From 03d4dae0e4a4880a5e24452c390173bad5742c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szilveszter=20Sz=C3=A9kely?= <szekelyszilv@gmail.com>
Date: Sat, 13 Jul 2013 18:07:32 +0200
Subject: [PATCH 01/61] Fix conditional in vimrcs/extended.vim

In the font section change has("linux") to has("unix").
Vim does not have "linux" feature only "unix".
---
 vimrcs/extended.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim
index 6373d424..8d0b5483 100644
--- a/vimrcs/extended.vim
+++ b/vimrcs/extended.vim
@@ -17,7 +17,7 @@ if has("mac") || has("macunix")
     set gfn=Menlo:h15
 elseif has("win16") || has("win32")
     set gfn=Bitstream\ Vera\ Sans\ Mono:h11
-elseif has("linux")
+elseif has("unix")
     set gfn=Monospace\ 11
 endif
 

From a448b32309701b5fc9cbc4ce3697245077b3640b Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Wed, 17 Jul 2013 19:06:05 -0400
Subject: [PATCH 02/61] Updated plugins

---
 .../ctrlp.vim/autoload/ctrlp.vim              | 206 +++++++---
 .../ctrlp.vim/autoload/ctrlp/buffertag.vim    |   4 +-
 .../ctrlp.vim/autoload/ctrlp/changes.vim      |   4 +-
 .../ctrlp.vim/autoload/ctrlp/dir.vim          |   2 +-
 .../ctrlp.vim/autoload/ctrlp/line.vim         |  15 +-
 .../ctrlp.vim/autoload/ctrlp/mrufiles.vim     |   4 +
 sources_non_forked/ctrlp.vim/doc/ctrlp.txt    |  84 +++-
 sources_non_forked/ctrlp.vim/plugin/ctrlp.vim |   4 +-
 .../vim-markdown/syntax/markdown.vim          |   6 +-
 .../vim-multiple-cursors/CHANGELOG.md         |   4 +
 .../vim-multiple-cursors/README.md            |   3 +-
 .../autoload/multiple_cursors.vim             |  43 +-
 .../doc/multiple_cursors.txt                  |   1 -
 .../spec/multiple_cursors_spec.rb             |  15 +
 .../vim-snipmate/autoload/snipMate.vim        |  38 +-
 .../vim-snipmate/doc/snipMate.txt             |  19 +-
 .../vim-snipmate/plugin/snipMate.vim          |  23 +-
 .../vim-snipmate/syntax/snippets.vim          |   5 +-
 sources_non_forked/vim-snippets/AUTHORS       |   2 +
 sources_non_forked/vim-snippets/README.md     |  74 +++-
 .../vim-snippets/UltiSnips/coffee.snippets    |  54 +--
 .../vim-snippets/UltiSnips/d.snippets         |   4 +-
 .../vim-snippets/UltiSnips/django.snippets    |   2 +-
 .../vim-snippets/UltiSnips/eruby.snippets     |   2 +-
 .../vim-snippets/UltiSnips/haskell.snippets   |   8 +-
 .../UltiSnips/html_minimal.snippets           |  31 ++
 .../vim-snippets/UltiSnips/java.snippets      |   2 +-
 .../UltiSnips/javascript.snippets             |  11 +-
 .../vim-snippets/UltiSnips/ocaml.snippets     |  81 ++--
 .../vim-snippets/UltiSnips/php.snippets       |  22 +-
 .../vim-snippets/UltiSnips/rst.snippets       | 273 ++++++++++++-
 .../vim-snippets/UltiSnips/ruby.snippets      | 120 +++---
 .../vim-snippets/UltiSnips/tcl.snippets       |   6 +-
 .../vim-snippets/UltiSnips/vim.snippets       |  16 +-
 .../vim-snippets/autoload/vim_snippets.vim    |  27 ++
 .../vim-snippets/snippets/_.snippets          |  68 ++--
 .../snippets/actionscript.snippets            |  20 +-
 .../vim-snippets/snippets/apache.snippets     |   2 +-
 .../vim-snippets/snippets/autoit.snippets     |   6 +-
 .../vim-snippets/snippets/c.snippets          |  29 +-
 .../vim-snippets/snippets/chef.snippets       |   6 +-
 .../vim-snippets/snippets/clojure.snippets    |   2 +-
 .../vim-snippets/snippets/cmake.snippets      |   6 +-
 .../vim-snippets/snippets/coffee.snippets     |  10 +-
 .../vim-snippets/snippets/cpp.snippets        |  20 +-
 .../vim-snippets/snippets/cs.snippets         |  38 +-
 .../vim-snippets/snippets/dart.snippets       |  12 +-
 .../vim-snippets/snippets/django.snippets     |  12 +-
 .../vim-snippets/snippets/elixir.snippets     | 122 ++++++
 .../vim-snippets/snippets/erlang.snippets     | 206 +++++++++-
 .../vim-snippets/snippets/eruby.snippets      |  12 +
 .../vim-snippets/snippets/falcon.snippets     |  34 +-
 .../vim-snippets/snippets/go.snippets         |  64 +--
 .../vim-snippets/snippets/haml.snippets       |  22 +-
 .../vim-snippets/snippets/haskell.snippets    |   2 +-
 .../vim-snippets/snippets/html.snippets       |  10 +-
 .../snippets/html_minimal.snippets            |  74 ++++
 .../vim-snippets/snippets/htmldjango.snippets |   4 +-
 .../snippets/htmltornado.snippets             |   6 +-
 .../vim-snippets/snippets/java.snippets       |  14 +-
 .../snippets/javascript-jquery.snippets       |   4 +-
 .../vim-snippets/snippets/javascript.snippets |  30 +-
 .../vim-snippets/snippets/make.snippets       |   2 +-
 .../vim-snippets/snippets/mako.snippets       |   2 +-
 .../vim-snippets/snippets/markdown.snippets   |   4 +-
 .../vim-snippets/snippets/objc.snippets       |  20 +-
 .../vim-snippets/snippets/perl.snippets       |  42 +-
 .../vim-snippets/snippets/php.snippets        |  50 +--
 .../vim-snippets/snippets/processing.snippets |   6 +-
 .../vim-snippets/snippets/progress.snippets   |   2 +-
 .../vim-snippets/snippets/puppet.snippets     |  14 +-
 .../vim-snippets/snippets/python.snippets     |  58 +--
 .../vim-snippets/snippets/r.snippets          |  12 +-
 .../vim-snippets/snippets/rst.snippets        |  53 ++-
 .../vim-snippets/snippets/ruby.snippets       | 385 +++++++++++-------
 .../vim-snippets/snippets/scala.snippets      |  56 +--
 .../vim-snippets/snippets/sh.snippets         |  14 +-
 .../vim-snippets/snippets/tcl.snippets        |  20 +-
 .../vim-snippets/snippets/tex.snippets        |  89 +++-
 .../vim-snippets/snippets/textile.snippets    |   2 +-
 .../vim-snippets/snippets/vim.snippets        |  24 +-
 .../vim-snippets/snippets/xslt.snippets       |   8 +-
 .../vim-snippets/snippets/yii-chtml.snippets  | 118 +++---
 .../vim-snippets/snippets/yii.snippets        |  82 ++--
 .../vim-snippets/snippets/zsh.snippets        |   2 +-
 85 files changed, 2174 insertions(+), 941 deletions(-)
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
 create mode 100644 sources_non_forked/vim-snippets/autoload/vim_snippets.vim
 create mode 100644 sources_non_forked/vim-snippets/snippets/elixir.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/html_minimal.snippets

diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
index f233c197..a1afaf14 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
@@ -68,6 +68,7 @@ let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
 	\ 'key_loop':              ['s:keyloop', 0],
 	\ 'lazy_update':           ['s:lazy', 0],
 	\ 'match_func':            ['s:matcher', {}],
+	\ 'match_window':          ['s:mw', ''],
 	\ 'match_window_bottom':   ['s:mwbottom', 1],
 	\ 'match_window_reversed': ['s:mwreverse', 1],
 	\ 'max_depth':             ['s:maxdepth', 40],
@@ -102,7 +103,7 @@ let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
 
 " Global options
 let s:glbs = { 'magic': 1, 'to': 1, 'tm': 0, 'sb': 1, 'hls': 0, 'im': 0,
-	\ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'mouse': 'n',
+	\ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'ttimeout': 0,
 	\ 'gcr': 'a:blinkon0', 'ic': 1, 'lmap': '', 'mousef': 0, 'imd': 1 }
 
 " Keymaps
@@ -181,7 +182,7 @@ let s:hlgrps = {
 	\ 'PrtText': 'Normal',
 	\ 'PrtCursor': 'Constant',
 	\ }
-" s:opts() {{{2
+" Get the options {{{2
 fu! s:opts(...)
 	unl! s:usrign s:usrcmd s:urprtmaps
 	for each in ['byfname', 'regexp', 'extensions'] | if exists('s:'.each)
@@ -201,6 +202,9 @@ fu! s:opts(...)
 			let {va} = {s:bpref.ke}
 		en
 	endfo
+	" Match window options
+	cal s:match_window_opts()
+	" One-time values
 	if a:0 && a:1 != {}
 		unl va
 		for [ke, va] in items(a:1)
@@ -217,7 +221,6 @@ fu! s:opts(...)
 	en | endfo
 	if !exists('g:ctrlp_newcache') | let g:ctrlp_newcache = 0 | en
 	let s:maxdepth = min([s:maxdepth, 100])
-	let s:mxheight = max([s:mxheight, 1])
 	let s:glob = s:showhidden ? '.*\|*' : '*'
 	let s:igntype = empty(s:usrign) ? -1 : type(s:usrign)
 	let s:lash = ctrlp#utils#lash()
@@ -238,13 +241,32 @@ fu! s:opts(...)
 		cal extend(s:prtmaps, s:urprtmaps)
 	en
 endf
+
+fu! s:match_window_opts()
+	let s:mw_pos =
+		\ s:mw =~ 'top\|bottom' ? matchstr(s:mw, 'top\|bottom') :
+		\ exists('g:ctrlp_match_window_bottom') ? ( s:mwbottom ? 'bottom' : 'top' )
+		\ : 'bottom'
+	let s:mw_order =
+		\ s:mw =~ 'order:[^,]\+' ? matchstr(s:mw, 'order:\zs[^,]\+') :
+		\ exists('g:ctrlp_match_window_reversed') ? ( s:mwreverse ? 'btt' : 'ttb' )
+		\ : 'btt'
+	let s:mw_max =
+		\ s:mw =~ 'max:[^,]\+' ? str2nr(matchstr(s:mw, 'max:\zs\d\+')) :
+		\ exists('g:ctrlp_max_height') ? s:mxheight
+		\ : 10
+	let s:mw_min =
+		\ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
+	let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
+	let s:mw_min = min([s:mw_min, s:mw_max])
+endf
 "}}}1
 " * Open & Close {{{1
 fu! s:Open()
 	cal s:log(1)
 	cal s:getenv()
 	cal s:execextvar('enter')
-	sil! exe 'keepa' ( s:mwbottom ? 'bo' : 'to' ) '1new ControlP'
+	sil! exe 'keepa' ( s:mw_pos == 'top' ? 'to' : 'bo' ) '1new ControlP'
 	cal s:buffunc(1)
 	let [s:bufnr, s:winw] = [bufnr('%'), winwidth(0)]
 	let [s:focus, s:prompt] = [1, ['', '', '']]
@@ -297,7 +319,7 @@ fu! ctrlp#clra()
 	if isdirectory(cadir)
 		let cafiles = split(s:glbpath(s:fnesc(cadir, 'g', ','), '**', 1), "\n")
 		let eval = '!isdirectory(v:val) && v:val !~ ''\v[\/]cache[.a-z]+$|\.log$'''
-		sil! cal map(filter(cafiles, eval), 'delete(v:val)')
+		sil! cal map(s:ifilter(cafiles, eval), 'delete(v:val)')
 	en
 	cal ctrlp#clr()
 endf
@@ -362,7 +384,7 @@ fu! s:UserCmd(lscmd)
 		let [ssl, &ssl, path] = [&ssl, 0, tr(path, '/', '\')]
 	en
 	if has('win32') || has('win64')
-		let lscmd = substitute(lscmd, '\v(^|&&\s*)\zscd (/d)@!', 'cd /d ', '')
+		let lscmd = substitute(lscmd, '\v(^|\&\&\s*)\zscd (/d)@!', 'cd /d ', '')
 	en
 	let path = exists('*shellescape') ? shellescape(path) : path
 	let g:ctrlp_allfiles = split(system(printf(lscmd, path)), "\n")
@@ -433,7 +455,7 @@ endf
 fu! s:MatchIt(items, pat, limit, exc)
 	let [lines, id] = [[], 0]
 	let pat =
-		\ s:byfname ? map(split(a:pat, '^[^;]\+\\\@<!\zs;', 1), 's:martcs.v:val')
+		\ s:byfname() ? map(split(a:pat, '^[^;]\+\\\@<!\zs;', 1), 's:martcs.v:val')
 		\ : s:martcs.a:pat
 	for item in a:items
 		let id += 1
@@ -450,7 +472,16 @@ fu! s:MatchedItems(items, pat, limit)
 	let exc = exists('s:crfilerel') ? s:crfilerel : ''
 	let items = s:narrowable() ? s:matched + s:mdata[3] : a:items
 	if s:matcher != {}
-		let argms = [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
+		let argms =
+			\ has_key(s:matcher, 'arg_type') && s:matcher['arg_type'] == 'dict' ? [{
+			\ 'items':  items,
+			\ 'str':    a:pat,
+			\ 'limit':  a:limit,
+			\ 'mmode':  s:mmode(),
+			\ 'ispath': s:ispath,
+			\ 'crfile': exc,
+			\ 'regex':  s:regexp,
+			\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
 		let lines = call(s:matcher['match'], argms, s:matcher)
 	el
 		let lines = s:MatchIt(items, a:pat, a:limit, exc)
@@ -480,7 +511,7 @@ fu! s:SplitPattern(str)
 	if exists('lst')
 		let pat = ''
 		if !empty(lst)
-			if s:byfname && index(lst, ';') > 0
+			if s:byfname() && index(lst, ';') > 0
 				let fbar = index(lst, ';')
 				let lst_1 = s:sublist(lst, 0, fbar - 1)
 				let lst_2 = len(lst) - 1 > fbar ? s:sublist(lst, fbar + 1, -1) : ['']
@@ -494,15 +525,19 @@ fu! s:SplitPattern(str)
 endf
 " * BuildPrompt() {{{1
 fu! s:Render(lines, pat)
-	let [&ma, lines, s:height] = [1, a:lines, min([len(a:lines), s:winh])]
-	let pat = s:byfname ? split(a:pat, '^[^;]\+\\\@<!\zs;', 1)[0] : a:pat
+	let [&ma, lines, s:res_count] = [1, a:lines, len(a:lines)]
+	let height = min([max([s:mw_min, s:res_count]), s:winmaxh])
+	let pat = s:byfname() ? split(a:pat, '^[^;]\+\\\@<!\zs;', 1)[0] : a:pat
+	let cur_cmd = 'keepj norm! '.( s:mw_order == 'btt' ? 'G' : 'gg' ).'1|'
 	" Setup the match window
-	sil! exe '%d _ | res' s:height
+	sil! exe '%d _ | res' height
 	" Print the new items
 	if empty(lines)
 		let [s:matched, s:lines] = [[], []]
-		cal setline(1, ' == NO ENTRIES ==')
+		let lines = [' == NO ENTRIES ==']
+		cal setline(1, s:offset(lines, height - 1))
 		setl noma nocul
+		exe cur_cmd
 		cal s:unmarksigns()
 		if s:dohighlight() | cal clearmatches() | en
 		retu
@@ -514,12 +549,12 @@ fu! s:Render(lines, pat)
 		cal sort(lines, 's:mixedsort')
 		unl s:compat
 	en
-	if s:mwreverse | cal reverse(lines) | en
+	if s:mw_order == 'btt' | cal reverse(lines) | en
 	let s:lines = copy(lines)
 	cal map(lines, 's:formatline(v:val)')
-	cal setline(1, lines)
+	cal setline(1, s:offset(lines, height))
 	setl noma cul
-	exe 'keepj norm!' ( s:mwreverse ? 'G' : 'gg' ).'1|'
+	exe cur_cmd
 	cal s:unmarksigns()
 	cal s:remarksigns()
 	if exists('s:cline') && s:nolim != 1
@@ -541,7 +576,7 @@ fu! s:Update(str)
 	let s:martcs = &scs && str =~ '\u' ? '\C' : ''
 	let pat = s:matcher == {} ? s:SplitPattern(str) : str
 	let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
-		\ : s:MatchedItems(g:ctrlp_lines, pat, s:winh)
+		\ : s:MatchedItems(g:ctrlp_lines, pat, s:winmaxh)
 	cal s:Render(lines, pat)
 endf
 
@@ -550,7 +585,7 @@ fu! s:ForceUpdate()
 endf
 
 fu! s:BuildPrompt(upd)
-	let base = ( s:regexp ? 'r' : '>' ).( s:byfname ? 'd' : '>' ).'> '
+	let base = ( s:regexp ? 'r' : '>' ).( s:byfname() ? 'd' : '>' ).'> '
 	let str = escape(s:getinput(), '\')
 	let lazy = str == '' || exists('s:force') || !has('autocmd') ? 0 : s:lazy
 	if a:upd && !lazy && ( s:matches || s:regexp || exists('s:did_exp')
@@ -581,11 +616,8 @@ fu! s:SetDefTxt()
 	if s:deftxt == '0' || ( s:deftxt == 1 && !s:ispath ) | retu | en
 	let txt = s:deftxt
 	if !type(txt)
-		let txt = txt && !stridx(s:crfpath, s:dyncwd)
-			\ ? ctrlp#rmbasedir([s:crfpath])[0] : ''
-		let txt = txt != '' ? txt.s:lash(s:crfpath) : ''
-	el
-		let txt = expand(txt, 1)
+		let path = s:crfpath.s:lash(s:crfpath)
+		let txt = txt && !stridx(path, s:dyncwd) ? ctrlp#rmbasedir([path])[0] : ''
 	en
 	let s:prompt[0] = txt
 endf
@@ -735,7 +767,7 @@ endf
 
 fu! s:PrtSelectJump(char)
 	let lines = copy(s:lines)
-	if s:byfname
+	if s:byfname()
 		cal map(lines, 'split(v:val, ''[\/]\ze[^\/]\+$'')[-1]')
 	en
 	" Cycle through matches, use s:jmpchr to store last jump
@@ -904,6 +936,11 @@ fu! s:ToggleKeyLoop()
 	en
 endf
 
+fu! s:ToggleMRURelative()
+	cal ctrlp#mrufiles#tgrel()
+	cal s:PrtClearCache()
+endf
+
 fu! s:PrtSwitcher()
 	let [s:force, s:matches] = [1, 1]
 	cal s:BuildPrompt(1)
@@ -937,14 +974,21 @@ fu! s:SetWD(args)
 	en
 endf
 " * AcceptSelection() {{{1
-fu! ctrlp#acceptfile(mode, line, ...)
-	let [md, useb] = [a:mode, 0]
-	if !type(a:line)
-		let [filpath, bufnr, useb] = [a:line, a:line, 1]
+fu! ctrlp#acceptfile(...)
+	let useb = 0
+	if a:0 == 1 && type(a:1) == 4
+		let [md, line] = [a:1['action'], a:1['line']]
+		let atl = has_key(a:1, 'tail') ? a:1['tail'] : ''
 	el
-		let filpath = fnamemodify(a:line, ':p')
-		if s:nonamecond(a:line, filpath)
-			let bufnr = str2nr(matchstr(a:line, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
+		let [md, line] = [a:1, a:2]
+		let atl = a:0 > 2 ? a:3 : ''
+	en
+	if !type(line)
+		let [filpath, bufnr, useb] = [line, line, 1]
+	el
+		let filpath = fnamemodify(line, ':p')
+		if s:nonamecond(line, filpath)
+			let bufnr = str2nr(matchstr(line, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
 			let [filpath, useb] = [bufnr, 1]
 		el
 			let bufnr = bufnr('^'.filpath.'$')
@@ -952,7 +996,7 @@ fu! ctrlp#acceptfile(mode, line, ...)
 	en
 	cal s:PrtExit()
 	let tail = s:tail()
-	let j2l = a:0 ? a:1 : matchstr(tail, '^ +\zs\d\+$')
+	let j2l = atl != '' ? atl : matchstr(tail, '^ +\zs\d\+$')
 	if ( s:jmptobuf =~ md || ( s:jmptobuf && md =~ '[et]' ) ) && bufnr > 0
 		\ && !( md == 'e' && bufnr == bufnr('%') )
 		let [jmpb, bufwinnr] = [1, bufwinnr(bufnr)]
@@ -980,7 +1024,7 @@ fu! ctrlp#acceptfile(mode, line, ...)
 		" Reset &switchbuf option
 		let [swb, &swb] = [&swb, '']
 		" Open new window/buffer
-		let [fid, tail] = [( useb ? bufnr : filpath ), ( a:0 ? ' +'.a:1 : tail )]
+		let [fid, tail] = [( useb ? bufnr : filpath ), ( atl != '' ? ' +'.atl : tail )]
 		let args = [cmd, fid, tail, 1, [useb, j2l]]
 		cal call('s:openfile', args)
 		let &swb = swb
@@ -1011,24 +1055,34 @@ fu! s:SpecInputs(str)
 	retu 0
 endf
 
-fu! s:AcceptSelection(mode)
-	if a:mode != 'e' && s:OpenMulti(a:mode) != -1 | retu | en
+fu! s:AcceptSelection(action)
+	let [md, icr] = [a:action[0], match(a:action, 'r') >= 0]
+	let subm = icr || ( !icr && md == 'e' )
+	if !subm && s:OpenMulti(md) != -1 | retu | en
 	let str = s:getinput()
-	if a:mode == 'e' | if s:SpecInputs(str) | retu | en | en
+	if subm | if s:SpecInputs(str) | retu | en | en
 	" Get the selected line
 	let line = ctrlp#getcline()
-	if a:mode != 'e' && !s:itemtype && line == ''
+	if !subm && !s:itemtype && line == '' && line('.') > s:offset
 		\ && str !~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*|/|\\|\?|\@.+)$'
-		cal s:CreateNewFile(a:mode) | retu
+		cal s:CreateNewFile(md) | retu
 	en
 	if empty(line) | retu | en
 	" Do something with it
 	if s:openfunc != {} && has_key(s:openfunc, s:ctype)
 		let actfunc = s:openfunc[s:ctype]
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'list'
 	el
-		let actfunc = s:itemtype < 3 ? 'ctrlp#acceptfile' : s:getextvar('accept')
+		if s:itemtype < 3
+			let [actfunc, type] = ['ctrlp#acceptfile', 'dict']
+		el
+			let [actfunc, exttype] = [s:getextvar('accept'), s:getextvar('act_farg')]
+			let type = exttype == 'dict' ? exttype : 'list'
+		en
 	en
-	cal call(actfunc, [a:mode, line])
+	let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr }]
+		\ : [md, line]
+	cal call(actfunc, actargs)
 endf
 " - CreateNewFile() {{{1
 fu! s:CreateNewFile(...)
@@ -1187,7 +1241,10 @@ fu! s:OpenNoMarks(md, line)
 		cal s:remarksigns()
 		cal s:BuildPrompt(0)
 	elsei a:md == 'x'
-		cal call(s:openfunc[s:ctype], [a:md, a:line], s:openfunc)
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'dict'
+		let argms = type == 'dict' ? [{ 'action': a:md, 'line': a:line }]
+			\ : [a:md, a:line]
+		cal call(s:openfunc[s:ctype], argms, s:openfunc)
 	elsei a:md == 'd'
 		let dir = fnamemodify(a:line, ':h')
 		if isdirectory(dir)
@@ -1278,7 +1335,7 @@ fu! s:mixedsort(...)
 	let [cln, cml] = [ctrlp#complen(a:1, a:2), s:compmatlen(a:1, a:2)]
 	if s:ispath
 		let ms = []
-		if s:height < 21
+		if s:res_count < 21
 			let ms += [s:compfnlen(a:1, a:2)]
 			if s:itemtype !~ '^[12]$' | let ms += [s:comptime(a:1, a:2)] | en
 			if !s:itemtype | let ms += [s:comparent(a:1, a:2)] | en
@@ -1324,12 +1381,21 @@ fu! ctrlp#statusline()
 	let prv = tps[s:walker(max, s:itemtype, -1)][1]
 	let s:ctype = tps[s:itemtype][0]
 	let focus   = s:focus ? 'prt'  : 'win'
-	let byfname = s:byfname ? 'file' : 'path'
+	let byfname = s:ispath ? s:byfname ? 'file' : 'path' : 'line'
 	let marked  = s:opmul != '0' ?
 		\ exists('s:marked') ? ' <'.s:dismrk().'>' : ' <->' : ''
 	if s:status != {}
-		let args = [focus, byfname, s:regexp, prv, s:ctype, nxt, marked]
-		let &l:stl = call(s:status['main'], args, s:status)
+		let argms =
+			\ has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict' ? [{
+			\ 'focus':   focus,
+			\ 'byfname': byfname,
+			\ 'regex':   s:regexp,
+			\ 'prev':    prv,
+			\ 'item':    s:ctype,
+			\ 'next':    nxt,
+			\ 'marked':  marked,
+			\ }] : [focus, byfname, s:regexp, prv, s:ctype, nxt, marked]
+		let &l:stl = call(s:status['main'], argms, s:status)
 	el
 		let item    = '%#CtrlPMode1# '.s:ctype.' %*'
 		let focus   = '%#CtrlPMode2# '.focus.' %*'
@@ -1349,8 +1415,13 @@ endf
 fu! ctrlp#progress(enum, ...)
 	if has('macunix') || has('mac') | sl 1m | en
 	let txt = a:0 ? '(press ctrl-c to abort)' : ''
-	let &l:stl = s:status != {} ? call(s:status['prog'], [a:enum], s:status)
-		\ : '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# %{getcwd()} %*'
+	if s:status != {}
+		let argms = has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict'
+			\ ? [{ 'str': a:enum }] : [a:enum]
+		let &l:stl = call(s:status['prog'], argms, s:status)
+	el
+		let &l:stl = '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# %{getcwd()} %*'
+	en
 	redraws
 endf
 " *** Paths {{{2
@@ -1376,6 +1447,11 @@ fu! s:pathshorten(str)
 	retu matchstr(a:str, '^.\{9}').'...'
 		\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
 endf
+
+fu! s:offset(lines, height)
+	let s:offset = s:mw_order == 'btt' ? ( a:height - s:res_count ) : 0
+	retu s:offset > 0 ? ( repeat([''], s:offset) + a:lines ) : a:lines
+endf
 " Directory completion {{{3
 fu! s:dircompl(be, sd)
 	if a:sd == '' | retu [] | en
@@ -1464,7 +1540,7 @@ fu! s:samerootsyml(each, isfile, cwd)
 endf
 
 fu! ctrlp#rmbasedir(items)
-	let cwd = s:dyncwd.( s:dyncwd !~ '[\/]$' ? s:lash : '' )
+	let cwd = s:dyncwd.s:lash()
 	if a:items != [] && !stridx(a:items[0], cwd)
 		let idx = strlen(cwd)
 		retu map(a:items, 'strpart(v:val, idx)')
@@ -1599,6 +1675,18 @@ fu! s:dosigns()
 	retu exists('s:marked') && s:bufnr > 0 && s:opmul != '0' && has('signs')
 endf
 " Lists & Dictionaries {{{2
+fu! s:ifilter(list, str)
+	let [rlist, estr] = [[], substitute(a:str, 'v:val', 'each', 'g')]
+	for each in a:list
+		try
+			if eval(estr)
+				cal add(rlist, each)
+			en
+		cat | con | endt
+	endfo
+	retu rlist
+endf
+
 fu! s:dictindex(dict, expr)
 	for key in keys(a:dict)
 		if a:dict[key] == a:expr | retu key | en
@@ -1808,7 +1896,6 @@ endf
 fu! s:modevar()
 	let s:matchtype = s:mtype()
 	let s:ispath = s:ispathitem()
-	if !s:ispath | let s:byfname = 0 | en
 	let s:mfunc = s:mfunc()
 	let s:nolim = s:getextvar('nolim')
 	let s:dosort = s:getextvar('sort')
@@ -1820,6 +1907,10 @@ fu! s:nosort()
 		\ || ( s:itemtype =~ '\v^(1|2)$' && s:prompt == ['', '', ''] ) || !s:dosort
 endf
 
+fu! s:byfname()
+	retu s:ispath && s:byfname
+endf
+
 fu! s:narrowable()
 	retu exists('s:act_add') && exists('s:matched') && s:matched != []
 		\ && exists('s:mdata') && s:mdata[:2] == [s:dyncwd, s:itemtype, s:regexp]
@@ -1834,7 +1925,7 @@ fu! s:getinput(...)
 		if gmd =~ 't' && gmd =~ 'k' && !a:0 && matchstr(str, '.$') =~ '\k'
 			retu join(prt, '')
 		en
-		let [pf, rz] = [( s:byfname ? 'f' : 'p' ), ( s:regexp ? 'r' : 'z' )]
+		let [pf, rz] = [( s:byfname() ? 'f' : 'p' ), ( s:regexp ? 'r' : 'z' )]
 		for dict in s:abbrev['abbrevs']
 			let dmd = has_key(dict, 'mode') ? dict['mode'] : ''
 			let pat = escape(dict['pattern'], '~')
@@ -1916,7 +2007,7 @@ fu! s:getenv()
 	let [s:cwd, s:winres] = [getcwd(), [winrestcmd(), &lines, winnr('$')]]
 	let [s:crword, s:crnbword] = [expand('<cword>', 1), expand('<cWORD>', 1)]
 	let [s:crgfile, s:crline] = [expand('<cfile>', 1), getline('.')]
-	let [s:winh, s:crcursor] = [min([s:mxheight, &lines]), getpos('.')]
+	let [s:winmaxh, s:crcursor] = [min([s:mw_max, &lines]), getpos('.')]
 	let [s:crbufnr, s:crvisual] = [bufnr('%'), s:lastvisual()]
 	let s:crfile = bufname('%') == ''
 		\ ? '['.s:crbufnr.'*No Name]' : expand('%:p', 1)
@@ -1939,7 +2030,8 @@ endf
 fu! s:log(m)
 	if exists('g:ctrlp_log') && g:ctrlp_log | if a:m
 		let cadir = ctrlp#utils#cachedir()
-		sil! exe 'redi! >' cadir.s:lash(cadir).'ctrlp.log'
+		let apd = g:ctrlp_log > 1 ? '>' : ''
+		sil! exe 'redi! >'.apd cadir.s:lash(cadir).'ctrlp.log'
 	el
 		sil! redi END
 	en | en
@@ -2023,7 +2115,7 @@ endf
 
 fu! s:mfunc()
 	let mfunc = 'match'
-	if s:byfname && s:ispath
+	if s:byfname()
 		let mfunc = 's:matchfname'
 	elsei s:itemtype > 2
 		let matchtypes = { 'tabs': 's:matchtabs', 'tabe': 's:matchtabe' }
@@ -2102,7 +2194,9 @@ fu! s:getextvar(key)
 endf
 
 fu! ctrlp#getcline()
-	retu !empty(s:lines) ? s:lines[line('.') - 1] : ''
+	let [linenr, offset] = [line('.'), ( s:offset > 0 ? s:offset : 0 )]
+	retu !empty(s:lines) && !( offset && linenr <= offset )
+		\ ? s:lines[linenr - 1 - offset] : ''
 endf
 
 fu! ctrlp#getmarkedlist()
@@ -2134,6 +2228,10 @@ endf
 fu! ctrlp#call(func, ...)
 	retu call(a:func, a:000)
 endf
+
+fu! ctrlp#getvar(var)
+	retu {a:var}
+endf
 "}}}1
 " * Initialization {{{1
 fu! ctrlp#setlines(...)
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
index aa67afa6..bc3662a4 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
@@ -248,7 +248,9 @@ endf
 fu! ctrlp#buffertag#cmd(mode, ...)
 	let s:btmode = a:mode
 	if a:0 && !empty(a:1)
-		let s:bufname = fnamemodify(a:1, ':p')
+		let s:btmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufname = fnamemodify(bname, ':p')
 	en
 	retu s:id
 endf
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim
index 67a299c6..313d8c2f 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/changes.vim
@@ -83,7 +83,9 @@ endf
 fu! ctrlp#changes#cmd(mode, ...)
 	let s:clmode = a:mode
 	if a:0 && !empty(a:1)
-		let s:bufnr = bufnr('^'.fnamemodify(a:1, ':p').'$')
+		let s:clmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufnr = bufnr('^'.fnamemodify(bname, ':p').'$')
 	en
 	retu s:id
 endf
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim
index 091e66c2..4e6d4adc 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/dir.vim
@@ -74,7 +74,7 @@ fu! ctrlp#dir#init(...)
 endf
 
 fu! ctrlp#dir#accept(mode, str)
-	let path = a:mode == 'h' ? getcwd() : s:cwd.ctrlp#utils#lash().a:str
+	let path = a:mode == 'h' ? getcwd() : s:cwd.ctrlp#call('s:lash', s:cwd).a:str
 	if a:mode =~ 't\|v\|h'
 		cal ctrlp#exit()
 	en
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim
index e82bf1b5..5bec47ee 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim
@@ -11,7 +11,7 @@ en
 let g:loaded_ctrlp_line = 1
 
 cal add(g:ctrlp_ext_vars, {
-	\ 'init': 'ctrlp#line#init()',
+	\ 'init': 'ctrlp#line#init(s:crbufnr)',
 	\ 'accept': 'ctrlp#line#accept',
 	\ 'lname': 'lines',
 	\ 'sname': 'lns',
@@ -29,8 +29,9 @@ fu! s:syntax()
 	en
 endf
 " Public {{{1
-fu! ctrlp#line#init()
-	let [bufs, lines] = [ctrlp#buffers('id'), []]
+fu! ctrlp#line#init(bufnr)
+	let [lines, bufnr] = [[], exists('s:bufnr') ? s:bufnr : a:bufnr]
+	let bufs = exists('s:lnmode') && s:lnmode ? ctrlp#buffers('id') : [bufnr]
 	for bufnr in bufs
 		let [lfb, bufn] = [getbufline(bufnr, 1, '$'), bufname(bufnr)]
 		if lfb == [] && bufn != ''
@@ -57,7 +58,13 @@ fu! ctrlp#line#accept(mode, str)
 	en
 endf
 
-fu! ctrlp#line#id()
+fu! ctrlp#line#cmd(mode, ...)
+	let s:lnmode = a:mode
+	if a:0 && !empty(a:1)
+		let s:lnmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufnr = bufnr('^'.fnamemodify(bname, ':p').'$')
+	en
 	retu s:id
 endf
 "}}}
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim
index e34f4504..a1821114 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/mrufiles.vim
@@ -126,6 +126,10 @@ fu! ctrlp#mrufiles#bufs()
 	retu s:mrbs
 endf
 
+fu! ctrlp#mrufiles#tgrel()
+	let {s:re} = !{s:re}
+endf
+
 fu! ctrlp#mrufiles#cachefile()
 	if !exists('s:cadir') || !exists('s:cafile')
 		let s:cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'mru'
diff --git a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
index cf3e23a4..8a3863aa 100644
--- a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
+++ b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
@@ -40,9 +40,7 @@ Overview:~
   |ctrlp_cmd|...................Default command used for the default mapping.
   |ctrlp_by_filename|...........Default to filename mode or not.
   |ctrlp_regexp|................Default to regexp mode or not.
-  |ctrlp_match_window_bottom|...Where to show the match window.
-  |ctrlp_match_window_reversed|.Sort order in the match window.
-  |ctrlp_max_height|............Max height of the match window.
+  |ctrlp_match_window|..........Order, height and position of the match window.
   |ctrlp_switch_buffer|.........Jump to an open buffer if already opened.
   |ctrlp_reuse_window|..........Reuse special windows (help, quickfix, etc).
   |ctrlp_tabpage_position|......Where to put the new tab page.
@@ -77,6 +75,11 @@ Overview:~
   |ctrlp_mruf_case_sensitive|...MRU files are case sensitive or not.
   |ctrlp_mruf_save_on_update|...Save to disk whenever a new entry is added.
 
+  BufferTag mode: (to enable, see |ctrlp-extensions|)
+  |g:ctrlp_buftag_ctags_bin|....The location of the ctags-compatible binary.
+  |g:ctrlp_buftag_systemenc|....The encoding used for the ctags command.
+  |g:ctrlp_buftag_types|........Add new filetypes and set the cmd arguments.
+
   Advanced options:
   |ctrlp_open_func|.............Use custom file opening functions.
   |ctrlp_status_func|...........Change CtrlP's two statuslines.
@@ -114,21 +117,27 @@ Set this to 1 to set regexp search as the default: >
 <
 Can be toggled on/off by pressing <c-r> inside the prompt.
 
-                                                *'g:ctrlp_match_window_bottom'*
-Set this to 0 to show the match window at the top of the screen: >
-  let g:ctrlp_match_window_bottom = 1
+                                                       *'g:ctrlp_match_window'*
+Change the postion, the listing order of results, the minimum and the maximum
+heights of the match window: >
+  let g:ctrlp_match_window = ''
 <
+Example: >
+  let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10'
+<
+The position: (default: bottom)
+  top - show the match window at the top of the screen.
+  bottom - show the match window at the bottom of the screen.
 
-                                              *'g:ctrlp_match_window_reversed'*
-Change the listing order of the files in the match window. The default setting
-(1) is from bottom to top: >
-  let g:ctrlp_match_window_reversed = 1
-<
+The listing order of results: (default: btt)
+  order:ttb - from top to bottom.
+  order:btt - from bottom to top.
 
-                                                         *'g:ctrlp_max_height'*
-Set the maximum height of the match window: >
-  let g:ctrlp_max_height = 10
-<
+The minimum and maximum heights:
+  min:{n} - show minimum {n} lines (default: 1).
+  max:{n} - show maximum {n} lines (default: 10).
+
+Note: When a setting isn't set, its default value will be used.
 
                                                       *'g:ctrlp_switch_buffer'*
 When opening a file, if it's already open in a window somewhere, CtrlP will try
@@ -323,18 +332,21 @@ Some examples: >
   let g:ctrlp_user_command = ['.hg', 'for /f "tokens=1" %%a in (''hg root'') '
     \ . 'do hg --cwd %s status -numac -I . %%a']           " Windows
 <
-Note #1: if the fallback_command is empty or the 'fallback' key is not defined,
+Note #1: in the |Dictionary| format, 'fallback' and 'ignore' are optional. In
+the |List| format, fallback_command is optional.
+
+Note #2: if the fallback_command is empty or the 'fallback' key is not defined,
 |globpath()| will then be used when scanning outside of a repository.
 
-Note #2: unless the |Dictionary| format is used and 'ignore' is defined and set
+Note #3: unless the |Dictionary| format is used and 'ignore' is defined and set
 to 1, the |wildignore| and |g:ctrlp_custom_ignore| options do not apply when
 these custom commands are being used. When not present, 'ignore' is set to 0 by
 default to retain the performance advantage of using external commands.
 
-Note #3: when changing the option's variable type, remember to |:unlet| it
+Note #4: when changing the option's variable type, remember to |:unlet| it
 first or restart Vim to avoid the "E706: Variable type mismatch" error.
 
-Note #4: you can use a |b:var| to set this option on a per buffer basis.
+Note #5: you can use a |b:var| to set this option on a per buffer basis.
 
                                                         *'g:ctrlp_max_history'*
 The maximum number of input strings you want CtrlP to remember. The default
@@ -563,6 +575,9 @@ Example: >
 Set this to 1 to show only MRU files in the current working directory: >
   let g:ctrlp_mruf_relative = 0
 <
+Note: you can use a custom mapping to toggle this option inside the prompt: >
+  let g:ctrlp_prompt_mappings = { 'ToggleMRURelative()': ['<F2>'] }
+<
 
                                                  *'g:ctrlp_mruf_default_order'*
 Set this to 1 to disable sorting when searching in MRU mode: >
@@ -734,6 +749,27 @@ Structure of the function: >
   endfunction
 <
 
+Note: you can extend any of the above options with { 'arg_type': 'dict' } to
+enable passing all the function arguments in a single Dictionary argument. Use
+the existing argument names as keys in this Dictionary.
+
+Example: >
+  let g:ctrlp_status_func = {
+    \ 'arg_type' : 'dict',
+    \ 'enter': 'Function_Name_1',
+    \ 'exit':  'Function_Name_2',
+    \ }
+
+  function! Function_Name_1(dict)
+    " where dict == {
+    " \ 'focus':   value,
+    " \ 'byfname': value,
+    " \ 'regex':   value,
+    " \ ...
+    " }
+  endfunction
+<
+
 ===============================================================================
 COMMANDS                                                       *ctrlp-commands*
 
@@ -1076,8 +1112,8 @@ Available extensions:~
                                                                    *:CtrlPLine*
   * Line mode:~
     - Name: 'line'
-    - Command: ":CtrlPLine"
-    - Search for a line in all listed buffers.
+    - Command: ":CtrlPLine [buffer]"
+    - Search for a line in all listed buffers or in the specified [buffer].
 
                                                                  *:CtrlPChange*
                                                               *:CtrlPChangeAll*
@@ -1164,7 +1200,7 @@ Highlighting:~
 
 Statuslines:~
   * Highlight groups:
-    CtrlPMode1 : 'file' or 'path', and the current mode (Character)
+    CtrlPMode1 : 'file' or 'path' or 'line', and the current mode (Character)
     CtrlPMode2 : 'prt' or 'win', 'regex', the working directory (|hl-LineNr|)
     CtrlPStats : the scanning status (Function)
 
@@ -1253,6 +1289,10 @@ Special thanks:~
 ===============================================================================
 CHANGELOG                                                     *ctrlp-changelog*
 
+    + Combine *g:ctrlp_match_window_bottom* *g:ctrlp_match_window_reversed* and
+      *g:ctrlp_max_height* into |g:ctrlp_match_window|.
+    + New option: |g:ctrlp_match_window|.
+
 Before 2012/11/30~
 
     + New options: |g:ctrlp_abbrev|,
diff --git a/sources_non_forked/ctrlp.vim/plugin/ctrlp.vim b/sources_non_forked/ctrlp.vim/plugin/ctrlp.vim
index b6f9a27e..c7b8fa3f 100644
--- a/sources_non_forked/ctrlp.vim/plugin/ctrlp.vim
+++ b/sources_non_forked/ctrlp.vim/plugin/ctrlp.vim
@@ -51,7 +51,9 @@ com! -n=? -com=buffer CtrlPBufTag
 com! -bar CtrlPBufTagAll cal ctrlp#init(ctrlp#buffertag#cmd(1))
 com! -bar CtrlPRTS       cal ctrlp#init(ctrlp#rtscript#id())
 com! -bar CtrlPUndo      cal ctrlp#init(ctrlp#undo#id())
-com! -bar CtrlPLine      cal ctrlp#init(ctrlp#line#id())
+
+com! -n=? -com=buffer CtrlPLine
+	\ cal ctrlp#init(ctrlp#line#cmd(1, <q-args>))
 
 com! -n=? -com=buffer CtrlPChange
 	\ cal ctrlp#init(ctrlp#changes#cmd(0, <q-args>))
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 2b565b4d..3024f2f7 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -76,8 +76,8 @@ syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+
 
 syn region markdownItalic start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart
 syn region markdownItalic start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart
-syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart
-syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart
+syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic
+syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic
 syn region markdownBoldItalic start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart
 syn region markdownBoldItalic start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepend contains=markdownLineStart
@@ -86,7 +86,7 @@ syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end=
 
 if main_syntax ==# 'markdown'
   for s:type in g:markdown_fenced_languages
-    exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
+    exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```\s*'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
   endfor
   unlet! s:type
 endif
diff --git a/sources_non_forked/vim-multiple-cursors/CHANGELOG.md b/sources_non_forked/vim-multiple-cursors/CHANGELOG.md
index d08bd09e..265b39f8 100644
--- a/sources_non_forked/vim-multiple-cursors/CHANGELOG.md
+++ b/sources_non_forked/vim-multiple-cursors/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2 (06/10/2013)
+Bugfixes:
+  - Fix plugin break in PASTE mode. This fixes #44.
+
 ## 2.1 (04/26/2013)
 
 Bugfixes:
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index a94de146..c61ac01e 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -69,7 +69,7 @@ let g:multi_cursor_start_key='<F6>'
 
 ## Setting
 Currently there're two additional global settings one can tweak:
-### ```g:multi_cursor_exit_from_visual_mode``` (Defaut: 1)
+### ```g:multi_cursor_exit_from_visual_mode``` (Default: 1)
 
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
 
@@ -87,7 +87,6 @@ highlight link multiple_cursors_visual Visual
 
 ## Issues
 - Multi key commands like `ciw` do not work at the moment
-- Insert mode can be slow. If you are using Neobundle and have many plugins, try switching to Vundle to see if it helps. See https://github.com/Shougo/neobundle.vim/issues/84 for additional info.
 - All user input typed before Vim is able to fan out the last operation to all cursors is lost. This is a implementation decision to keep the input perfectly synced in all locations, at the cost of potentially losing user input.
 - Select mode is not implemented
 
diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index 227e150d..7cdae119 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -50,9 +50,9 @@ endif
 " Internal Mappings
 "===============================================================================
 
-inoremap <silent> <Plug>(i) <C-o>:call <SID>process_user_inut()<CR>
-nnoremap <silent> <Plug>(i) :call <SID>process_user_inut()<CR>
-xnoremap <silent> <Plug>(i) :<C-u>call <SID>process_user_inut()<CR>
+inoremap <silent> <Plug>(i) <C-o>:call <SID>process_user_input()<CR>
+nnoremap <silent> <Plug>(i) :call <SID>process_user_input()<CR>
+xnoremap <silent> <Plug>(i) :<C-u>call <SID>process_user_input()<CR>
 
 inoremap <silent> <Plug>(a) <C-o>:call <SID>apply_user_input_next('i')<CR>
 nnoremap <silent> <Plug>(a) :call <SID>apply_user_input_next('n')<CR>
@@ -97,8 +97,8 @@ endfunction
 " attempted to be created at the next occurrence of the visual selection
 function! multiple_cursors#new(mode)
   if a:mode ==# 'n'
-    " Reset all existing cursors, don't restore view
-    call s:cm.reset(0)
+    " Reset all existing cursors, don't restore view and setting
+    call s:cm.reset(0, 0)
 
     " Select the word under cursor to set the '< and '> marks
     exec "normal! viw"
@@ -113,7 +113,7 @@ function! multiple_cursors#new(mode)
     let start = line("'<")
     let finish = line("'>")
     if start != finish
-      call s:cm.reset(0)
+      call s:cm.reset(0, 0)
       let col = col("'<")
       for line in range(line("'<"), line("'>"))
         let pos = [line, col]
@@ -124,7 +124,7 @@ function! multiple_cursors#new(mode)
     else
       " Came directly from visual mode
       if s:cm.is_empty()
-        call s:cm.reset(0)
+        call s:cm.reset(0, 0)
 
         if visualmode() ==# 'V'
           let left = [line('.'), 1]
@@ -133,7 +133,7 @@ function! multiple_cursors#new(mode)
             return
           endif
           call s:cm.add(right, [left, right])
-        else 
+        else
           call s:cm.add(s:pos("'>"), s:region("'<", "'>"))
         endif
       endif
@@ -219,7 +219,7 @@ function! multiple_cursors#find(start, end, pattern)
     call winrestview(s:cm.saved_winview)
     echohl ErrorMsg | echo 'No match found' | echohl None
     return
-  else 
+  else
     echohl Normal | echo 'Added '.s:cm.size().' cursor'.(s:cm.size()>1?'s':'') | echohl None
     call s:wait_for_user_input('v')
   endif
@@ -318,6 +318,7 @@ function! s:CursorManager.new()
         \ 'virtualedit': &virtualedit,
         \ 'cursorline': &cursorline,
         \ 'lazyredraw': &lazyredraw,
+        \ 'paste': &paste,
         \ }
   " We save the window view when multicursor mode is entered
   let obj.saved_winview = []
@@ -327,7 +328,7 @@ function! s:CursorManager.new()
 endfunction
 
 " Clear all cursors and their highlights
-function! s:CursorManager.reset(restore_view) dict
+function! s:CursorManager.reset(restore_view, restore_setting) dict
   if a:restore_view
     " Return the view back to the beginning
     if !empty(self.saved_winview)
@@ -357,7 +358,9 @@ function! s:CursorManager.reset(restore_view) dict
   let self.saved_winview = []
   let self.start_from_find = 0
   let s:char = ''
-  call self.restore_user_settings()
+  if a:restore_setting
+    call self.restore_user_settings()
+  endif
 endfunction
 
 " Returns 0 if it's not managing any cursors at the moment
@@ -513,10 +516,17 @@ endfunction
 " where the real vim cursor is
 " lazyredraw needs to be turned on to prevent jerky screen behavior with many
 " cursors on screen
+" paste mode needs to be switched off since it turns off a bunch of features
+" that's critical for the plugin to function
 function! s:CursorManager.initialize() dict
+  let self.saved_settings['virtualedit'] = &virtualedit
+  let self.saved_settings['cursorline'] = &cursorline
+  let self.saved_settings['lazyredraw'] = &lazyredraw
+  let self.saved_settings['paste'] = &paste
   let &virtualedit = "onemore"
   let &cursorline = 0
   let &lazyredraw = 1
+  let &paste = 0
   " We could have already saved the view from multiple_cursors#find
   if !self.start_from_find
     let self.saved_winview = winsaveview()
@@ -529,6 +539,7 @@ function! s:CursorManager.restore_user_settings() dict
     let &virtualedit = self.saved_settings['virtualedit']
     let &cursorline = self.saved_settings['cursorline']
     let &lazyredraw = self.saved_settings['lazyredraw']
+    let &paste = self.saved_settings['paste']
   endif
 endfunction
 
@@ -742,7 +753,7 @@ function! s:feedkeys(keys)
 endfunction
 
 " Take the user input and apply it at every cursor
-function! s:process_user_inut()
+function! s:process_user_input()
   " Grr this is frustrating. In Insert mode, between the feedkey call and here,
   " the current position could actually CHANGE for some odd reason. Forcing a
   " position reset here
@@ -876,7 +887,7 @@ function! s:exit()
     let exit = 1
   endif
   if exit
-    call s:cm.reset(1)
+    call s:cm.reset(1, 1)
     return 1
   endif
   return 0
@@ -923,7 +934,7 @@ function! s:revert_highlight_fix()
   if type(s:saved_line) == 1
     if s:from_mode ==# 'i'
       silent! undojoin | call setline('.', s:saved_line)
-    else 
+    else
       call setline('.', s:saved_line)
     endif
   endif
@@ -961,7 +972,7 @@ function! s:end_latency_measure()
         silent! echom "Starting latency debug at ".reltimestr(reltime())
       redir END
     endif
-    
+
     if !s:skip_latency_measure
       exec 'redir >> '.s:latency_debug_file
         silent! echom "Processing '".s:char."' took ".string(str2float(reltimestr(reltime(s:start_time)))*1000).' ms in '.s:cm.size().' cursors. mode = '.s:from_mode
@@ -1000,7 +1011,7 @@ function! s:wait_for_user_input(mode)
   if s:exit()
     return
   endif
-  
+
   " If the key is a special key and we're in the right mode, handle it
   if index(get(s:special_keys, s:from_mode, []), s:char) != -1
     call s:handle_special_key(s:char, s:from_mode)
diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
index dc6550bf..a1de56e5 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -160,7 +160,6 @@ like the following in your vimrc: >
   cursors is lost. This is a implementation decision to keep the input
   perfectly synced in all locations, at the cost of potentially losing user
   input.
-- Performance in terminal vim degrades significantly with more cursors
 - Select mode is not implemented
 
 ==============================================================================
diff --git a/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb b/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
index 590222eb..1e8fc89c 100644
--- a/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
+++ b/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
@@ -270,4 +270,19 @@ describe "Multiple Cursors" do
       hello world
     EOF
   end
+
+  specify "#set paste mode" do
+    before <<-EOF
+      hello
+      hello
+    EOF
+
+    type ':set paste<CR><C-n><C-n>cworld<Esc>:set nopaste<CR>'
+
+    after <<-EOF
+      world
+      world
+    EOF
+  end
+
 end
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 0b830e03..5479dd7f 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -77,11 +77,10 @@ fun! snipMate#expandSnip(snip, col)
 		endif
 	endif
 
-	call setline(lnum, line.snipLines[0])
-
-	" Autoindent snippet according to previous indentation
-	let indent = matchend(line, '^.\{-}\ze\(\S\|$\)') + 1
-	call append(lnum, map(snipLines[1:], "'".strpart(line, 0, indent - 1)."'.v:val"))
+	" Insert snippet with proper indentation
+	let indent = indent(lnum) + 1
+	call setline(lnum, line . snipLines[0])
+	call append(lnum, map(snipLines[1:], "empty(v:val) ? v:val : '" . strpart(line, 0, indent - 1) . "' . v:val"))
 
 	" Open any folds snippet expands into
 	if &fen | sil! exe lnum.','.(lnum + len(snipLines) - 1).'foldopen' | endif
@@ -391,7 +390,8 @@ endf
 " if triggername is not set 'default' is assumed
 fun! snipMate#ReadSnippetsFile(file)
 	let result = []
-	if !filereadable(a:file) | return result | endif
+	let new_scopes = []
+	if !filereadable(a:file) | return [result, new_scopes] | endif
 	let r_guard = '^guard\s\+\zs.*'
 	let inSnip = 0
 	let guard = 1
@@ -421,9 +421,12 @@ fun! snipMate#ReadSnippetsFile(file)
 				let trigger = strpart(trigger, 0, space - 1)
 			endif
 			let content = ''
+		elseif line[:6] == 'extends'
+			call extend(new_scopes, map(split(strpart(line, 8)),
+						\ "substitute(v:val, ',*$', '', '')"))
 		endif
 	endfor
-	return result
+	return [result, new_scopes]
 endf
 
 " adds scope aliases to list.
@@ -448,7 +451,14 @@ fun! s:AddScopeAliases(list)
 endf
 
 function! s:Glob(path, expr)
-	return filter(split(globpath(a:path, a:expr), "\n"), 'filereadable(v:val)')
+	let res = []
+	for p in split(a:path, ',')
+		let h = fnamemodify(a:expr, ':h')
+		if isdirectory(p . '/' . h)
+			call extend(res, split(glob(p . '/' . a:expr), "\n"))
+		endif
+	endfor
+	return filter(res, 'filereadable(v:val)')
 endfunction
 
 " returns dict of
@@ -467,7 +477,7 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 	let paths = join(funcref#Call(s:c.snippet_dirs), ',')
 	let result = {}
 	let scopes = s:AddScopeAliases(a:scopes)
-	let trigger = escape(a:trigger, '{}*[]`')
+	let trigger = escape(a:trigger, "*[]?{}`'$")
 
 	" collect existing files
 	for scope in scopes
@@ -490,7 +500,7 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 
 		if !a:mustExist
 			for p in split(paths, ',')
-				let p .= '/' . scope . '.snippets'
+				let p .= '/snippets/' . scope . '.snippets'
 				let result[p] = get(result, p, {'exists': 0, 'type': 'snippets'})
 			endfor
 		endif
@@ -514,21 +524,27 @@ endf
 " default triggers based on paths
 fun! snipMate#DefaultPool(scopes, trigger, result)
 	let triggerR = substitute(a:trigger,'*','.*','g')
+	let extra_scopes = []
 	for [f,opts] in items(snipMate#GetSnippetFiles(1, a:scopes, a:trigger))
 		let opts.name_prefix = matchstr(f, '\v[^/]+\ze/snippets') . ' ' . opts.name_prefix
 		if opts.type == 'snippets'
-			for [trigger, name, contents, guard] in cached_file_contents#CachedFileContents(f, s:c.read_snippets_cached, 0)
+			let [snippets, extension] = cached_file_contents#CachedFileContents(f, s:c.read_snippets_cached, 0)
+			for [trigger, name, contents, guard] in snippets
 				if trigger !~ escape(triggerR,'~') | continue | endif
 				if snipMate#EvalGuard(guard)
 					call snipMate#SetByPath(a:result, [trigger, opts.name_prefix.' '.name], contents)
 				endif
 			endfor
+			call extend(extra_scopes, extension)
 		elseif opts.type == 'snippet'
 			call snipMate#SetByPath(a:result, [opts.trigger, opts.name_prefix.' '.opts.name], funcref#Function('return readfile('.string(f).')'))
 		else
 			throw "unexpected"
 		endif
 	endfor
+	if !empty(extra_scopes)
+		call snipMate#DefaultPool(extra_scopes, a:trigger, a:result)
+	endif
 endf
 
 " return a dict of snippets found in runtimepath matching trigger
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index 4043191a..3ac9f5c4 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -1,7 +1,6 @@
 *snipMate.txt*  Plugin for using TextMate-style snippets in Vim.
 
 snipMate                                       *snippet* *snippets* *snipMate*
-Last Change: December 27, 2009
 
 |snipMate-installation|  Installation
 |snipMate-description|   Description
@@ -306,6 +305,15 @@ TextMates's functionality, use the |system()| function. E.g.: >
 will insert the current date, assuming you are on a Unix system. Note that you
 can also (and should) use |strftime()| for this example.
 
+                                                            *snipMate-extends*
+Borrowing from UltiSnips, .snippets files can also contain an extends
+directive, for example: >
+
+ extends html, javascript, css
+
+will tell SnipMate to also read html, javascript, and css snippets.
+
+
 Filename([{expr}] [, {defaultText}])             *snipMate-filename* *Filename()*
 
 Since the current filename is used often in snippets, a default function
@@ -420,6 +428,15 @@ Perhaps some of these features will be added in a later release.
 ==============================================================================
 CHANGELOG                                                  *snipMate-changelog*
 
+0.86 - 2013-06-15
+-----------------
+* Use more idiomatic <Plug> maps
+
+* Fix disappearing variables bug (hpesoj)
+* Fix cursor position bug when a variable is on the same line as the stop
+* Fix undo point creation causing problems with Supertab
+* Fix bug where SnipMate would use a typed trigger as a regular expression
+
 0.85 - 2013-04-03
 -----------------
 
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 0ae33584..97b282c9 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -1,6 +1,6 @@
 " File:          snipMate.vim
 " Author:        Michael Sanders
-" Version:       0.85
+" Version:       0.86
 " Description:   snipMate.vim implements some of TextMate's snippets features in
 "                Vim. A snippet is a piece of often-typed text that you can
 "                insert into your document using a trigger word followed by a "<tab>".
@@ -56,30 +56,15 @@ let s:snipMate['get_snippets'] = get(s:snipMate, 'get_snippets', funcref#Functio
 " snippets. You can replace it with your own implementation. Defaults to all
 " directories in &rtp/snippets/*
 let s:snipMate['snippet_dirs'] = get(s:snipMate, 'snippet_dirs', funcref#Function('return split(&runtimepath,",")'))
+if type(s:snipMate['snippet_dirs']) == type([])
+	call map(s:snipMate['snippet_dirs'], 'expand(v:val)')
+endif
 
 " _ is default scope added always
 "
 " &ft honors multiple filetypes and syntax such as in set ft=html.javascript syntax=FOO
 let s:snipMate['get_scopes'] = get(s:snipMate, 'get_scopes', funcref#Function('return split(&ft,"\\.")+[&syntax, "_"]'))
 
-if !exists('snippets_dir')
-	let snippets_dir = substitute(globpath(&rtp, 'snippets/'), "\n", ',', 'g')
-endif
-
-" Processes a single-snippet file; optionally add the name of the parent
-" directory for a snippet with multiple matches.
-fun! s:ProcessFile(file, ft, ...)
-	let keyword = fnamemodify(a:file, ':t:r')
-	if keyword  == '' | return | endif
-	try
-		let text = join(readfile(a:file), "\n")
-	catch /E484/
-		echom "Error in snipMate.vim: couldn't read file: ".a:file
-	endtry
-	return a:0 ? MakeSnip(a:ft, a:1, text, keyword)
-			\  : MakeSnip(a:ft, keyword, text)
-endf
-
 " dummy for compatibility - will be removed
 " moving to autoload to improve loading speed and debugging
 fun! TriggerSnippet()
diff --git a/sources_non_forked/vim-snipmate/syntax/snippets.vim b/sources_non_forked/vim-snipmate/syntax/snippets.vim
index 169802f0..f5646243 100644
--- a/sources_non_forked/vim-snipmate/syntax/snippets.vim
+++ b/sources_non_forked/vim-snipmate/syntax/snippets.vim
@@ -6,10 +6,11 @@ syn match tabStop '\$\d\+'
 syn match snipEscape '\\\\\|\\`'
 syn match snipCommand '\%(\\\@<!\%(\\\\\)*\)\@<=`.\{-}\%(\\\@<!\%(\\\\\)*\)\@<=`'
 syn match snippet '^snippet.*' contains=multiSnipText,snipKeyword
+syn match snippet '^extends.*' contains=snipKeyword
 syn match snippet '^guard\s\+.*' contains=multiSnipText,snipKeyword
 syn match multiSnipText '\S\+ \zs.*' contained
-syn match snipKeyword '^snippet'me=s+8 contained
-syn match snipError "^[^#s\t].*$"
+syn match snipKeyword '^(snippet|extends)'me=s+8 contained
+syn match snipError "^[^#se\t].*$"
 
 hi link snippet       Identifier
 hi link snipComment   Comment
diff --git a/sources_non_forked/vim-snippets/AUTHORS b/sources_non_forked/vim-snippets/AUTHORS
index 22a32290..c5c68c6a 100644
--- a/sources_non_forked/vim-snippets/AUTHORS
+++ b/sources_non_forked/vim-snippets/AUTHORS
@@ -10,6 +10,7 @@ Elliot Murphy
 Eustaquio Rangel
 Henrik Nyh
 Honza Pokorny
+Iuri Fernandes Queiroz
 Jakub Nawalaniec
 James F. Herdman
 Jon Bernard
@@ -38,6 +39,7 @@ Dmitry Dementev
 Travis Holton
 Chrisyue
 Erik Westrup
+Matt Deacalion Stevens
 
 TODO: add contributors from github.com/SirVer/Ultisnip having contributed to
 github.com/SirVer/Ultisnip/UltiSnips/* files
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 1c949785..35eac1bc 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -50,6 +50,49 @@ of the snippets by setting the "always_use_first_snippet" option to 1.
 If you have VimL only (vim without python support) your best option is using
 garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
+
+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 ..
+```
+
+If you're not satisfied with these defaults, open a ticket that we implement
+aliasing. Then you can remap "else" to "el" or the like.
+
+
+Don't add stupid placeholder default texts like
+```
+if (${1:condition}){
+  ${2:some code here}
+}
+```
+instead use:
+
+```
+if (${1}){
+  ${2}
+}
+```
+
+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
+
+Open questions:
+What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
+What about wh(ile), which trigger?
+Discuss at: https://github.com/honza/vim-snippets/issues/230
+
+
 Related repositories
 ====================
 We also encourage people to maintain sets of snippets for particular use cases
@@ -63,10 +106,11 @@ so that all users can benefit from them.  People can list their snippet reposito
 Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
 
-## If you believe in the success of vim-snipmate
-then you may also want to have a look at [vim-git-wiki](http://github.com/MarcWeber/vim-git-wiki).
-If you contribute to this git based wiki editable by Vim we have a chance
-of making it official at www.vim.org.
+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
 ================
@@ -86,19 +130,23 @@ add snippets/ruby-1.9.snippets (1.9 only)
 
 then configure github.com/garbas/vim-snipmate this way:
 
-    let g:snipMate = {}
-    let g:snipMate.scope_aliases = {}
-    let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
+
+```vim
+let g:snipMate = {}
+let g:snipMate.scope_aliases = {}
+let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
+```
 
 or github.com/MarcWeber/UltiSnips this way:
 
 
-    let g:UltiSnips = {}
-
-    let g:UltiSnips.snipmate_ft_filter = {
-                \ 'default' : {'filetypes': ["FILETYPE"] },
-                \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
+```vim
+let g:UltiSnips = {}
 
+let g:UltiSnips.snipmate_ft_filter = {
+            \ 'default' : {'filetypes': ["FILETYPE"] },
+            \ 'ruby'    : {'filetypes': ["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.
@@ -129,6 +177,8 @@ vim-snippets is not like the "linux kernel".
 * Ruby - [taq](http://github.com/taq)
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
+* Falcon - [steveno](https://github.com/steveno)
+* Elixir - [iurifq](https://github.com/iurifq)
 
 Contributing notes
 ------------------
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
index 8f347f1f..68d40349 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
@@ -1,75 +1,83 @@
 # From the TextMate bundle
+# with some modification
 
 snippet fun "Function" b
-${1:name} = (${2:args}) ->
+${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)" b
-${1:(${2:args}) }=>
-	${0:# body...}
+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
+snippet if "If"
 if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ife "If .. Else" b
+snippet ife "If .. Else"
 if ${1:condition}
 	${2:# body...}
 else
 	${3:# body...}
 endsnippet
 
-snippet elif "Else if" b
+snippet eif "Else if" b
 else if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ifte "Ternary if" b
+snippet ifte "Ternary if"
 if ${1:condition} then ${2:value} else ${3:other}
 endsnippet
 
-snippet unl "Unless" b
+snippet unl "Unless"
 ${1:action} unless ${2:condition}
 endsnippet
 
-snippet fora "Array Comprehension" b
+snippet fora "Array Comprehension"
 for ${1:name} in ${2:array}
 	${0:# body...}
 endsnippet
 
-snippet foro "Object Comprehension" b
+snippet foro "Object Comprehension"
 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}]${4: by ${5:step}}
+snippet forr "Range Comprehension (inclusive)"
+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}]${4: by ${5:step}}
+snippet forrex "Range Comprehension (exclusive)"
+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
+snippet swi "Switch"
 switch ${1:object}
 	when ${2:value}
-		${0:# body...}
+		${3:# body...}
+	else
+		$0
+endsnippet
+
+snippet swit "Switch when .. then"
+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}${2: extends ${3:Ancestor}}
+class ${1:ClassName}`!p snip.rv = " extends " if t[2] else ""`${2:Ancestor}
 
-	${4:constructor: (${5:args}) ->
-		${6:# body...}}
-	$7
+	${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
+snippet try "Try .. Catch"
 try
 	$1
 catch ${2:error}
@@ -80,7 +88,7 @@ snippet req "Require" b
 ${1/^'?(\w+)'?$/\L$1\E/} = require(${1:'${2:sys}'})
 endsnippet
 
-snippet # "Interpolated Code"
+snippet # "Interpolated Code" i
 #{$1}$0
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/d.snippets b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
index 8ed9b417..7f38c6d8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/d.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
@@ -126,7 +126,7 @@ else
 }
 endsnippet
 
-snippet elif "else if (elif)" b
+snippet eif "else if (elif)" b
 else if(${1:/*condition*/})
 {
     ${VISUAL}${0:/*code*/}
@@ -576,7 +576,7 @@ snippet module "New module (module)" b
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-module ${2}.`!v Filename('$1', 'name')`;
+module ${2}.`!v vim_snippets#Filename('$1', 'name')`;
 
 
 ${3}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/django.snippets b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
index 59b77c57..553babab 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/django.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
@@ -76,7 +76,7 @@ snippet if
 {% endif %}
 endsnippet
 
-snippet else
+snippet el
 {% else %}
   ${1}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index c6b201ea..88f71791 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -263,7 +263,7 @@ snippet st "submit_tag"
 `!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)"
+snippet el "else (ERB)"
 <% else %>
   
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
index eb7b2c62..99f947f8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
@@ -1,13 +1,13 @@
-snippet if "if ... then ... else ..."
+snippet ife "if ... then ... else ..."
 if ${1:condition}
    then ${2:expression}
    else ${3:expression}
 endsnippet
 
 snippet case "case ... of ..."
-case ${1:expression} of
-     ${2:pattern} -> ${3:expression}
-     ${4:pattern} -> ${5:expression}
+case ${1} of
+     ${2} -> ${3}
+     ${4} -> ${5}
 endsnippet
 
 snippet :: "Type signature"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
new file mode 100644
index 00000000..1f77ad7b
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
@@ -0,0 +1,31 @@
+# more can be found in snippets/html_minimal.snippets
+# these UltiSnips override snippets because nested placeholders are being used
+
+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/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 6e1b3ffe..617c1616 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -59,7 +59,7 @@ default:
 	$0
 endsnippet
 
-snippet elif "else if" b
+snippet eif "else if" b
 else if ($1)`!p nl(snip)`{
 	$0
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index e4e7f7ab..7eb18d77 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -50,12 +50,19 @@ function ${1:function_name} (${2:argument}) {
 }
 endsnippet
 
+# for one line if .. else you usually use a ? b : c
 snippet ife "if ___ else"
-if (${1:true}) {$0} else{};
+if (${1}) {
+	{$2}
+} else {
+	{$3}
+};
 endsnippet
 
 snippet if "if"
-if (${1:true}) {$0};
+if (${1}) {
+	{$2}
+};
 endsnippet
 
 snippet timeout "setTimeout function"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
index 8aefef3a..14926c89 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
@@ -4,17 +4,17 @@ endsnippet
 
 snippet open "open"
 let open ${1:module} in
-${2:e}
+${2}
 endsnippet
 
 snippet try "try"
-try ${1:e}
+try ${1}
 with ${2:Not_found} -> ${3:()}
 endsnippet
 
 snippet ref "ref"
-let ${1:name} = ref ${2:val} in
-${3:e}
+let ${1} = ref ${2} in
+${3}
 endsnippet
 
 snippet matchl "pattern match on a list"
@@ -24,88 +24,83 @@ match ${1:list} with
 endsnippet
 
 snippet matcho "pattern match on an option type"
-match ${1:x} with
-| Some(${2:y}) -> ${3:()}
+match ${1} with
+| Some(${2}) -> ${3:()}
 | None -> ${4:()}
 endsnippet
 
 snippet fun "anonymous function"
-(fun ${1:x} -> ${2:x})
+(fun ${1} -> ${2})
 endsnippet
 
 snippet cc "commment"
-(* ${1:comment} *)
+(* ${1} *)
 endsnippet
 
 snippet let "let .. in binding"
-let ${1:x} = ${2:v} in
-${3:e}
+let ${1} = ${2} in
+${3}
 endsnippet
 
 snippet lr "let rec"
-let rec ${1:f} =
-  ${2:expr}
+let rec ${1} =
+  ${2}
 endsnippet
 
-snippet if "if"
-if ${1:(* condition *)} then
-  ${2:(* A *)}
+snippet ife "if"
+if ${1} then
+  ${2}
 else
-  ${3:(* B *)}
+  ${3}
 endsnippet
 
-snippet If "If"
-if ${1:(* condition *)} then
-  ${2:(* A *)}
+snippet if "If"
+if ${1} then
+  ${2}
 endsnippet
 
 snippet while "while"
-while ${1:(* condition *)} do
-  ${2:(* A *)}
+while ${1} do
+  ${2}
 done
 endsnippet
 
 snippet for "for"
 for ${1:i} = ${2:1} to ${3:10} do
-  ${4:(* BODY *)}
+  ${4}
 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}
+match ${1} with
+| ${2} -> ${3}
 endsnippet
 
 snippet class "class"
 class ${1:name} = object
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet obj "obj"
 object
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet Obj "object"
 object (self)
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet {{ "object functional update"
-{< ${1:x} = ${2:y} >}
+{< ${1} = ${2} >}
 endsnippet
 
 snippet beg "beg"
 begin
-  ${1:block}
+  ${1}${VISUAL}
 end
 endsnippet
 
@@ -115,19 +110,19 @@ endsnippet
 
 snippet mod "module - no signature"
 module ${1:(* Name *)} = struct
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
 snippet Mod "module with signature"
 module ${1:(* Name *)} : ${2:(* SIG *)} = struct
-  ${3:(* BODY *)}
+  ${3}
 end
 endsnippet
 
 snippet sig "anonymous signature"
 sig
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
@@ -137,32 +132,32 @@ endsnippet
 
 snippet func "define functor - no signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) = struct
-  ${4:(* BODY *)}
+  ${4}
 end
 endsnippet
 
 snippet Func "define functor - with signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
-  ${5:(* BODY *)}
+  ${5}
 end
 endsnippet
 
 snippet mot "Declare module signature"
 module type ${1:(* Name *)} = sig
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
 snippet module "Module with anonymous signature"
 module ${1:(* Name *)} : sig
-  ${2:(* SIGNATURE *)}
+  ${2}
 end = struct
-  ${3:(* BODY *)}
+  ${3}
 end
 endsnippet
 
 snippet oo "odoc"
-(** ${1:odoc} *)
+(** ${1} *)
 endsnippet
 
 snippet qt "inline qtest"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 40461d29..3245568e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -11,8 +11,8 @@ endsnippet
 
 snippet do "do"
 do {
-	${2:// code... }
-} while (${1:/* condition */});"
+	${2}
+} while (${1});"
 endsnippet
 
 snippet doc_f "doc_f"
@@ -37,21 +37,21 @@ interface ${1:someClass}
 } // END interface $1"
 endsnippet
 
-snippet else "else"
+snippet el "else"
 else {
-	${1:// code...}
+	${1}
 }
 endsnippet
 
 snippet for "for"
 for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4:// code...}
+	${4}
 }
 endsnippet
 
 snippet foreachk "foreachk"
 foreach ($${1:variable} as $${2:key} => $${3:value}){
-	${4:// code...}
+	${4}
 }
 endsnippet
 
@@ -60,8 +60,8 @@ $_GET['${1}']${2}
 endsnippet
 
 snippet if "if"
-if (${1:/* condition */}) {
-	${2:// code...}
+if (${1}) {
+	${2}
 }
 endsnippet
 
@@ -210,9 +210,9 @@ endsnippet
 
 snippet ife "if else"
 if (${1:/* condition */}) {
-    ${2:// code...}
+    ${2}
 } else {
-    ${3:// code...}
+    ${3}
 }
 $0
 endsnippet
@@ -227,7 +227,7 @@ class $1
 {
     public function ${3:__construct}(${4:$options})
     {
-        ${4:// code}
+        ${4}
     }
 }
 $0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
index 71745101..88e0caaf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
@@ -1,61 +1,314 @@
-
+# -*- coding: utf-8 -*-
 
 ###########################################################################
 #                              General Stuff                              #
 ###########################################################################
+global !p
+import vim
+from os import path as ospath
+from string import Template
+import re
+from collections import Counter
+
+#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',
+              '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(char):
+    """
+    Detect char contains CJK character
+    
+    :param char: characters needs to be detect 
+    """
+    try:
+        CJK_RE.finditer(char).next()
+    except StopIteration:
+        return False
+    else:
+        return True
+
+def real_filename(filename):
+    """peal extension 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
+
+
+def rst_char_len(char):
+    """ 
+    return len of string which fit in rst
+    For instance:chinese "我" decode as only one character, 
+    However, the rst interpreter needs 2 "=" instead of 1.
+
+    :param: char needs to be count
+    """
+    return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
+
+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 xrange(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
+ 
+
+def complete(t, opts):
+    """
+    get options that start with t
+
+    :param t: query string
+    :param opts: list that needs to be completed
+
+    :return: a string that start with t
+    """
+    msg = "({0})"
+    if t:
+        opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+    if len(opts) == 1:
+        return opts[0]
+
+    if not len(opts):
+        msg = "{0}"
+    return msg.format("|".join(opts))
+
+endglobal
+
 snippet part "Part" b
-`!p snip.rv = len(t[1])*'#'`
+`!p snip.rv = rst_char_len(t[1])*'#'`
 ${1:Part name}
-`!p snip.rv = len(t[1])*'#'`
+`!p snip.rv = rst_char_len(t[1])*'#'`
 
 $0
 endsnippet
 
 snippet sec "Section" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'='`
+`!p snip.rv = rst_char_len(t[1])*'='`
 
 $0
 endsnippet
 
 snippet ssec "Subsection" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'-'`
+`!p snip.rv = rst_char_len(t[1])*'-'`
 
 $0
 endsnippet
 
 snippet sssec "Subsubsection" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'^'`
+`!p snip.rv = rst_char_len(t[1])*'^'`
 
 $0
 endsnippet
 
 snippet chap "Chapter" b
-`!p snip.rv = len(t[1])*'*'`
+`!p snip.rv = rst_char_len(t[1])*'*'`
 ${1:Chapter name}
-`!p snip.rv = len(t[1])*'*'`
+`!p snip.rv = rst_char_len(t[1])*'*'`
 
 $0
 endsnippet
 
 snippet para "Paragraph" b
 ${1:Paragraph name}
-`!p snip.rv = len(t[1])*'"'`
+`!p snip.rv = rst_char_len(t[1])*'"'`
 
 $0
 endsnippet
 
+snippet em "Emphasize string" i
+`!p
+# dirty but works with CJK charactor 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:lua}
+.. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
    ${2: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: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: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: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
+
+############
+#  Sphinx  #
+############
+
+snippet sid "SideBar" b
+.. sidebar:: ${1:SideBar Title}
+
+    ${2:SideBar Content}
+endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
index 63365890..306c7e10 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
@@ -25,7 +25,7 @@ endsnippet
 
 snippet if "if <condition> ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 end
 endsnippet
 
@@ -33,9 +33,9 @@ endsnippet
 
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 else
-	${3:# TODO}
+	${3}
 end
 endsnippet
 
@@ -43,11 +43,11 @@ endsnippet
 
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 elsif ${3:condition}
-	${4:# TODO}
+	${4}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -55,7 +55,7 @@ endsnippet
 
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -63,9 +63,9 @@ endsnippet
 
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	${2}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -73,11 +73,11 @@ endsnippet
 
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	${2}
 elsif ${3:condition}
-	${4:# TODO}
+	${4}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -85,7 +85,7 @@ endsnippet
 
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2: ${3:*args}}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -93,7 +93,7 @@ endsnippet
 
 snippet defi "def initialize ..."
 def initialize${1: ${2:*args}}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -101,23 +101,23 @@ endsnippet
 
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2: ${3:*args}}
-	${4:# TODO}
+	${4}
 rescue
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+(${1:from}..${2:to}).each { |${3:i}| ${4} }
 endsnippet
 
 
 
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -138,42 +138,42 @@ endsnippet
 
 
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3} }
 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:# TODO}
+	${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}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3} }
 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:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -194,56 +194,56 @@ endsnippet
 
 
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2} }
 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:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2} }
 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:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+${1:elements}.each { |${2:${1/s$//}}| ${3} }
 endsnippet
 
 
 
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -251,14 +251,14 @@ endsnippet
 
 snippet each_?s(lice)? "<array>.each_slice(n) do |slice| <block> end"
 each_slice(${1:2}) do |${2:slice}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet Each_?s(lice)? "<array>.each_slice(n) { |slice| <block> }"
-each_slice(${1:2}) { |${2:slice}| ${3:# TODO} }
+each_slice(${1:2}) { |${2:slice}| ${3} }
 endsnippet
 
 
@@ -273,7 +273,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -288,7 +288,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -303,7 +303,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -318,7 +318,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -333,7 +333,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -348,7 +348,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -364,7 +364,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3:# TODO} }$0
+`},${2:i}| ${3} }$0
 endsnippet
 
 
@@ -379,7 +379,7 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -387,14 +387,14 @@ endsnippet
 
 
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3} }
 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:# TODO}
+	${0}
 end
 endsnippet
 
@@ -424,26 +424,24 @@ snippet "(\S+)\.Index" ".index do |item| ... end" r
 end
 endsnippet
 
-
-
-snippet do "do |<key>| ... end" i
-do ${1:|${2:key}|}
-	$0
-end
-endsnippet
-
-
-
-snippet Do "do ... end" i
+# comments about do and dov see snippets/ruby.snippets
+snippet do "do ... end" i
 do
 	$0
 end
 endsnippet
 
+snippet dov "do |<key>| ... end" i
+do |${0:v}|
+	$1
+end
+endsnippet
+
+
 
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -451,7 +449,7 @@ endsnippet
 
 snippet Until "begin ... end until <expression>"
 begin
-	${0:# TODO}
+	${0}
 end until ${1:expression}
 endsnippet
 
@@ -459,7 +457,7 @@ endsnippet
 
 snippet while "while <expression> ... end"
 while ${1:expression}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -467,7 +465,7 @@ endsnippet
 
 snippet While "begin ... end while <expression>"
 begin
-	${0:# TODO}
+	${0}
 end while ${1:expression}
 endsnippet
 
@@ -493,9 +491,9 @@ endsnippet
 
 snippet begin "begin ... rescue ... end"
 begin
-	${1:# TODO}
+	${1}
 rescue
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
index 2cb1f347..c5ae37ba 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
@@ -16,14 +16,14 @@ foreach ${1:var} ${2:\$list} {
 endsnippet
 
 snippet if "if... (if)" b
-if {${1:condition}} {
+if {${1}} {
 	${2}
 }
 
 endsnippet
 
 snippet proc "proc... (proc)" b
-proc ${1:name} {${2:args}} \
+proc ${1} {${2}} \
 {
 	${3}
 }
@@ -41,7 +41,7 @@ switch ${1:-exact} -- ${2:\$var} {
 endsnippet
 
 snippet while "while... (while)" b
-while {${1:condition}} {
+while {${1}} {
 	${2}
 }
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
index f4c37f07..5655c4b1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
@@ -25,30 +25,30 @@ endsnippet
 
 snippet f
 fun ${1:function_name}(${2})
-	${3:" code}
+	${3}
 endf
 endsnippet
 
 snippet for
-for ${1:needle} in ${2:haystack}
-	${3:" code}
+for ${1} in ${2}
+	${3}
 endfor
 endsnippet
 
 snippet wh
-while ${1:condition}
-	${2:" code}
+while ${1}
+	${2}
 endw
 endsnippet
 
 snippet if
-if ${1:condition}
-	${2:" code}
+if ${1}
+	${2}
 endif
 endsnippet
 
 snippet ife
-if ${1:condition}
+if ${1}
 	${2}
 else
 	${3}
diff --git a/sources_non_forked/vim-snippets/autoload/vim_snippets.vim b/sources_non_forked/vim-snippets/autoload/vim_snippets.vim
new file mode 100644
index 00000000..061f171e
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index c7297480..6204aee5 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -16,17 +16,17 @@ snippet lorem
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	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/>.
 
@@ -34,17 +34,17 @@ snippet GPL2
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	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 
+	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/>.
 
@@ -52,35 +52,35 @@ snippet LGPL2
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	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/>.
-	
+
 	${3}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	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 
+	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/>.
 
@@ -89,7 +89,7 @@ snippet BSD2
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	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
@@ -97,7 +97,7 @@ snippet BSD2
 	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
@@ -108,9 +108,9 @@ snippet BSD2
 	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 
+
+
+	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 expressedor implied, of $2.
 
@@ -119,7 +119,7 @@ snippet BSD3
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	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
@@ -130,7 +130,7 @@ snippet BSD3
 	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
@@ -147,7 +147,7 @@ snippet BSD4
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	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
@@ -161,7 +161,7 @@ snippet BSD4
 	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
@@ -177,17 +177,17 @@ snippet BSD4
 snippet MIT
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	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 
+	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.
@@ -200,13 +200,13 @@ snippet MIT
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${2:copyright holder}
-	
+
 	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.
@@ -214,14 +214,14 @@ snippet APACHE
 	limitations under the License.
 
 	${3}
-snippet BEERWARE 
+snippet BEERWARE
 	${2:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${3:copyright holder}
-	
+
 	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
 	${1:`g:snips_author`} 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 
+	this stuff is worth it, you can buy me a beer or coffee in return
 
 	${4}
 
diff --git a/sources_non_forked/vim-snippets/snippets/actionscript.snippets b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
index af9611c3..5385d115 100644
--- a/sources_non_forked/vim-snippets/snippets/actionscript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
@@ -2,22 +2,22 @@ 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} ${3:extends } {
@@ -109,17 +109,17 @@ snippet try
 # For Loop (same as c.snippet)
 snippet for for (..) {..}
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}
 # Custom For Loop
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 snippet el
 	else {
@@ -131,7 +131,7 @@ snippet t
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
-		${4:/* code */}
+		${4}
 	}
 # FlxSprite (usefull when using the flixel library)
 snippet FlxSprite
@@ -144,13 +144,13 @@ snippet FlxSprite
 			public function $1(${3: X:Number, Y:Number}):void
 			{
 				super(X,Y);
-				${4: //code...}
+				${4}
 			}
 
 			override public function update():void
 			{
 				super.update();
-				${5: //code...}
+				${5}
 			}
 		}
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/apache.snippets b/sources_non_forked/vim-snippets/snippets/apache.snippets
index a9e53e19..6f0c8873 100644
--- a/sources_non_forked/vim-snippets/snippets/apache.snippets
+++ b/sources_non_forked/vim-snippets/snippets/apache.snippets
@@ -6,7 +6,7 @@ snippet dir
 		Order Deny,Allow
 		Deny from All
 	</Directory>
-# <FilesMatch>   
+# <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
 		${2}
diff --git a/sources_non_forked/vim-snippets/snippets/autoit.snippets b/sources_non_forked/vim-snippets/snippets/autoit.snippets
index 690018ce..c266e339 100644
--- a/sources_non_forked/vim-snippets/snippets/autoit.snippets
+++ b/sources_non_forked/vim-snippets/snippets/autoit.snippets
@@ -5,17 +5,17 @@ snippet if
 snippet el
 	Else
 		${1}
-snippet elif
+snippet eif
 	ElseIf ${1:condition} Then
 		${2:; True code}
 # If/Else block
-snippet ifel
+snippet ife
 	If ${1:condition} Then
 		${2:; True code}
 	Else
 		${3:; Else code}
 	EndIf
-# If/ElseIf/Else block
+# If/ElseIf/Else block - because there is eif this is not really neccessary
 snippet ifelif
 	If ${1:condition 1} Then
 		${2:; True code}
diff --git a/sources_non_forked/vim-snippets/snippets/c.snippets b/sources_non_forked/vim-snippets/snippets/c.snippets
index de6d6a93..75780243 100644
--- a/sources_non_forked/vim-snippets/snippets/c.snippets
+++ b/sources_non_forked/vim-snippets/snippets/c.snippets
@@ -14,13 +14,13 @@ snippet mainn
 		return 0;
 	}
 ##
-## Preprocessor 
+## Preprocessor
 # #include <...>
 snippet inc
 	#include <${1:stdio}.h>${2}
 # #include "..."
 snippet Inc
-	#include "${1:`Filename("$1.h")`}"${2}
+	#include "${1:`vim_snippets#Filename("$1.h")`}"${2}
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1
@@ -41,7 +41,7 @@ snippet #if
 	#endif
 # header include guard
 snippet once
-	#ifndef ${1:`toupper(Filename('$1_H', 'UNTITLED_H'))`}
+	#ifndef ${1:`toupper(vim_snippets#Filename('$1_H', 'UNTITLED_H'))`}
 
 	#define $1
 
@@ -53,7 +53,7 @@ snippet once
 # if
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # else
 snippet el
@@ -63,8 +63,11 @@ snippet el
 # else if
 snippet elif
 	else if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
+# ifi
+snippet ifi
+	if (${1:/* condition */}) ${2};${3}
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}
@@ -94,22 +97,22 @@ snippet case
 # for
 snippet for
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # for (custom)
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}${6}
 # while
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # do... while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});${3}
 ##
 ## Functions
@@ -117,7 +120,7 @@ snippet do
 snippet fun
 	${1:void} ${2:function_name}(${3})
 	{
-		${4:/* code */}
+		${4}
 	}${5}
 # function declaration
 snippet fund
@@ -129,14 +132,14 @@ snippet td
 	typedef ${1:int} ${2:MyCustomType};${3}
 # struct
 snippet st
-	struct ${1:`Filename('$1_t', 'name')`} {
+	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
 		${2:/* data */}
 	}${3: /* optional variable list */};${4}
 # typedef struct
 snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
-	} ${1:`Filename('$1_t', 'name')`};${4}
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};${4}
 # typedef enum
 snippet tde
 	typedef enum {
@@ -230,5 +233,5 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
diff --git a/sources_non_forked/vim-snippets/snippets/chef.snippets b/sources_non_forked/vim-snippets/snippets/chef.snippets
index 51036135..d44f535e 100644
--- a/sources_non_forked/vim-snippets/snippets/chef.snippets
+++ b/sources_non_forked/vim-snippets/snippets/chef.snippets
@@ -141,7 +141,7 @@ snippet svn
 		${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:#}${23:action :export} # Export the source, excluding or removing any version control artifacts
@@ -159,7 +159,7 @@ snippet git
 		${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:#}${25:action :export} # Export the source, excluding or removing any version control artifacts
@@ -197,7 +197,7 @@ snippet deploy
 		${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:#}${65::rollback} # Rollback the application to the previous release
diff --git a/sources_non_forked/vim-snippets/snippets/clojure.snippets b/sources_non_forked/vim-snippets/snippets/clojure.snippets
index e247debf..59867b75 100644
--- a/sources_non_forked/vim-snippets/snippets/clojure.snippets
+++ b/sources_non_forked/vim-snippets/snippets/clojure.snippets
@@ -43,7 +43,7 @@ snippet if
 	(if ${1:test-expr}
 	  ${2:then-expr}
 	  ${3:else-expr})
-snippet if-let 
+snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
 		(${4:else-expr}))
diff --git a/sources_non_forked/vim-snippets/snippets/cmake.snippets b/sources_non_forked/vim-snippets/snippets/cmake.snippets
index 26aa9ac9..0c3a2157 100644
--- a/sources_non_forked/vim-snippets/snippets/cmake.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cmake.snippets
@@ -39,7 +39,7 @@ snippet link
 	TARGET_LINK_LIBRARIES(${1:bin}
 		${2:somelib}
 	)
-	
+
 snippet bin
 	ADD_EXECUTABLE(${1:bin})
 
@@ -52,7 +52,7 @@ snippet dep
 	)
 
 snippet props
-	SET_TARGET_PROPERTIES(${1:target} 
-		${2:PROPERTIES} ${3:COMPILE_FLAGS} 
+	SET_TARGET_PROPERTIES(${1:target}
+		${2:PROPERTIES} ${3:COMPILE_FLAGS}
 		${4:"-O3 -Wall -pedantic"}
 	)
diff --git a/sources_non_forked/vim-snippets/snippets/coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee.snippets
index 11c82e7d..8e2f20e0 100644
--- a/sources_non_forked/vim-snippets/snippets/coffee.snippets
+++ b/sources_non_forked/vim-snippets/snippets/coffee.snippets
@@ -35,19 +35,19 @@ snippet bfun
 		${2:# body...}
 # Class
 snippet cla class ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 snippet cla class .. constructor: ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		constructor: (${2:args}) ->
 			${3}
 
 		${4}
 snippet cla class .. extends ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		${3}
 snippet cla class .. extends .. constructor: ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		constructor: (${3:args}) ->
 			${4}
 
@@ -63,7 +63,7 @@ snippet ife
 	else
 		${3:# body...}
 # Else if
-snippet elif
+snippet eif
 	else if ${1:condition}
 		${2:# body...}
 # Ternary If
diff --git a/sources_non_forked/vim-snippets/snippets/cpp.snippets b/sources_non_forked/vim-snippets/snippets/cpp.snippets
index c3e19fe9..e95d3534 100644
--- a/sources_non_forked/vim-snippets/snippets/cpp.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cpp.snippets
@@ -64,11 +64,11 @@ snippet fr
 # mutable
 snippet mu
 	mutable
-## 
+##
 ## Class
 # class
 snippet cl
-	class ${1:`Filename('$1', 'name')`} 
+	class ${1:`vim_snippets#Filename('$1', 'name')`}
 	{
 	public:
 		$1(${2});
@@ -79,12 +79,12 @@ snippet cl
 	};
 # member function implementation
 snippet mfun
-	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5:/* code */}
+	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
+		${5}
 	}
 # namespace
 snippet ns
-	namespace ${1:`Filename('', 'my')`} {
+	namespace ${1:`vim_snippets#Filename('', 'my')`} {
 		${2}
 	} /* namespace $1 */
 ##
@@ -97,16 +97,16 @@ snippet cin
 	std::cin >> ${1};${2}
 ##
 ## Iteration
-# for i 
+# for i
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 
 # foreach
 snippet fore
 	for (${1:auto} ${2:i} : ${3:container}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # iterator
 snippet iter
@@ -123,9 +123,9 @@ snippet itera
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3:/* code */}}${4}
+	[${1}](${2}){${3}}${4}
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
-		${3:/* code */}
+		${3}
 	}${4}
diff --git a/sources_non_forked/vim-snippets/snippets/cs.snippets b/sources_non_forked/vim-snippets/snippets/cs.snippets
index 725f8b7d..9a915f09 100644
--- a/sources_non_forked/vim-snippets/snippets/cs.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cs.snippets
@@ -1,12 +1,12 @@
 # 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) 
+# Most snippets on elements (i.e. classes, properties)
 # follow suffix conventions. The order of suffixes to a snippet
 # is fixed.
 #
@@ -55,13 +55,13 @@
 # * Events
 #
 # Feedback is welcome!
-# 
+#
 # entry point
 snippet sim
 	public static int Main(string[] args) {
 		${1}
 		return 0;
-	} 
+	}
 snippet simc
 	public class Application {
 		public static int Main(string[] args) {
@@ -73,13 +73,13 @@ snippet simc
 snippet if
 	if (${1}) {
 		${2}
-	} 
+	}
 snippet el
 	else {
 		${1}
-	} 
+	}
 snippet ifs
-	if (${1}) 
+	if (${1})
 		${2}
 # ternary conditional
 snippet t
@@ -116,49 +116,49 @@ snippet each
 	}
 # interfaces
 snippet interface
-	public interface ${1:`Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet if+
-	public interface ${1:`Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # class bodies
 snippet class
-	public class ${1:`Filename()`} {
+	public class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls
-	${2:public} class ${1:`Filename()`} {
+	${2:public} class ${1:`vim_snippets#Filename()`} {
 		${3}
 	}
 snippet cls+
-	public class ${1:`Filename()`} {
+	public class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls+^
-	public static class ${1:`Filename()`} {
+	public static class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls&
-	internal class ${1:`Filename()`} {
+	internal class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls&^
-	internal static class ${1:`Filename()`} {
+	internal static class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls|
-	protected class ${1:`Filename()`} {
+	protected class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls|%
-	protected abstract class ${1:`Filename()`} {
+	protected abstract class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # constructor
 snippet ctor
-	public ${1:`Filename()`}() {
+	public ${1:`vim_snippets#Filename()`}() {
 		${2}
 	}
 # properties - auto properties by default.
@@ -342,7 +342,7 @@ snippet ms-
 	}
 # structure
 snippet struct
-	public struct ${1:`Filename()`} {
+	public struct ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # enumeration
diff --git a/sources_non_forked/vim-snippets/snippets/dart.snippets b/sources_non_forked/vim-snippets/snippets/dart.snippets
index 6f0b8ac5..a7452002 100644
--- a/sources_non_forked/vim-snippets/snippets/dart.snippets
+++ b/sources_non_forked/vim-snippets/snippets/dart.snippets
@@ -9,7 +9,7 @@ snippet so
 	${2}
 snippet main
 	static void main() {
-	  ${1:/* code */}
+	  ${1}
 	}
 snippet st
 	static ${1}
@@ -22,9 +22,9 @@ snippet br
 snippet th
 	throw ${1}
 snippet cl
-	class ${1:`Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet in
-	interface ${1:`Filename("", "untitled")`} ${2}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet imp
 	implements ${1}
 snippet ext
@@ -57,15 +57,15 @@ snippet for
 	}
 snippet fore
 	for (final ${2:item} in ${1:itemList}) {
-	  ${3:/* code */}
+	  ${3}
 	}
 snippet wh
 	while (${1:/* condition */}) {
-	  ${2:/* code */}
+	  ${2}
 	}
 snippet dowh
 	do {
-	  ${2:/* code */}
+	  ${2}
 	} while (${1:/* condition */});
 snippet as
 	assert(${1:/* condition */});
diff --git a/sources_non_forked/vim-snippets/snippets/django.snippets b/sources_non_forked/vim-snippets/snippets/django.snippets
index 8296cce2..5c72b2b9 100644
--- a/sources_non_forked/vim-snippets/snippets/django.snippets
+++ b/sources_non_forked/vim-snippets/snippets/django.snippets
@@ -73,16 +73,16 @@ snippet model
 	class ${1:ModelName}(models.Model):
 		"""${2:docstring}"""
 		${3}
-		
+
 		class Meta:
 			${4}
-		
+
 		def __unicode__(self):
 			${5}
-		
+
 		def save(self, force_insert=False, force_update=False):
 			${6}
-		
+
 		@models.permalink
 		def get_absolute_url(self):
 			return ('${7:view_or_url_name}' ${8})
@@ -90,9 +90,9 @@ snippet model
 snippet modeladmin
 	class ${1:ModelName}Admin(admin.ModelAdmin):
 		${2}
-	
+
 	admin.site.register($1, $1Admin)
-	
+
 snippet tabularinline
 	class ${1:ModelName}Inline(admin.TabularInline):
 		model = $1
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
new file mode 100644
index 00000000..50243a70
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -0,0 +1,122 @@
+snippet do
+	do
+		${1}
+	end
+snippet if if .. do .. end
+	if ${1} do
+		${2}
+	end
+
+snippet if if .. do: ..
+	if ${1:condition}, do: ${2}
+
+snippet ife if .. do .. else .. end
+	if ${1:condition} do
+		${2}
+	else
+		${3}
+	end
+
+snippet ife if .. do: .. else:
+	if ${1:condition}, do: ${2}, else: ${3}
+
+snippet unless unless .. do .. end
+	unless ${1} do
+		${2}
+	end
+
+snippet unless unless .. do: ..
+	unless ${1:condition}, do: ${2}
+
+snippet unlesse unless .. do .. else .. end
+	unless ${1:condition} do
+		${2}
+	else
+		${3}
+	end
+
+snippet unlesse unless .. do: .. else:
+	unless ${1:condition}, do: ${2}, else: ${3}
+
+snippet cond
+	cond do
+	${1} ->
+		${2}
+	end
+
+snippet case
+	case ${1} do
+	${2} ->
+		${3}
+	end
+
+snippet def
+	def ${1:name} do
+		${2}
+	end
+
+snippet defim
+	defimpl ${1:protocol_name}, for: ${2:data_type} do
+		${3}
+	end
+
+snippet defma
+	defmacro ${1:name} do
+		${2}
+	end
+
+snippet defmo
+	defmodule ${1:module_name} do
+		${2}
+	end
+
+snippet defp
+	defp ${1:name} do
+		${2}
+	end
+
+snippet defpr
+	defprotocol ${1:name}, [${2:function}]
+
+snippet defr
+	defrecord ${1:record_name}, ${2:fields}
+
+snippet doc
+	@doc """
+	${1}
+	"""
+
+snippet fn
+	fn(${1:args}) -> ${2} end
+
+snippet mdoc
+	@moduledoc """
+	${1}
+	"""
+
+snippet rec
+	receive do
+	${1} ->
+		${2}
+	end
+
+snippet req
+	require ${1:module_name}
+
+snippet imp
+	import ${1:module_name}
+
+snippet ali
+	alias ${1:module_name}
+
+snippet test
+	test "${1:test_name}" do
+		${2}
+	end
+
+snippet try try .. rescue .. end
+	try do
+		${1}
+	rescue
+		${2} -> ${3}
+	end
diff --git a/sources_non_forked/vim-snippets/snippets/erlang.snippets b/sources_non_forked/vim-snippets/snippets/erlang.snippets
index acc6fd19..cfad09a3 100644
--- a/sources_non_forked/vim-snippets/snippets/erlang.snippets
+++ b/sources_non_forked/vim-snippets/snippets/erlang.snippets
@@ -1,12 +1,12 @@
 # module and export all
 snippet mod
-	-module(${1:`Filename('', 'my')`}).
-	
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
+
 	-compile([export_all]).
-	
+
 	start() ->
 	    ${2}
-	
+
 	stop() ->
 	    ok.
 # define directive
@@ -66,7 +66,7 @@ snippet %p
 	%% @private
 # OTP application
 snippet application
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(application).
 
@@ -81,10 +81,10 @@ snippet application
 	    end.
 
 	stop(_State) ->
-	    ok.	
+	    ok.
 # OTP supervisor
 snippet supervisor
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(supervisor).
 
@@ -107,7 +107,7 @@ snippet supervisor
 	    {ok, {RestartStrategy, Children}}.
 # OTP gen_server
 snippet gen_server
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(gen_server).
 
@@ -157,4 +157,194 @@ snippet gen_server
 	%%%===================================================================
 	%%% Internal functions
 	%%%===================================================================
+# common_test test_SUITE
+snippet testsuite
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
+
+	-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/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index 592e490b..d99cf0b6 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -53,6 +53,8 @@ snippet ff
 	<%= form_for @${1:model} do |f| %>
 		${2}
 	<% end %>
+snippet ffi
+	<%= ${1:f}.input :${2:attribute} %>
 snippet ffcb
 	<%= ${1:f}.check_box :${2:attribute} %>
 snippet ffe
@@ -111,3 +113,13 @@ snippet slt
 	<%= stylesheet_link_tag ${1::all}, :cache => ${2:true} %>
 snippet sslt
 	<%= stylesheet_link_tag "${1}" %>
+snippet if
+	<% if ${1} %>
+		${2}
+	<% end %>
+snippet ife
+	<% if ${1} %>
+		${2}
+	<% else %>
+		${3}
+	<% end %>
diff --git a/sources_non_forked/vim-snippets/snippets/falcon.snippets b/sources_non_forked/vim-snippets/snippets/falcon.snippets
index 85fb918d..78257b6e 100644
--- a/sources_non_forked/vim-snippets/snippets/falcon.snippets
+++ b/sources_non_forked/vim-snippets/snippets/falcon.snippets
@@ -1,15 +1,15 @@
 snippet #!
 	#!/usr/bin/env falcon
 
-# Import	
+# Import
 snippet imp
 	import ${1:module}
 
 # Function
 snippet fun
-	function ${2:function_name}(${3})	
-		${4:/* code */}
-	end	
+	function ${2:function_name}(${3})
+		${4}
+	end
 
 # Class
 snippet class
@@ -17,35 +17,35 @@ snippet class
 		${3:/* members/methods */}
 	end
 
-# If 
+# If
 snippet if
 	if ${1:condition}
-		${2:/* code */}		
+		${2}
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2:/* code */}		
+		${2}
 	else
-	    ${1}	
+	    ${1}
 	end
 
-# If else if	
-snippet elif
+# If else if
+snippet eif
 	elif ${1:condition}
-		${2:/* code */}	        
+		${2}
 
 # Switch case
 snippet switch
 	switch ${1:expression}
 		case ${2:item}
 		case ${3:item}
-		default 
+		default
 	end
 
 # Select
-snippet select 
+snippet select
 	select ${1:variable}
 		case ${2:TypeSpec}
 		case ${3:TypeSpec}
@@ -55,17 +55,17 @@ snippet select
 # For/in Loop
 snippet forin
 	for ${1:element} in ${2:container}
-		${3:/* code */}
+		${3}
 	end
 
 # For/to Loop
 snippet forto
 	for ${1:lowerbound} to ${2:upperbound}
-		${3:/* code */}
+		${3}
 	end
 
 # While Loop
-snippet while 
+snippet while
 	while ${1:conidition}
-		${2:/* code */}	
+		${2}
 	end
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index c64db91f..c4aaf602 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -4,7 +4,7 @@ snippet ap
 # bool
 snippet bl
 	bool
-# byte 
+# byte
 snippet bt
 	byte
 # break
@@ -16,7 +16,7 @@ snippet ch
 # case
 snippet cs
 	case ${1:value}:
-		${2:/* code */}
+		${2}
 # const
 snippet c
 	const ${1:NAME} = ${2:0}
@@ -29,14 +29,14 @@ snippet co
 # continue
 snippet cn
 	continue
-# defer 
+# defer
 snippet df
 	defer ${1:func}()
 # defer recover
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${1:/* code */}
+			${1}
 		}
 	}()
 # gpl
@@ -57,20 +57,20 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
 # int
 snippet i
 	int
-# import 
+# import
 snippet im
 	import (
-		"${1:package}" 
+		"${1:package}"
 	)${2}
-# interface 
+# interface
 snippet in
 	interface{}
-# full interface snippet 
+# full interface snippet
 snippet inf
 	interface ${1:name} {
 		${2:/* methods */}
@@ -78,8 +78,8 @@ snippet inf
 # if condition
 snippet if
 	if ${1:/* condition */} {
-		${2:/* code */}
-	}${2}
+		${2}
+	}${3}
 # else snippet
 snippet el
 	else {
@@ -109,7 +109,7 @@ snippet f6
 # if else
 snippet ie
 	if ${1:/* condition */} {
-		${2:/* code */}
+		${2}
 	} else {
 		${3}
 	}
@@ -117,25 +117,25 @@ snippet ie
 # for loop
 snippet fo
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
-# function simple 
+# function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
-# function on receiver 
+# function on receiver
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5:/* code */}
+		${5}
 	}
 	${6}
 # log printf
@@ -147,42 +147,42 @@ snippet lp
 # make
 snippet mk
 	make(${1:[]string}, ${2:0})
-# map 
+# map
 snippet mp
 	map[${1:string}]${2:int}
 # main()
 snippet main
 	func main() {
-		${1:/* code */}
+		${1}
 	}
 	${2}
 # new
 snippet nw
 	new(${1:type})
-# panic 
+# panic
 snippet pn
 	panic("${1:msg}")
 # print
 snippet pr
 	fmt.Printf("%${1:s}\n", ${2:var})${3}
-# range 
+# range
 snippet rn
 	range ${1}
-# return 
+# return
 snippet rt
 	return ${1}
-# result 
+# result
 snippet rs
 	result
 # select
 snippet sl
 	select {
 	case ${1:v1} := <-${2:chan1}
-		${3:/* code */}
+		${3}
 	case ${4:v2} := <-${5:chan2}
-		${6:/* code */}
+		${6}
 	default:
-		${7:/* code */}
+		${7}
 	}
 # string
 snippet sr
@@ -193,19 +193,19 @@ snippet st
 		${2:/* data */}
 	}
 	${3}
-# switch 
+# switch
 snippet sw
 	switch ${1:var} {
 	case ${2:value1}:
-		${3:/* code */}
+		${3}
 	case ${4:value2}:
-		${5:/* code */}
+		${5}
 	default:
-		${6:/* code */}
+		${6}
 	}
 snippet sp
 	fmt.Sprintf("%${1:s}", ${2:var})${3}
-# true 
+# true
 snippet t
 	true
 # variable declaration
diff --git a/sources_non_forked/vim-snippets/snippets/haml.snippets b/sources_non_forked/vim-snippets/snippets/haml.snippets
index 61e9cf28..939158d5 100644
--- a/sources_non_forked/vim-snippets/snippets/haml.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haml.snippets
@@ -11,10 +11,20 @@ snippet ul
 		%li
 			${1:item}
 		%li
-snippet =rp
-	= render :partial => '${1:partial}'
-snippet =rpl
-	= render :partial => '${1:partial}', :locals => {}
-snippet =rpc
-	= render :partial => '${1:partial}', :collection => @$1
+snippet rp
+	= render :partial => "${1:item}"
+snippet rpc
+	= render :partial => "${1:item}", :collection => ${2:@$1s}
+snippet rpl
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+snippet rpo
+	= render :partial => "${1:item}", :object => ${2:@$1}
+snippet ife
+	- if ${1:condition}
+		${2}
+	- else
+		${3}
+snippet ifp
+	- if ${1:condition}.presence?
+		${2}
 
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index bcda8a5b..3857d8b4 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -48,7 +48,7 @@ snippet ap
 	${1:map} ${2:fn} ${3:list}
 snippet do
 	do
-		
+
 snippet λ
 	\${1:x} -> ${2}
 snippet \
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index cfc44ad1..a83089c8 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -412,7 +412,7 @@ snippet head
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
-		<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${2}
 	</head>
 snippet header
@@ -450,7 +450,7 @@ snippet html5
 	<html>
 		<head>
 			<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-			<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:meta}
 		</head>
 		<body>
@@ -730,6 +730,10 @@ snippet source
 	<source src="${1}" type="${2}" media="${3}" />
 snippet span
 	<span>${1}</span>
+snippet span.
+	<span class="${1}">${2}</span>
+snippet span#
+	<span id="${1}">${2}</span>
 snippet strong
 	<strong>${1}</strong>
 snippet style
@@ -791,7 +795,7 @@ snippet thead
 snippet time
 	<time datetime="${1}" pubdate="${2:$1}">${3:$1}</time>
 snippet title
-	<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+	<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 snippet tr
 	<tr>
 		${1}
diff --git a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
new file mode 100644
index 00000000..ce971ef5
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
@@ -0,0 +1,74 @@
+# file containing most useful mappings only
+# when editing this file please be aware that there is ZenCoding and sparkup
+
+# html 5 is recommended from now on
+snippet html5
+	<!doctype html>
+	<html>
+	<head>
+		<title>$2</title>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		$3
+	</head>
+	<body>
+	$4
+	</body>
+	</html>
+
+# ==== TAGS
+# you always need these:
+snippet .
+	class="${1}"${2}
+snippet n
+	name="${1}"${2}
+snippet r
+	rel="${1}"${2}
+snippet t
+	title="${1}"${2}
+
+# not using # because id is faster to type
+snippet id
+	id="${1}"${2}
+snippet idn
+	id="${1}" name="${2:$1}"
+
+snippet label_and_input
+	<label for="${2:$1}">${1}</label>
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}" />${7}
+
+
+# FORMS
+# use idn . or n to add id
+snippet input
+	<input type="${1:text}" value="${2}" ${3}/>${7}
+snippet submit
+	<input type="submit" value="${2}" ${3}/>${7}
+snippet textarea
+	<textarea $1>$2</textarea>
+
+# if you need id or class use snippets above
+snippet form
+	<form method="${1:post/get}" action="$2">
+        $3
+	</form>
+
+# other tags
+snippet br
+	<br/>
+snippet a
+	<a href="#" $2>$3</a>
+snippet img
+	<img src="$1" alt="$2"/>
+# JS/CSS
+snippet css_file
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+snippet css_block
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
+        </link>
+
+snippet script_block
+	<script type="text/javascript" charset="utf-8">
+	</script>
+snippet script_file
+	<script type="text/javascript" charset="utf-8">
+	</script>
diff --git a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
index 09cf98ec..4ff5d336 100644
--- a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
+++ b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
@@ -47,10 +47,10 @@ snippet if
 	{% if ${1} %}
 		${2}
 	{% endif %}
-snippet else
+snippet el
 	{% else %}
 		${1}
-snippet elif
+snippet eif
 	{% elif ${1} %}
 		${2}
 snippet ifchanged
diff --git a/sources_non_forked/vim-snippets/snippets/htmltornado.snippets b/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
index de991536..e80499ce 100644
--- a/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
+++ b/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
@@ -27,9 +27,9 @@ snippet if
 	{% if ${1:condition} %}
 	  ${2}
 	{% end %}
-snippet elif
-	{% elif ${1:condition} %} 
-snippet else
+snippet eif
+	{% elif ${1:condition} %}
+snippet el
 	{% else %}
 snippet import
 	{% import ${1:module} %}
diff --git a/sources_non_forked/vim-snippets/snippets/java.snippets b/sources_non_forked/vim-snippets/snippets/java.snippets
index 854f14ac..a36e0f15 100644
--- a/sources_non_forked/vim-snippets/snippets/java.snippets
+++ b/sources_non_forked/vim-snippets/snippets/java.snippets
@@ -39,15 +39,15 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet in
-	interface ${1:`Filename("", "untitled")`} ${2:extends Parent}${3}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}${3}
 snippet tc
-	public class ${1:`Filename()`} extends ${2:TestCase}
+	public class ${1:`vim_snippets#Filename()`} extends ${2:TestCase}
 ##
 ## Class Enhancements
 snippet ext
-	extends 
+	extends
 snippet imp
 	implements
 ##
@@ -72,7 +72,7 @@ snippet def
 		${2}
 snippet el
 	else
-snippet elif
+snippet eif
 	else if (${1}) ${2}
 snippet if
 	if (${1}) ${2}
@@ -144,7 +144,7 @@ snippet @au
 snippet @br
 	@brief ${1:Description}
 snippet @fi
-	@file ${1:`Filename()`}.java
+	@file ${1:`vim_snippets#Filename()`}.java
 snippet @pa
 	@param ${1:param}
 snippet @re
@@ -171,7 +171,7 @@ snippet wh
 ## Main method
 snippet main
 	public static void main (String[] args) {
-		${1:/* code */}
+		${1}
 	}
 ##
 ## Print Methods
diff --git a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets b/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
index ce247a00..014c6158 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
@@ -260,7 +260,7 @@ snippet filter
 	${1:obj}.filter('${2:selector expression}')${3}
 snippet filtert
 	${1:obj}.filter(function (${2:index}) {
-		${3:// test code}
+		${3}
 	})${4}
 snippet find
 	${1:obj}.find('${2:selector expression}')${3}
@@ -291,7 +291,7 @@ snippet getscript
 	});
 snippet grep
 	$.grep(${1:array}, function (item, index) {
-		${2:// test code}
+		${2}
 	}${3:, true});
 snippet hasc
 	${1:obj}.hasClass('${2:className}')${3}
diff --git a/sources_non_forked/vim-snippets/snippets/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript.snippets
index 801968fc..fedb943d 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript.snippets
@@ -17,7 +17,7 @@ snippet f
 # Immediate function
 snippet (f
 	(function (${1}) {
-		${3:/* code */}
+		${3}
 	}(${2}));
 # if
 snippet if
@@ -38,16 +38,16 @@ snippet ter
 snippet switch
 	switch (${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 # case
 snippet case
 	case '${1:case}':
-		${2:// code}
+		${2}
 		break;
 	${3}
 # for (...) {...}
@@ -63,19 +63,19 @@ snippet forr
 # while (...) {...}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 # try
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch (${2:e}) {
 		${3:/* handle error */}
 	}
 # do...while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});
 # Object Method
 snippet :f
@@ -124,10 +124,10 @@ snippet jsons
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {
-		${3:// initial code ...}
+		${3}
 
 		$1 = function ($2) {
-			${4:// main code}
+			${4}
 		};
 	};
 # singleton
@@ -140,7 +140,7 @@ snippet sing
 		$1 = function $1($2) {
 			return instance;
 		};
-		
+
 		// carry over the prototype properties
 		$1.prototype = this;
 
@@ -150,11 +150,11 @@ snippet sing
 		// reset the constructor pointer
 		instance.constructor = $1;
 
-		${3:// code ...}
+		${3}
 
 		return instance;
 	}
-# Crockford's object function 
+# Crockford's object function
 snippet obj
 	function object(o) {
 		function F() {}
@@ -164,7 +164,7 @@ snippet obj
 # Define multiple properties
 snippet props
 	var ${1:my_object} = Object.defineProperties(
-		${2:new Object()}, 
+		${2:new Object()},
 		{
 			${3:property} : {
 				get : function $1_$3_getter() {
@@ -182,9 +182,9 @@ snippet props
 	);
 # Define single property
 snippet prop
-	Object.defineProperty( 
+	Object.defineProperty(
 		${1:object},
-		"${2:property}", 
+		"${2:property}",
 		{
 			get : function $1_$2_getter() {
 				// getter code
diff --git a/sources_non_forked/vim-snippets/snippets/make.snippets b/sources_non_forked/vim-snippets/snippets/make.snippets
index 43648136..ba8e2b29 100644
--- a/sources_non_forked/vim-snippets/snippets/make.snippets
+++ b/sources_non_forked/vim-snippets/snippets/make.snippets
@@ -1,4 +1,4 @@
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
-		${3:code}
+		${3}
 	endif
diff --git a/sources_non_forked/vim-snippets/snippets/mako.snippets b/sources_non_forked/vim-snippets/snippets/mako.snippets
index 2a0aef9c..0f64187f 100644
--- a/sources_non_forked/vim-snippets/snippets/mako.snippets
+++ b/sources_non_forked/vim-snippets/snippets/mako.snippets
@@ -22,7 +22,7 @@ snippet if if
 	% if ${1:condition}:
 		${2:}
 	% endif
-snippet if if/else
+snippet ife if/else
 	% if ${1:condition}:
 		${2:}
 	% else:
diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/sources_non_forked/vim-snippets/snippets/markdown.snippets
index e4efd3c2..9788959f 100644
--- a/sources_non_forked/vim-snippets/snippets/markdown.snippets
+++ b/sources_non_forked/vim-snippets/snippets/markdown.snippets
@@ -24,11 +24,11 @@ snippet ![:*
 
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 
 snippet blockquote
diff --git a/sources_non_forked/vim-snippets/snippets/objc.snippets b/sources_non_forked/vim-snippets/snippets/objc.snippets
index 85b80d9e..c819c776 100644
--- a/sources_non_forked/vim-snippets/snippets/objc.snippets
+++ b/sources_non_forked/vim-snippets/snippets/objc.snippets
@@ -3,7 +3,7 @@ snippet Imp
 	#import <${1:Cocoa/Cocoa.h}>${2}
 # #import "..."
 snippet imp
-	#import "${1:`Filename()`.h}"${2}
+	#import "${1:`vim_snippets#Filename()`.h}"${2}
 # @selector(...)
 snippet sel
 	@selector(${1:method}:)${3}
@@ -18,7 +18,7 @@ snippet log
 	NSLog(@"${1:%@}"${2});${3}
 # Class
 snippet objc
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{
 	}
 	@end
@@ -28,33 +28,33 @@ snippet objc
 	@end
 # Class Interface
 snippet int
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
 	${4}
 	@end
 snippet @interface
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
 	${4}
 	@end
 # Class Implementation
 snippet impl
-	@implementation ${1:`Filename('', 'someClass')`}
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
 	${2}
 	@end
 snippet @implementation
-	@implementation ${1:`Filename('', 'someClass')`}
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
 	${2}
 	@end
 # Protocol
 snippet pro
-	@protocol ${1:`Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
 	${3}
 	@end
 snippet @protocol
-	@protocol ${1:`Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
 	${3}
 	@end
 # init Definition
@@ -87,7 +87,7 @@ snippet cat
 	@end
 # Category Interface
 snippet cath
-	@interface ${1:`Filename('$1', 'NSObject')`} (${2:MyCategory})
+	@interface ${1:`vim_snippets#Filename('$1', 'NSObject')`} (${2:MyCategory})
 	${3}
 	@end
 # Method
@@ -207,7 +207,7 @@ snippet arel
 # autorelease pool
 snippet pool
 	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
-	${2:/* code */}
+	${2}
 	[$1 drain];
 # Throw an exception
 snippet except
diff --git a/sources_non_forked/vim-snippets/snippets/perl.snippets b/sources_non_forked/vim-snippets/snippets/perl.snippets
index 9cebedea..48d3f226 100644
--- a/sources_non_forked/vim-snippets/snippets/perl.snippets
+++ b/sources_non_forked/vim-snippets/snippets/perl.snippets
@@ -8,31 +8,35 @@ snippet .
 # Function
 snippet sub
 	sub ${1:function_name} {
-		${2:#body ...}
+		${2}
 	}
 # Conditional
 snippet if
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 # Conditional if..else
 snippet ife
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 	else {
-		${3:# else...}
+		${3}
 	}
 # Conditional if..elsif..else
 snippet ifee
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 	elsif (${3}) {
 		${4:# elsif...}
 	}
 	else {
-		${5:# else...}
+		${5}
+	}
+snippet eif
+	elsif (${1}) {
+		${2}
 	}
 # Conditional One-line
 snippet xif
@@ -40,7 +44,7 @@ snippet xif
 # Unless conditional
 snippet unless
 	unless (${1}) {
-		${2:# body...}
+		${2}
 	}
 # Unless conditional One-line
 snippet xunless
@@ -57,7 +61,7 @@ snippet eval
 # While Loop
 snippet wh
 	while (${1}) {
-		${2:# body...}
+		${2}
 	}
 # While Loop One-line
 snippet xwh
@@ -65,7 +69,7 @@ snippet xwh
 # C-style For Loop
 snippet cfor
 	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4:# body...}
+		${4}
 	}
 # For loop one-line
 snippet xfor
@@ -73,14 +77,14 @@ snippet xfor
 # Foreach Loop
 snippet for
 	foreach my $${1:x} (@${2:array}) {
-		${3:# body...}
+		${3}
 	}
 # Foreach Loop One-line
 snippet fore
 	${1:expression} foreach @${2:array};${3}
 # Package
 snippet package
-	package ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`};
+	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`};
 
 	${2}
 
@@ -89,7 +93,7 @@ snippet package
 	__END__
 # Package syntax perl >= 5.14
 snippet packagev514
-	package ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
+	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
 
 	${3}
 
@@ -127,7 +131,7 @@ snippet switch
 # Anonymous subroutine
 snippet asub
 	sub {
-	 	${1:# body }
+		${1}
 	}
 
 
@@ -135,7 +139,7 @@ snippet asub
 # Begin block
 snippet begin
 	BEGIN {
-		${1:# begin body}
+		${1}
 	}
 
 # call package function with some parameter
@@ -174,7 +178,7 @@ snippet given
 # switch-like case
 snippet when
 	when (${1:case}) {
-		${2:# body}
+		${2}
 	}
 
 # hash slice
@@ -237,7 +241,7 @@ snippet subpod
 	=cut
 
 	sub ${1:subroutine_name} {
-		${2:# body...}
+		${2}
 	}
 # Subroutine signature
 snippet parg
@@ -318,7 +322,7 @@ snippet trunner
 snippet tsub
 	sub t${1:number}_${2:test_case} :Test(${3:num_of_tests}) {
 		my $self = shift;
-		${4:#  body}
+		${4}
 
 	}
 
@@ -326,14 +330,14 @@ snippet tsub
 snippet trsub
 	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
 		my ($self) = @_;
-		${3:# test code}
+		${3}
 	};
 
 #prep test method
 snippet tprep
 	sub prep${1:number}_${2:test_case} :Test(startup) {
 		my $self = shift;
-		${4:#  body}
+		${4}
 	}
 
 # cause failures to print stack trace
diff --git a/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index 793c2a57..b85d96e6 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -28,12 +28,12 @@ snippet use
 	use ${1:Foo\Bar\Baz};
 	${2}
 snippet	c
-	class ${1:`Filename()`}
+	class ${1:`vim_snippets#Filename()`}
 	{
 		${2}
 	}
 snippet i
-	interface ${1:`Filename()`}
+	interface ${1:`vim_snippets#Filename()`}
 	{
 		${2}
 	}
@@ -57,7 +57,7 @@ snippet sm
 	 *
 	 * @param ${2:$1} $$1 ${3:description}
 	 *
-	 * @return ${4:`Filename()`}
+	 * @return ${4:`vim_snippets#Filename()`}
 	 */
 	${5:public} function set${6:$2}(${7:$2 }$$1)
 	{
@@ -214,7 +214,7 @@ snippet interface
 	 * @package ${3:default}
 	 * @author ${4:`g:snips_author`}
 	 */
-	interface ${1:`Filename()`}
+	interface ${1:`vim_snippets#Filename()`}
 	{
 		${5}
 	}
@@ -223,7 +223,7 @@ snippet class
 	/**
 	 * ${1}
 	 */
-	class ${2:`Filename()`}
+	class ${2:`vim_snippets#Filename()`}
 	{
 		${3}
 		/**
@@ -231,13 +231,13 @@ snippet class
 		 */
 		${5:public} function ${6:__construct}(${7:argument})
 		{
-			${8:// code...}
+			${8}
 		}
 	}
 snippet nc
 	namespace ${1:`substitute(substitute(expand("%:h"), '\v^\w+\/(\u)', '\1', ''), '\/', '\\\', 'g')`};
 
-	${2:abstract }class ${3:`Filename()`}
+	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
 		${4}
 	}
@@ -249,26 +249,26 @@ snippet def?
 	${1}defined('${2}')${3}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 # do ... while
 snippet do
 	do {
-		${2:// code... }
+		${2}
 	} while (${1:/* condition */});
 snippet if
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
-		${2:<!-- code... -->}
+		${2}
 	<?php endif; ?>
 snippet ife
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	} else {
-		${3:// code...}
+		${3}
 	}
 	${4}
 snippet ifeil
@@ -278,35 +278,35 @@ snippet ifeil
 		${3:<!-- html... -->}
 	<?php endif; ?>
 	${4}
-snippet else
+snippet el
 	else {
-		${1:// code...}
+		${1}
 	}
-snippet elseif
+snippet eif
 	elseif (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet switch
 	switch ($${1:variable}) {
 		case '${2:value}':
-			${3:// code...}
+			${3}
 			break;
 		${5}
 		default:
-			${4:// code...}
+			${4}
 			break;
 	}
 snippet case
 	case '${1:value}':
-		${2:// code...}
+		${2}
 		break;${3}
 snippet for
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4: // code...}
+		${4}
 	}
 snippet foreach
 	foreach ($${1:variable} as $${2:value}) {
-		${3:// code...}
+		${3}
 	}
 snippet foreachil
 	<?php foreach ($${1:variable} as $${2:value}): ?>
@@ -314,7 +314,7 @@ snippet foreachil
 	<?php endforeach; ?>
 snippet foreachk
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${4:// code...}
+		${4}
 	}
 snippet foreachkil
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
@@ -343,6 +343,8 @@ snippet vd
 	var_dump(${1});
 snippet vdd
 	var_dump(${1}); die(${2:});
+snippet vdf
+	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');${3}
 snippet http_redirect
 	header ("HTTP/1.1 301 Moved Permanently");
 	header ("Location: ".URL);
@@ -364,7 +366,7 @@ snippet gs
 	 *
 	 * @param $2 $$1 ${5:description}
 	 *
-	 * @return ${6:`Filename()`}
+	 * @return ${6:`vim_snippets#Filename()`}
 	 */
 	public function set$3(${7:$2 }$$1)
 	{
diff --git a/sources_non_forked/vim-snippets/snippets/processing.snippets b/sources_non_forked/vim-snippets/snippets/processing.snippets
index b0aa93ce..27f3e005 100644
--- a/sources_non_forked/vim-snippets/snippets/processing.snippets
+++ b/sources_non_forked/vim-snippets/snippets/processing.snippets
@@ -65,7 +65,7 @@ snippet for
 #loop while
 snippet while
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 #break
 snippet break
@@ -84,11 +84,11 @@ snippet default
 snippet switch
 	switch(${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 #try
 snippet try
diff --git a/sources_non_forked/vim-snippets/snippets/progress.snippets b/sources_non_forked/vim-snippets/snippets/progress.snippets
index 0e6d47bb..0f1f436d 100644
--- a/sources_non_forked/vim-snippets/snippets/progress.snippets
+++ b/sources_non_forked/vim-snippets/snippets/progress.snippets
@@ -55,4 +55,4 @@ snippet log
 snippet dec
 	DECIMAL
 snippet sep
-	/* ------------------------------------------------------------------------- */ 
+	/* ------------------------------------------------------------------------- */
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index f3499321..e95b9c7a 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -1,15 +1,15 @@
 # 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, 
+# 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
 
 # Language Constructs
 snippet class
-	class ${1:`Filename('', 'name')`} {
+	class ${1:`vim_snippets#Filename('', 'name')`} {
 		${2}
 	}
 snippet node
-	node "${1:`Filename('', 'fqdn')`}" {
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
 		${2}
 	}
 snippet case
@@ -25,8 +25,8 @@ snippet ife
 snippet if
 	if $${1:variable} {
 		${2}
-	} 
-snippet else
+	}
+snippet el
 	else {
 		${1}
 	}
@@ -34,7 +34,7 @@ snippet ?
 	? {
 		'${1}'	=> ${2}
 	  }
-# 
+#
 # blocks etc and general syntax sugar
 snippet [
 	[ ${1} ]${2}
@@ -54,7 +54,7 @@ snippet defined
 	defined(${1:Resource}["${2:name}"])${3}
 snippet emerg
 	emerg("${1:message}")${2}
-snippet extlookup Simple extlookup 
+snippet extlookup Simple extlookup
 	extlookup("${1:variable}")${2}
 snippet extlookup Extlookup with defaults
 	extlookup("${1:variable}", "${2:default}")${3}
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index b8593602..d8544cd1 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -2,29 +2,33 @@ snippet #!
 	#!/usr/bin/env python
 snippet imp
 	import ${1:module}
+snippet uni
+	def __unicode__(self):
+		${1:representation}
 snippet from
 	from ${1:package} import ${2:module}
 # Module Docstring
 snippet docs
 	"""
-	File: ${1:`Filename('$1.py', 'foo.py')`}
+	File: ${1:`vim_snippets#Filename('$1.py', 'foo.py')`}
 	Author: `g:snips_author`
 	Email: `g:snips_email`
 	Github: `g:snips_github`
 	Description: ${2}
 	"""
+
 snippet wh
 	while ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
-		${1:# TODO: write code...}
+		${1}
 		if ${2:condition}:
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${3:# TODO: write code...}
+		${3}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -37,14 +41,14 @@ snippet cl
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		"""${3:docstring for $1}"""
-		${4:# TODO: write code...}
+		${4}
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # New Method
 snippet defs
 	def ${1:mname}(self, ${2:arg}):
-		${3:# TODO: write code...}
+		${3}
 # New Property
 snippet property
 	def ${1:foo}():
@@ -60,17 +64,17 @@ snippet property
 # Ifs
 snippet if
 	if ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 snippet el
 	else:
-		${1:# TODO: write code...}
+		${1}
 snippet ei
 	elif ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
-		${3:# TODO: write code...}
+		${3}
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -79,38 +83,38 @@ snippet clatin1
 snippet cascii
 	# -*- coding: ascii -*-
 # Lambda
-snippet lda
+snippet ld
 	${1:var} = lambda ${2:vars} : ${3:action}
 snippet .
 	self.
 snippet try Try/Except
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 snippet try Try/Except/Else
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Else/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 	finally:
-		${6:# TODO: write code...}
+		${6}
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
@@ -127,6 +131,9 @@ snippet ipdb
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# python console debugger (pudb)
+snippet pudb
+	import pudb; pudb.set_trace()
 snippet pprint
 	import pprint; pprint.pprint(${1})${2}
 snippet "
@@ -136,13 +143,13 @@ snippet "
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
-		
+
 		def test_${2:description}(self):
-			${3:# TODO: write code...}
+			${3}
 snippet fut
 	from __future__ import ${1}
 #getopt
@@ -151,7 +158,7 @@ snippet getopt
 		# 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)
@@ -169,7 +176,8 @@ snippet glog
 	logger = logging.getLogger(${1:__name__})
 snippet le
 	logger.error(${1:msg})
-snippet ld
+# conflict with lambda=ld, therefor we change into Logger.debuG
+snippet lg
 	logger.debug(${1:msg})
 snippet lw
 	logger.warning(${1:msg})
diff --git a/sources_non_forked/vim-snippets/snippets/r.snippets b/sources_non_forked/vim-snippets/snippets/r.snippets
index 71186e35..2436f56e 100644
--- a/sources_non_forked/vim-snippets/snippets/r.snippets
+++ b/sources_non_forked/vim-snippets/snippets/r.snippets
@@ -12,24 +12,24 @@ snippet source
 # conditionals
 snippet if
 	if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 snippet el
 	else {
-		${1:code}
+		${1}
 	}
 snippet ei
 	else if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {
-		${3:code}
+		${3}
 	}
 snippet ret
-	return(${1:code})
+	return(${1})
 
 # dataframes, lists, etc
 snippet df
@@ -117,5 +117,5 @@ snippet cor
 	cor.test(${1:x}, ${2:y})
 snippet fte
 	var.test(${1:x}, ${2:y})
-snippet kvt 
+snippet kvt
 	kv.test(${1:x}, ${2:y})
diff --git a/sources_non_forked/vim-snippets/snippets/rst.snippets b/sources_non_forked/vim-snippets/snippets/rst.snippets
index 97845de3..6cb79922 100644
--- a/sources_non_forked/vim-snippets/snippets/rst.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rst.snippets
@@ -3,9 +3,9 @@
 snippet :
 	:${1:field name}: ${2:field body}
 snippet *
-	*${1:Emphasis}*
+	*${1:Emphasis}* ${2}
 snippet **
-	**${1:Strong emphasis}**
+	**${1:Strong emphasis}** ${2}
 snippet _
 	\`${1:hyperlink-name}\`_
 	.. _\`$1\`: ${2:link-block}
@@ -17,6 +17,53 @@ snippet -
 	${1:Title}
 	-----${2:-}
 	${3}
+#some directive
+snippet img:
+	.. |${2:alias}| image:: ${1:img}
+snippet fig:
+	.. figure:: ${1:img}
+		:alt: ${2:alter text}
+
+		$2
 snippet cont:
 	.. contents::
-	
+		${1:content}
+snippet code:
+	.. code:: ${1:type}
+
+		${2:write some code}
+snippet tip:
+	.. tip::
+		${1:my tips}
+snippet not:
+	.. note::
+		${1:my notes}
+snippet	war:
+	.. warning::
+		${1:attention!}
+snippet imp:
+	.. important::
+		${1:this is importatnt}
+snippet att:
+	.. attention::
+		${1:hey!}
+snippet dan:
+	.. danger::
+		${1:ah!}
+snippet err:
+	.. error::
+		${1:Error occur}
+snippet cau:
+	.. caution::
+		${1:Watch out!}
+#Spinx only
+snippet sid:
+	.. sidebar:: ${1:Title}
+
+		${2}
+# CJK optimize, CJK has no space between charaters
+snippet *c
+	\ *${1:Emphasis}*\ ${2}
+snippet **c
+	\ **${1:Strong emphasis}**\ ${2}
+
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 13522e3b..73db3667 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -16,6 +16,14 @@ snippet =b
 	=begin rdoc
 		${1}
 	=end
+snippet prot
+	protected
+
+	${1}
+snippet priv
+	private
+
+	${1}
 snippet y
 	:yields: ${1:arguments}
 snippet rb
@@ -60,7 +68,7 @@ snippet ife
 	else
 		${3}
 	end
-snippet elsif
+snippet eif
 	elsif ${1:condition}
 		${2}
 snippet unless
@@ -80,23 +88,23 @@ snippet until
 		${2}
 	end
 snippet cla class .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 	end
 snippet cla class .. initialize .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
 			${3}
 		end
 	end
 snippet cla class .. < ParentClass .. initialize .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
 		def initialize(${3:args})
 			${4}
 		end
 	end
 snippet cla ClassName = Struct .. do .. end
-	${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
+	${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
 		def ${3:method_name}
 			${4}
 		end
@@ -111,7 +119,7 @@ snippet cla class << self .. end
 	end
 # class .. < DelegateClass .. initialize .. end
 snippet cla-
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < DelegateClass(${2:ParentClass})
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < DelegateClass(${2:ParentClass})
 		def initialize(${3:args})
 			super(${4:del_obj})
 
@@ -119,17 +127,17 @@ snippet cla-
 		end
 	end
 snippet mod module .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 	end
 snippet mod module .. module_function .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module_function
 
 		${2}
 	end
 snippet mod module .. ClassMethods .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module ClassMethods
 			${2}
 		end
@@ -156,6 +164,11 @@ snippet atp
 	attr_protected :${1:attr_names}
 snippet ata
 	attr_accessible :${1:attr_names}
+snippet ana
+	accepts_nested_attributes_for :${1:association}
+# ivc == instance variable cache
+snippet ivc
+	@${1:variable_name} ||= ${2:chached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable
@@ -178,6 +191,11 @@ snippet defs
 	def self.${1:class_method_name}
 		${2}
 	end
+# def initialize
+snippet definit
+	def initialize(${1:args})
+		${2}
+	end
 # def method_missing
 snippet defmm
 	def method_missing(meth, *args, &blk)
@@ -309,6 +327,12 @@ snippet injd
 	inject(${1:init}) do |${2:mem}, ${3:var}|
 		${4}
 	end
+snippet red
+	reduce(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+snippet redd
+	reduce(${1:init}) do |${2:mem}, ${3:var}|
+		${4}
+	end
 snippet map
 	map { |${1:e}| ${2} }
 snippet mapd
@@ -389,13 +413,17 @@ snippet seld
 	end
 snippet lam
 	lambda { |${1:args}| ${2} }
-snippet doo
+# I'm pretty sure that ruby users expect do to expand to do .. end
+snippet do
 	do
 		${1}
 	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:variable}|
-		${2}
+	do |${0:v}|
+		${1}
 	end
 snippet :
 	:${1:key} => ${2:"value"}${3}
@@ -529,7 +557,7 @@ snippet clafn
 snippet sinc
 	class << self; self end
 snippet nam
-	namespace :${1:`Filename()`} do
+	namespace :${1:`vim_snippets#Filename()`} do
 		${2}
 	end
 snippet tas
@@ -572,8 +600,8 @@ snippet artp
 snippet artpp
 	assert_redirected_to ${1:model}s_path
 snippet asd
-	assert_difference "${1:Model}.${2:count}", $1 do
-		${3}
+	assert_difference "${1:Model}.${2:count}", ${3:1} do
+		${4}
 	end
 snippet asnd
 	assert_no_difference "${1:Model}.${2:count}" do
@@ -597,14 +625,14 @@ snippet defcreate
 	def create
 		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
 
-		respond_to do |wants|
+		respond_to do |format|
 			if @$1.save
 				flash[:notice] = '$2 was successfully created.'
-				wants.html { redirect_to(@$1) }
-				wants.xml  { render :xml => @$1, :status => :created, :location => @$1 }
+				format.html { redirect_to(@$1) }
+				format.xml  { render :xml => @$1, :status => :created, :location => @$1 }
 			else
-				wants.html { render :action => "new" }
-				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render :action => "new" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
 	end${3}
@@ -613,9 +641,9 @@ snippet defdestroy
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 		@$1.destroy
 
-		respond_to do |wants|
-			wants.html { redirect_to($1s_url) }
-			wants.xml  { head :ok }
+		respond_to do |format|
+			format.html { redirect_to($1s_url) }
+			format.xml  { head :ok }
 		end
 	end${3}
 snippet defedit
@@ -626,41 +654,41 @@ snippet defindex
 	def index
 		@${1:model_class_name} = ${2:ModelClassName}.all
 
-		respond_to do |wants|
-			wants.html # index.html.erb
-			wants.xml  { render :xml => @$1s }
+		respond_to do |format|
+			format.html # index.html.erb
+			format.xml  { render :xml => @$1s }
 		end
 	end${3}
 snippet defnew
 	def new
 		@${1:model_class_name} = ${2:ModelClassName}.new
 
-		respond_to do |wants|
-			wants.html # new.html.erb
-			wants.xml  { render :xml => @$1 }
+		respond_to do |format|
+			format.html # new.html.erb
+			format.xml  { render :xml => @$1 }
 		end
 	end${3}
 snippet defshow
 	def show
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
-		respond_to do |wants|
-			wants.html # show.html.erb
-			wants.xml  { render :xml => @$1 }
+		respond_to do |format|
+			format.html # show.html.erb
+			format.xml  { render :xml => @$1 }
 		end
 	end${3}
 snippet defupdate
 	def update
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
-		respond_to do |wants|
+		respond_to do |format|
 			if @$1.update_attributes(params[:$1])
 				flash[:notice] = '$2 was successfully updated.'
-				wants.html { redirect_to(@$1) }
-				wants.xml  { head :ok }
+				format.html { redirect_to(@$1) }
+				format.xml  { head :ok }
 			else
-				wants.html { render :action => "edit" }
-				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render :action => "edit" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
 	end${3}
@@ -733,8 +761,8 @@ snippet ra
 snippet ral
 	render :action => "${1:action}", :layout => "${2:layoutname}"
 snippet rest
-	respond_to do |wants|
-		wants.${1:html} { ${2} }
+	respond_to do |format|
+		format.${1:html} { ${2} }
 	end
 snippet rf
 	render :file => "${1:filepath}"
@@ -779,7 +807,7 @@ snippet ru
 snippet rxml
 	render :xml => ${1:text to render}
 snippet sc
-	scope :${1:name}, :where(:@${2:field} => ${3:value})
+	scope :${1:name}, -> { where(${2:field}: ${3:value}) }
 snippet sl
 	scope :${1:name}, lambda do |${2:value}|
 		where("${3:field = ?}", ${4:bind var})
@@ -802,6 +830,85 @@ snippet sweeper
 			expire_page
 		end
 	end
+snippet va validates_associated
+	validates_associated :${1:attribute}
+snippet va validates .., :acceptance => true
+	validates :${1:terms}, :acceptance => true
+snippet vc
+	validates :${1:attribute}, :confirmation => true
+snippet ve
+	validates :${1:attribute}, :exclusion => { :in => ${2:%w( mov avi )} }
+snippet vf
+	validates :${1:attribute}, :format => { :with => /${2:regex}/ }
+snippet vi
+	validates :${1:attribute}, :inclusion => { :in => %w(${2: mov avi }) }
+snippet vl
+	validates :${1:attribute}, :length => { :in => ${2:3}..${3:20} }
+snippet vn
+	validates :${1:attribute}, :numericality => true
+snippet vp
+	validates :${1:attribute}, :presence => true
+snippet vu
+	validates :${1:attribute}, :uniqueness => true
+snippet format
+	format.${1:js|xml|html} { ${2} }
+snippet wc
+	where(${1:"conditions"}${2:, bind_var})
+snippet wh
+	where(${1:field} => ${2:value})
+snippet xdelete
+	xhr :delete, :${1:destroy}, :id => ${2:1}${3}
+snippet xget
+	xhr :get, :${1:show}, :id => ${2:1}${3}
+snippet xpost
+	xhr :post, :${1:create}, :${2:object} => { ${3} }
+snippet xput
+	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}
+snippet test
+	test "should ${1:do something}" do
+		${2}
+	end
+###########################
+#   migrations snippets   #
+###########################
+snippet mac
+	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
+snippet mai
+	add_index :${1:table_name}, :${2:column_name}
+snippet mrc
+	remove_column :${1:table_name}, :${2:column_name}
+snippet mrnc
+	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}
+snippet mcc
+	change_column :${1:table}, :${2:column}, :${3:type}
+snippet mnc
+	t.${1:string} :${2:title}${3:, null: false}${4}
+snippet mct
+	create_table :${1:table_name} do |t|
+		${2}
+	end
+snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
+	class ${1:class_name} < ActiveRecord::Migration
+		def up
+			${2}
+		end
+
+		def down
+		end
+	end
+snippet migration class .. < ActiveRecord::Migration .. def change .. end
+	class ${1:class_name} < ActiveRecord::Migration
+		def change
+			${2}
+		end
+	end
+snippet trc
+	t.remove :${1:column}
+snippet tre
+	t.rename :${1:old_column_name}, :${2:new_column_name}
+	${3}
+snippet tref
+	t.references :${1:model}
 snippet tcb
 	t.boolean :${1:title}
 	${2}
@@ -847,98 +954,17 @@ snippet tcts
 snippet tctss
 	t.timestamps
 	${1}
-snippet va
-	validates_associated :${1:attribute}
-snippet vao
-	validates_acceptance_of :${1:terms}
-snippet vc
-	validates_confirmation_of :${1:attribute}
-snippet ve
-	validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )}
-snippet vf
-	validates_format_of :${1:attribute}, :with => /${2:regex}/
-snippet vi
-	validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi })
-snippet vl
-	validates_length_of :${1:attribute}, :within => ${2:3}..${3:20}
-snippet vn
-	validates_numericality_of :${1:attribute}
-snippet vpo
-	validates_presence_of :${1:attribute}
-snippet vu
-	validates_uniqueness_of :${1:attribute}
-snippet wants
-	wants.${1:js|xml|html} { ${2} }
-snippet wc
-	where(${1:"conditions"}${2:, bind_var})
-snippet wh
-	where(${1:field} => ${2:value})
-snippet xdelete
-	xhr :delete, :${1:destroy}, :id => ${2:1}${3}
-snippet xget
-	xhr :get, :${1:show}, :id => ${2:1}${3}
-snippet xpost
-	xhr :post, :${1:create}, :${2:object} => { ${3} }
-snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}
-snippet test
-	test "should ${1:do something}" do
-		${2}
-	end
-#migrations
-snippet mac
-	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
-snippet mrc
-	remove_column :${1:table_name}, :${2:column_name}
-snippet mrnc
-	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}
-snippet mcc
-	change_column :${1:table}, :${2:column}, :${3:type}
-snippet mnc
-	t.${1:string} :${2:title}${3:, null: false}${4}
-snippet mct
-	create_table :${1:table_name} do |t|
-		${2}
-	end
-snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
-	class ${1:class_name} < ActiveRecord::Migration
-		def up
-			${2}
-		end
-
-		def down
-		end
-	end
-snippet migration class .. < ActiveRecord::Migration .. def change .. end
-	class ${1:class_name} < ActiveRecord::Migration
-		def change
-			${2}
-		end
-	end
-snippet trc
-	t.remove :${1:column}
-snippet tre
-	t.rename :${1:old_column_name}, :${2:new_column_name}
-	${3}
-snippet tref
-	t.references :${1:model}
-#rspec
-snippet it
-	it "${1:spec_name}" do
-		${2}
-	end
-snippet itp
-	it "${1:spec_name}"
-	${2}
-snippet its
-	its(:${1:method}) { should ${2} }
-snippet itsn
-	its(:${1:method}) { should_not ${2} }
-
+##########################
+#     Rspec snippets     #
+##########################
 snippet desc
 	describe ${1:class_name} do
 		${2}
 	end
+snippet descm
+	describe "${1:#method}" do
+		${2:pending "Not implemented"}
+	end
 snippet cont
 	context "${1:message}" do
 		${2}
@@ -952,22 +978,101 @@ snippet aft
 		${2}
 	end
 snippet let
-	let(:${1:object}) ${2:block}
+	let(:${1:object}) ${2}
 snippet let!
-	let!(:${1:object}) ${2:block}
+	let!(:${1:object}) ${2}
 snippet subj
 	subject { ${1} }
+snippet s.
+	subject.${1:method}
 snippet spec
 	specify { subject.${1} }
 snippet exp
-	expect(${1:object}).to ${2}
-snippet btr
-	be_true
-snippet bfa
-	be_false
+	expect { ${1:object} }.to ${2}
+snippet raise
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
 snippet shared
-	shared_examples "${1:shared examples name}" ${2}
-snippet itb
-	it_behaves_like "${1:shared examples name}"${2}
-snippet ana
-	accepts_nested_attributes_for :${1:association}
+	shared_examples ${1:"shared examples name"}
+snippet ibl
+	it_behaves_like ${1:"shared examples name"}
+snippet it
+	it "${1:spec_name}" do
+		${2}
+	end
+snippet its
+	its(:${1:method}) { should ${2} }
+snippet is
+	it { should ${1} }
+snippet isn
+	it { should_not ${1} }
+#ShouldaMatchers#ActionController
+snippet isfp
+	it { should filter_param :${1:key} }
+snippet isrt
+	it { should redirect_to ${1:url} }
+snippet isrtp
+	it { should render_template ${1} }
+snippet isrwl
+	it { should render_with_layout ${1} }
+snippet isrf
+	it { should rescue_from ${1:exception} }
+snippet isrw
+	it { should respond_with ${1:status} }
+snippet isr
+	it { should route(:${1:method}, '${2:path}') }
+snippet isss
+	it { should set_session :${1:key} }
+snippet issf
+	it { should set_the_flash('${1}') }
+#ShouldaMatchers#ActiveModel
+snippet isama
+	it { should allow_mass_assignment_of :${1} }
+snippet isav
+	it { should allow_value(${1}).for :${2} }
+snippet isee
+	it { should ensure_exclusion_of :${1} }
+snippet isei
+	it { should ensure_inclusion_of :${1} }
+snippet isel
+	it { should ensure_length_of :${1} }
+snippet isva
+	it { should validate_acceptance_of :${1} }
+snippet isvc
+	it { should validate_confirmation_of :${1} }
+snippet isvn
+	it { should validate_numericality_of :${1} }
+snippet isvp
+	it { should validate_presence_of :${1} }
+snippet isvu
+	it { should validate_uniqueness_of :${1} }
+#ShouldaMatchers#ActiveRecord
+snippet isana
+	it { should accept_nested_attributes_for :${1} }
+snippet isbt
+	it { should belong_to :${1} }
+snippet isbtcc
+	it { should belong_to(:${1}).counter_cache ${2:true} }
+snippet ishbtm
+	it { should have_and_belong_to_many :${1} }
+snippet isbv
+	it { should be_valid }${1}
+snippet ishc
+	it { should have_db_column :${1} }
+snippet ishi
+	it { should have_db_index :${1} }
+snippet ishm
+	it { should have_many :${1} }
+snippet ishmt
+	it { should have_many(:${1}).through :${2} }
+snippet isho
+	it { should have_one :${1} }
+snippet ishro
+	it { should have_readonly_attribute :${1} }
+snippet iss
+	it { should serialize :${1} }
+snippet isres
+	it { should respond_to :${1} }
+snippet isresw
+	it { should respond_to(:${1}).with(${2}).arguments }
+snippet super_call
+      ${1:super_class}.instance_method(:${2:method}).bind(self).call
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index c342228a..e3999f85 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -7,61 +7,65 @@
 #if
 snippet if
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if not
 snippet ifn
 	if(!${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if-else
-snippet ifel
+snippet ife
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else {
-		${3:/* code */}
+		${3}
 	}
 #if-else-if
 snippet ifelif
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else if(${3:obj}) {
-		${4:/* code */}
+		${4}
+	}
+snippet eif
+	else if(${3:obj}) {
+		${4}
 	}
 #while loop
 snippet while
 	while (${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #for loop(classic)
 snippet for
 	for (${1:item} <- ${2:obj}) {
-		${3:/* code */}
+		${3}
 	}
 #for loop(indexed)
 snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
-		${4:/* code */}
+		${4}
 	}
 #exceptions
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch {
-		case e: FileNotFoundException => ${2:/* code */}
-		case e: IOException => ${3:/* code */}
+		case e: FileNotFoundException => ${2}
+		case e: IOException => ${3}
 	} finally {
-		${4:/* code */}
+		${4}
 	}
 #match
 snippet match
 	${1: obj} match {
-		case ${2:e} => ${3:/* code */}
-		case _ => ${4:/* code */}
+		case ${2:e} => ${3}
+		case _ => ${4}
 	}
 #case
 snippet case
-	case ${1:value} => ${2:/* code */}
+	case ${1:value} => ${2}
 ############################
 # methods and arguments
 #
@@ -82,9 +86,9 @@ snippet ovdef
 	override def ${1:name}(${2:arg}) = ${3:}
 #first class function(see scalabook p 188)
 snippet fcf
-	(${1:a}: ${2:T}) => $1 ${3:/* code */}
+	(${1:a}: ${2:T}) => $1 ${3}
 snippet =>
-	${1:name} => ${2:/* code */}
+	${1:name} => ${2}
 #recursion
 snippet rec
 	def ${1:name}(${2:arg}) =
@@ -196,11 +200,11 @@ snippet as
 
 #scope() with one arg
 snippet (a
-	(${1:a} => ${2:/* code */})
+	(${1:a} => ${2})
 #scope() with two args
 snippet {(
 	{(${1:a},${2:b}) =>
-		${3:/* code */}
+		${3}
 	}
 #filter
 snippet filter
@@ -220,10 +224,10 @@ snippet fldr
 #fold left operator(if u wanna reduce readability of ur code)
 #use wildcard symbols
 snippet /:
-	(${1:first}/:${2:name})(${3:/* code */})
+	(${1:first}/:${2:name})(${3})
 #fold right operator
 snippet :\
-	(${1:first}:\${2:name})(${3:/* code */})
+	(${1:first}:\${2:name})(${3})
 #reduce left
 snippet redl
 	${1:name}.reduceLeft[${2:T}] {(
@@ -258,13 +262,13 @@ snippet athis
 snippet abstract
 	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #class
 snippet class
 	class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #object
 snippet object
@@ -279,7 +283,7 @@ snippet ordered
 	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
 		${4:override def toString = "$1"}
 		def compare(that: $1) = ${5:this - that}
-		${6:/* code */}
+		${6}
 	}
 #case class
 snippet casecl
diff --git a/sources_non_forked/vim-snippets/snippets/sh.snippets b/sources_non_forked/vim-snippets/snippets/sh.snippets
index b0736208..e2853b64 100644
--- a/sources_non_forked/vim-snippets/snippets/sh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/sh.snippets
@@ -1,7 +1,7 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
 	#!/usr/bin/env bash
-	
+
 snippet if
 	if [[ ${1:condition} ]]; then
 		${2:#statements}
@@ -30,9 +30,9 @@ snippet case
 		${2:pattern})
 			${3};;
 	esac
-snippet go 
-	while getopts '${1:o}' ${2:opts} 
-	do 
+snippet go
+	while getopts '${1:o}' ${2:opts}
+	do
 		case $$2 in
 		${3:o0})
 			${4:#staments};;
@@ -53,9 +53,9 @@ snippet getopt
 	{
 			cat <<- EOT
 
-	  Usage :  $${0:0} [options] [--] 
+	  Usage :  $${0:0} [options] [--]
 
-	  Options: 
+	  Options:
 	  -h|help       Display this message
 	  -v|version    Display script version
 
@@ -80,7 +80,5 @@ snippet getopt
 	  esac    # --- end of case ---
 	done
 	shift $(($OPTIND-1))
-
-
 snippet root
 	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi
diff --git a/sources_non_forked/vim-snippets/snippets/tcl.snippets b/sources_non_forked/vim-snippets/snippets/tcl.snippets
index 1fe1cb96..8c0674e4 100644
--- a/sources_non_forked/vim-snippets/snippets/tcl.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tcl.snippets
@@ -1,11 +1,11 @@
 # #!/usr/bin/env tclsh
 snippet #!
 	#!/usr/bin/env tclsh
-	
+
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
-		${3:#body ...}
+		${3}
 	}
 #xif
 snippet xif
@@ -13,19 +13,23 @@ snippet xif
 # Conditional
 snippet if
 	if {${1}} {
-		${2:# body...}
+		${2}
 	}
 # Conditional if..else
 snippet ife
 	if {${1}} {
-		${2:# body...}
+		${2}
 	} else {
 		${3:# else...}
 	}
+snippet eif
+	elseif {${1}} {
+		${2}
+	}
 # Conditional if..elsif..else
 snippet ifee
 	if {${1}} {
-		${2:# body...}
+		${2}
 	} elseif {${3}} {
 		${4:# elsif...}
 	} else {
@@ -42,17 +46,17 @@ snippet catch
 # While Loop
 snippet wh
 	while {${1}} {
-		${2:# body...}
+		${2}
 	}
 # For Loop
 snippet for
 	for {set ${2:var} 0} {$$2 < ${1:count}} {${3:incr} $2} {
-		${4:# body...}
+		${4}
 	}
 # Foreach Loop
 snippet fore
 	foreach ${1:x} {${2:#list}} {
-		${3:# body...}
+		${3}
 	}
 # after ms script...
 snippet af
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index 10fa82ef..649e06b7 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -1,16 +1,16 @@
 #PREAMBLE
 #newcommand
 snippet nc
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}}${4}
+	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${4}
 #usepackage
 snippet up
-	\usepackage[${1:[options}]{${2:package}}
+	\usepackage[${1:options}]{${2:package}} ${3}
 #newunicodechar
 snippet nuc
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}}
+	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${4}
 #DeclareMathOperator
 snippet dmo
-	\DeclareMathOperator{${1}}{${2}}
+	\DeclareMathOperator{${1}}{${2}} ${3}
 
 #DOCUMENT
 # \begin{}...\end{}
@@ -26,7 +26,7 @@ snippet tab
 snippet thm
 	\begin[${1:author}]{${2:thm}}
 	${3}
-	\end{$1}
+	\end{$2}
 snippet center
 	\begin{center}
 		${1}
@@ -56,6 +56,11 @@ snippet \
 	\[
 		${1}
 	\]
+# Equation array
+snippet eqnarray
+	\begin{eqnarray}
+		${1}
+	\end{eqnarray}
 # Enumerate
 snippet enum
 	\begin{enumerate}
@@ -66,11 +71,17 @@ snippet itemize
 	\begin{itemize}
 		\item ${1}
 	\end{itemize}
+snippet item
+	\item ${1}
 # Description
 snippet desc
 	\begin{description}
 		\item[${1}] ${2}
 	\end{description}
+# Endless new item
+snippet ]i
+	\item ${1}
+	${2:]i}
 # Matrix
 snippet mat
 	\begin{${1:p/b/v/V/B/small}matrix}
@@ -103,16 +114,31 @@ snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${3}
+# Section without number
+snippet sec*
+	\section*{${1:section name}}
+	\label{sec:${2:$1}}
+	${3}
 # Sub Section
 snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${3}
+# Sub Section without number
+snippet sub*
+	\subsection*{${1:subsection name}}
+	\label{sub:${2:$1}}
+	${3}
 # Sub Sub Section
 snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${3}
+# Sub Sub Section without number
+snippet subs*
+	\subsubsection*{${1:subsubsection name}}
+	\label{ssub:${2:$1}}
+	${3}
 # Paragraph
 snippet par
 	\paragraph{${1:paragraph name}}
@@ -123,6 +149,9 @@ snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${3}
+snippet ni
+	\noindent
+	${1}
 #References
 snippet itd
 	\item[${1:description}] ${2:item}
@@ -133,14 +162,21 @@ snippet table
 snippet listing
 	${1:Listing}~\ref{${2:list}}${3}
 snippet section
-	${1:Section}~\ref{${2:sec:}}${3}
+	${1:Section}~\ref{sec:${2}} ${3}
 snippet page
-	${1:page}~\pageref{${2}}${3}
+	${1:page}~\pageref{${2}} ${3}
 snippet index
-	\index{${1:index}}${2}
+	\index{${1:index}} ${2}
 #Citations
+snippet citen
+	\cite{$1} ${2}
+# bibtex commands
+snippet citep
+	\citep{$1} ${2}
+snippet citet
+	\citet{$1} ${2}
 snippet cite
-	\cite[${1}]{${2}}${3}
+	\cite[${1}]{${2}} ${3}
 snippet fcite
 	\footcite[${1}]{${2}}${3}
 #Formating text: italic, bold, underline, small capital, emphase ..
@@ -172,6 +208,7 @@ snippet fig
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
+	${5}
 snippet tikz
 	\begin{figure}
 	\begin{center}
@@ -182,10 +219,40 @@ snippet tikz
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
+	${5}
 #math
 snippet stackrel
 	\stackrel{${1:above}}{${2:below}} ${3}
 snippet frac
-	\frac{${1:num}}{${2:denom}}
+	\frac{${1:num}}{${2:denom}} ${3}
 snippet sum
-	\sum^{${1:n}}_{${2:i=1}}{${3}}
\ No newline at end of file
+	\sum^{${1:n}}_{${2:i=1}} ${3}
+snippet lim
+	\lim_{${1:x \to +\infty}} ${2}
+snippet frame
+	\begin{frame}[<+->]
+		\frametitle{${1:title}}
+
+		${2}
+	\end{frame}
+snippet block
+	\begin{block}{${1:title}}
+	${2}
+	\end{block}
+snippet alert
+	\begin{alertblock}{${1:title}}
+	${2}
+	\end{alertblock}
+snippet example
+	\begin{exampleblock}{${1:title}}
+	${2}
+	\end{exampleblock}
+snippet col2
+	\begin{columns}
+		\begin{column}{0.5\textwidth}
+			${1}
+		\end{column}
+		\begin{column}{0.5\textwidth}
+			${2}
+		\end{column}
+	\end{columns}
diff --git a/sources_non_forked/vim-snippets/snippets/textile.snippets b/sources_non_forked/vim-snippets/snippets/textile.snippets
index c78d6ec8..9ad97be5 100644
--- a/sources_non_forked/vim-snippets/snippets/textile.snippets
+++ b/sources_non_forked/vim-snippets/snippets/textile.snippets
@@ -27,4 +27,4 @@ snippet fn
 	[${1:ref number}] ${3}
 
 	fn$1. ${2:footnote}
-	
+
diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/sources_non_forked/vim-snippets/snippets/vim.snippets
index 329d1e9f..6dd502ff 100644
--- a/sources_non_forked/vim-snippets/snippets/vim.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vim.snippets
@@ -4,13 +4,13 @@ snippet header
 	" Description: ${3}
 	${4:" Last Modified: `strftime("%B %d, %Y")`}
 snippet guard
-	if exists('${1:did_`Filename()`}') || &cp${2: || version < 700}
+	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
 	let $1 = 1${3}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4:" code}
+		${4}
 	endf
 snippet t
 	try
@@ -19,19 +19,25 @@ snippet t
 		${3}
 	endtry
 snippet for
-	for ${1:needle} in ${2:haystack}
-		${3:" code}
+	for ${1} in ${2}
+		${3}
 	endfor
+snippet forkv
+	for [${1},${2}] in items(${3})
+		${4}
+            unlet $1 $2
+	endfor
+
 snippet wh
-	while ${1:condition}
-		${2:" code}
+	while ${1}
+		${2}
 	endw
 snippet if
-	if ${1:condition}
-		${2:" code}
+	if ${1}
+		${2}
 	endif
 snippet ife
-	if ${1:condition}
+	if ${1}
 		${2}
 	else
 		${3}
diff --git a/sources_non_forked/vim-snippets/snippets/xslt.snippets b/sources_non_forked/vim-snippets/snippets/xslt.snippets
index e7abdf3f..6e25fd59 100644
--- a/sources_non_forked/vim-snippets/snippets/xslt.snippets
+++ b/sources_non_forked/vim-snippets/snippets/xslt.snippets
@@ -50,7 +50,7 @@ snippet import
 
 snippet include
 	<xsl:include href="${1:stylesheet}" />${2}
-	
+
 snippet otherwise
 	<xsl:otherwise>${1}
 	</xsl:otherwise>
@@ -64,7 +64,7 @@ snippet stylesheet
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${1}
 	</xsl:stylesheet>
 
-snippet template 
+snippet template
 	<xsl:template match="${1:*}">${3}
 	</xsl:template>
 
@@ -91,7 +91,7 @@ snippet when
 
 snippet with-param
 	<xsl:with-param name="${1:name}">${2}</xsl:with-param>
-	
+
 snippet with-param select
 	<xsl:with-param name="${1:name}" select="${2:*}" />
-	
+
diff --git a/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets b/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
index 91c65b92..df5d5eb7 100644
--- a/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
+++ b/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
@@ -1,59 +1,59 @@
 #--------------------Yii CHtml---------------------------------
 #Yii CHtml::radioButton
 snippet yhrb
-	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} ); 
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} );
 
 #Yii CHtml::asset
 snippet yhass
-	echo CHtml::asset('${1:path}'); 
+	echo CHtml::asset('${1:path}');
 
 #Yii CHtml::activeLabelEx
 snippet yhale
-	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encodeArray
 snippet yheca
-	echo CHtml::encodeArray(array(${1})); 
+	echo CHtml::encodeArray(array(${1}));
 
 #Yii CHtml::normalizeUrl
 snippet yhnurl
-	echo CHtml::normalizeUrl(array('${1}')); 
+	echo CHtml::normalizeUrl(array('${1}'));
 
 #Yii CHtml::resetButton
 snippet yhsb
-	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::linkButton
 snippet yhlinkb
-	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeTextArea
 snippet yhata
-	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::ajaxButton
 snippet yhajb
-	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::activeId
 snippet yhai
-	echo CHtml::activeId(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeId(${1:model}, '${2:attribute}');
 
 #Yii CHtml::activeCheckBox
 snippet yhacb
-	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeHiddenField
 snippet yhahf
-	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encode
 snippet yhec
-	echo CHtml::encode(${1:text}); 
+	echo CHtml::encode(${1:text});
 
 #Yii CHtml::metaTag
 snippet yhmtag
-	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::dropDownList
 snippet yhddl
@@ -61,167 +61,167 @@ snippet yhddl
 
 #Yii CHtml::listBox
 snippet yhlb
-	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::script
 snippet yhjs
-	echo CHtml::script('${1:test}'); 
+	echo CHtml::script('${1:test}');
 
 #Yii CHtml::ajax
 snippet yhaj
-	echo CHtml::ajax(array(${1})); 
+	echo CHtml::ajax(array(${1}));
 
 #Yii CHtml::textField
 snippet yhtf
-	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activePasswordField
 snippet yhapf
-	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::listData
 snippet yhld
-	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}'); 
+	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}');
 
 #Yii CHtml::mailto
 snippet yhmt
-	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::image
 snippet yhimg
-	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeListBox
 snippet yhalb
-	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeFileField
 snippet yhaff
-	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::closeTag
 snippet yhct
-	echo CHtml::closeTag('${1:tag}'); 
+	echo CHtml::closeTag('${1:tag}');
 
 #Yii CHtml::activeInputField
 snippet yhaif
-	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::scriptFile
 snippet yhjsf
-	echo CHtml::scriptFile('${1:url}'); 
+	echo CHtml::scriptFile('${1:url}');
 
 #Yii CHtml::radioButtonList
 snippet yhrbl
-	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::cssFile
 snippet yhcssf
-	echo CHtml::cssFile('${1:url}','${2:media}'); 
+	echo CHtml::cssFile('${1:url}','${2:media}');
 
 #Yii CHtml::error
 snippet yherr
-	echo CHtml::error(${1:model}, '${2:attribute}'); 
+	echo CHtml::error(${1:model}, '${2:attribute}');
 
 #Yii CHtml::passwordField
 snippet yhpf
-	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::hiddenField
 snippet yhhf
-	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::cdata
 snippet yhc
-	echo CHtml::cdata(${1:text}); 
+	echo CHtml::cdata(${1:text});
 
 #Yii CHtml::link
 snippet yhlink
-	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::errorSummary
 snippet yherrs
-	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}'); 
+	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}');
 
 #Yii CHtml::tag
 snippet yht
-	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true}); 
+	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true});
 
 #Yii CHtml::ajaxLink
 snippet yhajl
-	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::label
 snippet yhlabel
-	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeName
 snippet yhan
-	echo CHtml::activeName(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeName(${1:model}, '${2:attribute}');
 
 #Yii CHtml::statefulForm
 snippet yhsform
-	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::fileField
 snippet yhff
-	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeTextField
 snippet yhatf
-	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::css
 snippet yhcss
-	echo CHtml::css('${1:test}','${2:media}'); 
+	echo CHtml::css('${1:test}','${2:media}');
 
 #Yii CHtml::imageButton
 snippet yhimgb
-	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::ajaxSubmitButton
 snippet yhajsb
-	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::button
 snippet yhb
-	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::listOptions
 snippet yhlo
-	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeCheckBoxList
 snippet yhacbl
-	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::openTag
 snippet yhot
-	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::checkBox
 snippet yhcb
-	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::textArea
 snippet yhta
-	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::linkTag
 snippet yhlinkt
-	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::resetButton
 snippet yhrsb
-	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeRadioButtonList
 snippet yharbl
-	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::checkBoxList
 snippet yhcbl
-	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::form
 snippet yhform
@@ -231,18 +231,18 @@ snippet yhform
 snippet yhbeform
 	echo CHtml::beginForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 	${5}
-	echo CHtml::endForm(); 
+	echo CHtml::endForm();
 
 #Yii CHtml::activeDropDownList
 snippet yhaddl
-	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeRadioButton
 snippet yharb
-	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeLabel
 snippet yhal
-	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 
diff --git a/sources_non_forked/vim-snippets/snippets/yii.snippets b/sources_non_forked/vim-snippets/snippets/yii.snippets
index 9f29eaf1..da48ee23 100644
--- a/sources_non_forked/vim-snippets/snippets/yii.snippets
+++ b/sources_non_forked/vim-snippets/snippets/yii.snippets
@@ -1,58 +1,58 @@
 #Yii session offset
 snippet yse
-	Yii::app()->session['${1}']; 
+	Yii::app()->session['${1}'];
 
 #Yii renderDynamic
 snippet yrd
-	$this->renderDynamic('${1:callback}'); 
+	$this->renderDynamic('${1:callback}');
 
 #Yii set cache
 snippet ycas
-	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5})); 
+	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5}));
 
 #Yii Add cache
 snippet ycad
-	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5})); 
+	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5}));
 
 #Yii register CSS file
 snippet yregcf
-	Yii::app()->clientScript->registerCssFile('${1:file}'); 
+	Yii::app()->clientScript->registerCssFile('${1:file}');
 
 #Yii requestType
 snippet yreqtype
-	Yii::app()->request->requestType 
+	Yii::app()->request->requestType
 
 #Yii isAjaxRequest
 snippet yisajax
-	Yii::app()->request->isAjaxRequest 
+	Yii::app()->request->isAjaxRequest
 
 #Yii translate
 snippet yt
-	Yii::t('${1:category}', '${2:message}',array(${3})); 
+	Yii::t('${1:category}', '${2:message}',array(${3}));
 
 #Yii register CSS
 snippet yregc
-	Yii::app()->clientScript->registerCss('${1:id}', '${2}'); 
+	Yii::app()->clientScript->registerCss('${1:id}', '${2}');
 
 #Yii log
 snippet ylog
-	Yii::log('${1:msg}', '${2:info}'); 
+	Yii::log('${1:msg}', '${2:info}');
 
 #Yii userHostAddress
 snippet yuserip
-	YYii::app()->request->userHostAddress 
+	YYii::app()->request->userHostAddress
 
 #Yii register script file
 snippet yregsf
-	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END}); 
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END});
 
 #Yii CLinkPager
 snippet ylinkpager
-	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'})) 
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'}))
 
 #Yii CJSON::encode
 snippet yjec
-	CJSON::encode(${1:text}); 
+	CJSON::encode(${1:text});
 
 #CActiveDataProvider
 snippet yadp
@@ -68,23 +68,23 @@ snippet yadp
 		),
 	));
 	${6}
-	// $dataProvider->getData() will return a list of Post objects 
+	// $dataProvider->getData() will return a list of Post objects
 
 #Yii renderDynamic internal
 snippet yrdi
-	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value})); 
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value}));
 
 #Yii register script
 snippet yregs
-	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY}); 
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY});
 
 #Yii Flush cache
 snippet ycaf
-	Yii::app()->cache->flush(); 
+	Yii::app()->cache->flush();
 
 #Yii Yii::app()->request->cookies
 snippet yco
-	Yii::app()->request->cookies['${1}'] 
+	Yii::app()->request->cookies['${1}']
 
 #Yii user->
 snippet yuser
@@ -92,54 +92,54 @@ snippet yuser
 
 #Yii refresh
 snippet yrf
-	$this->refresh(); 
+	$this->refresh();
 
 #Yii import
 snippet yimp
-	Yii::import('${1}'); 
+	Yii::import('${1}');
 
 #Yii trace
 snippet ytrace
-	Yii::trace('${1:msg}'); 
+	Yii::trace('${1:msg}');
 
 #Yii params
 snippet ypar
-	Yii::app()->params['${1}'] 
+	Yii::app()->params['${1}']
 
 #Yii isPostRequest
 snippet yispost
-	Yii::app()->request->isPostRequest 
+	Yii::app()->request->isPostRequest
 
 #Yii IF isAjaxRequest
 snippet yifisajax
 	if(Yii::app()->request->isAjaxRequest == TRUE)
 	{
 		${1}
-	} 
+	}
 
 #Yii Yii::app()->cache->delete
 snippet ydelcache
-	Yii::app()->cache->delete('${1:key}'); 
+	Yii::app()->cache->delete('${1:key}');
 
 #Yii render view
 snippet yr
-	$this->render('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->render('${1:view}',array('${2:key}'=>${3:value}));
 
 #Yii redirect
 snippet yre
-	$this->redirect(array('${1:controller}/${2:action}')); 
+	$this->redirect(array('${1:controller}/${2:action}'));
 
 #Yii Get cache
 snippet ycag
-	Yii::app()->cache->get('${1:key}'); 
+	Yii::app()->cache->get('${1:key}');
 
 #Yii render text
 snippet yrt
-	$this->renderText('${1}'); 
+	$this->renderText('${1}');
 
 #Yii render partial
 snippet yrp
-	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value}));
 
 #----------------Yii Model-----------------------------
 #Yii Model count
@@ -152,7 +152,7 @@ snippet ycountbs
 
 #Yii Model updateAll
 snippet yupdatea
-	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model updateByPk
 snippet yupdatebp
@@ -164,35 +164,35 @@ snippet ydela
 
 #Yii Model deleteByPk
 snippet ydelbp
-	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model find
 snippet yfind
-	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findAll
 snippet yfinda
-	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findByPk
 snippet yfindbp
-	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model findAllByPk
 snippet yfindabp
-	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model findBySql
 snippet yfindbs
-	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value}));
 
 #Yii Model findAllByAttributes
 snippet yfindaba
-	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value})); 
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value}));
 
 #Yii Model exists
 snippet yexists
-	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value}));
 
 #Yii Create model class
 snippet ymodel
@@ -245,7 +245,7 @@ snippet ymodel
 		}
 	}
 
-#------------Yii Controller------------------------------------ 
+#------------Yii Controller------------------------------------
 
 #Yii Create controller class
 snippet ycontroller
diff --git a/sources_non_forked/vim-snippets/snippets/zsh.snippets b/sources_non_forked/vim-snippets/snippets/zsh.snippets
index 367a01ce..b3fdb8c7 100644
--- a/sources_non_forked/vim-snippets/snippets/zsh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/zsh.snippets
@@ -12,7 +12,7 @@ snippet ife
 	else
 		${3:# statements}
 	fi
-snippet elif
+snippet eif
 	elif ${1:condition} ; then
 		${2:# statements}
 snippet for

From 351979d3e0298f04e7631c15d0c7d82f6c0d61f9 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 3 Aug 2013 14:50:12 +0200
Subject: [PATCH 03/61] Updated plugins

---
 .../ctrlp.vim/autoload/ctrlp.vim              |   9 +-
 .../ctrlp.vim/autoload/ctrlp/bookmarkdir.vim  |   4 +-
 .../ctrlp.vim/autoload/ctrlp/buffertag.vim    |   1 +
 .../ctrlp.vim/autoload/ctrlp/tag.vim          |  54 +-
 sources_non_forked/ctrlp.vim/doc/ctrlp.txt    |   7 +-
 .../vim-snipmate/Contributors.md              |   1 +
 .../vim-snipmate/addon-info.json              |   2 +-
 .../vim-snipmate/autoload/snipMate.vim        |  19 +-
 .../vim-snipmate/doc/snipMate.txt             | 700 ++++++++----------
 .../vim-snipmate/plugin/snipMate.vim          |  17 +-
 .../UltiSnips/javascript.snippets             |  22 +-
 .../vim-snippets/UltiSnips/php.snippets       | 292 ++------
 .../UltiSnips/php/symfony2.snippets           |  75 ++
 .../vim-snippets/snippets/elixir.snippets     |   5 +
 .../vim-snippets/snippets/eruby.snippets      |   2 +
 .../vim-snippets/snippets/go.snippets         |   8 +
 .../vim-snippets/snippets/haml.snippets       |   3 +-
 .../snippets/html_minimal.snippets            |  10 +-
 .../snippets/javascript.d3.snippets           |  30 +
 .../vim-snippets/snippets/python.snippets     |  12 +
 20 files changed, 603 insertions(+), 670 deletions(-)
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript.d3.snippets

diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
index a1afaf14..19ac1463 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp.vim
@@ -259,6 +259,10 @@ fu! s:match_window_opts()
 		\ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
 	let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
 	let s:mw_min = min([s:mw_min, s:mw_max])
+	let s:mw_res =
+		\ s:mw =~ 'results:[^,]\+' ? str2nr(matchstr(s:mw, 'results:\zs\d\+'))
+		\ : min([s:mw_max, &lines])
+	let s:mw_res = max([s:mw_res, 1])
 endf
 "}}}1
 " * Open & Close {{{1
@@ -576,7 +580,7 @@ fu! s:Update(str)
 	let s:martcs = &scs && str =~ '\u' ? '\C' : ''
 	let pat = s:matcher == {} ? s:SplitPattern(str) : str
 	let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
-		\ : s:MatchedItems(g:ctrlp_lines, pat, s:winmaxh)
+		\ : s:MatchedItems(g:ctrlp_lines, pat, s:mw_res)
 	cal s:Render(lines, pat)
 endf
 
@@ -1605,8 +1609,7 @@ endf
 fu! ctrlp#syntax()
 	if ctrlp#nosy() | retu | en
 	for [ke, va] in items(s:hlgrps) | cal ctrlp#hicheck('CtrlP'.ke, va) | endfo
-	if !hlexists('CtrlPLinePre')
-		\ && synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
+	if synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
 		sil! exe 'hi CtrlPLinePre '.( has("gui_running") ? 'gui' : 'cterm' ).'fg=bg'
 	en
 	sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim
index 7d955b57..89bda895 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim
@@ -112,12 +112,12 @@ fu! ctrlp#bookmarkdir#accept(mode, str)
 	en
 endf
 
-fu! ctrlp#bookmarkdir#add(dir)
+fu! ctrlp#bookmarkdir#add(dir, ...)
 	let str = 'Directory to bookmark: '
 	let cwd = a:dir != '' ? a:dir : s:getinput(str, getcwd(), 'dir')
 	if cwd == '' | retu | en
 	let cwd = fnamemodify(cwd, ':p')
-	let name = s:getinput('Bookmark as: ', cwd)
+	let name = a:0 && a:1 != '' ? a:1 : s:getinput('Bookmark as: ', cwd)
 	if name == '' | retu | en
 	let name = tr(name, '	', ' ')
 	cal s:savebookmark(name, cwd)
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
index bc3662a4..a38cad56 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim
@@ -62,6 +62,7 @@ let s:types = {
 	\ 'lisp'   : '%slisp%slisp%sf',
 	\ 'lua'    : '%slua%slua%sf',
 	\ 'make'   : '%smake%smake%sm',
+	\ 'ocaml'  : '%socaml%socaml%scmMvtfCre',
 	\ 'pascal' : '%spascal%spascal%sfp',
 	\ 'perl'   : '%sperl%sperl%sclps',
 	\ 'php'    : '%sphp%sphp%scdvf',
diff --git a/sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim b/sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim
index cd4d9097..626363a4 100644
--- a/sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim
+++ b/sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim
@@ -22,32 +22,36 @@ cal add(g:ctrlp_ext_vars, {
 let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
 " Utilities {{{1
 fu! s:findcount(str)
-	let [tg, fname] = split(a:str, '\t\+\ze[^\t]\+$')
+	let [tg, ofname] = split(a:str, '\t\+\ze[^\t]\+$')
 	let tgs = taglist('^'.tg.'$')
 	if len(tgs) < 2
-		retu [1, 1]
+		retu [0, 0, 0, 0]
 	en
 	let bname = fnamemodify(bufname('%'), ':p')
-	let fname = expand(fnamemodify(simplify(fname), ':s?^[.\/]\+??:p:.'), 1)
-	let [fnd, ct, pos, idx] = [0, 0, 0, 0]
-	wh idx < len(tgs)
-		if bname == fnamemodify(tgs[idx]["filename"], ':p')
-			cal insert(tgs, remove(tgs, idx))
-			brea
-		en
-		let idx += 1
-	endw
-	for each in tgs
-		let ct += 1
-		let fulname = fnamemodify(each["filename"], ':p')
+	let fname = expand(fnamemodify(simplify(ofname), ':s?^[.\/]\+??:p:.'), 1)
+	let [fnd, cnt, pos, ctgs, otgs] = [0, 0, 0, [], []]
+	for tgi in tgs
+		let lst = bname == fnamemodify(tgi["filename"], ':p') ? 'ctgs' : 'otgs'
+		cal call('add', [{lst}, tgi])
+	endfo
+	let ntgs = ctgs + otgs
+	for tgi in ntgs
+		let cnt += 1
+		let fulname = fnamemodify(tgi["filename"], ':p')
 		if stridx(fulname, fname) >= 0
 			\ && strlen(fname) + stridx(fulname, fname) == strlen(fulname)
 			let fnd += 1
-			let pos = ct
+			let pos = cnt
 		en
-		if fnd > 1 | brea | en
 	endfo
-	retu [fnd, pos]
+	let cnt = 0
+	for tgi in ntgs
+		let cnt += 1
+		if tgi["filename"] == ofname
+			let [fnd, pos] = [0, cnt]
+		en
+	endfo
+	retu [1, fnd, pos, len(ctgs)]
 endf
 
 fu! s:filter(tags)
@@ -89,27 +93,33 @@ endf
 fu! ctrlp#tag#accept(mode, str)
 	cal ctrlp#exit()
 	let str = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\ze\t')
-	let [tg, fnd] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
+	let [tg, fdcnt] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
 	let cmds = {
 		\ 't': ['tab sp', 'tab stj'],
 		\ 'h': ['sp', 'stj'],
 		\ 'v': ['vs', 'vert stj'],
 		\ 'e': ['', 'tj'],
 		\ }
-	let cmd = fnd[0] == 1 ? cmds[a:mode][0] : cmds[a:mode][1]
+	let utg = fdcnt[3] < 2 && fdcnt[0] == 1 && fdcnt[1] == 1
+	let cmd = !fdcnt[0] || utg ? cmds[a:mode][0] : cmds[a:mode][1]
 	let cmd = a:mode == 'e' && ctrlp#modfilecond(!&aw)
 		\ ? ( cmd == 'tj' ? 'stj' : 'sp' ) : cmd
 	let cmd = a:mode == 't' ? ctrlp#tabcount().cmd : cmd
-	if fnd[0] == 1
+	if !fdcnt[0] || utg
 		if cmd != ''
 			exe cmd
 		en
 		let save_cst = &cst
 		set cst&
-		cal feedkeys(":".fnd[1]."ta ".tg."\r", 'nt')
+		cal feedkeys(":".( utg ? fdcnt[2] : "" )."ta ".tg."\r", 'nt')
 		let &cst = save_cst
 	el
-		cal feedkeys(":".cmd." ".tg."\r", 'nt')
+		let ext = ""
+		if fdcnt[1] < 2 && fdcnt[2]
+			let [sav_more, &more] = [&more, 0]
+			let ext = fdcnt[2]."\r".":let &more = ".sav_more."\r"
+		en
+		cal feedkeys(":".cmd." ".tg."\r".ext, 'nt')
 	en
 	cal ctrlp#setlcdir()
 endf
diff --git a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
index 8a3863aa..e697b937 100644
--- a/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
+++ b/sources_non_forked/ctrlp.vim/doc/ctrlp.txt
@@ -123,7 +123,7 @@ heights of the match window: >
   let g:ctrlp_match_window = ''
 <
 Example: >
-  let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10'
+  let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10,results:10'
 <
 The position: (default: bottom)
   top - show the match window at the top of the screen.
@@ -137,6 +137,9 @@ The minimum and maximum heights:
   min:{n} - show minimum {n} lines (default: 1).
   max:{n} - show maximum {n} lines (default: 10).
 
+The maximum number of results:
+  results:{n} - list maximum {n} results (default: sync with max height).
+
 Note: When a setting isn't set, its default value will be used.
 
                                                       *'g:ctrlp_switch_buffer'*
@@ -1285,6 +1288,8 @@ Special thanks:~
     * Christopher Fredén <github.com/icetan>
     * Zahary Karadjov <github.com/zah>
     * Jo De Boeck <github.com/grimpy>
+    * Rudi Grinberg <github.com/rgrinberg>
+    * Timothy Mellor <github.com/mellort>
 
 ===============================================================================
 CHANGELOG                                                     *ctrlp-changelog*
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 7d9488f5..9aebb051 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -30,6 +30,7 @@ additional contributions from:
 * [radicalbit](https://github.com/radicalbit)
 * [redpill](https://github.com/redpill)
 * [robhudson](https://github.com/robhudson)
+* [Shraymonks](https://github.com/shraymonks)
 * [sickill](https://github.com/sickill)
 * [statik](https://github.com/statik)
 * [steveno](https://github.com/steveno)
diff --git a/sources_non_forked/vim-snipmate/addon-info.json b/sources_non_forked/vim-snipmate/addon-info.json
index 94903731..8d9930ff 100644
--- a/sources_non_forked/vim-snipmate/addon-info.json
+++ b/sources_non_forked/vim-snipmate/addon-info.json
@@ -8,5 +8,5 @@
     "vim-addon-mw-utils": {},
     "tlib": {}
   },
-  "description" : "snipMate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim. See README.markdown to learn about the features this fork adds"
+  "description" : "snipMate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim. See README.md to learn about the features this fork adds"
 }
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 5479dd7f..00041f33 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -7,7 +7,7 @@ let s:c = g:snipMate
 try
 	call tlib#input#List('mi', '', [])
 catch /.*/
-	echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.rst'
+	echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.md'
 endtry
 
 " match $ which doesn't follow a \
@@ -121,8 +121,9 @@ endfunction
 fun! s:ProcessSnippet(snip)
 	let snippet = a:snip
 
-	if exists('g:snipmate_content_visual')
-		let visual = g:snipmate_content_visual | unlet g:snipmate_content_visual
+	if exists('b:snipmate_content_visual')
+		let visual = b:snipmate_content_visual
+		unlet b:snipmate_content_visual
 	else
 		let visual = ''
 	endif
@@ -167,6 +168,18 @@ fun! s:ProcessSnippet(snip)
 		let i += 1
 	endw
 
+	" Add ${0} tab stop if found
+	if snippet =~ s:d . '{0'
+		let snippet = substitute(snippet, s:d.'{0', '${'.i, '')
+		let s = matchstr(snippet, s:d.'{'.i.':\zs.\{-}\ze}')
+		if s != ''
+			let snippet = substitute(snippet, s:d.'0', '$'.i, 'g')
+			let snippet = substitute(snippet, s:d.i, s.'&', 'g')
+		endif
+	else
+		let snippet .= '${'.i.'}'
+	endif
+
 	if &et " Expand tabs to spaces if 'expandtab' is set.
 		return substitute(snippet, '\t', repeat(' ', &sts ? &sts : &sw), 'g')
 	endif
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index 3ac9f5c4..06708a2b 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -1,309 +1,201 @@
-*snipMate.txt*  Plugin for using TextMate-style snippets in Vim.
+*SnipMate.txt*  Plugin for using TextMate-style snippets in Vim.
 
-snipMate                                       *snippet* *snippets* *snipMate*
+SnipMate                                       *snippet* *snippets* *SnipMate*
+Last Change: December 27, 2009
 
-|snipMate-installation|  Installation
-|snipMate-description|   Description
-|snipMate-related-work|  Related work
-|snipMate-usage|         Usage (GETTING STARTED QUICKLY)
-|snipMate-snippet-sources|       snippet sources
-|snipMate-syntax|        Snippet syntax
-|snipMate-settings|      Settings
-|snipMate-features|      Features
-|snipMate-disadvantages| Disadvantages to TextMate
-|snipMate-contact|       Contact
-|snipMate-license|       License
-|snipMate-bugs|       BUGS
+1. Description                        |SnipMate-description|
+2. Usage                              |SnipMate-usage|
+3. Interface and Settings             |SnipMate-interface| |SnipMate-settings|
+4. Snippet syntax                     |SnipMate-syntax|
+5. Snippet sources                    |SnipMate-snippet-sources|
+6. Disadvantages to TextMate          |SnipMate-disadvantages|
+7. Contact                            |SnipMate-contact|
+8. License                            |SnipMate-license|
 
 For Vim version 7.0 or later.
 This plugin only works if 'compatible' is not set.
 {Vi does not have any of these features.}
 
+SnipMate depends on vim-addon-mw-utils and tlib.
 
 ==============================================================================
-INSTALLATION                                           *snipMate-installation*
+DESCRIPTION                                             *SnipMate-description*
 
-Of course you can use whatever tool you want.
-However some features of snipMate depend on external VimL code:
-tlib: tlib#input#List (providing a nice selection list)
-vim-addon-mw-utils: (providing all the caching implementation)
-Thus i recommend vim-addon-manager to install snipMate because this will also
-fetch the dependencies for you.
+SnipMate implements snippet features in Vim. A snippet is like a template,
+reducing repetitive insertion of pieces of text. Snippets can contain
+placeholders for modifying the text if necessary or interpolated code for
+evaluation. For example, in C, typing "for" then pushing <Tab> could expand
+to: >
 
-The complete set of dependencies can be found in snipMate-addon-info.txt
-The current VAM-plugin name for this enhanced version of snipMate is "snipMate".
+    for (i = 0; i < count; i++) {
+        /* code */
+    }
+
+SnipMate is inspired by TextMate's snippet features.
 
 ==============================================================================
-DESCRIPTION                                             *snipMate-description*
+USAGE                                                         *SnipMate-usage*
 
-snipMate is an extension to Vim which allows you to store and retrieve text
-snippets with placeholders in a very convenient way.
+Every snippet consists of an expansion and a trigger. Typing a trigger into
+your buffer and then hitting your trigger key (<Tab> by default, see
+|SnipMate-mappings|) will replace the trigger with the expansion text.
 
-snipMate is inspired by TextMate's snippet features.
+The expansion text can optionally include tab stops. When it does, upon
+expansion of the snippet, the cursor is placed at the first one, and the user
+can jump between each tab stop. Each of these tab stops can be represented by
+default placeholder text. If such a placeholder is provided, then the text of
+the placeholder can be repeated in the snippet at specified mirrors. Any edits
+to the placeholder are instantly updated at every mirror.
+
+SnipMate allows multiple snippets to use the same trigger. When triggered,
+a list of all snippets with that trigger is provided and prompts for which
+snippet to use.
+
+                                                             *SnipMate-scopes*
+SnipMate searches for snippets inside a directory named "snippets" inside each
+entry in 'runtimepath'. Which files are loaded depends on 'filetype' and
+'syntax'; see |SnipMate-syntax| for more information. Snippets are loaded and
+refreshed automatically on demand.
+
+Note: SnipMate does not ship with any snippets. In order to use it, the user
+must either write their own snippets or obtain some from a repository like
+https://github.com/honza/vim-snippets
 
 ==============================================================================
-RELATED WORK                                 *snipMate-related-work*
+INTERFACE AND SETTINGS                *SnipMate-interface* *SnipMate-settings*
 
-There are some alternatives:
-- ultisnips (python based)
-- xptemplate which is probably a much more powerful
-  but also more complex
-- neosnippets - which seems to be able to read snippet
-files when swiching on compatible mode
-- (..?)
+                                                           *SnipMate-commands*
+Commands~
 
-snipmate is not perfect - however it gets its job done perfectly and gets out
-of your way. So if you want to get started fast without reading too much
-documentation probably snipmate is for you.
+                                                   *:SnipMateOpenSnippetFiles*
+:SnipMateOpenSnippetFiles       Opens a list of all valid snippet locations
+                                based on the current scope |SnipMate-scopes|.
+                                Only existing files and non-existing .snippets
+                                files will be shown, with the existing files
+                                shown first.
+
+                                                            *SnipMate-options*
+Options~
+
+g:snips_author                  A variable used in some snippets in place of
+                                the author's (your) name. Similar to
+                                $TM_FULLNAME in TextMate. For example, >
+                                    snippet name
+                                        `g:snips_author`
+<                               creates a snippet "name" that expands to your
+                                name.
+
+g:snipMate                      This |Dictionary| contains other SnipMate
+                                options. In short add >
+                                    let g:snipMate = {}
+<                               to your .vimrc before setting other SnipMate
+                                options.
+
+g:snipMate.scope_aliases        A |Dictionary| associating certain filetypes
+                                with other scopes |SnipMate-scopes|. The
+                                entries consist of a filetype as the key and
+                                a comma-separated list of aliases as the
+                                value. For example, >
+                                    let g:snipMate.scope_aliases = {}
+                                    let g:snipMate.scope_aliases['ruby']
+                                                \ = 'ruby,ruby-rails'
+<                               tells SnipMate that "ruby-rails" snippets in
+                                addition to "ruby" snippets should be loaded
+                                when editing files with 'filetype' set to
+                                "ruby" or contains "ruby" as an entry in the
+                                case of dotted filetypes.
+
+g:snipMate['no_match_completion_feedkeys_chars']
+                                A string inserted when no match for a trigger
+                                is found. By default a tab is inserted
+                                according to 'expandtab', 'tabstop', and
+                                'softtabstop'. Set it to the empty string to
+                                prevent anything from being inserted.
+
+                                                           *SnipMate-mappings*
+Mappings~
+
+The mappings SnipMate uses can be customized with the |:map| commands. For
+example, to change the key that triggers snippets and moves to the next
+tabstop, >
+
+        :imap <C-J> <Plug>SnipMateNextOrTrigger
+        :smap <C-J> <Plug>SnipMateNextOrTrigger
+
+The list of possible <Plug> mappings is as follows:
+
+<Plug>SnipMateNextOrTrigger     Default: <Tab>          Mode: Insert, Select
+                                Jumps to the next tab stop or, if none exists,
+                                try to expand a snippet. Use in both insert
+                                and select modes.
+
+<Plug>SnipMateBack              Default: <S-Tab>        Mode: Insert, Select
+                                Jump to the previous tab stop, if it exists.
+                                Use in both insert and select modes.
+
+<Plug>SnipMateShow              Default: <C-R><Tab>     Mode: Insert
+                                Show all available snippets (that start with
+                                the previous text, if it exists). Use in
+                                insert mode.
+
+<Plug>SnipMateVisual            Default: <Tab>          Mode: Visual
+                                See |SnipMate-visual|.
+
+Additionally, <CR> is mapped in visual mode in .snippets files for retabbing
+snippets.
 
 ==============================================================================
-USAGE (GETTING STARTED QUICKLY)                               *snipMate-usage*
+SYNTAX                                      *snippet-syntax* *SnipMate-syntax*
 
-Adding snippets: >
-  :SnipMateOpenSnippetFiles
-< all valid snippet locations will be shown in a list. Existing files are
-  shown first. The list depends on Vim's |runtimepath|. Thus snipMate
-  perfectly integrates with the recommended way of installing each plugin into
-  its own directory which all newer plugin management solutions (VAM,
-  Pathogen, Vundle, ..) propagate.
+SnipMate looks inside of each entry of 'rtp' (or |SnipMate-snippet-sources|)
+for a directory named /snippets/. Based on the 'filetype' and 'syntax'
+settings (taking into account the dotted syntax), the following files are read
+for snippets: >
 
-  The command will only show non existing .snippets files. See |snipMate-syntax|
-  to learn about all supported files snipMate can read.
+    .../snippets/<scope>.snippets
+    .../snippets/<scope>/<name>.snippets
+    .../snippets/<scope>/<trigger>.snippet
+    .../snippets/<scope>/<trigger>/<description>.snippet
 
-  In .snippets files you should use \t as indentation character which will
-  be replaced by spaces/tabs depending on your Vim indentation settings.
+where <scope> is an entry in 'filetype' or 'syntax', <name> is an arbitrary
+name, <trigger> is the trigger for a snippet, and <description> is
+a description used for |SnipMate-multisnip|.
 
-  You can retab your snippet text by visually selecting it and pressing <cr>.
+A .snippet file defines a single snippet with the trigger (and description)
+determined by the filename. The entire contents of the file are used as the
+snippet expansion text.
 
-Using snippets: ~
+Multiple snippets can be defined in *.snippets files. Each snippet definition
+looks something like: >
 
-  <c-r><tab>: shows a list of available snippets
-  XX<tab>   : will either show a list of all snippets starting with the
-              characters XX or expand the snippet if it matches a snippet name.
+    snippet trigger optional description
+    guard left_from_cursor='^\s*'
+        expanded text
+        more expanded text
 
-associating snippets and filetypes: ~
+<                                                         *SnipMate-multisnip*
+The description is optional. If it is left out and a second snippet inside the
+same .snippets file uses the same trigger, the second one will overwrite the
+first. Otherwise multisnip is used.
 
-1) >
-  g:snipMate.scope_aliases
-< defines which snippets types are available when you edit a buffer.
-  You can override the default in autoload/snipMate.vim in your .vimrc. For
-  example, to add both ruby.snippets and ruby-rails.snippets for files of
-  filetype='ruby', add the following to your vimrc: >
-    let g:snipMate = {}
-    let g:snipMate.scope_aliases = {} 
-    let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails'
+The guard condition line is also optional. It can be used to make a snippet
+available only in some cases. The value should be a VimL expression.
 
-< SnipMate scopes are akin to filetypes.  Setting a scope alias as shown above
-  allows multiple snippets files to be used for one filetype without actually
-  changing the filetype.
+Note: Hard tabs in the expansion text are required. When the snippet is
+expanded in the text and 'expandtab' is set, each tab will be replaced with
+spaces based on 'softtabstop' if nonzero or 'shiftwidth' otherwise.
 
-2)
-  set filetype to a list such as 'html.javascript' or such.
+Comments can be made in .snippets files by starting a line with a # character.
+However these can't be used inside of snippet definitions: >
 
-  Add this to your .vimrc to not add tabs if there is no match: >
-    let g:snipMate['no_match_completion_feedkeys_chars'] = ""
-<
+    # this is a correct comment
+    snippet trigger
+        expanded text
+    snippet another_trigger
+        # this isn't a comment!
+        expanded text
 
- *snipMate-disambiguation*
-What happens if multiple files or filetypes define the same snippet name or if
-|multi_snip| is being used? This results in name collisions!
-You'll get list of matching snippets and can choose one.
-
-Snippets are loaded and refreshed automatically on demand.
-The parsed .snippets files are cached.
-
-in the current buffer to show a list via.
-
-==============================================================================
-SNIPPET SOURCES                                     *snipMate-snippet-sources*
-
-snipMate is configurable.
-
-plugin/snipMate.vim assigns three important keys:
->
-  " default implementation collecting snippets by handlers
-  let g:snipMate['get_snippets'] = snipMate#GetSnippets
-  " default handler:
-  let g:snipMateSources['default'] = snipMate#DefaultPool
-  " default directories containing snippets:
-  let g:snipMate['snippet_dirs'] = funcref#Function('return split(&runtimepath,",")')
-<
-You can override all of those settings.
-
-You can see that the default set of snippets is determined by Vim's |rtp|.
-
-Example 1: ~
-autoload/snipMate_python_demo.vim shows how you can register additional
-sources such as creating snippets on the fly representing python function
-definitions found in the current file.
-
-Example 2: ~
-Add to your ~/.vimrc: For each know snippet add a second version ending in _
-adding folding markers
->
-	let g:commentChar = {
-		\ 'vim': '"',
-		\ 'c': '//',
-		\ 'cpp': '//',
-		\ 'sh': '#',
-		\ 'python': '#'
-		\}
-	" url https://github.com/garbas/vim-snipmate/issues/49
-	fun! AddFolding(text)
-		return substitute(a:text,'\n'," ".g:commentChar[&ft]." {{{\n",1)."\n".g:commentChar[&ft]." }}}"
-	endf
-
-  fun! SnippetsWithFolding(scopes, trigger, result)
-    " hacky: temporarely remove this function to prevent infinite recursion:
-    call remove(g:snipMateSources, 'with_folding')
-    " get list of snippets:
-    let result = snipMate#GetSnippets(a:scopes, substitute(a:trigger,'_\(\*\)\?$','\1',''))
-    let g:snipMateSources['with_folding'] = funcref#Function('SnippetsWithFolding')
-
-    " add folding:
-    for k in keys(result)
-      let a:result[k.'_'] = map(result[k],'AddFolding(v:val)')
-    endfor
-  endf
-
-  " force setting default:
-  runtime plugin/snipMate.vim
-  " add our own source
-  let g:snipMateSources['with_folding'] = funcref#Function('SnippetsWithFolding')
-<
-
-More details about all possible relative locations to |rtp| can be found in
-|snipMate-syntax|
-
-==============================================================================
-SYNTAX                                      *snippet-syntax* *snipMate-syntax*
-
-Default snippet sources [1], you can add your own as illustrated in
-|snipMate-snippet-sources|.
-
-trigger: the snippet's name.
-|rtp|  : Vim's |runtimepath| path list
-
-one snippet per file:
-  |rtp|/snippets/<filetype>/<trigger>.snippet
-
-many snippets per file, triggers are specified in file, see below:
-  |rtp|/snippets/<filetype>.snippets (RECOMMENDED)
-  |rtp|/snippets/<filetype>/*.snippets
-
-
-See |snipMate-disambiguation| to learn about how name collisions are handled.
-
-Note that dotted
-'filetype' syntax is supported -- e.g., you can use >
-
-	:set ft=html.eruby syntax=sql
-
-to activate snippets for both HTML, eRuby and sql for the current file.
-See g:snipMate['get_scopes'] in plugin/snipMate.vim. However, this is not
-recommended, as it can have unwanted side effects (appears to break some forms
-of syntax highlighting).  Instead, set g:snipMate.scope_aliases. 
-See|snipMate-usage|.
-
-The syntax for snippets in *.snippets files is the following: >
-
- snippet trigger
- guard left_from_cursor='^\s*'
- 	expanded text
-	more expanded text
-
-Note: the guard condition line is optional. It can be used to make a snippet available
-only in some cases. the value should be a viml expression.
-(This implementation may change). Only supported in *.snippets files by now.
-
-Multiple snippets having the same name but different triggers exist?
-
-
-Note that the first hard tab after the snippet trigger is required, and not
-expanded in the actual snippet. The syntax for *.snippet files is the same,
-only without the trigger declaration and starting indentation.
-
-Also note that indentation within snippets must be defined using hard tabs.
-They can be expanded to spaces later if desired (see |snipMate-indenting|).
-You can retab a snippet by visually selecting the lines, then press <cr>.
-
-"#" is used as a line-comment character in *.snippets files; however, they can
-only be used outside of a snippet declaration. E.g.: >
-
- # this is a correct comment
- snippet trigger
- 	expanded text
- snippet another_trigger
- 	# this isn't a comment!
-	expanded text
-<
-This should hopefully be obvious with the included syntax highlighting.
-
-                                                               *snipMate-${#}*
-Tab stops ~
-
-By default, the cursor is placed at the end of a snippet. To specify where the
-cursor is to be placed next, use "${#}", where the # is the number of the tab
-stop. E.g., to place the cursor first on the id of a <div> tag, and then allow
-the user to press <tab> to go to the middle of it:
- >
- snippet div
- 	<div id="${1}">
-		${2}
-	</div>
-<
-                        *snipMate-placeholders* *snipMate-${#:}* *snipMate-$#*
-Placeholders ~
-
-Placeholder text can be supplied using "${#:text}", where # is the number of
-the tab stop. This text then can be copied throughout the snippet using "$#",
-given # is the same number as used before. So, to make a C for loop: >
-
- snippet for
- 	for (${2:i}; $2 < ${1:count}; $1++) {
-		${4}
-	}
-
-This will cause "count" to first be selected and change if the user starts
-typing. When <tab> is pressed, the "i" in ${2}'s position will be selected;
-all $2 variables will default to "i" and automatically be updated if the user
-starts typing.
-NOTE: "$#" syntax is used only for variables, not for tab stops as in TextMate.
-
-Variables within variables are also possible. For instance: >
-
- snippet opt
- 	<option value="${1:option}">${2:$1}</option>
-
-Will, as usual, cause "option" to first be selected and update all the $1
-variables if the user starts typing. Since one of these variables is inside of
-${2}, this text will then be used as a placeholder for the next tab stop,
-allowing the user to change it if he wishes.
-
-To copy a value throughout a snippet without supplying default text, simply
-use the "${#:}" construct without the text; e.g.: >
-
- snippet foo
- 	${1:}bar$1
-<                                                          *snipMate-commands*
-
-
-                                          *snipMate-visual-selection-support*
-There is a special placeholder called {VISUAL}. If you visually select text,
-then press <tab> Vim switches to insert mode. The next snippet you'll expand
-will replace {VISUAL} by the text which was selected previously
-
-Interpolated Vim Script ~
-
-Snippets can also contain Vim script commands that are executed (via |eval()|)
-when the snippet is inserted. Commands are given inside backticks (`...`); for
-TextMates's functionality, use the |system()| function. E.g.: >
-
- snippet date
- 	`system("date +%Y-%m-%d")`
-
-will insert the current date, assuming you are on a Unix system. Note that you
-can also (and should) use |strftime()| for this example.
+This should hopefully be clear with the included syntax highlighting.
 
                                                             *snipMate-extends*
 Borrowing from UltiSnips, .snippets files can also contain an extends
@@ -313,11 +205,79 @@ directive, for example: >
 
 will tell SnipMate to also read html, javascript, and css snippets.
 
+                                                          *SnipMate-tabstops*
+Tab stops~
 
-Filename([{expr}] [, {defaultText}])             *snipMate-filename* *Filename()*
+A tab stop, specified by ${#} where # is a number, tells SnipMate where to
+position the cursor next. The special tab stop ${0} denotes the last cursor
+position; in its absence, the cursor is placed at the end of the snippet.
+
+For example, to place the cursor first on the id of a <div> tag, allow
+the user to press <tab> to go to the middle of it, and finally end after
+</div>: >
+
+    snippet div
+        <div id="${1}">
+            ${2}
+        </div>
+
+<                                   *SnipMate-placeholders* *SnipMate-mirrors*
+Placeholders and Mirrors~
+
+Placeholder text can be supplied using "${#:text}", where # is the number of
+the tab stop. This text then can be copied throughout the snippet using "$#",
+given # is the same number as used before. So, to make a C for loop: >
+
+    snippet for
+        for (${2:i}; $2 < ${1:count}; $1++) {
+            ${4}
+        }
+
+This will cause "count" to first be selected and change if the user starts
+typing. When <tab> is pressed, the "i" in ${2}'s position will be selected;
+all $2 variables will default to "i" and automatically be updated if the user
+starts typing.
+
+NOTE: "$#" syntax is used only for mirrors, not for tab stops as in TextMate.
+
+Mirrors can also be used inside of placeholders. For instance: >
+
+ snippet opt
+        <option value="${1:option}">${2:$1}</option>
+
+Will, as usual, cause "option" to first be selected and update all the $1
+variables if the user starts typing. Since one of these variables is inside of
+${2}, this text will then be used as a placeholder for the next tab stop,
+allowing the user to change it if he wishes.
+
+To copy a value throughout a snippet without supplying default text, simply
+use the "${#:}" construct without the text, e.g.: >
+
+ snippet foo
+        ${1:}bar$1
+
+<                                                            *SnipMate-visual*
+There is a special placeholder called {VISUAL}. If you visually select text,
+then press <Tab> Vim switches to insert mode. The next snippet you'll expand
+will replace {VISUAL} by the text which was selected previously.
+
+                                                               *SnipMate-eval*
+Interpolated Vim Script~
+
+Snippets can also contain Vim script commands that are executed (via |eval()|)
+when the snippet is inserted. Commands are given inside backticks (`...`); for
+TextMates's functionality, use the |system()| function. E.g.: >
+
+ snippet date
+        `system("date +%Y-%m-%d")`
+
+will insert the current date, assuming you are on a Unix system. Note that you
+can also (and should) use |strftime()| for this example.
+
+Filename([{expr}] [, {defaultText}])                     *SnipMate-Filename()*
 
 Since the current filename is used often in snippets, a default function
-has been defined for it in snipMate.vim, appropriately called Filename().
+has been defined for it in SnipMate.vim, appropriately called Filename().
 
 With no arguments, the default filename without an extension is returned;
 the first argument specifies what to place before or after the filename,
@@ -327,97 +287,88 @@ if you only want the filename to be returned, the first argument can be left
 blank. Examples: >
 
  snippet filename
- 	`Filename()`
+        `Filename()`
  snippet filename_with_default
- 	`Filename('', 'name')`
+        `Filename('', 'name')`
  snippet filename_foo
- 	`filename('$1_foo')`
+        `Filename('$1_foo')`
 
 The first example returns the filename if it the file has been named, and an
 empty string if it hasn't. The second returns the filename if it's been named,
 and "name" if it hasn't. The third returns the filename followed by "_foo" if
 it has been named, and an empty string if it hasn't.
 
-                                                                   *multi_snip*
-To specify that a snippet can have multiple matches in a *.snippets file, use
-this syntax: >
+==============================================================================
+SNIPPET SOURCES                                     *SnipMate-snippet-sources*
 
- snippet trigger A description of snippet #1
- 	expand this text
- snippet trigger A description of snippet #2
- 	expand THIS text!
+SnipMate is configurable.
 
-See |snipMate-disambiguation|
+plugin/SnipMate.vim assigns three important keys: >
+
+    " default implementation collecting snippets by handlers
+    let g:SnipMate['get_snippets'] = SnipMate#GetSnippets
+    " default handler:
+    let g:SnipMateSources['default'] = SnipMate#DefaultPool
+    " default directories containing snippets:
+    let g:SnipMate['snippet_dirs']
+                \ = funcref#Function('return split(&runtimepath,",")')
+
+You can override all of those settings.
+
+You can see that the default set of snippets is determined by Vim's 'rtp'.
+
+Example 1:~
+autoload/SnipMate_python_demo.vim shows how you can register additional
+sources such as creating snippets on the fly representing python function
+definitions found in the current file.
+
+Example 2:~
+Add to your ~/.vimrc: For each know snippet add a second version ending in _
+adding folding markers >
+
+    let g:commentChar = {
+                \   'vim': '"',
+                \   'c': '//',
+                \   'cpp': '//',
+                \   'sh': '#',
+                \   'python': '#'
+                \ }
+    " url https://github.com/garbas/vim-snipmate/issues/49
+    fun! AddFolding(text)
+        return substitute(a:text,'\n'," ".g:commentChar[&ft]." {{{\n",1)."\n".g:commentChar[&ft]." }}}"
+    endf
+
+    fun! SnippetsWithFolding(scopes, trigger, result)
+        " hacky: temporarely remove this function to prevent infinite recursion:
+        call remove(g:SnipMateSources, 'with_folding')
+        " get list of snippets:
+        let result = SnipMate#GetSnippets(a:scopes, substitute(a:trigger,'_\(\*\)\?$','\1',''))
+        let g:SnipMateSources['with_folding'] = funcref#Function('SnippetsWithFolding')
+
+        " add folding:
+        for k in keys(result)
+        let a:result[k.'_'] = map(result[k],'AddFolding(v:val)')
+        endfor
+    endf
+
+    " force setting default:
+    runtime plugin/SnipMate.vim
+    " add our own source
+    let g:SnipMateSources['with_folding'] = funcref#Function('SnippetsWithFolding')
+
+See |SnipMate-syntax| for more details about all possible relative locations
+to 'rtp' can be found in.
 
 ==============================================================================
-SETTINGS                                  *snipMate-settings* *g:snips_author*
+DISADVANTAGES                                         *SnipMate-disadvantages*
 
-The g:snips_author string (similar to $TM_FULLNAME in TextMate) should be set
-to your name; it can then be used in snippets to automatically add it. E.g.: >
-
- let g:snips_author = 'Hubert Farnsworth'
- snippet name
- 	`g:snips_author`
-<
-                                     *snipMate-expandtab* *snipMate-indenting*
-If you would like your snippets to be expanded using spaces instead of tabs,
-just enable 'expandtab' and set 'softtabstop' to your preferred amount of
-spaces. If 'softtabstop' is not set, 'shiftwidth' is used instead.
-
-                                                           *snipMate-mappings*
-The mappings snipMate uses can be customized with the |:map| commands. For
-example, to change the key that triggers snippets and moves to the next
-tabstop, >
-
-	:imap <C-J> <Plug>snipMateNextOrTrigger
-	:smap <C-J> <Plug>snipMateNextOrTrigger
-<
-The list of possible <Plug> mappings is as follows:
-
-<Plug>snipMateNextOrTrigger	Jumps to the next tab stop or, if none exists,
-				try to expand a snippet. Use in both insert
-				and select modes.
-
-<Plug>snipMateBack		Jump to the previous tab stop, if it exists.
-				Use in both insert and select modes.
-
-<Plug>snipMateShow		Show all available snippets (that start with
-				the previous text, if it exists). Use in
-				insert mode.
-
-<Plug>snipMateVisual		|snipMate-visual-selection-support|
-
-==============================================================================
-FEATURES                                                   *snipMate-features*
-
-snipMate.vim has the following features among others:
-  - The syntax of snippets is very similar to TextMate's, allowing
-    easy conversion.
-  - The position of the snippet is kept transparently (i.e. it does not use
-    markers/placeholders written to the buffer), which allows you to escape
-    out of an incomplete snippet, something particularly useful in Vim.
-  - Variables in snippets are updated as-you-type.
-  - Snippets can have multiple matches.
-  - Snippets can be out of order. For instance, in a do...while loop, the
-    condition can be added before the code.
-  - [New] File-based snippets are supported.
-  - [New] Triggers after non-word delimiters are expanded, e.g. "foo"
-    in "bar.foo".
-  - [New] <shift-tab> can now be used to jump tab stops in reverse order.
-
-==============================================================================
-DISADVANTAGES                                         *snipMate-disadvantages*
-
-snipMate.vim currently has the following disadvantages to TextMate's snippets:
-    - There is no $0; the order of tab stops must be explicitly stated.
-    - Placeholders within placeholders are not possible. E.g.: >
-
-      '<div${1: id="${2:some_id}}">${3}</div>'
-<
-      In TextMate this would first highlight ' id="some_id"', and if
+SnipMate.vim currently has the following disadvantages to TextMate's snippets:
+    - Nested placeholders are not currently possible. E.g.: >
+        '<div${1: id="${2:some_id}}">${3}</div>'
+<     In TextMate this would first highlight ' id="some_id"', and if
       you hit delete it would automatically skip ${2} and go to ${3}
       on the next <tab>, but if you didn't delete it it would highlight
-      "some_id" first. You cannot do this in snipMate.vim.
+      "some_id" first. You cannot do this in SnipMate.vim.
     - Regex cannot be performed on variables, such as "${1/.*/\U&}"
     - Placeholders cannot span multiple lines.
     - Activating snippets in different scopes of the same file is
@@ -426,16 +377,7 @@ snipMate.vim currently has the following disadvantages to TextMate's snippets:
 Perhaps some of these features will be added in a later release.
 
 ==============================================================================
-CHANGELOG                                                  *snipMate-changelog*
-
-0.86 - 2013-06-15
------------------
-* Use more idiomatic <Plug> maps
-
-* Fix disappearing variables bug (hpesoj)
-* Fix cursor position bug when a variable is on the same line as the stop
-* Fix undo point creation causing problems with Supertab
-* Fix bug where SnipMate would use a typed trigger as a regular expression
+CHANGELOG                                                 *SnipMate-changelog*
 
 0.85 - 2013-04-03
 -----------------
@@ -449,7 +391,7 @@ CHANGELOG                                                  *snipMate-changelog*
 * Enable per-buffer expansion of snippets
 * Fix 'cpo' compatibility
 * Update supertab compatibility
-* Enable customization of various things through g:snipMate
+* Enable customization of various things through g:SnipMate
 
 * Disable spelling in snippet files
 * Highlight trigger names in .snippets files
@@ -470,33 +412,24 @@ CHANGELOG                                                  *snipMate-changelog*
   <http://www.vim.org/scripts/script.php?script_id=2540>
 
 ==============================================================================
-CONTACT                                   *snipMate-contact* *snipMate-author*
+CONTACT                                   *SnipMate-contact* *SnipMate-author*
 
-current maintainers:
-  - Adnan Zafar
-  - garbas
+SnipMate is currently maintained by:
+  - Rok Garbas
   - Marc Weber (marco-oweber@gmx.de)
-You should consider creating a github ticket or contacting us because the
-original author Michael Sanders did not act upon change requests for long
-time. Anyway - he did most of the hard initial work.
+  - Adnan Zafar
 
-To contact the author (Michael Sanders), please email:
- msanders42+snipmate <at> gmail <dot> com
+For bug reports, issues, or questions, check out the Issues page on GitHub:
+https://github.com/garbas/vim-snipmate/issues
+
+The original author, Michael Sanders, can be reached at:
+msanders42+snipmate <at> gmail <dot> com
 
 
 ==============================================================================
-BUGS                                                     *snipMate-bugs*
+LICENSE                                                     *SnipMate-license*
 
-<c-space> does not work: Try gvim. <c-space> is mapped to ctrl-2 or such in
-Vim - this is not a snipmate issue.
-
-[1]: I think having so many different ways is too complicated
-    - Marc Weber
-
-==============================================================================
-LICENSE                                                     *snipMate-license*
-
-snipMate is released under the MIT license:
+SnipMate is released under the MIT license:
 
 Copyright 2009-2010 Michael Sanders. All rights reserved.
 
@@ -519,5 +452,4 @@ out of or in connection with the software or the use or other dealings in the
 software.
 
 ==============================================================================
-
-vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 97b282c9..662aeb40 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -21,7 +21,7 @@ set cpo&vim
 try
 	call funcref#Function('')
 catch /.*/
-	echoe "you're missing vim-addon-mw-utils. See install instructions at ".expand('<sfile>:h:h').'/README.rst'
+	echoe "you're missing vim-addon-mw-utils. See install instructions at ".expand('<sfile>:h:h').'/README.md'
 endtry
 
 if (!exists('g:snipMateSources'))
@@ -41,8 +41,7 @@ snoremap <silent> <Plug>snipMateNextOrTrigger  <Esc>a<C-R>=snipMate#TriggerSnipp
 inoremap <silent> <Plug>snipMateBack           <C-R>=snipMate#BackwardsSnippet()<CR>
 snoremap <silent> <Plug>snipMateBack           <Esc>a<C-R>=snipMate#BackwardsSnippet()<CR>
 inoremap <silent> <Plug>snipMateShow           <C-R>=snipMate#ShowAvailableSnips()<CR>
-" FIXME: <Plug>snipMateVisual pollutes register(s)
-xnoremap <silent> <Plug>snipMateVisual         s<C-O>:let g:snipmate_content_visual=getreg('1')<CR>
+xnoremap <silent> <Plug>snipMateVisual         :<C-U>call <SID>grab_visual()<CR>i
 
 " config which can be overridden (shared lines)
 if !exists('g:snipMate')
@@ -76,6 +75,18 @@ fun! BackwardSnippet()
 	return snipMate#BackwardsSnippet()
 endf
 
+" Modified from Luc Hermitte's function on StackOverflow
+" <http://stackoverflow.com/a/1534347>
+function! s:grab_visual()
+	let a_save = @a
+	try
+		normal! gv"ad
+		let b:snipmate_content_visual = @a
+	finally
+		let @a = a_save
+	endtry
+endfunction
+
 " restore 'cpo'
 let &cpo = s:save_cpo
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 7eb18d77..439ec874 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -27,46 +27,46 @@ endsnippet
 
 snippet proto "Prototype (proto)"
 ${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) ,,{
-	${0:// body...}
-};
+	${0}
+}
  
 endsnippet
 
 snippet for "for (...) {...} (faster)"
 for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2--){
 	${3:$1[$2]}$0
-};
+}
 endsnippet
 
 snippet for "for (...) {...}"
 for (var ${2:i}=0; $2 < ${1:Things}.length; $2++) {
 	${3:$1[$2]}$0
-};
+}
 endsnippet
 
 snippet fun "function (fun)"
 function ${1:function_name} (${2:argument}) {
-	${0:// body...}
+	${0}
 }
 endsnippet
 
 # for one line if .. else you usually use a ? b : c
 snippet ife "if ___ else"
 if (${1}) {
-	{$2}
+	${2}
 } else {
-	{$3}
-};
+	${3}
+}
 endsnippet
 
 snippet if "if"
 if (${1}) {
-	{$2}
-};
+	${2}
+}
 endsnippet
 
 snippet timeout "setTimeout function"
-setTimeout(function() {$0}${2:}, ${1:10});
+setTimeout(function() {$0}${2:}, ${1:10})
 endsnippet
 
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 3245568e..0e866d92 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -1,258 +1,82 @@
-## Snippets from SnipMate, taken from
-## https://github.com/scrooloose/snipmate-snippets.git
+snippet <? "php open tag" b
+<?php
+
 
-snippet array "array"
-$${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet
 
-snippet def "def"
-define('${1}'${2});${3}
+snippet vdd "php var_dump and die"
+var_dump(${1}); die();
 endsnippet
 
-snippet do "do"
-do {
-	${2}
-} while (${1});"
+snippet ns "php namespace" b
+namespace ${1:`!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
 endsnippet
 
-snippet doc_f "doc_f"
+snippet nc "php namespace and class" b
+namespace ${1:`!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
 /**
- * $2
- * @return ${4:void}
- * @author ${5:`!v g:snips_author`}
- **/
-${1:public }function ${2:someFunc}(${3})
-{${6}
+ * ${3:@author `whoami`}${4}
+ */
+class ${2:`!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`}
+{
 }
 endsnippet
 
-snippet doc_i "doc_i"
-/**
- * $1
- * @package ${2:default}
- * @author ${3:`!v g:snips_author`}
- **/
-interface ${1:someClass}
-{${4}
-} // END interface $1"
-endsnippet
-
-snippet el "else"
-else {
-	${1}
-}
-endsnippet
-
-snippet for "for"
-for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
+snippet st "php static function" b
+${1:public} static function $2($3)
+{
 	${4}
 }
 endsnippet
 
-snippet foreachk "foreachk"
-foreach ($${1:variable} as $${2:key} => $${3:value}){
-	${4}
+snippet __ "php constructor" b
+${1:public} function __construct($2)
+{
+	${3}
 }
 endsnippet
 
-snippet get "get"
-$_GET['${1}']${2}
+snippet sg "Setter and Getter" b
+
+/**
+ * @var ${3:`!p snip.rv = t[2].capitalize()`}${4}
+ */
+${1:protected} $$2;
+
+public function set`!p snip.rv = t[2].capitalize()`(`!p
+if re.match(r'[A-Z].*', t[3]):
+	snip.rv = t[3] + ' '
+else:
+	snip.rv = ''
+`$$2)
+{
+	$this->$2 = $$2;
+
+	return $this;
+}
+
+public function get`!p snip.rv = t[2].capitalize()`()
+{
+	return $this->$2;
+}
 endsnippet
 
-snippet if "if"
+snippet if "php if" !b
 if (${1}) {
 	${2}
 }
 endsnippet
-
-snippet inc "inc"
-include '${1:file}';${2}
-endsnippet
-
-snippet log "log"
-error_log(var_export(${1}, true));${2}
-endsnippet
-
-snippet post "post"
-$_POST['${1}']${2}
-endsnippet
-
-snippet req1 "req1"
-require_once '${1:file}';${2}
-endsnippet
-
-snippet session "session"
-$_SESSION['${1}']${2}
-endsnippet
-
-snippet t "t"
-$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
-endsnippet
-
-snippet var "var"
-var_export(${1});${2}
-endsnippet
-
-snippet getter "PHP Class Getter" !b
-/*
- * Getter for $1
- */
-public function get${1/\w+\s*/\u$0/}() 
-{
-    return $this->$1;$2
-}
-$4
-endsnippet
-
-snippet setter "PHP Class Setter" !b
-/*
- * Setter for $1
- */
-public function set${1/\w+\s*/\u$0/}($$1)
-{
-    $this->$1 = $$1;$3
-    ${4:return $this;}
-}
-$0
-endsnippet
-
-snippet gs "PHP Class Getter Setter" !b
-protected $$1
-
-/*
- * Getter for $1
- */
-public function get${1/\w+\s*/\u$0/}() 
-{
-    return $this->$1;$2
-}
-
-/*
- * Setter for $1
- */
-public function set${1/\w+\s*/\u$0/}($$1)
-{
-    $this->$1 = $$1;$3
-    ${4:return $this;}
-}
-$0
-endsnippet
-
-snippet pub "Public function" !b
-public function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pro "Protected function" !b
-protected function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pri "Private function" !b
-private function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pubs "Public static function" !b
-public static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pros "Protected static function" !b
-protected static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pris "Private static function" !b
-private static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet fu "Function snip" !b
-function ${1:name}(${2:$param}) 
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-# :vim:ft=snippets
-
-snippet fore "Foreach loop"
-foreach ($${1:variable} as $${3:value}){
-    ${VISUAL}${4}
-}
-$0
-endsnippet
-
-snippet new "New class instance" !b
-$$1 = new $1($2);
-$0
-endsnippet
-
-
-snippet ife "if else"
-if (${1:/* condition */}) {
-    ${2}
-} else {
-    ${3}
-}
-$0
-endsnippet
-
-
-snippet class "Class declaration template" !b
-/**
- * Class ${1:`!p snip.rv=snip.fn.capitalize().split('.')[0]`} 
- * @author $2
- */
-class $1
-{
-    public function ${3:__construct}(${4:$options})
-    {
-        ${4}
-    }
-}
-$0
-endsnippet
-
-snippet pr "Dumb debug helper in HTML"
-echo '<pre>' . var_export($1, 1) . '</pre>';$0
-endsnippet
-
-snippet pc "Dumb debug helper in cli"
-var_export($1);$0
-endsnippet
-
-# Symfony 2 based snippets
-snippet sfa "Symfony 2 Controller action"
-/**
-* @Route("/${1:route_name}", name="$1")
-* @Template()
-*/
-public function $1Action($2)
-{
-    $3
-    return ${4:array();}$0
-}
-endsnippet
-
-# :vim:ft=snippets:
-
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
new file mode 100644
index 00000000..53df3d3d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
@@ -0,0 +1,75 @@
+snippet contr "symfony2 controller" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+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 `whoami`}${2}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Controller
+{
+}
+endsnippet
+
+snippet act "symfony2 action" b
+/**
+ * @Route("${3}", name="${4}")
+ * @Method({${5:"GET"}})
+ * @Template()
+ */
+public function ${1}Action(${2})
+{
+	${6}
+	return [];
+}
+endsnippet
+
+snippet comm "symfony2 command" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+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 `whoami`}${4}
+ */
+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
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index 50243a70..eb3319e0 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -89,6 +89,11 @@ snippet doc
 snippet fn
 	fn(${1:args}) -> ${2} end
 
+snippet fun
+        function do
+        	${1}
+        end
+
 snippet mdoc
 	@moduledoc """
 	${1}
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index d99cf0b6..e3f42136 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -103,6 +103,8 @@ snippet lipp
 	<%= link_to "${1:Link text...}", ${2:model}s_path %>
 snippet lt
 	<%= link_to "${1:name}", ${2:dest} %>
+snippet ntc
+	<%= number_to_currency(${1}) %>
 snippet ofcfs
 	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${4:selected_value} %>
 snippet rf
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index c4aaf602..94610fc8 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -211,3 +211,11 @@ snippet t
 # variable declaration
 snippet v
 	var ${1:t} ${2:string}
+# goroutine named function
+snippet g
+	go ${1:funcName}(${2})
+# goroutine anonymous function 
+snippet ga
+	go func(${1} ${2:type}) {
+		${3:/* code */}
+	}(${4})
diff --git a/sources_non_forked/vim-snippets/snippets/haml.snippets b/sources_non_forked/vim-snippets/snippets/haml.snippets
index 939158d5..fd66e742 100644
--- a/sources_non_forked/vim-snippets/snippets/haml.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haml.snippets
@@ -27,4 +27,5 @@ snippet ife
 snippet ifp
 	- if ${1:condition}.presence?
 		${2}
-
+snippet ntc
+	= number_to_currency(${1})
diff --git a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
index ce971ef5..bc6d3e0a 100644
--- a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
@@ -6,8 +6,8 @@ snippet html5
 	<!doctype html>
 	<html>
 	<head>
+		<meta charset="utf-8">
 		<title>$2</title>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		$3
 	</head>
 	<body>
@@ -34,15 +34,15 @@ snippet idn
 
 snippet label_and_input
 	<label for="${2:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}" />${7}
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">${7}
 
 
 # FORMS
 # use idn . or n to add id
 snippet input
-	<input type="${1:text}" value="${2}" ${3}/>${7}
+	<input type="${1:text}" value="${2}" ${3}>${7}
 snippet submit
-	<input type="submit" value="${2}" ${3}/>${7}
+	<input type="submit" value="${2}" ${3}>${7}
 snippet textarea
 	<textarea $1>$2</textarea>
 
@@ -61,7 +61,7 @@ snippet img
 	<img src="$1" alt="$2"/>
 # JS/CSS
 snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">${3}
 snippet css_block
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
         </link>
diff --git a/sources_non_forked/vim-snippets/snippets/javascript.d3.snippets b/sources_non_forked/vim-snippets/snippets/javascript.d3.snippets
new file mode 100644
index 00000000..a3f7fa7a
--- /dev/null
+++ b/sources_non_forked/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)
+	  .attr("height", $8)
+	    .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/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index d8544cd1..a2008682 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -185,3 +185,15 @@ snippet lc
 	logger.critical(${1:msg})
 snippet li
 	logger.info(${1:msg})
+snippet epydoc
+	"""
+	${1:Description}
+
+	@param ${2:param}: ${3: Description}
+	@type  $2: ${4: Type}
+
+	@return: ${5: Description}
+	@rtype : ${6: Type}
+
+	@raise e: ${7: Description}
+	"""

From 86f4456be14594e743b28403c3d34ccc0d8aa056 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 16 Nov 2013 19:45:48 +0000
Subject: [PATCH 04/61] Updated all the plugins. Removed powerline. Added
 vim-airline (replacement for powerline). Added vim-fugitive.

---
 README.md                                     |    3 +-
 ...Powerline_default_default_compatible.cache |    4 -
 sources_forked/vim-powerline/README.md        |    0
 sources_forked/vim-powerline/README.rst       |  107 -
 sources_forked/vim-powerline/autoload/Pl.vim  |  183 --
 .../vim-powerline/autoload/Pl/Colorscheme.vim |  145 -
 .../vim-powerline/autoload/Pl/Hi.vim          |  140 -
 .../vim-powerline/autoload/Pl/Match.vim       |   43 -
 .../vim-powerline/autoload/Pl/Mod.vim         |   40 -
 .../vim-powerline/autoload/Pl/Parser.vim      |  371 ---
 .../vim-powerline/autoload/Pl/Segment.vim     |  188 --
 .../vim-powerline/autoload/Pl/Theme.vim       |  100 -
 .../Powerline/Colorschemes/default.vim        |  166 --
 .../autoload/Powerline/Colorschemes/skwp.vim  |  192 --
 .../autoload/Powerline/Functions.vim          |  141 -
 .../autoload/Powerline/Functions/ft_man.vim   |   12 -
 .../autoload/Powerline/Functions/fugitive.vim |    7 -
 .../autoload/Powerline/Functions/hgrev.vim    |   17 -
 .../Powerline/Functions/syntastic.vim         |   16 -
 .../autoload/Powerline/Matches.vim            |   13 -
 .../autoload/Powerline/Segments.vim           |   30 -
 .../autoload/Powerline/Segments/ctrlp.vim     |   20 -
 .../autoload/Powerline/Segments/ft_man.vim    |    3 -
 .../autoload/Powerline/Segments/fugitive.vim  |    5 -
 .../autoload/Powerline/Segments/hgrev.vim     |    4 -
 .../autoload/Powerline/Segments/rvm.vim       |    6 -
 .../autoload/Powerline/Segments/syntastic.vim |    5 -
 .../autoload/Powerline/Segments/tagbar.vim    |    6 -
 .../Powerline/Segments/virtualenv.vim         |    5 -
 .../autoload/Powerline/Themes/default.vim     |  116 -
 .../autoload/Powerline/Themes/skwp.vim        |  116 -
 .../vim-powerline/doc/Powerline.txt           |  429 ---
 sources_forked/vim-powerline/doc/tags         |   34 -
 .../fontpatcher/PowerlineSymbols.sfd          |  319 --
 .../vim-powerline/fontpatcher/README.rst      |  164 --
 .../vim-powerline/fontpatcher/fontpatcher     |  240 --
 .../vim-powerline/plugin/Powerline.vim        |   69 -
 sources_non_forked/tlib/autoload/tlib.vim     |    9 +-
 .../tlib/autoload/tlib/Filter_cnf.vim         |    8 +-
 .../tlib/autoload/tlib/Filter_cnfd.vim        |    6 +-
 .../tlib/autoload/tlib/Filter_cnfx.vim        |    6 +-
 .../tlib/autoload/tlib/Filter_fuzzy.vim       |    6 +-
 .../tlib/autoload/tlib/World.vim              |  173 +-
 .../tlib/autoload/tlib/agent.vim              |   60 +-
 .../tlib/autoload/tlib/autocmdgroup.vim       |   11 +-
 .../tlib/autoload/tlib/balloon.vim            |    4 +-
 .../tlib/autoload/tlib/bitwise.vim            |  141 +
 .../tlib/autoload/tlib/buffer.vim             |    9 +-
 .../tlib/autoload/tlib/cache.vim              |   86 +-
 sources_non_forked/tlib/autoload/tlib/cmd.vim |   20 +-
 sources_non_forked/tlib/autoload/tlib/dir.vim |   25 +-
 .../tlib/autoload/tlib/file.vim               |   42 +-
 .../tlib/autoload/tlib/fixes.vim              |   14 +
 .../tlib/autoload/tlib/grep.vim               |   38 +
 .../tlib/autoload/tlib/hash.vim               |  145 +
 .../tlib/autoload/tlib/input.vim              |  451 ++-
 .../tlib/autoload/tlib/number.vim             |   30 +
 .../tlib/autoload/tlib/persistent.vim         |    6 +-
 .../tlib/autoload/tlib/scratch.vim            |   74 +-
 sources_non_forked/tlib/autoload/tlib/tag.vim |   21 +-
 sources_non_forked/tlib/doc/tlib.txt          | 1013 ++++---
 sources_non_forked/tlib/plugin/02tlib.vim     |  241 +-
 sources_non_forked/vim-airline/.gitignore     |    3 +
 sources_non_forked/vim-airline/.travis.yml    |    4 +
 sources_non_forked/vim-airline/Gemfile        |    2 +
 sources_non_forked/vim-airline/LICENSE        |   21 +
 sources_non_forked/vim-airline/README.md      |  199 ++
 sources_non_forked/vim-airline/Rakefile       |   14 +
 .../vim-airline/autoload/airline.vim          |  170 ++
 .../vim-airline/autoload/airline/builder.vim  |   74 +
 .../vim-airline/autoload/airline/debug.vim    |   50 +
 .../autoload/airline/deprecation.vim          |   32 +
 .../autoload/airline/extensions.vim           |  215 ++
 .../autoload/airline/extensions/branch.vim    |   76 +
 .../airline/extensions/bufferline.vim         |   23 +
 .../autoload/airline/extensions/commandt.vim  |   16 +
 .../autoload/airline/extensions/csv.vim       |   31 +
 .../autoload/airline/extensions/ctrlp.vim     |   77 +
 .../autoload/airline/extensions/default.vim   |   77 +
 .../autoload/airline/extensions/eclim.vim     |   35 +
 .../autoload/airline/extensions/example.vim   |   54 +
 .../autoload/airline/extensions/hunks.vim     |   63 +
 .../autoload/airline/extensions/quickfix.vim  |   37 +
 .../autoload/airline/extensions/syntastic.vim |   19 +
 .../autoload/airline/extensions/tabline.vim   |  243 ++
 .../airline/extensions/tabline/formatters.vim |   60 +
 .../autoload/airline/extensions/tagbar.vim    |   39 +
 .../autoload/airline/extensions/undotree.vim  |   27 +
 .../autoload/airline/extensions/unite.vim     |   23 +
 .../airline/extensions/virtualenv.vim         |   20 +
 .../airline/extensions/whitespace.vim         |   78 +
 .../autoload/airline/highlighter.vim          |  156 +
 .../vim-airline/autoload/airline/init.vim     |  113 +
 .../vim-airline/autoload/airline/parts.vim    |   79 +
 .../vim-airline/autoload/airline/section.vim  |   73 +
 .../vim-airline/autoload/airline/themes.vim   |   67 +
 .../autoload/airline/themes/badwolf.vim       |   52 +
 .../autoload/airline/themes/base16.vim        |  107 +
 .../autoload/airline/themes/bubblegum.vim     |   62 +
 .../autoload/airline/themes/dark.vim          |  102 +
 .../autoload/airline/themes/jellybeans.vim    |   52 +
 .../autoload/airline/themes/laederon.vim      |   62 +
 .../autoload/airline/themes/light.vim         |   45 +
 .../autoload/airline/themes/lucius.vim        |   56 +
 .../autoload/airline/themes/luna.vim          |   92 +
 .../autoload/airline/themes/molokai.vim       |   65 +
 .../autoload/airline/themes/monochrome.vim    |   15 +
 .../autoload/airline/themes/murmur.vim        |   46 +
 .../autoload/airline/themes/powerlineish.vim  |   46 +
 .../autoload/airline/themes/serene.vim        |   41 +
 .../autoload/airline/themes/simple.vim        |   46 +
 .../autoload/airline/themes/sol.vim           |   90 +
 .../autoload/airline/themes/solarized.vim     |  173 ++
 .../autoload/airline/themes/tomorrow.vim      |   44 +
 .../autoload/airline/themes/ubaryd.vim        |   64 +
 .../autoload/airline/themes/understated.vim   |   43 +
 .../autoload/airline/themes/wombat.vim        |   90 +
 .../autoload/airline/themes/zenburn.vim       |   44 +
 .../vim-airline/autoload/airline/util.vim     |   64 +
 .../vim-airline/doc/airline.txt               |  677 +++++
 .../vim-airline/plugin/airline.vim            |  109 +
 sources_non_forked/vim-airline/t/airline.vim  |   87 +
 sources_non_forked/vim-airline/t/builder.vim  |   80 +
 sources_non_forked/vim-airline/t/commands.vim |   33 +
 .../vim-airline/t/extensions_default.vim      |   32 +
 .../vim-airline/t/highlighter.vim             |   21 +
 sources_non_forked/vim-airline/t/init.vim     |   77 +
 sources_non_forked/vim-airline/t/parts.vim    |   39 +
 sources_non_forked/vim-airline/t/section.vim  |   76 +
 sources_non_forked/vim-airline/t/themes.vim   |   68 +
 sources_non_forked/vim-airline/t/util.vim     |   54 +
 sources_non_forked/vim-coffee-script/Makefile |    2 +-
 .../vim-coffee-script/Readme.md               |  587 +++-
 .../vim-coffee-script/after/indent/html.vim   |   33 +
 .../vim-coffee-script/after/syntax/haml.vim   |    6 +-
 .../vim-coffee-script/after/syntax/html.vim   |    4 +-
 .../vim-coffee-script/autoload/coffee.vim     |   54 +
 .../vim-coffee-script/compiler/cake.vim       |   15 +
 .../vim-coffee-script/compiler/coffee.vim     |   40 +-
 .../vim-coffee-script/doc/coffee-script.txt   |  143 +-
 .../vim-coffee-script/ftdetect/eco.vim        |    1 -
 .../vim-coffee-script/ftplugin/coffee.vim     |  473 +--
 .../vim-coffee-script/indent/coffee.vim       |  543 ++--
 .../vim-coffee-script/syntax/coffee.vim       |   62 +-
 .../vim-coffee-script/syntax/eco.vim          |   62 -
 .../vim-coffee-script/test/test-eco.html.eco  |   12 -
 .../vim-coffee-script/test/test.haml          |    3 +
 .../vim-expand-region/README.md               |    4 +
 sources_non_forked/vim-fugitive/.gitignore    |    1 +
 .../vim-fugitive/CONTRIBUTING.markdown        |   18 +
 .../vim-fugitive/README.markdown              |  120 +
 .../vim-fugitive/doc/fugitive.txt             |  317 ++
 .../vim-fugitive/plugin/fugitive.vim          | 2587 +++++++++++++++++
 sources_non_forked/vim-less/README.md         |   11 +-
 .../vim-multiple-cursors/README.md            |    4 +
 .../vim-snipmate/Contributors.md              |    3 +
 sources_non_forked/vim-snipmate/README.md     |   13 +-
 .../vim-snipmate/autoload/snipMate.vim        |   35 +-
 .../vim-snipmate/doc/snipMate.txt             |   37 +-
 .../vim-snipmate/ftplugin/snippet.vim         |    2 +-
 .../vim-snipmate/plugin/snipMate.vim          |    1 +
 .../vim-snipmate/syntax/snippets.vim          |    1 -
 sources_non_forked/vim-snippets/README.md     |    5 +-
 .../vim-snippets/UltiSnips/elixir.snippets    |  168 ++
 .../vim-snippets/UltiSnips/html.snippets      |   16 +-
 .../UltiSnips/javascript_ember.snippets       |   88 +
 .../vim-snippets/UltiSnips/ocaml.snippets     |    2 +-
 .../vim-snippets/UltiSnips/perl.snippets      |    2 +-
 .../vim-snippets/UltiSnips/php.snippets       |   42 +-
 .../UltiSnips/php/phpunit.snippets            |   30 +
 .../UltiSnips/php/symfony2.snippets           |  168 +-
 .../vim-snippets/UltiSnips/ruby.snippets      |    6 +-
 .../vim-snippets/UltiSnips/sh.snippets        |    2 +-
 .../vim-snippets/UltiSnips/tcl.snippets       |    2 +-
 .../vim-snippets/snippets/_.snippets          |   24 +-
 .../snippets/actionscript.snippets            |   42 +-
 .../vim-snippets/snippets/apache.snippets     |   12 +-
 .../vim-snippets/snippets/autoit.snippets     |   36 +-
 .../vim-snippets/snippets/c.snippets          |   60 +-
 .../vim-snippets/snippets/chef.snippets       |   22 +-
 .../vim-snippets/snippets/clojure.snippets    |   62 +-
 .../vim-snippets/snippets/cmake.snippets      |   20 +-
 .../vim-snippets/snippets/coffee.snippets     |   46 +-
 .../vim-snippets/snippets/cpp.snippets        |   58 +-
 .../vim-snippets/snippets/cs.snippets         |  158 +-
 .../vim-snippets/snippets/css.snippets        |  372 +--
 .../vim-snippets/snippets/dart.snippets       |   50 +-
 .../vim-snippets/snippets/diff.snippets       |    2 +-
 .../vim-snippets/snippets/django.snippets     |   64 +-
 .../vim-snippets/snippets/dosini.snippets     |   12 +
 .../vim-snippets/snippets/elixir.snippets     |   56 +-
 .../vim-snippets/snippets/erlang.snippets     |   37 +-
 .../vim-snippets/snippets/eruby.snippets      |   98 +-
 .../vim-snippets/snippets/falcon.snippets     |   24 +-
 .../vim-snippets/snippets/go.snippets         |   85 +-
 .../vim-snippets/snippets/haml.snippets       |   22 +-
 .../vim-snippets/snippets/haskell.snippets    |   52 +-
 .../vim-snippets/snippets/html.snippets       |  522 ++--
 .../snippets/html_minimal.snippets            |   30 +-
 .../vim-snippets/snippets/htmldjango.snippets |   94 +-
 .../snippets/htmltornado.snippets             |   34 +-
 .../vim-snippets/snippets/java.snippets       |  114 +-
 .../snippets/javascript-jquery.snippets       |  416 +--
 .../vim-snippets/snippets/javascript.snippets |   62 +-
 .../vim-snippets/snippets/jsp.snippets        |   64 +-
 .../vim-snippets/snippets/ledger.snippets     |    2 +-
 .../vim-snippets/snippets/ls.snippets         |  108 +
 .../vim-snippets/snippets/lua.snippets        |   10 +-
 .../vim-snippets/snippets/make.snippets       |    2 +-
 .../vim-snippets/snippets/mako.snippets       |   32 +-
 .../vim-snippets/snippets/markdown.snippets   |   48 +-
 .../vim-snippets/snippets/objc.snippets       |  112 +-
 .../vim-snippets/snippets/openfoam.snippets   |   10 +-
 .../vim-snippets/snippets/perl.snippets       |   90 +-
 .../vim-snippets/snippets/php.snippets        |  302 +-
 .../vim-snippets/snippets/plsql.snippets      |   44 +-
 .../vim-snippets/snippets/po.snippets         |    2 +-
 .../vim-snippets/snippets/processing.snippets |  781 +++--
 .../vim-snippets/snippets/progress.snippets   |   16 +-
 .../vim-snippets/snippets/puppet.snippets     |  161 +-
 .../vim-snippets/snippets/python.snippets     |   75 +-
 .../vim-snippets/snippets/r.snippets          |   90 +-
 .../vim-snippets/snippets/rst.snippets        |   42 +-
 .../vim-snippets/snippets/ruby.snippets       |  695 ++---
 .../vim-snippets/snippets/scala.snippets      |  136 +-
 .../vim-snippets/snippets/sh.snippets         |   24 +-
 .../vim-snippets/snippets/snippets.snippets   |    4 +-
 .../vim-snippets/snippets/sql.snippets        |   24 +-
 .../vim-snippets/snippets/tcl.snippets        |   38 +-
 .../vim-snippets/snippets/tex.snippets        |  128 +-
 .../vim-snippets/snippets/textile.snippets    |   12 +-
 .../vim-snippets/snippets/vim.snippets        |   22 +-
 .../vim-snippets/snippets/xslt.snippets       |   48 +-
 .../vim-snippets/snippets/yii-chtml.snippets  |  122 +-
 .../vim-snippets/snippets/yii.snippets        |   84 +-
 .../vim-snippets/snippets/zsh.snippets        |   32 +-
 .../vim-surround/plugin/surround.vim          |    9 +
 update_plugins.py                             |    2 +
 vimrcs/plugins_config.vim                     |    6 +
 239 files changed, 14942 insertions(+), 8068 deletions(-)
 delete mode 100644 sources_forked/vim-powerline/Powerline_default_default_compatible.cache
 delete mode 100644 sources_forked/vim-powerline/README.md
 delete mode 100755 sources_forked/vim-powerline/README.rst
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Colorscheme.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Hi.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Match.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Mod.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Parser.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Segment.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Pl/Theme.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Colorschemes/default.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Colorschemes/skwp.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Functions.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Functions/ft_man.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Functions/fugitive.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Functions/hgrev.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Functions/syntastic.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Matches.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/ft_man.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/fugitive.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/hgrev.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/rvm.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/syntastic.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/tagbar.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Themes/default.vim
 delete mode 100755 sources_forked/vim-powerline/autoload/Powerline/Themes/skwp.vim
 delete mode 100755 sources_forked/vim-powerline/doc/Powerline.txt
 delete mode 100644 sources_forked/vim-powerline/doc/tags
 delete mode 100755 sources_forked/vim-powerline/fontpatcher/PowerlineSymbols.sfd
 delete mode 100755 sources_forked/vim-powerline/fontpatcher/README.rst
 delete mode 100755 sources_forked/vim-powerline/fontpatcher/fontpatcher
 delete mode 100755 sources_forked/vim-powerline/plugin/Powerline.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/bitwise.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/fixes.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/grep.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/hash.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/number.vim
 create mode 100644 sources_non_forked/vim-airline/.gitignore
 create mode 100644 sources_non_forked/vim-airline/.travis.yml
 create mode 100644 sources_non_forked/vim-airline/Gemfile
 create mode 100644 sources_non_forked/vim-airline/LICENSE
 create mode 100644 sources_non_forked/vim-airline/README.md
 create mode 100644 sources_non_forked/vim-airline/Rakefile
 create mode 100644 sources_non_forked/vim-airline/autoload/airline.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/builder.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/debug.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/deprecation.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/highlighter.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/init.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/parts.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/section.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/dark.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/laederon.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/light.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/luna.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/molokai.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/monochrome.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/powerlineish.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/serene.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/simple.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/sol.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/tomorrow.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/ubaryd.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/understated.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/wombat.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/zenburn.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/util.vim
 create mode 100644 sources_non_forked/vim-airline/doc/airline.txt
 create mode 100644 sources_non_forked/vim-airline/plugin/airline.vim
 create mode 100644 sources_non_forked/vim-airline/t/airline.vim
 create mode 100644 sources_non_forked/vim-airline/t/builder.vim
 create mode 100644 sources_non_forked/vim-airline/t/commands.vim
 create mode 100644 sources_non_forked/vim-airline/t/extensions_default.vim
 create mode 100644 sources_non_forked/vim-airline/t/highlighter.vim
 create mode 100644 sources_non_forked/vim-airline/t/init.vim
 create mode 100644 sources_non_forked/vim-airline/t/parts.vim
 create mode 100644 sources_non_forked/vim-airline/t/section.vim
 create mode 100644 sources_non_forked/vim-airline/t/themes.vim
 create mode 100644 sources_non_forked/vim-airline/t/util.vim
 create mode 100644 sources_non_forked/vim-coffee-script/after/indent/html.vim
 create mode 100644 sources_non_forked/vim-coffee-script/autoload/coffee.vim
 create mode 100644 sources_non_forked/vim-coffee-script/compiler/cake.vim
 delete mode 100644 sources_non_forked/vim-coffee-script/ftdetect/eco.vim
 delete mode 100644 sources_non_forked/vim-coffee-script/syntax/eco.vim
 delete mode 100644 sources_non_forked/vim-coffee-script/test/test-eco.html.eco
 create mode 100644 sources_non_forked/vim-coffee-script/test/test.haml
 create mode 100644 sources_non_forked/vim-fugitive/.gitignore
 create mode 100644 sources_non_forked/vim-fugitive/CONTRIBUTING.markdown
 create mode 100644 sources_non_forked/vim-fugitive/README.markdown
 create mode 100644 sources_non_forked/vim-fugitive/doc/fugitive.txt
 create mode 100644 sources_non_forked/vim-fugitive/plugin/fugitive.vim
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/dosini.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/ls.snippets

diff --git a/README.md b/README.md
index bc0fba7b..775bc586 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,6 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [bufexplorer.zip](https://github.com/vim-scripts/bufexplorer.zip): Buffer Explorer / Browser. This plugin can be opened with `<leader+o>`
 * [NERD Tree](https://github.com/scrooloose/nerdtree): A tree explorer plugin for vim
 * [ack.vim](github.com/mileszs/ack.vim): Vim plugin for the Perl module / CLI script 'ack'
-* [vim-powerline](https://github.com/Lokaltog/vim-powerline): The ultimate vim statusline utility
 * [ctrlp.vim](https://github.com/kien/ctrlp.vim): Fuzzy file, buffer, mru and tag finder. In my config it's mapped to `<Ctrl+F>`, because `<Ctrl+P>` is used by YankRing
 * [mru.vim](https://github.com/vim-scripts/mru.vim): Plugin to manage Most Recently Used (MRU) files. Includes my own fork which adds syntax highlighting to MRU. This plugin can be opened with `<leader+f>`
 * [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`
@@ -73,6 +72,8 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [taglist.vim](https://github.com/vim-scripts/taglist.vim): Source code browser (supports C/C++, java, perl, python, tcl, sql, php, etc)
 * [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors): Sublime Text style multiple selections for Vim, CTRL+N is remapped to CTRL+S (due to YankRing)
 * [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination.
+* [vim-airline](https://github.com/bling/vim-airline): Lean & mean status/tabline for vim that's light as air (replacing powerline)
+* [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
 
 
 ## What color schemes are included?
diff --git a/sources_forked/vim-powerline/Powerline_default_default_compatible.cache b/sources_forked/vim-powerline/Powerline_default_default_compatible.cache
deleted file mode 100644
index 498b4f63..00000000
--- a/sources_forked/vim-powerline/Powerline_default_default_compatible.cache
+++ /dev/null
@@ -1,4 +0,0 @@
-let g:Powerline_cache_revision = 7
-let g:Pl#HL = ['hi Ple7ffffffa0d70000b ctermfg=231 ctermbg=160 cterm=bold guifg=#ffffff guibg=#d70000 gui=bold', 'hi Pla0d70000f0585858N ctermfg=160 ctermbg=240 cterm=NONE guifg=#d70000 guibg=#585858 gui=NONE', 'hi Plc4ff0000f0585858b ctermfg=196 ctermbg=240 cterm=bold guifg=#ff0000 guibg=#585858 gui=bold', 'hi Plfcd0d0d0f0585858N ctermfg=252 ctermbg=240 cterm=NONE guifg=#d0d0d0 guibg=#585858 gui=NONE', 'hi Ple7fffffff0585858b ctermfg=231 ctermbg=240 cterm=bold guifg=#ffffff guibg=#585858 gui=bold', 'hi Plf0585858ec303030N ctermfg=240 ctermbg=236 cterm=NONE guifg=#585858 guibg=#303030 gui=NONE', 'hi Ple7ffffffec303030N ctermfg=231 ctermbg=236 cterm=NONE guifg=#ffffff guibg=#303030 gui=NONE', 'hi Plf79e9e9eec303030N ctermfg=247 ctermbg=236 cterm=NONE guifg=#9e9e9e guibg=#303030 gui=NONE', 'hi Plec303030ec303030N ctermfg=236 ctermbg=236 cterm=NONE guifg=#303030 guibg=#303030 gui=NONE', 'hi Plfabcbcbcf0585858N ctermfg=250 ctermbg=240 cterm=NONE guifg=#bcbcbc guibg=#585858 gui=NONE', 'hi Plec303030fcd0d0d0b ctermfg=236 ctermbg=252 cterm=bold guifg=#303030 guibg=#d0d0d0 gui=bold', 'hi Plf4808080fcd0d0d0N ctermfg=244 ctermbg=252 cterm=NONE guifg=#808080 guibg=#d0d0d0 gui=NONE', 'hi Pla0d70000f1626262N ctermfg=160 ctermbg=241 cterm=NONE guifg=#d70000 guibg=#626262 gui=NONE', 'hi Ple7fffffff1626262b ctermfg=231 ctermbg=241 cterm=bold guifg=#ffffff guibg=#626262 gui=bold', 'hi Plf1626262f0585858N ctermfg=241 ctermbg=240 cterm=NONE guifg=#626262 guibg=#585858 gui=NONE', 'hi Pl58870000e9121212N ctermfg=88 ctermbg=233 cterm=NONE guifg=#870000 guibg=#121212 gui=NONE', 'hi Plf1626262e9121212N ctermfg=241 ctermbg=233 cterm=NONE guifg=#626262 guibg=#121212 gui=NONE', 'hi Plf58a8a8ae9121212b ctermfg=245 ctermbg=233 cterm=bold guifg=#8a8a8a guibg=#121212 gui=bold', 'hi Ple9121212e9121212N ctermfg=233 ctermbg=233 cterm=NONE guifg=#121212 guibg=#121212 gui=NONE', 'hi Ple7ffffffe9121212N ctermfg=231 ctermbg=233 cterm=NONE guifg=#ffffff guibg=#121212 gui=NONE', 'hi Plf0585858eb262626N ctermfg=240 ctermbg=235 cterm=NONE guifg=#585858 guibg=#262626 gui=NONE', 'hi Pleb262626e9121212N ctermfg=235 ctermbg=233 cterm=NONE guifg=#262626 guibg=#121212 gui=NONE', 'hi Plf58a8a8aeb262626b ctermfg=245 ctermbg=235 cterm=bold guifg=#8a8a8a guibg=#262626 gui=bold', 'hi Plf1626262eb262626N ctermfg=241 ctermbg=235 cterm=NONE guifg=#626262 guibg=#262626 gui=NONE', 'hi Pla0d70000d0ff8700N ctermfg=160 ctermbg=208 cterm=NONE guifg=#d70000 guibg=#ff8700 gui=NONE', 'hi Pl58870000d0ff8700b ctermfg=88 ctermbg=208 cterm=bold guifg=#870000 guibg=#ff8700 gui=bold', 'hi Pld0ff8700f0585858N ctermfg=208 ctermbg=240 cterm=NONE guifg=#ff8700 guibg=#585858 gui=NONE', 'hi Pla0d70000e7ffffffN ctermfg=160 ctermbg=231 cterm=NONE guifg=#d70000 guibg=#ffffff gui=NONE', 'hi Pl17005f5fe7ffffffb ctermfg=23 ctermbg=231 cterm=bold guifg=#005f5f guibg=#ffffff gui=bold', 'hi Ple7ffffff1f0087afN ctermfg=231 ctermbg=31 cterm=NONE guifg=#ffffff guibg=#0087af gui=NONE', 'hi Plc4ff00001f0087afb ctermfg=196 ctermbg=31 cterm=bold guifg=#ff0000 guibg=#0087af gui=bold', 'hi Pl7587d7ff1f0087afN ctermfg=117 ctermbg=31 cterm=NONE guifg=#87d7ff guibg=#0087af gui=NONE', 'hi Ple7ffffff1f0087afb ctermfg=231 ctermbg=31 cterm=bold guifg=#ffffff guibg=#0087af gui=bold', 'hi Pl1f0087af18005f87N ctermfg=31 ctermbg=24 cterm=NONE guifg=#0087af guibg=#005f87 gui=NONE', 'hi Ple7ffffff18005f87N ctermfg=231 ctermbg=24 cterm=NONE guifg=#ffffff guibg=#005f87 gui=NONE', 'hi Pl7587d7ff18005f87N ctermfg=117 ctermbg=24 cterm=NONE guifg=#87d7ff guibg=#005f87 gui=NONE', 'hi Pl18005f8718005f87N ctermfg=24 ctermbg=24 cterm=NONE guifg=#005f87 guibg=#005f87 gui=NONE', 'hi Pl17005f5f7587d7ffb ctermfg=23 ctermbg=117 cterm=bold guifg=#005f5f guibg=#87d7ff gui=bold', 'hi Pl17005f5f7587d7ffN ctermfg=23 ctermbg=117 cterm=NONE guifg=#005f5f guibg=#87d7ff gui=NONE', 'hi Pla0d7000094afd700N ctermfg=160 ctermbg=148 cterm=NONE guifg=#d70000 guibg=#afd700 gui=NONE', 'hi Pl16005f0094afd700b ctermfg=22 ctermbg=148 cterm=bold guifg=#005f00 guibg=#afd700 gui=bold', 'hi Pl94afd700f0585858N ctermfg=148 ctermbg=240 cterm=NONE guifg=#afd700 guibg=#585858 gui=NONE', 'hi Ple7ffffff7caf0000b ctermfg=231 ctermbg=124 cterm=bold guifg=#ffffff guibg=#af0000 gui=bold', 'hi Pl7caf000058870000N ctermfg=124 ctermbg=88 cterm=NONE guifg=#af0000 guibg=#870000 gui=NONE', 'hi Ple7ffffff58870000N ctermfg=231 ctermbg=88 cterm=NONE guifg=#ffffff guibg=#870000 gui=NONE', 'hi Pl5887000058870000N ctermfg=88 ctermbg=88 cterm=NONE guifg=#870000 guibg=#870000 gui=NONE', 'hi Pla0d70000345f0000b ctermfg=160 ctermbg=52 cterm=bold guifg=#d70000 guibg=#5f0000 gui=bold', 'hi Pl345f0000345f0000N ctermfg=52 ctermbg=52 cterm=NONE guifg=#5f0000 guibg=#5f0000 gui=NONE', 'hi Ple7ffffff345f0000N ctermfg=231 ctermbg=52 cterm=NONE guifg=#ffffff guibg=#5f0000 gui=NONE', 'hi Pla0d70000345f0000N ctermfg=160 ctermbg=52 cterm=NONE guifg=#d70000 guibg=#5f0000 gui=NONE', 'hi Ple7fffffff0585858N ctermfg=231 ctermbg=240 cterm=NONE guifg=#ffffff guibg=#585858 gui=NONE', 'hi Plf58a8a8aeb262626N ctermfg=245 ctermbg=235 cterm=NONE guifg=#8a8a8a guibg=#262626 gui=NONE', 'hi Ple7ffffff465faf00b ctermfg=231 ctermbg=70 cterm=bold guifg=#ffffff guibg=#5faf00 gui=bold', 'hi Pl465faf001c008700N ctermfg=70 ctermbg=28 cterm=NONE guifg=#5faf00 guibg=#008700 gui=NONE', 'hi Pl94afd7001c008700N ctermfg=148 ctermbg=28 cterm=NONE guifg=#afd700 guibg=#008700 gui=NONE', 'hi Pl1c0087001c008700N ctermfg=28 ctermbg=28 cterm=NONE guifg=#008700 guibg=#008700 gui=NONE', 'hi Ple7ffffff1c008700N ctermfg=231 ctermbg=28 cterm=NONE guifg=#ffffff guibg=#008700 gui=NONE', 'hi Pl465faf0016005f00b ctermfg=70 ctermbg=22 cterm=bold guifg=#5faf00 guibg=#005f00 gui=bold', 'hi Pl465faf0016005f00N ctermfg=70 ctermbg=22 cterm=NONE guifg=#5faf00 guibg=#005f00 gui=NONE', 'hi Pl16005f0016005f00N ctermfg=22 ctermbg=22 cterm=NONE guifg=#005f00 guibg=#005f00 gui=NONE', 'hi Ple7ffffff16005f00N ctermfg=231 ctermbg=22 cterm=NONE guifg=#ffffff guibg=#005f00 gui=NONE', 'hi Ple7ffffff62875fd7N ctermfg=231 ctermbg=98 cterm=NONE guifg=#ffffff guibg=#875fd7 gui=NONE', 'hi Pl62875fd7e7ffffffN ctermfg=98 ctermbg=231 cterm=NONE guifg=#875fd7 guibg=#ffffff gui=NONE', 'hi Pl375f00afe7ffffffb ctermfg=55 ctermbg=231 cterm=bold guifg=#5f00af guibg=#ffffff gui=bold', 'hi Pl62875fd7375f00afN ctermfg=98 ctermbg=55 cterm=NONE guifg=#875fd7 guibg=#5f00af gui=NONE', 'hi Plc4ff0000375f00afb ctermfg=196 ctermbg=55 cterm=bold guifg=#ff0000 guibg=#5f00af gui=bold', 'hi Pl375f00af375f00afN ctermfg=55 ctermbg=55 cterm=NONE guifg=#5f00af guibg=#5f00af gui=NONE', 'hi Ple7ffffff375f00afN ctermfg=231 ctermbg=55 cterm=NONE guifg=#ffffff guibg=#5f00af gui=NONE', 'hi Plbdd7d7ff375f00afN ctermfg=189 ctermbg=55 cterm=NONE guifg=#d7d7ff guibg=#5f00af gui=NONE', 'hi Pl375f00afe7ffffffN ctermfg=55 ctermbg=231 cterm=NONE guifg=#5f00af guibg=#ffffff gui=NONE', 'hi Pla0d7000000000000N ctermfg=160 ctermbg=0 cterm=NONE guifg=#d70000 guibg=#000000 gui=NONE', 'hi Ple7ffffff00000000b ctermfg=231 ctermbg=0 cterm=bold guifg=#ffffff guibg=#000000 gui=bold', 'hi Pl00000000f0585858N ctermfg=0 ctermbg=240 cterm=NONE guifg=#000000 guibg=#585858 gui=NONE', 'hi Pla0d70000e9121212N ctermfg=160 ctermbg=233 cterm=NONE guifg=#d70000 guibg=#121212 gui=NONE', 'hi Plfcd0d0d0e9121212b ctermfg=252 ctermbg=233 cterm=bold guifg=#d0d0d0 guibg=#121212 gui=bold', 'hi Ple9121212f0585858N ctermfg=233 ctermbg=240 cterm=NONE guifg=#121212 guibg=#585858 gui=NONE', 'hi Pla0d7000018005f87N ctermfg=160 ctermbg=24 cterm=NONE guifg=#d70000 guibg=#005f87 gui=NONE', 'hi Ple7ffffff18005f87b ctermfg=231 ctermbg=24 cterm=bold guifg=#ffffff guibg=#005f87 gui=bold', 'hi Pl18005f87f0585858N ctermfg=24 ctermbg=240 cterm=NONE guifg=#005f87 guibg=#585858 gui=NONE']
-let g:Pl#THEME  = [{'mode_statuslines': {'r': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Ple7ffffffa0d70000b#│%)%(%(%#Ple7ffffffa0d70000b# %{Powerline#Functions#GetMode()} %)%#Pla0d70000f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 's': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000f1626262N#%)%(%(%#Ple7fffffff1626262b# %{Powerline#Functions#GetMode()} %)%#Plf1626262f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 'N': '%( %(%#Pl58870000e9121212N#%{&readonly ? "RO" : ""} %)%(%#Plf1626262e9121212N#%{Powerline#Functions#GetFilepath()}%)%(%#Plf58a8a8ae9121212b#%t %)%(%#Pl58870000e9121212N#%M %)%(%#Pl58870000e9121212N#%H%W %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)%(%#Plf58a8a8aeb262626b#│%(%#Plf58a8a8aeb262626b# LN %3l%)%(%#Plf1626262eb262626N#:%-2v%) %)', 'v': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d7000018005f87N#%)%(%(%#Ple7ffffff18005f87b# %{Powerline#Functions#GetMode()} %)%#Pl18005f87f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 'i': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000e7ffffffN#%)%(%(%#Pl17005f5fe7ffffffb# %{Powerline#Functions#GetMode()} %)%#Ple7ffffff1f0087afN#%)%( %(%#Plc4ff00001f0087afb#%{&readonly ? "RO" : ""} %)%(%#Pl7587d7ff1f0087afN#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7ffffff1f0087afb#%t %)%(%#Plc4ff00001f0087afb#%M %)%(%#Plc4ff00001f0087afb#%H%W %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl18005f8718005f87N#%(%#Pl7587d7ff18005f87N# %{&fileformat} %)%)%(%#Pl7587d7ff18005f87N#│%(%#Pl7587d7ff18005f87N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Pl7587d7ff18005f87N#│%(%#Pl7587d7ff18005f87N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)%(%#Pl7587d7ff1f0087afN#%(%#Pl17005f5f7587d7ffb# LN %3l%)%(%#Pl17005f5f7587d7ffN#:%-2v%) %)', 'n': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000e9121212N#%)%(%(%#Plfcd0d0d0e9121212b# %{Powerline#Functions#GetMode()} %)%#Ple9121212f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)'}, 'matches': ['match', 'any', []]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'N': '%(%(%#Pla0d70000345f0000b# %{"Command-T"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=%(%#Pl345f0000345f0000N#%(%#Pla0d70000345f0000N# %10(Match #%l%) %)%)', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)'}, 'matches': ['match', 'any', [['bufname("%")', 'GoToFile']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'N': '%(%(%#Pla0d70000345f0000b# %{"Gundo"} %)%#Pla0d70000345f0000b#│%)%(%(%#Pla0d70000345f0000N# %{"Undo tree"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%='}, 'matches': ['match', 'any', [['bufname("%")', '__Gundo__']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'N': '%(%(%#Pla0d70000345f0000b# %{"Gundo"} %)%#Pla0d70000345f0000b#│%)%(%(%#Pla0d70000345f0000N# %{"Diff preview"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%='}, 'matches': ['match', 'any', [['bufname("%")', '__Gundo_Preview__']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Help"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %t %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Help"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %t %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['&bt', 'help']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Pager"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %t %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Pager"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %t %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['&ft', 'vimpager']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"LustyExplorer"} %)%#Pl465faf0016005f00b#│%)%(%(%#Pl465faf0016005f00N# %{"Buffer list"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['bufname("%")', '\[LustyExplorer-Buffers\]']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Man page"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %{Powerline#Functions#ft_man#GetName()} %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Man page"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %{Powerline#Functions#ft_man#GetName()} %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['&ft', 'man']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"MiniBufExplorer"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['bufname("%")', '\-MiniBufExplorer\-']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 's': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Quickfix"} %)%#Pleb262626e9121212N#%)%<%#Ple7ffffffe9121212N#%=', 'v': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Quickfix"} %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=', 'n': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%='}, 'matches': ['match', 'any', [['&ft', 'qf']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"Tagbar"} %)%#Pl465faf0016005f00b#│%)%(%(%#Pl465faf0016005f00N# %{"Tree"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['&ft', 'tagbar']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['&ft', 'nerdtree']]]}]
-let g:Pl#THEME_CALLBACKS  = [['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"'], ['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"'], ['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"'], ['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"'], ['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"'], ['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"']]
diff --git a/sources_forked/vim-powerline/README.md b/sources_forked/vim-powerline/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/sources_forked/vim-powerline/README.rst b/sources_forked/vim-powerline/README.rst
deleted file mode 100755
index 72cd84f2..00000000
--- a/sources_forked/vim-powerline/README.rst
+++ /dev/null
@@ -1,107 +0,0 @@
-=================
-Powerline for vim
-=================
-
-:Author: Kim Silkebækken (kim.silkebaekken+vim@gmail.com)
-:Source: https://github.com/Lokaltog/vim-powerline
-:Version: β
-
-Introduction
-------------
-
-Powerline is a utility plugin which allows you to create better-looking, 
-more functional vim statuslines. See the screenshots below for 
-a demonstration of the plugin's capabilities.
-
-It's recommended that you install the plugin using Pathogen_ or Vundle_.  
-After the plugin is installed update your help tags and see ``:help 
-Powerline`` for instructions on how to enable and configure the plugin.
-
-See the `Troubleshooting`_ section below if you're having any issues with 
-the plugin or the font patcher.
-
-**Note:** You need a patched font to be able to use the symbols in the 
-statusline. An experimental Python/fontforge-based font patcher is included 
-in the ``fontpatcher`` directory. See ``fontpatcher/README.rst`` for usage 
-instructions.
-
-.. _Pathogen: https://github.com/tpope/vim-pathogen
-.. _Vundle: https://github.com/gmarik/vundle
-
-Screenshots
------------
-
-.. image:: http://i.imgur.com/MsuIB.png
-
-Troubleshooting
----------------
-
-I can't see the fancy symbols, what's wrong?
-    Make sure that you have ``let g:Powerline_symbols = 'fancy'`` in your 
-    ``vimrc`` file. The settings may be loaded too late if you have this in 
-    ``gvimrc``, so always put this in your ``vimrc``.
-
-    Clear the cache using ``:PowerlineClearCache`` and restart vim.
-
-    Make sure that you've configured gvim or your terminal emulator to use 
-    a patched font.
-
-    Make sure that vim is compiled with the ``--with-features=big`` flag.
-
-The fancy symbols look a bit blurry or "off"!
-    Make sure that you have patched all variants of your font (i.e. both the 
-    regular and the bold font files).
-
-I'm unable to patch my font, what should I do?
-    Font patching is only known to work on most Linux and OS X machines. If 
-    you have followed the instructions in the fontpatcher README and still 
-    have problems, please submit an issue on GitHub.
-
-    You can download some community-contributed patched fonts from the 
-    `Powerline wiki`_ if you don't want to mess around with the font 
-    patcher.
-
-The Syntastic/Fugitive statusline flags don't work!
-    These flags should work without any configuration. If you installed 
-    either plugin after Powerline, you'll have to clear the cache using 
-    ``:PowerlineClearCache`` and restart vim.
-
-The colors are weird in the default OS X Terminal app!
-    The default OS X Terminal app is known to have some issues with the 
-    Powerline colors. Please use another terminal emulator. iTerm2 should 
-    work fine.
-
-    The arrows may have the wrong colors if you have changed the "minimum 
-    contrast" slider in the color tab of  your OS X settings.
-
-The statusline has strange characters like ``^B`` in it!
-    Please add ``set encoding=utf-8`` to your ``vimrc``.
-
-    You may also need to set your ``LANG`` and ``LC_*`` environment 
-    variables to a UTF-8 locale (e.g. ``LANG=en_US.utf8``). Consult your 
-    Linux distro's documentation for information about setting these 
-    variables correctly.
-
-The statusline has a lot of ``^`` or underline characters in it!
-    You need to configure the ``fillchars`` setting to disable statusline 
-    fillchars (see ``:h fillchars`` for details). Add this to your 
-    ``vimrc`` to solve this issue::
-
-        set fillchars+=stl:\ ,stlnc:\ 
-
-The statusline is hidden/only appears in split windows!
-    Make sure that you have ``set laststatus=2`` in your ``vimrc``.
-
-I'm using tmux and Powerline looks like crap, what's wrong?
-    You need to tell tmux that it has 256-color capabilities. Add this to 
-    your ``.tmux.conf`` to solve this issue::
-
-        set -g default-terminal "screen-256color"
-
-    If you use iTerm2, make sure that you have enabled the setting 'Set 
-    locale variables automatically' in Profiles > Terminal > Environment.
-
-If you have any other issues and you can't find the answer in the docs, 
-please submit an issue on GitHub.
-
-.. _`Powerline wiki`: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts
diff --git a/sources_forked/vim-powerline/autoload/Pl.vim b/sources_forked/vim-powerline/autoload/Pl.vim
deleted file mode 100755
index c933030d..00000000
--- a/sources_forked/vim-powerline/autoload/Pl.vim
+++ /dev/null
@@ -1,183 +0,0 @@
-" Powerline - The ultimate statusline utility
-"
-" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-" Source repository: https://github.com/Lokaltog/vim-powerline
-
-" Script variables {{{
-	let g:Pl#OLD_STL = ''
-	let g:Pl#THEME = []
-	let g:Pl#THEME_CALLBACKS = []
-	let g:Pl#HL = []
-
-	" Cache revision, this must be incremented whenever the cache format is changed
-	let s:CACHE_REVISION = 7
-" }}}
-" Script initialization {{{
-	function! Pl#LoadCache() " {{{
-		if filereadable(g:Powerline_cache_file) && g:Powerline_cache_enabled
-			exec 'source' escape(g:Powerline_cache_file, ' \')
-
-			if ! exists('g:Powerline_cache_revision') || g:Powerline_cache_revision != s:CACHE_REVISION
-				" Cache revision differs, cache is invalid
-				unlet! g:Powerline_cache_revision
-
-				return 0
-			endif
-
-			" Create highlighting groups
-			for hi_cmd in g:Pl#HL
-				exec hi_cmd
-			endfor
-
-			" Run theme callbacks
-			for callback in g:Pl#THEME_CALLBACKS
-				" Substitute {{NEWLINE}} with newlines (strings must be
-				" stored without newlines characters to avoid vim errors)
-				exec substitute(callback[0], "{{NEWLINE}}", "\n", 'g')
-				exec substitute(callback[1], "{{NEWLINE}}", "\n", 'g')
-			endfor
-
-			return 1
-		endif
-
-		return 0
-	endfunction " }}}
-	function! Pl#ClearCache() " {{{
-		if filereadable(g:Powerline_cache_file)
-			" Delete the cache file
-			call delete(g:Powerline_cache_file)
-		endif
-
-		echo 'Powerline cache cleared. Please restart vim for the changes to take effect.'
-	endfunction " }}}
-	function! Pl#ReloadColorscheme() " {{{
-		call Pl#ClearCache()
-
-		" The colorscheme and theme files must be manually sourced because
-		" vim won't reload previously autoloaded files
-		"
-		" This is a bit hackish, but it works
-		unlet! g:Powerline#Colorschemes#{g:Powerline_colorscheme}#colorscheme
-		exec "source" split(globpath(&rtp, 'autoload/Powerline/Colorschemes/'. g:Powerline_colorscheme .'.vim', 1), '\n')[0]
-
-		unlet! g:Powerline#Themes#{g:Powerline_theme}#theme
-		exec "source" split(globpath(&rtp, 'autoload/Powerline/Themes/'. g:Powerline_theme .'.vim', 1), '\n')[0]
-
-		let g:Pl#THEME = []
-
-		call Pl#Load()
-	endfunction " }}}
-	function! Pl#Load() " {{{
-		if empty(g:Pl#OLD_STL)
-			" Store old statusline
-			let g:Pl#OLD_STL = &statusline
-		endif
-
-		if ! Pl#LoadCache()
-			try
-				" Autoload the theme dict first
-				let raw_theme = g:Powerline#Themes#{g:Powerline_theme}#theme
-			catch
-				echom 'Invalid Powerline theme! Please check your theme and colorscheme settings.'
-
-				return
-			endtry
-
-			" Create list with parsed statuslines
-			for buffer_statusline in raw_theme
-				unlet! mode_statuslines
-				let mode_statuslines = Pl#Parser#GetStatusline(buffer_statusline.segments)
-
-				if ! empty(buffer_statusline.callback)
-					" The callback function passes its arguments on to
-					" Pl#StatuslineCallback along with the normal/current mode
-					" statusline.
-					let s:cb_func  = "function! PowerlineStatuslineCallback_". buffer_statusline.callback[1] ."(...)\n"
-					let s:cb_func .= "return Pl#StatuslineCallback(". string(mode_statuslines['n']) .", a:000)\n"
-					let s:cb_func .= "endfunction"
-
-					" The callback expression should be used to initialize any
-					" variables that will use the callback function. The
-					" expression requires a %s which will be replaced by the
-					" callback function name.
-					let s:cb_expr  = printf(buffer_statusline.callback[2], 'PowerlineStatuslineCallback_'. buffer_statusline.callback[1])
-
-					exec s:cb_func
-					exec s:cb_expr
-
-					" Newlines must be substituted with another character
-					" because vim doesn't like newlines in strings
-					call add(g:Pl#THEME_CALLBACKS, [substitute(s:cb_func, "\n", "{{NEWLINE}}", 'g'), substitute(s:cb_expr, "\n", "{{NEWLINE}}", 'g')])
-
-					unlet! s:cb_func s:cb_expr
-
-					continue
-				endif
-
-				" Store the statuslines for matching specific buffers
-				call add(g:Pl#THEME, {
-					\ 'matches': buffer_statusline.matches,
-					\ 'mode_statuslines': mode_statuslines
-					\ })
-			endfor
-
-			if ! g:Powerline_cache_enabled
-				" Don't cache anything if caching is disabled or cache file isn't writeable
-				return
-			endif
-
-			" Prepare commands and statuslines for caching
-			let cache = [
-				\ 'let g:Powerline_cache_revision = '. string(s:CACHE_REVISION),
-				\ 'let g:Pl#HL = '. string(g:Pl#HL),
-				\ 'let g:Pl#THEME  = '. string(g:Pl#THEME),
-				\ 'let g:Pl#THEME_CALLBACKS  = '. string(g:Pl#THEME_CALLBACKS),
-			\ ]
-
-			call writefile(cache, g:Powerline_cache_file)
-		endif
-	endfunction " }}}
-" }}}
-" Statusline updater {{{
-	function! Pl#Statusline(statusline, current) " {{{
-		let mode = mode()
-
-		if ! a:current
-			let mode = 'N' " Normal (non-current)
-		elseif mode =~# '\v(v|V|)'
-			let mode = 'v' " Visual mode
-		elseif mode =~# '\v(s|S|)'
-			let mode = 's' " Select mode
-		elseif mode =~# '\vi'
-			let mode = 'i' " Insert mode
-		elseif mode =~# '\v(R|Rv)'
-			let mode = 'r' " Replace mode
-		else
-			" Fallback to normal mode
-			let mode = 'n' " Normal (current)
-		endif
-
-		return g:Pl#THEME[a:statusline].mode_statuslines[mode]
-	endfunction " }}}
-	function! Pl#StatuslineCallback(statusline, args) " {{{
-		" Replace %1, %2, etc. in the statusline with the callback args
-		return substitute(
-			\ a:statusline,
-			\ '\v\%(\d+)',
-			\ '\=a:args[submatch(1)]',
-			\ 'g')
-	endfunction " }}}
-	function! Pl#UpdateStatusline(current) " {{{
-		if empty(g:Pl#THEME)
-			" Load statuslines if they aren't loaded yet
-			call Pl#Load()
-		endif
-
-		for i in range(0, len(g:Pl#THEME) - 1)
-			if Pl#Match#Validate(g:Pl#THEME[i])
-				" Update window-local statusline
-				let &l:statusline = '%!Pl#Statusline('. i .','. a:current .')'
-			endif
-		endfor
-	endfunction " }}}
-" }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Colorscheme.vim b/sources_forked/vim-powerline/autoload/Pl/Colorscheme.vim
deleted file mode 100755
index ec15e461..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Colorscheme.vim
+++ /dev/null
@@ -1,145 +0,0 @@
-function! Pl#Colorscheme#Init(hi) " {{{
-	let colorscheme = {}
-
-	for hi in a:hi
-		" Ensure that the segments are a list
-		let segments = type(hi[0]) == type('') ? [ hi[0] ] : hi[0]
-		let mode_hi_dict = hi[1]
-
-		for segment in segments
-			let colorscheme[segment] = mode_hi_dict
-		endfor
-	endfor
-
-	return colorscheme
-endfunction " }}}
-function! Pl#Colorscheme#Apply(colorscheme, buffer_segments) " {{{
-	" Set color parameters for all segments in a:buffer_segments
-
-	" TODO This function should be recursive and work on both segments and groups
-	" TODO We could probably handle the NS stuff here...
-
-	try
-		let colorscheme = g:Powerline#Colorschemes#{a:colorscheme}#colorscheme
-	catch
-		echom 'Color scheme "'. a:colorscheme .'" doesn''t exist!'
-
-		return
-	endtry
-
-	let buffer_segments = a:buffer_segments
-
-	" This is a bit complex, I'll walk you through exactly what happens here...
-	"
-	" First of all we loop through the buffer_segments, which are the segments that
-	" this specific buffer will have.
-	for buffer_segment in buffer_segments
-		" The buffer_segment consists of a 'matches' list and a 'segments' list.
-		" The 'matches' list has conditions to limit this statusline to specific buffers/windows.
-		" The 'segments' list has each segment and segment group for this buffer
-		for segment in buffer_segment.segments
-			let type = get(segment, 'type', '')
-
-			if type == 'segment_group'
-				" We're going to handle segment groups different from single segments. Segment groups
-				" have child segments which may have their own highlighting (e.g. fileinfo.flags),
-				" and these child segments may be grouped (e.g. fileinfo.flags.ro) to provide very
-				" specific highlighting. So here we'll handle all that:
-
-				" Set the default/fallback colors for this group
-				for i in range(len(segment.variants), 0, -1)
-					" Check for available highlighting for the main group segment
-					"
-					" This works like the segment highlighting below
-					" TODO Create a function for this
-					let seg_variants = join(segment.variants[0:i], '.')
-
-					let seg_name = i > 0 ? segment.name .'.'. seg_variants : segment.name
-					let seg_ns_name = len(segment.ns) > 0 ? segment.ns .':'. seg_name : seg_name
-
-					if has_key(colorscheme, seg_ns_name)
-						" We have a namespaced highlight group
-						let segment.colors = colorscheme[seg_ns_name]
-						break
-					elseif has_key(colorscheme, seg_name)
-						" We have a non-namespaced group
-						let segment.colors = colorscheme[seg_name]
-						break
-					endif
-				endfor
-
-				" The reason why we need to deepcopy the group's segments is that the child segments
-				" all point to the same base segments and that screws up highlighting if we highlight
-				" some child segments with different namespaced colors
-				let segment.segments = deepcopy(segment.segments)
-
-				" Apply colors to each child segment
-				for child_segment in segment.segments
-					" Check if this child segment is grouped (e.g. fileinfo.flags.group.subgroup)
-					" We're going to prioritize the most specific grouping and then work back to the
-					" most common group (e.g. fileinfo.flags)
-
-					" FIXME We don't have the variants from before because group children aren't run through Pl#Segment#Get
-					let child_segment.variants = [seg_name] + split(child_segment.name, '\.')
-
-					" Use the parent group's namespace
-					let child_segment.ns = segment.ns
-
-					for i in range(len(child_segment.variants), 0, -1)
-						" Check for available highlighting for the main group segment
-						let child_seg_name = join(child_segment.variants[0:i], '.')
-
-						let child_seg_ns_name = len(child_segment.ns) > 0 ? child_segment.ns .':'. child_seg_name : child_seg_name
-
-						if has_key(colorscheme, child_seg_ns_name)
-							" We have a namespaced highlight group
-							let child_segment.colors = colorscheme[child_seg_ns_name]
-							break
-						elseif has_key(colorscheme, child_seg_name)
-							" We have a non-namespaced group
-							let child_segment.colors = colorscheme[child_seg_name]
-							break
-						endif
-					endfor
-				endfor
-			elseif type == 'segment'
-				for i in range(len(segment.variants), 0, -1)
-					" Check for available highlighting
-					"
-					" This is done in the following manner, using the segment gundo:static_filename.text.buffer as an example:
-					"
-					" * Look for the hl group: gundo:static_filename.text.buffer
-					" * Look for the hl group:       static_filename.text.buffer
-					" * Look for the hl group: gundo:static_filename.text
-					" * Look for the hl group:       static_filename.text
-					" * Look for the hl group: gundo:static_filename
-					" * Look for the hl group:       static_filename
-					" * Return the segment without highlighting, causing an error in the parser
-					let seg_variants = join(segment.variants[0:i], '.')
-
-					let seg_name = i > 0 ? segment.name .'.'. seg_variants : segment.name
-					let seg_ns_name = len(segment.ns) > 0 ? segment.ns .':'. seg_name : seg_name
-
-					if has_key(colorscheme, seg_ns_name)
-						" We have a namespaced highlight group
-						let segment.colors = colorscheme[seg_ns_name]
-						break
-					elseif has_key(colorscheme, seg_name)
-						" We have a non-namespaced group
-						let segment.colors = colorscheme[seg_name]
-						break
-					endif
-				endfor
-			endif
-
-			unlet! segment
-		endfor
-	endfor
-
-	" Good luck parsing this return value
-	"
-	" It's a huge dict with all segments for all buffers with their respective syntax highlighting.
-	" It will be parsed by the main Powerline code, where all the data will be shortened to a simple
-	" array consiting of a statusline for each mode, with generated highlighting groups and dividers.
-	return buffer_segments
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Hi.vim b/sources_forked/vim-powerline/autoload/Pl/Hi.vim
deleted file mode 100755
index f6b3eea2..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Hi.vim
+++ /dev/null
@@ -1,140 +0,0 @@
-" cterm -> gui color dict {{{
-let s:cterm2gui_dict = {
-	\ 16:  0x000000, 17:  0x00005f, 18:  0x000087, 19:  0x0000af, 20:  0x0000d7, 21:  0x0000ff,
-	\ 22:  0x005f00, 23:  0x005f5f, 24:  0x005f87, 25:  0x005faf, 26:  0x005fd7, 27:  0x005fff,
-	\ 28:  0x008700, 29:  0x00875f, 30:  0x008787, 31:  0x0087af, 32:  0x0087d7, 33:  0x0087ff,
-	\ 34:  0x00af00, 35:  0x00af5f, 36:  0x00af87, 37:  0x00afaf, 38:  0x00afd7, 39:  0x00afff,
-	\ 40:  0x00d700, 41:  0x00d75f, 42:  0x00d787, 43:  0x00d7af, 44:  0x00d7d7, 45:  0x00d7ff,
-	\ 46:  0x00ff00, 47:  0x00ff5f, 48:  0x00ff87, 49:  0x00ffaf, 50:  0x00ffd7, 51:  0x00ffff,
-	\ 52:  0x5f0000, 53:  0x5f005f, 54:  0x5f0087, 55:  0x5f00af, 56:  0x5f00d7, 57:  0x5f00ff,
-	\ 58:  0x5f5f00, 59:  0x5f5f5f, 60:  0x5f5f87, 61:  0x5f5faf, 62:  0x5f5fd7, 63:  0x5f5fff,
-	\ 64:  0x5f8700, 65:  0x5f875f, 66:  0x5f8787, 67:  0x5f87af, 68:  0x5f87d7, 69:  0x5f87ff,
-	\ 70:  0x5faf00, 71:  0x5faf5f, 72:  0x5faf87, 73:  0x5fafaf, 74:  0x5fafd7, 75:  0x5fafff,
-	\ 76:  0x5fd700, 77:  0x5fd75f, 78:  0x5fd787, 79:  0x5fd7af, 80:  0x5fd7d7, 81:  0x5fd7ff,
-	\ 82:  0x5fff00, 83:  0x5fff5f, 84:  0x5fff87, 85:  0x5fffaf, 86:  0x5fffd7, 87:  0x5fffff,
-	\ 88:  0x870000, 89:  0x87005f, 90:  0x870087, 91:  0x8700af, 92:  0x8700d7, 93:  0x8700ff,
-	\ 94:  0x875f00, 95:  0x875f5f, 96:  0x875f87, 97:  0x875faf, 98:  0x875fd7, 99:  0x875fff,
-	\ 100: 0x878700, 101: 0x87875f, 102: 0x878787, 103: 0x8787af, 104: 0x8787d7, 105: 0x8787ff,
-	\ 106: 0x87af00, 107: 0x87af5f, 108: 0x87af87, 109: 0x87afaf, 110: 0x87afd7, 111: 0x87afff,
-	\ 112: 0x87d700, 113: 0x87d75f, 114: 0x87d787, 115: 0x87d7af, 116: 0x87d7d7, 117: 0x87d7ff,
-	\ 118: 0x87ff00, 119: 0x87ff5f, 120: 0x87ff87, 121: 0x87ffaf, 122: 0x87ffd7, 123: 0x87ffff,
-	\ 124: 0xaf0000, 125: 0xaf005f, 126: 0xaf0087, 127: 0xaf00af, 128: 0xaf00d7, 129: 0xaf00ff,
-	\ 130: 0xaf5f00, 131: 0xaf5f5f, 132: 0xaf5f87, 133: 0xaf5faf, 134: 0xaf5fd7, 135: 0xaf5fff,
-	\ 136: 0xaf8700, 137: 0xaf875f, 138: 0xaf8787, 139: 0xaf87af, 140: 0xaf87d7, 141: 0xaf87ff,
-	\ 142: 0xafaf00, 143: 0xafaf5f, 144: 0xafaf87, 145: 0xafafaf, 146: 0xafafd7, 147: 0xafafff,
-	\ 148: 0xafd700, 149: 0xafd75f, 150: 0xafd787, 151: 0xafd7af, 152: 0xafd7d7, 153: 0xafd7ff,
-	\ 154: 0xafff00, 155: 0xafff5f, 156: 0xafff87, 157: 0xafffaf, 158: 0xafffd7, 159: 0xafffff,
-	\ 160: 0xd70000, 161: 0xd7005f, 162: 0xd70087, 163: 0xd700af, 164: 0xd700d7, 165: 0xd700ff,
-	\ 166: 0xd75f00, 167: 0xd75f5f, 168: 0xd75f87, 169: 0xd75faf, 170: 0xd75fd7, 171: 0xd75fff,
-	\ 172: 0xd78700, 173: 0xd7875f, 174: 0xd78787, 175: 0xd787af, 176: 0xd787d7, 177: 0xd787ff,
-	\ 178: 0xd7af00, 179: 0xd7af5f, 180: 0xd7af87, 181: 0xd7afaf, 182: 0xd7afd7, 183: 0xd7afff,
-	\ 184: 0xd7d700, 185: 0xd7d75f, 186: 0xd7d787, 187: 0xd7d7af, 188: 0xd7d7d7, 189: 0xd7d7ff,
-	\ 190: 0xd7ff00, 191: 0xd7ff5f, 192: 0xd7ff87, 193: 0xd7ffaf, 194: 0xd7ffd7, 195: 0xd7ffff,
-	\ 196: 0xff0000, 197: 0xff005f, 198: 0xff0087, 199: 0xff00af, 200: 0xff00d7, 201: 0xff00ff,
-	\ 202: 0xff5f00, 203: 0xff5f5f, 204: 0xff5f87, 205: 0xff5faf, 206: 0xff5fd7, 207: 0xff5fff,
-	\ 208: 0xff8700, 209: 0xff875f, 210: 0xff8787, 211: 0xff87af, 212: 0xff87d7, 213: 0xff87ff,
-	\ 214: 0xffaf00, 215: 0xffaf5f, 216: 0xffaf87, 217: 0xffafaf, 218: 0xffafd7, 219: 0xffafff,
-	\ 220: 0xffd700, 221: 0xffd75f, 222: 0xffd787, 223: 0xffd7af, 224: 0xffd7d7, 225: 0xffd7ff,
-	\ 226: 0xffff00, 227: 0xffff5f, 228: 0xffff87, 229: 0xffffaf, 230: 0xffffd7, 231: 0xffffff,
-	\ 232: 0x080808, 233: 0x121212, 234: 0x1c1c1c, 235: 0x262626, 236: 0x303030, 237: 0x3a3a3a,
-	\ 238: 0x444444, 239: 0x4e4e4e, 240: 0x585858, 241: 0x626262, 242: 0x6c6c6c, 243: 0x767676,
-	\ 244: 0x808080, 245: 0x8a8a8a, 246: 0x949494, 247: 0x9e9e9e, 248: 0xa8a8a8, 249: 0xb2b2b2,
-	\ 250: 0xbcbcbc, 251: 0xc6c6c6, 252: 0xd0d0d0, 253: 0xdadada, 254: 0xe4e4e4, 255: 0xeeeeee
-\ }
-" }}}
-" Allocated color dict {{{
-let s:allocated_colors = {
-	\ 'NONE': 'NONE',
-	\ }
-" }}}
-function! s:Cterm2GUI(cterm) " {{{
-	if toupper(a:cterm) == 'NONE'
-		return 'NONE'
-	endif
-
-	if ! has_key(s:cterm2gui_dict, a:cterm)
-		return 0xff0000
-	endif
-
-	return s:cterm2gui_dict[a:cterm]
-endfunction " }}}
-function! Pl#Hi#Segments(segments, mode_colors) " {{{
-	let mode_translate = {
-		\ 'normal':     'n',
-		\ 'noncurrent': 'N',
-		\ 'insert':     'i',
-		\ 'visual':     'v',
-		\ 'replace':    'r',
-		\ 'select':     's',
-		\ }
-
-	let attributes = ['bold', 'italic', 'underline']
-
-	let segments = a:segments
-	let mode_hi_dict = {}
-
-	" Mode dict
-	for [mode, colors] in items(a:mode_colors)
-		if has_key(mode_translate, mode)
-			let mode = mode_translate[mode]
-		endif
-
-		unlet! fg
-		let fg = s:allocated_colors[colors[0]]
-
-		let hi = {
-			\ 'cterm': [fg['cterm'], ''],
-			\ 'gui'  : [fg['gui'], ''],
-			\ 'attr' : []
-			\ }
-
-		if exists('colors[1]')
-			if type(colors[1]) == type([])
-				" We don't have a BG color, but we have attributes
-				let hi.attr = colors[1]
-			else
-				" The second parameter is the background color
-				unlet! bg
-				let bg = s:allocated_colors[colors[1]]
-
-				let hi.cterm[1] = bg['cterm']
-				let hi.gui[1] = bg['gui']
-			endif
-		endif
-
-		if exists('colors[2]') && type(colors[2]) == type([])
-			" The third parameter is always an attribute list
-			let hi.attr = colors[2]
-		endif
-
-		let mode_hi_dict[mode] = {
-			\ 'ctermfg': (empty(hi['cterm'][0]) ? '' : (string(hi['cterm'][0]) == 'NONE' ? 'NONE' : hi['cterm'][0])),
-			\ 'ctermbg': (empty(hi['cterm'][1]) ? '' : (string(hi['cterm'][1]) == 'NONE' ? 'NONE' : hi['cterm'][1])),
-			\ 'guifg'  : (empty(hi['gui'][0]) ? '' : (string(hi['gui'][0]) == 'NONE' ? 'NONE' : hi['gui'][0])),
-			\ 'guibg'  : (empty(hi['gui'][1]) ? '' : (string(hi['gui'][1]) == 'NONE' ? 'NONE' : hi['gui'][1])),
-			\ 'attr'   : (! len(hi['attr']) ? 'NONE' : join(hi['attr'], ','))
-			\ }
-	endfor
-
-	return [segments, mode_hi_dict]
-endfunction " }}}
-function! Pl#Hi#Allocate(colors) " {{{
-	for [key, color] in items(a:colors)
-		if type(color) == type(0)
-			" Only terminal color
-			let cterm = color
-			let gui = s:Cterm2GUI(color)
-		elseif type(color) == type([]) && len(color) == 2
-			" Terminal and GUI colors
-			let cterm = color[0]
-			let gui = color[1]
-		endif
-
-		let s:allocated_colors[key] = {
-			\ 'cterm': cterm,
-			\ 'gui': gui,
-			\ }
-
-		unlet! color
-	endfor
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Match.vim b/sources_forked/vim-powerline/autoload/Pl/Match.vim
deleted file mode 100755
index b05f5851..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Match.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-function! Pl#Match#Add(pat, expr) " {{{
-	return [a:pat, a:expr]
-endfunction " }}}
-function! Pl#Match#Any(...) " {{{
-	let matches = []
-
-	for match_name in a:000
-		if empty(match_name)
-			" Skip empty match parameters
-			continue
-		endif
-
-		if has_key(g:Powerline#Matches#matches, match_name)
-			call add(matches, g:Powerline#Matches#matches[match_name])
-		endif
-
-		unlet! match_name
-	endfor
-
-	return ['match', 'any', matches]
-endfunction " }}}
-function! Pl#Match#Validate(theme) " {{{
-	let match = a:theme.matches[1]
-
-	if match == 'none'
-		return 0
-	elseif match == 'any'
-		let matches = a:theme.matches[2]
-
-		if ! len(matches)
-			" Empty match array matches everything
-			return 1
-		endif
-
-		for [eval, re] in matches
-			if match(eval(eval), '\v'. re) != -1
-				return 1
-			endif
-		endfor
-
-		return 0
-	endif
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Mod.vim b/sources_forked/vim-powerline/autoload/Pl/Mod.vim
deleted file mode 100755
index fdfb5718..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Mod.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-let s:segment_mods = []
-
-function! Pl#Mod#AddSegmentMod(action, properties) " {{{
-	call add(s:segment_mods, [a:action, a:properties])
-endfunction " }}}
-function! Pl#Mod#ApplySegmentMods(theme) " {{{
-	let theme = deepcopy(a:theme)
-
-	for mod in s:segment_mods
-		let [action, properties] = mod
-
-		" We have to loop through the segments instead of using index() because some
-		" segments are lists!
-		let target_seg_idx = -1
-
-		for i in range(0, len(theme) - 1)
-			unlet! segment
-			let segment = theme[i]
-
-			if type(segment) == type(properties.target_segment) && segment == properties.target_segment
-				let target_seg_idx = i
-				break
-			endif
-		endfor
-
-		if action == 'insert_segment'
-			" Insert segment
-			if target_seg_idx != -1
-				call insert(theme, properties.new_segment, (properties.where == 'before' ? target_seg_idx : target_seg_idx + 1))
-			endif
-		elseif action == 'remove_segment'
-			" Remove segment
-			if target_seg_idx != -1
-				call remove(theme, target_seg_idx)
-			endif
-		endif
-	endfor
-
-	return theme
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Parser.vim b/sources_forked/vim-powerline/autoload/Pl/Parser.vim
deleted file mode 100755
index a6f3428a..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Parser.vim
+++ /dev/null
@@ -1,371 +0,0 @@
-let g:Pl#Parser#Symbols = {
-	\ 'compatible': {
-		\   'dividers': [ '', [0x2502], '', [0x2502] ]
-		\ , 'symbols' : {
-			\   'BRANCH': 'BR:'
-			\ , 'RO'    : 'RO'
-			\ , 'FT'    : 'FT'
-			\ , 'LINE'  : 'LN'
-		\ }
-	\ },
-	\ 'unicode': {
-		\   'dividers': [ [0x25b6], [0x276f], [0x25c0], [0x276e]  ]
-		\ , 'symbols' : {
-			\   'BRANCH': [0x26a1]
-			\ , 'RO'    : [0x2613]
-			\ , 'FT'    : [0x2691]
-			\ , 'LINE'  : [0x204b]
-		\ },
-	\ },
-	\ 'fancy': {
-		\   'dividers': [ [0x2b80], [0x2b81], [0x2b82], [0x2b83] ]
-		\ , 'symbols' : {
-			\   'BRANCH': [0x2b60]
-			\ , 'RO'    : [0x2b64]
-			\ , 'FT'    : [0x2b62, 0x2b63]
-			\ , 'LINE'  : [0x2b61]
-		\ }
-	\ }
-\ }
-
-" Handle symbol overrides
-for [s:key, s:value] in items(g:Powerline_symbols_override)
-	let g:Pl#Parser#Symbols[g:Powerline_symbols].symbols[s:key] = s:value
-
-	unlet! s:key s:value
-endfor
-
-" Handle divider overrides
-if len(g:Powerline_dividers_override) == 4
-	let g:Pl#Parser#Symbols[g:Powerline_symbols].dividers = g:Powerline_dividers_override
-endif
-
-let s:LEFT_SIDE = 0
-let s:RIGHT_SIDE = 2
-
-let s:PADDING = 1
-
-let s:EMPTY_SEGMENT = { 'type': 'empty' }
-
-let s:HARD_DIVIDER = 0
-let s:SOFT_DIVIDER = 1
-
-function! Pl#Parser#GetStatusline(segments) " {{{
-	let statusline = {
-		\   'n': ''
-		\ , 'N': ''
-		\ , 'v': ''
-		\ , 'i': ''
-		\ , 'r': ''
-		\ , 's': ''
-		\ }
-
-	" Run through the different modes and create the statuslines
-	for mode in keys(statusline)
-		" Create an empty statusline list
-		let stl = []
-
-		call extend(stl, s:ParseSegments(mode, s:LEFT_SIDE, a:segments))
-
-		let statusline[mode] .= join(stl, '')
-	endfor
-
-	return statusline
-endfunction " }}}
-function! Pl#Parser#ParseChars(arg) " {{{
-	" Handles symbol arrays which can be either an array of hex values,
-	" or a string. Will convert the hex array to a string, or return the
-	" string as-is.
-	let arg = a:arg
-
-	if type(arg) == type([])
-		" Hex array
-		call map(arg, 'nr2char(v:val)')
-
-		return join(arg, '')
-	endif
-
-	" Anything else, just return it as it is
-	return arg
-endfunction " }}}
-function! s:ParseSegments(mode, side, segments, ...) " {{{
-	let mode     = a:mode
-	let side     = a:side
-	let segments = a:segments
-
-	let level      = exists('a:1') ? a:1 : 0
-	let base_color = exists('a:2') ? a:2 : {}
-
-	let ret = []
-
-	for i in range(0, len(segments) - 1)
-		unlet! seg_prev seg_curr seg_next
-
-		" Prepare some resources (fetch previous, current and next segment)
-		let seg_curr = deepcopy(get(segments, i))
-
-		" Find previous segment
-		let seg_prev = s:EMPTY_SEGMENT
-
-		" If we're currently at i = 0 we have to start on 0 or else we will start on the last segment (list[-1])
-		let range_start = (i == 0 ? i : i - 1)
-		for j in range(range_start, 0, -1)
-			let seg = deepcopy(get(segments, j))
-			if get(seg, 'name') ==# 'TRUNCATE'
-				" Skip truncate segments
-				continue
-			endif
-
-			" Look ahead for another segment that's visible in this mode
-			if index(get(seg, 'modes'), mode) != -1
-				" Use this segment
-				let seg_prev = seg
-
-				break
-			endif
-		endfor
-
-		"" Find next segment
-		let seg_next = s:EMPTY_SEGMENT
-
-		" If we're currently at i = len(segments) - 1 we have to start on i or else we will get an error because the index doesn't exist
-		let range_start = (i == len(segments) - 1 ? i : i + 1)
-		for j in range(range_start, len(segments) - 1, 1)
-			let seg = deepcopy(get(segments, j))
-			if get(seg, 'name') ==# 'TRUNCATE'
-				" Skip truncate segments
-				continue
-			endif
-
-			" Look ahead for another segment that's visible in this mode
-			if index(get(seg, 'modes'), mode) != -1
-				" Use this segment
-				let seg_next = seg
-
-				break
-			endif
-		endfor
-
-		if index(get(seg_curr, 'modes', []), mode) == -1
-			" The segment is invisible in this mode, skip it
-			" FIXME When two segments after each other are hidden, a gap appears where the segments would be, this is probably due to segment padding
-			continue
-		endif
-
-		" Handle the different segment types
-		if seg_curr.type == 'segment'
-			if seg_curr.name ==# 'TRUNCATE'
-				" Truncate statusline
-				call add(ret, '%<')
-			elseif seg_curr.name ==# 'SPLIT'
-				" Split statusline
-
-				" Switch sides
-				let side = s:RIGHT_SIDE
-
-				" Handle highlighting
-				let mode_colors = get(seg_curr.colors, mode, seg_curr.colors['n'])
-				let hl_group = s:HlCreate(mode_colors)
-
-				" Add segment text
-				call add(ret, '%#'. hl_group .'#%=')
-			else
-				" Add segment text
-				let text = seg_curr.text
-
-				" Decide on whether to use the group's colors or the segment's colors
-				let colors = get(seg_curr, 'colors', base_color)
-
-				" Fallback to normal (current) highlighting if we don't have mode-specific highlighting
-				let mode_colors = get(colors, mode, get(colors, 'n', {}))
-
-				if empty(mode_colors)
-					echom 'Segment doesn''t have any colors! NS: "'. seg_curr.ns .'" SEG: "'. seg_curr.name .'"'
-
-					continue
-				endif
-
-				" Check if we're in a group (level > 0)
-				if level > 0
-					" If we're in a group we don't have dividers between
-					" segments, so we should only pad one side, but only pad
-					" if the segment doesn't have Pl#Segment#NoPadding() set
-					let padding_right = (seg_curr.padding && side == s:LEFT_SIDE  ? repeat(' ', s:PADDING) : '')
-					let padding_left  = (seg_curr.padding && side == s:RIGHT_SIDE ? repeat(' ', s:PADDING) : '')
-
-					" Check if we lack a bg/fg color for this segment
-					" If we do, use the bg/fg color from base_color
-					let base_color_mode = ! has_key(base_color, mode) ? base_color['n'] : base_color[mode]
-
-					for col in ['ctermbg', 'ctermfg', 'guibg', 'guifg']
-						if empty(mode_colors[col])
-							let mode_colors[col] = base_color_mode[col]
-						endif
-					endfor
-				else
-					"" If we're outside a group we have dividers and must pad both sides
-					let padding_left  = repeat(' ', s:PADDING)
-					let padding_right = repeat(' ', s:PADDING)
-				endif
-
-				" Get main hl group for segment
-				let hl_group = s:HlCreate(mode_colors)
-
-				" Prepare segment text
-				let text = '%(%#'. hl_group .'#'. padding_left . text . padding_right . '%)'
-
-				if level == 0
-					" Add divider to single segments
-					let text = s:AddDivider(text, side, mode, colors, seg_prev, seg_curr, seg_next)
-				endif
-
-				call add(ret, text)
-			endif
-		elseif seg_curr.type == 'segment_group'
-			" Recursively parse segment group
-			let func_params = [mode, side, seg_curr.segments, level + 1]
-
-			if has_key(seg_curr, 'colors')
-				" Pass the base colors on to the child segments
-				call add(func_params, seg_curr.colors)
-			endif
-
-			" Get segment group string
-			let text = join(call('s:ParseSegments', func_params), '')
-
-			" Pad on the opposite side of the divider
-			let padding_right = (side == s:RIGHT_SIDE ? repeat(' ', s:PADDING) : '')
-			let padding_left  = (side == s:LEFT_SIDE  ? repeat(' ', s:PADDING) : '')
-
-			let text = s:AddDivider(padding_left . text . padding_right, side, mode, seg_curr.colors, seg_prev, seg_curr, seg_next)
-
-			call add(ret, text)
-		endif
-	endfor
-
-	return ret
-endfunction " }}}
-function! s:HlCreate(hl) " {{{
-	" Create a short and unique highlighting group name
-	" It uses the hex values of all the color properties and an attribute flag at the end
-	" NONE colors are translated to NN for cterm and NNNNNN for gui colors
-	let hi_group = printf('Pl%s%s%s%s%s'
-		\ , (a:hl['ctermfg'] == 'NONE' ? 'NN'     : printf('%02x', a:hl['ctermfg']))
-		\ , (a:hl['guifg']   == 'NONE' ? 'NNNNNN' : printf('%06x', a:hl['guifg']  ))
-		\ , (a:hl['ctermbg'] == 'NONE' ? 'NN'     : printf('%02x', a:hl['ctermbg']))
-		\ , (a:hl['guibg']   == 'NONE' ? 'NNNNNN' : printf('%06x', a:hl['guibg']  ))
-		\ , substitute(a:hl['attr'], '\v([a-zA-Z])[a-zA-Z]*,?', '\1', 'g')
-		\ )
-
-	if ! s:HlExists(hi_group)
-		let ctermbg = a:hl['ctermbg'] == 'NONE' ? 'NONE' : printf('%d', a:hl['ctermbg'])
-		if (has('win32') || has('win64')) && !has('gui_running') && ctermbg != 'NONE' && ctermbg > 128
-			let ctermbg -= 128
-		endif
-		let hi_cmd = printf('hi %s ctermfg=%s ctermbg=%s cterm=%s guifg=%s guibg=%s gui=%s'
-			\ , hi_group
-			\ , a:hl['ctermfg'] == 'NONE' ? 'NONE' : printf('%d', a:hl['ctermfg'])
-			\ , ctermbg
-			\ , a:hl['attr']
-			\ , (a:hl['guifg'] == 'NONE' ? 'NONE' : printf('#%06x', a:hl['guifg']))
-			\ , (a:hl['guibg'] == 'NONE' ? 'NONE' : printf('#%06x', a:hl['guibg']))
-			\ , a:hl['attr']
-			\ )
-
-		exec hi_cmd
-
-		" Add command to Pl#HL list for caching
-		call add(g:Pl#HL, hi_cmd)
-	endif
-
-	" Return only the highlighting group name
-	return hi_group
-endfunction " }}}
-function! s:HlExists(hl) " {{{
-	if ! hlexists(a:hl)
-		return 0
-	endif
-
-	redir => hlstatus
-	silent exec 'hi' a:hl
-	redir END
-
-	return (hlstatus !~ 'cleared')
-endfunction " }}}
-function! s:AddDivider(text, side, mode, colors, prev, curr, next) " {{{
-	let seg_prev = a:prev
-	let seg_curr = a:curr
-	let seg_next = a:next
-
-	" Set default color/type for the divider
-	let div_colors = get(a:colors, a:mode, a:colors['n'])
-	let div_type = s:SOFT_DIVIDER
-
-	" Define segment to compare
-	let cmp_seg = a:side == s:LEFT_SIDE ? seg_next : seg_prev
-
-	let cmp_all_colors = get(cmp_seg, 'colors', {})
-	let cmp_colors = get(cmp_all_colors, a:mode, get(cmp_all_colors, 'n', {}))
-
-	if ! empty(cmp_colors)
-		" Compare the highlighting groups
-		"
-		" If the background color for cterm is equal, use soft divider with the current segment's highlighting
-		" If not, use hard divider with a new highlighting group
-		"
-		" Note that if the previous/next segment is the split, a hard divider is always used
-		if get(div_colors, 'ctermbg') != get(cmp_colors, 'ctermbg') || get(seg_next, 'name') ==# 'SPLIT' || get(seg_prev, 'name') ==# 'SPLIT'
-			let div_type = s:HARD_DIVIDER
-
-			" Create new highlighting group
-			if div_colors['attr'] =~ 'reverse' && cmp_colors['attr'] =~ 'reverse'
-				" Use FG = CURRENT FG, BG = CMP FG
-				let div_colors['ctermbg'] = get(cmp_colors, 'ctermfg')
-				let div_colors['guibg']   = get(cmp_colors, 'guifg')
-
-				let div_colors['attr']    = div_colors['attr'] =~ 'bold' ? 'bold' : 'NONE'
-			elseif div_colors['attr'] =~ 'reverse'
-				" Use FG = CURRENT FG, BG = CMP BG
-				let div_colors['ctermbg'] = get(cmp_colors, 'ctermbg')
-				let div_colors['guibg']   = get(cmp_colors, 'guibg')
-
-				let div_colors['attr']    = div_colors['attr'] =~ 'bold' ? 'bold' : 'NONE'
-			elseif cmp_colors['attr'] =~ 'reverse'
-				" Use FG = CMP FG, BG = CURRENT BG : reversed
-				let div_colors['ctermfg'] = get(cmp_colors, 'ctermfg')
-				let div_colors['guifg']   = get(cmp_colors, 'guifg')
-
-				let div_colors['attr']    = 'reverse'
-
-			else
-				" Use FG = CURRENT BG, BG = CMP BG
-				let div_colors['ctermfg'] = get(div_colors, 'ctermbg')
-				let div_colors['guifg']   = get(div_colors, 'guibg')
-
-				let div_colors['ctermbg'] = get(cmp_colors, 'ctermbg')
-				let div_colors['guibg']   = get(cmp_colors, 'guibg')
-
-				let div_colors['attr']    = 'NONE'
-			endif
-		endif
-	endif
-
-	" Prepare divider
-	let divider_raw = deepcopy(g:Pl#Parser#Symbols[g:Powerline_symbols].dividers[a:side + div_type])
-	let divider = Pl#Parser#ParseChars(divider_raw)
-
-	" Don't add dividers for segments adjacent to split (unless it's a hard divider)
-	if ((get(seg_next, 'name') ==# 'SPLIT' || get(seg_prev, 'name') ==# 'SPLIT') && div_type != s:HARD_DIVIDER)
-		return ''
-	endif
-
-	if a:side == s:LEFT_SIDE
-		" Left side
-		" Divider to the right
-		return printf('%%(%s%%#%s#%s%%)', a:text, s:HlCreate(div_colors), divider)
-	else
-		" Right side
-		" Divider to the left
-		return printf('%%(%%#%s#%s%s%%)', s:HlCreate(div_colors), divider, a:text)
-	endif
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Segment.vim b/sources_forked/vim-powerline/autoload/Pl/Segment.vim
deleted file mode 100755
index bb09438c..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Segment.vim
+++ /dev/null
@@ -1,188 +0,0 @@
-let s:default_modes = ['n', 'N', 'v', 'i', 'r', 's']
-
-function! s:CheckConditions(params) " {{{
-	" Check conditions for a segment/group
-	" Integer parameters are always conditions
-	for param in a:params
-		if type(param) == type(0) && param == 0
-			" Break here if it's an integer parameter and it's false (0)
-			return 0
-		endif
-		unlet! param
-	endfor
-
-	return 1
-endfunction " }}}
-function! Pl#Segment#Create(name, ...) " {{{
-	" Check condition parameters
-	if ! s:CheckConditions(a:000)
-		return {}
-	endif
-
-	let name = a:name
-	let modes = s:default_modes
-	let padding = 1
-	let segments = []
-
-	for param in a:000
-		" Lookup modes for this segment/group
-		if type(param) == type([]) && param[0] == 'modes'
-			let modes = param[1]
-		elseif type(param) == type([]) && param[0] == 'nopadding'
-			let padding = 0
-		elseif type(a:1) == type([]) && a:1[0] == 'segment'
-			call add(segments, param[1])
-		endif
-
-		unlet! param
-	endfor
-
-	if type(a:1) == type([]) && a:1[0] == 'segment'
-		" This is a segment group
-		return ['segment_group', {
-			\   'type': 'segment_group'
-			\ , 'name': name
-			\ , 'segments': segments
-			\ , 'modes': modes
-			\ , 'padding': padding
-			\ }]
-	else
-		" This is a single segment
-		let text = a:1
-
-		" Search/replace symbols
-		for [key, symbol] in items(g:Pl#Parser#Symbols[g:Powerline_symbols].symbols)
-			let text = substitute(
-				\ text,
-				\ '\v\$('. key .')',
-				\ '\=Pl#Parser#ParseChars(g:Pl#Parser#Symbols[g:Powerline_symbols].symbols[submatch(1)])',
-				\ 'g')
-
-			unlet! key symbol
-		endfor
-
-		return ['segment', {
-			\   'type': 'segment'
-			\ , 'name': name
-			\ , 'text': text
-			\ , 'modes': modes
-			\ , 'padding': padding
-			\ }]
-	endif
-
-endfunction " }}}
-function! Pl#Segment#Init(params) " {{{
-	" Check condition parameters
-	if ! s:CheckConditions(a:params)
-		return {}
-	endif
-
-	let segments = {}
-	let ns = ''
-
-	for param in a:params
-		if type(param) == type('')
-			" String parameters is the namespace
-			let ns = param
-		elseif type(param) == type([])
-			" The data dict is in param[1]
-			" By default we don't have a namespace for the segment
-			let segment = param[1]
-
-			if ! empty(ns)
-				" Update segment so that it includes the namespace
-				" Add the namespace to the segment dict key
-				let segment.ns = ns
-				let segment.name = join([segment.ns, segment.name], ':')
-			endif
-
-			let key = segment.name
-
-			let segments[key] = segment
-		endif
-
-		unlet! param
-	endfor
-
-	return segments
-endfunction " }}}
-function! Pl#Segment#Modes(modes) " {{{
-	" Handle modes for both segments and groups
-	let modes = split(a:modes, '\zs')
-
-	if modes[0] == '!'
-		" Filter modes (e.g. "!nr" will ignore the segment in normal and replace modes)
-		let modes = filter(deepcopy(s:default_modes), 'v:val !~# "['. join(modes[1:]) .']"')
-	endif
-
-	return ['modes', modes]
-endfunction " }}}
-function! Pl#Segment#NoPadding() " {{{
-	return ['nopadding']
-endfunction " }}}
-function! Pl#Segment#Split(...) " {{{
-	return a:0 ? a:1 .':SPLIT' : 'SPLIT'
-endfunction " }}}
-function! Pl#Segment#Truncate() " {{{
-	return 'TRUNCATE'
-endfunction " }}}
-function! Pl#Segment#Get(name) " {{{
-	" Return a segment data dict
-	let args = []
-
-	" Check for printf segments (lists)
-	if type(a:name) == type([])
-		" We're dealing with a segment with printf arguments
-		let seg_orig_name = a:name[0]
-		let args = a:name[1:]
-	else
-		let seg_orig_name = a:name
-	endif
-
-	" Fetch namespace and variants for storing in the segment dict
-	let seg_ns = ''
-	let seg_variants = []
-
-	" Retrieve color scheme variants
-	let seg_name_split = split(seg_orig_name, '\v\.')
-	if len(seg_name_split) > 1
-		let seg_variants = seg_name_split[1:]
-	endif
-
-	" Retrieve segment name and namespace
-	" Use the first piece of the split string, we can't have variants in the final segment name
-	let seg_name_split = split(seg_name_split[0], '\v:')
-	let seg_name = seg_name_split[0]
-
-	if len(seg_name_split) > 1
-		let seg_ns = seg_name_split[0]
-		let seg_name = seg_name_split[-1]
-	endif
-
-	try
-		" If we have a namespace, try to use the namespaced segment first (i.e. search for the segment in the namespaced file first)
-		let return_segment = deepcopy(g:Powerline#Segments#{seg_ns}#segments[seg_ns .':'. seg_name])
-	catch
-		try
-			" We didn't find a namespaced segment, fall back to common segments
-			let return_segment = deepcopy(g:Powerline#Segments#segments[seg_name])
-		catch
-			" Didn't find the segment among the common segments either, just skip it
-			return {}
-		endtry
-	endtry
-
-	if len(args) && has_key(return_segment, 'text')
-		" Handle segment printf arguments
-		" printf doesn't accept lists as its second argument, so we have to work around that
-		let return_segment.text = call('printf', [ return_segment.text ] + args)
-	endif
-
-	" Assign namespace, name and variants
-	let return_segment.ns = seg_ns
-	let return_segment.name = seg_name
-	let return_segment.orig_name = seg_orig_name
-	let return_segment.variants = seg_variants
-
-	return return_segment
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Pl/Theme.vim b/sources_forked/vim-powerline/autoload/Pl/Theme.vim
deleted file mode 100755
index da1581e2..00000000
--- a/sources_forked/vim-powerline/autoload/Pl/Theme.vim
+++ /dev/null
@@ -1,100 +0,0 @@
-function! Pl#Theme#Create(...) " {{{
-	let buffer_segments = []
-
-	for buffer_segment in a:000
-		" Remove empty segments (e.g. 'Pl#Theme#Function's)
-		if empty(buffer_segment)
-			continue
-		endif
-
-		call add(buffer_segments, buffer_segment)
-	endfor
-
-	let buffer_segments = Pl#Colorscheme#Apply(g:Powerline_colorscheme, buffer_segments)
-
-	return buffer_segments
-endfunction " }}}
-function! Pl#Theme#Callback(name, expr) " {{{
-	return ['callback', a:name, a:expr]
-endfunction " }}}
-function! Pl#Theme#Buffer(ns, ...) " {{{
-	let segments = []
-	let ns = ! empty(a:ns) ? a:ns .':' : ''
-
-	" Match namespace parameter by default
-	let matches = Pl#Match#Any(a:ns)
-	let callback = []
-
-	let args = a:000
-	let args = Pl#Mod#ApplySegmentMods(args)
-
-	" Fetch segment data dicts
-	for item in args
-		if type(item) == type([])
-			if item[0] == 'match'
-				" Match item, overrides default namespace match
-				let matches = item
-
-				unlet! item
-				continue
-			elseif item[0] == 'callback'
-				" Store the item as a callback expression
-				let matches = ['match', 'none']
-				let callback = [a:ns, item[1], item[2]]
-
-				unlet! item
-				continue
-			endif
-
-			" printf segment, append ns to first item in list
-			let item[0] = ns . item[0]
-		else
-			let item = ns . item
-		endif
-
-		let segment = Pl#Segment#Get(item)
-
-		if ! empty(segment)
-			" Skip empty (possible disabled) segments
-			call add(segments, segment)
-		endif
-
-		unlet! item
-	endfor
-
-	return {
-		\   'matches': matches
-		\ , 'callback': callback
-		\ , 'segments': segments
-		\ }
-endfunction " }}}
-function! Pl#Theme#InsertSegment(new_segment, where, target_segment) " {{{
-	" It's very important to NOT refer to the theme dict until everything's loaded!
-	"
-	" Because these functions are called from the vimrc, we need to put the
-	" actions in a list which will be parsed later.
-	"
-	" These functions don't accept a name parameter, because they work on the
-	" currently selected theme (will change any selected theme)
-	call Pl#Mod#AddSegmentMod('insert_segment', {
-		\ 'new_segment': a:new_segment,
-		\ 'where': a:where,
-		\ 'target_segment': a:target_segment
-		\ })
-endfunction " }}}
-function! Pl#Theme#RemoveSegment(target_segment) " {{{
-	" It's very important to NOT refer to the theme dict until everything's loaded!
-	"
-	" Because these functions are called from the vimrc, we need to put the
-	" actions in a list which will be parsed later.
-	"
-	" These functions don't accept a name parameter, because they work on the
-	" currently selected theme (will change any selected theme)
-	call Pl#Mod#AddSegmentMod('remove_segment', {
-		\ 'target_segment': a:target_segment
-		\ })
-endfunction " }}}
-function! Pl#Theme#ReplaceSegment(old_segment, new_segment) " {{{
-	call Pl#Theme#InsertSegment(a:new_segment, 'after', a:old_segment)
-	call Pl#Theme#RemoveSegment(a:old_segment)
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/default.vim b/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/default.vim
deleted file mode 100755
index b28a4871..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/default.vim
+++ /dev/null
@@ -1,166 +0,0 @@
-call Pl#Hi#Allocate({
-	\ 'black'          : 16,
-	\ 'white'          : 231,
-	\
-	\ 'darkestgreen'   : 22,
-	\ 'darkgreen'      : 28,
-	\ 'mediumgreen'    : 70,
-	\ 'brightgreen'    : 148,
-	\
-	\ 'darkestcyan'    : 23,
-	\ 'mediumcyan'     : 117,
-	\
-	\ 'darkestblue'    : 24,
-	\ 'darkblue'       : 31,
-	\
-	\ 'darkestred'     : 52,
-	\ 'darkred'        : 88,
-	\ 'mediumred'      : 124,
-	\ 'brightred'      : 160,
-	\ 'brightestred'   : 196,
-	\
-	\ 'darkestpurple'  : 55,
-	\ 'mediumpurple'   : 98,
-	\ 'brightpurple'   : 189,
-	\
-	\ 'brightorange'   : 208,
-	\ 'brightestorange': 214,
-	\
-	\ 'gray0'          : 233,
-	\ 'gray1'          : 235,
-	\ 'gray2'          : 236,
-	\ 'gray3'          : 239,
-	\ 'gray4'          : 240,
-	\ 'gray5'          : 241,
-	\ 'gray6'          : 244,
-	\ 'gray7'          : 245,
-	\ 'gray8'          : 247,
-	\ 'gray9'          : 250,
-	\ 'gray10'         : 252,
-	\ })
-
-let g:Powerline#Colorschemes#default#colorscheme = Pl#Colorscheme#Init([
-	\ Pl#Hi#Segments(['SPLIT'], {
-		\ 'n': ['white', 'gray2'],
-		\ 'N': ['white', 'gray0'],
-		\ 'i': ['white', 'darkestblue'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['mode_indicator'], {
-		\ 'n': ['gray10', 'gray0', ['bold']],
-		\ 'i': ['darkestcyan', 'white', ['bold']],
-		\ 'v': ['white', 'darkestblue', ['bold']],
-		\ 'r': ['white', 'brightred', ['bold']],
-		\ 's': ['white', 'gray5', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['branch', 'scrollpercent', 'raw', 'filesize'], {
-		\ 'n': ['gray9', 'gray4'],
-		\ 'N': ['gray4', 'gray1'],
-		\ 'i': ['mediumcyan', 'darkblue'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo', 'filename'], {
-		\ 'n': ['white', 'gray4', ['bold']],
-		\ 'N': ['gray7', 'gray0', ['bold']],
-		\ 'i': ['white', 'darkblue', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo.filepath'], {
-		\ 'n': ['gray10'],
-		\ 'N': ['gray5'],
-		\ 'i': ['mediumcyan'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['static_str'], {
-		\ 'n': ['white', 'gray4'],
-		\ 'N': ['gray7', 'gray1'],
-		\ 'i': ['white', 'darkblue'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo.flags'], {
-		\ 'n': ['brightestred', ['bold']],
-		\ 'N': ['darkred'],
-		\ 'i': ['brightestred', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
-		\ 'n': ['gray8', 'gray2'],
-		\ 'i': ['mediumcyan', 'darkestblue'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lineinfo'], {
-		\ 'n': ['gray2', 'gray10', ['bold']],
-		\ 'N': ['gray7', 'gray1', ['bold']],
-		\ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['errors'], {
-		\ 'n': ['brightestorange', 'gray2', ['bold']],
-		\ 'i': ['brightestorange', 'darkestblue', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
-		\ 'n': ['gray6'],
-		\ 'N': ['gray5'],
-		\ 'i': ['darkestcyan'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
-		\ 'n': ['white', 'brightred', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
-		\ 'n': ['white', 'mediumred', ['bold']],
-		\ 'N': ['brightred', 'darkestred', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
-		\ 'n': ['white', 'darkred'],
-		\ 'N': ['brightred', 'darkestred'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
-		\ 'n': ['white', 'darkred'],
-		\ 'N': ['white', 'darkestred'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
-		\ 'n': ['white', 'mediumgreen', ['bold']],
-		\ 'N': ['mediumgreen', 'darkestgreen', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
-		\ 'n': ['brightgreen', 'darkgreen'],
-		\ 'N': ['mediumgreen', 'darkestgreen'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
-		\ 'n': ['white', 'darkgreen'],
-		\ 'N': ['white', 'darkestgreen'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
-		\ 'n': ['brightpurple', 'darkestpurple'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
-		\ 'n': ['white', 'mediumpurple'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:item'], {
-		\ 'n': ['darkestpurple', 'white', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:marked'], {
-		\ 'n': ['brightestred', 'darkestpurple', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:count'], {
-		\ 'n': ['darkestpurple', 'white'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
-		\ 'n': ['white', 'darkestpurple'],
-		\ }),
-	\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/skwp.vim b/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/skwp.vim
deleted file mode 100755
index 798caa44..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Colorschemes/skwp.vim
+++ /dev/null
@@ -1,192 +0,0 @@
-" This theme is based on Solarized-dark colors, combined
-" with Powerline native colors
-call Pl#Hi#Allocate({
-	\ 'black'          : 16,
-	\ 'white'          : 231,
-	\
-	\ 'darkestgreen'   : 22,
-	\ 'darkgreen'      : 28,
-	\ 'mediumgreen'    : 70,
-	\ 'brightgreen'    : 148,
-	\
-	\ 'darkestcyan'    : 23,
-	\ 'mediumcyan'     : 117,
-	\
-	\ 'darkestblue'    : 24,
-	\ 'darkblue'       : 31,
-	\
-	\ 'darkestred'     : 52,
-	\ 'darkred'        : 88,
-	\ 'mediumred'      : 124,
-	\ 'brightred'      : 160,
-	\ 'brightestred'   : 196,
-	\
-	\ 'darkestpurple'  : 55,
-	\ 'mediumpurple'   : 98,
-	\ 'brightpurple'   : 189,
-	\
-	\ 'brightorange'   : 208,
-	\ 'brightestorange': 214,
-	\
-	\ 'gray0'          : 233,
-	\ 'gray1'          : 235,
-	\ 'gray2'          : 236,
-	\ 'gray3'          : 239,
-	\ 'gray4'          : 240,
-	\ 'gray5'          : 241,
-	\ 'gray6'          : 244,
-	\ 'gray7'          : 245,
-	\ 'gray8'          : 247,
-	\ 'gray9'          : 250,
-	\ 'gray10'         : 252,
-	\
-	\ 'base00'         : [241, 0x657b83],
-	\ 'base01'         : [240, 0x586e75],
-	\ 'base02'         : [0, 0x073642],
-	\ 'base03'         : [234, 0x002b36],
-	\ 'base0'          : [244, 0x839496],
-	\ 'base1'          : [245, 0x93a1a1],
-	\ 'base2'          : [254, 0xeee8d5],
-	\ 'base3'          : [230, 0xfdf6e3],
-	\ 'yellow'         : [136, 0xb58900],
-	\ 'orange'         : [166, 0xcb4b16],
-	\ 'red'            : [160, 0xdc322f],
-	\ 'magenta'        : [125, 0xd33682],
-	\ 'violet'         : [61, 0x6c71c4],
-	\ 'blue'           : [33, 0x268bd2],
-	\ 'cyan'           : [37, 0x2aa198],
-	\ 'green'          : [64, 0x859900],
-	\ })
-
-let g:Powerline#Colorschemes#skwp#colorscheme = Pl#Colorscheme#Init([
-	\ Pl#Hi#Segments(['SPLIT'], {
-		\ 'n': ['white', 'base02'],
-		\ 'N': ['white', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['mode_indicator'], {
-		\ 'n': ['darkestgreen', 'brightgreen', ['bold']],
-		\ 'i': ['darkestcyan', 'white', ['bold']],
-		\ 'v': ['red', 'brightorange', ['bold']],
-		\ 'r': ['white', 'violet', ['bold']],
-		\ 's': ['white', 'gray5', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['branch', 'raw', 'filesize'], {
-		\ 'n': ['base03', 'blue'],
-		\ 'N': ['gray5', 'base03'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['scrollpercent'], {
-		\ 'n': ['gray7', 'gray2'],
-		\ 'N': ['base2', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo', 'filename', 'filepath'], {
-		\ 'n': ['base2', 'darkestblue', ['bold']],
-		\ 'N': ['base1', 'base02', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo.filepath'], {
-		\ 'n': ['gray10'],
-		\ 'N': ['gray5'],
-		\ 'i': ['mediumcyan'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['static_str'], {
-		\ 'n': ['base3', 'violet'],
-		\ 'N': ['base1', 'base02'],
-		\ 'i': ['white', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['fileinfo.flags'], {
-		\ 'n': ['base03', ['bold']],
-		\ 'N': ['gray5'],
-		\ 'i': ['base03', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
-		\ 'n': ['gray5', 'gray2'],
-		\ 'i': ['mediumcyan', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lineinfo'], {
-		\ 'n': ['gray2', 'gray10', ['bold']],
-		\ 'N': ['gray7', 'gray1', ['bold']],
-		\ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['errors'], {
-		\ 'n': ['orange', 'base02', ['bold']],
-		\ 'N': ['gray5', 'base03', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
-		\ 'n': ['gray6'],
-		\ 'N': ['gray5'],
-		\ 'i': ['darkestcyan'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
-		\ 'n': ['base3', 'red', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
-		\ 'n': ['base3', 'darkblue', ['bold']],
-		\ 'N': ['base1', 'base03', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
-		\ 'n': ['white', 'base02'],
-		\ 'N': ['gray5', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
-		\ 'n': ['white', 'base02'],
-		\ 'N': ['white', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
-		\ 'n': ['gray10', 'darkestblue', ['bold']],
-		\ 'N': ['gray3', 'base02', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
-		\ 'n': ['base3', 'blue'],
-		\ 'N': ['gray5', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
-		\ 'n': ['gray3', 'base02'],
-		\ 'N': ['gray3', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
-		\ 'n': ['green', 'base03'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
-		\ 'n': ['green', 'base02'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:item'], {
-		\ 'n': ['base2', 'darkestblue', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:marked'], {
-		\ 'n': ['brightgreen', 'base03', ['bold']],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:count'], {
-		\ 'n': ['base0', 'base03'],
-		\ }),
-	\
-	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
-		\ 'n': ['white', 'base03'],
-		\ }),
-  \
-  \ Pl#Hi#Segments(['status'], {
-		\ 'n': ['green', 'base02'],
-		\ 'N': ['gray5', 'base02'],
-    \ }),
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Functions.vim b/sources_forked/vim-powerline/autoload/Powerline/Functions.vim
deleted file mode 100755
index 26db9b36..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Functions.vim
+++ /dev/null
@@ -1,141 +0,0 @@
-" Recalculate the trailing whitespace warning when idle, and after saving
-autocmd CursorHold,BufWritePost,InsertLeave * unlet! b:statusline_trailing_space_warning
-
-function! Powerline#Functions#GetFilepath() " {{{
-	" Recalculate the filepath when cwd changes.
-	let cwd = getcwd()
-	if exists("b:Powerline_cwd") && cwd != b:Powerline_cwd
-		unlet! b:Powerline_filepath
-	endif
-	let b:Powerline_cwd = cwd
-
-	if exists('b:Powerline_filepath')
-		return b:Powerline_filepath
-	endif
-
-	let dirsep = has('win32') && ! &shellslash ? '\' : '/'
-	let filepath = expand('%:p')
-
-	if empty(filepath)
-		return ''
-	endif
-
-	let ret = ''
-
-	if g:Powerline_stl_path_style == 'short'
-		" Display a short path where the first directory is displayed with its
-		" full name, and the subsequent directories are shortened to their
-		" first letter, i.e. "/home/user/foo/foo/bar/baz.vim" becomes
-		" "~/foo/f/b/baz.vim"
-		"
-		" This displays the shortest possible path, relative to ~ or the
-		" current directory.
-		let mod = (exists('+acd') && &acd) ? ':~:h' : ':~:.:h'
-		let fpath = split(fnamemodify(filepath, mod), dirsep)
-		let fpath_shortparts = map(fpath[1:], 'v:val[0]')
-		let ret = join(extend([fpath[0]], fpath_shortparts), dirsep) . dirsep
-	elseif g:Powerline_stl_path_style == 'relative'
-		" Display a relative path, similar to the %f statusline item
-		let ret = fnamemodify(filepath, ':~:.:h') . dirsep
-	elseif g:Powerline_stl_path_style == 'full'
-		" Display the full path, similar to the %F statusline item
-		let ret = fnamemodify(filepath, ':h') . dirsep
-	endif
-
-	if ret == ('.' . dirsep)
-		let ret = ''
-	endif
-
-	let b:Powerline_filepath = ret
-	return ret
-endfunction " }}}
-function! Powerline#Functions#GetShortPath(threshold) " {{{
-	let fullpath = split(substitute(expand('%:p:h'), $HOME, '~', 'g'), '/')
-
-	if len(fullpath) > a:threshold
-		let fullpath = [fullpath[0], '…'] +  fullpath[-a:threshold + 1 :]
-	endif
-
-	return join(fullpath, '/')
-endfunction " }}}
-function! Powerline#Functions#GetMode() " {{{
-	let mode = mode()
-
-	if mode ==# 'v'
-		let mode = get(g:, "Powerline_mode_v", "VISUAL")
-	elseif mode ==# 'V'
-		let mode = get(g:, "Powerline_mode_V", "V⋅LINE")
-	elseif mode ==# ''
-		let mode = get(g:, "Powerline_mode_cv", "V⋅BLOCK")
-	elseif mode ==# 's'
-		let mode = get(g:, "Powerline_mode_s", "SELECT")
-	elseif mode ==# 'S'
-		let mode = get(g:, "Powerline_mode_S", "S⋅LINE")
-	elseif mode ==# ''
-		let mode = get(g:, "Powerline_mode_cs", "S⋅BLOCK")
-	elseif mode =~# '\vi'
-		let mode = get(g:, "Powerline_mode_i", "INSERT")
-	elseif mode =~# '\v(R|Rv)'
-		let mode = get(g:, "Powerline_mode_R", "REPLACE")
-	else
-		" Fallback to normal mode
-		let mode = get(g:, "Powerline_mode_n", "NORMAL")
-	endif
-
-	return mode
-endfunction " }}}
-function! Powerline#Functions#GetFilesize() " {{{
-	let bytes = getfsize(expand("%:p"))
-
-	if bytes <= 0
-		return ''
-	endif
-
-	if bytes < 1024
-		return bytes . 'B'
-	else
-		return (bytes / 1024) . 'kB'
-	endif
-endfunction "}}}
-function! Powerline#Functions#GetCharCode() " {{{
-	" Get the output of :ascii
-	redir => ascii
-	silent! ascii
-	redir END
-
-	if match(ascii, 'NUL') != -1
-		return 'NUL'
-	endif
-
-	" Zero pad hex values
-	let nrformat = '0x%02x'
-
-	let encoding = (&fenc == '' ? &enc : &fenc)
-
-	if encoding == 'utf-8'
-		" Zero pad with 4 zeroes in unicode files
-		let nrformat = '0x%04x'
-	endif
-
-	" Get the character and the numeric value from the return value of :ascii
-	" This matches the two first pieces of the return value, e.g.
-	" "<F>  70" => char: 'F', nr: '70'
-	let [str, char, nr; rest] = matchlist(ascii, '\v\<(.{-1,})\>\s*([0-9]+)')
-
-	" Format the numeric value
-	let nr = printf(nrformat, nr)
-
-	return "'". char ."' ". nr
-endfunction "}}}
-function! Powerline#Functions#GetWSMarker() " {{{
-	" Return '...' if trailing white space is detected
-	" Return '' otherwise
-	if ! exists("b:statusline_trailing_space_warning")
-		if search('\s$', 'nw') != 0
-			let b:statusline_trailing_space_warning = ' … '
-		else
-			let b:statusline_trailing_space_warning = ''
-		endif
-	endif
-	return b:statusline_trailing_space_warning
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Functions/ft_man.vim b/sources_forked/vim-powerline/autoload/Powerline/Functions/ft_man.vim
deleted file mode 100755
index 29135e43..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Functions/ft_man.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-function! Powerline#Functions#ft_man#GetName() " {{{
-	let matches = matchlist(getline(1), '\v^([a-zA-Z_\.\-]+)\((\d+)\)')
-
-	if ! len(matches)
-		return 'n/a'
-	endif
-
-	let file = tolower(matches[1])
-	let num = matches[2]
-
-	return file
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Functions/fugitive.vim b/sources_forked/vim-powerline/autoload/Powerline/Functions/fugitive.vim
deleted file mode 100755
index bb001315..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Functions/fugitive.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-function! Powerline#Functions#fugitive#GetBranch(symbol) " {{{
-	let ret = fugitive#statusline()
-
-	let ret = substitute(ret, '\c\v\[?GIT\(([a-z0-9\-_\./:]+)\)\]?', a:symbol .' \1', 'g')
-
-	return ret
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Functions/hgrev.vim b/sources_forked/vim-powerline/autoload/Powerline/Functions/hgrev.vim
deleted file mode 100755
index 61d94adf..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Functions/hgrev.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-function! Powerline#Functions#hgrev#Status(symbol) " {{{
-	if ! exists('*HGRev')
-		" HGRev hasn't been loaded yet
-		return ''
-	endif
-	if !exists("b:statusline_hg_status")
-		silent execute "RefreshMercurialRev"
-	endif
-	let b:statusline_hg_status=HGRev()
-	if b:statusline_hg_status != '-'
-		let ret = "\u26A1". '' . substitute(b:statusline_hg_status, '^[^ ]*', '\1', 'g')
-		let ret=substitute(ret,' M$','+','g')
-	else
-		let ret=''
-		endif
-	return ret
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Functions/syntastic.vim b/sources_forked/vim-powerline/autoload/Powerline/Functions/syntastic.vim
deleted file mode 100755
index 70c8849e..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Functions/syntastic.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-function! Powerline#Functions#syntastic#GetErrors(line_symbol) " {{{
-	if ! exists('g:syntastic_stl_format')
-		" Syntastic hasn't been loaded yet
-		return ''
-	endif
-
-	" Temporarily change syntastic output format
-	let old_stl_format = g:syntastic_stl_format
-	let g:syntastic_stl_format = '%E{ ERRORS (%e) '. a:line_symbol .' %fe }%W{ WARNINGS (%w) '. a:line_symbol .' %fw }'
-
-	let ret = SyntasticStatuslineFlag()
-
-	let g:syntastic_stl_format = old_stl_format
-
-	return ret
-endfunction " }}}
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Matches.vim b/sources_forked/vim-powerline/autoload/Powerline/Matches.vim
deleted file mode 100755
index 5cce4756..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Matches.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-let g:Powerline#Matches#matches = {
-	\ 'command_t'       : Pl#Match#Add('bufname("%")', 'GoToFile'),
-	\ 'bt_help'         : Pl#Match#Add('&bt'         , 'help'),
-	\ 'ft_man'          : Pl#Match#Add('&ft'         , 'man'),
-	\ 'ft_qf'           : Pl#Match#Add('&ft'         , 'qf'),
-	\ 'ft_vimpager'     : Pl#Match#Add('&ft'         , 'vimpager'),
-	\ 'gundo_preview'   : Pl#Match#Add('bufname("%")', '__Gundo_Preview__'),
-	\ 'gundo_tree'      : Pl#Match#Add('bufname("%")', '__Gundo__'),
-	\ 'lustyexplorer'   : Pl#Match#Add('bufname("%")', '\[LustyExplorer-Buffers\]'),
-	\ 'minibufexplorer' : Pl#Match#Add('bufname("%")', '\-MiniBufExplorer\-'),
-	\ 'tagbar'          : Pl#Match#Add('&ft'         , 'tagbar'),
-	\ 'nerdtree'        : Pl#Match#Add('&ft'         , 'nerdtree'),
-\ }
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments.vim
deleted file mode 100755
index c74c34f3..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-let g:Powerline#Segments#segments = Pl#Segment#Init([
-	\ Pl#Segment#Create('SPLIT'   , '__split__'),
-	\ Pl#Segment#Create('TRUNCATE', '__truncate__'),
-	\
-	\ Pl#Segment#Create('paste_indicator' , '%{&paste ? "PASTE" : ""}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('mode_indicator'  , '%{Powerline#Functions#GetMode()}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('fileinfo',
-		\ Pl#Segment#Create('flags.ro'    , '%{&readonly ? "$RO" : ""}'),
-		\ Pl#Segment#Create('filepath'    , '%{Powerline#Functions#GetFilepath()}', Pl#Segment#NoPadding()),
-		\ Pl#Segment#Create('filename'    , '%t'),
-		\ Pl#Segment#Create('flags.mod'   , '%M'),
-		\ Pl#Segment#Create('flags.type'  , '%H%W'),
-	\ ),
-	\ Pl#Segment#Create('filename'        , '%t'),
-	\ Pl#Segment#Create('filesize'        , '%{Powerline#Functions#GetFilesize()}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('pwd'             , '%{substitute(getcwd(), expand("$HOME"), "~", "g")}'),
-	\ Pl#Segment#Create('static_str'      , '%%{"%s"}'),
-	\ Pl#Segment#Create('raw'             , '%s'),
-	\ Pl#Segment#Create('fileformat'      , '%{&fileformat}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('fileencoding'    , '%{(&fenc == "" ? &enc : &fenc)}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('filetype'        , '%{strlen(&ft) ? &ft : "no ft"}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('scrollpercent'   , '%3p%%'),
-	\ Pl#Segment#Create('lineinfo',
-		\ Pl#Segment#Create('line.cur'    , '$LINE %3l'),
-		\ Pl#Segment#Create('line.tot'    , ':%-2v', Pl#Segment#NoPadding()),
-	\ ),
-	\ Pl#Segment#Create('charcode'        , '%{Powerline#Functions#GetCharCode()}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('currhigroup'     , '%{synIDattr(synID(line("."), col("."), 1), "name")}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('ws_marker'       , '%{Powerline#Functions#GetWSMarker()}', Pl#Segment#Modes('!N')),
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/ctrlp.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
deleted file mode 100755
index 41c5ebfc..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
+++ /dev/null
@@ -1,20 +0,0 @@
-if !exists("g:Powerline#Segments#ctrlp#segments#focus ")
-	let g:Powerline#Segments#ctrlp#segments#focus = '%{"%0"}'
-endif
-if !exists("g:Powerline#Segments#ctrlp#segments#prev ")
-	let g:Powerline#Segments#ctrlp#segments#prev = '%-3{"%3"}'
-endif
-if !exists("g:Powerline#Segments#ctrlp#segments#next ")
-	let g:Powerline#Segments#ctrlp#segments#next = '%-3{"%5"}'
-endif
-
-let g:Powerline#Segments#ctrlp#segments = Pl#Segment#Init(['ctrlp'
-	\ , Pl#Segment#Create('focus', g:Powerline#Segments#ctrlp#segments#focus)
-	\ , Pl#Segment#Create('byfname', '%{"%1"}')
-	\ , Pl#Segment#Create('prev', g:Powerline#Segments#ctrlp#segments#prev)
-	\ , Pl#Segment#Create('item', '%-9{"%4"}')
-	\ , Pl#Segment#Create('next', g:Powerline#Segments#ctrlp#segments#next)
-	\ , Pl#Segment#Create('marked', '%{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)}')
-	\
-	\ , Pl#Segment#Create('count', '%-6{"%0"}')
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/ft_man.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/ft_man.vim
deleted file mode 100755
index 6ed0cc30..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/ft_man.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-let g:Powerline#Segments#ft_man#segments = Pl#Segment#Init(['ft_man',
-	\ Pl#Segment#Create('filename', '%{Powerline#Functions#ft_man#GetName()}')
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/fugitive.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/fugitive.vim
deleted file mode 100755
index bb46eeca..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/fugitive.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#fugitive#segments = Pl#Segment#Init(['fugitive',
-	\ (exists('g:loaded_fugitive') && g:loaded_fugitive == 1),
-	\
-	\ Pl#Segment#Create('branch', '%{Powerline#Functions#fugitive#GetBranch("$BRANCH")}')
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/hgrev.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/hgrev.vim
deleted file mode 100755
index 3e651d13..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/hgrev.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-let g:Powerline#Segments#hgrev#segments = Pl#Segment#Init(['hgrev',
-	\ (exists('hgrev_loaded')),
-	\ Pl#Segment#Create('branch', '%{Powerline#Functions#hgrev#Status("$BRANCH")}')
-  \ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/rvm.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/rvm.vim
deleted file mode 100755
index c840632d..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/rvm.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-let g:Powerline#Segments#rvm#segments = Pl#Segment#Init(['rvm',
-	\ (exists('g:loaded_rvm') && g:loaded_rvm == 1),
-	\
-	\ Pl#Segment#Create('string', '%{rvm#string()}'),
-	\ Pl#Segment#Create('statusline', '%{rvm#statusline()}')
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/syntastic.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/syntastic.vim
deleted file mode 100755
index 5a893d6e..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/syntastic.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#syntastic#segments = Pl#Segment#Init(['syntastic',
-	\ (exists('g:loaded_syntastic_plugin') && g:loaded_syntastic_plugin == 1),
-	\
-	\ Pl#Segment#Create('errors', '%{Powerline#Functions#syntastic#GetErrors("$LINE")}', Pl#Segment#Modes('!N'))
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/tagbar.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/tagbar.vim
deleted file mode 100755
index 5db8cd95..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/tagbar.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-let g:Powerline#Segments#tagbar#segments = Pl#Segment#Init(['tagbar',
-	\ (exists(':Tagbar') > 0),
-	\
-	\ Pl#Segment#Create('currenttag', '%{tagbar#currenttag("%s", "")}', Pl#Segment#Modes('!N')),
-	\ Pl#Segment#Create('fullcurrenttag', '%{tagbar#currenttag("%s", "", "f")}', Pl#Segment#Modes('!N'))
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Segments/virtualenv.vim b/sources_forked/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
deleted file mode 100755
index 8c7d6fb5..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#virtualenv#segments = Pl#Segment#Init(['virtualenv',
-	\ has('python') && (exists('g:virtualenv_loaded') && g:virtualenv_loaded == 1),
-	\
-	\ Pl#Segment#Create('statusline', '%{virtualenv#statusline()}')
-\ ])
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Themes/default.vim b/sources_forked/vim-powerline/autoload/Powerline/Themes/default.vim
deleted file mode 100755
index a97d5b9c..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Themes/default.vim
+++ /dev/null
@@ -1,116 +0,0 @@
-let g:Powerline#Themes#default#theme = Pl#Theme#Create(
-	\ Pl#Theme#Buffer(''
-		\ , 'paste_indicator'
-		\ , 'mode_indicator'
-		\ , 'fugitive:branch'
-		\ , 'hgrev:branch'
-		\ , 'fileinfo'
-		\ , 'syntastic:errors'
-		\ , Pl#Segment#Truncate()
-		\ , 'tagbar:currenttag'
-		\ , Pl#Segment#Split()
-		\ , 'rvm:string'
-		\ , 'virtualenv:statusline'
-		\ , 'fileformat'
-		\ , 'fileencoding'
-		\ , 'filetype'
-		\ , 'scrollpercent'
-		\ , 'lineinfo'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('command_t'
-		\ , ['static_str.name', 'Command-T']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , ['raw.line', '%10(Match #%l%)']
-	\ ),
-	\
-	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
-		\ , ['static_str.name', 'Gundo']
-		\ , ['static_str.buffer', 'Undo tree']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
-		\ , ['static_str.name', 'Gundo']
-		\ , ['static_str.buffer', 'Diff preview']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('bt_help'
-		\ , ['static_str.name', 'Help']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_vimpager'
-		\ , ['static_str.name', 'Pager']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('lustyexplorer'
-		\ , ['static_str.name', 'LustyExplorer']
-		\ , ['static_str.buffer', 'Buffer list']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_man'
-		\ , ['static_str.name', 'Man page']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('minibufexplorer'
-		\ , ['static_str.name', 'MiniBufExplorer']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_qf'
-		\ , ['static_str.name', 'Quickfix']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('tagbar'
-		\ , ['static_str.name', 'Tagbar']
-		\ , ['static_str.buffer', 'Tree']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
-		\ , 'ctrlp:prev'
-		\ , 'ctrlp:item'
-		\ , 'ctrlp:next'
-		\ , 'ctrlp:marked'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'ctrlp:focus'
-		\ , 'ctrlp:byfname'
-		\ , 'pwd'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
-		\ , 'ctrlp:count'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'pwd'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('nerdtree'
-		\ , ['raw.name', '%{Powerline#Functions#GetShortPath(4)}']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ )
-\ )
diff --git a/sources_forked/vim-powerline/autoload/Powerline/Themes/skwp.vim b/sources_forked/vim-powerline/autoload/Powerline/Themes/skwp.vim
deleted file mode 100755
index 64ed1342..00000000
--- a/sources_forked/vim-powerline/autoload/Powerline/Themes/skwp.vim
+++ /dev/null
@@ -1,116 +0,0 @@
-" Disabled:
-" Add the following line into the first theme group to see the highlight
-" group
-" \ , 'currhigroup'
-"
-" Line info taken out - I know which line number I'm on from the gutter
-"\ , 'lineinfo'
-let g:Powerline#Themes#skwp#theme = Pl#Theme#Create(
-	\ Pl#Theme#Buffer(''
-		\ , 'fugitive:branch'
-		\ , 'fileinfo'
-		\ , 'flags.mod'
-		\ , 'syntastic:errors'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'sass:status'
-		\ , 'rvm:string'
-		\ , 'paste_indicator'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('command_t'
-		\ , ['static_str.name', 'Command-T']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , ['raw.line', '%10(Match #%l%)']
-	\ ),
-	\
-	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
-		\ , ['static_str.name', 'Gundo']
-		\ , ['static_str.buffer', 'Undo tree']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
-		\ , ['static_str.name', 'Gundo']
-		\ , ['static_str.buffer', 'Diff preview']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('bt_help'
-		\ , ['static_str.name', 'Help']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_vimpager'
-		\ , ['static_str.name', 'Pager']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('lustyexplorer'
-		\ , ['static_str.name', 'LustyExplorer']
-		\ , ['static_str.buffer', 'Buffer list']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_man'
-		\ , ['static_str.name', 'Man page']
-		\ , 'filename'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'scrollpercent'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('minibufexplorer'
-		\ , ['static_str.name', 'MiniBufExplorer']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ft_qf'
-		\ , ['static_str.name', 'Quickfix']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('tagbar'
-		\ , ['static_str.name', 'Tagbar']
-		\ , ['static_str.buffer', 'Tree']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
-		\ , 'ctrlp:prev'
-		\ , 'ctrlp:item'
-		\ , 'ctrlp:next'
-		\ , 'ctrlp:marked'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'ctrlp:focus'
-		\ , 'ctrlp:byfname'
-		\ , 'pwd'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
-		\ , 'ctrlp:count'
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-		\ , 'pwd'
-	\ ),
-	\
-	\ Pl#Theme#Buffer('nerdtree'
-		\ , ['raw.name', '%{Powerline#Functions#GetShortPath(4)}']
-		\ , Pl#Segment#Truncate()
-		\ , Pl#Segment#Split()
-	\ )
-\ )
diff --git a/sources_forked/vim-powerline/doc/Powerline.txt b/sources_forked/vim-powerline/doc/Powerline.txt
deleted file mode 100755
index 33d136fd..00000000
--- a/sources_forked/vim-powerline/doc/Powerline.txt
+++ /dev/null
@@ -1,429 +0,0 @@
-*Powerline.txt*	For Vim version 7.3.	Last change: 2011 Nov 23
-
-                                            ______
-         _________                          \    /__
-         \_____   \______  _  _____________ /   /'__' ___   ____
-          |    ___/  _ \ \/ \/ / __ \_  ___\   / |  |/   \_/ __ \
-          |   |  |  (_) \  _  /  ___/|  |  /  /__|  |  |  \  ___/
-          '___'   \____/ \/ \/ \___  |__' /___  /'__'__|  /\___ \
-                                   \/        / /        \/     \/
-                                            | /
-                                            |/
-                                            '
-
-==============================================================================
-CONTENTS                                                  *Powerline-contents*
-
-    1. Introduction ....................... |Powerline-introduction|
-    2. Usage .............................. |Powerline-usage|
-    3. Requirements ....................... |Powerline-requirements|
-       3.1 Recommended settings ........... |Powerline-recommended-settings|
-    4. Configuration ...................... |Powerline-configuration|
-       4.1 Powerline_cache_file ........... |Powerline_cache_file|
-           4.1.1 Clearing the cache ....... |:PowerlineClearCache|
-       4.2 Powerline_cache_enabled ........ |Powerline_cache_enabled|
-       4.3 Powerline_symbols .............. |Powerline_symbols|
-           4.3.1 Compatible symbols ....... |Powerline-symbols-compatible|
-           4.3.2 Fancy symbols ............ |Powerline-symbols-fancy|
-           4.3.3 Overriding symbols ....... |Powerline_symbols_override|
-           4.3.4 Overriding dividers ...... |Powerline_dividers_override|
-       4.4 Powerline_theme ................ |Powerline_theme|
-       4.5 Powerline_colorscheme .......... |Powerline_colorscheme|
-       4.6 Powerline_stl_path_style ....... |Powerline_stl_path_style|
-    5. Fonts .............................. |Powerline-fonts|
-    6. Customization ...................... |Powerline-customization|
-       6.1 Basic customization ............ |Powerline-basic-customization|
-       6.2 Advanced customization ......... |Powerline-advanced-customization|
-           6.2.1 Colorschemes ............. |Powerline-cust-colorschemes|
-           6.2.2 Functions ................ |Powerline-cust-functions|
-           6.2.3 Segments ................. |Powerline-cust-segments|
-           6.2.4 Themes ................... |Powerline-cust-themes|
-    7. License ............................ |Powerline-license|
-    8. Known issues ....................... |Powerline-known-issues|
-    9. Contributing ....................... |Powerline-contributing|
-
-==============================================================================
-1. Introduction                           *Powerline* *Powerline-introduction*
-
-Powerline is a utility plugin which allows you to create better-looking, more 
-functional Vim statuslines.
-
-==============================================================================
-2. Usage                                                     *Powerline-usage*
-
-Powerline is automatically enabled when it's installed, either by unzipping 
-the provided archive or by adding it as a Pathogen/Vundle bundle.
-
-Powerline replaces the standard Vim 'statusline' with a custom statusline made 
-up of Powerline segments.
-
-Powerline ignores any 'statusline' customizations you have defined in your 
-|vimrc|. If you remove Powerline, your 'statusline' customizations are 
-restored.
-
-==============================================================================
-3. Requirements                                       *Powerline-requirements*
-
-Powerline has been developed and tested in Vim 7.3, but it should run without 
-any problems in Vim 7.2. The default configuration requires a Unix-like system 
-to work properly.
-
-The plugin only works with Vim running in an 88/256-color terminal or Gvim.
-
-Vi-compatible mode must be disabled.
-
-------------------------------------------------------------------------------
-3.1 Recommended settings                      *Powerline-recommended-settings*
-
-The following configuration options should be set in your |vimrc|: >
-
-    set nocompatible   " Disable vi-compatibility
-    set laststatus=2   " Always show the statusline
-    set encoding=utf-8 " Necessary to show Unicode glyphs
-
-Note: If you're using an 88/256-color terminal but still don't see the colored 
-statusline, you may have to set the following option as well: >
-
-    set t_Co=256 " Explicitly tell Vim that the terminal supports 256 colors
-
-==============================================================================
-4. Configuration                                     *Powerline-configuration*
-
-Powerline will work fine without any user configuration, but default behavior 
-can be overridden by setting configuration variables globally in your |vimrc| 
-file.
-
-------------------------------------------------------------------------------
-4.1 Powerline_cache_file                                *Powerline_cache_file*
-
-By default Powerline caches all the statuslines and colors in a cache file in 
-the plugin's directory (or the Vim directory, depending on the installation 
-method used).
-
-It's recommended that you enable the cache, as this dramatically improves Vim 
-startup time after the cache file has been generated (the plugin usually loads 
-within ~100ms without the cache and ~1ms with the cache).
-
-Note: The default cache filename includes the current theme, colorscheme and 
-symbol settings in order to tie the cache file to your current configuration, 
-so the cache file will be regenerated when you change any settings. This may 
-leave several old cache files in your Vim folder, and these may safely be 
-deleted.
-
-Defaults: "<plugin_directory>/Powerline_<theme>_<colorscheme>_<symbols>.cache"
-
-------------------------------------------------------------------------------
-4.1.1 Clearing the cache                                *:PowerlineClearCache*
-
-Powerline provides a command to easily clear the cache after changing your 
-settings or updating your theme. Simply run the following command to clear 
-your cache, and restart Vim afterwards: >
-
-    :PowerlineClearCache
-<
-------------------------------------------------------------------------------
-4.2 Powerline_cache_enabled                          *Powerline_cache_enabled*
-
-It's possible to disable statusline caching by setting this option to 0. This 
-is mostly useful when developing statuslines.
-
-Example: >
-
-    let g:Powerline_cache_enabled = 0
-<
-
-Default: 1
-
-------------------------------------------------------------------------------
-4.3 Powerline_symbols                                      *Powerline_symbols*
-
-This option defines which set of symbols and dividers you want to use. There 
-are currently three available options: "compatible", "unicode" and "fancy".
-
-    TYPE           DESCRIPTION ~
-    compatible     Doesn't use any special characters.
-    unicode        Simulates icons and arrows using similar Unicode glyphs.
-    fancy          Custom icons and arrows. Requires a patched font.
-
-Example: >
-
-    let g:Powerline_symbols = 'fancy'
-<
-
-Default: "compatible"
-
-Symbols can be inserted into statuslines by using the following variables 
-(just insert the variables as text in your segments):
-
-    VARIABLE       DESCRIPTION ~
-    $BRANCH        Inserts a branch symbol
-    $RO            Inserts a read-only symbol
-    $FT            Inserts a filetype symbol
-    $LINE          Inserts a line number symbol
-
-------------------------------------------------------------------------------
-4.3.1 Compatible symbols                        *Powerline-symbols-compatible*
-
-These symbols will work in any configuration, and do not require a special 
-font to work. This option will replace the fancy icons with plain text, and 
-the pointy dividers with straight lines.
-
-------------------------------------------------------------------------------
-4.3.2 Fancy symbols                                  *Powerline-symbols-fancy*
-
-These symbols require a custom font to work. A font patcher is provided for 
-adding the required symbols to any outline font and some bitmap fonts, see 
-|Powerline-fonts| and the provided README file for usage details.
-
-------------------------------------------------------------------------------
-4.3.3 Overriding symbols                          *Powerline_symbols_override*
-
-You can override symbols by adding your symbols to the 
-g:Powerline_symbols_override dictionary. Example: If you want the branch 
-symbol to be "∓" (hex code 0x2213) and the line symbol to be "L" you can add 
-the following to your |vimrc|: >
-
-    let g:Powerline_symbols_override = {
-        \ 'BRANCH': [0x2213],
-        \ 'LINE': 'L',
-        \ }
-<
-------------------------------------------------------------------------------
-4.3.4 Overriding dividers                        *Powerline_dividers_override*
-
-If you for some reason want to override the dividers then you can set 
-g:Powerline_dividers_override to a list with exactly four elements:
-
-    1: Hard right-pointing arrow
-    2: Soft right-pointing arrow
-    3: Hard left-pointing arrow
-    4: Soft left-pointing arrow
-
-Example: >
-
-    let g:Powerline_dividers_override = ['>>', '>', '<<', '<']
-<
-
-------------------------------------------------------------------------------
-4.3.5 Overriding mode names                                   *Powerline_mode*
-
-You can change the names used for modes at the far left by setting some
-variables in your |vimrc|. For example you can change "N" to "NORMAL" with: >
-
-    let g:Powerline_mode_n = 'NORMAL'
-<
-The variables are all named beginning with 'g:Powerline_mode_', as follows:
-
-mode                name    default       note ~
-Normal              n       ' N '         (surrounded by spaces)
-Insert              i       INSERT
-Replace             R       REPLACE       |Replace-mode|
-Visual              v       VISUAL        |Visual-mode|
-Visual linewise     V       V⋅LINE
-Visual blockwise    cv      V⋅BLOCK
-Select              s       SELECT        |Select-mode|
-Select linewise     S       S⋅LINE
-Select blockwise    cs      S⋅BLOCK
-
------------------------------------------------------------------------------
-4.4 Powerline_theme                                          *Powerline_theme*
-
-This option defines the theme Powerline uses. The available themes are located 
-in autoload/Powerline/Themes/. A theme is a pre-defined set of Powerline 
-segments which make up the statusline.
-
-Example: >
-
-    let g:Powerline_theme = 'skwp'
-<
-
-Default: "default"
-
-------------------------------------------------------------------------------
-4.5 Powerline_colorscheme                              *Powerline_colorscheme*
-
-This option defines the colorscheme Powerline uses. The available colorschemes 
-are located in autoload/Powerline/Colorschemes/.
-
-Example: >
-
-    let g:Powerline_colorscheme = 'skwp'
-<
-
-Default: "default"
-
-------------------------------------------------------------------------------
-4.6 Powerline_stl_path_style                        *Powerline_stl_path_style*
-
-There are currently four ways to display the current path and file name. The 
-default is to only display the file name like the %t statusline item. By 
-setting this configuration value you can choose from the following ways 
-display the current path and file name:
-
-    VALUE      DESCRIPTION ~
-    filename   Display only the file name using the %t statusline item.
-    short      Display a short path. The home directory is substituted with
-               "~", the first directory is displayed with its full name, and
-               subsequent directories are shortened to their first letter.
-               I.e. "/home/user/foo/bar/baz.vim" becomes "~/f/b/baz.vim" and
-               "long/relative/path/foo/bar/baz.vim becomes
-               "long/r/p/f/b/baz.vim".
-    relative   Display a relative path, similar to the %f statusline item.
-    full       Display the full path, similar to the %F statusline item.
-
-Example: >
-
-    let g:Powerline_stl_path_style = 'full'
-<
-
-Default: "relative"
-
-==============================================================================
-5. Fonts                                                     *Powerline-fonts*
-
-TODO
-
-==============================================================================
-6. Customization                                     *Powerline-customization*
-
-There are currently two ways of customizing Powerline: Basic customization 
-using a couple of functions to insert and remove existing segments from the 
-statusline, and advanced customization using your own autoload files. The 
-customization features of Powerline allow you to create your own statuslines 
-without ever touching the original source code.
-
-------------------------------------------------------------------------------
-6.1 Basic customization                        *Powerline-basic-customization*
-
-Powerline provides the following functions to alter the default statusline 
-look. These functions should be called from your |vimrc| file or another file 
-which is sourced at Vim startup.
-
-Note: These functions are currently applied to all statuslines, so if you 
-insert a segment after a segment which is present in many statuslines (e.g.  
-the "filename" segment), all the statuslines will have the inserted segment.  
-This behavior may be changed in a future version of Powerline.
-
-Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
-your statusline!
-
-Example: >
-
-    " Insert the charcode segment after the filetype segment
-    call Pl#Theme#InsertSegment('charcode', 'after', 'filetype')
-
-    " Replace the scrollpercent segment with the charcode segment
-    call Pl#Theme#ReplaceSegment('scrollpercent', 'fileinfo')
-<
-                                                      *Pl#Theme#InsertSegment*
-Pl#Theme#InsertSegment({newsegment}, {location}, {targetsegment})
-
-This function inserts {newsegment} before or after {targetsegment}. The 
-{location} parameter specifies the location of the new segment, valid values 
-are "before" and "after". You can see all the available segments in 
-autoload/Powerline/Segments.vim and the files specified in 
-|Powerline-cust-segments|.
-
-Pl#Theme#RemoveSegment({targetsegment})               *Pl#Theme#RemoveSegment*
-
-This function removes the {targetsegment} segment entirely.
-
-Pl#Theme#ReplaceSegment({oldsegment}, {newsegment})  *Pl#Theme#ReplaceSegment*
-
-This function replaces {oldsegment} with {newsegment}.
-
-------------------------------------------------------------------------------
-6.2 Advanced customization                  *Powerline-advanced-customization*
-
-Because Powerline utilizes Vim's autoload functionality, you can easily create 
-your own segments, themes, functions and colorschemes without touching the 
-original source code. This is a bit more complex than using the utility 
-functions, but it allows you to do a lot more with your statusline.
-
-Your custom autoload files should be stored in your |runtimepath| (usually in 
-"~/.vim/autoload/Powerline/*").
-
-Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
-your statusline!
-
-6.2.1 Colorschemes                               *Powerline-cust-colorschemes*
-------------------------------------------------------------------------------
-
-Colorschemes should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Colorschemes/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.2 Functions                                     *Powerline-cust-functions*
-------------------------------------------------------------------------------
-
-Functions should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Functions/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.3 Segments                                       *Powerline-cust-segments*
-------------------------------------------------------------------------------
-
-Segments should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Segments/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.4 Themes                                           *Powerline-cust-themes*
-------------------------------------------------------------------------------
-
-Themes should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Themes/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-==============================================================================
-7. License                                                 *Powerline-license*
-
-Creative Commons Attribution-ShareAlike 3.0 Unported
-
-http://creativecommons.org/licenses/by-sa/3.0/
-
-==============================================================================
-8. Known issues                                       *Powerline-known-issues*
-
-See the issue tracker at
-https://github.com/Lokaltog/vim-powerline/issues
-
-==============================================================================
-9. Contributing                                       *Powerline-contributing*
-
-If you experience any bugs or have feature requests, please open an issue on
-GitHub. Fork the source repository on GitHub and send a pull request if you
-have any code improvements.
-
-Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-Source repository: https://github.com/Lokaltog/vim-powerline
-
-==============================================================================
-vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/sources_forked/vim-powerline/doc/tags b/sources_forked/vim-powerline/doc/tags
deleted file mode 100644
index c81aba9a..00000000
--- a/sources_forked/vim-powerline/doc/tags
+++ /dev/null
@@ -1,34 +0,0 @@
-:PowerlineClearCache	Powerline.txt	/*:PowerlineClearCache*
-Pl#Theme#InsertSegment	Powerline.txt	/*Pl#Theme#InsertSegment*
-Pl#Theme#RemoveSegment	Powerline.txt	/*Pl#Theme#RemoveSegment*
-Pl#Theme#ReplaceSegment	Powerline.txt	/*Pl#Theme#ReplaceSegment*
-Powerline	Powerline.txt	/*Powerline*
-Powerline-advanced-customization	Powerline.txt	/*Powerline-advanced-customization*
-Powerline-basic-customization	Powerline.txt	/*Powerline-basic-customization*
-Powerline-configuration	Powerline.txt	/*Powerline-configuration*
-Powerline-contents	Powerline.txt	/*Powerline-contents*
-Powerline-contributing	Powerline.txt	/*Powerline-contributing*
-Powerline-cust-colorschemes	Powerline.txt	/*Powerline-cust-colorschemes*
-Powerline-cust-functions	Powerline.txt	/*Powerline-cust-functions*
-Powerline-cust-segments	Powerline.txt	/*Powerline-cust-segments*
-Powerline-cust-themes	Powerline.txt	/*Powerline-cust-themes*
-Powerline-customization	Powerline.txt	/*Powerline-customization*
-Powerline-fonts	Powerline.txt	/*Powerline-fonts*
-Powerline-introduction	Powerline.txt	/*Powerline-introduction*
-Powerline-known-issues	Powerline.txt	/*Powerline-known-issues*
-Powerline-license	Powerline.txt	/*Powerline-license*
-Powerline-recommended-settings	Powerline.txt	/*Powerline-recommended-settings*
-Powerline-requirements	Powerline.txt	/*Powerline-requirements*
-Powerline-symbols-compatible	Powerline.txt	/*Powerline-symbols-compatible*
-Powerline-symbols-fancy	Powerline.txt	/*Powerline-symbols-fancy*
-Powerline-usage	Powerline.txt	/*Powerline-usage*
-Powerline.txt	Powerline.txt	/*Powerline.txt*
-Powerline_cache_enabled	Powerline.txt	/*Powerline_cache_enabled*
-Powerline_cache_file	Powerline.txt	/*Powerline_cache_file*
-Powerline_colorscheme	Powerline.txt	/*Powerline_colorscheme*
-Powerline_dividers_override	Powerline.txt	/*Powerline_dividers_override*
-Powerline_mode	Powerline.txt	/*Powerline_mode*
-Powerline_stl_path_style	Powerline.txt	/*Powerline_stl_path_style*
-Powerline_symbols	Powerline.txt	/*Powerline_symbols*
-Powerline_symbols_override	Powerline.txt	/*Powerline_symbols_override*
-Powerline_theme	Powerline.txt	/*Powerline_theme*
diff --git a/sources_forked/vim-powerline/fontpatcher/PowerlineSymbols.sfd b/sources_forked/vim-powerline/fontpatcher/PowerlineSymbols.sfd
deleted file mode 100755
index 34d7d0c8..00000000
--- a/sources_forked/vim-powerline/fontpatcher/PowerlineSymbols.sfd
+++ /dev/null
@@ -1,319 +0,0 @@
-SplineFontDB: 3.0
-FontName: PowerlineSymbols
-FullName: PowerlineSymbols
-FamilyName: PowerlineSymbols
-Weight: Medium
-Copyright: 
-UComments: "2011-11-21: Created." 
-Version: 001.000
-ItalicAngle: 0
-UnderlinePosition: -98.6328
-UnderlineWidth: 48.8281
-Ascent: 800
-Descent: 200
-LayerCount: 2
-Layer: 0 0 "Back"  1
-Layer: 1 0 "Fore"  0
-XUID: [1021 211 26716215 11021609]
-FSType: 0
-OS2Version: 0
-OS2_WeightWidthSlopeOnly: 0
-OS2_UseTypoMetrics: 1
-CreationTime: 1321867751
-ModificationTime: 1326665029
-OS2TypoAscent: 0
-OS2TypoAOffset: 1
-OS2TypoDescent: 0
-OS2TypoDOffset: 1
-OS2TypoLinegap: 90
-OS2WinAscent: 0
-OS2WinAOffset: 1
-OS2WinDescent: 0
-OS2WinDOffset: 1
-HheadAscent: 0
-HheadAOffset: 1
-HheadDescent: 0
-HheadDOffset: 1
-OS2Vendor: 'PfEd'
-MarkAttachClasses: 1
-DEI: 91125
-Encoding: UnicodeFull
-Compacted: 1
-UnicodeInterp: none
-NameList: Adobe Glyph List
-DisplaySize: -24
-AntiAlias: 1
-FitToEm: 1
-WinInfo: 0 31 18
-BeginPrivate: 0
-EndPrivate
-BeginChars: 1114112 9
-
-StartChar: uni2B80
-Encoding: 11136 11136 0
-Width: 621
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-0 1000 m 1
- 621 379 l 1
- 0 -243 l 1
- 0 1000 l 1
-EndSplineSet
-EndChar
-
-StartChar: uni2B81
-Encoding: 11137 11137 1
-Width: 621
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-10 991 m 0
- 16 997 23 1000 32 1000 c 0
- 41 1000 48 996 54 990 c 2
- 613 400 l 2
- 619 394 621 386 621 378 c 0
- 621 370 618 362 613 357 c 2
- 54 -233 l 2
- 48 -239 41 -242 32 -242 c 0
- 23 -242 16 -240 10 -234 c 0
- 4 -228 0 -221 0 -212 c 0
- 0 -203 3 -196 8 -190 c 2
- 547 379 l 1
- 8 948 l 2
- 3 954 0 961 0 970 c 0
- 0 979 4 985 10 991 c 0
-EndSplineSet
-EndChar
-
-StartChar: uni2B82
-Encoding: 11138 11138 2
-Width: 621
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-621 1000 m 5
- 621 -243 l 5
- 0 379 l 5
- 621 1000 l 5
-EndSplineSet
-EndChar
-
-StartChar: uni2B83
-Encoding: 11139 11139 3
-Width: 621
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-612 991 m 0
- 618 985 621 979 621 970 c 0
- 621 961 619 954 613 948 c 2
- 74 379 l 1
- 613 -190 l 2
- 619 -196 621 -203 621 -212 c 0
- 621 -221 618 -228 612 -234 c 0
- 606 -240 598 -242 589 -242 c 0
- 580 -242 574 -239 568 -233 c 2
- 8 357 l 2
- 3 362 0 370 0 378 c 0
- 0 386 3 394 8 400 c 2
- 568 990 l 2
- 574 996 580 1000 589 1000 c 0
- 598 1000 606 997 612 991 c 0
-EndSplineSet
-EndChar
-
-StartChar: uni2B61
-Encoding: 11105 11105 4
-Width: 555
-VWidth: 0
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-0 800 m 5
- 92 800 l 5
- 92 513 l 5
- 253 513 l 5
- 253 444 l 5
- 0 444 l 5
- 0 800 l 5
-236 312 m 5
- 339 312 l 5
- 468 67 l 5
- 468 312 l 5
- 555 312 l 5
- 555 -44 l 5
- 453 -44 l 5
- 323 200 l 5
- 323 -44 l 5
- 236 -44 l 5
- 236 312 l 5
-EndSplineSet
-EndChar
-
-StartChar: uni2B60
-Encoding: 11104 11104 5
-Width: 676
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-0 197 m 1
- 94 207 419 279 419 384 c 2
- 419 537 l 1
- 278 501 l 1
- 478 794 l 1
- 677 501 l 1
- 536 537 l 1
- 536 384 l 2
- 536 196 208 126 208 21 c 2
- 208 -244 l 1
- 0 -244 l 1
- 0 197 l 1
-0 288 m 1
- 0 405 0 944 0 944 c 1
- 208 944 l 1
- 208 944 208 451 208 334 c 1
- 185 311 12 288 0 288 c 1
-EndSplineSet
-EndChar
-
-StartChar: uni2B62
-Encoding: 11106 11106 6
-Width: 428
-VWidth: 0
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-88 677 m 2
- 429 677 l 1
- 429 589 l 1
- 88 589 l 1
- 88 162 l 1
- 198 162 l 1
- 198 343 l 1
- 374 343 l 1
- 374 427 l 1
- 198 427 l 1
- 198 506 l 1
- 429 506 l 1
- 429 274 l 1
- 416 263 391 255 374 255 c 2
- 286 255 l 1
- 286 162 l 2
- 286 114 246 74 198 74 c 2
- 88 74 l 2
- 40 74 0 114 0 162 c 2
- 0 589 l 2
- 0 637 40 677 88 677 c 2
-EndSplineSet
-EndChar
-
-StartChar: uni2B63
-Encoding: 11107 11107 7
-Width: 428
-VWidth: 0
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-0 677 m 5
- 341 677 l 6
- 389 677 429 637 429 589 c 6
- 429 506 l 6
- 429 458 389 418 341 418 c 6
- 287 418 l 5
- 287 162 l 6
- 287 114 247 74 199 74 c 6
- 89 74 l 6
- 41 74 1 114 1 162 c 6
- 1 274 l 6
- 0 274 l 6
- 0 506 l 5
- 89 506 l 5
- 89 162 l 5
- 199 162 l 5
- 199 506 l 5
- 341 506 l 5
- 341 589 l 5
- 0 589 l 5
- 0 677 l 5
-EndSplineSet
-EndChar
-
-StartChar: uni2B64
-Encoding: 11108 11108 8
-Width: 546
-VWidth: 0
-Flags: HMW
-LayerCount: 2
-Fore
-SplineSet
-273 733 m 4
- 429 733 430 538 430 538 c 5
- 430 420 l 5
- 547 420 l 5
- 547 303 l 5
- 547 303 546 -9 273 -9 c 4
- 0 -9 0 303 0 303 c 5
- 0 420 l 5
- 117 420 l 5
- 117 538 l 5
- 117 538 117 733 273 733 c 4
-273 655 m 4
- 195 655 195 576 195 420 c 5
- 352 420 l 5
- 352 576 351 655 273 655 c 4
-273 342 m 4
- 195 342 195 147 273 147 c 4
- 351 147 351 342 273 342 c 4
-EndSplineSet
-EndChar
-EndChars
-BitmapFont: 10 10 8 2 1 
-BDFChar: 0 11136 6 0 4 -2 7
-JAC+4q"X@:^jlCb
-BDFChar: 1 11137 6 0 4 -2 7
-J3Y4g#RCta5_&h7
-BDFChar: 2 11138 6 1 5 -2 7
-#T,OGq"T(n(^L*A
-BDFChar: 3 11139 6 1 5 -2 7
-#S8+DJ:Km-&-r79
-BDFChar: 4 11105 6 1 4 -1 7
-J:N1>!0GR3O8o7\
-BDFChar: 5 11104 7 0 5 -2 7
-^rY<PaN2`d^q]pM
-BDFChar: 6 11106 4 1 5 -1 6
-G^u0KJ=)F+
-BDFChar: 7 11107 4 0 5 -1 6
-p]QtGOH>Q3
-BDFChar: 8 11108 5 0 5 0 6
-0M"b4bku\c
-EndBitmapFont
-BitmapFont: 12 10 10 2 1 
-BDFChar: 0 11136 7 0 6 -2 11
-!!%Pbi:-O>r:od>^jlCb
-BDFChar: 1 11137 7 0 6 -3 11
-!!%O7+:ne]":,P]5_&h7
-BDFChar: 2 11138 7 0 6 -2 11
-!!!-1*'AWHr-UUH$j6P1
-BDFChar: 3 11139 7 0 6 -2 11
-!!!--&0O5gJ3Y4g#Qt,-
-BDFChar: 4 11105 7 0 5 0 8
-J:N1>!$jBP,QIfE
-BDFChar: 5 11104 8 0 8 -3 11
-z^];.Ma8juqa8j9]a8jQehuLOm^];.Mz
-BDFChar: 6 11106 5 1 6 0 8
-!-j$]R"1Qc?iU0,
-BDFChar: 7 11107 5 0 5 0 7
-p]QtGOH>Q3
-BDFChar: 8 11108 7 0 5 0 8
-0M"`*r63C_GQ7^D
-EndBitmapFont
-EndSplineFont
diff --git a/sources_forked/vim-powerline/fontpatcher/README.rst b/sources_forked/vim-powerline/fontpatcher/README.rst
deleted file mode 100755
index 35b3d5d0..00000000
--- a/sources_forked/vim-powerline/fontpatcher/README.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-======================
-Powerline font patcher
-======================
-
-:Author: Kim Silkebækken (kim.silkebaekken+vim@gmail.com)
-
-Description
------------
-
-This font patcher creates dividers and symbols for use with Powerline. The 
-script requires Python 2 and FontForge compiled with Python bindings.
-
-Patched fonts are renamed by default (" for Powerline" is added to the font 
-name) so they don't conflict with existing fonts. Use the ``--no-rename`` 
-option to disable font renaming.
-
-Glyph table
------------
-
-All the glyphs are stored in the ``U+2B60``-``U+2BFF`` range ("Misc symbols 
-and arrows").
-
-+------------+-------------------+
-| Code point | Description       |
-+============+===================+
-| ``U+2B60`` | Branch symbol     |
-+------------+-------------------+
-| ``U+2B61`` | LN (line) symbol  |
-+------------+-------------------+
-| ``U+2B62`` | FT symbol, part 1 |
-+------------+-------------------+
-| ``U+2B63`` | FT symbol, part 2 |
-+------------+-------------------+
-| ``U+2B64`` | Padlock (closed)  |
-+------------+-------------------+
-| ``U+2B80`` | Hard right arrow  |
-+------------+-------------------+
-| ``U+2B81`` | Soft right arrow  |
-+------------+-------------------+
-| ``U+2B82`` | Hard left arrow   |
-+------------+-------------------+
-| ``U+2B83`` | Soft left arrow   |
-+------------+-------------------+
-
-===================
-Font patching guide
-===================
-
-There's a `GitHub wiki page`_ dedicated to community-contributed patched 
-fonts. You may download one of the fonts on that page if you don't want to 
-patch the fonts yourself.
-
-If you do patch a font that's not included in the wiki (and you have 
-permission to distribute it), please include it on the wiki page.
-
-**Note:** The fonts in the wiki may be outdated, and may have different 
-glyphs than the ones provided in the latest version of Powerline. It's 
-recommended that you always patch your fonts yourself if you have the 
-required software.
-
-.. _`GitHub wiki page`: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts
-
-Linux
------
-
-1. Install fontforge with Python bindings. For Ubuntu users the required 
-   package is ``python-fontforge``, for Arch Linux users the required 
-   package is ``fontforge``. It should be something similar for other 
-   distros.
-
-2. Run the font patcher::
-
-       $ /path/to/fontpatcher MyFontFile.ttf
-
-3. Copy the font file into ``~/.fonts`` (or another X font directory)::
-
-       $ cp MyFontFile-Powerline.otf ~/.fonts
-
-   **Note:** If the font is a pure bitmap font (e.g. a PCF font) it will be 
-   stored in the BDF format. This is usually not a problem, and you may 
-   convert the font back to the PCF format using ``bdftopcf`` if you want 
-   to. All other fonts will be stored in the OTF format regardless of the 
-   original format.
-
-4. Update your font cache::
-
-       $ sudo fc-cache -vf
-
-   **Note:** If you use vim in rxvt-unicode in the client/daemon mode, you 
-   may need to close all running terminals as well for the font to be 
-   updated.
-
-5. **For gvim users:** Update the GUI font in your ``vimrc`` file::
-
-       set guifont=MyFont\ for\ Powerline
-
-   **For terminal users:** Update your terminal configuration to use the 
-   patched font.
-
-6. Update your ``vimrc`` configuration to use the new symbols::
-
-       let g:Powerline_symbols = 'fancy'
-
-7. Make sure that the cache file is deleted::
-
-       $ rm /tmp/Powerline.cache
-
-8. Start vim and enjoy your new statusline!
-
-OS X
-----
-
-1. Check if you have a FontForge version with Python support by running 
-   ``fontforge -version``. You should see something like this::
-
-       $ fontforge -version
-       Copyright (c) 2000-2011 by George Williams.
-       Executable based on sources from 13:48 GMT 22-Feb-2011-D.
-       Library based on sources from 13:48 GMT 22-Feb-2011.
-       fontforge 20110222
-       libfontforge 20110222
-
-   Make sure that the executable version number doesn't have ``NoPython`` in 
-   it. If everything looks OK, skip ahead to step 4.
-
-2. If you have FontForge but with ``NoPython`` in the version number, please 
-   try to update to a later version::
-
-       $ brew uninstall fontforge
-       $ brew update
-       $ brew install --use-gcc fontforge
-
-   **Note:** You may have to use ``--use-clang`` instead of ``--use-gcc`` 
-   when compiling FontForge.
-
-3. If you don't have FontForge, install it with Homebrew::
-
-       $ brew update
-       $ brew install --use-gcc fontforge
-
-4. Patch your fonts by passing the ``fontpatcher`` script as a parameter to 
-   FontForge::
-
-       $ fontforge -script /path/to/fontpatcher MyFontFile.ttf
-
-5. Install the font by double-clicking the font file in Finder and click 
-   "Install this font" from the preview window.
-
-6. **For gvim users:** Update the GUI font in your ``vimrc`` file::
-
-       set guifont=MyFont\ for\ Powerline
-
-   **For terminal users:** Update your terminal configuration to use the 
-   patched font.
-
-7. Update your ``vimrc`` configuration to use the new symbols::
-
-       let g:Powerline_symbols = 'fancy'
-
-8. Make sure that the cache file is deleted::
-
-       $ rm /tmp/Powerline.cache
-
-9. Start vim and enjoy your new statusline!
diff --git a/sources_forked/vim-powerline/fontpatcher/fontpatcher b/sources_forked/vim-powerline/fontpatcher/fontpatcher
deleted file mode 100755
index 2c54a3fa..00000000
--- a/sources_forked/vim-powerline/fontpatcher/fontpatcher
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/usr/bin/env python
-
-"""Font patcher for Powerline.
-
-Creates dividers and symbols for use with Powerline. Requires FontForge with Python bindings.
-
-Stores glyphs in the 2b60-2bff Unicode range ("Misc symbols and arrows").
-
-[2b60] Branch symbol
-[2b61] LN (line) symbol
-[2b62] FT symbol 1
-[2b63] FT symbol 2
-[2b64] Padlock (closed) symbol
-[2b80] Hard right arrow
-[2b81] Soft right arrow
-[2b82] Hard left arrow
-[2b83] Soft left arrow
-"""
-
-from __future__ import division
-
-import argparse
-import os
-import sys
-import re
-
-try:
-	import fontforge
-	import psMat
-except ImportError:
-	sys.stderr.write('The required FontForge modules could not be loaded.\n\n')
-
-	if sys.version_info.major > 2:
-		sys.stderr.write('FontForge only supports Python 2. Please run this script with the Python 2 executable - e.g. "python2 {0}"\n'.format(sys.argv[0]))
-	else:
-		sys.stderr.write('You need FontForge with Python bindings for this script to work.\n')
-
-	sys.exit(1)
-
-# Handle command-line arguments
-parser = argparse.ArgumentParser(description='Font patcher for Powerline. Creates dividers and symbols in FontForge-compatible font files. Requires FontForge with Python bindings. Stores glyphs in the U+2B80-U+2BFF range ("Miscellaneous symbols and arrows"). Stores the patched font as a new, renamed font file by default.')
-
-parser.add_argument('fonts', help='font file to patch', metavar='font', nargs='+')
-parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename')
-parser.add_argument('--symbol-font', help='font file with symbols', metavar='font', dest='symbol_font', default='{0}/PowerlineSymbols.sfd'.format(sys.path[0]))
-parser.add_argument('--fix-mono', help='fixes some mono-fonts which have glyphs of 0 widths', default=False, action='store_true', dest='fixmono')
-parser.add_argument('--fix-win', help='modifies font names such that Windows correctly recognizes font families', default=False, action='store_true', dest='fixwin')
-
-args = parser.parse_args()
-
-SYM_ATTR = {
-	# Right/left-aligned glyphs will have their advance width reduced in order to overlap the next glyph slightly
-	0x2b60: { 'align': 'c', 'stretch': 'y' , 'overlap': False },
-	0x2b61: { 'align': 'c', 'stretch': ''  , 'overlap': False },
-	0x2b62: { 'align': 'r', 'stretch': ''  , 'overlap': False },
-	0x2b63: { 'align': 'l', 'stretch': ''  , 'overlap': False },
-	0x2b64: { 'align': 'c', 'stretch': ''  , 'overlap': False },
-	0x2b80: { 'align': 'l', 'stretch': 'xy', 'overlap': True  },
-	0x2b81: { 'align': 'l', 'stretch': 'xy', 'overlap': True  },
-	0x2b82: { 'align': 'r', 'stretch': 'xy', 'overlap': True  },
-	0x2b83: { 'align': 'r', 'stretch': 'xy', 'overlap': True  },
-}
-
-# Open symbol font
-try:
-	symbols = fontforge.open(args.symbol_font)
-except EnvironmentError:
-	sys.exit(1)
-
-# Patch provided fonts
-for font_path in args.fonts:
-	try:
-		font = fontforge.open(font_path)
-	except EnvironmentError:
-		sys.exit(1)
-
-	# Rename font
-	if args.rename:
-		font.familyname += ' for Powerline'
-		font.fullname += ' for Powerline'
-		font.fontname += 'ForPowerline'
-		font.appendSFNTName('English (US)', 'Preferred Family', font.familyname)
-		font.appendSFNTName('English (US)', 'Compatible Full', font.fullname)
-	if args.fixwin:
-		font.fontname = re.sub(r'\W', '', font.familyname)
-
-	# Force the em size to be equal
-	symbols.em = font.em
-
-	# Initial font dimensions
-	font_dim = {
-		'xmin'  :    0,
-		'ymin'  :    -font.descent,
-		'xmax'  :    0,
-		'ymax'  :    font.ascent,
-
-		'width' :    0,
-		'height':    0,
-	}
-
-	# Find the biggest char width and height
-	#
-	# 0x00-0x17f is the Latin Extended-A range
-	# 0x2500-0x2600 is the box drawing range
-	for glyph in range(0x00, 0x17f) + range(0x2500, 0x2600):
-		try:
-			(xmin, ymin, xmax, ymax) = font[glyph].boundingBox()
-		except TypeError:
-			continue
-
-		if font_dim['width'] == 0:
-			font_dim['width'] = font[glyph].width
-
-		if ymin < font_dim['ymin']: font_dim['ymin'] = ymin
-		if ymax > font_dim['ymax']: font_dim['ymax'] = ymax
-		if xmax > font_dim['xmax']: font_dim['xmax'] = xmax
-
-	# Calculate font height
-	font_dim['height'] = abs(font_dim['ymin']) + font_dim['ymax']
-
-	# Update the font encoding to ensure that the Unicode glyphs are available
-	font.encoding = 'ISO10646'
-
-	# Fetch this property before adding outlines
-	onlybitmaps = font.onlybitmaps
-
-	def get_dim(glyph):
-		bbox = glyph.boundingBox()
-
-		return  {
-			'xmin'  : bbox[0],
-			'ymin'  : bbox[1],
-			'xmax'  : bbox[2],
-			'ymax'  : bbox[3],
-
-			'width' : bbox[2] + (-bbox[0]),
-			'height': bbox[3] + (-bbox[1]),
-		}
-
-	# Create glyphs from symbol font
-	for sym_glyph in symbols.glyphs():
-		sym_attr = SYM_ATTR[sym_glyph.unicode]
-
-		# Prepare symbol glyph dimensions
-		sym_dim = get_dim(sym_glyph)
-
-		# Select and copy symbol from its encoding point
-		symbols.selection.select(sym_glyph.encoding)
-		symbols.copy()
-
-		# Select and paste symbol to its unicode code point
-		font.selection.select(sym_glyph.unicode)
-		font.paste()
-
-		# Now that we have copy/pasted the glyph, it's time to scale and move it
-
-		# Handle glyph stretching
-		if 'x' in sym_attr['stretch']:
-			# Stretch the glyph horizontally
-			scale_ratio = font_dim['width'] / sym_dim['width']
-
-			font.transform(psMat.scale(scale_ratio, 1))
-		if 'y' in sym_attr['stretch']:
-			# Stretch the glyph vertically
-			scale_ratio = font_dim['height'] / sym_dim['height']
-
-			font.transform(psMat.scale(1, scale_ratio))
-
-		# Use the dimensions from the pasted and stretched glyph
-		sym_dim = get_dim(font[sym_glyph.unicode])
-
-		# Center-align the glyph vertically
-		font_ycenter = font_dim['height'] / 2
-		sym_ycenter  = sym_dim['height'] / 2
-
-		# First move it to the ymax (top)
-		font.transform(psMat.translate(0, font_dim['ymax'] - sym_dim['ymax']))
-
-		# Then move it the y center difference
-		font.transform(psMat.translate(0, sym_ycenter - font_ycenter))
-
-		# Ensure that the glyph doesn't extend outside the font's bounding box
-		if sym_dim['width'] > font_dim['width']:
-			# The glyph is too wide, scale it down to fit
-			scale_matrix = psMat.scale(font_dim['width'] / sym_dim['width'], 1)
-
-			font.transform(scale_matrix)
-
-			# Use the dimensions from the stretched glyph
-			sym_dim = get_dim(font[sym_glyph.unicode])
-
-		# Handle glyph alignment
-		if sym_attr['align'] == 'c':
-			# Center align
-			align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
-		elif sym_attr['align'] == 'r':
-			# Right align
-			align_matrix = psMat.translate(font_dim['width'] - sym_dim['width'], 0)
-		else:
-			# No alignment (left alignment)
-			align_matrix = psMat.translate(0, 0)
-
-		font.transform(align_matrix)
-
-		if sym_attr['overlap'] is True:
-			overlap_width = font.em / 48
-
-			# Stretch the glyph slightly horizontally if it should overlap
-			font.transform(psMat.scale((sym_dim['width'] + overlap_width) / sym_dim['width'], 1))
-
-			if sym_attr['align'] == 'l':
-				# The glyph should be left-aligned, so it must be moved overlap_width to the left
-				# This only applies to left-aligned glyphs because the glyph is scaled to the right
-				font.transform(psMat.translate(-overlap_width, 0))
-
-		# Ensure the font is considered monospaced on Windows
-		font[sym_glyph.unicode].width = font_dim['width']
-
-	if font.bitmapSizes and not onlybitmaps:
-		# If this is an outline font with bitmaps, regenerate bitmaps for the changed glyphs
-		font.selection.changed()
-
-		for size in font.bitmapSizes:
-			font.regenBitmaps((size, ))
-
-	output_name, extension = os.path.split(font_path)[1].rsplit('.', 1)
-	if extension.lower() not in ['ttf', 'otf']:
-		# Default to OpenType if input is not TrueType/OpenType
-		extension = 'otf'
-	if args.fixmono:
-		for glyph in font.glyphs():
-			if glyph.width == 0: glyph.width = font_dim['width']
-
-	if onlybitmaps:
-		# Generate BDF font
-		font.generate('{0}-Powerline.bdf'.format(output_name, bitmap_type='bdf'))
-	else:
-		# Generate OTF/TTF font
-		font.generate('{0}-Powerline.{1}'.format(output_name, extension))
-
diff --git a/sources_forked/vim-powerline/plugin/Powerline.vim b/sources_forked/vim-powerline/plugin/Powerline.vim
deleted file mode 100755
index 5454aa49..00000000
--- a/sources_forked/vim-powerline/plugin/Powerline.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Powerline - The ultimate statusline utility
-"
-" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-" Source repository: https://github.com/Lokaltog/vim-powerline
-
-" Script initialization {{{
-	if exists('g:Powerline_loaded') || &compatible || version < 702
-		finish
-	endif
-
-	let g:Powerline_loaded = 1
-" }}}
-" Commands {{{
-	command! PowerlineClearCache call Pl#ClearCache()
-	command! PowerlineReloadColorscheme call Pl#ReloadColorscheme()
-" }}}
-" Set default options {{{
-	for [s:key, s:value] in items({
-		\   'theme'            : 'default'
-		\ , 'colorscheme'      : 'default'
-		\ , 'symbols'          : 'compatible'
-		\ , 'symbols_override' : {}
-		\ , 'dividers_override': []
-		\ , 'stl_path_style'   : 'relative'
-		\ , 'cache_enabled'    : 1
-		\ })
-
-		if ! exists('g:Powerline_' . s:key)
-			exec printf('let g:Powerline_%s = %s', s:key, string(s:value))
-		endif
-
-		unlet! s:key s:value
-	endfor
-
-	if ! exists('g:Powerline_cache_file')
-		exec 'let g:Powerline_cache_file = '. string(printf('%s/Powerline_%s_%s_%s.cache'
-			\ , simplify(expand('<sfile>:p:h') .'/..')
-			\ , g:Powerline_theme
-			\ , g:Powerline_colorscheme
-			\ , g:Powerline_symbols
-			\ ))
-	endif
-" }}}
-" Autocommands {{{
-	function! s:CreateAutocmds()
-		augroup PowerlineMain
-			autocmd!
-
-			" Reload statuslines when changing color scheme
-			autocmd ColorScheme *
-				\ call Pl#Load()
-
-			autocmd BufEnter,WinEnter,FileType,BufUnload *
-				\ call Pl#UpdateStatusline(1)
-
-			autocmd BufLeave,WinLeave *
-				\ call Pl#UpdateStatusline(0)
-
-			autocmd BufWritePost */autoload/Powerline/Colorschemes/*.vim
-				\ :PowerlineReloadColorscheme
-		augroup END
-	endfunction
-
-	augroup PowerlineStartup
-		autocmd!
-
-		autocmd VimEnter * call s:CreateAutocmds() | call Pl#UpdateStatusline(1)
-	augroup END
-" }}}
diff --git a/sources_non_forked/tlib/autoload/tlib.vim b/sources_non_forked/tlib/autoload/tlib.vim
index 008740f2..2ed32001 100644
--- a/sources_non_forked/tlib/autoload/tlib.vim
+++ b/sources_non_forked/tlib/autoload/tlib.vim
@@ -3,10 +3,9 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-07-17.
-" @Last Change: 2010-01-03.
-" @Revision:    0.0.7
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.12
 
-" call tlog#Log('Load: '. expand('<sfile>')) " vimtlib-sfile
-
-" Dummy file for backwards compatibility.
+" :nodefault:
+TLet g:tlib#debug = 0
 
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
index 0abc7067..0093c8b0 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
@@ -3,11 +3,11 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2012-09-26.
-" @Revision:    0.0.90
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.92
 
 let s:prototype = tlib#Object#New({'_class': ['Filter_cnf'], 'name': 'cnf'}) "{{{2
-let s:prototype.highlight = g:tlib_inputlist_higroup
+let s:prototype.highlight = g:tlib#input#higroup
 
 " The search pattern for |tlib#input#List()| is in conjunctive normal 
 " form: (P1 OR P2 ...) AND (P3 OR P4 ...) ...
@@ -33,7 +33,7 @@ endf
 " :nodoc:
 function! s:prototype.Help(world) dict "{{{3
     call a:world.PushHelp(
-                \ printf('"%s", "%s", "%sWORD"', g:tlib_inputlist_and, g:tlib_inputlist_or, g:tlib_inputlist_not),
+                \ printf('"%s", "%s", "%sWORD"', g:tlib#input#and, g:tlib#input#or, g:tlib#input#not),
                 \ 'AND, OR, NOT')
 endf
 
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
index b141b733..0bac3c42 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
@@ -3,11 +3,11 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2012-09-20.
-" @Revision:    0.0.50
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.51
 
 let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_cnfd'], 'name': 'cnfd'}) "{{{2
-let s:prototype.highlight = g:tlib_inputlist_higroup
+let s:prototype.highlight = g:tlib#input#higroup
 
 
 " The same as |tlib#Filter_cnf#New()| but a dot is expanded to '\.\{-}'. 
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
index 95abdae7..1f48c5f4 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
@@ -2,11 +2,11 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2012-09-20.
-" @Revision:    0.0.61
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.62
 
 let s:prototype = tlib#Filter_cnfd#New({'_class': ['Filter_cnfx'], 'name': 'cnfx'}) "{{{2
-let s:prototype.highlight = g:tlib_inputlist_higroup
+let s:prototype.highlight = g:tlib#input#higroup
 
 
 " A character that should be expanded to '\.\{-}'.
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim b/sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim
index 39e09844..349bfd57 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_fuzzy.vim
@@ -3,11 +3,11 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2012-09-20.
-" @Revision:    0.0.46
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.47
 
 let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_fuzzy'], 'name': 'fuzzy'}) "{{{2
-let s:prototype.highlight = g:tlib_inputlist_higroup
+let s:prototype.highlight = g:tlib#input#higroup
 
 
 " Support for "fuzzy" pattern matching in |tlib#input#List()|. 
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index 296f2d41..daedb559 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -3,14 +3,34 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-05-01.
-" @Last Change: 2012-10-03.
-" @Revision:    0.1.1203
+" @Last Change: 2013-09-26.
+" @Revision:    0.1.1297
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
 " Inherits from |tlib#Object#New|.
 
 
+" Size of the input list window (in percent) from the main size (of &lines).
+" See |tlib#input#List()|.
+TLet g:tlib_inputlist_pct = 50
+
+" Size of filename columns when listing filenames.
+" See |tlib#input#List()|.
+TLet g:tlib_inputlist_width_filename = '&co / 3'
+" TLet g:tlib_inputlist_width_filename = 25
+
+" If true, |tlib#input#List()| will show some indicators about the 
+" status of a filename (e.g. buflisted(), bufloaded() etc.).
+" This is disabled by default because vim checks also for the file on 
+" disk when doing this.
+TLet g:tlib_inputlist_filename_indicators = 0
+
+" If not null, display only a short info about the filter.
+TLet g:tlib_inputlist_shortmessage = 0
+
+
+
 " Known keys & values:
 "   scratch_split ... See |tlib#scratch#UseScratch()|
 let s:prototype = tlib#Object#New({
@@ -19,6 +39,7 @@ let s:prototype = tlib#Object#New({
             \ 'allow_suspend': 1,
             \ 'base': [], 
             \ 'bufnr': -1,
+            \ 'buffer_local': 1,
             \ 'cache_var': '',
             \ 'display_format': '',
             \ 'fileencoding': &fileencoding,
@@ -40,22 +61,26 @@ let s:prototype = tlib#Object#New({
             \ 'key_handlers': [],
             \ 'list': [],
             \ 'matcher': {},
+            \ 'next_agent': '',
+            \ 'next_eval': '',
             \ 'next_state': '',
-            \ 'numeric_chars': tlib#var#Get('tlib_numeric_chars', 'bg'),
+            \ 'numeric_chars': g:tlib#input#numeric_chars,
             \ 'offset': 1,
             \ 'offset_horizontal': 0,
             \ 'on_leave': [],
-            \ 'pick_last_item': tlib#var#Get('tlib_pick_last_item', 'bg'),
+            \ 'pick_last_item': tlib#var#Get('tlib#input#pick_last_item', 'bg'),
             \ 'post_handlers': [],
             \ 'query': '',
             \ 'resize': 0,
             \ 'resize_vertical': 0,
             \ 'restore_from_cache': [],
+            \ 'filtered_items': [],
             \ 'retrieve_eval': '',
             \ 'return_agent': '',
             \ 'rv': '',
             \ 'scratch': '__InputList__',
             \ 'scratch_filetype': 'tlibInputList',
+            \ 'scratch_hidden': g:tlib#scratch#hidden,
             \ 'scratch_vertical': 0,
             \ 'scratch_split': 1,
             \ 'sel_idx': [],
@@ -63,6 +88,7 @@ let s:prototype = tlib#Object#New({
             \ 'state': 'display', 
             \ 'state_handlers': [],
             \ 'sticky': 0,
+            \ 'temp_lines': [],
             \ 'temp_prompt': [],
             \ 'timeout': 0,
             \ 'timeout_resolution': 2,
@@ -77,7 +103,7 @@ let s:prototype = tlib#Object#New({
 
 function! tlib#World#New(...)
     let object = s:prototype.New(a:0 >= 1 ? a:1 : {})
-    call object.SetMatchMode(tlib#var#Get('tlib_inputlist_match', 'g', 'cnf'))
+    call object.SetMatchMode(tlib#var#Get('tlib#input#filter_mode', 'g', 'cnf'))
     return object
 endf
 
@@ -113,7 +139,7 @@ if g:tlib#input#format_filename == 'r'
     function! s:prototype.FormatFilename(file) dict "{{{3
         if !has_key(self.fmt_options, 'maxlen')
             let maxco = &co - len(len(self.base)) - eval(g:tlib#input#filename_padding_r)
-            let maxfi = max(map(copy(self.base), 'len(v:val)'))
+            let maxfi = max(map(copy(self.base), 'strwidth(v:val)'))
             let self.fmt_options.maxlen = min([maxco, maxfi])
             " TLogVAR maxco, maxfi, self.fmt_options.maxlen
         endif
@@ -135,11 +161,11 @@ else
         let self.width_filename = min([
                     \ get(self, 'width_filename', &co),
                     \ empty(g:tlib#input#filename_max_width) ? &co : eval(g:tlib#input#filename_max_width),
-                    \ max(map(copy(self.base), 'len(fnamemodify(v:val, ":t"))'))
+                    \ max(map(copy(self.base), 'strwidth(fnamemodify(v:val, ":t"))'))
                     \ ])
         " TLogVAR self.width_filename
         exec 'syntax match TLibFilename /[^\/]\+$/ contained containedin=TLibDir'
-        exec 'syntax match TLibDir /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \zs\(\(\a:\|\.\.\..\{-}\)\?[\/][^&<>*|]\{-}\)\?[^\/]\+$/ contained containedin=TLibMarker contains=TLibFilename'
+        exec 'syntax match TLibDir /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \zs\(\(\a:\|\.\.\|\.\.\..\{-}\)\?[\/][^&<>*|]\{-}\)\?[^\/]\+$/ contained containedin=TLibMarker contains=TLibFilename'
         exec 'syntax match TLibMarker /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \S.*$/ contains=TLibDir'
         hi def link TLibMarker Special
         hi def link TLibDir Directory
@@ -154,10 +180,11 @@ else
 
     " :nodoc:
     function! s:prototype.FormatFilename(file) dict "{{{3
+        " TLogVAR a:file
         let width = self.width_filename
         let split = match(a:file, '[/\\]\zs[^/\\]\+$')
         if split == -1
-            let fname = ''
+            let fname = a:file
             let dname = a:file
         else
             let fname = strpart(a:file, split)
@@ -167,15 +194,17 @@ else
         if strwidth(fname) > width
             let fname = strpart(fname, 0, width - 3) .'...'
         endif
-        let dnmax = &co - max([width, len(fname)]) - 10 - self.index_width - &fdc
+        let dnmax = &co - max([width, strwidth(fname)]) - 10 - self.index_width - &fdc
         if g:tlib_inputlist_filename_indicators
             let dnmax -= 2
         endif
-        if len(dname) > dnmax
+        if strwidth(dname) > dnmax
             let dname = '...'. strpart(dname, len(dname) - dnmax)
         endif
         let marker = []
-        if g:tlib_inputlist_filename_indicators
+        let use_indicators = g:tlib_inputlist_filename_indicators || has_key(self, 'filename_indicators')
+        " TLogVAR use_indicators
+        if use_indicators
             call insert(marker, '[')
             let bnr = bufnr(a:file)
             " TLogVAR a:file, bnr, self.bufnr
@@ -194,14 +223,24 @@ else
                 " if !buflisted(bnr)
                 "     call add(marker, 'u')
                 " endif
-            else
+                " echom "DBG" a:file string(get(self,'filename_indicators'))
+            endif
+            if has_key(self, 'filename_indicators') && has_key(self.filename_indicators, a:file)
+                if len(marker) > 1
+                    call add(marker, '|')
+                endif
+                call add(marker, self.filename_indicators[a:file])
+            endif
+            if len(marker) <= 1
                 call add(marker, ' ')
             endif
             call add(marker, ']')
         else
             call add(marker, '|')
         endif
-        return printf("%-". self.width_filename ."s %s %s", fname, join(marker, ''), dname)
+        return printf("%-*s %s %s",
+                    \ self.width_filename + len(fname) - strwidth(fname),
+                    \ fname, join(marker, ''), dname)
     endf
 
 endif
@@ -250,6 +289,26 @@ function! s:InsertSelectedItems(rv, current) "{{{3
 endf
 
 
+" :nodoc:
+function! s:prototype.SelectItemsByNames(mode, items) dict "{{{3
+    for item in a:items
+        let bi = index(self.base, item) + 1
+        " TLogVAR item, bi
+        if bi > 0
+            let si = index(self.sel_idx, bi)
+            " TLogVAR self.sel_idx
+            " TLogVAR si
+            if si == -1
+                call add(self.sel_idx, bi)
+            elseif a:mode == 'toggle'
+                call remove(self.sel_idx, si)
+            endif
+        endif
+    endfor
+    return 1
+endf
+
+
 " :nodoc:
 function! s:prototype.SelectItem(mode, index) dict "{{{3
     let bi = self.GetBaseIdx(a:index)
@@ -292,7 +351,7 @@ function! s:prototype.GetRx0(...) dict "{{{3
         " TLogVAR filter
         let rx = join(reverse(filter(copy(filter), '!empty(v:val)')), '\|')
         " TLogVAR rx
-        if !empty(rx) && (negative ? rx[0] == g:tlib_inputlist_not : rx[0] != g:tlib_inputlist_not)
+        if !empty(rx) && (negative ? rx[0] == g:tlib#input#not : rx[0] != g:tlib#input#not)
             call add(rx0, rx)
         endif
     endfor
@@ -478,7 +537,7 @@ function! s:prototype.SetFilter() dict "{{{3
                 let mrx1 = mrx
             endif
             " TLogVAR rx
-            if rx[0] == g:tlib_inputlist_not
+            if rx[0] == g:tlib#input#not
                 if len(rx) > 1
                     call add(self.filter_neg, mrx1 .'\('. rx[1:-1] .'\)')
                 endif
@@ -513,7 +572,7 @@ function! s:prototype.SetMatchMode(match_mode) dict "{{{3
             let self.matcher = tlib#Filter_{a:match_mode}#New()
             call self.matcher.Init(self)
         catch /^Vim\%((\a\+)\)\=:E117/
-            throw 'tlib: Unknown mode for tlib_inputlist_match: '. a:match_mode
+            throw 'tlib: Unknown mode for tlib#input#filter_mode: '. a:match_mode
         endtry
     endif
 endf
@@ -542,18 +601,21 @@ function! s:prototype.BuildTableList() dict "{{{3
     " TLogVAR time0
     call self.SetFilter()
     " TLogVAR self.filter_neg, self.filter_pos
-    if empty(self.filter_pos) && empty(self.filter_neg)
-        let self.table = range(1, len(self.base))
+    let self.table = range(1, len(self.base))
+    " TLogVAR self.filtered_items
+    let copy_base = 1
+    if !empty(self.filtered_items)
+        let self.table = filter(self.table, 'index(self.filtered_items, v:val) != -1')
+        let copy_base = 0
+    endif
+    if !empty(self.filter_pos) || !empty(self.filter_neg)
+        let self.table = filter(self.table, 'self.MatchBaseIdx(v:val)')
+        let copy_base = 0
+    endif
+    if copy_base
         let self.list = copy(self.base)
     else
-        " let time1 = str2float(reltimestr(reltime()))  " DBG
-        " TLogVAR time1, time1 - time0
-        let self.table = filter(range(1, len(self.base)), 'self.MatchBaseIdx(v:val)')
-        " let time2 = str2float(reltimestr(reltime()))  " DBG
-        " TLogVAR time2, time2 - time0
         let self.list  = map(copy(self.table), 'self.GetBaseItem(v:val)')
-        " let time3 = str2float(reltimestr(reltime()))  " DBG
-        " TLogVAR time3, time3 - time0
     endif
 endf
 
@@ -634,7 +696,18 @@ endf
 
 " :nodoc:
 function! s:prototype.UseScratch() dict "{{{3
-    keepalt return tlib#scratch#UseScratch(self)
+    " if type(self.scratch) != 0 && get(self, 'buffer_local', 1)
+    "     if self.scratch != fnamemodify(self.scratch, ':p')
+    "         let self.scratch = tlib#file#Join([expand('%:p:h'), self.scratch])
+    "         " TLogVAR self.scratch
+    "     endif
+    "     " let self.scratch_hidden = 'wipe'
+    " endif
+    keepjumps keepalt let rv = tlib#scratch#UseScratch(self)
+    " if expand('%:t') == self.scratch
+        let b:tlib_world = self
+    " endif
+    return rv
 endf
 
 
@@ -828,12 +901,12 @@ function! s:prototype.PushHelp(...) dict "{{{3
     " TLogVAR a:000
     if a:0 == 1
         if type(a:1) == 3
-            let self._help += a:1
+            let self.temp_lines += a:1
         else
-            call add(self._help, a:1)
+            call add(self.temp_lines, a:1)
         endif
     elseif a:0 == 2
-        call add(self._help, a:000)
+        call add(self.temp_lines, a:000)
     else
         throw "TLIB: PushHelp: Wrong number of arguments: ". string(a:000)
     endif
@@ -843,7 +916,7 @@ endf
 
 " :nodoc:
 function! s:prototype.DisplayHelp() dict "{{{3
-    let self._help = self.InitHelp()
+    let self.temp_lines = self.InitHelp()
     call self.PushHelp('<Esc>', self.key_mode == 'default' ? 'Abort' : 'Reset keymap')
     call self.PushHelp('Enter, <cr>', 'Pick the current item')
     call self.PushHelp('<M-Number>',  'Pick an item')
@@ -861,14 +934,15 @@ function! s:prototype.DisplayHelp() dict "{{{3
             call self.PushHelp('<C-o>', 'Switch to origin')
         endif
         if stridx(self.type, 'm') != -1
-            call self.PushHelp('<S-up/down>', '(Un)Select items')
+            call self.PushHelp('<S-Up/Down>', '(Un)Select items')
             call self.PushHelp('#, <C-Space>', '(Un)Select the current item')
             call self.PushHelp('<C|M-a>', '(Un)Select all items')
+            call self.PushHelp('<F9>', '(Un)Restrict view to selection')
             " \ '<c-\>        ... Show only selected',
         endif
     endif
 
-    " TLogVAR len(self._help)
+    " TLogVAR len(self.temp_lines)
     call self.matcher.Help(self)
 
     " TLogVAR self.key_mode
@@ -893,20 +967,24 @@ function! s:prototype.DisplayHelp() dict "{{{3
         call self.PushHelp(self.help_extra)
     endif
 
-    " TLogVAR len(self._help)
+    " TLogVAR len(self.temp_lines)
     call self.PushHelp([
                 \ '',
                 \ 'Matches at word boundaries are prioritized.',
                 \ ])
-    let self._help = s:FormatHelp(self._help)
+    let self.temp_lines = s:FormatHelp(self.temp_lines)
+    call self.PrintLines()
+endf
+
+
+function! s:prototype.PrintLines() dict "{{{3
     let self.temp_prompt = ['Press any key to continue.', 'Question']
-    " call tlib#normal#WithRegister('gg"tdG', 't')
     call tlib#buffer#DeleteRange('1', '$')
-    call append(0, self._help)
-    " call tlib#normal#WithRegister('G"tddgg', 't')
+    call append(0, self.temp_lines)
     call tlib#buffer#DeleteRange('$', '$')
     1
-    call self.Resize(len(self._help), 0)
+    call self.Resize(len(self.temp_lines), 0)
+    let self.temp_lines = []
 endf
 
 
@@ -914,12 +992,14 @@ endf
 function! s:prototype.Resize(hsize, vsize) dict "{{{3
     " TLogVAR self.scratch_vertical, a:hsize, a:vsize
     let world_resize = ''
+    let winpos = ''
     let scratch_split = get(self, 'scratch_split', 1)
     " TLogVAR scratch_split
     if scratch_split > 0
         if self.scratch_vertical
             if a:vsize
                 let world_resize = 'vert resize '. a:vsize
+                let winpos = tlib#fixes#Winpos()
                 " let w:winresize = {'v': a:vsize}
                 setlocal winfixwidth
             endif
@@ -932,8 +1012,11 @@ function! s:prototype.Resize(hsize, vsize) dict "{{{3
         endif
     endif
     if !empty(world_resize)
-        " TLogVAR world_resize
+        " TLogVAR world_resize, winpos
         exec world_resize
+        if !empty(winpos)
+            exec winpos
+        endif
         " redraw!
     endif
 endf
@@ -971,6 +1054,9 @@ function! s:prototype.DisplayList(...) dict "{{{3
     elseif self.state == 'help'
         call self.DisplayHelp()
         call self.SetStatusline(query)
+    elseif self.state == 'printlines'
+        call self.PrintLines()
+        call self.SetStatusline(query)
     else
         " TLogVAR query
         " let ll = len(list)
@@ -1042,6 +1128,13 @@ function! s:prototype.SetStatusline(query) dict "{{{3
         if self.key_mode != 'default'
             call add(options, 'map:'. self.key_mode)
         endif
+        if !empty(self.filtered_items)
+            if g:tlib_inputlist_shortmessage
+                call add(options, 'R')
+            else
+                call add(options, 'restricted')
+            endif
+        endif
         if !empty(options)
             let sopts = printf('[%s]', join(options, ', '))
             " let echo  = query . repeat(' ', &columns - len(sopts) - len(query) - 20) . sopts
diff --git a/sources_non_forked/tlib/autoload/tlib/agent.vim b/sources_non_forked/tlib/autoload/tlib/agent.vim
index 56365c11..c0d9566a 100644
--- a/sources_non_forked/tlib/autoload/tlib/agent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/agent.vim
@@ -3,13 +3,16 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-24.
-" @Last Change: 2012-10-03.
-" @Revision:    0.1.208
+" @Last Change: 2013-09-26.
+" @Revision:    0.1.240
 
 
 " :filedoc:
 " Various agents for use as key handlers in tlib#input#List()
 
+" Number of items to move when pressing <c-up/down> in the input list window.
+TLet g:tlib_scroll_lines = 10
+
 
 " General {{{1
 
@@ -111,6 +114,36 @@ function! tlib#agent#Reset(world, selected) "{{{3
 endf
 
 
+function! tlib#agent#ToggleRestrictView(world, selected) "{{{3
+    if empty(a:world.filtered_items)
+        return tlib#agent#RestrictView(a:world, a:selected)
+    else
+        return tlib#agent#UnrestrictView(a:world, a:selected)
+    endif
+endf
+
+
+function! tlib#agent#RestrictView(world, selected) "{{{3
+    " TLogVAR a:selected
+    let filtered_items = map(copy(a:selected), 'index(a:world.base, v:val) + 1')
+    " TLogVAR 1, filtered_items
+    let filtered_items = filter(filtered_items, 'v:val > 0')
+    " TLogVAR 2, filtered_items
+    if !empty(filtered_items)
+        let a:world.filtered_items = filtered_items
+    endif
+    let a:world.state = 'display'
+    return a:world
+endf
+
+
+function! tlib#agent#UnrestrictView(world, selected) "{{{3
+    let a:world.filtered_items = []
+    let a:world.state = 'display'
+    return a:world
+endf
+
+
 function! tlib#agent#Input(world, selected) "{{{3
     let flt0 = a:world.CleanFilter(a:world.filter[0][0])
     let flt1 = input('Filter: ', flt0)
@@ -401,7 +434,11 @@ function! tlib#agent#EditFileInVSplit(world, selected) "{{{3
     call a:world.CloseScratch()
     " call tlib#file#With('edit', 'buffer', a:selected[0:0], a:world)
     " call tlib#file#With('vertical split', 'vertical sbuffer', a:selected[1:-1], a:world)
+    let winpos = tlib#fixes#Winpos()
     call tlib#file#With('vertical split', 'vertical sbuffer', a:selected, a:world)
+    if !empty(winpos)
+        exec winpos
+    endif
     return tlib#agent#Exit(a:world, a:selected)
 endf
 
@@ -419,19 +456,18 @@ function! tlib#agent#ToggleScrollbind(world, selected) "{{{3
     return a:world
 endf
 
+
 function! tlib#agent#ShowInfo(world, selected)
+    let lines = []
     for f in a:selected
         if filereadable(f)
             let desc = [getfperm(f), strftime('%c', getftime(f)),  getfsize(f) .' bytes', getftype(f)]
-            echo fnamemodify(f, ':t') .':'
-            echo '  '. join(desc, '; ')
+            call add(lines, fnamemodify(f, ':t') .':')
+            call add(lines, '  '. join(desc, '; '))
         endif
     endfor
-    echohl MoreMsg
-    echo 'Press any key to continue'
-    echohl NONE
-    call getchar()
-    let a:world.state = 'redisplay'
+    let a:world.temp_lines = lines
+    let a:world.state = 'printlines'
     return a:world
 endf
 
@@ -530,8 +566,8 @@ function! tlib#agent#ExecAgentByName(world, selected) "{{{3
             let agent_names[def.help] = def.agent
         endif
     endfor
-    let s:agent_names = join(sort(keys(agent_names)), "\n")
-    let command = input('Command: ', '', 'custom,tlib#agent#CompleteAgentNames')
+    let s:agent_names = sort(keys(agent_names))
+    let command = input('Command: ', '', 'customlist,tlib#agent#CompleteAgentNames')
     " TLogVAR command
     if !has_key(agent_names, command)
         " TLogVAR command
@@ -558,6 +594,6 @@ endf
 
 
 function! tlib#agent#CompleteAgentNames(ArgLead, CmdLine, CursorPos)
-    return s:agent_names
+    return filter(copy(s:agent_names), 'stridx(v:val, a:ArgLead) != -1')
 endf
 
diff --git a/sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim b/sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim
index d1ade9f1..84395248 100644
--- a/sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim
+++ b/sources_non_forked/tlib/autoload/tlib/autocmdgroup.vim
@@ -2,13 +2,7 @@
 " @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2008-08-19.
-" @Last Change: 2010-01-05.
-" @Revision:    0.0.6
-
-let s:save_cpo = &cpo
-set cpo&vim
-
+" @Revision:    7
 
 augroup TLib
     autocmd!
@@ -18,6 +12,3 @@ augroup END
 function! tlib#autocmdgroup#Init() "{{{3
 endf
 
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/sources_non_forked/tlib/autoload/tlib/balloon.vim b/sources_non_forked/tlib/autoload/tlib/balloon.vim
index 4b7c2eee..cc70d038 100644
--- a/sources_non_forked/tlib/autoload/tlib/balloon.vim
+++ b/sources_non_forked/tlib/autoload/tlib/balloon.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2010-08-30.
 " @Last Change: 2010-09-05.
-" @Revision:    23
+" @Revision:    27
 
 
 function! tlib#balloon#Register(expr) "{{{3
@@ -37,10 +37,12 @@ endf
 
 
 function! tlib#balloon#Expr() "{{{3
+    " TLogVAR exists('b:tlib_balloons')
     if !exists('b:tlib_balloons')
         return ''
     endif
     let text = map(copy(b:tlib_balloons), 'eval(v:val)')
+    " TLogVAR b:tlib_balloons, text
     call filter(text, '!empty(v:val)')
     if has('balloon_multiline')
         return join(text, "\n----------------------------------\n")
diff --git a/sources_non_forked/tlib/autoload/tlib/bitwise.vim b/sources_non_forked/tlib/autoload/tlib/bitwise.vim
new file mode 100644
index 00000000..54a4258d
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/bitwise.vim
@@ -0,0 +1,141 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Revision:    124
+
+
+function! tlib#bitwise#Num2Bits(num) "{{{3
+    if type(a:num) <= 1 || type(a:num) == 5
+        let bits = reverse(tlib#number#ConvertBase(a:num, 2, 'list'))
+    elseif type(a:num) == 3
+        let bits = copy(a:num)
+    else
+        throw "tlib#bitwise#Num2Bits: Must be number of list: ". string(a:num)
+    endif
+    return bits
+endf
+
+
+function! tlib#bitwise#Bits2Num(bits, ...) "{{{3
+    let base = a:0 >= 1 ? a:1 : 10
+    " TLogVAR a:bits
+    let num = 0.0
+    for i in range(len(a:bits))
+        if get(a:bits, i, 0)
+            let num += pow(2, i)
+        endif
+    endfor
+    " TLogVAR num
+    if base == 10
+        if type(base) == 5
+            return num
+        else
+            return float2nr(num)
+        endif
+    else
+        return tlib#number#ConvertBase(num, base)
+    endif
+endf
+
+
+function! tlib#bitwise#AND(num1, num2, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'num'
+    return s:BitwiseComparison(a:num1, a:num2, rtype,
+                \ 'get(bits1, v:val) && get(bits2, v:val)')
+endf
+
+
+function! tlib#bitwise#OR(num1, num2, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'num'
+    return s:BitwiseComparison(a:num1, a:num2, rtype,
+                \ 'get(bits1, v:val) || get(bits2, v:val)')
+endf
+
+
+function! tlib#bitwise#XOR(num1, num2, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'num'
+    return s:BitwiseComparison(a:num1, a:num2, rtype,
+                \ 'get(bits1, v:val) ? !get(bits2, v:val) : get(bits2, v:val)')
+endf
+
+
+function! s:BitwiseComparison(num1, num2, rtype, expr) "{{{3
+    let bits1 = tlib#bitwise#Num2Bits(a:num1)
+    let bits2 = tlib#bitwise#Num2Bits(a:num2)
+    let range = range(max([len(bits1), len(bits2)]))
+    let bits = map(range, a:expr)
+    if a:rtype == 'num' || (a:rtype == 'auto' && type(a:num1) <= 1)
+        return tlib#bitwise#Bits2Num(bits)
+    else
+        return bits
+    endif
+endf
+
+
+function! tlib#bitwise#ShiftRight(bits, n) "{{{3
+    let bits = a:bits[a:n : -1]
+    if empty(bits)
+        let bits = [0]
+    endif
+    return bits
+endf
+
+
+function! tlib#bitwise#ShiftLeft(bits, n) "{{{3
+    let bits = repeat([0], a:n) + a:bits
+    return bits
+endf
+
+
+function! tlib#bitwise#Add(num1, num2, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'num'
+    let bits1 = tlib#bitwise#Num2Bits(a:num1)
+    let bits2 = tlib#bitwise#Num2Bits(a:num2)
+    let range = range(max([len(bits1), len(bits2)]))
+    " TLogVAR bits1, bits2, range
+    let carry = 0
+    let bits  = []
+    for i in range
+        let sum = get(bits1, i) + get(bits2, i) + carry
+        if sum == 3
+            let bit = 1
+            let carry = 1
+        elseif sum == 2
+            let bit = 0
+            let carry = 1
+        elseif sum == 1
+            let bit = 1
+            let carry = 0
+        elseif sum == 0
+            let bit = 0
+            let carry = 0
+        endif
+        call add(bits, bit)
+        " TLogVAR i, bits, bit
+    endfor
+    if carry == 1
+        call add(bits, carry)
+    endif
+    if rtype == 'num' || (rtype == 'auto' && type(a:num1) <= 1)
+        return tlib#bitwise#Bits2Num(bits)
+    else
+        return bits
+    endif
+endf
+
+
+function! tlib#bitwise#Sub(num1, num2, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'num'
+    let bits1 = tlib#bitwise#Num2Bits(a:num1)
+    let bits2 = tlib#bitwise#Num2Bits(a:num2)
+    let range = range(max([len(bits1), len(bits2)]))
+    let bits2 = map(range, '!get(bits2, v:val)')
+    let bits2 = tlib#bitwise#Add(bits2, [1], 'bits')
+    let bits3 = tlib#bitwise#Add(bits1, bits2, 'bits')
+    let bits = bits3[0 : -2]
+    if rtype == 'num' || (rtype == 'auto' && type(a:num1) <= 1)
+        return tlib#bitwise#Bits2Num(bits)
+    else
+        return bits
+    endif
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/buffer.vim b/sources_non_forked/tlib/autoload/tlib/buffer.vim
index de151a49..8920f758 100644
--- a/sources_non_forked/tlib/autoload/tlib/buffer.vim
+++ b/sources_non_forked/tlib/autoload/tlib/buffer.vim
@@ -3,8 +3,13 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2012-02-09.
-" @Revision:    0.0.351
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.352
+
+
+" Where to display the line when using |tlib#buffer#ViewLine|.
+" For possible values for position see |scroll-cursor|.
+TLet g:tlib_viewline_position = 'zz'
 
 
 let s:bmru = []
diff --git a/sources_non_forked/tlib/autoload/tlib/cache.vim b/sources_non_forked/tlib/autoload/tlib/cache.vim
index c480495c..7380d6dd 100644
--- a/sources_non_forked/tlib/autoload/tlib/cache.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cache.vim
@@ -3,10 +3,16 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2012-05-11.
-" @Revision:    0.1.192
+" @Last Change: 2013-09-25.
+" @Revision:    0.1.220
 
 
+" The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
+" You might want to delete old files from this directory from time to 
+" time with a command like: >
+"   find ~/vimfiles/cache/ -atime +31 -type f -print -delete
+TLet g:tlib_cache = ''
+
 " |tlib#cache#Purge()|: Remove cache files older than N days.
 TLet g:tlib#cache#purge_days = 31
 
@@ -24,15 +30,21 @@ TLet g:tlib#cache#script_encoding = &enc
 "    2 ... Yes
 TLet g:tlib#cache#run_script = 1
 
-" If non-nil, don't display a message that files were deleted from the 
-" cache.
-TLet g:tlib#cache#silent = 0
+" Verbosity level:
+"     0 ... Be quiet
+"     1 ... Display informative message
+"     2 ... Display detailed messages
+TLet g:tlib#cache#verbosity = 1
 
 " A list of regexps that are matched against partial filenames of the 
 " cached files. If a regexp matches, the file won't be removed by 
 " |tlib#cache#Purge()|.
 TLet g:tlib#cache#dont_purge = ['[\/]\.last_purge$']
 
+" If the cache filename is longer than N characters, use 
+" |pathshorten()|.
+TLet g:tlib#cache#max_filename = 200
+
 
 " :display: tlib#cache#Dir(?mode = 'bg')
 " The default cache directory.
@@ -49,7 +61,8 @@ endf
 " :def: function! tlib#cache#Filename(type, ?file=%, ?mkdir=0, ?dir='')
 function! tlib#cache#Filename(type, ...) "{{{3
     " TLogDBG 'bufname='. bufname('.')
-    let dir = a:0 >= 3 && !empty(a:3) ? a:3 : tlib#cache#Dir()
+    let dir0 = a:0 >= 3 && !empty(a:3) ? a:3 : tlib#cache#Dir()
+    let dir = dir0
     if a:0 >= 1 && !empty(a:1)
         let file  = a:1
     else
@@ -73,18 +86,23 @@ function! tlib#cache#Filename(type, ...) "{{{3
     " TLogVAR dir
     let file  = fnamemodify(file, ':t')
     " TLogVAR file, dir, mkdir
-    if mkdir && !isdirectory(dir)
-        try
-            call mkdir(dir, 'p')
-        catch /^Vim\%((\a\+)\)\=:E739:/
-            if filereadable(dir) && !isdirectory(dir)
-                echoerr 'TLib: Cannot create directory for cache file because a file with the same name exists (please delete it):' dir
-                " call delete(dir)
-                " call mkdir(dir, 'p')
-            endif
-        endtry
-    endif
     let cache_file = tlib#file#Join([dir, file])
+    if len(cache_file) > g:tlib#cache#max_filename
+        let shortfilename = pathshorten(file) .'_'. tlib#hash#Adler32(file)
+        let cache_file = tlib#cache#Filename(a:type, shortfilename, mkdir, dir0)
+    else
+        if mkdir && !isdirectory(dir)
+            try
+                call mkdir(dir, 'p')
+            catch /^Vim\%((\a\+)\)\=:E739:/
+                if filereadable(dir) && !isdirectory(dir)
+                    echoerr 'TLib: Cannot create directory for cache file because a file with the same name exists (please delete it):' dir
+                    " call delete(dir)
+                    " call mkdir(dir, 'p')
+                endif
+            endtry
+        endif
+    endif
     " TLogVAR cache_file
     return cache_file
 endf
@@ -101,6 +119,22 @@ function! tlib#cache#Get(cfile) "{{{3
 endf
 
 
+" Get a cached value from cfile. If it is outdated (compared to ftime) 
+" or does not exist, create it calling a generator function.
+function! tlib#cache#Value(cfile, generator, ftime, ...) "{{{3
+    if !filereadable(a:cfile) || (a:ftime != 0 && getftime(a:cfile) < a:ftime)
+        let args = a:0 >= 1 ? a:1 : []
+        let val = call(a:generator, args)
+        " TLogVAR a:generator, args, val
+        call tlib#cache#Save(a:cfile, {'val': val})
+        return val
+    else
+        let val = tlib#cache#Get(a:cfile)
+        return val.val
+    endif
+endf
+
+
 " Call |tlib#cache#Purge()| if the last purge was done before 
 " |g:tlib#cache#purge_every_days|.
 function! tlib#cache#MaybePurge() "{{{3
@@ -144,7 +178,7 @@ endf
 function! tlib#cache#Purge() "{{{3
     let threshold = localtime() - g:tlib#cache#purge_days * g:tlib#date#dayshift
     let dir = tlib#cache#Dir('g')
-    if !g:tlib#cache#silent
+    if g:tlib#cache#verbosity >= 1
         echohl WarningMsg
         echom "TLib: Delete files older than ". g:tlib#cache#purge_days ." days from ". dir
         echohl NONE
@@ -165,7 +199,7 @@ function! tlib#cache#Purge() "{{{3
                 if getftime(file) < threshold
                     if delete(file)
                         call add(msg, "TLib: Could not delete cache file: ". file)
-                    else
+                    elseif g:tlib#cache#verbosity >= 2
                         call add(msg, "TLib: Delete cache file: ". file)
                     endif
                 else
@@ -176,7 +210,7 @@ function! tlib#cache#Purge() "{{{3
     finally
         let &more = more
     endtry
-    if !empty(msg) && !g:tlib#cache#silent
+    if !empty(msg) && g:tlib#cache#verbosity >= 1
         echo join(msg, "\n")
     endif
     if !empty(deldir)
@@ -202,12 +236,14 @@ function! tlib#cache#Purge() "{{{3
         call writefile(script, scriptfile)
         call inputsave()
         if g:tlib#cache#run_script == 0
-            echohl WarningMsg
-            if g:tlib#cache#silent
-                echom "TLib: Purged cache. Need to run script to delete directories"
+            if g:tlib#cache#verbosity >= 1
+                echohl WarningMsg
+                if g:tlib#cache#verbosity >= 2
+                    echom "TLib: Purged cache. Need to run script to delete directories"
+                endif
+                echom "TLib: Please review and execute: ". scriptfile
+                echohl NONE
             endif
-            echom "TLib: Please review and execute: ". scriptfile
-            echohl NONE
         else
             try
                 let yn = g:tlib#cache#run_script == 2 ? 'y' : tlib#input#Dialog("TLib: About to delete directories by means of a shell script.\nDirectory removal script: ". scriptfile ."\nRun script to delete directories now?", ['yes', 'no', 'edit'], 'no')
diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/sources_non_forked/tlib/autoload/tlib/cmd.vim
index 478e4bb6..e6ab3e88 100644
--- a/sources_non_forked/tlib/autoload/tlib/cmd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cmd.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-08-23.
-" @Last Change: 2012-02-10.
-" @Revision:    0.0.35
+" @Last Change: 2013-05-14.
+" @Revision:    0.0.46
 
 if &cp || exists("loaded_tlib_cmd_autoload")
     finish
@@ -17,12 +17,20 @@ let g:tlib#cmd#last_output = []
 
 function! tlib#cmd#OutputAsList(command) "{{{3
     " TLogVAR a:command
-    " let lines = ''
-    redir => lines
+    if exists('s:redir_lines')
+        redir END
+        let cache = s:redir_lines
+    endif
+    let s:redir_lines = ''
+    redir =>> s:redir_lines
     silent! exec a:command
     redir END
-    " TLogVAR lines
-    let g:tlib#cmd#last_output = split(lines, '\n')
+    let g:tlib#cmd#last_output = split(s:redir_lines, '\n')
+    unlet s:redir_lines
+    if exists('cache')
+        let s:redir_lines = cache
+        redir =>> s:redir_lines
+    endif
     return g:tlib#cmd#last_output
 endf
 
diff --git a/sources_non_forked/tlib/autoload/tlib/dir.vim b/sources_non_forked/tlib/autoload/tlib/dir.vim
index 855ce101..c3902972 100644
--- a/sources_non_forked/tlib/autoload/tlib/dir.vim
+++ b/sources_non_forked/tlib/autoload/tlib/dir.vim
@@ -3,14 +3,18 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2009-08-04.
-" @Revision:    0.0.32
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.37
 
 if &cp || exists("loaded_tlib_dir_autoload")
     finish
 endif
 let loaded_tlib_dir_autoload = 1
 
+" TLet g:tlib#dir#sep = '/'
+TLet g:tlib#dir#sep = exists('+shellslash') && !&shellslash ? '\' : '/'
+
+
 let s:dir_stack = []
 
 " EXAMPLES: >
@@ -18,12 +22,25 @@ let s:dir_stack = []
 "   => 'foo/bar/'
 function! tlib#dir#CanonicName(dirname) "{{{3
     if a:dirname !~ '[/\\]$'
-        return a:dirname . g:tlib_filename_sep
+        return a:dirname . g:tlib#dir#sep
     endif
     return a:dirname
 endf
 
 
+" EXAMPLES: >
+"   tlib#dir#NativeName('foo/bar/')
+"   On Windows:
+"   => 'foo\bar\'
+"   On Linux:
+"   => 'foo/bar/'
+function! tlib#dir#NativeName(dirname) "{{{3
+    let sep = tlib#rx#EscapeReplace(g:tlib#dir#sep)
+    let dirname = substitute(a:dirname, '[\/]', sep, 'g')
+    return dirname
+endf
+
+
 " EXAMPLES: >
 "   tlib#dir#PlainName('foo/bar/')
 "   => 'foo/bar'
@@ -33,7 +50,7 @@ function! tlib#dir#PlainName(dirname) "{{{3
         let dirname = dirname[0 : -2]
     endwh
     return dirname
-    " return substitute(a:dirname, tlib#rx#Escape(g:tlib_filename_sep).'\+$', '', '')
+    " return substitute(a:dirname, tlib#rx#Escape(g:tlib#dir#sep).'\+$', '', '')
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/file.vim b/sources_non_forked/tlib/autoload/tlib/file.vim
index f768abdd..e7ea855a 100644
--- a/sources_non_forked/tlib/autoload/tlib/file.vim
+++ b/sources_non_forked/tlib/autoload/tlib/file.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2012-03-23.
-" @Revision:    0.0.106
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.141
 
 if &cp || exists("loaded_tlib_file_autoload")
     finish
@@ -42,13 +42,15 @@ endf
 "   => 'foo/bar/filename.txt'
 function! tlib#file#Join(filename_parts, ...) "{{{3
     TVarArg 'strip_slashes'
+    " TLogVAR a:filename_parts, strip_slashes
     if strip_slashes
-        " let rx    = tlib#rx#Escape(g:tlib_filename_sep) .'$'
-        let rx    = '[/\\]$'
+        " let rx    = tlib#rx#Escape(g:tlib#dir#sep) .'$'
+        let rx    = '[/\\]\+$'
         let parts = map(copy(a:filename_parts), 'substitute(v:val, rx, "", "")')
-        return join(parts, g:tlib_filename_sep)
+        " TLogVAR parts
+        return join(parts, g:tlib#dir#sep)
     else
-        return join(a:filename_parts, g:tlib_filename_sep)
+        return join(a:filename_parts, g:tlib#dir#sep)
     endif
 endf
 
@@ -60,14 +62,14 @@ function! tlib#file#Relative(filename, basedir) "{{{3
     " TLogVAR a:filename, a:basedir
     " TLogDBG getcwd()
     " TLogDBG expand('%:p')
-    let f0 = fnamemodify(a:filename, ':p')
+    let b0 = tlib#file#Absolute(a:basedir)
+    let b  = tlib#file#Split(b0)
+    " TLogVAR b
+    let f0 = tlib#file#Absolute(a:filename)
     let fn = fnamemodify(f0, ':t')
     let fd = fnamemodify(f0, ':h')
     let f  = tlib#file#Split(fd)
-    " TLogVAR f
-    let b0 = fnamemodify(a:basedir, ':p')
-    let b  = tlib#file#Split(b0)
-    " TLogVAR b
+    " TLogVAR f0, fn, fd, f
     if f[0] != b[0]
         let rv = f0
     else
@@ -78,6 +80,7 @@ function! tlib#file#Relative(filename, basedir) "{{{3
             call remove(f, 0)
             call remove(b, 0)
         endwh
+        " TLogVAR f, b
         let rv = tlib#file#Join(repeat(['..'], len(b)) + f + [fn])
     endif
     " TLogVAR rv
@@ -85,6 +88,21 @@ function! tlib#file#Relative(filename, basedir) "{{{3
 endf
 
 
+function! tlib#file#Absolute(filename, ...) "{{{3
+    if filereadable(a:filename)
+        let filename = fnamemodify(a:filename, ':p')
+    elseif a:filename =~ '^\(/\|[^\/]\+:\)'
+        let filename = a:filename
+    else
+        let cwd = a:0 >= 1 ? a:1 : getcwd()
+        let filename = tlib#file#Join([cwd, a:filename])
+    endif
+    let filename = substitute(filename, '\(^\|[\/]\)\zs\.[\/]', '', 'g')
+    let filename = substitute(filename, '[\/]\zs[^\/]\+[\/]\.\.[\/]', '', 'g')
+    return filename
+endf
+
+
 function! s:SetScrollBind(world) "{{{3
     let sb = get(a:world, 'scrollbind', &scrollbind)
     if sb != &scrollbind
@@ -118,7 +136,7 @@ function! tlib#file#With(fcmd, bcmd, files, ...) "{{{3
             if filereadable(f)
                 if !empty(a:fcmd)
                     " TLogDBG a:fcmd .' '. tlib#arg#Ex(f)
-                    exec 'autocmd TLibFileRead BufRead' escape(f, ' ') 'let s:bufread=expand("<afile>:p")'
+                    exec 'autocmd TLibFileRead BufRead' escape(f, '\ ') 'let s:bufread=expand("<afile>:p")'
                     try 
                         exec a:fcmd .' '. tlib#arg#Ex(f)
                     finally
diff --git a/sources_non_forked/tlib/autoload/tlib/fixes.vim b/sources_non_forked/tlib/autoload/tlib/fixes.vim
new file mode 100644
index 00000000..e9247dd6
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/fixes.vim
@@ -0,0 +1,14 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2013-02-22.
+" @Revision:    3
+
+
+function! tlib#fixes#Winpos() "{{{3
+    if has('gui_win32')
+        return 'winpos '. getwinposx() .' '. getwinposy()
+    else
+        return ''
+    endif
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/grep.vim b/sources_non_forked/tlib/autoload/tlib/grep.vim
new file mode 100644
index 00000000..894b1ee7
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/grep.vim
@@ -0,0 +1,38 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2013-10-16.
+" @Revision:    31
+
+
+function! tlib#grep#Do(cmd, rx, files) "{{{3
+    " TLogVAR a:cmd, a:rx, a:files
+    let files = join(map(copy(a:files), 'tlib#arg#Ex(v:val, "")'), ' ')
+    let rx = '/'. escape(a:rx, '/') .'/j'
+    " TLogVAR rx, files
+    silent exec a:cmd rx files
+endf
+
+
+function! tlib#grep#LocList(rx, files) "{{{3
+    return tlib#grep#Do('noautocmd lvimgrep', a:rx, a:files)
+endf
+
+
+function! tlib#grep#QuickFixList(rx, files) "{{{3
+    return tlib#grep#Do('noautocmd vimgrep', a:rx, a:files)
+endf
+
+
+function! tlib#grep#List(rx, files) "{{{3
+    call setqflist([])
+    call tlib#grep#Do('noautocmd vimgrepadd', a:rx, a:files)
+    let qfl = getqflist()
+    " TLogVAR qfl
+    " try
+        silent! colder
+    " catch
+    "     call setqflist([], 'r')
+    " endtry
+    return qfl
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/hash.vim b/sources_non_forked/tlib/autoload/tlib/hash.vim
new file mode 100644
index 00000000..29c9ef67
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/hash.vim
@@ -0,0 +1,145 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Revision:    276
+
+
+if !exists('g:tlib#hash#use_crc32')
+    let g:tlib#hash#use_crc32 = ''   "{{{2
+endif
+
+
+if !exists('g:tlib#hash#use_adler32')
+    let g:tlib#hash#use_adler32 = ''   "{{{2
+endif
+
+
+function! tlib#hash#CRC32B(chars) "{{{3
+    if !empty(g:tlib#hash#use_crc32)
+        let use = g:tlib#hash#use_crc32
+    elseif has('ruby')
+        let use = 'ruby'
+    else
+        let use = 'vim'
+    endif
+    if exists('*tlib#hash#CRC32B_'. use)
+        return tlib#hash#CRC32B_{use}(a:chars)
+    else
+        throw "Unknown version of tlib#hash#CRC32B: ". use
+    endif
+endf
+
+
+function! tlib#hash#CRC32B_ruby(chars) "{{{3
+    if has('ruby')
+        let rv = ''
+        if !exists('s:loaded_ruby_zlib')
+            ruby require 'zlib'
+            let s:loaded_ruby_zlib = 1
+        endif
+        ruby VIM::command('let rv = "%08X"' % Zlib.crc32(VIM::evaluate("a:chars")))
+        return rv
+    else
+        throw "tlib#hash#CRC32B_ruby not supported in this version of vim"
+    endif
+endf
+
+
+function! tlib#hash#CRC32B_vim(chars) "{{{3
+    if !exists('s:crc_table')
+        let cfile = tlib#persistent#Filename('tlib', 'crc_table', 1)
+        let s:crc_table = tlib#persistent#Value(cfile, 'tlib#hash#CreateCrcTable', 0)
+    endif
+    let xFFFF_FFFF = repeat([1], 32)
+    let crc = tlib#bitwise#XOR([0], xFFFF_FFFF, 'bits')
+    for char in split(a:chars, '\zs')
+        let octet = char2nr(char)
+        let r1 = tlib#bitwise#ShiftRight(crc, 8)
+        let i0 = tlib#bitwise#AND(crc, xFFFF_FFFF, 'bits')
+        let i1 = tlib#bitwise#XOR(i0, octet, 'bits')
+        let i2 = tlib#bitwise#Bits2Num(tlib#bitwise#AND(i1, 0xff, 'bits'))
+        let r2 = s:crc_table[i2]
+        let crc = tlib#bitwise#XOR(r1, r2, 'bits')
+    endfor
+    let crc = tlib#bitwise#XOR(crc, xFFFF_FFFF, 'bits')
+    let rv = tlib#bitwise#Bits2Num(crc, 16)
+    if len(rv) < 8
+        let rv = repeat('0', 8 - len(rv)) . rv
+    endif
+    return rv
+endf
+
+
+" :nodoc:
+function! tlib#hash#CreateCrcTable() "{{{3
+    let sum = 0.0
+    for exponent in [0, 1, 2, 4, 5, 7, 8, 10, 11, 12, 16, 22, 23, 26, 32]
+        let exp = tlib#bitwise#Bits2Num(repeat([0], 32 - exponent) + [1], 10.0)
+        let sum += exp
+    endfor
+    let divisor = tlib#bitwise#Num2Bits(sum)
+    let crc_table = []
+    for octet in range(256)
+        let remainder = tlib#bitwise#Num2Bits(octet)
+        for i in range(8)
+            if get(remainder, i) != 0
+                let remainder = tlib#bitwise#XOR(remainder, tlib#bitwise#ShiftLeft(divisor, i), "bits")
+            endif
+        endfor
+        let remainder = tlib#bitwise#ShiftRight(remainder, 8)
+        call add(crc_table, remainder)
+    endfor
+    return crc_table
+endf
+
+
+function! tlib#hash#Adler32(chars) "{{{3
+    if !empty(g:tlib#hash#use_adler32)
+        let use = g:tlib#hash#use_adler32
+    elseif exists('*or')
+        let use = 'vim'
+    else
+        let use = 'tlib'
+    endif
+    if exists('*tlib#hash#Adler32_'. use)
+        return tlib#hash#Adler32_{use}(a:chars)
+    else
+        throw "Unknown version of tlib#hash#Adler32_: ". use
+    endif
+endf
+
+
+function! tlib#hash#Adler32_vim(chars) "{{{3
+    if exists('*or')
+        let mod_adler = 65521
+        let a = 1
+        let b = 0
+        for index in range(len(a:chars))
+            let c = char2nr(a:chars[index])
+            let a = (a + c) % mod_adler
+            let b = (b + a) % mod_adler
+        endfor
+        let bb = b * float2nr(pow(2, 16))
+        let checksum = or(bb, a)
+        " TLogVAR checksum, a, b, bb
+        return printf("%08X", checksum)
+    else
+        throw "TLIB: Vim version doesn't support bitwise or()"
+    endif
+endf
+
+
+function! tlib#hash#Adler32_tlib(chars) "{{{3
+    let mod_adler = 65521
+    let a = 1
+    let b = 0
+    for index in range(len(a:chars))
+        let c = char2nr(a:chars[index])
+        let a = (a + c) % mod_adler
+        let b = (b + a) % mod_adler
+    endfor
+    let bb = tlib#bitwise#ShiftLeft(tlib#bitwise#Num2Bits(b), 16)
+    let checksum = tlib#bitwise#OR(bb, a, "bits")
+    return printf('%08s', tlib#bitwise#Bits2Num(checksum, 16))
+endf
+
+
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index 302aca88..b756f783 100644
--- a/sources_non_forked/tlib/autoload/tlib/input.vim
+++ b/sources_non_forked/tlib/autoload/tlib/input.vim
@@ -3,13 +3,188 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2012-10-01.
-" @Revision:    0.0.966
+" @Last Change: 2013-09-30.
+" @Revision:    0.0.1262
 
 
 " :filedoc:
 " Input-related, select from a list etc.
 
+" If a list is bigger than this value, don't try to be smart when 
+" selecting an item. Be slightly faster instead.
+" See |tlib#input#List()|.
+TLet g:tlib#input#sortprefs_threshold = 200
+
+
+" If a list contains more items, |tlib#input#List()| does not perform an 
+" incremental "live search" but uses |input()| to query the user for a 
+" filter. This is useful on slower machines or with very long lists.
+TLet g:tlib#input#livesearch_threshold = 1000
+
+
+" Determine how |tlib#input#List()| and related functions work.
+" Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
+"   cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
+"            as a wildcard (this is the default method)
+"     - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
+"       |/\{-|) were entered.
+"     - Examples:
+"         - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+"           "far".
+"     - Otherwise it is a derivate of the cnf method (see below).
+"     - See also |tlib#Filter_cnfx#New()|.
+"   cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
+"            expanded to "\.\{-}"
+"     - A period character (".") acts as a wildcard as if ".\{-}" (see 
+"       |/\{-|) were entered.
+"     - Examples:
+"         - "f.o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+"           "far".
+"     - Otherwise it is a derivate of the cnf method (see below).
+"     - See also |tlib#Filter_cnfd#New()|.
+"   cnf .... Match substrings
+"     - A blank creates an AND conjunction, i.e. the next pattern has to 
+"       match too.
+"     - A pipe character ("|") creates an OR conjunction, either this or 
+"       the next next pattern has to match.
+"     - Patterns are very 'nomagic' |regexp| with a |\V| prefix.
+"     - A pattern starting with "-" makes the filter exclude items 
+"       matching that pattern.
+"     - Examples:
+"         - "foo bar" matches items that contain the strings "foo" AND 
+"           "bar".
+"         - "foo|bar boo|far" matches items that contain either ("foo" OR 
+"           "bar") AND ("boo" OR "far").
+"     - See also |tlib#Filter_cnf#New()|.
+"   seq .... Match sequences of characters
+"     - |tlib#Filter_seq#New()|
+"   fuzzy .. Match fuzzy character sequences
+"     - |tlib#Filter_fuzzy#New()|
+TLet g:tlib#input#filter_mode = 'cnfx'
+
+
+" The highlight group to use for showing matches in the input list 
+" window.
+" See |tlib#input#List()|.
+TLet g:tlib#input#higroup = 'IncSearch'
+
+" When 1, automatically select the last remaining item only if the list 
+" had only one item to begin with.
+" When 2, automatically select a last remaining item after applying 
+" any filters.
+" See |tlib#input#List()|.
+TLet g:tlib_pick_last_item = 1
+
+
+" :doc:
+" Keys for |tlib#input#List|~
+
+TLet g:tlib#input#and = ' '
+TLet g:tlib#input#or  = '|'
+TLet g:tlib#input#not = '-'
+
+" When editing a list with |tlib#input#List|, typing these numeric chars 
+" (as returned by getchar()) will select an item based on its index, not 
+" based on its name. I.e. in the default setting, typing a "4" will 
+" select the fourth item, not the item called "4".
+" In order to make keys 0-9 filter the items in the list and make 
+" <m-[0-9]> select an item by its index, remove the keys 48 to 57 from 
+" this dictionary.
+" Format: [KEY] = BASE ... the number is calculated as KEY - BASE.
+" :nodefault:
+TLet g:tlib#input#numeric_chars = {
+            \ 176: 176,
+            \ 177: 176,
+            \ 178: 176,
+            \ 179: 176,
+            \ 180: 176,
+            \ 181: 176,
+            \ 182: 176,
+            \ 183: 176,
+            \ 184: 176,
+            \ 185: 176,
+            \}
+            " \ 48: 48,
+            " \ 49: 48,
+            " \ 50: 48,
+            " \ 51: 48,
+            " \ 52: 48,
+            " \ 53: 48,
+            " \ 54: 48,
+            " \ 55: 48,
+            " \ 56: 48,
+            " \ 57: 48,
+
+
+" :nodefault:
+" The default key bindings for single-item-select list views. If you 
+" want to use <c-j>, <c-k> to move the cursor up and down, add these two 
+" lines to after/plugin/02tlib.vim: >
+"
+"   let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
+"   let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
+TLet g:tlib#input#keyagents_InputList_s = {
+            \ "\<PageUp>":   'tlib#agent#PageUp',
+            \ "\<PageDown>": 'tlib#agent#PageDown',
+            \ "\<Up>":       'tlib#agent#Up',
+            \ "\<Down>":     'tlib#agent#Down',
+            \ "\<c-Up>":     'tlib#agent#UpN',
+            \ "\<c-Down>":   'tlib#agent#DownN',
+            \ "\<Left>":     'tlib#agent#ShiftLeft',
+            \ "\<Right>":    'tlib#agent#ShiftRight',
+            \ 18:            'tlib#agent#Reset',
+            \ 242:           'tlib#agent#Reset',
+            \ 17:            'tlib#agent#Input',
+            \ 241:           'tlib#agent#Input',
+            \ 27:            'tlib#agent#Exit',
+            \ 26:            'tlib#agent#Suspend',
+            \ 250:           'tlib#agent#Suspend',
+            \ 15:            'tlib#agent#SuspendToParentWindow',  
+            \ 63:            'tlib#agent#Help',
+            \ "\<F1>":       'tlib#agent#Help',
+            \ "\<F10>":      'tlib#agent#ExecAgentByName',
+            \ "\<S-Esc>":    'tlib#agent#ExecAgentByName',
+            \ "\<bs>":       'tlib#agent#ReduceFilter',
+            \ "\<del>":      'tlib#agent#ReduceFilter',
+            \ "\<c-bs>":     'tlib#agent#PopFilter',
+            \ "\<m-bs>":     'tlib#agent#PopFilter',
+            \ "\<c-del>":    'tlib#agent#PopFilter',
+            \ "\<m-del>":    'tlib#agent#PopFilter',
+            \ "\<s-space>":  'tlib#agent#Wildcard',
+            \ 191:           'tlib#agent#Debug',
+            \ char2nr(g:tlib#input#or):  'tlib#agent#OR',
+            \ char2nr(g:tlib#input#and): 'tlib#agent#AND',
+            \ }
+
+
+" :nodefault:
+TLet g:tlib#input#keyagents_InputList_m = {
+            \ 35:          'tlib#agent#Select',
+            \ "\<s-up>":   'tlib#agent#SelectUp',
+            \ "\<s-down>": 'tlib#agent#SelectDown',
+            \ 1:           'tlib#agent#SelectAll',
+            \ 225:         'tlib#agent#SelectAll',
+            \ "\<F9>":     'tlib#agent#ToggleRestrictView',
+            \ }
+" "\<c-space>": 'tlib#agent#Select'
+
+
+" :nodefault:
+TLet g:tlib#input#handlers_EditList = [
+            \ {'key': 5,  'agent': 'tlib#agent#EditItem',    'key_name': '<c-e>', 'help': 'Edit item'},
+            \ {'key': 4,  'agent': 'tlib#agent#DeleteItems', 'key_name': '<c-d>', 'help': 'Delete item(s)'},
+            \ {'key': 14, 'agent': 'tlib#agent#NewItem',     'key_name': '<c-n>', 'help': 'New item'},
+            \ {'key': 24, 'agent': 'tlib#agent#Cut',         'key_name': '<c-x>', 'help': 'Cut item(s)'},
+            \ {'key':  3, 'agent': 'tlib#agent#Copy',        'key_name': '<c-c>', 'help': 'Copy item(s)'},
+            \ {'key': 22, 'agent': 'tlib#agent#Paste',       'key_name': '<c-v>', 'help': 'Paste item(s)'},
+            \ {'pick_last_item': 0},
+            \ {'return_agent': 'tlib#agent#EditReturnValue'},
+            \ {'help_extra': [
+            \      'Submit changes by pressing ENTER or <c-s> or <c-w><cr>',
+            \      'Cancel editing by pressing <c-w>c'
+            \ ]},
+            \ ]
+
 
 " If true, define a popup menu for |tlib#input#List()| and related 
 " functions.
@@ -40,7 +215,7 @@ TLet g:tlib#input#filename_max_width = '&co / 2'
 " of selected elements or its indexes.
 "
 " By default, typing numbers will select an item by its index. See 
-" |g:tlib_numeric_chars| to find out how to change this.
+" |g:tlib#input#numeric_chars| to find out how to change this.
 "
 " The item is automatically selected if the numbers typed equals the 
 " number of digits of the list length. I.e. if a list contains 20 items, 
@@ -58,7 +233,7 @@ TLet g:tlib#input#filename_max_width = '&co / 2'
 "     mi ... Return a list of indexes
 "
 " Several pattern matching styles are supported. See 
-" |g:tlib_inputlist_match|.
+" |g:tlib#input#filter_mode|.
 "
 " EXAMPLES: >
 "   echo tlib#input#List('s', 'Select one item', [100,200,300])
@@ -110,7 +285,7 @@ function! tlib#input#List(type, ...) "{{{3
         let world.pick_last_item   = tlib#list#Find(handlers, 'has_key(v:val, "pick_last_item")', 
                     \ tlib#var#Get('tlib_pick_last_item', 'bg'), 'v:val.pick_last_item')
         let world.numeric_chars    = tlib#list#Find(handlers, 'has_key(v:val, "numeric_chars")', 
-                    \ tlib#var#Get('tlib_numeric_chars', 'bg'), 'v:val.numeric_chars')
+                    \ g:tlib#input#numeric_chars, 'v:val.numeric_chars')
         let world.key_handlers     = filter(copy(handlers), 'has_key(v:val, "key")')
         let filter                 = tlib#list#Find(handlers, 'has_key(v:val, "filter")', '', 'v:val.filter')
         if !empty(filter)
@@ -157,10 +332,12 @@ function! tlib#input#ListW(world, ...) "{{{3
     let &l:scrolloff = 0
     let @/ = ''
     let dlist = []
+    let post_keys = ''
     " let &laststatus = 2
 
     try
         while !empty(world.state) && world.state !~ '^exit' && (world.show_empty || !empty(world.base))
+            let post_keys = ''
             " TLogDBG 'while'
             " TLogVAR world.state
             " let time01 = str2float(reltimestr(reltime()))  " DBG
@@ -249,7 +426,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                             " TLogVAR world.idx, world.llen, world.state
                             " TLogDBG world.FilterIsEmpty()
                             if world.state == 'display'
-                                if world.idx == '' && world.llen < g:tlib_sortprefs_threshold && !world.FilterIsEmpty()
+                                if world.idx == '' && world.llen < g:tlib#input#sortprefs_threshold && !world.FilterIsEmpty()
                                     call world.SetPrefIdx()
                                 else
                                     let world.prefidx = world.idx == '' ? world.initial_index : world.idx
@@ -333,7 +510,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                     "     let world.prefidx = world.offset
                     " endif
                     call world.DisplayList()
-                    if world.state == 'help'
+                    if world.state == 'help' || world.state == 'printlines'
                         let world.state = 'display'
                     else
                         let world.state = ''
@@ -343,7 +520,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                 " TAssert IsNotEmpty(world.scratch)
                 let world.list_wnr = winnr()
 
-                " TLogVAR world.next_state, world.state
+                " TLogVAR world.state, world.next_state
                 if !empty(world.next_state)
                     let world.state = world.next_state
                     let world.next_state = ''
@@ -354,11 +531,49 @@ function! tlib#input#ListW(world, ...) "{{{3
                     continue
                 endif
 
-                " TLogVAR world.timeout
-                let c = tlib#char#Get(world.timeout, world.timeout_resolution)
-                " TLogVAR c, has_key(world.key_map[world.key_mode],c)
+                if world.state =~ '\<eval\>'
+                    let query = matchstr(world.state, '\<eval\[\zs.\{-}\ze\]')
+                    if empty(query)
+                        let query = 'Waiting for input ... Press ESC to continue'
+                    endif
+                    if has('gui_win32')
+                        let exec_cmd = input(query, '')
+                        " TLogVAR exec_cmd
+                        if exec_cmd == ''
+                            let world.state = 'redisplay'
+                        else
+                            exec exec_cmd
+                        endif
+                    elseif has('gui_gtk') || has('gui_gtk2')
+                        let c = getchar()
+                        let cmod = getcharmod()
+                        " TLogVAR c, cmod
+                        if c !~ '\D' && c > 0 && cmod != 0
+                            let c = printf("<%s-%s>", cmod, c)
+                        endif
+                    endif
+                else
+                    " TLogVAR world.timeout
+                    let c = tlib#char#Get(world.timeout, world.timeout_resolution)
+                    " TLogVAR c, has_key(world.key_map[world.key_mode],c)
+                    let cmod = getcharmod()
+                endif
+                " TLogVAR c, cmod
                 " TLogDBG string(sort(keys(world.key_map[world.key_mode])))
-                if world.state != ''
+
+                " TLogVAR world.next_agent, world.next_eval
+                if !empty(world.next_agent)
+                    let nagent = world.next_agent
+                    let world.next_agent = ''
+                    let world = call(nagent, [world, world.GetSelectedItems(world.CurrentItem())])
+                    call s:CheckAgentReturnValue(nagent, world)
+                elseif !empty(world.next_eval)
+                    let selected = world.GetSelectedItems(world.CurrentItem())
+                    let neval = world.next_eval
+                    let world.next_eval = ''
+                    exec neval
+                    call s:CheckAgentReturnValue(neval, world)
+                elseif world.state != ''
                     " continue
                 elseif has_key(world.key_map[world.key_mode], c)
                     let sr = @/
@@ -382,35 +597,53 @@ function! tlib#input#ListW(world, ...) "{{{3
                         let world.state = 'exit empty'
                     endif
                 elseif c == "\<LeftMouse>"
-                    let world.prefidx = world.GetLineIdx(v:mouse_lnum)
-                    " let world.offset  = world.prefidx
-                    " TLogVAR v:mouse_lnum, world.prefidx
-                    if empty(world.prefidx)
-                        " call feedkeys(c, 't')
-                        let c = tlib#char#Get(world.timeout)
-                        let world.state = 'help'
-                        continue
-                    endif
-                    throw 'pick'
-                elseif c == "\<RightMouse>"
-                    if g:tlib#input#use_popup && world.has_menu
-                        " if v:mouse_lnum != line('.')
-                        " endif
+                    if v:mouse_win == world.list_wnr
                         let world.prefidx = world.GetLineIdx(v:mouse_lnum)
-                        let world.state = 'redisplay'
-                        call world.DisplayList()
-                        if line('w$') - v:mouse_lnum < 6
-                            popup ]TLibInputListPopupMenu
+                        " let world.offset  = world.prefidx
+                        if empty(world.prefidx)
+                            " call feedkeys(c, 't')
+                            let c = tlib#char#Get(world.timeout)
+                            let world.state = 'help'
+                            continue
+                        endif
+                        throw 'pick'
+                    else
+                        let post_keys = v:mouse_lnum .'gg'. v:mouse_col .'|'. c
+                        if world.allow_suspend
+                            let world = tlib#agent#SuspendToParentWindow(world, world.rv)
                         else
-                            popup! ]TLibInputListPopupMenu
+                            let world.state = 'exit empty'
+                        endif
+                    endif
+                elseif c == "\<RightMouse>"
+                    if v:mouse_win == world.list_wnr
+                        call s:BuildMenu(world)
+                        let world.state = 'redisplay'
+                        if s:PopupmenuExists() == 1
+                            " if v:mouse_lnum != line('.')
+                            " endif
+                            let world.prefidx = world.GetLineIdx(v:mouse_lnum)
+                            let world.next_state = 'eval[Waiting for popup menu ... Press ESC to continue]'
+                            call world.DisplayList()
+                            if line('w$') - v:mouse_lnum < 6
+                                popup ]TLibInputListPopupMenu
+                            else
+                                popup! ]TLibInputListPopupMenu
+                            endif
                         endif
                     else
-                        let world.state = 'redisplay'
+                        let post_keys = v:mouse_lnum .'gg'. v:mouse_col .'|'. c
+                        if world.allow_suspend
+                            let world = tlib#agent#SuspendToParentWindow(world, world.rv)
+                        else
+                            let world.state = 'exit empty'
+                        endif
                     endif
                     " TLogVAR world.prefidx, world.state
                 elseif has_key(world.key_map[world.key_mode], 'unknown_key')
                     let agent = world.key_map[world.key_mode].unknown_key.agent
                     let world = call(agent, [world, c])
+                    call s:CheckAgentReturnValue(agent, world)
                 elseif c >= 32
                     let world.state = 'display'
                     let numbase = get(world.numeric_chars, c, -99999)
@@ -425,7 +658,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                     else
                         let world.idx = ''
                         " TLogVAR world.filter
-                        if world.llen > g:tlib_inputlist_livesearch_threshold
+                        if world.llen > g:tlib#input#livesearch_threshold
                             let pattern = input('Filter: ', world.CleanFilter(world.filter[0][0]) . nr2char(c))
                             if empty(pattern)
                                 let world.state = 'exit empty'
@@ -552,9 +785,8 @@ function! tlib#input#ListW(world, ...) "{{{3
         " let &laststatus = laststatus
         silent! let @/  = lastsearch
         let &l:scrolloff = scrolloff
-        if g:tlib#input#use_popup && world.has_menu
+        if s:PopupmenuExists() == 1
             silent! aunmenu ]TLibInputListPopupMenu
-            let world.has_menu = 0
         endif
 
         " TLogDBG 'finally 2'
@@ -589,6 +821,10 @@ function! tlib#input#ListW(world, ...) "{{{3
         " endfor
         echo
         redraw!
+        if !empty(post_keys)
+            " TLogVAR post_keys
+            call feedkeys(post_keys)
+        endif
     endtry
 endf
 
@@ -612,7 +848,7 @@ function! s:Init(world, cmd) "{{{3
         " TLogVAR a:world.initialized, a:world.win_wnr, a:world.bufnr
         let a:world.filetype = &filetype
         let a:world.fileencoding = &fileencoding
-        call a:world.SetMatchMode(tlib#var#Get('tlib_inputlist_match', 'wb'))
+        call a:world.SetMatchMode(tlib#var#Get('tlib#input#filter_mode', 'wb'))
         call a:world.Initialize()
         if !has_key(a:world, 'key_mode')
             let a:world.key_mode = 'default'
@@ -623,18 +859,19 @@ function! s:Init(world, cmd) "{{{3
             if has_key(a:world.key_map, a:world.key_mode)
                 let a:world.key_map[a:world.key_mode] = extend(
                             \ a:world.key_map[a:world.key_mode],
-                            \ copy(g:tlib_keyagents_InputList_s),
+                            \ copy(g:tlib#input#keyagents_InputList_s),
                             \ 'keep')
             else
-                let a:world.key_map[a:world.key_mode] = copy(g:tlib_keyagents_InputList_s)
+                let a:world.key_map[a:world.key_mode] = copy(g:tlib#input#keyagents_InputList_s)
             endif
         else
             let a:world.key_map = {
-                        \ a:world.key_mode : copy(g:tlib_keyagents_InputList_s)
+                        \ a:world.key_mode : copy(g:tlib#input#keyagents_InputList_s)
                         \ }
         endif
+        " TLogVAR a:world.type
         if stridx(a:world.type, 'm') != -1
-            call extend(a:world.key_map[a:world.key_mode], g:tlib_keyagents_InputList_m, 'force')
+            call extend(a:world.key_map[a:world.key_mode], g:tlib#input#keyagents_InputList_m, 'force')
         endif
         for key_mode in keys(a:world.key_map)
             let a:world.key_map[key_mode] = map(a:world.key_map[key_mode], 'type(v:val) == 4 ? v:val : {"agent": v:val}')
@@ -652,7 +889,6 @@ function! s:Init(world, cmd) "{{{3
             let a:world.state .= ' '. a:cmd
         endif
     endif
-    call s:BuildMenu(a:world)
     " TLogVAR a:world.state, a:world.sticky
 endf
 
@@ -667,40 +903,133 @@ function! s:ExtendKeyMap(world, key_mode, key_handlers) "{{{3
 endf
 
 
+function s:PopupmenuExists()
+    if !g:tlib#input#use_popup
+                \ || exists(':popup') != 2
+                \ || !(has('gui_win32') || has('gui_gtk') || has('gui_gtk2'))
+                " \ || !has('gui_win32')
+        let rv = -1
+    else
+        try
+            let rv = 1
+            silent amenu ]TLibInputListPopupMenu
+        catch
+            let rv = 0
+        endtry
+    endif
+    " TLogVAR rv
+    return rv
+endf
+
+
 function! s:BuildMenu(world) "{{{3
-    if g:tlib#input#use_popup
-        if a:world.has_menu
-            silent! aunmenu ]TLibInputListPopupMenu
-        endif
-        amenu ]TLibInputListPopupMenu.Pick\ selected\ item <cr>
-        amenu ]TLibInputListPopupMenu.Select #
-        amenu ]TLibInputListPopupMenu.Select\ all <c-a>
-        amenu ]TLibInputListPopupMenu.Reset\ list <c-r>
-        amenu ]TLibInputListPopupMenu.Cancel <esc>
-        amenu ]TLibInputListPopupMenu.-StandardEntries- :
-        let a:world.has_menu = 1
+    if g:tlib#input#use_popup && s:PopupmenuExists() == 0
+        call s:BuildItem('Pick\ selected\ item', {'key_name': '<cr>', 'eval': 'let world.state = "pick"'})
+        call s:BuildItem('Cancel', {'key_name': '<esc>', 'agent': 'tlib#agent#Exit'})
+        call s:BuildItem('Select', {'key_name': '#', 'agent': 'tlib#agent#Select'})
+        call s:BuildItem('Select\ all', {'key_name': '<c-a>', 'agent': 'tlib#agent#SelectAll'})
+        call s:BuildItem('Reset\ list', {'key_name': '<c-r>', 'agent': 'tlib#agent#Reset'})
+        call s:BuildItem('-StandardEntries-', {'key': ":", 'eval': 'let world.state = "redisplay"'})
         for [key_mode, key_handlers] in items(a:world.key_map)
             let keys = sort(keys(key_handlers))
+            let mitems = {}
             for key in keys
                 let handler = key_handlers[key]
                 let k = get(handler, 'key', '')
                 if !empty(k) && has_key(handler, 'help') && !empty(handler.help)
                     if empty(key_mode) || key_mode == 'default'
-                        exec 'amenu ]TLibInputListPopupMenu.'. escape(handler.help, ' .\')
-                                    \ .' '. handler.key_name
+                        let mname = ''
                     else
-                        exec 'amenu ]TLibInputListPopupMenu'. 
-                                    \ '.'. escape(key_mode, ' .\')
-                                    \ '.'. escape(handler.help, ' .\')
-                                    \ .' '. handler.key_name
+                        let mname = escape(key_mode, ' .\') .'.'
                     endif
+                    if has_key(handler, 'submenu')
+                        let submenu = escape(handler.submenu, ' .\')
+                    else
+                        let submenu = '~'
+                    endif
+                    for mfield in ['menu', 'help', 'key_name', 'agent']
+                        if has_key(handler, mfield)
+                            let mname .= escape(handler[mfield], ' .\')
+                            break
+                        endif
+                    endfor
+                    if !has_key(mitems, submenu)
+                        let mitems[submenu] = {}
+                    endif
+                    let mitems[submenu][mname] = handler
                 endif
             endfor
+            for msubname in sort(keys(mitems))
+                let msubitems = mitems[msubname]
+                if msubname == '~'
+                    let msubmname = ''
+                else
+                    let msubmname = msubname .'.'
+                endif
+                for mname in sort(keys(msubitems))
+                    let msname = msubmname . mname
+                    let handler = msubitems[mname]
+                    call s:BuildItem(msname, handler)
+                    " if has_key(handler, 'agent')
+                    "     call s:BuildItem(msname, {'agent': handler.agent})
+                    " else
+                    "     call s:BuildItem(msname, {'key': handler.key_name})
+                    " endif
+                endfor
+            endfor
         endfor
     endif
 endf
 
 
+function! s:BuildItem(menu, def) "{{{3
+    if has('gui_win32')
+        let key_mode = 'c'
+    elseif has('gui_gtk') || has('gui_gtk2')
+        let key_mode = 'raw'
+    endif
+    for k in ['agent', 'eval', 'key_name', 'key']
+        if has('gui_win32')
+        elseif has('gui_gtk') || has('gui_gtk')
+            if k == 'agent' || k == 'eval'
+                continue
+            endif
+        endif
+        try 
+            if has_key(a:def, k)
+                let v = a:def[k]
+                if k == 'key'
+                    if key_mode == 'c'
+                        " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) ':let c = "'. v .'"<cr>'
+                        exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) ':let c = "'. v .'"<cr>'
+                    else
+                        " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) v
+                        exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) v
+                    endif
+                elseif k == 'key_name'
+                    if key_mode == 'c'
+                        " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) ':let c = "\'. v .'"<cr>'
+                        exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) ':let c = "\'. v .'"<cr>'
+                    else
+                        let key = v
+                        " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) key
+                        exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) key
+                    endif
+                elseif k == 'agent'
+                    " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) ':let world.next_agent ='. string(v) .'<cr>'
+                    exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) ':let world.next_agent ='. string(v) .'<cr>'
+                elseif k == 'eval'
+                    " echom 'DBG amenu' (']TLibInputListPopupMenu.'. a:menu) ':let world.next_eval ='. string(v) .'<cr>'
+                    exec 'amenu' (']TLibInputListPopupMenu.'. a:menu) ':let world.next_eval ='. string(v) .'<cr>'
+                endif
+                return
+            endif
+        catch
+        endtry
+    endfor
+endf
+
+
 function! s:RunStateHandlers(world) "{{{3
     " Provide the variable "world" in the environment of an "exec" 
     " handler (ea).
@@ -748,7 +1077,7 @@ endf
 " EXAMPLES: >
 "   echo tlib#input#EditList('Edit:', [100,200,300])
 function! tlib#input#EditList(query, list, ...) "{{{3
-    let handlers = a:0 >= 1 && !empty(a:1) ? a:1 : g:tlib_handlers_EditList
+    let handlers = a:0 >= 1 && !empty(a:1) ? a:1 : g:tlib#input#handlers_EditList
     let default  = a:0 >= 2 ? a:2 : []
     let timeout  = a:0 >= 3 ? a:3 : 0
     " TLogVAR handlers
@@ -767,7 +1096,7 @@ function! tlib#input#Resume(name, pick, bufnr) "{{{3
     " TLogVAR a:name, a:pick
     echo
     if bufnr('%') != a:bufnr
-        if g:tlib_debug
+        if g:tlib#debug
             echohl WarningMsg
             echom "tlib#input#Resume: Internal error: Not in scratch buffer:" bufname('%')
             echohl NONE
@@ -775,7 +1104,7 @@ function! tlib#input#Resume(name, pick, bufnr) "{{{3
         let br = tlib#buffer#Set(a:bufnr)
     endif
     if !exists('b:tlib_'. a:name)
-        if g:tlib_debug
+        if g:tlib#debug
             echohl WarningMsg
             echom "tlib#input#Resume: Internal error: b:tlib_". a:name ." does not exist:" bufname('%')
             echohl NONE
diff --git a/sources_non_forked/tlib/autoload/tlib/number.vim b/sources_non_forked/tlib/autoload/tlib/number.vim
new file mode 100644
index 00000000..94fde02f
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/number.vim
@@ -0,0 +1,30 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Revision:    14
+
+
+function! tlib#number#ConvertBase(num, base, ...) "{{{3
+    let rtype = a:0 >= 1 ? a:1 : 'string'
+    " TLogVAR a:num, a:base, rtype
+    let rv = []
+    let num = 0.0 + a:num
+    while floor(num) > 0.0
+        let div = floor(num / a:base)
+        let num1 = float2nr(num - a:base * div)
+        if a:base <= 10
+            call insert(rv, num1)
+        elseif a:base == 16
+            let char = "0123456789ABCDEF"[num1]
+            call insert(rv, char)
+        endif
+        let num = num / a:base
+    endwh
+    " TLogVAR rv
+    if rtype == 'list'
+        return rv
+    else
+        return join(rv, '')
+    endif
+endf
+
+
diff --git a/sources_non_forked/tlib/autoload/tlib/persistent.vim b/sources_non_forked/tlib/autoload/tlib/persistent.vim
index a4611a69..b5791744 100644
--- a/sources_non_forked/tlib/autoload/tlib/persistent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/persistent.vim
@@ -3,7 +3,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-05-11.
 " @Last Change: 2012-05-11.
-" @Revision:    6
+" @Revision:    7
 
 " The directory for persistent data files. If empty, use 
 " |tlib#dir#MyRuntime|.'/share'.
@@ -38,6 +38,10 @@ function! tlib#persistent#Get(cfile) "{{{3
     endif
 endf
 
+function! tlib#persistent#Value(...) "{{{3
+    return call('tlib#cache#Value', a:000)
+endf
+
 function! tlib#persistent#Save(cfile, dictionary) "{{{3
     if !empty(a:cfile)
         " TLogVAR a:dictionary
diff --git a/sources_non_forked/tlib/autoload/tlib/scratch.vim b/sources_non_forked/tlib/autoload/tlib/scratch.vim
index 41f935d9..bb6e4be2 100644
--- a/sources_non_forked/tlib/autoload/tlib/scratch.vim
+++ b/sources_non_forked/tlib/autoload/tlib/scratch.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-07-18.
-" @Last Change: 2012-02-08.
-" @Revision:    0.0.167
+" @Last Change: 2013-10-16.
+" @Revision:    0.0.242
 
 if &cp || exists("loaded_tlib_scratch_autoload")
     finish
@@ -12,6 +12,17 @@ endif
 let loaded_tlib_scratch_autoload = 1
 
 
+" Scratch window position. By default the list window is opened on the 
+" bottom. Set this variable to 'topleft' or '' to change this behaviour.
+" See |tlib#input#List()|.
+TLet g:tlib_scratch_pos = 'botright'
+
+" If you want the scratch buffer to be fully removed, you might want to 
+" set this variable to 'wipe'.
+" See also https://github.com/tomtom/tlib_vim/pull/16
+TLet g:tlib#scratch#hidden = 'hide'
+
+
 " :def: function! tlib#scratch#UseScratch(?keyargs={})
 " Display a scratch buffer (a buffer with no file). See :TScratch for an 
 " example.
@@ -22,23 +33,21 @@ function! tlib#scratch#UseScratch(...) "{{{3
     exec tlib#arg#Let([['keyargs', {}]])
     " TLogDBG string(keys(keyargs))
     let id = get(keyargs, 'scratch', '__Scratch__')
-    " TLogVAR id
-    " TLogDBG winnr()
-    " TLogDBG bufnr(id)
-    " TLogDBG bufwinnr(id)
-    " TLogDBG bufnr('%')
-    if id =~ '^\d\+$' && bufwinnr(id) != -1
-        if bufnr('%') != id
-            exec 'noautocmd buffer! '. id
-        endif
-        " let ft = &ft
-        let ft = '*'
+    " TLogVAR id, bufwinnr(id)
+    " TLogVAR bufnr(id), bufname(id)
+    " TLogVAR 1, winnr(), bufnr('%'), bufname("%")
+    if bufwinnr(id) != -1
+        " echom 'DBG noautocmd keepalt keepj' bufwinnr(id) 'wincmd w'
+        exec 'noautocmd keepalt keepj' bufwinnr(id) 'wincmd w'
+        " TLogVAR "reuse", bufnr("%"), bufname("%")
     else
+        let winpos = ''
         let bn = bufnr(id)
         let wpos = get(keyargs, 'scratch_pos', g:tlib_scratch_pos)
         " TLogVAR keyargs.scratch_vertical
         if get(keyargs, 'scratch_vertical')
             let wpos .= ' vertical'
+            let winpos = tlib#fixes#Winpos()
         endif
         " TLogVAR wpos
         let scratch_split = get(keyargs, 'scratch_split', 1)
@@ -47,7 +56,7 @@ function! tlib#scratch#UseScratch(...) "{{{3
             let wn = bufwinnr(bn)
             if wn != -1
                 " TLogVAR wn
-                exec 'noautocmd' (wn .'wincmd w')
+                exec 'noautocmd keepalt keepj' (wn .'wincmd w')
             else
                 if scratch_split == 1
                     let cmd = wpos.' sbuffer!'
@@ -57,7 +66,7 @@ function! tlib#scratch#UseScratch(...) "{{{3
                     let cmd = 'buffer!'
                 endif
                 " TLogVAR cmd
-                silent exec 'noautocmd' cmd bn
+                silent exec 'noautocmd keepalt keepj' cmd bn
             endif
         else
             " TLogVAR id
@@ -69,24 +78,29 @@ function! tlib#scratch#UseScratch(...) "{{{3
                 let cmd = 'edit'
             endif
             " TLogVAR cmd
-            silent exec 'noautocmd' cmd escape(id, '%#\ ')
+            silent exec 'noautocmd keepalt keepj' cmd escape(id, '%#\ ')
             " silent exec 'split '. id
         endif
         let ft = get(keyargs, 'scratch_filetype', '')
-        " TLogVAR ft
-    endif
-    setlocal buftype=nofile
-    setlocal bufhidden=hide
-    setlocal noswapfile
-    setlocal nobuflisted
-    setlocal foldmethod=manual
-    setlocal foldcolumn=0
-    setlocal modifiable
-    setlocal nospell
-    if &ft != '*'
-        let &ft = ft
+        " TLogVAR ft, winpos
+        if !empty(winpos)
+            exec winpos
+        endif
+        setlocal buftype=nofile
+        let &l:bufhidden = get(keyargs, 'scratch_hidden', g:tlib#scratch#hidden)
+        setlocal noswapfile
+        setlocal nobuflisted
+        setlocal foldmethod=manual
+        setlocal foldcolumn=0
+        setlocal modifiable
+        setlocal nospell
+        " TLogVAR &ft, ft
+        if !empty(ft)
+            let &l:ft = ft
+        endif
     endif
     let keyargs.scratch = bufnr('%')
+    " TLogVAR 2, winnr(), bufnr('%'), bufname("%")
     return keyargs.scratch
 endf
 
@@ -106,7 +120,11 @@ function! tlib#scratch#CloseScratch(keyargs, ...) "{{{3
             if wn != -1
                 " TLogDBG winnr()
                 let wb = tlib#win#Set(wn)
+                let winpos = tlib#fixes#Winpos()
                 wincmd c
+                if get(a:keyargs, 'scratch_vertical') && !empty(winpos)
+                    exec winpos
+                endif
                 " exec wb 
                 " redraw
                 " TLogVAR winnr()
diff --git a/sources_non_forked/tlib/autoload/tlib/tag.vim b/sources_non_forked/tlib/autoload/tlib/tag.vim
index 64a1715c..5695f0a3 100644
--- a/sources_non_forked/tlib/autoload/tlib/tag.vim
+++ b/sources_non_forked/tlib/autoload/tlib/tag.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-11-01.
-" @Last Change: 2011-08-11.
-" @Revision:    0.0.56
+" @Last Change: 2013-09-25.
+" @Revision:    0.0.58
 
 if &cp || exists("loaded_tlib_tag_autoload")
     finish
@@ -12,6 +12,23 @@ endif
 let loaded_tlib_tag_autoload = 1
 
 
+" Extra tags for |tlib#tag#Retrieve()| (see there). Can also be buffer-local.
+TLet g:tlib_tags_extra = ''
+
+" Filter the tag description through |substitute()| for these filetypes. 
+" This applies only if the tag cmd field (see |taglist()|) is used.
+" :nodefault:
+TLet g:tlib_tag_substitute = {
+            \ 'java': [['\s*{\s*$', '', '']],
+            \ 'ruby': [['\<\(def\|class\|module\)\>\s\+', '', '']],
+            \ 'vim':  [
+            \   ['^\s*com\%[mand]!\?\(\s\+-\S\+\)*\s*\u\w*\zs.*$', '', ''],
+            \   ['^\s*\(let\|aug\%[roup]\|fu\%[nction]!\?\|com\%[mand]!\?\(\s\+-\S\+\)*\)\s*', '', ''],
+            \   ['"\?\s*{{{\d.*$', '', ''],
+            \ ],
+            \ }
+
+
 " :def: function! tlib#tag#Retrieve(rx, ?extra_tags=0)
 " Get all tags matching rx. Basically, this function simply calls 
 " |taglist()|, but when extra_tags is true, the list of the tag files 
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index 6caa99f5..f12563aa 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -30,232 +30,264 @@ installed.
 ========================================================================
 Contents~
 
-        :TRequire ............................... |:TRequire|
-        :TLet ................................... |:TLet|
-        :TScratch ............................... |:TScratch|
-        :TVarArg ................................ |:TVarArg|
-        :TKeyArg ................................ |:TKeyArg|
-        :TBrowseOutput .......................... |:TBrowseOutput|
-        :TBrowseScriptnames ..................... |:TBrowseScriptnames|
-        :TTimeCommand ........................... |:TTimeCommand|
-        g:tlib_pick_last_item ................... |g:tlib_pick_last_item|
-        g:tlib_sortprefs_threshold .............. |g:tlib_sortprefs_threshold|
-        g:tlib_scratch_pos ...................... |g:tlib_scratch_pos|
-        g:tlib_inputlist_pct .................... |g:tlib_inputlist_pct|
-        g:tlib_inputlist_width_filename ......... |g:tlib_inputlist_width_filename|
-        g:tlib_inputlist_higroup ................ |g:tlib_inputlist_higroup|
-        g:tlib_inputlist_livesearch_threshold ... |g:tlib_inputlist_livesearch_threshold|
-        g:tlib_inputlist_filename_indicators .... |g:tlib_inputlist_filename_indicators|
-        g:tlib_inputlist_match .................. |g:tlib_inputlist_match|
-        g:tlib_inputlist_shortmessage ........... |g:tlib_inputlist_shortmessage|
-        g:tlib_tags_extra ....................... |g:tlib_tags_extra|
-        g:tlib_tag_substitute ................... |g:tlib_tag_substitute|
-        g:tlib_filename_sep ..................... |g:tlib_filename_sep|
-        g:tlib_cache ............................ |g:tlib_cache|
-        g:tlib_viewline_position ................ |g:tlib_viewline_position|
-        g:tlib_inputlist_and .................... |g:tlib_inputlist_and|
-        g:tlib_inputlist_or ..................... |g:tlib_inputlist_or|
-        g:tlib_inputlist_not .................... |g:tlib_inputlist_not|
-        g:tlib_numeric_chars .................... |g:tlib_numeric_chars|
-        g:tlib_keyagents_InputList_s ............ |g:tlib_keyagents_InputList_s|
-        g:tlib_scroll_lines ..................... |g:tlib_scroll_lines|
-        g:tlib_keyagents_InputList_m ............ |g:tlib_keyagents_InputList_m|
-        g:tlib_handlers_EditList ................ |g:tlib_handlers_EditList|
-        g:tlib_debug ............................ |g:tlib_debug|
-        tlib#notify#Echo ........................ |tlib#notify#Echo()|
-        tlib#notify#TrimMessage ................. |tlib#notify#TrimMessage()|
-        g:tlib_persistent ....................... |g:tlib_persistent|
-        tlib#persistent#Dir ..................... |tlib#persistent#Dir()|
-        tlib#persistent#Filename ................ |tlib#persistent#Filename()|
-        tlib#persistent#Get ..................... |tlib#persistent#Get()|
-        tlib#persistent#Save .................... |tlib#persistent#Save()|
-        g:tlib#vim#simalt_maximize .............. |g:tlib#vim#simalt_maximize|
-        g:tlib#vim#simalt_restore ............... |g:tlib#vim#simalt_restore|
-        g:tlib#vim#use_vimtweak ................. |g:tlib#vim#use_vimtweak|
-        tlib#vim#Maximize ....................... |tlib#vim#Maximize()|
-        tlib#vim#RestoreWindow .................. |tlib#vim#RestoreWindow()|
-        g:tlib#vim#use_wmctrl ................... |g:tlib#vim#use_wmctrl|
-        tlib#progressbar#Init ................... |tlib#progressbar#Init()|
-        tlib#progressbar#Display ................ |tlib#progressbar#Display()|
-        tlib#progressbar#Restore ................ |tlib#progressbar#Restore()|
-        tlib#eval#FormatValue ................... |tlib#eval#FormatValue()|
-        tlib#list#Inject ........................ |tlib#list#Inject()|
-        tlib#list#Compact ....................... |tlib#list#Compact()|
-        tlib#list#Flatten ....................... |tlib#list#Flatten()|
-        tlib#list#FindAll ....................... |tlib#list#FindAll()|
-        tlib#list#Find .......................... |tlib#list#Find()|
-        tlib#list#Any ........................... |tlib#list#Any()|
-        tlib#list#All ........................... |tlib#list#All()|
-        tlib#list#Remove ........................ |tlib#list#Remove()|
-        tlib#list#RemoveAll ..................... |tlib#list#RemoveAll()|
-        tlib#list#Zip ........................... |tlib#list#Zip()|
-        tlib#list#Uniq .......................... |tlib#list#Uniq()|
-        tlib#cmd#OutputAsList ................... |tlib#cmd#OutputAsList()|
-        tlib#cmd#BrowseOutput ................... |tlib#cmd#BrowseOutput()|
-        tlib#cmd#BrowseOutputWithCallback ....... |tlib#cmd#BrowseOutputWithCallback()|
-        tlib#cmd#DefaultBrowseOutput ............ |tlib#cmd#DefaultBrowseOutput()|
-        tlib#cmd#ParseScriptname ................ |tlib#cmd#ParseScriptname()|
-        tlib#cmd#UseVertical .................... |tlib#cmd#UseVertical()|
-        tlib#cmd#Time ........................... |tlib#cmd#Time()|
-        tlib#syntax#Collect ..................... |tlib#syntax#Collect()|
-        tlib#syntax#Names ....................... |tlib#syntax#Names()|
-        tlib#balloon#Register ................... |tlib#balloon#Register()|
-        tlib#balloon#Remove ..................... |tlib#balloon#Remove()|
-        tlib#balloon#Expr ....................... |tlib#balloon#Expr()|
-        g:tlib#vcs#def .......................... |g:tlib#vcs#def|
-        g:tlib#vcs#executables .................. |g:tlib#vcs#executables|
-        g:tlib#vcs#check ........................ |g:tlib#vcs#check|
-        tlib#vcs#FindVCS ........................ |tlib#vcs#FindVCS()|
-        tlib#vcs#Ls ............................. |tlib#vcs#Ls()|
-        tlib#vcs#Diff ........................... |tlib#vcs#Diff()|
-        tlib#char#Get ........................... |tlib#char#Get()|
-        tlib#char#IsAvailable ................... |tlib#char#IsAvailable()|
-        tlib#char#GetWithTimeout ................ |tlib#char#GetWithTimeout()|
-        tlib#scratch#UseScratch ................. |tlib#scratch#UseScratch()|
-        tlib#scratch#CloseScratch ............... |tlib#scratch#CloseScratch()|
-        tlib#autocmdgroup#Init .................. |tlib#autocmdgroup#Init()|
-        g:tlib#cache#purge_days ................. |g:tlib#cache#purge_days|
-        g:tlib#cache#purge_every_days ........... |g:tlib#cache#purge_every_days|
-        g:tlib#cache#script_encoding ............ |g:tlib#cache#script_encoding|
-        g:tlib#cache#run_script ................. |g:tlib#cache#run_script|
-        g:tlib#cache#silent ..................... |g:tlib#cache#silent|
-        g:tlib#cache#dont_purge ................. |g:tlib#cache#dont_purge|
-        tlib#cache#Dir .......................... |tlib#cache#Dir()|
-        tlib#cache#Filename ..................... |tlib#cache#Filename()|
-        tlib#cache#Save ......................... |tlib#cache#Save()|
-        tlib#cache#Get .......................... |tlib#cache#Get()|
-        tlib#cache#MaybePurge ................... |tlib#cache#MaybePurge()|
-        tlib#cache#Purge ........................ |tlib#cache#Purge()|
-        tlib#cache#ListFilesInCache ............. |tlib#cache#ListFilesInCache()|
-        tlib#normal#WithRegister ................ |tlib#normal#WithRegister()|
-        tlib#time#MSecs ......................... |tlib#time#MSecs()|
-        tlib#time#Now ........................... |tlib#time#Now()|
-        tlib#time#Diff .......................... |tlib#time#Diff()|
-        tlib#time#DiffMSecs ..................... |tlib#time#DiffMSecs()|
-        tlib#var#Let ............................ |tlib#var#Let()|
-        tlib#var#EGet ........................... |tlib#var#EGet()|
-        tlib#var#Get ............................ |tlib#var#Get()|
-        tlib#var#List ........................... |tlib#var#List()|
-        tlib#agent#Exit ......................... |tlib#agent#Exit()|
-        tlib#agent#CopyItems .................... |tlib#agent#CopyItems()|
-        tlib#agent#PageUp ....................... |tlib#agent#PageUp()|
-        tlib#agent#PageDown ..................... |tlib#agent#PageDown()|
-        tlib#agent#Up ........................... |tlib#agent#Up()|
-        tlib#agent#Down ......................... |tlib#agent#Down()|
-        tlib#agent#UpN .......................... |tlib#agent#UpN()|
-        tlib#agent#DownN ........................ |tlib#agent#DownN()|
-        tlib#agent#ShiftLeft .................... |tlib#agent#ShiftLeft()|
-        tlib#agent#ShiftRight ................... |tlib#agent#ShiftRight()|
-        tlib#agent#Reset ........................ |tlib#agent#Reset()|
-        tlib#agent#Input ........................ |tlib#agent#Input()|
-        tlib#agent#SuspendToParentWindow ........ |tlib#agent#SuspendToParentWindow()|
-        tlib#agent#Suspend ...................... |tlib#agent#Suspend()|
-        tlib#agent#Help ......................... |tlib#agent#Help()|
-        tlib#agent#OR ........................... |tlib#agent#OR()|
-        tlib#agent#AND .......................... |tlib#agent#AND()|
-        tlib#agent#ReduceFilter ................. |tlib#agent#ReduceFilter()|
-        tlib#agent#PopFilter .................... |tlib#agent#PopFilter()|
-        tlib#agent#Debug ........................ |tlib#agent#Debug()|
-        tlib#agent#Select ....................... |tlib#agent#Select()|
-        tlib#agent#SelectUp ..................... |tlib#agent#SelectUp()|
-        tlib#agent#SelectDown ................... |tlib#agent#SelectDown()|
-        tlib#agent#SelectAll .................... |tlib#agent#SelectAll()|
-        tlib#agent#ToggleStickyList ............. |tlib#agent#ToggleStickyList()|
-        tlib#agent#EditItem ..................... |tlib#agent#EditItem()|
-        tlib#agent#NewItem ...................... |tlib#agent#NewItem()|
-        tlib#agent#DeleteItems .................. |tlib#agent#DeleteItems()|
-        tlib#agent#Cut .......................... |tlib#agent#Cut()|
-        tlib#agent#Copy ......................... |tlib#agent#Copy()|
-        tlib#agent#Paste ........................ |tlib#agent#Paste()|
-        tlib#agent#EditReturnValue .............. |tlib#agent#EditReturnValue()|
-        tlib#agent#ViewFile ..................... |tlib#agent#ViewFile()|
-        tlib#agent#EditFile ..................... |tlib#agent#EditFile()|
-        tlib#agent#EditFileInSplit .............. |tlib#agent#EditFileInSplit()|
-        tlib#agent#EditFileInVSplit ............. |tlib#agent#EditFileInVSplit()|
-        tlib#agent#EditFileInTab ................ |tlib#agent#EditFileInTab()|
-        tlib#agent#ToggleScrollbind ............. |tlib#agent#ToggleScrollbind()|
-        tlib#agent#ShowInfo ..................... |tlib#agent#ShowInfo()|
-        tlib#agent#PreviewLine .................. |tlib#agent#PreviewLine()|
-        tlib#agent#GotoLine ..................... |tlib#agent#GotoLine()|
-        tlib#agent#DoAtLine ..................... |tlib#agent#DoAtLine()|
-        tlib#agent#Wildcard ..................... |tlib#agent#Wildcard()|
-        tlib#agent#Null ......................... |tlib#agent#Null()|
-        tlib#agent#ExecAgentByName .............. |tlib#agent#ExecAgentByName()|
-        tlib#agent#CompleteAgentNames ........... |tlib#agent#CompleteAgentNames()|
-        g:tlib#Filter_cnfx#expander ............. |g:tlib#Filter_cnfx#expander|
-        tlib#Filter_cnfx#New .................... |tlib#Filter_cnfx#New()|
-        tlib#url#Decode ......................... |tlib#url#Decode()|
-        tlib#url#DecodeChar ..................... |tlib#url#DecodeChar()|
-        tlib#url#EncodeChar ..................... |tlib#url#EncodeChar()|
-        tlib#url#Encode ......................... |tlib#url#Encode()|
-        tlib#signs#ClearAll ..................... |tlib#signs#ClearAll()|
-        tlib#signs#ClearBuffer .................. |tlib#signs#ClearBuffer()|
-        tlib#signs#Mark ......................... |tlib#signs#Mark()|
-        tlib#rx#Escape .......................... |tlib#rx#Escape()|
-        tlib#rx#EscapeReplace ................... |tlib#rx#EscapeReplace()|
-        tlib#rx#Suffixes ........................ |tlib#rx#Suffixes()|
-        tlib#tag#Retrieve ....................... |tlib#tag#Retrieve()|
-        tlib#tag#Collect ........................ |tlib#tag#Collect()|
-        tlib#tag#Format ......................... |tlib#tag#Format()|
-        tlib#map#PumAccept ...................... |tlib#map#PumAccept()|
-        tlib#Filter_cnfd#New .................... |tlib#Filter_cnfd#New()|
-        g:tlib#input#use_popup .................. |g:tlib#input#use_popup|
-        g:tlib#input#format_filename ............ |g:tlib#input#format_filename|
-        g:tlib#input#filename_padding_r ......... |g:tlib#input#filename_padding_r|
-        g:tlib#input#filename_max_width ......... |g:tlib#input#filename_max_width|
-        tlib#input#List ......................... |tlib#input#List()|
-        tlib#input#ListD ........................ |tlib#input#ListD()|
-        tlib#input#ListW ........................ |tlib#input#ListW()|
-        tlib#input#EditList ..................... |tlib#input#EditList()|
-        tlib#input#Resume ....................... |tlib#input#Resume()|
-        tlib#input#CommandSelect ................ |tlib#input#CommandSelect()|
-        tlib#input#Edit ......................... |tlib#input#Edit()|
-        tlib#input#Dialog ....................... |tlib#input#Dialog()|
-        tlib#file#Split ......................... |tlib#file#Split()|
-        tlib#file#Join .......................... |tlib#file#Join()|
-        tlib#file#Relative ...................... |tlib#file#Relative()|
-        tlib#file#With .......................... |tlib#file#With()|
-        tlib#paragraph#GetMetric ................ |tlib#paragraph#GetMetric()|
-        tlib#paragraph#Move ..................... |tlib#paragraph#Move()|
-        tlib#World#New .......................... |tlib#World#New()|
-        tlib#tab#BufMap ......................... |tlib#tab#BufMap()|
-        tlib#tab#TabWinNr ....................... |tlib#tab#TabWinNr()|
-        tlib#tab#Set ............................ |tlib#tab#Set()|
-        tlib#date#DiffInDays .................... |tlib#date#DiffInDays()|
-        tlib#date#Parse ......................... |tlib#date#Parse()|
-        tlib#date#SecondsSince1970 .............. |tlib#date#SecondsSince1970()|
-        tlib#type#IsNumber ...................... |tlib#type#IsNumber()|
-        tlib#type#IsString ...................... |tlib#type#IsString()|
-        tlib#type#IsFuncref ..................... |tlib#type#IsFuncref()|
-        tlib#type#IsList ........................ |tlib#type#IsList()|
-        tlib#type#IsDictionary .................. |tlib#type#IsDictionary()|
-        tlib#Filter_fuzzy#New ................... |tlib#Filter_fuzzy#New()|
-        tlib#textobjects#StandardParagraph ...... |standard-paragraph|
-        tlib#textobjects#Init ................... |tlib#textobjects#Init()|
-        v_sp .................................... |v_sp|
-        o_sp .................................... |o_sp|
-        tlib#arg#Get ............................ |tlib#arg#Get()|
-        tlib#arg#Let ............................ |tlib#arg#Let()|
-        tlib#arg#Key ............................ |tlib#arg#Key()|
-        tlib#arg#StringAsKeyArgs ................ |tlib#arg#StringAsKeyArgs()|
-        tlib#arg#Ex ............................. |tlib#arg#Ex()|
-        tlib#dir#CanonicName .................... |tlib#dir#CanonicName()|
-        tlib#dir#PlainName ...................... |tlib#dir#PlainName()|
-        tlib#dir#Ensure ......................... |tlib#dir#Ensure()|
-        tlib#dir#MyRuntime ...................... |tlib#dir#MyRuntime()|
-        tlib#dir#CD ............................. |tlib#dir#CD()|
-        tlib#dir#Push ........................... |tlib#dir#Push()|
-        tlib#dir#Pop ............................ |tlib#dir#Pop()|
-        tlib#win#Set ............................ |tlib#win#Set()|
-        tlib#win#GetLayout ...................... |tlib#win#GetLayout()|
-        tlib#win#SetLayout ...................... |tlib#win#SetLayout()|
-        tlib#win#List ........................... |tlib#win#List()|
-        tlib#win#Width .......................... |tlib#win#Width()|
-        tlib#win#WinDo .......................... |tlib#win#WinDo()|
-        tlib#comments#Comments .................. |tlib#comments#Comments()|
-        tlib#Filter_cnf#New ..................... |tlib#Filter_cnf#New()|
+        :TRequire .............................. |:TRequire|
+        :TLet .................................. |:TLet|
+        :TScratch .............................. |:TScratch|
+        :TVarArg ............................... |:TVarArg|
+        :TKeyArg ............................... |:TKeyArg|
+        :TBrowseOutput ......................... |:TBrowseOutput|
+        :TBrowseScriptnames .................... |:TBrowseScriptnames|
+        :TTimeCommand .......................... |:TTimeCommand|
+        g:tlib#debug ........................... |g:tlib#debug|
+        tlib#notify#Echo ....................... |tlib#notify#Echo()|
+        tlib#notify#TrimMessage ................ |tlib#notify#TrimMessage()|
+        g:tlib_persistent ...................... |g:tlib_persistent|
+        tlib#persistent#Dir .................... |tlib#persistent#Dir()|
+        tlib#persistent#Filename ............... |tlib#persistent#Filename()|
+        tlib#persistent#Get .................... |tlib#persistent#Get()|
+        tlib#persistent#Value .................. |tlib#persistent#Value()|
+        tlib#persistent#Save ................... |tlib#persistent#Save()|
+        g:tlib#vim#simalt_maximize ............. |g:tlib#vim#simalt_maximize|
+        g:tlib#vim#simalt_restore .............. |g:tlib#vim#simalt_restore|
+        g:tlib#vim#use_vimtweak ................ |g:tlib#vim#use_vimtweak|
+        tlib#vim#Maximize ...................... |tlib#vim#Maximize()|
+        tlib#vim#RestoreWindow ................. |tlib#vim#RestoreWindow()|
+        g:tlib#vim#use_wmctrl .................. |g:tlib#vim#use_wmctrl|
+        tlib#progressbar#Init .................. |tlib#progressbar#Init()|
+        tlib#progressbar#Display ............... |tlib#progressbar#Display()|
+        tlib#progressbar#Restore ............... |tlib#progressbar#Restore()|
+        tlib#eval#FormatValue .................. |tlib#eval#FormatValue()|
+        tlib#list#Inject ....................... |tlib#list#Inject()|
+        tlib#list#Compact ...................... |tlib#list#Compact()|
+        tlib#list#Flatten ...................... |tlib#list#Flatten()|
+        tlib#list#FindAll ...................... |tlib#list#FindAll()|
+        tlib#list#Find ......................... |tlib#list#Find()|
+        tlib#list#Any .......................... |tlib#list#Any()|
+        tlib#list#All .......................... |tlib#list#All()|
+        tlib#list#Remove ....................... |tlib#list#Remove()|
+        tlib#list#RemoveAll .................... |tlib#list#RemoveAll()|
+        tlib#list#Zip .......................... |tlib#list#Zip()|
+        tlib#list#Uniq ......................... |tlib#list#Uniq()|
+        tlib#cmd#OutputAsList .................. |tlib#cmd#OutputAsList()|
+        tlib#cmd#BrowseOutput .................. |tlib#cmd#BrowseOutput()|
+        tlib#cmd#BrowseOutputWithCallback ...... |tlib#cmd#BrowseOutputWithCallback()|
+        tlib#cmd#DefaultBrowseOutput ........... |tlib#cmd#DefaultBrowseOutput()|
+        tlib#cmd#ParseScriptname ............... |tlib#cmd#ParseScriptname()|
+        tlib#cmd#UseVertical ................... |tlib#cmd#UseVertical()|
+        tlib#cmd#Time .......................... |tlib#cmd#Time()|
+        tlib#syntax#Collect .................... |tlib#syntax#Collect()|
+        tlib#syntax#Names ...................... |tlib#syntax#Names()|
+        tlib#balloon#Register .................. |tlib#balloon#Register()|
+        tlib#balloon#Remove .................... |tlib#balloon#Remove()|
+        tlib#balloon#Expr ...................... |tlib#balloon#Expr()|
+        g:tlib#vcs#def ......................... |g:tlib#vcs#def|
+        g:tlib#vcs#executables ................. |g:tlib#vcs#executables|
+        g:tlib#vcs#check ....................... |g:tlib#vcs#check|
+        tlib#vcs#FindVCS ....................... |tlib#vcs#FindVCS()|
+        tlib#vcs#Ls ............................ |tlib#vcs#Ls()|
+        tlib#vcs#Diff .......................... |tlib#vcs#Diff()|
+        tlib#char#Get .......................... |tlib#char#Get()|
+        tlib#char#IsAvailable .................. |tlib#char#IsAvailable()|
+        tlib#char#GetWithTimeout ............... |tlib#char#GetWithTimeout()|
+        g:tlib_scratch_pos ..................... |g:tlib_scratch_pos|
+        g:tlib#scratch#hidden .................. |g:tlib#scratch#hidden|
+        tlib#scratch#UseScratch ................ |tlib#scratch#UseScratch()|
+        tlib#scratch#CloseScratch .............. |tlib#scratch#CloseScratch()|
+        tlib#autocmdgroup#Init ................. |tlib#autocmdgroup#Init()|
+        g:tlib_cache ........................... |g:tlib_cache|
+        g:tlib#cache#purge_days ................ |g:tlib#cache#purge_days|
+        g:tlib#cache#purge_every_days .......... |g:tlib#cache#purge_every_days|
+        g:tlib#cache#script_encoding ........... |g:tlib#cache#script_encoding|
+        g:tlib#cache#run_script ................ |g:tlib#cache#run_script|
+        g:tlib#cache#verbosity ................. |g:tlib#cache#verbosity|
+        g:tlib#cache#dont_purge ................ |g:tlib#cache#dont_purge|
+        g:tlib#cache#max_filename .............. |g:tlib#cache#max_filename|
+        tlib#cache#Dir ......................... |tlib#cache#Dir()|
+        tlib#cache#Filename .................... |tlib#cache#Filename()|
+        tlib#cache#Save ........................ |tlib#cache#Save()|
+        tlib#cache#Get ......................... |tlib#cache#Get()|
+        tlib#cache#Value ....................... |tlib#cache#Value()|
+        tlib#cache#MaybePurge .................. |tlib#cache#MaybePurge()|
+        tlib#cache#Purge ....................... |tlib#cache#Purge()|
+        tlib#cache#ListFilesInCache ............ |tlib#cache#ListFilesInCache()|
+        tlib#normal#WithRegister ............... |tlib#normal#WithRegister()|
+        tlib#time#MSecs ........................ |tlib#time#MSecs()|
+        tlib#time#Now .......................... |tlib#time#Now()|
+        tlib#time#Diff ......................... |tlib#time#Diff()|
+        tlib#time#DiffMSecs .................... |tlib#time#DiffMSecs()|
+        tlib#var#Let ........................... |tlib#var#Let()|
+        tlib#var#EGet .......................... |tlib#var#EGet()|
+        tlib#var#Get ........................... |tlib#var#Get()|
+        tlib#var#List .......................... |tlib#var#List()|
+        g:tlib_scroll_lines .................... |g:tlib_scroll_lines|
+        tlib#agent#Exit ........................ |tlib#agent#Exit()|
+        tlib#agent#CopyItems ................... |tlib#agent#CopyItems()|
+        tlib#agent#PageUp ...................... |tlib#agent#PageUp()|
+        tlib#agent#PageDown .................... |tlib#agent#PageDown()|
+        tlib#agent#Up .......................... |tlib#agent#Up()|
+        tlib#agent#Down ........................ |tlib#agent#Down()|
+        tlib#agent#UpN ......................... |tlib#agent#UpN()|
+        tlib#agent#DownN ....................... |tlib#agent#DownN()|
+        tlib#agent#ShiftLeft ................... |tlib#agent#ShiftLeft()|
+        tlib#agent#ShiftRight .................. |tlib#agent#ShiftRight()|
+        tlib#agent#Reset ....................... |tlib#agent#Reset()|
+        tlib#agent#ToggleRestrictView .......... |tlib#agent#ToggleRestrictView()|
+        tlib#agent#RestrictView ................ |tlib#agent#RestrictView()|
+        tlib#agent#UnrestrictView .............. |tlib#agent#UnrestrictView()|
+        tlib#agent#Input ....................... |tlib#agent#Input()|
+        tlib#agent#SuspendToParentWindow ....... |tlib#agent#SuspendToParentWindow()|
+        tlib#agent#Suspend ..................... |tlib#agent#Suspend()|
+        tlib#agent#Help ........................ |tlib#agent#Help()|
+        tlib#agent#OR .......................... |tlib#agent#OR()|
+        tlib#agent#AND ......................... |tlib#agent#AND()|
+        tlib#agent#ReduceFilter ................ |tlib#agent#ReduceFilter()|
+        tlib#agent#PopFilter ................... |tlib#agent#PopFilter()|
+        tlib#agent#Debug ....................... |tlib#agent#Debug()|
+        tlib#agent#Select ...................... |tlib#agent#Select()|
+        tlib#agent#SelectUp .................... |tlib#agent#SelectUp()|
+        tlib#agent#SelectDown .................. |tlib#agent#SelectDown()|
+        tlib#agent#SelectAll ................... |tlib#agent#SelectAll()|
+        tlib#agent#ToggleStickyList ............ |tlib#agent#ToggleStickyList()|
+        tlib#agent#EditItem .................... |tlib#agent#EditItem()|
+        tlib#agent#NewItem ..................... |tlib#agent#NewItem()|
+        tlib#agent#DeleteItems ................. |tlib#agent#DeleteItems()|
+        tlib#agent#Cut ......................... |tlib#agent#Cut()|
+        tlib#agent#Copy ........................ |tlib#agent#Copy()|
+        tlib#agent#Paste ....................... |tlib#agent#Paste()|
+        tlib#agent#EditReturnValue ............. |tlib#agent#EditReturnValue()|
+        tlib#agent#ViewFile .................... |tlib#agent#ViewFile()|
+        tlib#agent#EditFile .................... |tlib#agent#EditFile()|
+        tlib#agent#EditFileInSplit ............. |tlib#agent#EditFileInSplit()|
+        tlib#agent#EditFileInVSplit ............ |tlib#agent#EditFileInVSplit()|
+        tlib#agent#EditFileInTab ............... |tlib#agent#EditFileInTab()|
+        tlib#agent#ToggleScrollbind ............ |tlib#agent#ToggleScrollbind()|
+        tlib#agent#ShowInfo .................... |tlib#agent#ShowInfo()|
+        tlib#agent#PreviewLine ................. |tlib#agent#PreviewLine()|
+        tlib#agent#GotoLine .................... |tlib#agent#GotoLine()|
+        tlib#agent#DoAtLine .................... |tlib#agent#DoAtLine()|
+        tlib#agent#Wildcard .................... |tlib#agent#Wildcard()|
+        tlib#agent#Null ........................ |tlib#agent#Null()|
+        tlib#agent#ExecAgentByName ............. |tlib#agent#ExecAgentByName()|
+        tlib#agent#CompleteAgentNames .......... |tlib#agent#CompleteAgentNames()|
+        tlib#bitwise#Num2Bits .................. |tlib#bitwise#Num2Bits()|
+        tlib#bitwise#Bits2Num .................. |tlib#bitwise#Bits2Num()|
+        tlib#bitwise#AND ....................... |tlib#bitwise#AND()|
+        tlib#bitwise#OR ........................ |tlib#bitwise#OR()|
+        tlib#bitwise#XOR ....................... |tlib#bitwise#XOR()|
+        tlib#bitwise#ShiftRight ................ |tlib#bitwise#ShiftRight()|
+        tlib#bitwise#ShiftLeft ................. |tlib#bitwise#ShiftLeft()|
+        tlib#bitwise#Add ....................... |tlib#bitwise#Add()|
+        tlib#bitwise#Sub ....................... |tlib#bitwise#Sub()|
+        g:tlib#Filter_cnfx#expander ............ |g:tlib#Filter_cnfx#expander|
+        tlib#Filter_cnfx#New ................... |tlib#Filter_cnfx#New()|
+        tlib#url#Decode ........................ |tlib#url#Decode()|
+        tlib#url#DecodeChar .................... |tlib#url#DecodeChar()|
+        tlib#url#EncodeChar .................... |tlib#url#EncodeChar()|
+        tlib#url#Encode ........................ |tlib#url#Encode()|
+        tlib#signs#ClearAll .................... |tlib#signs#ClearAll()|
+        tlib#signs#ClearBuffer ................. |tlib#signs#ClearBuffer()|
+        tlib#signs#Mark ........................ |tlib#signs#Mark()|
+        tlib#rx#Escape ......................... |tlib#rx#Escape()|
+        tlib#rx#EscapeReplace .................. |tlib#rx#EscapeReplace()|
+        tlib#rx#Suffixes ....................... |tlib#rx#Suffixes()|
+        g:tlib_tags_extra ...................... |g:tlib_tags_extra|
+        g:tlib_tag_substitute .................. |g:tlib_tag_substitute|
+        tlib#tag#Retrieve ...................... |tlib#tag#Retrieve()|
+        tlib#tag#Collect ....................... |tlib#tag#Collect()|
+        tlib#tag#Format ........................ |tlib#tag#Format()|
+        tlib#map#PumAccept ..................... |tlib#map#PumAccept()|
+        tlib#Filter_cnfd#New ................... |tlib#Filter_cnfd#New()|
+        g:tlib#input#sortprefs_threshold ....... |g:tlib#input#sortprefs_threshold|
+        g:tlib#input#livesearch_threshold ...... |g:tlib#input#livesearch_threshold|
+        g:tlib#input#filter_mode ............... |g:tlib#input#filter_mode|
+        g:tlib#input#higroup ................... |g:tlib#input#higroup|
+        g:tlib_pick_last_item .................. |g:tlib_pick_last_item|
+        g:tlib#input#and ....................... |g:tlib#input#and|
+        g:tlib#input#or ........................ |g:tlib#input#or|
+        g:tlib#input#not ....................... |g:tlib#input#not|
+        g:tlib#input#numeric_chars ............. |g:tlib#input#numeric_chars|
+        g:tlib#input#keyagents_InputList_s ..... |g:tlib#input#keyagents_InputList_s|
+        g:tlib#input#keyagents_InputList_m ..... |g:tlib#input#keyagents_InputList_m|
+        g:tlib#input#handlers_EditList ......... |g:tlib#input#handlers_EditList|
+        g:tlib#input#use_popup ................. |g:tlib#input#use_popup|
+        g:tlib#input#format_filename ........... |g:tlib#input#format_filename|
+        g:tlib#input#filename_padding_r ........ |g:tlib#input#filename_padding_r|
+        g:tlib#input#filename_max_width ........ |g:tlib#input#filename_max_width|
+        tlib#input#List ........................ |tlib#input#List()|
+        tlib#input#ListD ....................... |tlib#input#ListD()|
+        tlib#input#ListW ....................... |tlib#input#ListW()|
+        tlib#input#EditList .................... |tlib#input#EditList()|
+        tlib#input#Resume ...................... |tlib#input#Resume()|
+        tlib#input#CommandSelect ............... |tlib#input#CommandSelect()|
+        tlib#input#Edit ........................ |tlib#input#Edit()|
+        tlib#input#Dialog ...................... |tlib#input#Dialog()|
+        tlib#number#ConvertBase ................ |tlib#number#ConvertBase()|
+        tlib#file#Split ........................ |tlib#file#Split()|
+        tlib#file#Join ......................... |tlib#file#Join()|
+        tlib#file#Relative ..................... |tlib#file#Relative()|
+        tlib#file#Absolute ..................... |tlib#file#Absolute()|
+        tlib#file#With ......................... |tlib#file#With()|
+        tlib#paragraph#GetMetric ............... |tlib#paragraph#GetMetric()|
+        tlib#paragraph#Move .................... |tlib#paragraph#Move()|
+        g:tlib_inputlist_pct ................... |g:tlib_inputlist_pct|
+        g:tlib_inputlist_width_filename ........ |g:tlib_inputlist_width_filename|
+        g:tlib_inputlist_filename_indicators ... |g:tlib_inputlist_filename_indicators|
+        g:tlib_inputlist_shortmessage .......... |g:tlib_inputlist_shortmessage|
+        tlib#World#New ......................... |tlib#World#New()|
+        prototype.PrintLines
+        tlib#tab#BufMap ........................ |tlib#tab#BufMap()|
+        tlib#tab#TabWinNr ...................... |tlib#tab#TabWinNr()|
+        tlib#tab#Set ........................... |tlib#tab#Set()|
+        tlib#date#DiffInDays ................... |tlib#date#DiffInDays()|
+        tlib#date#Parse ........................ |tlib#date#Parse()|
+        tlib#date#SecondsSince1970 ............. |tlib#date#SecondsSince1970()|
+        tlib#type#IsNumber ..................... |tlib#type#IsNumber()|
+        tlib#type#IsString ..................... |tlib#type#IsString()|
+        tlib#type#IsFuncref .................... |tlib#type#IsFuncref()|
+        tlib#type#IsList ....................... |tlib#type#IsList()|
+        tlib#type#IsDictionary ................. |tlib#type#IsDictionary()|
+        tlib#Filter_fuzzy#New .................. |tlib#Filter_fuzzy#New()|
+        tlib#textobjects#StandardParagraph ..... |standard-paragraph|
+        tlib#textobjects#Init .................. |tlib#textobjects#Init()|
+        v_sp ................................... |v_sp|
+        o_sp ................................... |o_sp|
+        tlib#arg#Get ........................... |tlib#arg#Get()|
+        tlib#arg#Let ........................... |tlib#arg#Let()|
+        tlib#arg#Key ........................... |tlib#arg#Key()|
+        tlib#arg#StringAsKeyArgs ............... |tlib#arg#StringAsKeyArgs()|
+        tlib#arg#Ex ............................ |tlib#arg#Ex()|
+        tlib#fixes#Winpos ...................... |tlib#fixes#Winpos()|
+        g:tlib#dir#sep ......................... |g:tlib#dir#sep|
+        tlib#dir#CanonicName ................... |tlib#dir#CanonicName()|
+        tlib#dir#NativeName .................... |tlib#dir#NativeName()|
+        tlib#dir#PlainName ..................... |tlib#dir#PlainName()|
+        tlib#dir#Ensure ........................ |tlib#dir#Ensure()|
+        tlib#dir#MyRuntime ..................... |tlib#dir#MyRuntime()|
+        tlib#dir#CD ............................ |tlib#dir#CD()|
+        tlib#dir#Push .......................... |tlib#dir#Push()|
+        tlib#dir#Pop ........................... |tlib#dir#Pop()|
+        g:tlib#hash#use_crc32 .................. |g:tlib#hash#use_crc32|
+        g:tlib#hash#use_adler32 ................ |g:tlib#hash#use_adler32|
+        tlib#hash#CRC32B ....................... |tlib#hash#CRC32B()|
+        tlib#hash#CRC32B_ruby .................. |tlib#hash#CRC32B_ruby()|
+        tlib#hash#CRC32B_vim ................... |tlib#hash#CRC32B_vim()|
+        tlib#hash#Adler32 ...................... |tlib#hash#Adler32()|
+        tlib#hash#Adler32_vim .................. |tlib#hash#Adler32_vim()|
+        tlib#hash#Adler32_tlib ................. |tlib#hash#Adler32_tlib()|
+        tlib#win#Set ........................... |tlib#win#Set()|
+        tlib#win#GetLayout ..................... |tlib#win#GetLayout()|
+        tlib#win#SetLayout ..................... |tlib#win#SetLayout()|
+        tlib#win#List .......................... |tlib#win#List()|
+        tlib#win#Width ......................... |tlib#win#Width()|
+        tlib#win#WinDo ......................... |tlib#win#WinDo()|
+        tlib#comments#Comments ................. |tlib#comments#Comments()|
+        tlib#grep#Do ........................... |tlib#grep#Do()|
+        tlib#grep#LocList ...................... |tlib#grep#LocList()|
+        tlib#grep#QuickFixList ................. |tlib#grep#QuickFixList()|
+        tlib#grep#List ......................... |tlib#grep#List()|
+        tlib#Filter_cnf#New .................... |tlib#Filter_cnf#New()|
         prototype.Pretty
-        tlib#Object#New ......................... |tlib#Object#New()|
+        tlib#Object#New ........................ |tlib#Object#New()|
         prototype.New
         prototype.Inherit
         prototype.Extend
@@ -263,32 +295,33 @@ Contents~
         prototype.IsRelated
         prototype.RespondTo
         prototype.Super
-        tlib#Object#Methods ..................... |tlib#Object#Methods()|
-        tlib#buffer#EnableMRU ................... |tlib#buffer#EnableMRU()|
-        tlib#buffer#DisableMRU .................. |tlib#buffer#DisableMRU()|
-        tlib#buffer#Set ......................... |tlib#buffer#Set()|
-        tlib#buffer#Eval ........................ |tlib#buffer#Eval()|
-        tlib#buffer#GetList ..................... |tlib#buffer#GetList()|
-        tlib#buffer#ViewLine .................... |tlib#buffer#ViewLine()|
-        tlib#buffer#HighlightLine ............... |tlib#buffer#HighlightLine()|
-        tlib#buffer#DeleteRange ................. |tlib#buffer#DeleteRange()|
-        tlib#buffer#ReplaceRange ................ |tlib#buffer#ReplaceRange()|
-        tlib#buffer#ScratchStart ................ |tlib#buffer#ScratchStart()|
-        tlib#buffer#ScratchEnd .................. |tlib#buffer#ScratchEnd()|
-        tlib#buffer#BufDo ....................... |tlib#buffer#BufDo()|
-        tlib#buffer#InsertText .................. |tlib#buffer#InsertText()|
-        tlib#buffer#InsertText0 ................. |tlib#buffer#InsertText0()|
-        tlib#buffer#CurrentByte ................. |tlib#buffer#CurrentByte()|
-        tlib#buffer#KeepCursorPosition .......... |tlib#buffer#KeepCursorPosition()|
-        tlib#hook#Run ........................... |tlib#hook#Run()|
-        tlib#string#RemoveBackslashes ........... |tlib#string#RemoveBackslashes()|
-        tlib#string#Chomp ....................... |tlib#string#Chomp()|
-        tlib#string#Format ...................... |tlib#string#Format()|
-        tlib#string#Printf1 ..................... |tlib#string#Printf1()|
-        tlib#string#TrimLeft .................... |tlib#string#TrimLeft()|
-        tlib#string#TrimRight ................... |tlib#string#TrimRight()|
-        tlib#string#Strip ....................... |tlib#string#Strip()|
-        tlib#string#Count ....................... |tlib#string#Count()|
+        tlib#Object#Methods .................... |tlib#Object#Methods()|
+        g:tlib_viewline_position ............... |g:tlib_viewline_position|
+        tlib#buffer#EnableMRU .................. |tlib#buffer#EnableMRU()|
+        tlib#buffer#DisableMRU ................. |tlib#buffer#DisableMRU()|
+        tlib#buffer#Set ........................ |tlib#buffer#Set()|
+        tlib#buffer#Eval ....................... |tlib#buffer#Eval()|
+        tlib#buffer#GetList .................... |tlib#buffer#GetList()|
+        tlib#buffer#ViewLine ................... |tlib#buffer#ViewLine()|
+        tlib#buffer#HighlightLine .............. |tlib#buffer#HighlightLine()|
+        tlib#buffer#DeleteRange ................ |tlib#buffer#DeleteRange()|
+        tlib#buffer#ReplaceRange ............... |tlib#buffer#ReplaceRange()|
+        tlib#buffer#ScratchStart ............... |tlib#buffer#ScratchStart()|
+        tlib#buffer#ScratchEnd ................. |tlib#buffer#ScratchEnd()|
+        tlib#buffer#BufDo ...................... |tlib#buffer#BufDo()|
+        tlib#buffer#InsertText ................. |tlib#buffer#InsertText()|
+        tlib#buffer#InsertText0 ................ |tlib#buffer#InsertText0()|
+        tlib#buffer#CurrentByte ................ |tlib#buffer#CurrentByte()|
+        tlib#buffer#KeepCursorPosition ......... |tlib#buffer#KeepCursorPosition()|
+        tlib#hook#Run .......................... |tlib#hook#Run()|
+        tlib#string#RemoveBackslashes .......... |tlib#string#RemoveBackslashes()|
+        tlib#string#Chomp ...................... |tlib#string#Chomp()|
+        tlib#string#Format ..................... |tlib#string#Format()|
+        tlib#string#Printf1 .................... |tlib#string#Printf1()|
+        tlib#string#TrimLeft ................... |tlib#string#TrimLeft()|
+        tlib#string#TrimRight .................. |tlib#string#TrimRight()|
+        tlib#string#Strip ...................... |tlib#string#Strip()|
+        tlib#string#Count ...................... |tlib#string#Count()|
 
 
 ========================================================================
@@ -376,172 +409,11 @@ plugin/02tlib.vim~
     Time the execution time of CMD.
 
 
-Variables~
+========================================================================
+autoload/tlib.vim~
 
-                                                    *g:tlib_pick_last_item*
-g:tlib_pick_last_item          (default: 1)
-    When 1, automatically select the last remaining item only if the list 
-    had only one item to begin with.
-    When 2, automatically select a last remaining item after applying 
-    any filters.
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_sortprefs_threshold*
-g:tlib_sortprefs_threshold     (default: 200)
-    If a list is bigger than this value, don't try to be smart when 
-    selecting an item. Be slightly faster instead.
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_scratch_pos*
-g:tlib_scratch_pos             (default: 'botright')
-    Scratch window position. By default the list window is opened on the 
-    bottom. Set this variable to 'topleft' or '' to change this behaviour.
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_inputlist_pct*
-g:tlib_inputlist_pct           (default: 50)
-    Size of the input list window (in percent) from the main size (of &lines).
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_inputlist_width_filename*
-g:tlib_inputlist_width_filename (default: '&co / 3')
-    Size of filename columns when listing filenames.
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_inputlist_higroup*
-g:tlib_inputlist_higroup       (default: 'IncSearch')
-    The highlight group to use for showing matches in the input list 
-    window.
-    See |tlib#input#List()|.
-
-                                                    *g:tlib_inputlist_livesearch_threshold*
-g:tlib_inputlist_livesearch_threshold (default: 1000)
-    If a list contains more items, |tlib#input#List()| does not perform an 
-    incremental "live search" but uses |input()| to query the user for a 
-    filter. This is useful on slower machines or with very long lists.
-
-                                                    *g:tlib_inputlist_filename_indicators*
-g:tlib_inputlist_filename_indicators (default: 0)
-    If true, |tlib#input#List()| will show some indicators about the 
-    status of a filename (e.g. buflisted(), bufloaded() etc.).
-    This is disabled by default because vim checks also for the file on 
-    disk when doing this.
-
-                                                    *g:tlib_inputlist_match*
-g:tlib_inputlist_match         (default: 'cnfx')
-    Determine how |tlib#input#List()| and related functions work.
-    Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
-      cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
-               as a wildcard (this is the default method)
-        - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
-          |/\{-|) were entered.
-        - Examples:
-            - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
-              "far".
-        - Otherwise it is a derivate of the cnf method (see below).
-        - See also |tlib#Filter_cnfx#New()|.
-      cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
-               expanded to "\.\{-}"
-        - A period character (".") acts as a wildcard as if ".\{-}" (see 
-          |/\{-|) were entered.
-        - Examples:
-            - "f.o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
-              "far".
-        - Otherwise it is a derivate of the cnf method (see below).
-        - See also |tlib#Filter_cnfd#New()|.
-      cnf .... Match substrings
-        - A blank creates an AND conjunction, i.e. the next pattern has to 
-          match too.
-        - A pipe character ("|") creates an OR conjunction, either this or 
-          the next next pattern has to match.
-        - Patterns are very 'nomagic' |regexp| with a |\V| prefix.
-        - A pattern starting with "-" makes the filter exclude items 
-          matching that pattern.
-        - Examples:
-            - "foo bar" matches items that contain the strings "foo" AND 
-              "bar".
-            - "foo|bar boo|far" matches items that contain either ("foo" OR 
-              "bar") AND ("boo" OR "far").
-        - See also |tlib#Filter_cnf#New()|.
-      seq .... Match sequences of characters
-        - |tlib#Filter_seq#New()|
-      fuzzy .. Match fuzzy character sequences
-        - |tlib#Filter_fuzzy#New()|
-
-                                                    *g:tlib_inputlist_shortmessage*
-g:tlib_inputlist_shortmessage  (default: 0)
-    If not null, display only a short info about the filter.
-
-                                                    *g:tlib_tags_extra*
-g:tlib_tags_extra              (default: '')
-    Extra tags for |tlib#tag#Retrieve()| (see there). Can also be buffer-local.
-
-                                                    *g:tlib_tag_substitute*
-g:tlib_tag_substitute
-    Filter the tag description through |substitute()| for these filetypes. 
-    This applies only if the tag cmd field (see |taglist()|) is used.
-
-                                                    *g:tlib_filename_sep*
-g:tlib_filename_sep            (default: '/')
-
-                                                    *g:tlib_cache*
-g:tlib_cache                   (default: '')
-    The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
-    You might want to delete old files from this directory from time to 
-    time with a command like: >
-      find ~/vimfiles/cache/ -atime +31 -type f -print -delete
-<
-
-                                                    *g:tlib_viewline_position*
-g:tlib_viewline_position       (default: 'zz')
-    Where to display the line when using |tlib#buffer#ViewLine|.
-    For possible values for position see |scroll-cursor|.
-
-
-Keys for |tlib#input#List|~
-
-                                                    *g:tlib_inputlist_and*
-g:tlib_inputlist_and           (default: ' ')
-
-                                                    *g:tlib_inputlist_or*
-g:tlib_inputlist_or            (default: '|')
-
-                                                    *g:tlib_inputlist_not*
-g:tlib_inputlist_not           (default: '-')
-
-                                                    *g:tlib_numeric_chars*
-g:tlib_numeric_chars
-    When editing a list with |tlib#input#List|, typing these numeric chars 
-    (as returned by getchar()) will select an item based on its index, not 
-    based on its name. I.e. in the default setting, typing a "4" will 
-    select the fourth item, not the item called "4".
-    In order to make keys 0-9 filter the items in the list and make 
-    <m-[0-9]> select an item by its index, remove the keys 48 to 57 from 
-    this dictionary.
-    Format: [KEY] = BASE ... the number is calculated as KEY - BASE.
-
-                                                    *g:tlib_keyagents_InputList_s*
-g:tlib_keyagents_InputList_s
-    The default key bindings for single-item-select list views. If you 
-    want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-    lines to after/plugin/02tlib.vim: >
-
-      let g:tlib_keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-      let g:tlib_keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
-<
-
-                                                    *g:tlib_scroll_lines*
-g:tlib_scroll_lines            (default: 10)
-    Number of items to move when pressing <c-up/down> in the input list window.
-
-                                                    *g:tlib_keyagents_InputList_m*
-g:tlib_keyagents_InputList_m
-
-                                                    *g:tlib_handlers_EditList*
-g:tlib_handlers_EditList
-
-                                                    *g:tlib_debug*
-g:tlib_debug
+                                                    *g:tlib#debug*
+g:tlib#debug
 
 
 ========================================================================
@@ -581,6 +453,9 @@ tlib#persistent#Filename(type, ?file=%, ?mkdir=0)
                                                     *tlib#persistent#Get()*
 tlib#persistent#Get(cfile)
 
+                                                    *tlib#persistent#Value()*
+tlib#persistent#Value(...)
+
                                                     *tlib#persistent#Save()*
 tlib#persistent#Save(cfile, dictionary)
 
@@ -859,6 +734,18 @@ tlib#char#GetWithTimeout(timeout, ...)
 ========================================================================
 autoload/tlib/scratch.vim~
 
+                                                    *g:tlib_scratch_pos*
+g:tlib_scratch_pos             (default: 'botright')
+    Scratch window position. By default the list window is opened on the 
+    bottom. Set this variable to 'topleft' or '' to change this behaviour.
+    See |tlib#input#List()|.
+
+                                                    *g:tlib#scratch#hidden*
+g:tlib#scratch#hidden          (default: 'hide')
+    If you want the scratch buffer to be fully removed, you might want to 
+    set this variable to 'wipe'.
+    See also https://github.com/tomtom/tlib_vim/pull/16
+
                                                     *tlib#scratch#UseScratch()*
 tlib#scratch#UseScratch(?keyargs={})
     Display a scratch buffer (a buffer with no file). See :TScratch for an 
@@ -884,6 +771,14 @@ tlib#autocmdgroup#Init()
 ========================================================================
 autoload/tlib/cache.vim~
 
+                                                    *g:tlib_cache*
+g:tlib_cache                   (default: '')
+    The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
+    You might want to delete old files from this directory from time to 
+    time with a command like: >
+      find ~/vimfiles/cache/ -atime +31 -type f -print -delete
+<
+
                                                     *g:tlib#cache#purge_days*
 g:tlib#cache#purge_days        (default: 31)
     |tlib#cache#Purge()|: Remove cache files older than N days.
@@ -905,10 +800,12 @@ g:tlib#cache#run_script        (default: 1)
        1 ... Query user
        2 ... Yes
 
-                                                    *g:tlib#cache#silent*
-g:tlib#cache#silent            (default: 0)
-    If non-nil, don't display a message that files were deleted from the 
-    cache.
+                                                    *g:tlib#cache#verbosity*
+g:tlib#cache#verbosity         (default: 1)
+    Verbosity level:
+        0 ... Be quiet
+        1 ... Display informative message
+        2 ... Display detailed messages
 
                                                     *g:tlib#cache#dont_purge*
 g:tlib#cache#dont_purge        (default: ['[\/]\.last_purge$'])
@@ -916,6 +813,11 @@ g:tlib#cache#dont_purge        (default: ['[\/]\.last_purge$'])
     cached files. If a regexp matches, the file won't be removed by 
     |tlib#cache#Purge()|.
 
+                                                    *g:tlib#cache#max_filename*
+g:tlib#cache#max_filename      (default: 200)
+    If the cache filename is longer than N characters, use 
+    |pathshorten()|.
+
                                                     *tlib#cache#Dir()*
 tlib#cache#Dir(?mode = 'bg')
     The default cache directory.
@@ -929,6 +831,11 @@ tlib#cache#Save(cfile, dictionary)
                                                     *tlib#cache#Get()*
 tlib#cache#Get(cfile)
 
+                                                    *tlib#cache#Value()*
+tlib#cache#Value(cfile, generator, ftime, ...)
+    Get a cached value from cfile. If it is outdated (compared to ftime) 
+    or does not exist, create it calling a generator function.
+
                                                     *tlib#cache#MaybePurge()*
 tlib#cache#MaybePurge()
     Call |tlib#cache#Purge()| if the last purge was done before 
@@ -1016,6 +923,10 @@ tlib#var#List(rx, ?prefix='')
 autoload/tlib/agent.vim~
 Various agents for use as key handlers in tlib#input#List()
 
+                                                    *g:tlib_scroll_lines*
+g:tlib_scroll_lines            (default: 10)
+    Number of items to move when pressing <c-up/down> in the input list window.
+
                                                     *tlib#agent#Exit()*
 tlib#agent#Exit(world, selected)
 
@@ -1049,6 +960,15 @@ tlib#agent#ShiftRight(world, selected)
                                                     *tlib#agent#Reset()*
 tlib#agent#Reset(world, selected)
 
+                                                    *tlib#agent#ToggleRestrictView()*
+tlib#agent#ToggleRestrictView(world, selected)
+
+                                                    *tlib#agent#RestrictView()*
+tlib#agent#RestrictView(world, selected)
+
+                                                    *tlib#agent#UnrestrictView()*
+tlib#agent#UnrestrictView(world, selected)
+
                                                     *tlib#agent#Input()*
 tlib#agent#Input(world, selected)
 
@@ -1165,6 +1085,37 @@ tlib#agent#ExecAgentByName(world, selected)
 tlib#agent#CompleteAgentNames(ArgLead, CmdLine, CursorPos)
 
 
+========================================================================
+autoload/tlib/bitwise.vim~
+
+                                                    *tlib#bitwise#Num2Bits()*
+tlib#bitwise#Num2Bits(num)
+
+                                                    *tlib#bitwise#Bits2Num()*
+tlib#bitwise#Bits2Num(bits, ...)
+
+                                                    *tlib#bitwise#AND()*
+tlib#bitwise#AND(num1, num2, ...)
+
+                                                    *tlib#bitwise#OR()*
+tlib#bitwise#OR(num1, num2, ...)
+
+                                                    *tlib#bitwise#XOR()*
+tlib#bitwise#XOR(num1, num2, ...)
+
+                                                    *tlib#bitwise#ShiftRight()*
+tlib#bitwise#ShiftRight(bits, n)
+
+                                                    *tlib#bitwise#ShiftLeft()*
+tlib#bitwise#ShiftLeft(bits, n)
+
+                                                    *tlib#bitwise#Add()*
+tlib#bitwise#Add(num1, num2, ...)
+
+                                                    *tlib#bitwise#Sub()*
+tlib#bitwise#Sub(num1, num2, ...)
+
+
 ========================================================================
 autoload/tlib/Filter_cnfx.vim~
 
@@ -1239,6 +1190,15 @@ tlib#rx#Suffixes(...)
 ========================================================================
 autoload/tlib/tag.vim~
 
+                                                    *g:tlib_tags_extra*
+g:tlib_tags_extra              (default: '')
+    Extra tags for |tlib#tag#Retrieve()| (see there). Can also be buffer-local.
+
+                                                    *g:tlib_tag_substitute*
+g:tlib_tag_substitute
+    Filter the tag description through |substitute()| for these filetypes. 
+    This applies only if the tag cmd field (see |taglist()|) is used.
+
                                                     *tlib#tag#Retrieve()*
 tlib#tag#Retrieve(rx, ?extra_tags=0)
     Get all tags matching rx. Basically, this function simply calls 
@@ -1301,6 +1261,112 @@ tlib#Filter_cnfd#New(...)
 autoload/tlib/input.vim~
 Input-related, select from a list etc.
 
+                                                    *g:tlib#input#sortprefs_threshold*
+g:tlib#input#sortprefs_threshold (default: 200)
+    If a list is bigger than this value, don't try to be smart when 
+    selecting an item. Be slightly faster instead.
+    See |tlib#input#List()|.
+
+                                                    *g:tlib#input#livesearch_threshold*
+g:tlib#input#livesearch_threshold (default: 1000)
+    If a list contains more items, |tlib#input#List()| does not perform an 
+    incremental "live search" but uses |input()| to query the user for a 
+    filter. This is useful on slower machines or with very long lists.
+
+                                                    *g:tlib#input#filter_mode*
+g:tlib#input#filter_mode       (default: 'cnfx')
+    Determine how |tlib#input#List()| and related functions work.
+    Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
+      cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
+               as a wildcard (this is the default method)
+        - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
+          |/\{-|) were entered.
+        - Examples:
+            - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+              "far".
+        - Otherwise it is a derivate of the cnf method (see below).
+        - See also |tlib#Filter_cnfx#New()|.
+      cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
+               expanded to "\.\{-}"
+        - A period character (".") acts as a wildcard as if ".\{-}" (see 
+          |/\{-|) were entered.
+        - Examples:
+            - "f.o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+              "far".
+        - Otherwise it is a derivate of the cnf method (see below).
+        - See also |tlib#Filter_cnfd#New()|.
+      cnf .... Match substrings
+        - A blank creates an AND conjunction, i.e. the next pattern has to 
+          match too.
+        - A pipe character ("|") creates an OR conjunction, either this or 
+          the next next pattern has to match.
+        - Patterns are very 'nomagic' |regexp| with a |\V| prefix.
+        - A pattern starting with "-" makes the filter exclude items 
+          matching that pattern.
+        - Examples:
+            - "foo bar" matches items that contain the strings "foo" AND 
+              "bar".
+            - "foo|bar boo|far" matches items that contain either ("foo" OR 
+              "bar") AND ("boo" OR "far").
+        - See also |tlib#Filter_cnf#New()|.
+      seq .... Match sequences of characters
+        - |tlib#Filter_seq#New()|
+      fuzzy .. Match fuzzy character sequences
+        - |tlib#Filter_fuzzy#New()|
+
+                                                    *g:tlib#input#higroup*
+g:tlib#input#higroup           (default: 'IncSearch')
+    The highlight group to use for showing matches in the input list 
+    window.
+    See |tlib#input#List()|.
+
+                                                    *g:tlib_pick_last_item*
+g:tlib_pick_last_item          (default: 1)
+    When 1, automatically select the last remaining item only if the list 
+    had only one item to begin with.
+    When 2, automatically select a last remaining item after applying 
+    any filters.
+    See |tlib#input#List()|.
+
+
+Keys for |tlib#input#List|~
+
+                                                    *g:tlib#input#and*
+g:tlib#input#and               (default: ' ')
+
+                                                    *g:tlib#input#or*
+g:tlib#input#or                (default: '|')
+
+                                                    *g:tlib#input#not*
+g:tlib#input#not               (default: '-')
+
+                                                    *g:tlib#input#numeric_chars*
+g:tlib#input#numeric_chars
+    When editing a list with |tlib#input#List|, typing these numeric chars 
+    (as returned by getchar()) will select an item based on its index, not 
+    based on its name. I.e. in the default setting, typing a "4" will 
+    select the fourth item, not the item called "4".
+    In order to make keys 0-9 filter the items in the list and make 
+    <m-[0-9]> select an item by its index, remove the keys 48 to 57 from 
+    this dictionary.
+    Format: [KEY] = BASE ... the number is calculated as KEY - BASE.
+
+                                                    *g:tlib#input#keyagents_InputList_s*
+g:tlib#input#keyagents_InputList_s
+    The default key bindings for single-item-select list views. If you 
+    want to use <c-j>, <c-k> to move the cursor up and down, add these two 
+    lines to after/plugin/02tlib.vim: >
+
+      let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
+      let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
+<
+
+                                                    *g:tlib#input#keyagents_InputList_m*
+g:tlib#input#keyagents_InputList_m
+
+                                                    *g:tlib#input#handlers_EditList*
+g:tlib#input#handlers_EditList
+
                                                     *g:tlib#input#use_popup*
 g:tlib#input#use_popup         (default: has('menu') && (has('gui_gtk') || has('gui_gtk2') || has('gui_win32')))
     If true, define a popup menu for |tlib#input#List()| and related 
@@ -1329,7 +1395,7 @@ tlib#input#List(type. ?query='', ?list=[], ?handlers=[], ?default="", ?timeout=0
     of selected elements or its indexes.
 
     By default, typing numbers will select an item by its index. See 
-    |g:tlib_numeric_chars| to find out how to change this.
+    |g:tlib#input#numeric_chars| to find out how to change this.
 
     The item is automatically selected if the numbers typed equals the 
     number of digits of the list length. I.e. if a list contains 20 items, 
@@ -1347,7 +1413,7 @@ tlib#input#List(type. ?query='', ?list=[], ?handlers=[], ?default="", ?timeout=0
         mi ... Return a list of indexes
 
     Several pattern matching styles are supported. See 
-    |g:tlib_inputlist_match|.
+    |g:tlib#input#filter_mode|.
 
     EXAMPLES: >
       echo tlib#input#List('s', 'Select one item', [100,200,300])
@@ -1411,6 +1477,13 @@ tlib#input#Edit(name, value, callback, ?cb_args=[])
 tlib#input#Dialog(text, options, default)
 
 
+========================================================================
+autoload/tlib/number.vim~
+
+                                                    *tlib#number#ConvertBase()*
+tlib#number#ConvertBase(num, base, ...)
+
+
 ========================================================================
 autoload/tlib/file.vim~
 
@@ -1435,6 +1508,9 @@ tlib#file#Relative(filename, basedir)
       => 'bar/filename.txt'
 <
 
+                                                    *tlib#file#Absolute()*
+tlib#file#Absolute(filename, ...)
+
                                                     *tlib#file#With()*
 tlib#file#With(fcmd, bcmd, files, ?world={})
 
@@ -1466,9 +1542,32 @@ autoload/tlib/World.vim~
 A prototype used by |tlib#input#List|.
 Inherits from |tlib#Object#New|.
 
+                                                    *g:tlib_inputlist_pct*
+g:tlib_inputlist_pct           (default: 50)
+    Size of the input list window (in percent) from the main size (of &lines).
+    See |tlib#input#List()|.
+
+                                                    *g:tlib_inputlist_width_filename*
+g:tlib_inputlist_width_filename (default: '&co / 3')
+    Size of filename columns when listing filenames.
+    See |tlib#input#List()|.
+
+                                                    *g:tlib_inputlist_filename_indicators*
+g:tlib_inputlist_filename_indicators (default: 0)
+    If true, |tlib#input#List()| will show some indicators about the 
+    status of a filename (e.g. buflisted(), bufloaded() etc.).
+    This is disabled by default because vim checks also for the file on 
+    disk when doing this.
+
+                                                    *g:tlib_inputlist_shortmessage*
+g:tlib_inputlist_shortmessage  (default: 0)
+    If not null, display only a short info about the filter.
+
                                                     *tlib#World#New()*
 tlib#World#New(...)
 
+prototype.PrintLines
+
 
 ========================================================================
 autoload/tlib/tab.vim~
@@ -1586,9 +1685,20 @@ tlib#arg#Ex(arg, ?chars='%#! ')
 <
 
 
+========================================================================
+autoload/tlib/fixes.vim~
+
+                                                    *tlib#fixes#Winpos()*
+tlib#fixes#Winpos()
+
+
 ========================================================================
 autoload/tlib/dir.vim~
 
+                                                    *g:tlib#dir#sep*
+g:tlib#dir#sep                 (default: exists('+shellslash') && !&shellslash ? '\' : '/')
+    TLet g:tlib#dir#sep = '/'
+
                                                     *tlib#dir#CanonicName()*
 tlib#dir#CanonicName(dirname)
     EXAMPLES: >
@@ -1596,6 +1706,16 @@ tlib#dir#CanonicName(dirname)
       => 'foo/bar/'
 <
 
+                                                    *tlib#dir#NativeName()*
+tlib#dir#NativeName(dirname)
+    EXAMPLES: >
+      tlib#dir#NativeName('foo/bar/')
+      On Windows:
+      => 'foo\bar\'
+      On Linux:
+      => 'foo/bar/'
+<
+
                                                     *tlib#dir#PlainName()*
 tlib#dir#PlainName(dirname)
     EXAMPLES: >
@@ -1621,6 +1741,34 @@ tlib#dir#Push(dir, ?locally=0)
 tlib#dir#Pop()
 
 
+========================================================================
+autoload/tlib/hash.vim~
+
+                                                    *g:tlib#hash#use_crc32*
+g:tlib#hash#use_crc32          (default: '')
+
+                                                    *g:tlib#hash#use_adler32*
+g:tlib#hash#use_adler32        (default: '')
+
+                                                    *tlib#hash#CRC32B()*
+tlib#hash#CRC32B(chars)
+
+                                                    *tlib#hash#CRC32B_ruby()*
+tlib#hash#CRC32B_ruby(chars)
+
+                                                    *tlib#hash#CRC32B_vim()*
+tlib#hash#CRC32B_vim(chars)
+
+                                                    *tlib#hash#Adler32()*
+tlib#hash#Adler32(chars)
+
+                                                    *tlib#hash#Adler32_vim()*
+tlib#hash#Adler32_vim(chars)
+
+                                                    *tlib#hash#Adler32_tlib()*
+tlib#hash#Adler32_tlib(chars)
+
+
 ========================================================================
 autoload/tlib/win.vim~
 
@@ -1652,6 +1800,22 @@ tlib#comments#Comments(...)
     function! tlib#comments#Comments(?rx='')
 
 
+========================================================================
+autoload/tlib/grep.vim~
+
+                                                    *tlib#grep#Do()*
+tlib#grep#Do(cmd, rx, files)
+
+                                                    *tlib#grep#LocList()*
+tlib#grep#LocList(rx, files)
+
+                                                    *tlib#grep#QuickFixList()*
+tlib#grep#QuickFixList(rx, files)
+
+                                                    *tlib#grep#List()*
+tlib#grep#List(rx, files)
+
+
 ========================================================================
 autoload/tlib/Filter_cnf.vim~
 
@@ -1739,6 +1903,11 @@ tlib#Object#Methods(object, ...)
 ========================================================================
 autoload/tlib/buffer.vim~
 
+                                                    *g:tlib_viewline_position*
+g:tlib_viewline_position       (default: 'zz')
+    Where to display the line when using |tlib#buffer#ViewLine|.
+    For possible values for position see |scroll-cursor|.
+
                                                     *tlib#buffer#EnableMRU()*
 tlib#buffer#EnableMRU()
 
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index 126db40a..2cfe155a 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-04-10.
-" @Last Change: 2012-10-03.
-" @Revision:    725
+" @Last Change: 2013-09-25.
+" @Revision:    746
 " GetLatestVimScripts: 1863 1 tlib.vim
 
 if &cp || exists("loaded_tlib")
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 102
+let loaded_tlib = 106
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -114,240 +114,5 @@ command! -nargs=0 -complete=command TBrowseScriptnames call
 command! -nargs=1 -complete=command TTimeCommand call tlib#cmd#Time(<q-args>)
 
 
-
-" :doc:
-" Variables~ {{{1
-
-" When 1, automatically select the last remaining item only if the list 
-" had only one item to begin with.
-" When 2, automatically select a last remaining item after applying 
-" any filters.
-" See |tlib#input#List()|.
-TLet g:tlib_pick_last_item = 1
-
-" If a list is bigger than this value, don't try to be smart when 
-" selecting an item. Be slightly faster instead.
-" See |tlib#input#List()|.
-TLet g:tlib_sortprefs_threshold = 200
-
-" Scratch window position. By default the list window is opened on the 
-" bottom. Set this variable to 'topleft' or '' to change this behaviour.
-" See |tlib#input#List()|.
-TLet g:tlib_scratch_pos = 'botright'
-
-" Size of the input list window (in percent) from the main size (of &lines).
-" See |tlib#input#List()|.
-TLet g:tlib_inputlist_pct = 50
-
-" Size of filename columns when listing filenames.
-" See |tlib#input#List()|.
-TLet g:tlib_inputlist_width_filename = '&co / 3'
-" TLet g:tlib_inputlist_width_filename = 25
-
-" The highlight group to use for showing matches in the input list 
-" window.
-" See |tlib#input#List()|.
-TLet g:tlib_inputlist_higroup = 'IncSearch'
-
-" If a list contains more items, |tlib#input#List()| does not perform an 
-" incremental "live search" but uses |input()| to query the user for a 
-" filter. This is useful on slower machines or with very long lists.
-TLet g:tlib_inputlist_livesearch_threshold = 1000
-
-" If true, |tlib#input#List()| will show some indicators about the 
-" status of a filename (e.g. buflisted(), bufloaded() etc.).
-" This is disabled by default because vim checks also for the file on 
-" disk when doing this.
-TLet g:tlib_inputlist_filename_indicators = 0
-
-" Determine how |tlib#input#List()| and related functions work.
-" Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
-"   cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
-"            as a wildcard (this is the default method)
-"     - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
-"       |/\{-|) were entered.
-"     - Examples:
-"         - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
-"           "far".
-"     - Otherwise it is a derivate of the cnf method (see below).
-"     - See also |tlib#Filter_cnfx#New()|.
-"   cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
-"            expanded to "\.\{-}"
-"     - A period character (".") acts as a wildcard as if ".\{-}" (see 
-"       |/\{-|) were entered.
-"     - Examples:
-"         - "f.o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
-"           "far".
-"     - Otherwise it is a derivate of the cnf method (see below).
-"     - See also |tlib#Filter_cnfd#New()|.
-"   cnf .... Match substrings
-"     - A blank creates an AND conjunction, i.e. the next pattern has to 
-"       match too.
-"     - A pipe character ("|") creates an OR conjunction, either this or 
-"       the next next pattern has to match.
-"     - Patterns are very 'nomagic' |regexp| with a |\V| prefix.
-"     - A pattern starting with "-" makes the filter exclude items 
-"       matching that pattern.
-"     - Examples:
-"         - "foo bar" matches items that contain the strings "foo" AND 
-"           "bar".
-"         - "foo|bar boo|far" matches items that contain either ("foo" OR 
-"           "bar") AND ("boo" OR "far").
-"     - See also |tlib#Filter_cnf#New()|.
-"   seq .... Match sequences of characters
-"     - |tlib#Filter_seq#New()|
-"   fuzzy .. Match fuzzy character sequences
-"     - |tlib#Filter_fuzzy#New()|
-TLet g:tlib_inputlist_match = 'cnfx'
-
-" If not null, display only a short info about the filter.
-TLet g:tlib_inputlist_shortmessage = 0
-
-" Extra tags for |tlib#tag#Retrieve()| (see there). Can also be buffer-local.
-TLet g:tlib_tags_extra = ''
-
-" Filter the tag description through |substitute()| for these filetypes. 
-" This applies only if the tag cmd field (see |taglist()|) is used.
-" :nodefault:
-TLet g:tlib_tag_substitute = {
-            \ 'java': [['\s*{\s*$', '', '']],
-            \ 'ruby': [['\<\(def\|class\|module\)\>\s\+', '', '']],
-            \ 'vim':  [
-            \   ['^\s*com\%[mand]!\?\(\s\+-\S\+\)*\s*\u\w*\zs.*$', '', ''],
-            \   ['^\s*\(let\|aug\%[roup]\|fu\%[nction]!\?\|com\%[mand]!\?\(\s\+-\S\+\)*\)\s*', '', ''],
-            \   ['"\?\s*{{{\d.*$', '', ''],
-            \ ],
-            \ }
-
-" " Alternative rx for keywords, in case 'iskeyword' is inadequate for 
-" " the purposes of tlib but you don't want to change it's value.
-" TLet g:tlib_keyword_rx = {
-"             \ 'vim': '\(\w\|#\)',
-"             \ }
-
-TLet g:tlib_filename_sep = '/'
-" TLet g:tlib_filename_sep = exists('+shellslash') && !&shellslash ? '\' : '/'   " {{{2
-
-" The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
-" You might want to delete old files from this directory from time to 
-" time with a command like: >
-"   find ~/vimfiles/cache/ -atime +31 -type f -print -delete
-TLet g:tlib_cache = ''
-
-" Where to display the line when using |tlib#buffer#ViewLine|.
-" For possible values for position see |scroll-cursor|.
-TLet g:tlib_viewline_position = 'zz'
-
-" :doc:
-" Keys for |tlib#input#List|~
-
-TLet g:tlib_inputlist_and = ' '
-TLet g:tlib_inputlist_or  = '|'
-TLet g:tlib_inputlist_not = '-'
-
-" When editing a list with |tlib#input#List|, typing these numeric chars 
-" (as returned by getchar()) will select an item based on its index, not 
-" based on its name. I.e. in the default setting, typing a "4" will 
-" select the fourth item, not the item called "4".
-" In order to make keys 0-9 filter the items in the list and make 
-" <m-[0-9]> select an item by its index, remove the keys 48 to 57 from 
-" this dictionary.
-" Format: [KEY] = BASE ... the number is calculated as KEY - BASE.
-" :nodefault:
-TLet g:tlib_numeric_chars = {
-            \ 176: 176,
-            \ 177: 176,
-            \ 178: 176,
-            \ 179: 176,
-            \ 180: 176,
-            \ 181: 176,
-            \ 182: 176,
-            \ 183: 176,
-            \ 184: 176,
-            \ 185: 176,
-            \}
-            " \ 48: 48,
-            " \ 49: 48,
-            " \ 50: 48,
-            " \ 51: 48,
-            " \ 52: 48,
-            " \ 53: 48,
-            " \ 54: 48,
-            " \ 55: 48,
-            " \ 56: 48,
-            " \ 57: 48,
-
-" :nodefault:
-" The default key bindings for single-item-select list views. If you 
-" want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-" lines to after/plugin/02tlib.vim: >
-"
-"   let g:tlib_keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-"   let g:tlib_keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
-TLet g:tlib_keyagents_InputList_s = {
-            \ "\<PageUp>":   'tlib#agent#PageUp',
-            \ "\<PageDown>": 'tlib#agent#PageDown',
-            \ "\<Up>":       'tlib#agent#Up',
-            \ "\<Down>":     'tlib#agent#Down',
-            \ "\<c-Up>":     'tlib#agent#UpN',
-            \ "\<c-Down>":   'tlib#agent#DownN',
-            \ "\<Left>":     'tlib#agent#ShiftLeft',
-            \ "\<Right>":    'tlib#agent#ShiftRight',
-            \ 18:            'tlib#agent#Reset',
-            \ 242:           'tlib#agent#Reset',
-            \ 17:            'tlib#agent#Input',
-            \ 241:           'tlib#agent#Input',
-            \ 27:            'tlib#agent#Exit',
-            \ 26:            'tlib#agent#Suspend',
-            \ 250:           'tlib#agent#Suspend',
-            \ 15:            'tlib#agent#SuspendToParentWindow',  
-            \ 63:            'tlib#agent#Help',
-            \ "\<F1>":       'tlib#agent#Help',
-            \ "\<F10>":      'tlib#agent#ExecAgentByName',
-            \ "\<S-Esc>":    'tlib#agent#ExecAgentByName',
-            \ "\<bs>":       'tlib#agent#ReduceFilter',
-            \ "\<del>":      'tlib#agent#ReduceFilter',
-            \ "\<c-bs>":     'tlib#agent#PopFilter',
-            \ "\<m-bs>":     'tlib#agent#PopFilter',
-            \ "\<c-del>":    'tlib#agent#PopFilter',
-            \ "\<m-del>":    'tlib#agent#PopFilter',
-            \ "\<s-space>":  'tlib#agent#Wildcard',
-            \ 191:           'tlib#agent#Debug',
-            \ char2nr(g:tlib_inputlist_or):  'tlib#agent#OR',
-            \ char2nr(g:tlib_inputlist_and): 'tlib#agent#AND',
-            \ }
-
-" Number of items to move when pressing <c-up/down> in the input list window.
-TLet g:tlib_scroll_lines = 10
-
-" :nodefault:
-TLet g:tlib_keyagents_InputList_m = {
-            \ 35:          'tlib#agent#Select',
-            \ "\<s-up>":   'tlib#agent#SelectUp',
-            \ "\<s-down>": 'tlib#agent#SelectDown',
-            \ 1:           'tlib#agent#SelectAll',
-            \ 225:         'tlib#agent#SelectAll',
-            \ }
-" "\<c-space>": 'tlib#agent#Select'
-
-" :nodefault:
-TLet g:tlib_handlers_EditList = [
-            \ {'key': 5,  'agent': 'tlib#agent#EditItem',    'key_name': '<c-e>', 'help': 'Edit item'},
-            \ {'key': 4,  'agent': 'tlib#agent#DeleteItems', 'key_name': '<c-d>', 'help': 'Delete item(s)'},
-            \ {'key': 14, 'agent': 'tlib#agent#NewItem',     'key_name': '<c-n>', 'help': 'New item'},
-            \ {'key': 24, 'agent': 'tlib#agent#Cut',         'key_name': '<c-x>', 'help': 'Cut item(s)'},
-            \ {'key':  3, 'agent': 'tlib#agent#Copy',        'key_name': '<c-c>', 'help': 'Copy item(s)'},
-            \ {'key': 22, 'agent': 'tlib#agent#Paste',       'key_name': '<c-v>', 'help': 'Paste item(s)'},
-            \ {'pick_last_item': 0},
-            \ {'return_agent': 'tlib#agent#EditReturnValue'},
-            \ {'help_extra': [
-            \      'Submit changes by pressing ENTER or <c-s> or <c-w><cr>',
-            \      'Cancel editing by pressing <c-w>c'
-            \ ]},
-            \ ]
-
-" :nodefault:
-TLet g:tlib_debug = 0
-
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/vim-airline/.gitignore b/sources_non_forked/vim-airline/.gitignore
new file mode 100644
index 00000000..296f094e
--- /dev/null
+++ b/sources_non_forked/vim-airline/.gitignore
@@ -0,0 +1,3 @@
+doc/tags
+*.lock
+.vim-flavor
diff --git a/sources_non_forked/vim-airline/.travis.yml b/sources_non_forked/vim-airline/.travis.yml
new file mode 100644
index 00000000..9ed483e7
--- /dev/null
+++ b/sources_non_forked/vim-airline/.travis.yml
@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: rake ci
diff --git a/sources_non_forked/vim-airline/Gemfile b/sources_non_forked/vim-airline/Gemfile
new file mode 100644
index 00000000..088f22e3
--- /dev/null
+++ b/sources_non_forked/vim-airline/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vim-flavor', '~> 1.1'
diff --git a/sources_non_forked/vim-airline/LICENSE b/sources_non_forked/vim-airline/LICENSE
new file mode 100644
index 00000000..46977354
--- /dev/null
+++ b/sources_non_forked/vim-airline/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (C) 2013 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/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
new file mode 100644
index 00000000..dd59b889
--- /dev/null
+++ b/sources_non_forked/vim-airline/README.md
@@ -0,0 +1,199 @@
+# vim-airline [![Build Status](https://travis-ci.org/bling/vim-airline.png)](https://travis-ci.org/bling/vim-airline)
+
+Lean &amp; mean status/tabline for vim that's light as air.
+
+![img](https://github.com/bling/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], [syntastic][5], [eclim][34], [lawrencium][21] and [virtualenv][31].
+*  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 colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
+*  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)
+
+## Automatic truncation
+
+Sections and parts within sections can be configured to automatically hide when the window size shrinks.
+
+![image](https://f.cloud.github.com/assets/306502/1060831/05c08aac-11bc-11e3-8470-a506a3037f45.png)
+
+## Smarter tab line
+
+Automatically displays all buffers when there's only one tab open.
+
+![tabline](https://f.cloud.github.com/assets/306502/1072623/44c292a0-1495-11e3-9ce6-dcada3f1c536.gif)
+
+This is disabled by default; add the following to your vimrc to enable the extension:
+
+    let g:airline#extensions#tabline#enabled = 1
+
+Separators can be configured independently for the tabline, so here is how you can define "straight" tabs:
+
+    let g:airline#extensions#tabline#left_sep = ' '
+    let g:airline#extensions#tabline#left_alt_sep = '|'
+
+## Seamless integration
+
+vim-airline integrates with a variety of plugins out of the box.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off).
+
+#### [ctrlp.vim][10]
+![image](https://f.cloud.github.com/assets/306502/962258/7345a224-04ec-11e3-8b5a-f11724a47437.png)
+
+#### [unite.vim][9]
+![image](https://f.cloud.github.com/assets/306502/962319/4d7d3a7e-04ed-11e3-9d59-ab29cb310ff8.png)
+
+#### [tagbar][19]
+![image](https://f.cloud.github.com/assets/306502/962150/7e7bfae6-04ea-11e3-9e28-32af206aed80.png)
+
+#### [csv.vim][28]
+![image](https://f.cloud.github.com/assets/306502/962204/cfc1210a-04eb-11e3-8a93-42e6bcd21efa.png)
+
+#### [syntastic][5]
+![image](https://f.cloud.github.com/assets/306502/962864/9824c484-04f7-11e3-9928-da94f8c7da5a.png)
+
+#### hunks ([vim-gitgutter][29] & [vim-signify][30])
+![image](https://f.cloud.github.com/assets/306502/995185/73fc7054-09b9-11e3-9d45-618406c6ed98.png)
+
+#### [virtualenv][31]
+![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
+
+## 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/bling/vim-airline/issues/299#issuecomment-25772886)).
+
+![image](https://f.cloud.github.com/assets/306502/1195815/4bfa38d0-249d-11e3-823e-773cfc2ca894.png)
+
+#### Extensible pipeline
+
+Completely transform the statusline to your liking.  Build out the statusline as you see fit by extracting colors from the current colorscheme's highlight groups.
+
+![allyourbase](https://f.cloud.github.com/assets/306502/1022714/e150034a-0da7-11e3-94a5-ca9d58a297e8.png)
+
+# Rationale
+
+There's already [powerline][2], why yet another statusline?
+
+*  100% vimscript; no python needed.
+
+What about [vim-powerline][1]?
+
+*  vim-powerline has been deprecated in favor of the newer, unifying powerline, which is under active development; the new version is written in python at the core and exposes various bindings such that it can style statuslines not only in vim, but also tmux, bash, zsh, and others.
+
+# Where did the name come from?
+
+I wrote the initial version on an airplane, and since it's light as air it turned out to be a good name.  Thanks for flying vim!
+
+# Installation
+
+This plugin follows the standard runtime path structure, and as such it can be installed with a variety of plugin managers:
+
+*  [Pathogen][11]
+  *  `git clone https://github.com/bling/vim-airline ~/.vim/bundle/vim-airline`
+*  [NeoBundle][12]
+  *  `NeoBundle 'bling/vim-airline'`
+*  [Vundle][13]
+  *  `Bundle 'bling/vim-airline'`
+*  [VAM][22]
+  *  `call vam#ActivateAddons([ 'vim-airline' ])`
+*  manual
+  *  copy all of the files into your `~/.vim` directory
+
+# Configuration
+
+`:help airline`
+
+# 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].
+
+# Screenshots
+
+A full list of screenshots for various themes can be found in the [Wiki][14].
+
+# 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.
+*  A link to your vimrc or a gist which shows how you configured the plugin(s).
+*  And so I can reproduce; your `:version` of vim, and the commit of vim-airline you're using.
+
+# 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.
+*  If you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
+
+# License
+
+MIT License. Copyright (c) 2013 Bailey Ling.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
+[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/kien/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/bling/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/latest/fontpatching.html
+[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/bling/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/bling/vim-airline/wiki/Test-Plan
+[34]: http://eclim.org
diff --git a/sources_non_forked/vim-airline/Rakefile b/sources_non_forked/vim-airline/Rakefile
new file mode 100644
index 00000000..741cfc25
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
new file mode 100644
index 00000000..664c78e6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -0,0 +1,170 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
+
+let s:sections = ['a','b','c','gutter','x','y','z','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()
+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#update_statusline()
+  call airline#load_theme()
+
+  " 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')
+    try
+      let palette = g:airline#themes#{g:colors_name}#palette
+      call airline#switch_theme(g:colors_name)
+      return 1
+    catch
+      for map in items(g:airline_theme_map)
+        if match(g:colors_name, map[0]) > -1
+          call airline#switch_theme(map[1])
+          return 1
+        endif
+      endfor
+    endtry
+  endif
+  return 0
+endfunction
+
+function! airline#update_statusline()
+  for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    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
+  unlet! w:airline_render_right
+  for section in s:sections
+    unlet! w:airline_section_{section}
+  endfor
+
+  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']
+    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
+    if &modified
+      call add(l:mode, 'modified')
+    endif
+  endif
+
+  if g:airline_detect_paste && &paste
+    call add(l:mode, 'paste')
+  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)
+    let w:airline_lastmode = mode_string
+  endif
+
+  return ''
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/sources_non_forked/vim-airline/autoload/airline/builder.vim
new file mode 100644
index 00000000..c1658974
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/builder.vim
@@ -0,0 +1,74 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:prototype = {}
+
+function! s:prototype.split(...)
+  let self._side = 0
+  let self._line .= '%#'.self._curgroup.'#'.(a:0 ? a:1 : '%=')
+endfunction
+
+function! s:prototype.add_section_spaced(group, contents)
+  call self.add_section(a:group, (g:airline_symbols.space).a:contents.(g:airline_symbols.space))
+endfunction
+
+function! s:prototype.add_section(group, contents)
+  if self._curgroup != ''
+    if self._curgroup == a:group
+      let self._line .= self._side ? self._context.left_alt_sep : self._context.right_alt_sep
+    else
+      call airline#highlighter#add_separator(self._curgroup, a:group, self._side)
+      let self._line .= '%#'.self._curgroup.'_to_'.a:group.'#'
+      let self._line .= self._side ? self._context.left_sep : self._context.right_sep
+    endif
+  endif
+
+  if self._curgroup != a:group
+    let self._line .= '%#'.a:group.'#'
+  endif
+
+  if 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
+
+  let self._line .= line
+  let self._curgroup = a:group
+endfunction
+
+function! s:prototype.add_raw(text)
+  let self._line .= a:text
+endfunction
+
+function! s:prototype.build()
+  if !self._context.active
+    let self._line = substitute(self._line, '%#.\{-}\ze#', '\0_inactive', 'g')
+  endif
+  return self._line
+endfunction
+
+function! airline#builder#new(context)
+  let builder = copy(s:prototype)
+  let builder._context = a:context
+  let builder._side = 1
+  let builder._curgroup = ''
+  let builder._line = ''
+
+  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/sources_non_forked/vim-airline/autoload/airline/debug.vim b/sources_non_forked/vim-airline/autoload/airline/debug.vim
new file mode 100644
index 00000000..04d7e59c
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/debug.vim
@@ -0,0 +1,50 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/deprecation.vim b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
new file mode 100644
index 00000000..dd0567fc
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
@@ -0,0 +1,32 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#deprecation#check()
+  if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
+    echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
+  endif
+
+  let tests = [
+        \ [ 'g:airline_paste_symbol', 'g:airline_symbols.paste' ],
+        \ [ 'g:airline_readonly_symbol', 'g:airline_symbols.readonly' ],
+        \ [ 'g:airline_linecolumn_prefix', 'g:airline_symbols.linenr' ],
+        \ [ 'g:airline_branch_prefix', 'g:airline_symbols.branch' ],
+        \ [ 'g:airline_branch_empty_message', 'g:airline#extensions#branch#empty_message' ],
+        \ [ 'g:airline_detect_whitespace', 'g:airline#extensions#whitespace#enabled|show_message' ],
+        \ [ 'g:airline_enable_hunks', 'g:airline#extensions#hunks#enabled' ],
+        \ [ 'g:airline_enable_tagbar', 'g:airline#extensions#tagbar#enabled' ],
+        \ [ 'g:airline_enable_csv', 'g:airline#extensions#csv#enabled' ],
+        \ [ 'g:airline_enable_branch', 'g:airline#extensions#branch#enabled' ],
+        \ [ 'g:airline_enable_bufferline', 'g:airline#extensions#bufferline#enabled' ],
+        \ [ 'g:airline_enable_syntastic', 'g:airline#extensions#syntastic#enabled' ],
+        \ [ 'g:airline_enable_eclim', 'g:airline#extensions#eclim#enabled' ],
+        \ ]
+  for test in tests
+    if exists(test[0])
+      let max = winwidth(0) - 16
+      let msg = printf('The variable %s is deprecated and may not work in the future. It has been replaced with %s. Please read the documentation.', test[0], test[1])
+      echom msg[:max].'...'
+    endif
+  endfor
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
new file mode 100644
index 00000000..8707dbd7
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -0,0 +1,215 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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 = {
+      \ 'netrw': [ 'netrw', '%f' ],
+      \ 'nerdtree': [ 'NERD', '' ],
+      \ 'gundo': [ 'Gundo', '' ],
+      \ 'diff': [ 'diff', '' ],
+      \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
+      \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
+      \ 'startify': [ 'startify', '' ],
+      \ }
+
+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()
+  " non-trivial number of external plugins use eventignore=all, so we need to account for that
+  autocmd CursorMoved * call <sid>sync_active_winnr()
+
+  call airline#extensions#quickfix#init(s:ext)
+
+  if get(g:, 'loaded_unite', 0)
+    call airline#extensions#unite#init(s:ext)
+  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)
+  endif
+
+  if get(g:, 'command_t_loaded', 0)
+    call airline#extensions#commandt#init(s:ext)
+  endif
+
+  if exists(':UndotreeToggle')
+    call airline#extensions#undotree#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#hunks#enabled', 1) && get(g:, 'airline_enable_hunks', 1))
+        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter'))
+    call airline#extensions#hunks#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#tagbar#enabled', 1) && get(g:, 'airline_enable_tagbar', 1))
+        \ && exists(':TagbarToggle')
+    call airline#extensions#tagbar#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#csv#enabled', 1) && get(g:, 'airline_enable_csv', 1))
+        \ && (get(g:, 'loaded_csv', 0) || exists(':Table'))
+    call airline#extensions#csv#init(s:ext)
+  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) && get(g:, 'airline_enable_branch', 1))
+        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline'))
+    call airline#extensions#branch#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#bufferline#enabled', 1) && get(g:, 'airline_enable_bufferline', 1))
+        \ && exists('*bufferline#get_status_string')
+    call airline#extensions#bufferline#init(s:ext)
+  endif
+
+  if get(g:, 'virtualenv_loaded', 0) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
+    call airline#extensions#virtualenv#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
+    call airline#extensions#eclim#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
+        \ && exists(':SyntasticCheck')
+    call airline#extensions#syntastic#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#whitespace#enabled', 1) && get(g:, 'airline_detect_whitespace', 1))
+    call airline#extensions#whitespace#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#tabline#enabled', 0)
+    call airline#extensions#tabline#init(s:ext)
+  endif
+
+  " load all other extensions not part of the default distribution
+  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)
+        continue
+      endif
+      try
+        call airline#extensions#{name}#init(s:ext)
+      catch
+      endtry
+    endif
+  endfor
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
new file mode 100644
index 00000000..87a70693
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -0,0 +1,76 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:has_fugitive = exists('*fugitive#head')
+let s:has_fugitive_detect = exists('*fugitive#detect')
+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:empty_message = get(g:, 'airline#extensions#branch#empty_message',
+      \ get(g:, 'airline_branch_empty_message', ''))
+let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
+
+function! airline#extensions#branch#get_head()
+  let head = ''
+
+  if s:has_fugitive && !exists('b:mercurial_dir')
+    let head = fugitive#head()
+
+    if empty(head) && s:has_fugitive_detect && !exists('b:git_dir')
+      call fugitive#detect(getcwd())
+      let head = fugitive#head()
+    endif
+  endif
+
+  if empty(head)
+    if s:has_lawrencium
+      let head = lawrencium#statusline()
+    endif
+  endif
+
+  if empty(head)
+    if s:has_vcscommand
+      call VCSCommandEnableBufferSetup()
+      if exists('b:VCSCommandBufferInfo')
+        let head = get(b:VCSCommandBufferInfo, 0, '')
+      endif
+    endif
+  endif
+
+  return empty(head) || !s:check_in_path()
+        \ ? s:empty_message
+        \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head)
+endfunction
+
+function! s:check_in_path()
+  if !exists('b:airline_branch_path')
+    let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
+    let bufferpath = resolve(fnamemodify(expand('%'), ':p:h'))
+
+    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
+        let pattern = '\.git\(\\\|\/\)modules\(\\\|\/\)'
+        if match(root, pattern) >= 0
+          let root = substitute(root, pattern, '', '')
+        endif
+    endif
+
+    let b:airline_file_in_root = stridx(bufferpath, root) > -1
+  endif
+  return b:airline_file_in_root
+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
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
new file mode 100644
index 00000000..0c6013ce
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
@@ -0,0 +1,23 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
new file mode 100644
index 00000000..1353940b
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
@@ -0,0 +1,16 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
new file mode 100644
index 00000000..d3a8cc84
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
@@ -0,0 +1,31 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
new file mode 100644
index 00000000..64e28854
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -0,0 +1,77 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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: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_raw('%#CtrlPdark#'.a:1.(g:airline_symbols.space))
+  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/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
new file mode 100644
index 00000000..5d21996f
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -0,0 +1,77 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
+      \ 'b': 79,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ })
+let s:layout = get(g:, 'airline#extensions#default#layout', [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'warning' ]
+      \ ])
+
+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
+  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' && !a:context.active
+      continue
+    endif
+    call s:add_section(a:builder, a:context, key)
+  endfor
+endfunction
+
+if v:version >= 704 || (v:version >= 703 && has('patch81'))
+  function s:add_section(builder, context, key)
+    " i have no idea why the warning section needs special treatment, but it's
+    " needed to prevent separators from showing up
+    if a:key == 'warning'
+      call a:builder.add_raw('%(')
+    endif
+    call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    if a:key == 'warning'
+      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 == 'warning'
+      call a:builder.add_raw('%#airline_warning#'.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 <sid>build_sections(a:builder, a:context, s:layout[0])
+  else
+    call a:builder.add_section('airline_c'.(a:context.bufnr), ' %f%m ')
+  endif
+
+  call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
+
+  if airline#util#getwinvar(winnr, 'airline_render_right', 1)
+    call <sid>build_sections(a:builder, a:context, s:layout[1])
+  endif
+
+  return 1
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
new file mode 100644
index 00000000..ff6a84fe
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -0,0 +1,35 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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()
+  let eclimList = eclim#display#signs#GetExisting()
+  if !empty(eclimList)
+    let errorsLine = eclimList[0]['line']
+    let errorsNumber = len(eclimList)
+    let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
+    if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+      return errors.(g:airline_symbols.space)
+    endif
+  endif
+  return ''
+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/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
new file mode 100644
index 00000000..0c64f2c8
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
@@ -0,0 +1,54 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" 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/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
new file mode 100644
index 00000000..73c0e2ea
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
@@ -0,0 +1,63 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 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:get_hunks_gitgutter()
+  if !get(g:, 'gitgutter_enabled', 0)
+    return ''
+  endif
+  return GitGutterGetHunkSummary()
+endfunction
+
+function! s:get_hunks_empty()
+  return ''
+endfunction
+
+let s:source_func = ''
+function! s:get_hunks()
+  if empty(s:source_func)
+    if get(g:, 'loaded_signify', 0)
+      let s:source_func = 's:get_hunks_signify'
+    elseif exists('*GitGutterGetHunkSummary')
+      let s:source_func = 's:get_hunks_gitgutter'
+    else
+      let s:source_func = 's:get_hunks_empty'
+    endif
+  endif
+  return {s:source_func}()
+endfunction
+
+function! airline#extensions#hunks#get_hunks()
+  if !get(w:, 'airline_active', 0)
+    return ''
+  endif
+  let hunks = s:get_hunks()
+  let string = ''
+  if !empty(hunks)
+    for i in [0, 1, 2]
+      if s:non_zero_only == 0 || hunks[i] > 0
+        let string .= printf('%s%s ', s:hunk_symbols[i], hunks[i])
+      endif
+    endfor
+  endif
+  return string
+endfunction
+
+function! airline#extensions#hunks#init(ext)
+  call airline#parts#define_function('hunks', 'airline#extensions#hunks#get_hunks')
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
new file mode 100644
index 00000000..7afad864
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -0,0 +1,37 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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')
+endfunction
+
+function! s:get_text()
+  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, '\[Quickfix List\]') > -1
+        return g:airline#extensions#quickfix#quickfix_text
+      else
+        return g:airline#extensions#quickfix#location_text
+      endif
+    endif
+  endfor
+  return ''
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
new file mode 100644
index 00000000..3ecc1eb1
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
@@ -0,0 +1,19 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
new file mode 100644
index 00000000..b80d16e6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -0,0 +1,243 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+
+let s:builder_context = {
+      \ 'active'        : 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 s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , "\ue0b0")
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , "\ue0b1")
+else
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
+endif
+
+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)
+let s:spc = g:airline_symbols.space
+
+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()
+  if exists('s:original_tabline')
+    let &tabline = s:original_tabline
+    let &showtabline = s:original_showtabline
+  endif
+endfunction
+
+function! s:toggle_on()
+  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
+
+  set tabline=%!airline#extensions#tabline#get()
+  if s:buf_min_count <= 0 && s:tab_min_count <= 1
+    set showtabline=2
+  else
+    augroup airline_tabline
+      autocmd!
+      if s:show_buffers == 1
+        autocmd CursorMoved * call <sid>on_cursormove(s:buf_min_count, len(s:get_buffer_list()))
+      else
+        autocmd TabEnter * call <sid>on_cursormove(s:tab_min_count, tabpagenr('$'))
+      endif
+    augroup END
+  endif
+endfunction
+
+function! airline#extensions#tabline#load_theme(palette)
+  let colors    = get(a:palette, 'tabline', {})
+  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)
+  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_tabhid', l:tabhid)
+endfunction
+
+function! s:on_cursormove(min_count, total_count)
+  if a:total_count >= a:min_count
+    if &showtabline != 2
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction
+
+function! airline#extensions#tabline#get()
+  if s:show_buffers && tabpagenr('$') == 1
+    return s:get_buffers()
+  else
+    return s:get_tabs()
+  endif
+endfunction
+
+function! airline#extensions#tabline#title(n)
+  let buflist = tabpagebuflist(a:n)
+  let winnr = tabpagewinnr(a:n)
+  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+endfunction
+
+function! airline#extensions#tabline#get_buffer_name(nr)
+  return airline#extensions#tabline#formatters#{s:formatter}(a:nr, get(s:, 'current_buffer_list', []))
+endfunction
+
+function! s:get_buffer_list()
+  let buffers = []
+  let cur = bufnr('%')
+  for nr in range(1, bufnr('$'))
+    if buflisted(nr) && bufexists(nr)
+      for ex in s:excludes
+        if match(bufname(nr), ex)
+          continue
+        endif
+      endfor
+      if getbufvar(nr, 'current_syntax') == 'qf'
+        continue
+      endif
+      call add(buffers, nr)
+    endif
+  endfor
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
+function! s:get_visible_buffers()
+  let buffers = s:get_buffer_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
+
+  return buffers
+endfunction
+
+function! s:get_buffers()
+  let b = airline#builder#new(s:builder_context)
+  let cur = bufnr('%')
+  let tab_bufs = tabpagebuflist(tabpagenr())
+  for nr in s:get_visible_buffers()
+    if nr < 0
+      call b.add_raw('%#airline_tabhid#...')
+      continue
+    endif
+    if cur == nr
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod'
+      else
+        let group = 'airline_tabsel'
+      endif
+    else
+      if index(tab_bufs, nr) > -1
+        let group = 'airline_tab'
+      else
+        let group = 'airline_tabhid'
+      endif
+    endif
+    call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabtype', ' buffers ')
+  return b.build()
+endfunction
+
+function! s:get_tabs()
+  let b = airline#builder#new(s:builder_context)
+  for i in range(1, tabpagenr('$'))
+    if i == tabpagenr()
+      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
+    else
+      let group = 'airline_tab'
+    endif
+    let val = '%('
+    if s:tab_nr_type == 0
+      let val .= ' %{len(tabpagebuflist('.i.'))}'
+    else
+      let val .= (g:airline_symbols.space).i
+    endif
+    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+  call b.add_raw('%T')
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tab', ' %999XX ')
+  call b.add_section('airline_tabtype', ' tabs ')
+  return b.build()
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim
new file mode 100644
index 00000000..656ba225
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim
@@ -0,0 +1,60 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
+let s:fnamecollapse = get(g:, 'airline#extensions#tabline#fnamecollapse', 1)
+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(bufnr, buffers)
+  let _ = ''
+
+  let name = bufname(a:bufnr)
+  if empty(name)
+    let _ .= '[No Name]'
+  else
+    if s:fnamecollapse
+      let _ .= substitute(fnamemodify(name, s:fmod), '\v\w\zs.{-}\ze(\\|/)', '', 'g')
+    else
+      let _ .= fnamemodify(name, s:fmod)
+    endif
+  endif
+
+  return s:wrap_name(a:bufnr, _)
+endfunction
+
+function! airline#extensions#tabline#formatters#unique_tail(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, ':t')
+      if has_key(tails, tail)
+        let duplicates[nr] = nr
+      endif
+      let tails[tail] = 1
+      let map[nr] = s:wrap_name(nr, tail)
+    endif
+  endfor
+
+  for nr in values(duplicates)
+    let map[nr] = s:wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+  endfor
+
+  return map[a:bufnr]
+endfunction
+
+function! s:wrap_name(bufnr, buffer_name)
+  let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
+  let _ .= a:buffer_name
+  if getbufvar(a:bufnr, '&modified') == 1
+    let _ .= s:buf_modified_symbol
+  endif
+  return _
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
new file mode 100644
index 00000000..061a47f2
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -0,0 +1,39 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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
+
+function! airline#extensions#tagbar#currenttag()
+  if get(w:, 'airline_active', 0)
+    return tagbar#currenttag('%s', '', s:flags)
+  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/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
new file mode 100644
index 00000000..d897f041
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
@@ -0,0 +1,27 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
new file mode 100644
index 00000000..4db38584
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
@@ -0,0 +1,23 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
new file mode 100644
index 00000000..c052282c
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -0,0 +1,20 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'virtualenv_loaded', 0)
+  finish
+endif
+
+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"
+    call airline#extensions#append_to_section('x',
+          \ s:spc.g:airline_right_alt_sep.s:spc.'%{virtualenv#statusline()}')
+  endif
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
new file mode 100644
index 00000000..c8910af6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -0,0 +1,78 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
+
+" for backwards compatibility
+if exists('g:airline_detect_whitespace')
+  let s:show_message = g:airline_detect_whitespace == 1
+else
+  let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1)
+endif
+
+let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace)
+let s:default_checks = ['indent', 'trailing']
+
+let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
+let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
+
+let s:enabled = 1
+
+function! airline#extensions#whitespace#check()
+  if &readonly || !&modifiable || !s:enabled
+    return ''
+  endif
+
+  if !exists('b:airline_whitespace_check')
+    let b:airline_whitespace_check = ''
+    let checks = get(g:, 'airline#extensions#whitespace#checks', s:default_checks)
+
+    let trailing = 0
+    if index(checks, 'trailing') > -1
+      let trailing = search(' $', 'nw')
+    endif
+
+    let mixed = 0
+    if index(checks, 'indent') > -1
+      let indents = [search('^ \{2,}', 'nb'), search('^ \{2,}', 'n'), search('^\t', 'nb'), search('^\t', 'n')]
+      let mixed = indents[0] != 0 && indents[1] != 0 && indents[2] != 0 && indents[3] != 0
+    endif
+
+    if trailing != 0 || mixed
+      let b:airline_whitespace_check = s:symbol
+      if s:show_message
+        if trailing != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:trailing_format, trailing)
+        endif
+        if mixed
+          let mixnr = indents[0] == indents[1] ? indents[0] : indents[2]
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixnr)
+        endif
+      endif
+    endif
+  endif
+  return b:airline_whitespace_check
+endfunction!
+
+function! airline#extensions#whitespace#toggle()
+  if s:enabled
+    autocmd! airline_whitespace CursorHold,BufWritePost
+    augroup! airline_whitespace
+    let s:enabled = 0
+  else
+    call airline#extensions#whitespace#init()
+    let s:enabled = 1
+  endif
+  echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
+endfunction
+
+function! airline#extensions#whitespace#init(...)
+  call airline#parts#define_function('whitespace', 'airline#extensions#whitespace#check')
+
+  unlet! b:airline_whitespace_check
+  augroup airline_whitespace
+    autocmd!
+    autocmd CursorHold,BufWritePost * unlet! b:airline_whitespace_check
+  augroup END
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
new file mode 100644
index 00000000..f5e68465
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
@@ -0,0 +1,156 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
+let s:separators = {}
+let s:accents = {}
+
+function! s:gui2cui(rgb, fallback)
+  if a:rgb == ''
+    return a:fallback
+  endif
+  let rgb = map(matchlist(a:rgb, '#\(..\)\(..\)\(..\)')[1:3], '0 + ("0x".v:val)')
+  let rgb = [rgb[0] > 127 ? 4 : 0, rgb[1] > 127 ? 2 : 0, rgb[2] > 127 ? 1 : 0]
+  return rgb[0]+rgb[1]+rgb[2]
+endfunction
+
+function! s:get_syn(group, what)
+  " need to pass in mode, known to break on 7.3.547
+  let mode = has('gui_running') ? 'gui' : 'cterm'
+  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
+  if empty(color) || color == -1
+    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
+  endif
+  if empty(color) || color == -1
+    if has('gui_running')
+      let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
+    else
+      let color = a:what ==# 'fg' ? 0 : 1
+    endif
+  endif
+  return color
+endfunction
+
+function! s:get_array(fg, bg, opts)
+  let fg = a:fg
+  let bg = a:bg
+  return has('gui_running')
+        \ ? [ fg, bg, '', '', join(a:opts, ',') ]
+        \ : [ '', '', fg, 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 = synIDattr(synIDtrans(hlID(a:group)), 'reverse', has('gui_running') ? 'gui' : '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)
+  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
+  exec printf('hi %s %s %s %s %s %s %s %s',
+        \ a:group,
+        \ get(colors, 0, '') != '' ? 'guifg='.colors[0] : '',
+        \ get(colors, 1, '') != '' ? 'guibg='.colors[1] : '',
+        \ get(colors, 2, '') != '' ? 'ctermfg='.colors[2] : '',
+        \ get(colors, 3, '') != '' ? 'ctermbg='.colors[3] : '',
+        \ get(colors, 4, '') != '' ? 'gui='.colors[4] : '',
+        \ get(colors, 4, '') != '' ? 'cterm='.colors[4] : '',
+        \ get(colors, 4, '') != '' ? 'term='.colors[4] : '')
+endfunction
+
+function! s:exec_separator(dict, from, to, inverse, suffix)
+  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()
+  for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
+  endfor
+  call airline#highlighter#highlight(['inactive'])
+  call airline#highlighter#highlight(['normal'])
+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 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]
+        call airline#highlighter#exec(kvp[0].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(kvp[0].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/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
new file mode 100644
index 00000000..558b3f23
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -0,0 +1,113 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! s:check_defined(variable, default)
+  if !exists(a:variable)
+    let {a:variable} = a:default
+  endif
+endfunction
+
+let s:loaded = 0
+function! airline#init#bootstrap()
+  if s:loaded
+    return
+  endif
+  let s:loaded = 1
+
+  let g:airline#init#bootstrapping = 1
+
+  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b0":">")
+  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b1":">")
+  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b2":"<")
+  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b3":"<")
+  call s:check_defined('g:airline_detect_modified', 1)
+  call s:check_defined('g:airline_detect_paste', 1)
+  call s:check_defined('g:airline_detect_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_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',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_theme_map', {})
+  call extend(g:airline_theme_map, {
+        \ 'Tomorrow.*': 'tomorrow',
+        \ 'base16.*': 'base16',
+        \ 'mo[l|n]okai': 'molokai',
+        \ 'wombat.*': 'wombat',
+        \ '.*zenburn.*': 'zenburn',
+        \ '.*solarized.*': 'solarized',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_symbols', {})
+  call extend(g:airline_symbols, {
+        \ 'paste': get(g:, 'airline_paste_symbol', 'PASTE'),
+        \ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a2" : 'RO'),
+        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? "\u2739" : '!',
+        \ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a1" : ':' ),
+        \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a0" : ''),
+        \ 'modified': '+',
+        \ 'space': ' ',
+        \ }, 'keep')
+
+  call airline#parts#define('mode', {
+        \ 'function': 'airline#parts#mode',
+        \ 'accent': 'bold',
+        \ })
+  call airline#parts#define_function('iminsert', 'airline#parts#iminsert')
+  call airline#parts#define_function('paste', 'airline#parts#paste')
+  call airline#parts#define_function('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('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
+  call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
+  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace'])
+
+  unlet g:airline#init#bootstrapping
+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', 'paste', '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')
+    let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
+  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')
+    let g:airline_section_z = airline#section#create(['%3p%%'.spc, 'linenr', ':%3c '])
+  endif
+  if !exists('g:airline_section_warning')
+    let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
+  endif
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/parts.vim b/sources_non_forked/vim-airline/autoload/airline/parts.vim
new file mode 100644
index 00000000..bec4504f
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/parts.vim
@@ -0,0 +1,79 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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 get(w:, 'airline_current_mode', '')
+endfunction
+
+function! airline#parts#paste()
+  return g:airline_detect_paste && &paste ? g:airline_symbols.paste : ''
+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()
+  return &readonly ? g:airline_symbols.readonly : ''
+endfunction
+
+function! airline#parts#filetype()
+  return &filetype
+endfunction
+
+function! airline#parts#ffenc()
+  return printf('%s%s', &fenc, strlen(&ff) > 0 ? '['.&ff.']' : '')
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/section.vim b/sources_non_forked/vim-airline/autoload/airline/section.vim
new file mode 100644
index 00000000..4562bacd
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/section.vim
@@ -0,0 +1,73 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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 = ''
+
+    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 val = s:spc.g:airline_right_alt_sep.s:spc.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)
+    elseif a:append < 0 && idx != len(a:parts) - 1
+      let partval = printf('%%{airline#util#prepend(%s,%s)}', func, minwidth)
+    else
+      let partval = printf('%%{airline#util#wrap(%s,%s)}', func, minwidth)
+    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/sources_non_forked/vim-airline/autoload/airline/themes.vim b/sources_non_forked/vim-airline/autoload/airline/themes.vim
new file mode 100644
index 00000000..110a9dc3
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes.vim
@@ -0,0 +1,67 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" 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
+  endfor
+
+  let a:palette.accents = get(a:palette, 'accents', {})
+  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/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim b/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim
new file mode 100644
index 00000000..41a25d1f
--- /dev/null
+++ b/sources_non_forked/vim-airline/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:N2[1] , s:N3[1] , s:N2[3] , s:N3[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/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim b/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
new file mode 100644
index 00000000..469435e9
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
@@ -0,0 +1,107 @@
+if get(g:, 'airline#themes#base16#constant', 0)
+  let g:airline#themes#base16#palette = {}
+
+  " 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_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
+
+  " 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#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
+  let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
+  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_highlight('Visual')
+    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(['DiffAdded', '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(['WarningMsg', '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(['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#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
+
+    let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
+    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': [ group[0], '', group[2], '', '' ]
+          \ }
+  endfunction
+  call airline#themes#base16#refresh()
+endif
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
new file mode 100644
index 00000000..d18e0324
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
@@ -0,0 +1,62 @@
+" 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_dark_gray, s:gui_med_gray_hi, s:cterm_dark_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, '', ''],
+      \ }
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/dark.vim b/sources_non_forked/vim-airline/autoload/airline/themes/dark.vim
new file mode 100644
index 00000000..217b2f1f
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/dark.vim
@@ -0,0 +1,102 @@
+" Each theme is contained in its own file and declares variables scoped to the
+" file.  These variables represent the possible "modes" that airline can
+" detect.  The mode is the return value of mode(), which gets converted to a
+" readable string.  The following is a list currently supported modes: normal,
+" insert, replace, visual, and inactive.
+"
+" Each mode can also have overrides.  These are small changes to the mode that
+" don't require a completely different look.  "modified" and "paste" are two
+" such supported overrides.  These are simply suffixed to the major mode,
+" separated by an underscore.  For example, "normal_modified" would be normal
+" mode where the current buffer is modified.
+"
+" The theming algorithm is a 2-pass system where the mode will draw over all
+" parts of the statusline, and then the override is applied after.  This means
+" it is possible to specify a subset of the theme in overrides, as it will
+" simply overwrite the previous colors.  If you want simultaneous overrides,
+" then they will need to change different parts of the statusline so they do
+" not conflict with each other.
+"
+" First, let's define an empty dictionary and assign it to the "palette"
+" variable. The # is a separator that maps with the directory structure. If
+" you get this wrong, Vim will complain loudly.
+let g:airline#themes#dark#palette = {}
+
+" First let's define some arrays. The s: is just a VimL thing for scoping the
+" variables to the current script. Without this, these variables would be
+" declared globally. Now let's declare some colors for normal mode and add it
+" to the dictionary.  The array is in the format:
+" [ guifg, guibg, ctermfg, ctermbg, opts ]. See "help attr-list" for valid
+" values for the "opt" value.
+let s:N1   = [ '#00005f' , '#dfff00' , 17  , 190 ]
+let s:N2   = [ '#ffffff' , '#444444' , 255 , 238 ]
+let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
+let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+" Here we define overrides for when the buffer is modified.  This will be
+" applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
+" declared.
+let g:airline#themes#dark#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
+let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
+let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
+let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#dark#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#dark#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#dark#palette.replace = copy(g:airline#themes#dark#palette.insert)
+let g:airline#themes#dark#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palette.insert_modified
+
+
+let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
+let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
+let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
+let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#dark#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
+let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
+let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
+let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#dark#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+" Accents are used to give parts within a section a slightly different look or
+" color. Here we are defining a "red" accent, which is used by the 'readonly'
+" part by default. Only the foreground colors are specified, so the background
+" colors are automatically extracted from the underlying section colors. What
+" this means is that regardless of which section the part is defined in, it
+" will be red instead of the section's foreground color. You can also have
+" multiple parts with accents within a section.
+let g:airline#themes#dark#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+
+" Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
+" variable so that related functionality is loaded iff the user is using
+" ctrlp. Note that this is optional, and if you do not define ctrlp colors
+" they will be chosen automatically from the existing palette.
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#dark#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
+      \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
+      \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim b/sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim
new file mode 100644
index 00000000..201068c6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/jellybeans.vim
@@ -0,0 +1,52 @@
+let g:airline#themes#jellybeans#palette = {}
+
+" The name of the function must be 'refresh'.
+function! airline#themes#jellybeans#refresh()
+  " This theme is an example of how to use helper functions to extract highlight
+  " values from the corresponding colorscheme. It was written in a hurry, so it
+  " is very minimalistic. If you are a jellybeans user and want to make updates,
+  " please send pull requests.
+
+  " Here are examples where the entire highlight group is copied and an airline
+  " compatible color array is generated.
+  let s:N1 = airline#themes#get_highlight('DbgCurrent', 'bold')
+  let s:N2 = airline#themes#get_highlight('Folded')
+  let s:N3 = airline#themes#get_highlight('NonText')
+
+  let g:airline#themes#jellybeans#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  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 = {
+        \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
+        \ }
+
+  let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
+  let s:I2 = s:N2
+  let s:I3 = s:N3
+  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 = g:airline#themes#jellybeans#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  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 = g:airline#themes#jellybeans#palette.normal_modified
+
+  " Sometimes you want to mix and match colors from different groups, you can do
+  " that with this method.
+  let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold')
+  let s:V2 = s:N2
+  let s:V3 = s:N3
+  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 = g:airline#themes#jellybeans#palette.normal_modified
+
+  " And of course, you can always do it manually as well.
+  let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
+  let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified
+endfunction
+
+call airline#themes#jellybeans#refresh()
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/laederon.vim b/sources_non_forked/vim-airline/autoload/airline/themes/laederon.vim
new file mode 100644
index 00000000..115c1079
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/light.vim b/sources_non_forked/vim-airline/autoload/airline/themes/light.vim
new file mode 100644
index 00000000..d9fe8441
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim b/sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim
new file mode 100644
index 00000000..e3869007
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/lucius.vim
@@ -0,0 +1,56 @@
+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'),
+                \ }
+
+endfunction
+
+call airline#themes#lucius#refresh()
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim b/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim
new file mode 100644
index 00000000..0024188f
--- /dev/null
+++ b/sources_non_forked/vim-airline/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': [ '#450000' , ''        , 52      , ''      , ''     ] ,
+      \ }
+
+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/sources_non_forked/vim-airline/autoload/airline/themes/molokai.vim b/sources_non_forked/vim-airline/autoload/airline/themes/molokai.vim
new file mode 100644
index 00000000..1998f002
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/monochrome.vim b/sources_non_forked/vim-airline/autoload/airline/themes/monochrome.vim
new file mode 100644
index 00000000..7dd1a173
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim b/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
new file mode 100644
index 00000000..adebf3bd
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
@@ -0,0 +1,46 @@
+let g:airline#themes#murmur#palette = {}
+
+let s:termbg = 237  " Background for branch and file format blocks
+let s:termbg2= 234  " Background for middle block
+let s:normalbg= 27  " Background for normal mode and file position blocks
+let s:insertbg= 70  " Background for insert mode and file position blocks
+let s:visualbg= 166 " Background for visual mode and file position blocks
+let s:replacebg=88  " Background for replace mode and file position blocks
+let s:alert= 88     " Modefied file alert color
+
+let s:BB = ['#AFAF87', '#5F5F5F', 144, s:termbg] " Branch and file format blocks
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, s:normalbg]   " Outside blocks in normal mode
+let s:N2 = ['#AFAF87', '#5F5F5F', 39, s: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': ['#ffffff', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, s:insertbg]         " Outside blocks in insert mode
+let s:I2 = ['#AFAF87', '#5F5F5F', s:insertbg, s: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': ['#AFAF87', '#5F5F5F', s:alert, s:termbg2, 'bold'] ,}
+
+let s:R1 = ['#FFFFFF', '#870000', 15, s:replacebg]  " Outside blocks in replace mode
+let s:R2 = ['#AFAF87', '#5F5F5F', 255, s: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': ['#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, s:visualbg]         " Outside blocks in visual mode
+let s:V2 = ['#AFAF87', '#5F5F5F', s:visualbg, s: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': [ '#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+" Inactive mode
+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#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(
+      \ ['#FFFFFF', '#5F87FF', 15, s:normalbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 144, s:termbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 39, s:termbg2, 'bold'])
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/powerlineish.vim b/sources_non_forked/vim-airline/autoload/airline/themes/powerlineish.vim
new file mode 100644
index 00000000..d550e110
--- /dev/null
+++ b/sources_non_forked/vim-airline/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[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/serene.vim b/sources_non_forked/vim-airline/autoload/airline/themes/serene.vim
new file mode 100644
index 00000000..9191c077
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/simple.vim b/sources_non_forked/vim-airline/autoload/airline/themes/simple.vim
new file mode 100644
index 00000000..a111a1cb
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim b/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim
new file mode 100644
index 00000000..31aa34fc
--- /dev/null
+++ b/sources_non_forked/vim-airline/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' , '#ff3535' , 231 , 203 , '' ] ,
+      \ }
+
+
+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': [ '#ffffff' , '#ff6868' , 225 , 167 , '' ] ,
+      \ }
+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': [ '#ffffff' , '#ff3535' , 231 , 203 , '' ] ,
+      \ }
+
+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':   ['#ffffff', '#ff6868',  231, 167, ''],
+      \ }
+
+let s:WI = [ '#eeeeee', '#ff0f38', 255, 201 ]
+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/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim b/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
new file mode 100644
index 00000000..db52bcf8
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
@@ -0,0 +1,173 @@
+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:tty         = &t_Co == 8
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Colors
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Base colors
+  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'}
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " 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: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: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], '']
+  else
+    let s:NM = [s:base01, 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
+  if s:background == 'dark'
+    let s:IA = [s:base00, s:base02, '']
+  else
+    let s:IA = [s:base1, s:base2, '']
+  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:NM[0].g, '', s:NM[0].t, '', s:NM[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_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/sources_non_forked/vim-airline/autoload/airline/themes/tomorrow.vim b/sources_non_forked/vim-airline/autoload/airline/themes/tomorrow.vim
new file mode 100644
index 00000000..f382fc14
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/ubaryd.vim b/sources_non_forked/vim-airline/autoload/airline/themes/ubaryd.vim
new file mode 100644
index 00000000..70232ef8
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/understated.vim b/sources_non_forked/vim-airline/autoload/airline/themes/understated.vim
new file mode 100644
index 00000000..b3e79179
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/wombat.vim b/sources_non_forked/vim-airline/autoload/airline/themes/wombat.vim
new file mode 100644
index 00000000..39fdc4c1
--- /dev/null
+++ b/sources_non_forked/vim-airline/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 , 236 ] " info
+let s:N3 = [ '#CAE682' , '#242424' , 192 , 234 ] " statusline
+let s:N4 = [ '#86CD74' , 113 ]                   " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 227 ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 227 , 236 ]
+let s:I3 = [ '#FDE76E' , '#242424' , 227 , 234 ]
+let s:I4 = [ '#FADE3E' , 221 ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 153 ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 153 , 236 ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 153 , 234 ]
+let s:V4 = [ '#7CB0E6' , 111 ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 173 ]
+let s:R2 = [ '#E5786D' , '#32322F' , 173 , 236 ]
+let s:R3 = [ '#E5786D' , '#242424' , 173 , 234 ]
+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/sources_non_forked/vim-airline/autoload/airline/themes/zenburn.vim b/sources_non_forked/vim-airline/autoload/airline/themes/zenburn.vim
new file mode 100644
index 00000000..9883c213
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/util.vim b/sources_non_forked/vim-airline/autoload/airline/util.vim
new file mode 100644
index 00000000..b97c0866
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/util.vim
@@ -0,0 +1,64 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+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#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
+
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
new file mode 100644
index 00000000..2816c290
--- /dev/null
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -0,0 +1,677 @@
+*airline.txt*  Lean and mean status/tabline that's light as air
+*airline*
+                   _                       _      _ _                        ~
+            __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
+            \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
+             \ V /| | | | | | |_____| (_| | | |  | | | | | |  __/            ~
+              \_/ |_|_| |_| |_|      \__,_|_|_|  |_|_|_| |_|\___|            ~
+                                                                             ~
+==============================================================================
+CONTENTS                                                  *airline-contents*
+
+   01. Intro ............................................... |airline-intro|
+   02. Features ......................................... |airline-features|
+   03. Name ................................................. |airline-name|
+   04. Configuration ............................... |airline-configuration|
+   05. Commands ......................................... |airline-commands|
+   06. Customization ............................... |airline-customization|
+   07. Extensions ..................................... |airline-extensions|
+   08. Advanced Customization ............. |airline-advanced-customization|
+   09. Funcrefs ......................................... |airline-funcrefs|
+   10. Pipeline ......................................... |airline-pipeline|
+   11. Writing Extensions ..................... |airline-writing-extensions|
+   12. Writing Themes ..................................... |airline-themes|
+   13. Troubleshooting ........................... |airline-troubleshooting|
+   14. Contributions ............................... |airline-contributions|
+   15. License ........................................... |airline-license|
+
+==============================================================================
+INTRODUCTION                                                 *airline-intro*
+
+vim-airline is a fast and lightweight alternative to powerline, written
+in 100% vimscript with no outside dependencies.
+
+==============================================================================
+FEATURES                                                  *airline-features*
+
+*  tiny core written with extensibility in mind.
+*  integrates with many popular plugins.
+*  looks good with regular fonts, and provides configuration points so you
+   can use unicode or powerline symbols.
+*  optimized for speed; it loads in under a millisecond.
+*  fully customizable; if you know a little 'statusline' syntax you can
+   tweak it to your needs.
+*  extremely easy to write themes.
+
+==============================================================================
+NAME                                                          *airline-name*
+
+Where did the name come from?
+
+I wrote this on an airplane, and since it's light as air it turned out to be a
+good name :-)
+
+==============================================================================
+CONFIGURATION                                        *airline-configuration*
+
+There are a couple configuration values available (shown with their default
+values):
+
+* the separator used on the left side >
+  let g:airline_left_sep='>'
+<
+* the separator used on the right side >
+  let g:airline_right_sep='<'
+<
+* enable modified detection >
+  let g:airline_detect_modified=1
+
+* enable paste detection >
+  let g:airline_detect_paste=1
+<
+* enable 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=
+<
+* if you want to patch the airline theme before it gets applied, you can
+  supply the name of a function where you can modify the palette. >
+  let g:airline_theme_patch_func = 'AirlineThemePatch'
+  function! AirlineThemePatch(palette)
+    if g:airline_theme == 'badwolf'
+      for colors in values(a:palette.inactive)
+        let colors[3] = 245
+      endfor
+    endif
+  endfunction
+<
+* enable/disable automatic population of the `g:airline_symbols` dictionary
+  with powerline symbols. >
+  let g:airline_powerline_fonts=0
+<
+* define the set of text to display for each mode.  >
+  let g:airline_mode_map = {} " see source for the defaults
+
+  " or copy paste the following into your vimrc for shortform text
+  let g:airline_mode_map = {
+      \ '__' : '-',
+      \ 'n'  : 'N',
+      \ 'i'  : 'I',
+      \ 'R'  : 'R',
+      \ 'c'  : 'C',
+      \ 'v'  : 'V',
+      \ 'V'  : 'V',
+      \ '' : 'V',
+      \ 's'  : 'S',
+      \ 'S'  : 'S',
+      \ '' : 'S',
+      \ }
+<
+* define the set of filename match queries which excludes a window from having
+  its statusline modified >
+  let g:airline_exclude_filenames = [] " see source for current list
+<
+* define the set of filetypes which are excluded from having its window
+  statusline modified >
+  let g:airline_exclude_filetypes = [] " see source for current list
+<
+* defines whether the preview window should be excluded from have its window
+  statusline modified (may help with plugins which use the preview window
+  heavily) >
+  let g:airline_exclude_preview = 0
+<
+==============================================================================
+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.
+
+==============================================================================
+CUSTOMIZATION                                        *airline-customization*
+
+The following are some unicode symbols for customizing the left/right
+separators, as well as the powerline font glyths.
+
+Note: You must define the dictionary first before setting values. Also, it's a
+good idea to check whether if it exists as to avoid accidentally overwritting
+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.linenr = '␊'
+  let g:airline_symbols.linenr = '␤'
+  let g:airline_symbols.linenr = '¶'
+  let g:airline_symbols.branch = '⎇'
+  let g:airline_symbols.paste = 'ρ'
+  let g:airline_symbols.paste = 'Þ'
+  let g:airline_symbols.paste = '∥'
+  let g:airline_symbols.whitespace = 'Ξ'
+
+  " powerline symbols
+  let g:airline_left_sep = ''
+  let g:airline_left_alt_sep = ''
+  let g:airline_right_sep = ''
+  let g:airline_right_alt_sep = ''
+  let g:airline_symbols.branch = ''
+  let g:airline_symbols.readonly = ''
+  let g:airline_symbols.linenr = ''
+
+  " old vim-powerline symbols
+  let g:airline_left_sep = '⮀'
+  let g:airline_left_alt_sep = '⮁'
+  let g:airline_right_sep = '⮂'
+  let g:airline_right_alt_sep = '⮃'
+  let g:airline_symbols.branch = '⭠'
+  let g:airline_symbols.readonly = '⭤'
+  let g:airline_symbols.linenr = '⭡'
+<
+
+For more intricate customizations, you can replace the predefined sections
+with the usual statusline syntax.
+
+Note: If you define any section variables it will replace the default values
+entirely.  If you want to disable only certain parts of a section you can try
+using variables defined in the |airline-configuration| or |airline-extensions|
+section.
+>
+  variable names                default contents
+  ----------------------------------------------------------------------------
+  let g:airline_section_a       (mode, paste, 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_warning (syntastic, 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.
+
+-------------------------------------                      *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,
+      \ })
+
+  " Note: set to an empty dictionary to disable truncation.
+  let g:airline#extensions#default#section_truncate_width = {}
+<
+* configure the layout of the sections by specificing 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', 'warning' ]
+      \ ])
+<
+
+-------------------------------------                     *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*
+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>
+
+* 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 = ''
+
+* use vcscommand.vim if available >
+  let g:airline#extensions#branch#use_vcscommand = 0
+<
+-------------------------------------                    *airline-syntastic*
+syntastic <https://github.com/scrooloose/syntastic>
+
+* enable/disable syntastic integration >
+  let g:airline#extensions#syntastic#enabled = 1
+<
+-------------------------------------                       *airline-tagbar*
+tagbar <https://github.com/majutsushi/>
+
+* 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>
+
+* enable/disable showing a summary of changed hunks under source control. >
+  let g:airline#extensions#hunks#enabled = 1
+<
+* enable/disable showing only non-zero hunks. >
+  let g:airline#extensions#hunks#non_zero_only = 0
+<
+* set hunk count symbols. >
+  let g:airline#extensions#hunks#hunk_symbols = ['+', '~', '-']
+<
+-------------------------------------                        *airline-ctrlp*
+ctrlp <https://github.com/kien/ctrlp.vim>
+
+* configure which mode colors should ctrlp window use (takes effect
+  only if the active airline theme doesn't define ctrlp colors) >
+  let g:airline#extensions#ctrlp#color_template = 'insert' (default)
+  let g:airline#extensions#ctrlp#color_template = 'normal'
+  let g:airline#extensions#ctrlp#color_template = 'visual'
+  let g:airline#extensions#ctrlp#color_template = 'replace'
+<
+
+* configure whether to show the previous and next modes (mru, buffer, etc...)
+>
+ let g:airline#extensions#ctrlp#show_adjacent_modes = 1
+<
+-------------------------------------                   *airline-virtualenv*
+virtualenv <https://github.com/jmcantrell/vim-virtualenv>
+
+* enable/disable virtualenv integration >
+  let g:airline#extensions#virtualenv#enabled = 1
+<
+-------------------------------------                        *airline-eclim*
+eclim <https://eclim.org>
+
+* enable/disable eclim integration, which works well with the
+  |airline-syntastic| extension. >
+  let g:airline#extensions#eclim#enabled = 1
+
+-------------------------------------                   *airline-whitespace*
+* enable/disable detection of whitespace errors. >
+  let g:airline#extensions#whitespace#enabled = 1
+<
+* customize the whitespace symbol. >
+  let g:airline#extensions#whitespace#symbol = '!'
+<
+* configure which whitespace checks to enable. >
+  let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ]
+<
+* 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]'
+<
+-------------------------------------                      *airline-tabline*
+* enable/disable enhanced tabline. >
+  let g:airline#extensions#tabline#enabled = 0
+<
+* enable/disable displaying buffers with a single tab. >
+  let g:airline#extensions#tabline#show_buffers = 1
+<
+* configure filename match rules to exclude from the tabline. >
+  let g:airline#extensions#tabline#excludes = []
+<
+* configure how numbers are calculated 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
+<
+* defines the name of a formatter for how buffer names are displayed. >
+  let g:airline#extensions#tabline#formatter = 'default'
+
+  " here is how you can define a 'foo' formatter:
+  function! airline#extensions#tabline#formatters#foo(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.
+
+    * 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
+
+  " 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'
+<
+* 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 = ''
+<
+Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
+
+==============================================================================
+ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
+
+The defaults will accomodate 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"')
+<
+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
+* `filetype`       displays the file type
+* `readonly`       displays the read only indicator
+* `file`           displays the filename and modified indicator
+* `ffenc`          displays the file format and encoding
+
+And the following are defined for their respective extensions:
+
+`hunks`, `branch`, `tagbar`, `syntastic`, `whitespace`
+
+-------------------------------------                      *airline-accents*
+Accents can be defined on any part, like so: >
+  call airline#parts#define_accent('foo', 'red')
+<
+This will override the colors of that part by using what is defined in that
+particular accent. In the above example, the `red` accent is used, which means
+regardless of which section the part is used in, it will have red foreground
+colors instead of the section's default foreground color.
+
+The following accents are defined by default. Themes can define their variants
+of the colors, but defaults will be provided if missing. >
+  bold, italic, red, green, blue, yellow, orange, purple
+<
+The defaults configure the mode and line number parts to be bold, and the
+readonly part to be red.
+
+-------------------------------------                     *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 VimEnter * call AirlineInit()
+<
+This will create a section with the `mode`, followed by a space, and our `foo`
+part in section `a`. Section `b` will have two parts with a left-side
+separator. And section `c` will contain the current path. You may notice that
+the space and cwd are not defined parts. For convenience, if a part of that
+key does not exist, it will be inserted as is. The unit tests will be a good
+resource for possibilities.
+
+Note: The use of |VimEnter| is important, because most extensions are lazily
+loaded, so we must give them a chance to define their parts before we can use
+them.
+
+Note: The `airline#section#create` function and friends will do its best to
+create a section with the appropriate separators, but it only works for
+function and text parts. Special 'statusline' items like %f or raw/undefined
+parts will not work as it is not possible to inspect their widths/contents
+before rendering to the statusline.
+
+==============================================================================
+FUNCREFS                                                  *airline-funcrefs*
+
+vim-airline internally uses funcrefs to integrate with third party plugins,
+and you can tap into this functionality to extend it for you needs. This is
+the most powerful way to customize the statusline, and sometimes it may be
+easier to go this route than the above methods.
+
+Every section can have two values. The default value is the global `g:`
+variable which is used in the absense 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 some 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.  The |jellybeans.vim| theme is another example of how to write a
+theme, but instead of manually declaring colors, it extracts the values from
+highlight groups.
+
+==============================================================================
+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.
+
+
+Solutions to other common problems can be found in the Wiki:
+<https://github.com/bling/vim-airline/wiki/FAQ>
+
+==============================================================================
+CONTRIBUTIONS                                        *airline-contributions*
+
+Contributions and pull requests are welcome.
+
+==============================================================================
+LICENSE                                                    *airline-license*
+
+MIT License.  Copyright © 2013 Bailey Ling.
+
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/sources_non_forked/vim-airline/plugin/airline.vim
new file mode 100644
index 00000000..f1d3d386
--- /dev/null
+++ b/sources_non_forked/vim-airline/plugin/airline.vim
@@ -0,0 +1,109 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
+  finish
+endif
+let g:loaded_airline = 1
+
+" autocmd VimEnter * call airline#deprecation#check()
+
+let s:airline_initialized = 0
+let s:airline_theme_defined = 0
+function! s:init()
+  if !s:airline_initialized
+    let s:airline_initialized = 1
+
+    call airline#init#bootstrap()
+    call airline#extensions#load()
+    call airline#init#sections()
+
+    let s:airline_theme_defined = exists('g:airline_theme')
+    if s:airline_theme_defined || !airline#switch_matching_theme()
+      let g:airline_theme = get(g:, 'airline_theme', 'dark')
+      call airline#switch_theme(g:airline_theme)
+    endif
+  endif
+endfunction
+
+function! s:on_window_changed()
+  if pumvisible()
+    return
+  endif
+  call <sid>init()
+  call airline#update_statusline()
+endfunction
+
+function! s:on_colorscheme_changed()
+  call <sid>init()
+  if !s:airline_theme_defined
+    if airline#switch_matching_theme()
+      return
+    endif
+  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 ColorScheme * call <sid>on_colorscheme_changed()
+      autocmd VimEnter,WinEnter,BufWinEnter,FileType,BufUnload,VimResized *
+            \ call <sid>on_window_changed()
+
+      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
+
+    silent doautocmd User AirlineToggledOn
+
+    if s:airline_initialized
+      call <sid>on_window_changed()
+    endif
+  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
+command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
+command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
+command! AirlineToggle call <sid>airline_toggle()
+command! AirlineRefresh call airline#load_theme()
+
+call <sid>airline_toggle()
+
diff --git a/sources_non_forked/vim-airline/t/airline.vim b/sources_non_forked/vim-airline/t/airline.vim
new file mode 100644
index 00000000..78ab6d7c
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/airline.vim
@@ -0,0 +1,87 @@
+let g:airline_theme = 'dark'
+call airline#init#bootstrap()
+call airline#init#sections()
+source plugin/airline.vim
+
+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/sources_non_forked/vim-airline/t/builder.vim b/sources_non_forked/vim-airline/t/builder.vim
new file mode 100644
index 00000000..3d1afcda
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/builder.vim
@@ -0,0 +1,80 @@
+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('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#>%#NonText#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('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#<%#NonText#world'
+  end
+
+  it 'should not repeat the same highlight group'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Normal', 'hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#hello>hello'
+  end
+
+  it 'should replace accent groups with the specified group'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#%#Normal_foo#hello'
+  end
+
+  it 'should replace two accent groups with correct groups'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_foo#hello%#Normal_bar#world'
+  end
+
+  it 'should special restore group should go back to previous group'
+    call s:builder.add_section('Normal', '%#__restore__#')
+    let stl = s:builder.build()
+    Expect stl !~ '%#__restore__#'
+    Expect stl =~ '%#Normal#'
+  end
+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('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_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/sources_non_forked/vim-airline/t/commands.vim b/sources_non_forked/vim-airline/t/commands.vim
new file mode 100644
index 00000000..b56b881d
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/commands.vim
@@ -0,0 +1,33 @@
+call airline#init#bootstrap()
+call airline#init#sections()
+
+source plugin/airline.vim
+
+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'
+  end
+
+  it 'should have a refresh command'
+    Expect exists(':AirlineRefresh') to_be_true
+  end
+end
+
diff --git a/sources_non_forked/vim-airline/t/extensions_default.vim b/sources_non_forked/vim-airline/t/extensions_default.vim
new file mode 100644
index 00000000..b98e8166
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/extensions_default.vim
@@ -0,0 +1,32 @@
+let g:airline_theme = 'dark'
+call airline#init#bootstrap()
+call airline#init#sections()
+source plugin/airline.vim
+
+describe 'default'
+  before
+    let s:builder = airline#builder#new({'active': 1})
+  end
+
+  it 'should use the layout'
+    let g:airline#extensions#default#layout = [
+          \ [ 'c', 'a', 'b', 'warning' ],
+          \ [ 'x', 'z', 'y' ]
+          \ ]
+    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/sources_non_forked/vim-airline/t/highlighter.vim b/sources_non_forked/vim-airline/t/highlighter.vim
new file mode 100644
index 00000000..a1ed4905
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-airline/t/init.vim b/sources_non_forked/vim-airline/t/init.vim
new file mode 100644
index 00000000..86efe582
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/init.vim
@@ -0,0 +1,77 @@
+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, iminsert'
+    Expect g:airline_section_a =~ 'mode'
+    Expect g:airline_section_a =~ 'paste'
+    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 =~ '%3c'
+  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/sources_non_forked/vim-airline/t/parts.vim b/sources_non_forked/vim-airline/t/parts.vim
new file mode 100644
index 00000000..ee7c92e3
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-airline/t/section.vim b/sources_non_forked/vim-airline/t/section.vim
new file mode 100644
index 00000000..034440c8
--- /dev/null
+++ b/sources_non_forked/vim-airline/t/section.vim
@@ -0,0 +1,76 @@
+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
+end
+
diff --git a/sources_non_forked/vim-airline/t/themes.vim b/sources_non_forked/vim-airline/t/themes.vim
new file mode 100644
index 00000000..d735229e
--- /dev/null
+++ b/sources_non_forked/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 == ['', '', 0, 1, 'bold,italic']
+
+    let hl = airline#themes#get_highlight2(['Foo','bg'], ['Foo','fg'], 'italic', 'bold')
+    Expect hl == ['', '', 1, 0, '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/sources_non_forked/vim-airline/t/util.vim b/sources_non_forked/vim-airline/t/util.vim
new file mode 100644
index 00000000..913de9d8
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-coffee-script/Makefile b/sources_non_forked/vim-coffee-script/Makefile
index 4c03d835..e6ef4092 100644
--- a/sources_non_forked/vim-coffee-script/Makefile
+++ b/sources_non_forked/vim-coffee-script/Makefile
@@ -2,7 +2,7 @@ REF = HEAD
 VERSION = $(shell git describe --always $(REF))
 
 ARCHIVE = vim-coffee-script-$(VERSION).zip
-ARCHIVE_DIRS = after compiler doc ftdetect ftplugin indent syntax
+ARCHIVE_DIRS = after autoload compiler doc ftdetect ftplugin indent syntax
 
 # Don't do anything by default.
 all:
diff --git a/sources_non_forked/vim-coffee-script/Readme.md b/sources_non_forked/vim-coffee-script/Readme.md
index 664b9835..d557848a 100644
--- a/sources_non_forked/vim-coffee-script/Readme.md
+++ b/sources_non_forked/vim-coffee-script/Readme.md
@@ -1,226 +1,555 @@
-This project adds [CoffeeScript] support to the vim editor. It handles syntax,
-indenting, compiling, and more. Also included is support for CoffeeScript in
-Haml and HTML.
+This project adds [CoffeeScript] support to vim. It covers syntax, indenting,
+compiling, and more.
 
-![Screenshot](http://i.imgur.com/eUBvm.png)
+![Screenshot](http://i.imgur.com/j1BhpZQ.png)
 
-[CoffeeScript]: http://jashkenas.github.com/coffee-script/
+[CoffeeScript]: http://coffeescript.org/
 
-### Install from a Zipball
+## Table of Contents
 
-This is the quickest way to get things running.
+- Installation
+  - [Requirements](#requirements)
+  - [Install using Pathogen](#install-using-pathogen)
+  - [Install using Vundle](#install-using-vundle)
+  - [Install from a Zip File](#install-from-a-zip-file)
+- Coffee Commands
+  - [Compile to JavaScript](#compile-to-javascript)
+  - [Compile CoffeeScript Snippets](#coffeecompile-compile-coffeescript-snippets)
+  - [Live Preview Compiling](#coffeewatch-live-preview-compiling)
+  - [Run CoffeeScript Snippets](#coffeerun-run-coffeescript-snippets)
+  - [Lint your CoffeeScript](#coffeelint-lint-your-coffeescript)
+- Extras
+  - [Literate CoffeeScript](#literate-coffeescript)
+  - [CoffeeScript in HTML](#coffeescript-in-html)
+  - [CoffeeScript in Haml](#coffeescript-in-haml)
+- Configuration
+  - [Custom Autocmds](#custom-autocmds)
+  - [Configuration Variables](#configuration-variables)
+  - [Configure Syntax Highlighting](#configure-syntax-highlighting)
+  - [Tune Vim for CoffeeScript](#tune-vim-for-coffeescript)
 
-1. Download the latest zipball from [vim.org][zipball-vim] or
-   [github][zipball-github]. The latest version on github is under Download
-   Packages (don't use the Download buttons.)
+## Requirements
 
-2. Extract the archive into `~/.vim/`:
+ - vim 7.4 or later
+ - coffee 1.2.0 or later
 
-        unzip -od ~/.vim vim-coffee-script-HASH.zip
+## Install using Pathogen
 
-These steps are also used to update the plugin.
+This project uses rolling releases based on git commits, so pathogen is a
+natural fit for it. If you're already using pathogen, you can skip to step 4.
 
-[zipball-vim]: http://www.vim.org/scripts/script.php?script_id=3590
-[zipball-github]: https://github.com/kchmck/vim-coffee-script/downloads
+1. Install [pathogen.vim] into `~/.vim/autoload/` (see [pathogen's
+   readme][install-pathogen] for more information.)
 
-### Install with Pathogen
+[pathogen.vim]: http://www.vim.org/scripts/script.php?script_id=2332
+[install-pathogen]: https://github.com/tpope/vim-pathogen#installation
 
-Since this plugin has rolling versions based on git commits, using pathogen and
-git is the preferred way to install. The plugin ends up contained in its own
-directory and updates are just a `git pull` away.
+2. Enable pathogen in your vimrc. Here's a bare-minimum vimrc that enables
+   all the features of `vim-coffee-script`:
 
-1. Install tpope's [pathogen] into `~/.vim/autoload/` and add this line to your
-   `vimrc`:
+   ```vim
+   call pathogen#infect()
+   syntax enable
+   filetype plugin indent on
+   ```
 
-        call pathogen#infect()
+   If you already have a vimrc built up, just make sure it contains these calls,
+   in this order.
 
-    To get the all the features of this plugin, make sure you also have a
-    `filetype plugin indent on` line in there.
+3. Create the directory `~/.vim/bundle/`:
 
-[pathogen]: http://www.vim.org/scripts/script.php?script_id=2332
+        mkdir ~/.vim/bundle
 
-2. Create and change into `~/.vim/bundle/`:
+4. Clone the `vim-coffee-script` repo into `~/.vim/bundle/`:
 
-        $ mkdir ~/.vim/bundle
-        $ cd ~/.vim/bundle
+        git clone https://github.com/kchmck/vim-coffee-script.git ~/.vim/bundle/vim-coffee-script/
 
-3. Make a clone of the `vim-coffee-script` repository:
-
-        $ git clone https://github.com/kchmck/vim-coffee-script.git
-
-#### Updating
+Updating takes two steps:
 
 1. Change into `~/.vim/bundle/vim-coffee-script/`:
 
-        $ cd ~/.vim/bundle/vim-coffee-script
+        cd ~/.vim/bundle/vim-coffee-script
 
 2. Pull in the latest changes:
 
-        $ git pull
+        git pull
 
-### CoffeeMake: Compile the Current File
+## Install using Vundle
 
-The `CoffeeMake` command compiles the current file and parses any errors:
+1. [Install Vundle] into `~/.vim/bundle/`.
 
-  ![CoffeeMake](http://i.imgur.com/cr9xI.png)
+[Install Vundle]: https://github.com/gmarik/vundle#quick-start
 
-The full signature of the command is:
+2. Configure your vimrc for Vundle. Here's a bare-minimum vimrc that enables all
+   the features of `vim-coffee-script`:
 
-    :[silent] CoffeeMake[!] [COFFEE-OPTIONS]...
 
-By default, `CoffeeMake` shows all compiler output and jumps to the first line
-reported as an error by `coffee`:
+   ```vim
+   set nocompatible
+   filetype off
 
-    :CoffeeMake
+   set rtp+=~/.vim/bundle/vundle/
+   call vundle#rc()
 
-Compiler output can be hidden with `silent`:
+   Bundle 'kchmck/vim-coffee-script'
 
-    :silent CoffeeMake
+   syntax enable
+   filetype plugin indent on
+   ```
 
-Line-jumping can be turned off by adding a bang:
+   If you're adding Vundle to a built-up vimrc, just make sure all these calls
+   are in there and that they occur in this order.
 
-    :CoffeeMake!
+3. Open vim and run `:BundleInstall`.
 
-Options given to `CoffeeMake` are passed along to `coffee`:
+To update, open vim and run `:BundleInstall!` (notice the bang!)
 
-    :CoffeeMake --bare
+## Install from a Zip File
 
-`CoffeeMake` can be manually loaded for a file with:
+1. Download the latest zip file from [vim.org][zip].
+
+2. Extract the archive into `~/.vim/`:
+
+        unzip -od ~/.vim/ ARCHIVE.zip
+
+   This should create the files `~/.vim/autoload/coffee.vim`,
+   `~/.vim/compiler/coffee.vim`, etc.
+
+You can update the plugin using the same steps.
+
+[zip]: http://www.vim.org/scripts/script.php?script_id=3590
+
+## Compile to JavaScript
+
+A `coffee` wrapper for use with `:make` is enabled automatically for coffee
+files if no other compiler is loaded. To enable it manually, run
 
     :compiler coffee
 
-#### Recompile on write
+The `:make` command is then configured to use the `coffee` compiler and
+recognize its errors. I've included a quick reference here but be sure to check
+out [`:help :make`][make] for a full reference of the command.
 
-To recompile a file when it's written, add an `autocmd` like this to your
-`vimrc`:
+  ![make](http://i.imgur.com/scUXmxR.png)
 
-    au BufWritePost *.coffee silent CoffeeMake!
+  ![make Result](http://i.imgur.com/eGIjEdn.png)
 
-All of the customizations above can be used, too. This one compiles silently
-and with the `-b` option, but shows any errors:
+[make]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:make_makeprg
 
-    au BufWritePost *.coffee silent CoffeeMake! -b | cwindow | redraw!
+Consider the full signature of a `:make` call as
+
+    :[silent] make[!] [COFFEE-OPTIONS]...
+
+By default `:make` shows all compiler output and jumps to the first line
+reported as an error. Compiler output can be hidden with a leading `:silent`:
+
+    :silent make
+
+Line-jumping can be turned off by adding a bang:
+
+    :make!
+
+`COFFEE-OPTIONS` given to `:make` are passed along to `coffee` (see also
+[`coffee_make_options`](#coffee_make_options)):
+
+    :make --bare --output /some/dir
+
+See the [full table of options](http://coffeescript.org/#usage) for a
+list of all the options that `coffee` recognizes.
+
+*Configuration*: [`coffee_compiler`](#coffee_compiler),
+[`coffee_make_options`](#coffee_make_options)
+
+#### The quickfix window
+
+Compiler errors are added to the [quickfix] list by `:make`, but the quickfix
+window isn't automatically shown. The [`:cwindow`][cwindow] command will pop up
+the quickfix window if there are any errors:
+
+    :make
+    :cwindow
+
+This is usually the desired behavior, so you may want to add an autocmd to your
+vimrc to do this automatically:
+
+    autocmd QuickFixCmdPost * nested cwindow | redraw!
 
 The `redraw!` command is needed to fix a redrawing quirk in terminal vim, but
 can removed for gVim.
 
-#### Default compiler options
+[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
+[cwindow]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:cwindow
 
-The `CoffeeMake` command passes any options in the `coffee_make_options`
-variable along to the compiler. You can use this to set default options:
+#### Recompile on write
 
-    let coffee_make_options = '--bare'
+To recompile a file when it's written, add a `BufWritePost` autocmd to your
+vimrc:
 
-#### Path to compiler
+    autocmd BufWritePost *.coffee silent make!
 
-To change the compiler used by `CoffeeMake` and `CoffeeCompile`, set
-`coffee_compiler` to the full path of an executable or the filename of one
-in your `$PATH`:
+#### Cake and Cakefiles
 
-    let coffee_compiler = '/usr/bin/coffee'
+A `cake` compiler is also available with the call
 
-This option is set to `coffee` by default.
+    :compiler cake
 
-### CoffeeCompile: Compile Snippets of CoffeeScript
+You can then use `:make` as above to run your Cakefile and capture any `coffee`
+errors:
 
-The `CoffeeCompile` command shows how the current file or a snippet of
-CoffeeScript is compiled to JavaScript. The full signature of the command is:
+    :silent make build
 
-    :[RANGE] CoffeeCompile [watch|unwatch] [vert[ical]] [WINDOW-SIZE]
+It runs within the current directory, so make sure you're in the directory of
+your Cakefile before calling it.
 
-Calling `CoffeeCompile` without a range compiles the whole file:
+*Configuration*: [`coffee_cake`](#coffee_cake),
+[`coffee_cake_options`](#coffee_cake_options)
 
-  ![CoffeeCompile](http://i.imgur.com/KJfSZ.png)
+## CoffeeCompile: Compile CoffeeScript Snippets
 
-Calling `CoffeeCompile` with a range, like in visual mode, compiles the selected
-snippet of CoffeeScript:
+CoffeeCompile shows how the current file or a snippet of CoffeeScript is
+compiled to JavaScript.
 
-  ![CoffeeCompile Snippet](http://i.imgur.com/mbaUA.png)
+    :[RANGE] CoffeeCompile [vert[ical]] [WINDOW-SIZE]
 
-  ![Compiled Snippet](http://i.imgur.com/Ocjuc.png)
+Calling `:CoffeeCompile` without a range compiles the whole file:
 
-This scratch buffer can be quickly closed by hitting the `q` key.
+  ![CoffeeCompile](http://i.imgur.com/0zFG0l0.png)
 
-Using `vert` splits the CoffeeCompile buffer vertically instead of horizontally:
+  ![CoffeeCompile Result](http://i.imgur.com/bpiAxaa.png)
+
+Calling it with a range, like in visual mode, compiles only the selected snippet
+of CoffeeScript:
+
+  ![CoffeeCompile Snippet](http://i.imgur.com/x3OT3Ay.png)
+
+  ![Compiled Snippet](http://i.imgur.com/J02j4T8.png)
+
+Each file gets its own CoffeeCompile buffer, and the same buffer is used for all
+future calls of `:CoffeeCompile` on that file. It can be quickly closed by
+hitting `q` in normal mode.
+
+Using `vert` opens the CoffeeCompile buffer vertically instead of horizontally
+(see also [`coffee_compile_vert`](#coffee_compile_vert)):
 
     :CoffeeCompile vert
 
-Set the `coffee_compile_vert` variable to split the buffer vertically by
-default:
-
-    let coffee_compile_vert = 1
-
-The initial size of the CoffeeCompile buffer can be given as a number:
+By default the CoffeeCompile buffer splits the source buffer in half, but this
+can be overridden by passing in a `WINDOW-SIZE`:
 
     :CoffeeCompile 4
 
-#### Watch (live preview) mode
+*Configuration*: [`coffee_compiler`](#coffee_compiler`),
+[`coffee_compile_vert`](#coffee_compile_vert)
 
-Watch mode is like the Try CoffeeScript preview box on the CoffeeScript
-homepage:
+#### Quick syntax checking
 
-  ![Watch Mode](http://i.imgur.com/M6l1j.png)
+If compiling a snippet results in a compiler error, CoffeeCompile adds that
+error to the [quickfix] list.
 
-  ![Watch Mode](http://i.imgur.com/qtNmU.png)
+[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
 
-Writing some code and then exiting insert mode automatically updates the
-compiled JavaScript buffer.
+  ![Syntax Checking](http://i.imgur.com/RC8accF.png)
 
-Use `watch` to start watching a buffer (`vert` is also recommended):
+  ![Syntax Checking Result](http://i.imgur.com/gi1ON75.png)
 
-    :CoffeeCompile watch vert
+You can use this to quickly check the syntax of a snippet.
 
-After making some changes in insert mode, hit escape and the CoffeeScript will
-be recompiled. Changes made outside of insert mode don't trigger this recompile,
-but calling `CoffeeCompile` will compile these changes without any bad effects.
+## CoffeeWatch: Live Preview Compiling
 
-To get synchronized scrolling of a CoffeeScript and CoffeeCompile buffer, set
-`scrollbind` on each:
+CoffeeWatch emulates using the Try CoffeeScript preview box on the [CoffeeScript
+homepage][CoffeeScript].
+
+  ![CoffeeWatch](http://i.imgur.com/TRHdIMG.png)
+
+  ![CoffeeWatch Result](http://i.imgur.com/rJbOeeS.png)
+
+CoffeeWatch takes the same options as CoffeeCompile:
+
+    :CoffeeWatch [vert[ical]] [WINDOW-SIZE]
+
+After a source buffer is watched, leaving insert mode or saving the file fires
+off a recompile of the CoffeeScript:
+
+  ![Insert Mode](http://i.imgur.com/SBVcf4k.png)
+
+  ![Recompile](http://i.imgur.com/pbPMog7.png)
+
+You can force recompilation by calling `:CoffeeWatch`.
+
+To get synchronized scrolling of the source buffer and CoffeeWatch buffer, set
+[`'scrollbind'`](http://vimdoc.sourceforge.net/htmldoc/options.html#'scrollbind')
+on each:
 
     :setl scrollbind
 
-Use `unwatch` to stop watching a buffer:
+*Configuration*: [`coffee_compiler`](#coffee_compiler),
+[`coffee_watch_vert`](#coffee_watch_vert)
 
-    :CoffeeCompile unwatch
+## CoffeeRun: Run CoffeeScript Snippets
 
-### CoffeeLint: Lint your CoffeeScript
+CoffeeRun compiles the current file or selected snippet and runs the resulting
+JavaScript.
 
-The `CoffeeLint` command runs [coffeelint](http://www.coffeelint.org/) (version
-0.4.0 or later required) on the current file and parses any errors:
+  ![CoffeeRun](http://i.imgur.com/YSkHUuQ.png)
 
-    :[RANGE] CoffeeLint[!] [COFFEELINT-OPTIONS]
+  ![CoffeeRun Output](http://i.imgur.com/wZQbggN.png)
 
-Use it like `CoffeeMake`.
+The command has two forms:
 
-  ![CoffeeLint](http://i.imgur.com/dlxF7.png)
+    :CoffeeRun [PROGRAM-OPTIONS]...
 
-#### Default coffeelint options
+This form applies when no `RANGE` is given or when the given range is `1,$`
+(first line to last line). It allows passing `PROGRAM-OPTIONS` to your compiled
+program. The filename is passed directly to `coffee` so you must save the file
+for your changes to take effect.
 
-Options in `coffee_lint_options` are passed along to `coffeelint`:
+    :RANGE CoffeeRun [COFFEE-OPTIONS]...
+
+This form applies with all other ranges. It compiles and runs the lines within
+the given `RANGE` and any extra `COFFEE-OPTIONS` are passed to `coffee`.
+
+*Configuration*: [`coffee_compiler`](#coffee_compiler),
+[`coffee_run_vert`](#coffee_run_vert)
+
+## CoffeeLint: Lint your CoffeeScript
+
+CoffeeLint runs [coffeelint](http://www.coffeelint.org/) (version 0.5.7 or later
+required) on the current file and adds any issues to the [quickfix] list.
+
+  ![CoffeeLint](http://i.imgur.com/UN8Nr5N.png)
+
+  ![CoffeeLint Result](http://i.imgur.com/9hSIj3W.png)
+
+    :[RANGE] CoffeeLint[!] [COFFEELINT-OPTIONS]... [ | cwindow]
+
+If a `RANGE` is given, only those lines are piped to `coffeelint`. Options given
+in `COFFEELINT-OPTIONS` are passed to `coffeelint` (see also
+[`coffee_lint_options`](#coffee_lint_options)):
+
+    :CoffeeLint -f lint.json
+
+It behaves very similar to `:make`, described [above](#compile-to-javascript).
+
+    :CoffeeLint! | cwindow
+
+*Configuration*: [`coffee_linter`](#coffee_linter),
+[`coffee_lint_options`](#coffee_lint_options)
+
+## Literate CoffeeScript
+
+Literate CoffeeScript syntax and indent support is provided by
+[vim-literate-coffeescript]. The `Coffee` commands detect when they're running
+on a litcoffee file and pass the `--literate` flag to their respective tools,
+but at this time the commands are not automatically loaded when a litcoffee file
+is opened.
+
+[vim-literate-coffeescript]: https://github.com/mintplant/vim-literate-coffeescript
+
+To load them, run
+
+    runtime ftplugin/coffee.vim
+
+while inside a litcoffee buffer. To do this automatically, add
+
+    autocmd FileType litcoffee runtime ftplugin/coffee.vim
+
+to your vimrc.
+
+## CoffeeScript in HTML
+
+CoffeeScript is highlighted and indented within
+
+```html
+<script type="text/coffeescript">
+</script>
+```
+
+blocks in html files.
+
+## CoffeeScript in Haml
+
+CoffeeScript is highlighted within the `:coffeescript` filter in haml files:
+
+```haml
+:coffeescript
+  console.log "hullo"
+```
+
+At this time, coffee indenting doesn't work in these blocks.
+
+## Custom Autocmds
+
+You can [define commands][autocmd-explain] to be ran automatically on these
+custom events.
+
+In all cases, the name of the command running the event (`CoffeeCompile`,
+`CoffeeWatch`, or `CoffeeRun`) is matched by the [`{pat}`][autocmd] argument.
+You can match all commands with a `*` or only specific commands by separating
+them with a comma: `CoffeeCompile,CoffeeWatch`.
+
+[autocmd-explain]: http://vimdoc.sourceforge.net/htmldoc/usr_40.html#40.3
+[autocmd]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#:autocmd
+
+#### CoffeeBufNew
+
+CoffeeBufNew is ran when a new scratch buffer is created. It's called from the
+new buffer, so it can be used to do additional set up.
+
+```vim
+augroup CoffeeBufNew
+  autocmd User * set wrap
+augroup END
+```
+
+*Used By*: CoffeeCompile, CoffeeWatch, CoffeeRun
+
+#### CoffeeBufUpdate
+
+CoffeeBufUpdate is ran when a scratch buffer is updated with output from
+`coffee`. It's called from the scratch buffer, so it can be used to alter the
+compiled output.
+
+```vim
+" Switch back to the source buffer after updating.
+augroup CoffeeBufUpdate
+  autocmd User CoffeeCompile,CoffeeRun exec bufwinnr(b:coffee_src_buf) 'wincmd w'
+augroup END
+```
+
+For example, to strip off the "Generated by" comment on the first line, put this
+in your vimrc:
+
+```vim
+function! s:RemoveGeneratedBy()
+  " If there was an error compiling, there's no comment to remove.
+  if v:shell_error
+    return
+  endif
+
+  " Save cursor position.
+  let pos = getpos('.')
+
+  " Remove first line.
+  set modifiable
+  1 delete _
+  set nomodifiable
+
+  " Restore cursor position.
+  call setpos('.', pos)
+endfunction
+
+augroup CoffeeBufUpdate
+  autocmd User CoffeeCompile,CoffeeWatch call s:RemoveGeneratedBy()
+augroup END
+```
+
+*Used By*: CoffeeCompile, CoffeeWatch, CoffeeRun
+
+## Configuration Variables
+
+This is the full list of configuration variables available, with example
+settings and default values. Use these in your vimrc to control the default
+behavior.
+
+#### coffee\_indent\_keep\_current
+
+By default, the indent function matches the indent of the previous line if it
+doesn't find a reason to indent or outdent. To change this behavior so it
+instead keeps the [current indent of the cursor][98], use
+
+    let coffee_indent_keep_current = 1
+
+[98]: https://github.com/kchmck/vim-coffee-script/pull/98
+
+*Default*: `unlet coffee_indent_keep_current`
+
+Note that if you change this after a coffee file has been loaded, you'll have to
+reload the indent script for the change to take effect:
+
+    unlet b:did_indent | runtime indent/coffee.vim
+
+#### coffee\_compiler
+
+Path to the `coffee` executable used by the `Coffee` commands:
+
+    let coffee_compiler = '/usr/bin/coffee'
+
+*Default*: `'coffee'` (search `$PATH` for executable)
+
+#### coffee\_make\_options
+
+Options to pass to `coffee` with `:make`:
+
+    let coffee_make_options = '--bare'
+
+*Default*: `''` (nothing)
+
+Note that `coffee_make_options` is embedded into `'makeprg'`, so `:compiler
+coffee` must be ran after changing `coffee_make_options` for the changes to take
+effect.
+
+#### coffee\_cake
+
+Path to the `cake` executable:
+
+    let coffee_cake = '/opt/bin/cake'
+
+*Default*: `'cake'` (search `$PATH` for executable)
+
+#### coffee\_cake\_options
+
+Options to pass to `cake` with `:make`:
+
+    let coffee_cake_options = 'build'
+
+*Default*: `''` (nothing)
+
+#### coffee\_linter
+
+Path to the `coffeelint` executable:
+
+    let coffee_linter = '/opt/bin/coffeelint'
+
+*Default*: `'coffeelint'` (search `$PATH` for executable)
+
+#### coffee\_lint\_options
+
+Options to pass to `coffeelint`:
 
     let coffee_lint_options = '-f lint.json'
 
-#### Path to `coffeelint`
+*Default*: `''` (nothing)
 
-Use the `coffee_linter` option to set a different path to the `coffeelint`
-executable:
+#### coffee\_compile\_vert
 
-    let coffee_linter = '/usr/bin/coffeelint'
+Open the CoffeeCompile buffer with a vertical split instead of a horizontal
+one:
 
-This option is set to `coffeelint` by default.
+    let coffee_compile_vert = 1
 
-### CoffeeRun: Run some CoffeeScript
+*Default*: `unlet coffee_compile_vert`
 
-The `CoffeeRun` command compiles the current file or selected snippet and runs
-the resulting JavaScript. Output is shown at the bottom of the screen:
+#### coffee\_watch\_vert
 
-  ![CoffeeRun](http://i.imgur.com/7hwSy.png)
+Open the CoffeeWatch buffer with a vertical split instead of a horizontal
+one:
 
-  ![CoffeeRun Output](http://i.imgur.com/WNWvC.png)
+    let coffee_watch_vert = 1
 
-### Configure Syntax Highlighting
+*Default*: `unlet coffee_watch_vert`
 
-Add these lines to your `vimrc` to disable the relevant syntax group.
+#### coffee\_run\_vert
+
+Open the CoffeeRun buffer with a vertical split instead of a horizontal
+one:
+
+    let coffee_run_vert = 1
+
+*Default*: `unlet coffee_run_vert`
+
+## Configure Syntax Highlighting
+
+Add these lines to your vimrc to disable the relevant syntax group.
 
 #### Disable trailing whitespace error
 
@@ -231,7 +560,7 @@ with:
 
 #### Disable trailing semicolon error
 
-Trailing semicolons are also considered an error (for help transitioning from
+Trailing semicolons are considered an error (for help transitioning from
 JavaScript.) This can be disabled with:
 
     hi link coffeeSemicolonError NONE
@@ -243,7 +572,7 @@ they're not allowed in CoffeeScript. This can be disabled with:
 
     hi link coffeeReservedError NONE
 
-### Tune Vim for CoffeeScript
+## Tune Vim for CoffeeScript
 
 Changing these core settings can make vim more CoffeeScript friendly.
 
@@ -251,20 +580,20 @@ Changing these core settings can make vim more CoffeeScript friendly.
 
 Folding by indentation works well for CoffeeScript functions and classes:
 
-  ![Folding](http://i.imgur.com/Y0rDC.png)
+  ![Folding](http://i.imgur.com/gDgUBdO.png)
 
-To fold by indentation in CoffeeScript files, add this line to your `vimrc`:
+To fold by indentation in CoffeeScript files, add this line to your vimrc:
 
-    au BufNewFile,BufReadPost *.coffee setl foldmethod=indent nofoldenable
+    autocmd BufNewFile,BufReadPost *.coffee setl foldmethod=indent nofoldenable
 
 With this, folding is disabled by default but can be quickly toggled per-file
 by hitting `zi`. To enable folding by default, remove `nofoldenable`:
 
-    au BufNewFile,BufReadPost *.coffee setl foldmethod=indent
+    autocmd BufNewFile,BufReadPost *.coffee setl foldmethod=indent
 
 #### Two-space indentation
 
 To get standard two-space indentation in CoffeeScript files, add this line to
-your `vimrc`:
+your vimrc:
 
-    au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
+    autocmd BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
diff --git a/sources_non_forked/vim-coffee-script/after/indent/html.vim b/sources_non_forked/vim-coffee-script/after/indent/html.vim
new file mode 100644
index 00000000..e6377087
--- /dev/null
+++ b/sources_non_forked/vim-coffee-script/after/indent/html.vim
@@ -0,0 +1,33 @@
+" Language:    CoffeeScript
+" Maintainer:  Mick Koch <kchmck@gmail.com>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
+
+" Load the coffee and html indent functions.
+silent! unlet b:did_indent
+runtime indent/coffee.vim
+let s:coffeeIndentExpr = &l:indentexpr
+
+" Load html last so it can overwrite coffee settings.
+silent! unlet b:did_indent
+runtime indent/html.vim
+let s:htmlIndentExpr = &l:indentexpr
+
+" Inject our wrapper indent function.
+setlocal indentexpr=GetCoffeeHtmlIndent(v:lnum)
+
+function! GetCoffeeHtmlIndent(curlinenum)
+  " See if we're inside a coffeescript block.
+  let scriptlnum = searchpair('<script [^>]*type="text/coffeescript"[^>]*>', '',
+  \                           '</script>', 'bWn')
+  let prevlnum = prevnonblank(a:curlinenum)
+
+  " If we're in the script block and the previous line isn't the script tag
+  " itself, use coffee indenting.
+  if scriptlnum && scriptlnum != prevlnum
+    exec 'return ' s:coffeeIndentExpr
+  endif
+
+  " Otherwise use html indenting.
+  exec 'return ' s:htmlIndentExpr
+endfunction
diff --git a/sources_non_forked/vim-coffee-script/after/syntax/haml.vim b/sources_non_forked/vim-coffee-script/after/syntax/haml.vim
index cddd5612..4c517ebb 100644
--- a/sources_non_forked/vim-coffee-script/after/syntax/haml.vim
+++ b/sources_non_forked/vim-coffee-script/after/syntax/haml.vim
@@ -6,4 +6,8 @@
 " Inherit coffee from html so coffeeComment isn't redefined and given higher
 " priority than hamlInterpolation.
 syn cluster hamlCoffeescript contains=@htmlCoffeeScript
-syn region  hamlCoffeescriptFilter matchgroup=hamlFilter start="^\z(\s*\):coffee\z(script\)*\s*$" end="^\%(\z1 \| *$\)\@!" contains=@hamlCoffeeScript,hamlInterpolation keepend
+syn region  hamlCoffeescriptFilter matchgroup=hamlFilter
+\                                  start="^\z(\s*\):coffee\z(script\)\?\s*$"
+\                                  end="^\%(\z1 \| *$\)\@!"
+\                                  contains=@hamlCoffeeScript,hamlInterpolation
+\                                  keepend
diff --git a/sources_non_forked/vim-coffee-script/after/syntax/html.vim b/sources_non_forked/vim-coffee-script/after/syntax/html.vim
index 0affe373..9e2eb3a1 100644
--- a/sources_non_forked/vim-coffee-script/after/syntax/html.vim
+++ b/sources_non_forked/vim-coffee-script/after/syntax/html.vim
@@ -5,7 +5,7 @@
 
 " Syntax highlighting for text/coffeescript script tags
 syn include @htmlCoffeeScript syntax/coffee.vim
-syn region coffeeScript start=+<script [^>]*type *=[^>]*text/coffeescript[^>]*>+
-\                       end=+</script>+me=s-1 keepend
+syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
+\                       end=#</script>#me=s-1 keepend
 \                       contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
 \                       containedin=htmlHead
diff --git a/sources_non_forked/vim-coffee-script/autoload/coffee.vim b/sources_non_forked/vim-coffee-script/autoload/coffee.vim
new file mode 100644
index 00000000..04d5efba
--- /dev/null
+++ b/sources_non_forked/vim-coffee-script/autoload/coffee.vim
@@ -0,0 +1,54 @@
+" Language:    CoffeeScript
+" Maintainer:  Mick Koch <kchmck@gmail.com>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
+
+" Set up some common global/buffer variables.
+function! coffee#CoffeeSetUpVariables()
+  " Path to coffee executable
+  if !exists('g:coffee_compiler')
+    let g:coffee_compiler = 'coffee'
+  endif
+
+  " Options passed to coffee with make
+  if !exists('g:coffee_make_options')
+    let g:coffee_make_options = ''
+  endif
+
+  " Path to cake executable
+  if !exists('g:coffee_cake')
+    let g:coffee_cake = 'cake'
+  endif
+
+  " Extra options passed to cake
+  if !exists('g:coffee_cake_options')
+    let g:coffee_cake_options = ''
+  endif
+
+  " Path to coffeelint executable
+  if !exists('g:coffee_linter')
+    let g:coffee_linter = 'coffeelint'
+  endif
+
+  " Options passed to CoffeeLint
+  if !exists('g:coffee_lint_options')
+    let g:coffee_lint_options = ''
+  endif
+
+  " Pass the litcoffee flag to tools in this buffer if a litcoffee file is open.
+  " Let the variable be overwritten so it can be updated if a different filetype
+  " is set.
+  if &filetype == 'litcoffee'
+    let b:coffee_litcoffee = '--literate'
+  else
+    let b:coffee_litcoffee = ''
+  endif
+endfunction
+
+function! coffee#CoffeeSetUpErrorFormat()
+  CompilerSet errorformat=Error:\ In\ %f\\,\ %m\ on\ line\ %l,
+                         \Error:\ In\ %f\\,\ Parse\ error\ on\ line\ %l:\ %m,
+                         \SyntaxError:\ In\ %f\\,\ %m,
+                         \%f:%l:%c:\ error:\ %m,
+                         \%-G%.%#
+endfunction
diff --git a/sources_non_forked/vim-coffee-script/compiler/cake.vim b/sources_non_forked/vim-coffee-script/compiler/cake.vim
new file mode 100644
index 00000000..0a3c7037
--- /dev/null
+++ b/sources_non_forked/vim-coffee-script/compiler/cake.vim
@@ -0,0 +1,15 @@
+" Language:    CoffeeScript
+" Maintainer:  Mick Koch <kchmck@gmail.com>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
+
+if exists('current_compiler')
+  finish
+endif
+
+let current_compiler = 'cake'
+call coffee#CoffeeSetUpVariables()
+
+exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
+\                                    g:coffee_cake_options . ' $*', ' ')
+call coffee#CoffeeSetUpErrorFormat()
diff --git a/sources_non_forked/vim-coffee-script/compiler/coffee.vim b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
index 8def0bfc..a70fa64c 100644
--- a/sources_non_forked/vim-coffee-script/compiler/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
@@ -13,27 +13,22 @@
 
 if exists('current_compiler')
   finish
-else
-  let current_compiler = 'coffee'
 endif
 
+let current_compiler = 'coffee'
+call coffee#CoffeeSetUpVariables()
+
 " Pattern to check if coffee is the compiler
 let s:pat = '^' . current_compiler
 
-" Path to CoffeeScript compiler
-if !exists('coffee_compiler')
-  let coffee_compiler = 'coffee'
-endif
-
-" Extra options passed to CoffeeMake
-if !exists('coffee_make_options')
-  let coffee_make_options = ''
-endif
-
 " Get a `makeprg` for the current filename.
 function! s:GetMakePrg()
-  return g:coffee_compiler . ' -c ' . g:coffee_make_options . ' $* '
-  \                        . fnameescape(expand('%'))
+  return g:coffee_compiler .
+  \      ' -c' .
+  \      ' ' . b:coffee_litcoffee .
+  \      ' ' . g:coffee_make_options .
+  \      ' $*' .
+  \      ' ' . fnameescape(expand('%'))
 endfunction
 
 " Set `makeprg` and return 1 if coffee is still the compiler, else return 0.
@@ -50,16 +45,21 @@ function! s:SetMakePrg()
 endfunction
 
 " Set a dummy compiler so we can check whether to set locally or globally.
-CompilerSet makeprg=coffee
+exec 'CompilerSet makeprg=' . current_compiler
+" Then actually set the compiler.
 call s:SetMakePrg()
+call coffee#CoffeeSetUpErrorFormat()
 
-CompilerSet errorformat=Error:\ In\ %f\\,\ %m\ on\ line\ %l,
-                       \Error:\ In\ %f\\,\ Parse\ error\ on\ line\ %l:\ %m,
-                       \SyntaxError:\ In\ %f\\,\ %m,
-                       \%-G%.%#
+function! s:CoffeeMakeDeprecated(bang, args)
+  echoerr 'CoffeeMake is deprecated! Please use :make instead, its behavior ' .
+  \       'is identical.'
+  sleep 5
+  exec 'make' . a:bang a:args
+endfunction
 
 " Compile the current file.
-command! -bang -bar -nargs=* CoffeeMake make<bang> <args>
+command! -bang -bar -nargs=* CoffeeMake
+\        call s:CoffeeMakeDeprecated(<q-bang>, <q-args>)
 
 " Set `makeprg` on rename since we embed the filename in the setting.
 augroup CoffeeUpdateMakePrg
diff --git a/sources_non_forked/vim-coffee-script/doc/coffee-script.txt b/sources_non_forked/vim-coffee-script/doc/coffee-script.txt
index 88a137db..1b43cf3a 100644
--- a/sources_non_forked/vim-coffee-script/doc/coffee-script.txt
+++ b/sources_non_forked/vim-coffee-script/doc/coffee-script.txt
@@ -1,143 +1,4 @@
-*coffee-script.txt*                                         For Vim version 7.3
-
-=============================================================================
-Author:  Mick Koch <kchmck@gmail.com>		*coffee-script-author*
-License: WTFPL (see |coffee-script-license|)
-=============================================================================
-
-CONTENTS					*coffee-script-contents*
-
-|coffee-script-introduction|		Introduction and Feature Summary
-|coffee-script-commands|			Commands
-|coffee-script-settings|			Settings
-|compiler-coffee-script|			Compiler
-
-{Vi does not have any of this}
-
-=============================================================================
-
-INTRODUCTION					*coffee-script*
-						*coffee-script-introduction*
-
-This plugin adds support for CoffeeScript syntax, indenting, and compiling.
-Also included is an eco syntax and support for CoffeeScript in Haml and HTML.
-
-COMMANDS					*coffee-script-commands*
-
-						*:CoffeeMake*
-:CoffeeMake[!] {opts}	Wrapper around |:make| that also passes options in
-                        |g:coffee_make_options| to the compiler. Use |:silent|
-                        to hide compiler output. See |:make| for more
-                        information about [!] and other helpful commands.
-
-						*:CoffeeCompile*
-:[range]CoffeeCompile [vertical] [{win-size}]
-			Shows how the current file or [range] is compiled
-			to JavaScript. [vertical] (or vert) splits the
-			compile buffer vertically instead of horizontally, and
-			{win-size} sets the initial size of the buffer. It can
-			be closed quickly with the "q" key.
-
-:CoffeeCompile {watch} [vertical] [{win-size}]
-			The watch mode of :CoffeeCompile emulates the "Try
-			CoffeeScript" live preview on the CoffeeScript web
-			site. After making changes to the source file,
-			exiting insert mode will cause the preview buffer to
-			update automatically. {watch} should be given as
-                        "watch" or "unwatch," where the latter will stop the
-                        automatic updating. [vertical] is recommended, and
-                        'scrollbind' is useful.
-
-						*:CoffeeLint*
-:[range]CoffeeLint[!] {opts}
-                        Run {coffeelint} on the current file and add any
-                        errors to the quickfix list. The first error is jumped
-                        to if [!] isn't given. Options in
-                        |g:coffee_lint_options| and {opts} are passed along to
-                        {coffeelint}. Although the whole file is linted, if a
-                        [range] is given, only errors within those lines will
-                        be considered.
-
-						*:CoffeeRun*
-:[range]CoffeeRun	Compiles the file or [range] and runs the resulting
-			JavaScript, displaying the output.
-
-SETTINGS					*coffee-script-settings*
-
-You can configure plugin behavior using global variables and syntax commands
-in your |vimrc|.
-
-Global Settings~
-						*g:coffee_compiler*
-Set the path to the compiler used by |CoffeeMake| and |CoffeeCompile| (it's
-{coffee} by default.)
->
-	let coffee_compiler = '/usr/bin/coffee'
-<
-						*g:coffee_make_options*
-Set default options |CoffeeMake| should pass to the compiler.
->
-	let coffee_make_options = '--bare'
-<
-						*g:coffee_compile_vert*
-Split the CoffeeCompile buffer vertically by default.
->
-	let coffee_compile_vert = 1
-<
-						*g:coffee_linter*
-Set the path to the {coffeelint} executable (it's {coffeelint} by default.)
->
-	let coffee_linter = '/usr/bin/coffeelint'
-<
-						*g:coffee_lint_options*
-Set default options |CoffeeLint| should pass to {coffeelint}.
->
-	let coffee_lint_options = '-f lint.json'
-<
-
-Syntax Highlighting~
-						*ft-coffee-script-syntax*
-Trailing whitespace is highlighted as an error by default. This can be
-disabled with:
->
-	hi link coffeeSpaceError NONE
-
-Trailing semicolons are also considered an error (for help transitioning from
-JavaScript.) This can be disabled with:
->
-	hi link coffeeSemicolonError NONE
-
-Reserved words like {function} and {var} are highlighted where they're not
-allowed in CoffeeScript. This can be disabled with:
->
-        hi link coffeeReservedError NONE
-
-COMPILER					*compiler-coffee-script*
-
-A CoffeeScript compiler is provided as a wrapper around {coffee} and can be
-loaded with;
->
-    compiler coffee
-
-This is done automatically when a CoffeeScript file is opened if no other
-compiler is loaded.
-
-=============================================================================
-
-LICENSE							*coffee-script-license*
-
-		DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-			Version 2, December 2004
-
-     Copyright (C) 2010 to 2012 Mick Koch <kchmck@gmail.com>
-
-     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.
+Please see the project readme for up-to-date docs:
+https://github.com/kchmck/vim-coffee-script
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/sources_non_forked/vim-coffee-script/ftdetect/eco.vim b/sources_non_forked/vim-coffee-script/ftdetect/eco.vim
deleted file mode 100644
index b420649d..00000000
--- a/sources_non_forked/vim-coffee-script/ftdetect/eco.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufNewFile,BufRead *.eco set filetype=eco
diff --git a/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim b/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
index 44ed1b3d..c44fe979 100644
--- a/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
@@ -3,261 +3,402 @@
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
-if exists("b:did_ftplugin")
+if exists('b:did_ftplugin')
   finish
 endif
 
 let b:did_ftplugin = 1
+call coffee#CoffeeSetUpVariables()
 
 setlocal formatoptions-=t formatoptions+=croql
-setlocal comments=:#
-setlocal commentstring=#\ %s
+setlocal comments=:# commentstring=#\ %s
 setlocal omnifunc=javascriptcomplete#CompleteJS
 
-" Enable CoffeeMake if it won't overwrite any settings.
+" Create custom augroups.
+augroup CoffeeBufUpdate | augroup END
+augroup CoffeeBufNew | augroup END
+
+" Enable coffee compiler if a compiler isn't set already.
 if !len(&l:makeprg)
   compiler coffee
 endif
 
-" Check here too in case the compiler above isn't loaded.
-if !exists('coffee_compiler')
-  let coffee_compiler = 'coffee'
-endif
-
-" Path to coffeelint executable
-if !exists('coffee_linter')
-  let coffee_linter = 'coffeelint'
-endif
-
-" Options passed to CoffeeLint
-if !exists('coffee_lint_options')
-  let coffee_lint_options = ''
-endif
-
-" Reset the CoffeeCompile variables for the current buffer.
-function! s:CoffeeCompileResetVars()
-  " Compiled output buffer
-  let b:coffee_compile_buf = -1
-  let b:coffee_compile_pos = []
-
-  " If CoffeeCompile is watching a buffer
-  let b:coffee_compile_watch = 0
+" Switch to the window for buf.
+function! s:SwitchWindow(buf)
+  exec bufwinnr(a:buf) 'wincmd w'
 endfunction
 
-" Clean things up in the source buffer.
+" Create a new scratch buffer and return the bufnr of it. After the function
+" returns, vim remains in the scratch buffer so more set up can be done.
+function! s:ScratchBufBuild(src, vert, size)
+  if a:size <= 0
+    if a:vert
+      let size = winwidth(bufwinnr(a:src)) / 2
+    else
+      let size = winheight(bufwinnr(a:src)) / 2
+    endif
+  endif
+
+  if a:vert
+    vertical belowright new
+    exec 'vertical resize' size
+  else
+    belowright new
+    exec 'resize' size
+  endif
+
+  setlocal bufhidden=wipe buftype=nofile nobuflisted noswapfile nomodifiable
+  nnoremap <buffer> <silent> q :hide<CR>
+
+  return bufnr('%')
+endfunction
+
+" Replace buffer contents with text and delete the last empty line.
+function! s:ScratchBufUpdate(buf, text)
+  " Move to the scratch buffer.
+  call s:SwitchWindow(a:buf)
+
+  " Double check we're in the scratch buffer before overwriting.
+  if bufnr('%') != a:buf
+    throw 'unable to change to scratch buffer'
+  endif
+
+  setlocal modifiable
+    silent exec '% delete _'
+    silent put! =a:text
+    silent exec '$ delete _'
+  setlocal nomodifiable
+endfunction
+
+" Parse the output of coffee into a qflist entry for src buffer.
+function! s:ParseCoffeeError(output, src, startline)
+  " Coffee error is always on first line?
+  let match = matchlist(a:output,
+  \                     '^\(\f\+\|\[stdin\]\):\(\d\):\(\d\): error: \(.\{-}\)' . "\n")
+
+  if !len(match)
+    return
+  endif
+
+  " Consider the line number from coffee as relative and add it to the beginning
+  " line number of the range the command was called on, then subtract one for
+  " zero-based relativity.
+  call setqflist([{'bufnr': a:src, 'lnum': a:startline + str2nr(match[2]) - 1,
+  \                'type': 'E', 'col': str2nr(match[3]), 'text': match[4]}], 'r')
+endfunction
+
+" Reset source buffer variables.
+function! s:CoffeeCompileResetVars()
+  " Variables defined in source buffer:
+  "   b:coffee_compile_buf: bufnr of output buffer
+  " Variables defined in output buffer:
+  "   b:coffee_src_buf: bufnr of source buffer
+  "   b:coffee_compile_pos: previous cursor position in output buffer
+
+  let b:coffee_compile_buf = -1
+endfunction
+
+function! s:CoffeeWatchResetVars()
+  " Variables defined in source buffer:
+  "   b:coffee_watch_buf: bufnr of output buffer
+  " Variables defined in output buffer:
+  "   b:coffee_src_buf: bufnr of source buffer
+  "   b:coffee_watch_pos: previous cursor position in output buffer
+
+  let b:coffee_watch_buf = -1
+endfunction
+
+function! s:CoffeeRunResetVars()
+  " Variables defined in CoffeeRun source buffer:
+  "   b:coffee_run_buf: bufnr of output buffer
+  " Variables defined in CoffeeRun output buffer:
+  "   b:coffee_src_buf: bufnr of source buffer
+  "   b:coffee_run_pos: previous cursor position in output buffer
+
+  let b:coffee_run_buf = -1
+endfunction
+
+" Clean things up in the source buffers.
 function! s:CoffeeCompileClose()
-  exec bufwinnr(b:coffee_compile_src_buf) 'wincmd w'
-  silent! autocmd! CoffeeCompileAuWatch * <buffer>
+  " Switch to the source buffer if not already in it.
+  silent! call s:SwitchWindow(b:coffee_src_buf)
   call s:CoffeeCompileResetVars()
 endfunction
 
-" Update the CoffeeCompile buffer given some input lines.
-function! s:CoffeeCompileUpdate(startline, endline)
-  let input = join(getline(a:startline, a:endline), "\n")
+function! s:CoffeeWatchClose()
+  silent! call s:SwitchWindow(b:coffee_src_buf)
+  silent! autocmd! CoffeeAuWatch * <buffer>
+  call s:CoffeeWatchResetVars()
+endfunction
 
-  " Move to the CoffeeCompile buffer.
-  exec bufwinnr(b:coffee_compile_buf) 'wincmd w'
+function! s:CoffeeRunClose()
+  silent! call s:SwitchWindow(b:coffee_src_buf)
+  call s:CoffeeRunResetVars()
+endfunction
+
+" Compile the lines between startline and endline and put the result into buf.
+function! s:CoffeeCompileToBuf(buf, startline, endline)
+  let src = bufnr('%')
+  let input = join(getline(a:startline, a:endline), "\n")
 
   " Coffee doesn't like empty input.
   if !len(input)
+    " Function should still return within output buffer.
+    call s:SwitchWindow(a:buf)
     return
   endif
 
-  " Compile input.
-  let output = system(g:coffee_compiler . ' -scb 2>&1', input)
+  " Pipe lines into coffee.
+  let output = system(g:coffee_compiler .
+  \                   ' -scb' .
+  \                   ' ' . b:coffee_litcoffee .
+  \                   ' 2>&1', input)
 
-  " Be sure we're in the CoffeeCompile buffer before overwriting.
-  if exists('b:coffee_compile_buf')
-    echoerr 'CoffeeCompile buffers are messed up'
-    return
-  endif
+  " Paste output into output buffer.
+  call s:ScratchBufUpdate(a:buf, output)
 
-  " Replace buffer contents with new output and delete the last empty line.
-  setlocal modifiable
-    exec '% delete _'
-    put! =output
-    exec '$ delete _'
-  setlocal nomodifiable
-
-  " Highlight as JavaScript if there is no compile error.
+  " Highlight as JavaScript if there were no compile errors.
   if v:shell_error
+    call s:ParseCoffeeError(output, src, a:startline)
     setlocal filetype=
   else
+    " Clear the quickfix list.
+    call setqflist([], 'r')
     setlocal filetype=javascript
   endif
-
-  call setpos('.', b:coffee_compile_pos)
-endfunction
-
-" Update the CoffeeCompile buffer with the whole source buffer.
-function! s:CoffeeCompileWatchUpdate()
-  call s:CoffeeCompileUpdate(1, '$')
-  exec bufwinnr(b:coffee_compile_src_buf) 'wincmd w'
 endfunction
 
 " Peek at compiled CoffeeScript in a scratch buffer. We handle ranges like this
 " to prevent the cursor from being moved (and its position saved) before the
 " function is called.
 function! s:CoffeeCompile(startline, endline, args)
-  if !executable(g:coffee_compiler)
-    echoerr "Can't find CoffeeScript compiler `" . g:coffee_compiler . "`"
+  if a:args =~ '\<watch\>'
+    echoerr 'CoffeeCompile watch is deprecated! Please use CoffeeWatch instead'
+    sleep 5
+    call s:CoffeeWatch(a:args)
     return
   endif
 
-  " If in the CoffeeCompile buffer, switch back to the source buffer and
-  " continue.
+  " Switch to the source buffer if not already in it.
+  silent! call s:SwitchWindow(b:coffee_src_buf)
+
+  " Bail if not in source buffer.
   if !exists('b:coffee_compile_buf')
-    exec bufwinnr(b:coffee_compile_src_buf) 'wincmd w'
-  endif
-
-  " Parse arguments.
-  let watch = a:args =~ '\<watch\>'
-  let unwatch = a:args =~ '\<unwatch\>'
-  let size = str2nr(matchstr(a:args, '\<\d\+\>'))
-
-  " Determine default split direction.
-  if exists('g:coffee_compile_vert')
-    let vert = 1
-  else
-    let vert = a:args =~ '\<vert\%[ical]\>'
-  endif
-
-  " Remove any watch listeners.
-  silent! autocmd! CoffeeCompileAuWatch * <buffer>
-
-  " If just unwatching, don't compile.
-  if unwatch
-    let b:coffee_compile_watch = 0
     return
   endif
 
-  if watch
-    let b:coffee_compile_watch = 1
-  endif
-
-  " Build the CoffeeCompile buffer if it doesn't exist.
+  " Build the output buffer if it doesn't exist.
   if bufwinnr(b:coffee_compile_buf) == -1
-    let src_buf = bufnr('%')
-    let src_win = bufwinnr(src_buf)
+    let src = bufnr('%')
 
-    " Create the new window and resize it.
-    if vert
-      let width = size ? size : winwidth(src_win) / 2
+    let vert = exists('g:coffee_compile_vert') || a:args =~ '\<vert\%[ical]\>'
+    let size = str2nr(matchstr(a:args, '\<\d\+\>'))
 
-      belowright vertical new
-      exec 'vertical resize' width
-    else
-      " Try to guess the compiled output's height.
-      let height = size ? size : min([winheight(src_win) / 2,
-      \                               a:endline - a:startline + 2])
+    " Build the output buffer and save the source bufnr.
+    let buf = s:ScratchBufBuild(src, vert, size)
+    let b:coffee_src_buf = src
 
-      belowright new
-      exec 'resize' height
-    endif
-
-    " We're now in the scratch buffer, so set it up.
-    setlocal bufhidden=wipe buftype=nofile
-    setlocal nobuflisted nomodifiable noswapfile nowrap
+    " Set the buffer name.
+    exec 'silent! file [CoffeeCompile ' . src . ']'
 
+    " Clean up the source buffer when the output buffer is closed.
     autocmd BufWipeout <buffer> call s:CoffeeCompileClose()
-    " Save the cursor when leaving the CoffeeCompile buffer.
+    " Save the cursor when leaving the output buffer.
     autocmd BufLeave <buffer> let b:coffee_compile_pos = getpos('.')
 
-    nnoremap <buffer> <silent> q :hide<CR>
+    " Run user-defined commands on new buffer.
+    silent doautocmd CoffeeBufNew User CoffeeCompile
 
-    let b:coffee_compile_src_buf = src_buf
-    let buf = bufnr('%')
-
-    " Go back to the source buffer and set it up.
-    exec bufwinnr(b:coffee_compile_src_buf) 'wincmd w'
+    " Switch back to the source buffer and save the output bufnr. This also
+    " triggers BufLeave above.
+    call s:SwitchWindow(src)
     let b:coffee_compile_buf = buf
   endif
 
-  if b:coffee_compile_watch
-    call s:CoffeeCompileWatchUpdate()
+  " Fill the scratch buffer.
+  call s:CoffeeCompileToBuf(b:coffee_compile_buf, a:startline, a:endline)
+  " Reset cursor to previous position.
+  call setpos('.', b:coffee_compile_pos)
 
-    augroup CoffeeCompileAuWatch
-      autocmd InsertLeave <buffer> call s:CoffeeCompileWatchUpdate()
-    augroup END
+  " Run any user-defined commands on the scratch buffer.
+  silent doautocmd CoffeeBufUpdate User CoffeeCompile
+endfunction
+
+" Update the scratch buffer and switch back to the source buffer.
+function! s:CoffeeWatchUpdate()
+  call s:CoffeeCompileToBuf(b:coffee_watch_buf, 1, '$')
+  call setpos('.', b:coffee_watch_pos)
+  silent doautocmd CoffeeBufUpdate User CoffeeWatch
+  call s:SwitchWindow(b:coffee_src_buf)
+endfunction
+
+" Continually compile a source buffer.
+function! s:CoffeeWatch(args)
+  silent! call s:SwitchWindow(b:coffee_src_buf)
+
+  if !exists('b:coffee_watch_buf')
+    return
+  endif
+
+  if bufwinnr(b:coffee_watch_buf) == -1
+    let src = bufnr('%')
+
+    let vert = exists('g:coffee_watch_vert') || a:args =~ '\<vert\%[ical]\>'
+    let size = str2nr(matchstr(a:args, '\<\d\+\>'))
+
+    let buf = s:ScratchBufBuild(src, vert, size)
+    let b:coffee_src_buf = src
+
+    exec 'silent! file [CoffeeWatch ' . src . ']'
+
+    autocmd BufWipeout <buffer> call s:CoffeeWatchClose()
+    autocmd BufLeave <buffer> let b:coffee_watch_pos = getpos('.')
+
+    silent doautocmd CoffeeBufNew User CoffeeWatch
+
+    call s:SwitchWindow(src)
+    let b:coffee_watch_buf = buf
+  endif
+
+  " Make sure only one watch autocmd is defined on this buffer.
+  silent! autocmd! CoffeeAuWatch * <buffer>
+
+  augroup CoffeeAuWatch
+    autocmd InsertLeave <buffer> call s:CoffeeWatchUpdate()
+    autocmd BufWritePost <buffer> call s:CoffeeWatchUpdate()
+  augroup END
+
+  call s:CoffeeWatchUpdate()
+endfunction
+
+" Run a snippet of CoffeeScript between startline and endline.
+function! s:CoffeeRun(startline, endline, args)
+  silent! call s:SwitchWindow(b:coffee_src_buf)
+
+  if !exists('b:coffee_run_buf')
+    return
+  endif
+
+  if bufwinnr(b:coffee_run_buf) == -1
+    let src = bufnr('%')
+
+    let buf = s:ScratchBufBuild(src, exists('g:coffee_run_vert'), 0)
+    let b:coffee_src_buf = src
+
+    exec 'silent! file [CoffeeRun ' . src . ']'
+
+    autocmd BufWipeout <buffer> call s:CoffeeRunClose()
+    autocmd BufLeave <buffer> let b:coffee_run_pos = getpos('.')
+
+    silent doautocmd CoffeeBufNew User CoffeeRun
+
+    call s:SwitchWindow(src)
+    let b:coffee_run_buf = buf
+  endif
+
+  if a:startline == 1 && a:endline == line('$')
+    let output = system(g:coffee_compiler .
+    \                   ' ' . b:coffee_litcoffee .
+    \                   ' ' . fnameescape(expand('%')) .
+    \                   ' ' . a:args)
   else
-    call s:CoffeeCompileUpdate(a:startline, a:endline)
-  endif
-endfunction
+    let input = join(getline(a:startline, a:endline), "\n")
 
-" Complete arguments for the CoffeeCompile command.
-function! s:CoffeeCompileComplete(arg, cmdline, cursor)
-  let args = ['unwatch', 'vertical', 'watch']
-
-  if !len(a:arg)
-    return args
-  endif
-
-  let match = '^' . a:arg
-
-  for arg in args
-    if arg =~ match
-      return [arg]
+    if !len(input)
+      return
     endif
-  endfor
+
+    let output = system(g:coffee_compiler .
+    \                   ' -s' .
+    \                   ' ' . b:coffee_litcoffee .
+    \                   ' ' . a:args, input)
+  endif
+
+  call s:ScratchBufUpdate(b:coffee_run_buf, output)
+  call setpos('.', b:coffee_run_pos)
+
+  silent doautocmd CoffeeBufUpdate User CoffeeRun
 endfunction
 
-" Run coffeelint on a file, and add any errors between @startline and @endline
+" Run coffeelint on a file, and add any errors between startline and endline
 " to the quickfix list.
 function! s:CoffeeLint(startline, endline, bang, args)
-  if !executable(g:coffee_linter)
-    echoerr "Can't find CoffeeScript linter `" . g:coffee_linter . "`"
+  let input = join(getline(a:startline, a:endline), "\n")
+
+  if !len(input)
     return
   endif
 
-  let filename = expand('%')
+  let output = system(g:coffee_linter .
+  \                   ' -s --csv' .
+  \                   ' ' . b:coffee_litcoffee .
+  \                   ' ' . g:coffee_lint_options .
+  \                   ' ' . a:args .
+  \                   ' 2>&1', input)
 
-  if !len(filename)
-    echoerr 'CoffeeLint must be ran on a saved file'
-    return
-  endif
-
-  let lines = split(system(g:coffee_linter . ' --csv ' . g:coffee_lint_options .
-  \                        ' ' . a:args . ' ' . filename . ' 2>&1'), '\n')
+  " Convert output into an array and strip off the csv header.
+  let lines = split(output, "\n")[1:]
+  let buf = bufnr('%')
   let qflist = []
 
   for line in lines
-    let match = matchlist(line, '\f\+,\(\d\+\),error,\(.\+\)')
+    let match = matchlist(line, '^stdin,\(\d\+\),\d*,\(error\|warn\),\(.\+\)$')
 
-    " Ignore invalid lines.
+    " Ignore unmatched lines.
     if !len(match)
       continue
     endif
 
-    let lnum = str2nr(match[1])
-
-    " Don't add the error if it's not in the range.
-    if lnum < a:startline || lnum > a:endline
-      continue
-    endif
-
-    let text = match[2]
-
-    call add(qflist, {'bufnr': bufnr('%'), 'lnum': lnum, 'text': text})
+    " The 'type' will result in either 'E' or 'W'.
+    call add(qflist, {'bufnr': buf, 'lnum': a:startline + str2nr(match[1]) - 1,
+    \                 'type': toupper(match[2][0]), 'text': match[3]})
   endfor
 
+  " Replace the quicklist with our items.
   call setqflist(qflist, 'r')
 
-  " Don't jump if there's a bang.
+  " If not given a bang, jump to first error.
   if !len(a:bang)
     silent! cc 1
   endif
 endfunction
 
-" Don't overwrite the CoffeeCompile variables.
+" Complete arguments for Coffee* commands.
+function! s:CoffeeComplete(cmd, cmdline, cursor)
+  let args = ['vertical']
+
+  " If no partial command, return all possibilities.
+  if !len(a:cmd)
+    return args
+  endif
+
+  let pat = '^' . a:cmd
+
+  for arg in args
+    if arg =~ pat
+      return [arg]
+    endif
+  endfor
+endfunction
+
+" Set initial state variables if they don't exist
 if !exists('b:coffee_compile_buf')
   call s:CoffeeCompileResetVars()
 endif
 
-" Peek at compiled CoffeeScript.
-command! -range=% -bar -nargs=* -complete=customlist,s:CoffeeCompileComplete
+if !exists('b:coffee_watch_buf')
+  call s:CoffeeWatchResetVars()
+endif
+
+if !exists('b:coffee_run_buf')
+  call s:CoffeeRunResetVars()
+endif
+
+command! -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
 \        CoffeeCompile call s:CoffeeCompile(<line1>, <line2>, <q-args>)
-" Run some CoffeeScript.
-command! -range=% -bar CoffeeRun <line1>,<line2>:w !coffee -s
-" Run coffeelint on the file.
+command! -bar -nargs=* -complete=customlist,s:CoffeeComplete
+\        CoffeeWatch call s:CoffeeWatch(<q-args>)
+command! -range=% -bar -nargs=* CoffeeRun
+\        call s:CoffeeRun(<line1>, <line2>, <q-args>)
 command! -range=% -bang -bar -nargs=* CoffeeLint
-\        call s:CoffeeLint(<line1>, <line2>, '<bang>', <q-args>)
+\        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
diff --git a/sources_non_forked/vim-coffee-script/indent/coffee.vim b/sources_non_forked/vim-coffee-script/indent/coffee.vim
index 6e58d5e7..7bd82e3e 100644
--- a/sources_non_forked/vim-coffee-script/indent/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/indent/coffee.vim
@@ -3,7 +3,7 @@
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
-if exists("b:did_indent")
+if exists('b:did_indent')
   finish
 endif
 
@@ -15,43 +15,76 @@ setlocal indentexpr=GetCoffeeIndent(v:lnum)
 " indented or outdented.
 setlocal indentkeys+=0],0),0.,=else,=when,=catch,=finally
 
+" If no indenting or outdenting is needed, either keep the indent of the cursor
+" (use autoindent) or match the indent of the previous line.
+if exists('g:coffee_indent_keep_current')
+  let s:DEFAULT_LEVEL = '-1'
+else
+  let s:DEFAULT_LEVEL = 'indent(prevnlnum)'
+endif
+
 " Only define the function once.
-if exists("*GetCoffeeIndent")
+if exists('*GetCoffeeIndent')
   finish
 endif
 
-" Keywords to indent after
-let s:INDENT_AFTER_KEYWORD = '^\%(if\|unless\|else\|for\|while\|until\|'
-\                          . 'loop\|switch\|when\|try\|catch\|finally\|'
-\                          . 'class\)\>'
+" Keywords that begin a block
+let s:BEGIN_BLOCK_KEYWORD = '\C^\%(if\|unless\|else\|for\|while\|until\|'
+\                         . 'loop\|switch\|when\|try\|catch\|finally\|'
+\                         . 'class\)\>\%(\s*:\)\@!'
 
-" Operators to indent after
-let s:INDENT_AFTER_OPERATOR = '\%([([{:=]\|[-=]>\)$'
+" An expression that uses the result of a statement
+let s:COMPOUND_EXPRESSION = '\C\%([^-]-\|[^+]+\|[^/]/\|[:=*%&|^<>]\)\s*'
+\                         . '\%(if\|unless\|for\|while\|until\|loop\|switch\|'
+\                         . 'try\|class\)\>'
 
-" Keywords and operators that continue a line
-let s:CONTINUATION = '\<\%(is\|isnt\|and\|or\)\>$'
-\                  . '\|'
-\                  . '\%(-\@<!-\|+\@<!+\|<\|[-=]\@<!>\|\*\|/\@<!/\|%\||\|'
-\                  . '&\|,\|\.\@<!\.\)$'
+" Combine the two above
+let s:BEGIN_BLOCK = s:BEGIN_BLOCK_KEYWORD . '\|' . s:COMPOUND_EXPRESSION
 
-" Operators that block continuation indenting
-let s:CONTINUATION_BLOCK = '[([{:=]$'
+" Operators that begin a block but also count as a continuation
+let s:BEGIN_BLOCK_OP = '[([{:=]$'
+
+" Begins a function block
+let s:FUNCTION = '[-=]>$'
+
+" Operators that continue a line onto the next line
+let s:CONTINUATION_OP = '\C\%(\<\%(is\|isnt\|and\|or\)\>\|'
+\                     . '[^-]-\|[^+]+\|[^-=]>\|[^.]\.\|[<*/%&|^,]\)$'
+
+" Ancestor operators that prevent continuation indenting
+let s:CONTINUATION = s:CONTINUATION_OP . '\|' . s:BEGIN_BLOCK_OP
+
+" A closing bracket by itself on a line followed by a continuation
+let s:BRACKET_CONTINUATION = '^\s*[}\])]\s*' . s:CONTINUATION_OP
 
 " A continuation dot access
 let s:DOT_ACCESS = '^\.'
 
-" Keywords to outdent after
-let s:OUTDENT_AFTER = '^\%(return\|break\|continue\|throw\)\>'
+" Keywords that break out of a block
+let s:BREAK_BLOCK_OP = '\C^\%(return\|break\|continue\|throw\)\>'
 
-" A compound assignment like `... = if ...`
-let s:COMPOUND_ASSIGNMENT = '[:=]\s*\%(if\|unless\|for\|while\|until\|'
-\                         . 'switch\|try\|class\)\>'
+" A condition attached to the end of a statement
+let s:POSTFIX_CONDITION = '\C\S\s\+\zs\<\%(if\|unless\|when\|while\|until\)\>'
 
-" A postfix condition like `return ... if ...`.
-let s:POSTFIX_CONDITION = '\S\s\+\zs\<\%(if\|unless\)\>'
+" A then contained in brackets
+let s:CONTAINED_THEN = '\C[(\[].\{-}\<then\>.\{-\}[)\]]'
 
-" A single line else statement like `else ...` but not `else if ...`
-let s:SINGLE_LINE_ELSE = '^else\s\+\%(\<\%(if\|unless\)\>\)\@!'
+" An else with a condition attached
+let s:ELSE_COND = '\C^\s*else\s\+\<\%(if\|unless\)\>'
+
+" A single-line else statement (without a condition attached)
+let s:SINGLE_LINE_ELSE = '\C^else\s\+\%(\<\%(if\|unless\)\>\)\@!'
+
+" Pairs of starting and ending keywords, with an initial pattern to match
+let s:KEYWORD_PAIRS = [
+\  ['\C^else\>', '\C\<\%(if\|unless\|when\|else\s\+\%(if\|unless\)\)\>',
+\   '\C\<else\>'],
+\  ['\C^catch\>', '\C\<try\>', '\C\<catch\>'],
+\  ['\C^finally\>', '\C\<try\>', '\C\<finally\>']
+\]
+
+" Pairs of starting and ending brackets
+let s:BRACKET_PAIRS = {']': '\[', '}': '{', ')': '('}
 
 " Max lines to look back for a match
 let s:MAX_LOOKBACK = 50
@@ -66,286 +99,330 @@ let s:SYNTAX_COMMENT = 'coffee\%(Comment\|BlockComment\|HeregexComment\)'
 " Syntax names for strings and comments
 let s:SYNTAX_STRING_COMMENT = s:SYNTAX_STRING . '\|' . s:SYNTAX_COMMENT
 
+" Compatibility code for shiftwidth() as recommended by the docs, but modified
+" so there isn't as much of a penalty if shiftwidth() exists.
+if exists('*shiftwidth')
+  let s:ShiftWidth = function('shiftwidth')
+else
+  function! s:ShiftWidth()
+    return &shiftwidth
+  endfunction
+endif
+
 " Get the linked syntax name of a character.
-function! s:SyntaxName(linenum, col)
-  return synIDattr(synID(a:linenum, a:col, 1), 'name')
+function! s:SyntaxName(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name')
 endfunction
 
 " Check if a character is in a comment.
-function! s:IsComment(linenum, col)
-  return s:SyntaxName(a:linenum, a:col) =~ s:SYNTAX_COMMENT
+function! s:IsComment(lnum, col)
+  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_COMMENT
 endfunction
 
 " Check if a character is in a string.
-function! s:IsString(linenum, col)
-  return s:SyntaxName(a:linenum, a:col) =~ s:SYNTAX_STRING
+function! s:IsString(lnum, col)
+  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_STRING
 endfunction
 
 " Check if a character is in a comment or string.
-function! s:IsCommentOrString(linenum, col)
-  return s:SyntaxName(a:linenum, a:col) =~ s:SYNTAX_STRING_COMMENT
-endfunction
-
-" Check if a whole line is a comment.
-function! s:IsCommentLine(linenum)
-  " Check the first non-whitespace character.
-  return s:IsComment(a:linenum, indent(a:linenum) + 1)
+function! s:IsCommentOrString(lnum, col)
+  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_STRING_COMMENT
 endfunction
 
 " Search a line for a regex until one is found outside a string or comment.
-function! s:SmartSearch(linenum, regex)
-  " Start at the first column.
-  let col = 0
+function! s:SearchCode(lnum, regex)
+  " Start at the first column and look for an initial match (including at the
+  " cursor.)
+  call cursor(a:lnum, 1)
+  let pos = search(a:regex, 'c', a:lnum)
 
-  " Search until there are no more matches, unless a good match is found.
-  while 1
-    call cursor(a:linenum, col + 1)
-    let [_, col] = searchpos(a:regex, 'cn', a:linenum)
-
-    " No more matches.
-    if !col
-      break
-    endif
-
-    if !s:IsCommentOrString(a:linenum, col)
+  while pos
+    if !s:IsCommentOrString(a:lnum, col('.'))
       return 1
     endif
+
+    " Move to the match and continue searching (don't accept matches at the
+    " cursor.)
+    let pos = search(a:regex, '', a:lnum)
   endwhile
 
-  " No good match found.
   return 0
 endfunction
 
-" Check if a match should be skipped.
-function! s:ShouldSkip(startlinenum, linenum, col)
-  " Skip if in a comment or string.
-  if s:IsCommentOrString(a:linenum, a:col)
-    return 1
-  endif
+" Search for the nearest previous line that isn't a comment.
+function! s:GetPrevNormalLine(startlnum)
+  let curlnum = a:startlnum
 
-  " Skip if a single line statement that isn't adjacent.
-  if s:SmartSearch(a:linenum, '\<then\>') && a:startlinenum - a:linenum > 1
-    return 1
-  endif
+  while curlnum
+    let curlnum = prevnonblank(curlnum - 1)
 
-  " Skip if a postfix condition.
-  if s:SmartSearch(a:linenum, s:POSTFIX_CONDITION) &&
-  \ !s:SmartSearch(a:linenum, s:COMPOUND_ASSIGNMENT)
-    return 1
-  endif
-
-  return 0
-endfunction
-
-" Find the farthest line to look back to, capped to line 1 (zero and negative
-" numbers cause bad things).
-function! s:MaxLookback(startlinenum)
-  return max([1, a:startlinenum - s:MAX_LOOKBACK])
-endfunction
-
-" Get the skip expression for searchpair().
-function! s:SkipExpr(startlinenum)
-  return "s:ShouldSkip(" . a:startlinenum . ", line('.'), col('.'))"
-endfunction
-
-" Search for pairs of text.
-function! s:SearchPair(start, end)
-  " The cursor must be in the first column for regexes to match.
-  call cursor(0, 1)
-
-  let startlinenum = line('.')
-
-  " Don't need the W flag since MaxLookback caps the search to line 1.
-  return searchpair(a:start, '', a:end, 'bcn',
-  \                 s:SkipExpr(startlinenum),
-  \                 s:MaxLookback(startlinenum))
-endfunction
-
-" Try to find a previous matching line.
-function! s:GetMatch(curline)
-  let firstchar = a:curline[0]
-
-  if firstchar == '}'
-    return s:SearchPair('{', '}')
-  elseif firstchar == ')'
-    return s:SearchPair('(', ')')
-  elseif firstchar == ']'
-    return s:SearchPair('\[', '\]')
-  elseif a:curline =~ '^else\>'
-    return s:SearchPair('\<\%(if\|unless\|when\)\>', '\<else\>')
-  elseif a:curline =~ '^catch\>'
-    return s:SearchPair('\<try\>', '\<catch\>')
-  elseif a:curline =~ '^finally\>'
-    return s:SearchPair('\<try\>', '\<finally\>')
-  endif
-
-  return 0
-endfunction
-
-" Get the nearest previous line that isn't a comment.
-function! s:GetPrevNormalLine(startlinenum)
-  let curlinenum = a:startlinenum
-
-  while curlinenum
-    let curlinenum = prevnonblank(curlinenum - 1)
-
-    if !s:IsCommentLine(curlinenum)
-      return curlinenum
+    " Return the line if the first non-whitespace character isn't a comment.
+    if !s:IsComment(curlnum, indent(curlnum) + 1)
+      return curlnum
     endif
   endwhile
 
   return 0
 endfunction
 
-" Try to find a comment in a line.
-function! s:FindComment(linenum)
-  call cursor(a:linenum, 0)
+function! s:SearchPair(startlnum, lookback, skip, open, close)
+  " Go to the first column so a:close will be matched even if it's at the
+  " beginning of the line.
+  call cursor(a:startlnum, 1)
+  return searchpair(a:open, '', a:close, 'bnW', a:skip, max([1, a:lookback]))
+endfunction
 
-  " Current column
-  let cur = 0
-  " Last column in the line
-  let end = col('$') - 1
+" Skip if a match
+"  - is in a string or comment
+"  - is a single-line statement that isn't immediately
+"    adjacent
+"  - has a postfix condition and isn't an else statement or compound
+"    expression
+function! s:ShouldSkip(startlnum, lnum, col)
+  return s:IsCommentOrString(a:lnum, a:col) ||
+  \      s:SearchCode(a:lnum, '\C\<then\>') && a:startlnum - a:lnum > 1 ||
+  \      s:SearchCode(a:lnum, s:POSTFIX_CONDITION) &&
+  \      getline(a:lnum) !~ s:ELSE_COND &&
+  \     !s:SearchCode(a:lnum, s:COMPOUND_EXPRESSION)
+endfunction
 
-  while cur != end
-    call cursor(0, cur + 1)
-    let [_, cur] = searchpos('#', 'cn', a:linenum)
+" Search for the nearest and farthest match for a keyword pair.
+function! s:SearchMatchingKeyword(startlnum, open, close)
+  let skip = 's:ShouldSkip(' . a:startlnum . ", line('.'), line('.'))"
 
-    if !cur
+  " Search for the nearest match.
+  let nearestlnum = s:SearchPair(a:startlnum, a:startlnum - s:MAX_LOOKBACK,
+  \                              skip, a:open, a:close)
+
+  if !nearestlnum
+    return []
+  endif
+
+  " Find the nearest previous line with indent less than or equal to startlnum.
+  let ind = indent(a:startlnum)
+  let lookback = s:GetPrevNormalLine(a:startlnum)
+
+  while lookback && indent(lookback) > ind
+    let lookback = s:GetPrevNormalLine(lookback)
+  endwhile
+
+  " Search for the farthest match. If there are no other matches, then the
+  " nearest match is also the farthest one.
+  let matchlnum = nearestlnum
+
+  while matchlnum
+    let lnum = matchlnum
+    let matchlnum = s:SearchPair(matchlnum, lookback, skip, a:open, a:close)
+  endwhile
+
+  return [nearestlnum, lnum]
+endfunction
+
+" Strip a line of a trailing comment and surrounding whitespace.
+function! s:GetTrimmedLine(lnum)
+  " Try to find a comment starting at the first column.
+  call cursor(a:lnum, 1)
+  let pos = search('#', 'c', a:lnum)
+
+  " Keep searching until a comment is found or search returns 0.
+  while pos
+    if s:IsComment(a:lnum, col('.'))
       break
     endif
 
-    if s:IsComment(a:linenum, cur)
-      return cur
-    endif
+    let pos = search('#', '', a:lnum)
   endwhile
 
-  return 0
-endfunction
-
-" Get a line without comments or surrounding whitespace.
-function! s:GetTrimmedLine(linenum)
-  let comment = s:FindComment(a:linenum)
-  let line = getline(a:linenum)
-
-  if comment
+  if !pos
+    " No comment was found so use the whole line.
+    let line = getline(a:lnum)
+  else
     " Subtract 1 to get to the column before the comment and another 1 for
-    " zero-based indexing.
-    let line = line[:comment - 2]
+    " column indexing -> zero-based indexing.
+    let line = getline(a:lnum)[:col('.') - 2]
   endif
 
   return substitute(substitute(line, '^\s\+', '', ''),
   \                                  '\s\+$', '', '')
 endfunction
 
-function! GetCoffeeIndent(curlinenum)
-  " Don't do anything if on the first line.
-  if a:curlinenum == 1
+" Get the indent policy when no special rules are used.
+function! s:GetDefaultPolicy(curlnum)
+  " Check whether equalprg is being ran on existing lines.
+  if strlen(getline(a:curlnum)) == indent(a:curlnum)
+    " If not indenting an existing line, use the default policy.
+    return s:DEFAULT_LEVEL
+  else
+    " Otherwise let autoindent determine what to do with an existing line.
+    return '-1'
+  endif
+endfunction
+
+function! GetCoffeeIndent(curlnum)
+  " Get the previous non-blank line (may be a comment.)
+  let prevlnum = prevnonblank(a:curlnum - 1)
+
+  " Bail if there's no code before.
+  if !prevlnum
     return -1
   endif
 
-  let prevlinenum = a:curlinenum - 1
-
-  " If continuing a comment, keep the indent level.
-  if s:IsCommentLine(prevlinenum)
-    return indent(prevlinenum)
+  " Bail if inside a multiline string.
+  if s:IsString(a:curlnum, 1)
+    let prevnlnum = prevlnum
+    exec 'return' s:GetDefaultPolicy(a:curlnum)
   endif
 
-  let prevlinenum = s:GetPrevNormalLine(a:curlinenum)
+  " Get the code part of the current line.
+  let curline = s:GetTrimmedLine(a:curlnum)
+  " Get the previous non-comment line.
+  let prevnlnum = s:GetPrevNormalLine(a:curlnum)
 
-  " Don't do anything if there's no code before.
-  if !prevlinenum
-    return -1
+  " Check if the current line is the closing bracket in a bracket pair.
+  if has_key(s:BRACKET_PAIRS, curline[0])
+    " Search for a matching opening bracket.
+    let matchlnum = s:SearchPair(a:curlnum, a:curlnum - s:MAX_LOOKBACK,
+    \                            "s:IsCommentOrString(line('.'), col('.'))",
+    \                            s:BRACKET_PAIRS[curline[0]], curline[0])
+
+    if matchlnum
+      " Match the indent of the opening bracket.
+      return indent(matchlnum)
+    else
+      " No opening bracket found (bad syntax), so bail.
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
+    endif
   endif
 
-  " Indent based on the current line.
-  let curline = s:GetTrimmedLine(a:curlinenum)
+  " Check if the current line is the closing keyword in a keyword pair.
+  for pair in s:KEYWORD_PAIRS
+    if curline =~ pair[0]
+      " Find the nearest and farthest matches within the same indent level.
+      let matches = s:SearchMatchingKeyword(a:curlnum, pair[1], pair[2])
 
-  " Try to find a matching statement. This handles outdenting.
-  let matchlinenum = s:GetMatch(curline)
-
-  if matchlinenum
-    return indent(matchlinenum)
-  endif
-
-  " Try to find a matching when.
-  if curline =~ '^when\>' && !s:SmartSearch(prevlinenum, '\<switch\>')
-    let linenum = a:curlinenum
-
-    while linenum
-      let linenum = s:GetPrevNormalLine(linenum)
-
-      if getline(linenum) =~ '^\s*when\>'
-        return indent(linenum)
+      if len(matches)
+        " Don't force indenting/outdenting as long as line is already lined up
+        " with a valid match
+        return max([min([indent(a:curlnum), indent(matches[0])]),
+        \           indent(matches[1])])
+      else
+        " No starting keyword found (bad syntax), so bail.
+        exec 'return' s:GetDefaultPolicy(a:curlnum)
       endif
+    endif
+  endfor
+
+  " Check if the current line is a `when` and not the first in a switch block.
+  if curline =~ '\C^when\>' && !s:SearchCode(prevnlnum, '\C\<switch\>')
+    " Look back for a `when`.
+    while prevnlnum
+      if getline(prevnlnum) =~ '\C^\s*when\>'
+        " Indent to match the found `when`, but don't force indenting (for when
+        " indenting nested switch blocks.)
+        return min([indent(a:curlnum), indent(prevnlnum)])
+      endif
+
+      let prevnlnum = s:GetPrevNormalLine(prevnlnum)
     endwhile
 
-    return -1
+    " No matching `when` found (bad syntax), so bail.
+    exec 'return' s:GetDefaultPolicy(a:curlnum)
   endif
 
-  " Indent based on the previous line.
-  let prevline = s:GetTrimmedLine(prevlinenum)
-  let previndent = indent(prevlinenum)
+  " If the previous line is a comment, use its indentation, but don't force
+  " indenting.
+  if prevlnum != prevnlnum
+    return min([indent(a:curlnum), indent(prevlnum)])
+  endif
+
+  let prevline = s:GetTrimmedLine(prevnlnum)
 
   " Always indent after these operators.
-  if prevline =~ s:INDENT_AFTER_OPERATOR
-    return previndent + &shiftwidth
+  if prevline =~ s:BEGIN_BLOCK_OP
+    return indent(prevnlnum) + s:ShiftWidth()
   endif
 
-  " Indent after a continuation if it's the first.
-  if prevline =~ s:CONTINUATION
-    " If the line ends in a slash, make sure it isn't a regex.
-    if prevline =~ '/$'
-      " Move to the line so we can get the last column.
-      call cursor(prevlinenum)
-
-      if s:IsString(prevlinenum, col('$') - 1)
-        return -1
-      endif
+  " Indent if the previous line starts a function block, but don't force
+  " indenting if the line is non-blank (for empty function bodies.)
+  if prevline =~ s:FUNCTION
+    if strlen(getline(a:curlnum)) > indent(a:curlnum)
+      return min([indent(prevnlnum) + s:ShiftWidth(), indent(a:curlnum)])
+    else
+      return indent(prevnlnum) + s:ShiftWidth()
     endif
-
-    let prevprevlinenum = s:GetPrevNormalLine(prevlinenum)
-
-    " If the continuation is the first in the file, there can't be others before
-    " it.
-    if !prevprevlinenum
-      return previndent + &shiftwidth
-    endif
-
-    let prevprevline = s:GetTrimmedLine(prevprevlinenum)
-
-    " Only indent after the first continuation.
-    if prevprevline !~ s:CONTINUATION && prevprevline !~ s:CONTINUATION_BLOCK
-      return previndent + &shiftwidth
-    endif
-
-    return -1
   endif
 
-  " Indent after these keywords and compound assignments if they aren't a
-  " single line statement.
-  if prevline =~ s:INDENT_AFTER_KEYWORD || prevline =~ s:COMPOUND_ASSIGNMENT
-    if !s:SmartSearch(prevlinenum, '\<then\>') && prevline !~ s:SINGLE_LINE_ELSE
-      return previndent + &shiftwidth
+  " Check if continuation indenting is needed. If the line ends in a slash, make
+  " sure it isn't a regex.
+  if prevline =~ s:CONTINUATION_OP &&
+  \  !(prevline =~ '/$' && s:IsString(prevnlnum, col([prevnlnum, '$']) - 1))
+    " Don't indent if the continuation follows a closing bracket.
+    if prevline =~ s:BRACKET_CONTINUATION
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
     endif
 
-    return -1
+    let prevprevnlnum = s:GetPrevNormalLine(prevnlnum)
+
+    " Don't indent if not the first continuation.
+    if prevprevnlnum && s:GetTrimmedLine(prevprevnlnum) =~ s:CONTINUATION
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
+    endif
+
+    " Continuation indenting seems to vary between programmers, so if the line
+    " is non-blank, don't override the indentation
+    if strlen(getline(a:curlnum)) > indent(a:curlnum)
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
+    endif
+
+    " Otherwise indent a level.
+    return indent(prevnlnum) + s:ShiftWidth()
+  endif
+
+  " Check if the previous line starts with a keyword that begins a block.
+  if prevline =~ s:BEGIN_BLOCK
+    " Indent if the current line doesn't start with `then` and the previous line
+    " isn't a single-line statement.
+    if curline !~ '\C^\<then\>' && !s:SearchCode(prevnlnum, '\C\<then\>') &&
+    \  prevline !~ s:SINGLE_LINE_ELSE
+      return indent(prevnlnum) + s:ShiftWidth()
+    else
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
+    endif
   endif
 
   " Indent a dot access if it's the first.
-  if curline =~ s:DOT_ACCESS && prevline !~ s:DOT_ACCESS
-    return previndent + &shiftwidth
-  endif
-
-  " Outdent after these keywords if they don't have a postfix condition or are
-  " a single-line statement.
-  if prevline =~ s:OUTDENT_AFTER
-    if !s:SmartSearch(prevlinenum, s:POSTFIX_CONDITION) ||
-    \   s:SmartSearch(prevlinenum, '\<then\>')
-      return previndent - &shiftwidth
+  if curline =~ s:DOT_ACCESS
+    if prevline !~ s:DOT_ACCESS
+      return indent(prevnlnum) + s:ShiftWidth()
+    else
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
     endif
   endif
 
-  " If no indent or outdent is needed, keep the indent level of the previous
-  " line.
-  return previndent
+  " Outdent if a keyword breaks out of a block as long as it doesn't have a
+  " postfix condition (and the postfix condition isn't a single-line statement.)
+  if prevline =~ s:BREAK_BLOCK_OP
+    if !s:SearchCode(prevnlnum, s:POSTFIX_CONDITION) ||
+    \   s:SearchCode(prevnlnum, '\C\<then\>') &&
+    \  !s:SearchCode(prevnlnum, s:CONTAINED_THEN)
+      " Don't force indenting.
+      return min([indent(a:curlnum), indent(prevnlnum) - s:ShiftWidth()])
+    else
+      exec 'return' s:GetDefaultPolicy(a:curlnum)
+    endif
+  endif
+
+  " Check if inside brackets.
+  let matchlnum = s:SearchPair(a:curlnum, a:curlnum - s:MAX_LOOKBACK,
+  \                            "s:IsCommentOrString(line('.'), col('.'))",
+  \                            '\[\|(\|{', '\]\|)\|}')
+
+  " If inside brackets, indent relative to the brackets, but don't outdent an
+  " already indented line.
+  if matchlnum
+    return max([indent(a:curlnum), indent(matchlnum) + s:ShiftWidth()])
+  endif
+
+  " No special rules applied, so use the default policy.
+  exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
diff --git a/sources_non_forked/vim-coffee-script/syntax/coffee.vim b/sources_non_forked/vim-coffee-script/syntax/coffee.vim
index da39e34a..7f8df73c 100644
--- a/sources_non_forked/vim-coffee-script/syntax/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/syntax/coffee.vim
@@ -10,12 +10,10 @@ endif
 
 " Include JavaScript for coffeeEmbed.
 syn include @coffeeJS syntax/javascript.vim
+silent! unlet b:current_syntax
 
 " Highlight long strings.
-syn sync minlines=100
-
-" CoffeeScript identifiers can have dollar signs.
-setlocal isident+=$
+syntax sync fromstart
 
 " These are `matches` instead of `keywords` because vim's highlighting
 " priority for keywords is higher than matches. This causes keywords to be
@@ -66,7 +64,7 @@ syn match coffeeSpecialVar /\<\%(this\|prototype\|arguments\)\>/ display
 hi def link coffeeSpecialVar Special
 
 " An @-variable
-syn match coffeeSpecialIdent /@\%(\I\i*\)\?/ display
+syn match coffeeSpecialIdent /@\%(\%(\I\|\$\)\%(\i\|\$\)*\)\?/ display
 hi def link coffeeSpecialIdent Identifier
 
 " A class-like name that starts with a capital letter
@@ -94,27 +92,27 @@ syn region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/
 hi def link coffeeString String
 
 " A integer, including a leading plus or minus
-syn match coffeeNumber /\i\@<![-+]\?\d\+\%([eE][+-]\?\d\+\)\?/ display
+syn match coffeeNumber /\%(\i\|\$\)\@<![-+]\?\d\+\%([eE][+-]\?\d\+\)\?/ display
 " A hex, binary, or octal number
 syn match coffeeNumber /\<0[xX]\x\+\>/ display
 syn match coffeeNumber /\<0[bB][01]\+\>/ display
 syn match coffeeNumber /\<0[oO][0-7]\+\>/ display
+syn match coffeeNumber /\<\%(Infinity\|NaN\)\>/ display
 hi def link coffeeNumber Number
 
 " A floating-point number, including a leading plus or minus
-syn match coffeeFloat /\i\@<![-+]\?\d*\.\@<!\.\d\+\%([eE][+-]\?\d\+\)\?/
+syn match coffeeFloat /\%(\i\|\$\)\@<![-+]\?\d*\.\@<!\.\d\+\%([eE][+-]\?\d\+\)\?/
 \                     display
 hi def link coffeeFloat Float
 
-" An error for reserved keywords
-if !exists("coffee_no_reserved_words_error")
-  syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|let\|package\|private\|protected\|public\|static\|yield\)\>/
-  \                             display
-  hi def link coffeeReservedError Error
-endif
+" An error for reserved keywords, taken from the RESERVED array:
+" http://coffeescript.org/documentation/docs/lexer.html#section-67
+syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|package\|private\|protected\|public\|static\|yield\)\>/
+\                             display
+hi def link coffeeReservedError Error
 
 " A normal object assignment
-syn match coffeeObjAssign /@\?\I\i*\s*\ze::\@!/ contains=@coffeeIdentifier display
+syn match coffeeObjAssign /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/ contains=@coffeeIdentifier display
 hi def link coffeeObjAssign Identifier
 
 syn keyword coffeeTodo TODO FIXME XXX contained
@@ -134,7 +132,7 @@ hi def link coffeeHeregexComment coffeeComment
 
 " Embedded JavaScript
 syn region coffeeEmbed matchgroup=coffeeEmbedDelim
-\                      start=/`/ skip=/\\\\\|\\`/ end=/`/
+\                      start=/`/ skip=/\\\\\|\\`/ end=/`/ keepend
 \                      contains=@coffeeJS
 hi def link coffeeEmbedDelim Delimiter
 
@@ -148,17 +146,23 @@ hi def link coffeeEscape SpecialChar
 
 " A regex -- must not follow a parenthesis, number, or identifier, and must not
 " be followed by a number
-syn region coffeeRegex start=/\%(\%()\|\i\@<!\d\)\s*\|\i\)\@<!\/=\@!\s\@!/
-\                      skip=/\[[^\]]\{-}\/[^\]]\{-}\]/
-\                      end=/\/[gimy]\{,4}\d\@!/
-\                      oneline contains=@coffeeBasicString
+syn region coffeeRegex start=#\%(\%()\|\%(\i\|\$\)\@<!\d\)\s*\|\i\)\@<!/=\@!\s\@!#
+\                      end=#/[gimy]\{,4}\d\@!#
+\                      oneline contains=@coffeeBasicString,coffeeRegexCharSet
+syn region coffeeRegexCharSet start=/\[/ end=/]/ contained
+\                             contains=@coffeeBasicString
 hi def link coffeeRegex String
+hi def link coffeeRegexCharSet coffeeRegex
 
 " A heregex
-syn region coffeeHeregex start=/\/\/\// end=/\/\/\/[gimy]\{,4}/
-\                        contains=@coffeeInterpString,coffeeHeregexComment
+syn region coffeeHeregex start=#///# end=#///[gimy]\{,4}#
+\                        contains=@coffeeInterpString,coffeeHeregexComment,
+\                                  coffeeHeregexCharSet
 \                        fold
+syn region coffeeHeregexCharSet start=/\[/ end=/]/ contained
+\                               contains=@coffeeInterpString
 hi def link coffeeHeregex coffeeRegex
+hi def link coffeeHeregexCharSet coffeeHeregex
 
 " Heredoc strings
 syn region coffeeHeredoc start=/"""/ end=/"""/ contains=@coffeeInterpString
@@ -168,23 +172,19 @@ syn region coffeeHeredoc start=/'''/ end=/'''/ contains=@coffeeBasicString
 hi def link coffeeHeredoc String
 
 " An error for trailing whitespace, as long as the line isn't just whitespace
-if !exists("coffee_no_trailing_space_error")
-  syn match coffeeSpaceError /\S\@<=\s\+$/ display
-  hi def link coffeeSpaceError Error
-endif
+syn match coffeeSpaceError /\S\@<=\s\+$/ display
+hi def link coffeeSpaceError Error
 
 " An error for trailing semicolons, for help transitioning from JavaScript
-if !exists("coffee_no_trailing_semicolon_error")
-  syn match coffeeSemicolonError /;$/ display
-  hi def link coffeeSemicolonError Error
-endif
+syn match coffeeSemicolonError /;$/ display
+hi def link coffeeSemicolonError Error
 
 " Ignore reserved words in dot accesses.
-syn match coffeeDotAccess /\.\@<!\.\s*\I\i*/he=s+1 contains=@coffeeIdentifier
+syn match coffeeDotAccess /\.\@<!\.\s*\%(\I\|\$\)\%(\i\|\$\)*/he=s+1 contains=@coffeeIdentifier
 hi def link coffeeDotAccess coffeeExtendedOp
 
 " Ignore reserved words in prototype accesses.
-syn match coffeeProtoAccess /::\s*\I\i*/he=s+2 contains=@coffeeIdentifier
+syn match coffeeProtoAccess /::\s*\%(\I\|\$\)\%(\i\|\$\)*/he=s+2 contains=@coffeeIdentifier
 hi def link coffeeProtoAccess coffeeExtendedOp
 
 " This is required for interpolations to work.
diff --git a/sources_non_forked/vim-coffee-script/syntax/eco.vim b/sources_non_forked/vim-coffee-script/syntax/eco.vim
deleted file mode 100644
index 485b356e..00000000
--- a/sources_non_forked/vim-coffee-script/syntax/eco.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim syntax file
-" Language:		eco
-" Maintainer:		Jay Adkisson
-" Mostly stolen from eruby.vim
-
-if !exists("g:eco_default_subtype")
-  let g:eco_default_subtype = "html"
-endif
-
-if !exists("b:eco_subtype")
-  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
-  let b:eco_subtype = matchstr(s:lines,'eco_subtype=\zs\w\+')
-  if b:eco_subtype == ''
-    let b:eco_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eco\)\+$','',''),'\.\zs\w\+$')
-  endif
-  if b:eco_subtype == 'rhtml'
-    let b:eco_subtype = 'html'
-  elseif b:eco_subtype == 'jst'
-    let b:eco_subtype = 'html'
-  elseif b:eco_subtype == 'rb'
-    let b:eco_subtype = 'ruby'
-  elseif b:eco_subtype == 'yml'
-    let b:eco_subtype = 'yaml'
-  elseif b:eco_subtype == 'js' || b:eco_subtype == 'json'
-    let b:eco_subtype = 'javascript'
-  elseif b:eco_subtype == 'txt'
-    " Conventional; not a real file type
-    let b:eco_subtype = 'text'
-  elseif b:eco_subtype == ''
-    if exists('b:current_syntax') && b:current_syntax != ''
-      let b:eco_subtype = b:current_syntax
-    else
-      let b:eco_subtype = g:eco_default_subtype
-    endif
-  endif
-endif
-
-if exists("b:eco_subtype") && b:eco_subtype != '' && b:eco_subtype != 'eco'
-  exec "runtime! syntax/".b:eco_subtype.".vim"
-  syn include @coffeeTop syntax/coffee.vim
-endif
-
-syn cluster ecoRegions contains=ecoBlock,ecoExpression,ecoComment
-
-syn region ecoBlock      matchgroup=ecoDelimiter start=/<%/      end=/%>/ contains=@coffeeTop containedin=ALLBUT,@ecoRegions keepend
-syn region ecoExpression matchgroup=ecoDelimiter start=/<%[=\-]/ end=/%>/ contains=@coffeeTop containedin=ALLBUT,@ecoRegions keepend
-syn region ecoComment    matchgroup=ecoComment   start=/<%#/     end=/%>/ contains=@coffeeTodo,@Spell containedin=ALLBUT,@ecoRegions keepend
-
-" eco features not in coffeescript proper
-syn keyword ecoEnd end containedin=@ecoRegions
-syn match ecoIndentColon /\s+\w+:/ containedin=@ecoRegions
-
-" Define the default highlighting.
-
-hi def link ecoDelimiter    Delimiter
-hi def link ecoComment      Comment
-hi def link ecoEnd          coffeeConditional
-hi def link ecoIndentColon  None
-
-let b:current_syntax = 'eco'
-
-" vim: nowrap sw=2 sts=2 ts=8:
diff --git a/sources_non_forked/vim-coffee-script/test/test-eco.html.eco b/sources_non_forked/vim-coffee-script/test/test-eco.html.eco
deleted file mode 100644
index d8c5ed4d..00000000
--- a/sources_non_forked/vim-coffee-script/test/test-eco.html.eco
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-  <%# comment %>
-
-  <%# basic %>
-  <%- foo = "1" %>
-
-  <%# interpolation %>
-  <%= " == #{ ( -> "LOL" )() } == " %>
-
-  <%# interpolation with nested curlies %>
-  <%= " == #{ { a: 1, b: { c: 3, d: 4 } } } == " %>
-</html>
diff --git a/sources_non_forked/vim-coffee-script/test/test.haml b/sources_non_forked/vim-coffee-script/test/test.haml
new file mode 100644
index 00000000..ae19fba5
--- /dev/null
+++ b/sources_non_forked/vim-coffee-script/test/test.haml
@@ -0,0 +1,3 @@
+:coffeescript
+  class Hello
+    # test
diff --git a/sources_non_forked/vim-expand-region/README.md b/sources_non_forked/vim-expand-region/README.md
index 0ba8efac..eb8fcd31 100644
--- a/sources_non_forked/vim-expand-region/README.md
+++ b/sources_non_forked/vim-expand-region/README.md
@@ -90,3 +90,7 @@ let g:expand_region_use_select_mode = 1
 [Pathogen]:http://github.com/tpope/vim-pathogen
 [Vundle]:http://github.com/gmarik/vundle
 [Neobundle]:http://github.com/Shougo/neobundle.vim
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/terryma/vim-expand-region/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
diff --git a/sources_non_forked/vim-fugitive/.gitignore b/sources_non_forked/vim-fugitive/.gitignore
new file mode 100644
index 00000000..0a56e3fc
--- /dev/null
+++ b/sources_non_forked/vim-fugitive/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown b/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown
new file mode 100644
index 00000000..8583e1e4
--- /dev/null
+++ b/sources_non_forked/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.
+
+If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
+I'm not going to accept your pull request.  I've explained very politely
+dozens of times that
+[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+are absolute rules on my own repositories, so I may lack the energy to explain
+it to you yet another time.  And please, if I ask you to change something,
+`git commit --amend`.
+
+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/sources_non_forked/vim-fugitive/README.markdown b/sources_non_forked/vim-fugitive/README.markdown
new file mode 100644
index 00000000..68a61e6a
--- /dev/null
+++ b/sources_non_forked/vim-fugitive/README.markdown
@@ -0,0 +1,120 @@
+# 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` that
+mofo.  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.  `:Gremove` 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 GitHub, with optional line
+range (try it in visual mode!).  If your current repository isn't on
+GitHub, `git instaweb` will be spun up instead.
+
+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, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-fugitive.git
+
+Once help tags have been generated, you can view the manual with
+`:help fugitive`.
+
+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/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
new file mode 100644
index 00000000..f40afcfb
--- /dev/null
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -0,0 +1,317 @@
+*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:
+
+                        <C-N> next file
+                        <C-P> previous file
+                        <CR>  |:Gedit|
+                        -     |:Git| add
+                        -     |:Git| reset (staged files)
+                        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|
+
+                                                *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.  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 muck with the index with commands like
+                        git-add and git-reset while a commit message is
+                        pending.
+
+                                                *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.
+
+                                                *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.  Use |do| and |dp| and write to the
+                        index file to simulate "git add --patch".
+
+                                                *fugitive-:Gsdiff*
+:Gsdiff [revision]      Like |:Gdiff|, but split horizontally.
+
+                                                *fugitive-:Gvdiff*
+:Gvdiff [revision]      Identical to |:Gdiff|.  For symmetry with |:Gsdiff|.
+
+                                                *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-:Gremove*
+:Gremove                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-:Gblame*
+:Gblame [flags]         Run git-blame on the file and open the results in a
+                        scroll bound vertical split.  Press enter on a line to
+                        reblame the file as it was in that commit.  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:
+
+                        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*
+:[range]Gbrowse         If the remote for the current branch is on GitHub,
+                        open the current file, blob, tree, commit, or tag
+                        (with git-web--browse) on GitHub.  Otherwise, open the
+                        current file, blob, tree, commit, or tag in
+                        git-instaweb (if you have issues, verify you can run
+                        "git instaweb" from a terminal).  If a range is given,
+                        it is appropriately appended to the URL as an anchor.
+
+                        To use with GitHub FI, point g:fugitive_github_domains
+                        at a list of domains:
+>
+                        let g:fugitive_github_domains = ['https://example.com']
+~
+:[range]Gbrowse!        Like :Gbrowse, but put the URL on the clipboard rather
+                        than opening it.
+
+:[range]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.
+
+:[range]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.
+
+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/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
new file mode 100644
index 00000000..51e52d88
--- /dev/null
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -0,0 +1,2587 @@
+" fugitive.vim - A Git wrapper so awesome, it should be illegal
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.0
+" 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
+
+" Utility {{{1
+
+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:shellesc(arg) abort
+  if a:arg =~ '^[A-Za-z0-9_/.-]\+$'
+    return a:arg
+  elseif &shell =~# 'cmd'
+    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)
+  echohl WarningMsg
+  echomsg a:str
+  echohl None
+  let v:warningmsg = a:str
+endfunction
+
+function! s:shellslash(path)
+  if exists('+shellslash') && !&shellslash
+    return s:gsub(a:path,'\\','/')
+  else
+    return a:path
+  endif
+endfunction
+
+let s:git_versions = {}
+
+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()
+  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()
+  for command in s:commands
+    exe 'command! -buffer '.command
+  endfor
+endfunction
+
+augroup fugitive_utility
+  autocmd!
+  autocmd User Fugitive call s:define_commands()
+augroup END
+
+let s:abstract_prototype = {}
+
+" }}}1
+" Initialization {{{1
+
+function! fugitive#is_git_dir(path) abort
+  let path = s:sub(a:path, '[\/]$', '') . '/'
+  return isdirectory(path.'objects') && isdirectory(path.'refs') && getfsize(path.'HEAD') > 10
+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
+  let root = s:shellslash(simplify(fnamemodify(a:path, ':p:s?[\/]$??')))
+  let previous = ""
+  while root !=# previous
+    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)
+  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
+    endif
+  endif
+  if exists('b:git_dir')
+    silent doautocmd User Fugitive
+    cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
+    nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
+    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.'/tags', ', ')) == -1
+      call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags'))
+      if &filetype !=# ''
+        call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
+      endif
+    endif
+  endif
+endfunction
+
+augroup fugitive
+  autocmd!
+  autocmd BufNewFile,BufReadPost * call fugitive#detect(expand('<amatch>: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 BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
+augroup END
+
+" }}}1
+" Repository {{{1
+
+let s:repo_prototype = {}
+let s:repos = {}
+
+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(...)
+  return call('s:repo', a:000)
+endfunction
+
+function! s:repo_dir(...) dict abort
+  return join([self.git_dir]+a:000,'/')
+endfunction
+
+function! s:repo_configured_tree() dict abort
+  if !has_key(self,'_tree')
+    let self._tree = ''
+    if filereadable(self.dir('config'))
+      let config = readfile(self.dir('config'),'',10)
+      call filter(config,'v:val =~# "^\\s*worktree *="')
+      if len(config) == 1
+        let self._tree = matchstr(config[0], '= *\zs.*')
+      endif
+    endif
+  endif
+  if self._tree =~# '^\.'
+    return simplify(self.dir(self._tree))
+  else
+    return self._tree
+  endif
+endfunction
+
+function! s:repo_tree(...) dict abort
+  if self.dir() =~# '/\.git$'
+    let dir = self.dir()[0:-6]
+  else
+    let dir = self.configured_tree()
+  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 self.configured_tree() ==# ''
+  endif
+endfunction
+
+function! s:repo_translate(spec) dict abort
+  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 =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(self.dir(a:spec))
+    return self.dir(a:spec)
+  elseif filereadable(self.dir('refs/'.a:spec))
+    return self.dir('refs/'.a:spec)
+  elseif filereadable(self.dir('refs/tags/'.a:spec))
+    return self.dir('refs/tags/'.a:spec)
+  elseif filereadable(self.dir('refs/heads/'.a:spec))
+    return self.dir('refs/heads/'.a:spec)
+  elseif filereadable(self.dir('refs/remotes/'.a:spec))
+    return self.dir('refs/remotes/'.a:spec)
+  elseif filereadable(self.dir('refs/remotes/'.a:spec.'/HEAD'))
+    return self.dir('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] : ''
+    endif
+
+    return branch
+endfunction
+
+call s:add_methods('repo',['dir','configured_tree','tree','bare','translate','head'])
+
+function! s:repo_git_command(...) dict abort
+  let git = g:fugitive_git_executable . ' --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
+  return s:sub(system(call(self.git_command,a:000,self)),'\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:repo().tree()`'
+    return call(s:repo().git_chomp, a:000, s:repo())
+  finally
+    execute cd.'`=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"))
+      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(system(s:repo().git_command('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','--get-regexp','^alias[.]'),"\n")
+      let self._aliases[matchstr(line,'\.\zs\S\+')] = matchstr(line,' \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 g:fugitive_git_executable . ' --no-pager' . args . ' log -1'
+  else
+    return g:fugitive_git_executable . args . ' show'
+  endif
+endfunction
+
+call s:add_methods('repo',['keywordprg'])
+
+" }}}1
+" Buffer {{{1
+
+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 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:buffer_path(...) dict abort
+  let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
+  if rev != ''
+    let rev = s:sub(rev,'\w*','')
+  elseif self.spec()[0 : len(self.repo().dir())] ==# self.repo().dir() . '/'
+    let rev = '/.git'.self.spec()[strlen(self.repo().dir()) : -1]
+  elseif !self.repo().bare() && self.spec()[0 : len(self.repo().tree())] ==# 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'])
+
+" }}}1
+" Git {{{1
+
+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:repo().tree()`'
+    execute a:cmd
+  finally
+    execute cd.'`=dir`'
+  endtry
+endfunction
+
+function! s:Git(bang,cmd) abort
+  if a:bang
+    return s:Edit('edit',1,a:cmd)
+  endif
+  let git = s:repo().git_command()
+  if has('gui_running') && !has('win32')
+    let git .= ' --no-pager'
+  endif
+  let cmd = matchstr(a:cmd,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
+  call s:ExecuteInTree('!'.git.' '.cmd)
+  call fugitive#reload_status()
+  return matchstr(a:cmd,'\v\C\\@<!%(\\\\)*\|\zs.*')
+endfunction
+
+function! s:GitComplete(A,L,P) abort
+  if !exists('s:exec_path')
+    let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
+  endif
+  let cmds = map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")')
+  if a:L =~ ' [[:alnum:]-]\+ '
+    return s:repo().superglob(a:A)
+  elseif a:A == ''
+    return sort(cmds+keys(s:repo().aliases()))
+  else
+    return filter(sort(cmds+keys(s:repo().aliases())),'v:val[0:strlen(a:A)-1] ==# a:A')
+  endif
+endfunction
+
+" }}}1
+" Gcd, Glcd {{{1
+
+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  :cd<bang>  `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
+call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :lcd<bang> `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
+
+" }}}1
+" Gstatus {{{1
+
+call s:command("-bar Gstatus :execute s:Status()")
+augroup fugitive_status
+  autocmd!
+  if !has('win32')
+    autocmd FocusGained,ShellCmdPost * 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) ==# '# Changes to be committed:'
+    return [matchstr(filename, colon.' *\zs.*'), 'staged']
+  elseif getline(lnum+2) =~# '^# .*\<git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
+    return [matchstr(filename, colon.' *\zs.*'), 'unstaged']
+  elseif getline(lnum+1) =~# '^# .*\<git add/rm ' || getline(lnum) ==# '# Unmerged paths:'
+    return [matchstr(filename, colon.' *\zs.*'), 'unmerged']
+  else
+    return [filename, 'untracked']
+  endif
+endfunction
+
+function! s:StageNext(count)
+  for i in range(a:count)
+    call search('^#\t.*','W')
+  endfor
+  return '.'
+endfunction
+
+function! s:StagePrevious(count)
+  if line('.') == 1 && exists(':CtrlP')
+    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)
+  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: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
+      if !exists('first_filename')
+        let first_filename = filename
+      endif
+      execute lnum
+      if filename =~ ' -> '
+        let cmd = ['mv','--'] + reverse(split(filename,' -> '))
+        let filename = cmd[-1]
+      elseif section ==# 'staged'
+        let cmd = ['reset','-q','--',filename]
+      elseif getline(lnum) =~# '^#\tdeleted:'
+        let cmd = ['rm','--',filename]
+      elseif getline(lnum) =~# '^#\tmodified:'
+        let cmd = ['add','--',filename]
+      else
+        let cmd = ['add','-A','--',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(add,'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
+
+" }}}1
+" Gcommit {{{1
+
+call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit(<q-args>)")
+
+function! s:Commit(args) abort
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  let msgfile = s:repo().dir('COMMIT_EDITMSG')
+  let outfile = tempname()
+  let errorfile = tempname()
+  try
+    try
+      execute cd.s:fnameescape(s:repo().tree())
+      if &shell =~# 'cmd'
+        let command = ''
+        let old_editor = $GIT_EDITOR
+        let $GIT_EDITOR = 'false'
+      else
+        let command = 'env GIT_EDITOR=false '
+      endif
+      let command .= s:repo().git_command('commit').' '.a:args
+      if &shell =~# 'csh'
+        noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile
+      elseif a:args =~# '\%(^\| \)--interactive\>'
+        noautocmd execute '!'.command.' 2> '.errorfile
+      else
+        noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile
+      endif
+    finally
+      execute cd.'`=dir`'
+    endtry
+    if !has('gui_running')
+      redraw!
+    endif
+    if !v:shell_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,'%(%(^| )-- )@<!%(^| )@<=%(-[es]|--edit|--interactive|--signoff)%($| )','')
+        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','')
+        let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))')
+        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 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(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=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--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()
+  let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments')
+  if !empty(args)
+    call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','')
+    return s:Commit(args)
+  endif
+  return ''
+endfunction
+
+augroup fugitive_commit
+  autocmd!
+  autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
+augroup END
+
+" }}}1
+" Ggrep, Glog {{{1
+
+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=* -complete=customlist,s:EditComplete Glog :execute s:Log('grep<bang>',<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gllog :execute s:Log('lgrep<bang>',<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:repo().tree()`'
+    let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n')
+    let &grepformat = '%f:%l:%m'
+    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
+      elseif a:arg =~# '\%(^\| \)--cached\>'
+        let entry.filename = s:repo().translate(':0:'.bufname(entry.bufnr))
+        unlet! entry.bufnr
+      endif
+    endfor
+    if a:cmd =~# '^l'
+      call setloclist(0, list, 'r')
+    else
+      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.'`=dir`'
+  endtry
+endfunction
+
+function! s:Log(cmd,...)
+  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 =~# '/.'
+    let cmd += ['--',path[1:-1]]
+  endif
+  let grepformat = &grepformat
+  let grepprg = &grepprg
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  try
+    execute cd.'`=s:repo().tree()`'
+    let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#')
+    let &grepformat = '%f::%m'
+    exe a:cmd
+  finally
+    let &grepformat = grepformat
+    let &grepprg = grepprg
+    execute cd.'`=dir`'
+  endtry
+endfunction
+
+" }}}1
+" Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread {{{1
+
+function! s:Edit(cmd,bang,...) abort
+  let buffer = s:buffer()
+  if a:cmd !~# 'read'
+    if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
+      wincmd p
+      if &diff
+        let mywinnr = winnr()
+        for winnr in range(winnr('$'),1,-1)
+          if winnr != mywinnr && getwinvar(winnr,'&diff')
+            execute winnr.'wincmd w'
+            close
+            wincmd p
+          endif
+        endfor
+      endif
+    endif
+  endif
+
+  if a:bang
+    let args = s:gsub(join(a:000, ' '), '\\@<!%(\\\\)*\zs[%#]', '\=s:buffer().expand(submatch(0))')
+    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())
+      let s:temp_files[temp] = buffer.repo().dir()
+      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 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>)")
+
+" }}}1
+" Gwrite, Gwq {{{1
+
+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 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', file)
+  else
+    let error = s:repo().git_chomp_in_tree('add', file)
+  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)
+  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
+
+" }}}1
+" Gdiff {{{1
+
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff(<bang>0,<f-args>)")
+call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff(0,<f-args>)")
+call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff(1,<f-args>)")
+
+augroup fugitive_diff
+  autocmd!
+  autocmd BufWinLeave * if s:diff_window_count() == 2 && &diff && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | endif
+  autocmd BufWinEnter * if s:diff_window_count() == 1 && &diff && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff() | endif
+augroup END
+
+function! s:diff_window_count()
+  let c = 0
+  for nr in range(1,winnr('$'))
+    let c += getwinvar(nr,'&diff')
+  endfor
+  return c
+endfunction
+
+function! s:diff_restore()
+  let restore = 'setlocal nodiff noscrollbind'
+        \ . ' scrollopt=' . &l:scrollopt
+        \ . (&l:wrap ? ' wrap' : ' nowrap')
+        \ . ' foldmethod=' . &l:foldmethod
+        \ . ' foldcolumn=' . &l:foldcolumn
+        \ . ' foldlevel=' . &l:foldlevel
+  if has('cursorbind')
+    let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind'
+  endif
+  return restore
+endfunction
+
+function! s:diffthis()
+  if !&diff
+    let w:fugitive_diff_restore = s:diff_restore()
+    diffthis
+  endif
+endfunction
+
+function! s:diffoff()
+  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)
+  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
+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(bang,...)
+  let vert = a:bang ? '' : 'vertical '
+  if exists(':DiffGitCached')
+    return 'DiffGitCached'
+  elseif (!a:0 || a:1 == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
+    let nr = bufnr('')
+    execute 'leftabove '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`'
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
+    call s:diffthis()
+    wincmd p
+    execute 'rightbelow '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':3''))`'
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
+    call s:diffthis()
+    wincmd p
+    call s:diffthis()
+    return ''
+  elseif a:0
+    let arg = join(a:000, ' ')
+    if arg ==# ''
+      return ''
+    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\+')
+    if s:buffer().compare_age(commit) < 0
+      execute 'rightbelow '.vert.'split '.s:fnameescape(spec)
+    else
+      execute 'leftabove '.vert.'split '.s:fnameescape(spec)
+    endif
+    call s:diffthis()
+    wincmd p
+    call s:diffthis()
+    return ''
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+" }}}1
+" Gmove, Gremove {{{1
+
+function! s:Move(force,destination)
+  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)
+  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(force)
+  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 'bdelete'.(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(<bang>0)" |
+        \ endif
+augroup END
+
+" }}}1
+" Gblame {{{1
+
+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
+augroup END
+
+function! s:linechars(pattern)
+  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
+  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 basecmd = escape(call(s:repo().git_command,cmd+['--',s:buffer().path()],s:repo()),'!')
+    try
+      let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+      if !s:repo().bare()
+        let dir = getcwd()
+        execute cd.'`=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.'`=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 getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr')
+            execute winbufnr(winnr).'bdelete'
+          endif
+        endfor
+        let bufnr = bufnr('')
+        let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)'
+        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
+        let top = line('w0') + &scrolloff
+        let current = line('.')
+        let s:temp_files[temp] = s:repo().dir()
+        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
+        setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable 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> 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.'`=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 'if foldlevel(".")|foldopen!|endif'
+      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
+  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
+  return ''
+endfunction
+
+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        Function
+  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
+endfunction
+
+" }}}1
+" Gbrowse {{{1
+
+call s:command("-bar -bang -range -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)")
+
+function! s:Browse(bang,line1,count,...) abort
+  try
+    let rev = a:0 ? substitute(join(a:000, ' '),'@[[:alnum:]_-]*\%(://.\{-\}\)\=$','','') : ''
+    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\+')
+      let path = matchstr(full,'://.*//\w\+\zs/.*')
+      if commit =~ '..'
+        let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':'))
+      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 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
+
+    if a:0 && join(a:000, ' ') =~# '@[[:alnum:]_-]*\%(://.\{-\}\)\=$'
+      let remote = matchstr(join(a:000, ' '),'@\zs[[:alnum:]_-]\+\%(://.\{-\}\)\=$')
+    elseif path =~# '^\.git/refs/remotes/.'
+      let remote = matchstr(path,'^\.git/refs/remotes/\zs[^/]\+')
+    else
+      let remote = 'origin'
+      let branch = matchstr(rev,'^[[:alnum:]/._-]\+\ze[:^~@]')
+      if branch ==# '' && path =~# '^\.git/refs/\w\+/'
+        let branch = s:sub(path,'^\.git/refs/\w+/','')
+      endif
+      if filereadable(s:repo().dir('refs/remotes/'.branch))
+        let remote = matchstr(branch,'[^/]\+')
+        let rev = rev[strlen(remote)+1:-1]
+      else
+        if branch ==# ''
+          let branch = matchstr(s:repo().head_ref(),'\<refs/heads/\zs.*')
+        endif
+        if branch != ''
+          let remote = s:repo().git_chomp('config','branch.'.branch.'.remote')
+          if remote =~# '^\.\=$'
+            let remote = 'origin'
+          elseif rev[0:strlen(branch)-1] ==# branch && rev[strlen(branch)] =~# '[:^~@]'
+            let rev = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1] . rev[strlen(branch):-1]
+          endif
+        endif
+      endif
+    endif
+
+    let raw = s:repo().git_chomp('config','remote.'.remote.'.url')
+    if raw ==# ''
+      let raw = remote
+    endif
+
+    let url = s:github_url(s:repo(),raw,rev,commit,path,type,a:line1,a:count)
+    if url == ''
+      let url = s:instaweb_url(s:repo(),rev,commit,path,type,a:count > 0 ? a:line1 : 0)
+    endif
+
+    if url == ''
+      call s:throw("Instaweb failed to start and '".remote."' is not a GitHub remote")
+    endif
+
+    if a:bang
+      let @* = url
+      return 'echomsg '.string(url)
+    else
+      return 'echomsg '.string(url).'|call fugitive#buffer().repo().git_chomp("web--browse",'.string(url).')'
+    endif
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:github_url(repo,url,rev,commit,path,type,line1,line2) abort
+  let path = a:path
+  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(a:url,'^\%(https\=://\|git://\|git@\)\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
+  if repo ==# ''
+    return ''
+  endif
+  if index(domains, 'http://' . matchstr(repo, '^[^:/]*')) >= 0
+    let root = 'http://' . s:sub(repo,':','/')
+  else
+    let root = 'https://' . s:sub(repo,':','/')
+  endif
+  if path =~# '^\.git/refs/heads/'
+    let branch = a:repo.git_chomp('config','branch.'.path[16:-1].'.merge')[11:-1]
+    if branch ==# ''
+      return root . '/commits/' . path[16:-1]
+    else
+      return root . '/commits/' . branch
+    endif
+  elseif path =~# '^\.git/refs/.'
+    return root . '/commits/' . matchstr(path,'[^/]\+$')
+  elseif path =~# '.git/\%(config$\|hooks\>\)'
+    return root . '/admin'
+  elseif path =~# '^\.git\>'
+    return root
+  endif
+  if a:rev =~# '^[[:alnum:]._-]\+:'
+    let commit = matchstr(a:rev,'^[^:]*')
+  elseif a:commit =~# '^\d\=$'
+    let local = matchstr(a:repo.head_ref(),'\<refs/heads/\zs.*')
+    let commit = a:repo.git_chomp('config','branch.'.local.'.merge')[11:-1]
+    if commit ==# ''
+      let commit = local
+    endif
+  else
+    let commit = a:commit
+  endif
+  if a:type == 'tree'
+    let url = s:sub(root . '/tree/' . commit . '/' . path,'/$','')
+  elseif a:type == 'blob'
+    let url = root . '/blob/' . commit . '/' . path
+    if a:line2 > 0 && a:line1 == a:line2
+      let url .= '#L' . a:line1
+    elseif a:line2 > 0
+      let url .= '#L' . a:line1 . '-' . a:line2
+    endif
+  elseif a:type == 'tag'
+    let commit = matchstr(getline(3),'^tag \zs.*')
+    let url = root . '/tree/' . commit
+  else
+    let url = root . '/commit/' . commit
+  endif
+  return url
+endfunction
+
+function! s:instaweb_url(repo,rev,commit,path,type,...) abort
+  let output = a:repo.git_chomp('instaweb','-b','unknown')
+  if output =~# 'http://'
+    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:repo.dir(),':t')
+  else
+    return ''
+  endif
+  if a:path =~# '^\.git/refs/.'
+    return root . ';a=shortlog;h=' . matchstr(a:path,'^\.git/\zs.*')
+  elseif a:path =~# '^\.git\>'
+    return root
+  endif
+  let url = root
+  if a:commit =~# '^\x\{40\}$'
+    if a:type ==# 'commit'
+      let url .= ';a=commit'
+    endif
+    let url .= ';h=' . a:repo.rev_parse(a:commit . (a:path == '' ? '' : ':' . a:path))
+  else
+    if a:type ==# 'blob'
+      let tmp = tempname()
+      silent execute 'write !'.a:repo.git_command('hash-object','-w','--stdin').' > '.tmp
+      let url .= ';h=' . readfile(tmp)[0]
+    else
+      try
+        let url .= ';h=' . a:repo.rev_parse((a:commit == '' ? 'HEAD' : ':' . a:commit) . ':' . a:path)
+      catch /^fugitive:/
+        call s:throw('fugitive: cannot browse uncommitted file')
+      endtry
+    endif
+    let root .= ';hb=' . matchstr(a:repo.head_ref(),'[^ ]\+$')
+  endif
+  if a:path !=# ''
+    let url .= ';f=' . a:path
+  endif
+  if a:0 && a:1
+    let url .= '#l' . a:1
+  endif
+  return url
+endfunction
+
+" }}}1
+" File access {{{1
+
+function! s:ReplaceCmd(cmd,...) abort
+  let fn = expand('%:p')
+  let tmp = tempname()
+  let prefix = ''
+  try
+    if a:0 && a:1 != ''
+      if &shell =~# 'cmd'
+        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
+    if &shell =~# 'cmd'
+      let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
+      call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').' > '.tmp.'"')
+    else
+      call system(' ('.prefix.a:cmd.' > '.tmp.') ')
+    endif
+  finally
+    if exists('old_index')
+      let $GIT_INDEX_FILE = old_index
+    endif
+  endtry
+  silent exe 'keepalt file '.tmp
+  try
+    silent edit!
+  finally
+    silent exe 'keepalt file '.s:fnameescape(fn)
+    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()
+  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',
+              \ 'status')
+      endif
+      try
+        execute cd.'`=s:repo().tree()`'
+        call s:ReplaceCmd(cmd, index)
+      finally
+        execute cd.'`=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('Gvdiff')<CR>
+    nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gvdiff')<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> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
+    nnoremap <buffer> <silent> R :<C-U>edit<CR>
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:FileRead()
+  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()
+  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
+    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()
+  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 &shell =~# 'cmd'
+      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
+      silent execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      call fugitive#reload_status()
+      return ''
+    else
+      return 'echoerr '.string('fugitive: '.error)
+    endif
+  finally
+    call delete(tmp)
+  endtry
+endfunction
+
+function! s:BufReadObject()
+  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 'fugitive: unrecognized git 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 %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 %T%nparent %P%nauthor %an <%ae> %ad%ncommitter %cn <%ce> %cd%nencoding %e%n%n%s%n%n%b',hash))
+          call search('^parent ')
+          if getline('.') ==# 'parent '
+            silent delete_
+          else
+            silent s/\%(^parent\)\@<! /\rparent /ge
+          endif
+          if search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
+            silent delete_
+          end
+          1
+        endif
+      elseif b:fugitive_type ==# 'blob'
+        call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
+      endif
+    finally
+      call setpos('.',pos)
+      setlocal ro noma nomod
+      if &bufhidden ==# ''
+        setlocal bufhidden=delete
+      endif
+      if b:fugitive_type !=# 'blob'
+        set filetype=git
+        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
+augroup END
+
+" }}}1
+" Temp files {{{1
+
+if !exists('s:temp_files')
+  let s:temp_files = {}
+endif
+
+augroup fugitive_temp
+  autocmd!
+  autocmd BufNewFile,BufReadPost *
+        \ if has_key(s:temp_files,expand('<afile>:p')) |
+        \   let b:git_dir = s:temp_files[expand('<afile>:p')] |
+        \   let b:git_type = 'temp' |
+        \   call fugitive#detect(expand('<afile>:p')) |
+        \   setlocal bufhidden=delete |
+        \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
+        \ endif
+augroup END
+
+" }}}1
+" Go to file {{{1
+
+function! s:JumpInit() abort
+  nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
+  if !&modifiable
+    if exists(':CtrlP')
+      nnoremap <buffer> <silent> <C-P> :<C-U>exe 'CtrlP '.fnameescape(<SID>repo().tree())<CR>
+    endif
+    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:GF(mode) 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('.') == 1
+        return ""
+      elseif showtree && line('.') > 2
+        return s:Edit(a:mode,0,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$',''))
+      elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t'
+        return s:Edit(a:mode,0,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 s:Edit(a:mode,0,ref)
+      endif
+
+    else
+
+      " 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 s:Edit(a:mode,0,file)
+
+      elseif getline('.') =~# '^#\trenamed:.* -> '
+        let file = '/'.matchstr(getline('.'),' -> \zs.*')
+        return s:Edit(a:mode,0,file)
+      elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.'
+        let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
+        return s:Edit(a:mode,0,file)
+      elseif getline('.') =~# '^#\t.'
+        let file = '/'.matchstr(getline('.'),'#\t\zs.*')
+        return s:Edit(a:mode,0,file)
+      elseif getline('.') =~# ': needs merge$'
+        let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$')
+        return s:Edit(a:mode,0,file).'|Gdiff'
+
+      elseif getline('.') ==# '# Not currently on any branch.'
+        return s:Edit(a:mode,0,'HEAD')
+      elseif getline('.') =~# '^# On branch '
+        let file = 'refs/heads/'.getline('.')[12:]
+        return s:Edit(a:mode,0,file)
+      elseif getline('.') =~# "^# Your branch .*'"
+        let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'")
+        return s:Edit(a:mode,0,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 s:Edit(a:mode,0,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 s:Edit(a:mode,0,ref)
+
+      elseif getline('.') =~ '^tree \x\{40\}$'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        if s:repo().rev_parse(myhash.':') == ref
+          let ref = myhash.':'
+        endif
+        return s:Edit(a:mode,0,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.'$'
+        return ''
+
+      elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*')
+
+      elseif getline('.') =~# '^[+-]\{3\} [ab/]'
+        let ref = getline('.')[4:]
+
+      elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW')
+        let type = getline('.')[0]
+        let lnum = line('.') - 1
+        let offset = -1
+        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\} [ab]/','bnW'))[4:-1]
+        let dcmd = '+'.offset.'|if foldlevel(".")|foldopen!|endif'
+        let dref = ''
+
+      elseif getline('.') =~# '^rename from '
+        let ref = 'a/'.getline('.')[12:]
+      elseif getline('.') =~# '^rename to '
+        let ref = 'b/'.getline('.')[10:]
+
+      elseif getline('.') =~# '^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)'
+        let dref = matchstr(getline('.'),'\Cdiff --git \zs\%(a/.*\|/dev/null\)\ze \%(b/.*\|/dev/null\)')
+        let ref = matchstr(getline('.'),'\Cdiff --git \%(a/.*\|/dev/null\) \zs\%(b/.*\|/dev/null\)')
+        let dcmd = 'Gdiff'
+
+      elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)'
+        let line = getline(line('.')-1)
+        let dref = matchstr(line,'\Cdiff --git \zs\%(a/.*\|/dev/null\)\ze \%(b/.*\|/dev/null\)')
+        let ref = matchstr(line,'\Cdiff --git \%(a/.*\|/dev/null\) \zs\%(b/.*\|/dev/null\)')
+        let dcmd = 'Gdiff!'
+
+      elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$'
+        let ref = getline('.')
+      else
+        let ref = ''
+      endif
+
+      if myhash ==# ''
+        let ref = s:sub(ref,'^a/','HEAD:')
+        let ref = s:sub(ref,'^b/',':0:')
+        if exists('dref')
+          let dref = s:sub(dref,'^a/','HEAD:')
+        endif
+      else
+        let ref = s:sub(ref,'^a/',myhash.'^:')
+        let ref = s:sub(ref,'^b/',myhash.':')
+        if exists('dref')
+          let dref = s:sub(dref,'^a/',myhash.'^:')
+        endif
+      endif
+
+      if ref ==# '/dev/null'
+        " Empty blob
+        let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
+      endif
+
+      if exists('dref')
+        return s:Edit(a:mode,0,ref) . '|'.dcmd.' '.s:fnameescape(dref)
+      elseif ref != ""
+        return s:Edit(a:mode,0,ref)
+      endif
+
+    endif
+    return ''
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+" }}}1
+" Statusline {{{1
+
+function! s:repo_head_ref() dict abort
+  return readfile(self.dir('HEAD'))[0]
+endfunction
+
+call s:add_methods('repo',['head_ref'])
+
+function! fugitive#statusline(...)
+  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(...)
+  if !exists('b:git_dir')
+    return ''
+  endif
+
+  return s:repo().head(a:0 ? a:1 : 0)
+endfunction
+
+" }}}1
+" Folding {{{1
+
+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 .\{-\} a/\zs.*\ze b/')
+    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
+
+" }}}1
+
+" vim:set et sw=2:
diff --git a/sources_non_forked/vim-less/README.md b/sources_non_forked/vim-less/README.md
index 6d15adf9..697ad124 100644
--- a/sources_non_forked/vim-less/README.md
+++ b/sources_non_forked/vim-less/README.md
@@ -1,4 +1,4 @@
-# VIM-LESS #
+# VIM-LESS
 
 This vim bundle adds syntax highlighting, indenting and autocompletion for the dynamic stylesheet language [LESS](http://lesscss.org).
 
@@ -8,7 +8,8 @@ in `after/syntax/css.vim` or `after/syntax/css/*.vim`.
 
 ![vim-less with vim-css-color and vim-css3-syntax (colorscheme solarized)](https://github.com/lenniboy/vim-less/raw/master/screenshot.png)
 
-## Installing and Using ##
+
+## Installing and Using
 
 - Install [pathogen](http://www.vim.org/scripts/script.php?script_id=2332) into `~/.vim/autoload/` and add the
    following line to your `~/.vimrc`:
@@ -23,19 +24,21 @@ in `after/syntax/css.vim` or `after/syntax/css/*.vim`.
 
 - OR use [vundle](https://github.com/gmarik/vundle), adding this line to your `~/.vimrc`:
 
-        Bundle 'lunaru/vim-less'
+        Bundle 'groenewege/vim-less'
 
 - OR use git submodules:
 
         $ git submodule add https://github.com/groenewege/vim-less.git bundle/vim-less
         $ git submodule init
 
+
 ### Map
 .less to .css , lessc is required.
 
     nnoremap ,m :w <BAR> !lessc % > %:t:r.css<CR><space>
 
-## Credits ##
+
+## Credits
 
 Inspiration from [vim-haml](https://github.com/tpope/vim-haml),
 [scss-syntax.vim](https://github.com/cakebaker/scss-syntax.vim) and
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index c61ac01e..04da4c6b 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -106,3 +106,7 @@ Obviously inspired by Sublime Text's [multiple selection][sublime-multiple-selec
 [Neobundle]:http://github.com/Shougo/neobundle.vim
 [emacs-multiple-cursors]:https://github.com/magnars/multiple-cursors.el
 
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/terryma/vim-multiple-cursors/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 9aebb051..33380c1d 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -10,6 +10,8 @@ additional contributions from:
 
 * [alderz](https://github.com/alderz)
 * [asymmetric](https://github.com/asymmetric)
+* [bpugh](https://github.com/bpugh)
+* [bruno-](https://github.com/bruno-)
 * [darkwise](https://github.com/darkwise)
 * [henrik](https://github.com/henrik)
 * [holizz](https://github.com/holizz)
@@ -36,3 +38,4 @@ additional contributions from:
 * [steveno](https://github.com/steveno)
 * [taq](https://github.com/taq)
 * [thisgeek](https://github.com/thisgeek)
+* [Xandaros](https://github.com/Xandaros)
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index eb7fae64..02718478 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -17,8 +17,10 @@ Garbas][garbas], [Marc Weber][marcweber], and [Adnan Zafar][ajzafar].
 
 ## Installing SnipMate ##
 
-SnipMate depends on [vim-addon-mw-utils][mw-utils] and [tlib][tlib]. We
-recommend one of the following ways of installing all three.
+We recommend one of the following methods for installing SnipMate and its
+dependencies. SnipMate depends on [vim-addon-mw-utils][mw-utils] and
+[tlib][tlib]. Since SnipMate does not ship with any snippets, we suggest
+looking at the [vim-snippets][vim-snippets] repository.
 
 * Using [Pathogen][pathogen], run the following commands:
 
@@ -27,6 +29,9 @@ recommend one of the following ways of installing all three.
         % git clone https://github.com/MarcWeber/vim-addon-mw-utils.git
         % git clone https://github.com/garbas/vim-snipmate.git
 
+        # Optional:
+        % git clone https://github.com/honza/vim-snippets.git
+
 * Using [VAM][vam], add `vim-snippets` to the list of packages to be installed.
 
 * Using [Vundle][vundle], add the following to your `vimrc` then run
@@ -36,8 +41,8 @@ recommend one of the following ways of installing all three.
         Bundle "tomtom/tlib_vim"
         Bundle "garbas/vim-snipmate"
 
-Lastly, since SnipMate does not ship with any snippets, we suggest looking at
-the [vim-snippets][vim-snippets] repository.
+        " Optional:
+        Bundle "honza/vim-snippets"
 
 
 [ultisnips]: https://github.com/sirver/ultisnips
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 00041f33..bb3ecdfd 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -22,17 +22,18 @@ let s:c.read_snippets_cached = get(s:c, 'read_snippets_cached', {'func' : functi
 
 " if filetype is objc, cpp, cs or cu also append snippets from scope 'c'
 " you can add multiple by separating scopes by ',', see s:AddScopeAliases
-" TODO add documentation to doc/*
 let s:c.scope_aliases = get(s:c, 'scope_aliases', {})
-let s:c.scope_aliases.objc = get(s:c.scope_aliases, 'objc', 'c')
-let s:c.scope_aliases.cpp = get(s:c.scope_aliases, 'cpp', 'c')
-let s:c.scope_aliases.cu = get(s:c.scope_aliases, 'cu', 'c')
-let s:c.scope_aliases.xhtml = get(s:c.scope_aliases, 'xhtml', 'html')
-let s:c.scope_aliases.html = get(s:c.scope_aliases, 'html', 'javascript')
-let s:c.scope_aliases.php = get(s:c.scope_aliases, 'php', 'php,html,javascript')
-let s:c.scope_aliases.ur = get(s:c.scope_aliases, 'ur', 'html,javascript')
-let s:c.scope_aliases.mxml = get(s:c.scope_aliases, 'mxml', 'actionscript')
-let s:c.scope_aliases.eruby = get(s:c.scope_aliases, 'eruby', 'eruby-rails,html')
+if !exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases
+	let s:c.scope_aliases.objc = get(s:c.scope_aliases, 'objc', 'c')
+	let s:c.scope_aliases.cpp = get(s:c.scope_aliases, 'cpp', 'c')
+	let s:c.scope_aliases.cu = get(s:c.scope_aliases, 'cu', 'c')
+	let s:c.scope_aliases.xhtml = get(s:c.scope_aliases, 'xhtml', 'html')
+	let s:c.scope_aliases.html = get(s:c.scope_aliases, 'html', 'javascript')
+	let s:c.scope_aliases.php = get(s:c.scope_aliases, 'php', 'php,html,javascript')
+	let s:c.scope_aliases.ur = get(s:c.scope_aliases, 'ur', 'html,javascript')
+	let s:c.scope_aliases.mxml = get(s:c.scope_aliases, 'mxml', 'actionscript')
+	let s:c.scope_aliases.eruby = get(s:c.scope_aliases, 'eruby', 'eruby-rails,html')
+endif
 
 " set this to "\<tab>" to make snipmate not swallow tab (make sure to not have
 " expandtab set). Remember that you can always enter tabs by <c-v> <tab> then
@@ -181,7 +182,7 @@ fun! s:ProcessSnippet(snip)
 	endif
 
 	if &et " Expand tabs to spaces if 'expandtab' is set.
-		return substitute(snippet, '\t', repeat(' ', &sts ? &sts : &sw), 'g')
+		return substitute(snippet, '\t', repeat(' ', (&sts > 0) ? &sts : &sw), 'g')
 	endif
 	return snippet
 endf
@@ -722,10 +723,8 @@ fun! snipMate#ShowAvailableSnips()
 	return ''
 endf
 
-
-" user interface implementation {{{1
-
-fun! snipMate#TriggerSnippet()
+" Pass an argument to force snippet expansion instead of triggering or jumping
+function! snipMate#TriggerSnippet(...)
 	if exists('g:SuperTabMappingForward')
 		if g:SuperTabMappingForward == "<tab>"
 			let SuperTabPlug = maparg('<Plug>SuperTabForward', 'i')
@@ -752,7 +751,7 @@ fun! snipMate#TriggerSnippet()
 		call feedkeys("\<tab>") | return ''
 	endif
 
-	if exists('b:snip_state')
+	if exists('b:snip_state') && a:0 == 0 " Jump only if no arguments
 		let jump = b:snip_state.jump_stop(0)
 		if type(jump) == 1 " returned a string
 			return jump
@@ -788,8 +787,7 @@ fun! snipMate#TriggerSnippet()
 	return word == ''
 	  \ ? "\<tab>"
 	  \ : "\<c-r>=snipMate#ShowAvailableSnips()\<cr>"
-endf
-
+endfunction
 
 fun! snipMate#BackwardsSnippet()
 	if exists('b:snip_state') | return b:snip_state.jump_stop(1) | endif
@@ -819,5 +817,4 @@ fun! snipMate#BackwardsSnippet()
 	return "\<s-tab>"
 endf
 
-
 " vim:noet:sw=4:ts=4:ft=vim
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index 06708a2b..a0f052d3 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -105,6 +105,25 @@ g:snipMate.scope_aliases        A |Dictionary| associating certain filetypes
                                 "ruby" or contains "ruby" as an entry in the
                                 case of dotted filetypes.
 
+g:snipMate_no_default_aliases
+                                When set to 1, prevents SnipMate from loading
+                                default scope aliases. The defaults are:
+                                    Filetype    Alias ~
+                                    cpp         c
+                                    cu          c
+                                    eruby       eruby-rails,html
+                                    html        javascript
+                                    mxml        actionscript
+                                    objc        c
+                                    php         php,html,javascript
+                                    ur          html,javascript
+                                    xhtml       html
+                                Note: Setting this option does not disable
+                                scope aliases entirely, only those made by
+                                SnipMate itself. Any scope aliases created by
+                                the user or someone else will still be in
+                                effect.
+
 g:snipMate['no_match_completion_feedkeys_chars']
                                 A string inserted when no match for a trigger
                                 is found. By default a tab is inserted
@@ -119,26 +138,32 @@ The mappings SnipMate uses can be customized with the |:map| commands. For
 example, to change the key that triggers snippets and moves to the next
 tabstop, >
 
-        :imap <C-J> <Plug>SnipMateNextOrTrigger
-        :smap <C-J> <Plug>SnipMateNextOrTrigger
+        :imap <C-J> <Plug>snipMateNextOrTrigger
+        :smap <C-J> <Plug>snipMateNextOrTrigger
 
 The list of possible <Plug> mappings is as follows:
 
-<Plug>SnipMateNextOrTrigger     Default: <Tab>          Mode: Insert, Select
+<Plug>snipMateNextOrTrigger     Default: <Tab>          Mode: Insert, Select
                                 Jumps to the next tab stop or, if none exists,
                                 try to expand a snippet. Use in both insert
                                 and select modes.
 
-<Plug>SnipMateBack              Default: <S-Tab>        Mode: Insert, Select
+<Plug>snipMateTrigger           Default: unmapped       Mode: Insert
+                                Try to expand a snippet regardless of any
+                                existing snippet expansion. If done within an
+                                expanded snippet, the outer snippet's tab
+                                stops are lost, unless expansion failed.
+
+<Plug>snipMateBack              Default: <S-Tab>        Mode: Insert, Select
                                 Jump to the previous tab stop, if it exists.
                                 Use in both insert and select modes.
 
-<Plug>SnipMateShow              Default: <C-R><Tab>     Mode: Insert
+<Plug>snipMateShow              Default: <C-R><Tab>     Mode: Insert
                                 Show all available snippets (that start with
                                 the previous text, if it exists). Use in
                                 insert mode.
 
-<Plug>SnipMateVisual            Default: <Tab>          Mode: Visual
+<Plug>snipMateVisual            Default: <Tab>          Mode: Visual
                                 See |SnipMate-visual|.
 
 Additionally, <CR> is mapped in visual mode in .snippets files for retabbing
diff --git a/sources_non_forked/vim-snipmate/ftplugin/snippet.vim b/sources_non_forked/vim-snipmate/ftplugin/snippet.vim
index bf09b424..242aa865 100644
--- a/sources_non_forked/vim-snipmate/ftplugin/snippet.vim
+++ b/sources_non_forked/vim-snipmate/ftplugin/snippet.vim
@@ -1,7 +1,7 @@
 command! -buffer -range=% RetabSnip <line1>,<line2>call snipMate#RetabSnip()
 vnoremap <buffer> <cr> :RetabSnip<cr>
 
-if !exists('g:nsippet_no_indentation_settings')
+if !exists('g:snippet_no_indentation_settings')
   setlocal sw=4
   setlocal tabstop=4
   setlocal noexpandtab
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 662aeb40..a4531b02 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -38,6 +38,7 @@ au FileType snippets setl noet nospell fdm=expr fde=getline(v:lnum)!~'^\\t\\\\|^
 
 inoremap <silent> <Plug>snipMateNextOrTrigger  <C-R>=snipMate#TriggerSnippet()<CR>
 snoremap <silent> <Plug>snipMateNextOrTrigger  <Esc>a<C-R>=snipMate#TriggerSnippet()<CR>
+inoremap <silent> <Plug>snipMateTrigger        <C-R>=snipMate#TriggerSnippet(1)<CR>
 inoremap <silent> <Plug>snipMateBack           <C-R>=snipMate#BackwardsSnippet()<CR>
 snoremap <silent> <Plug>snipMateBack           <Esc>a<C-R>=snipMate#BackwardsSnippet()<CR>
 inoremap <silent> <Plug>snipMateShow           <C-R>=snipMate#ShowAvailableSnips()<CR>
diff --git a/sources_non_forked/vim-snipmate/syntax/snippets.vim b/sources_non_forked/vim-snipmate/syntax/snippets.vim
index f5646243..f9859cf0 100644
--- a/sources_non_forked/vim-snipmate/syntax/snippets.vim
+++ b/sources_non_forked/vim-snipmate/syntax/snippets.vim
@@ -17,7 +17,6 @@ hi link snipComment   Comment
 hi link multiSnipText String
 hi link snipKeyword   Keyword
 hi link snipEscape    SpecialChar
-hi link snipComment   Comment
 hi link placeHolder   Special
 hi link tabStop       Special
 hi link snipCommand   String
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 35eac1bc..27592c73 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -1,4 +1,4 @@
-IMPORTANT: comment on: [What about merging whith Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
+IMPORTANT: comment on: [What about merging with Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
 
 Snipmate & UltiSnip Snippets
 ============================
@@ -61,6 +61,7 @@ if : if without else
 ife: if $1 else $2
 eif : else if ($1) { .. }
 el  : else ..
+wh  : while (cond) ...
 ```
 
 If you're not satisfied with these defaults, open a ticket that we implement
@@ -89,7 +90,7 @@ Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
 
 Open questions:
 What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
-What about wh(ile), which trigger?
+Which additional policies to add?
 Discuss at: https://github.com/honza/vim-snippets/issues/230
 
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets b/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
new file mode 100644
index 00000000..ae7ea201
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
@@ -0,0 +1,168 @@
+# Credit: @iurifg
+
+snippet do
+do
+	${1}
+end
+endsnippet
+
+snippet if "if .. do .. end"
+if ${1:condition} do
+	${2:expression}
+end
+endsnippet
+
+snippet if "if .. do: .."
+if ${1:condition}, do: ${2:expression}
+endsnippet
+
+snippet ife "if .. do .. else .. end"
+if ${1:condition} do
+	${2:expression}
+else
+	${3:expression}
+end
+endsnippet
+
+snippet ife "if .. do: .. else:"
+if ${1:condition}, do: ${2}, else: ${3}
+endsnippet
+
+snippet unless "unless .. do .. end"
+unless ${1} do
+	${2}
+end
+endsnippet
+
+snippet unless "unless .. do: .."
+unless ${1:condition}, do: ${2}
+endsnippet
+
+snippet unlesse "unless .. do .. else .. end"
+unless ${1:condition} do
+	${2}
+else
+	${3}
+end
+endsnippet
+
+snippet unlesse "unless .. do: .. else:"
+unless ${1:condition}, do: ${2}, else: ${3}
+endsnippet
+
+snippet cond
+"cond do"
+${1} ->
+	${2}
+end
+endsnippet
+
+snippet case
+case ${1} do
+${2} ->
+	${3}
+end
+endsnippet
+
+snippet def
+def ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defin "def function(n), do: n"
+def ${1:name},  do: ${2}
+endsnippet
+
+snippet defg
+def ${1:name} when ${2:guard-condition} do
+	${3}
+end
+endsnippet
+
+snippet defim
+defimpl ${1:protocol_name}, for: ${2:data_type} do
+	${3}
+end
+endsnippet
+
+snippet defma
+defmacro ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defmo
+defmodule ${1:module_name} do
+	${2}
+end
+endsnippet
+
+snippet defp
+defp ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defpr
+defprotocol ${1:name}, [${2:function}]
+endsnippet
+
+snippet defr
+defrecord ${1:record_name}, ${2:fields}
+endsnippet
+
+snippet doc
+@doc """
+${1}
+"""
+endsnippet
+
+snippet fn
+fn(${1:args}) -> ${2} end
+endsnippet
+
+snippet fun
+function do
+	${1}
+end
+endsnippet
+
+snippet mdoc
+@moduledoc """
+${1}
+"""
+endsnippet
+
+snippet rec
+receive do
+${1} ->
+	${2}
+end
+endsnippet
+
+snippet req
+require ${1:module_name}
+endsnippet
+
+snippet imp
+import ${1:module_name}
+endsnippet
+
+snippet ali "alias old-module to shorthand"
+alias ${1:module_name}
+endsnippet
+
+snippet test
+test "${1:test_name}" do
+	${2}
+end
+endsnippet
+
+snippet try "try .. rescue .. end"
+try do
+	${1}
+rescue
+	${2} -> ${3}
+end
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index bb074789..fd11d70b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -281,16 +281,16 @@ snippet html5 "HTML5 Template"
 <!DOCTYPE html>
 <html>
 <head>
-    <title>${1}</title>
-    <meta charset="utf-8" />
+	<title>${1}</title>
+	<meta charset="utf-8">
 </head>
 <body>
-    <header>
-        ${2}
-    </header>
-    <footer>
-        ${4}
-    </footer>
+	<header>
+		${2}
+	</header>
+	<footer>
+		${4}
+	</footer>
 </body>
 </html>
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
new file mode 100644
index 00000000..543a26ad
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
@@ -0,0 +1,88 @@
+###################################################################
+#                        Ember snippets                           #
+###################################################################
+
+# 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/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
index 14926c89..157eb91a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
@@ -59,7 +59,7 @@ if ${1} then
   ${2}
 endsnippet
 
-snippet while "while"
+snippet wh "while"
 while ${1} do
   ${2}
 done
diff --git a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
index 6a9e8f9d..e183b115 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
@@ -117,7 +117,7 @@ unless ($1) {
 
 endsnippet
 
-snippet while "while"
+snippet wh "while"
 while ($1) {
 	${2:# body...}
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 0e866d92..b7d01670 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -18,7 +18,7 @@ if m:
 
 endsnippet
 
-snippet nc "php namespace and class" b
+snippet nc "php namespace and class or interface" b
 namespace ${1:`!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -29,7 +29,18 @@ if m:
 /**
  * ${3:@author `whoami`}${4}
  */
-class ${2:`!p
+`!p
+m = re.search(r'Abstract', path)
+if m:
+	snip.rv = 'abstract '
+``!p
+if re.search(r'Interface', path):
+	snip.rv = 'interface'
+elif re.search(r'Trait', path):
+	snip.rv = 'trait'
+else:
+	snip.rv = 'class'
+` ${2:`!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 `}
 {
@@ -51,14 +62,15 @@ ${1:public} function __construct($2)
 endsnippet
 
 snippet sg "Setter and Getter" b
-
 /**
- * @var ${3:`!p snip.rv = t[2].capitalize()`}${4}
+ * @var ${3:`!p snip.rv = t[2][0:1].upper() + t[2][1:]`}
+ * 
+ * ${4}
  */
-${1:protected} $$2;
+${1:protected} $${2};
 
-public function set`!p snip.rv = t[2].capitalize()`(`!p
-if re.match(r'[A-Z].*', t[3]):
+public function set`!p snip.rv = t[2][0:1].upper() + t[2][1:]`(`!p
+if re.match(r'^(\\|[A-Z]).*', t[3]):
 	snip.rv = t[3] + ' '
 else:
 	snip.rv = ''
@@ -69,7 +81,7 @@ else:
 	return $this;
 }
 
-public function get`!p snip.rv = t[2].capitalize()`()
+public function get`!p snip.rv = t[2][0:1].upper() + t[2][1:]`()
 {
 	return $this->$2;
 }
@@ -80,3 +92,17 @@ if (${1}) {
 	${2}
 }
 endsnippet
+
+snippet ife "php ife" !b
+if (${1}) {
+	${2}
+} else {
+
+}
+endsnippet
+
+snippet /** "php comment block" b
+/**
+ * @${1}
+ */
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets b/sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets
new file mode 100644
index 00000000..6609f3fa
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets
@@ -0,0 +1,30 @@
+# sugguestion? report bugs? 
+# please go to https://github.com/chrisyue/vim-snippets/issues
+snippet test "phpunit test class" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * @author `whoami`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends \PHPUnit_Framework_TestCase
+{
+	public function test${1}()
+	{
+		${2}
+	}
+}
+endsnippet
+
+snippet exp "phpunit expects" i
+expects($this->${1:once}())
+	->method('${2}')
+	->with($this->equalTo(${3})${4})
+	->will($this->returnValue(${5}));
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
index 53df3d3d..b5ff0ee3 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
@@ -1,3 +1,6 @@
+# sugguestion? report bugs? 
+# go to https://github.com/chrisyue/vim-snippets/issues
+
 snippet contr "symfony2 controller" b
 namespace `!p 
 abspath = os.path.abspath(path)
@@ -13,7 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * ${1:@author `whoami`}${2}
+ * ${1:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -23,6 +26,18 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet act "symfony2 action" b
+/**
+ * @Route("${3}", name="${4}")
+ * @Method({${5:"POST"}})
+ */
+public function ${1}Action(${2})
+{
+	${6}
+	return $this->redirect($this->generateUrl('home', [], false));
+}
+endsnippet
+
+snippet actt "symfony2 action and template" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"GET"}})
@@ -32,7 +47,8 @@ public function ${1}Action(${2})
 {
 	${6}
 	return [];
-}
+}`!p
+abspath = os.path.abspath(path)`
 endsnippet
 
 snippet comm "symfony2 command" b
@@ -50,7 +66,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * ${3:@author `whoami`}${4}
+ * ${3:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -73,3 +89,149 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	}
 }
 endsnippet
+
+snippet subs "symfony2 subscriber" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * ${1:@author `whoami`}
+ */
+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
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * ${3:@author `whoami`}
+ */
+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
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * ${3:@author `whoami`}
+ *
+ * @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
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * ${2:@author `whoami`}
+ */
+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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
index 306c7e10..90001b1a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
@@ -432,8 +432,8 @@ end
 endsnippet
 
 snippet dov "do |<key>| ... end" i
-do |${0:v}|
-	$1
+do |${1:v}|
+	$2
 end
 endsnippet
 
@@ -455,7 +455,7 @@ endsnippet
 
 
 
-snippet while "while <expression> ... end"
+snippet wh "while <expression> ... end"
 while ${1:expression}
 	${0}
 end
diff --git a/sources_non_forked/vim-snippets/UltiSnips/sh.snippets b/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
index 915c0df9..cce06ef3 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
@@ -79,7 +79,7 @@ until ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
-snippet while "while ... (done)"
+snippet wh "while ... (done)"
 while ${2:[[ ${1:condition} ]]}; do
 	${0:#statements}
 done
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
index c5ae37ba..fd53d265 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
@@ -40,7 +40,7 @@ switch ${1:-exact} -- ${2:\$var} {
 
 endsnippet
 
-snippet while "while... (while)" b
+snippet wh "while... (while)" b
 while {${1}} {
 	${2}
 }
diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index 6204aee5..6a3d8b28 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -2,7 +2,7 @@
 
 # (c) holds no legal value ;)
 snippet c)
-	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.${2}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.
 snippet date
 	`strftime("%Y-%m-%d")`
 snippet ddate
@@ -30,7 +30,7 @@ snippet GPL2
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -48,7 +48,7 @@ snippet LGPL2
 	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/>.
 
-	${3}
+	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -66,7 +66,7 @@ snippet GPL3
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -84,7 +84,7 @@ snippet LGPL3
 	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/>.
 
-	${3}
+	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -114,7 +114,7 @@ snippet BSD2
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressedor implied, of $2.
 
-	${4}
+	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -142,7 +142,7 @@ snippet BSD3
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	${4}
+	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -173,7 +173,7 @@ snippet BSD4
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	${4}
+	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -196,7 +196,7 @@ snippet MIT
 	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 	OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-	${3}
+	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${2:copyright holder}
@@ -213,7 +213,7 @@ snippet APACHE
 	See the License for the specific language governing permissions and
 	limitations under the License.
 
-	${3}
+	${0}
 snippet BEERWARE
 	${2:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${3:copyright holder}
@@ -223,13 +223,13 @@ snippet BEERWARE
 	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
 
-	${4}
+	${0}
 
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 					Version 2, December 2004
 
-	Copyright `strftime("%Y")` ${1:copyright holder}
+	Copyright `strftime("%Y")` ${0:copyright holder}
 
 	Everyone is permitted to copy and distribute verbatim or modified
 	copies of this license document, and changing it is allowed as long
diff --git a/sources_non_forked/vim-snippets/snippets/actionscript.snippets b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
index 5385d115..6b1d8ebe 100644
--- a/sources_non_forked/vim-snippets/snippets/actionscript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
@@ -20,7 +20,7 @@ snippet main
 
 	}
 snippet class
-	${1:public|internal} class ${2:name} ${3:extends } {
+	${1:public|internal} class ${2:name} ${0:extends } {
 		public function $2 (	) {
 			("start");
 		}
@@ -28,7 +28,7 @@ snippet class
 snippet all
 	package name {
 
-		${1:public|internal|final} class ${2:name} ${3:extends } {
+		${1:public|internal|final} class ${2:name} ${0:extends } {
 			private|public| static const FOO = "abc";
 			private|public| static var BAR = "abc";
 
@@ -55,48 +55,48 @@ snippet all
 snippet switch
 	switch(${1}){
 		case ${2}:
-			${3}
+			${0}
 		break;
 		default:
 	}
 snippet case
 		case ${1}:
-			${2}
+			${0}
 		break;
 snippet package
 	package ${1:package}{
-		${2}
+		${0}
 	}
 snippet wh
 	while ${1:cond}{
-		${2}
+		${0}
 	}
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:cond})
-snippet while
+snippet wh
 	while ${1:cond}{
-		${2}
+		${0}
 	}
 snippet for enumerate names
 	for (${1:var} in ${2:object}){
-		${3}
+		${0}
 	}
 snippet for enumerate values
 	for each (${1:var} in ${2:object}){
-		${3}
+		${0}
 	}
 snippet get_set
 	function get ${1:name} {
 		return ${2}
 	}
 	function set $1 (newValue) {
-		${3}
+		${0}
 	}
 snippet interface
 	interface name {
-		function method(${1}):${2:returntype};
+		function method(${1}):${0:returntype};
 	}
 snippet try
 	try {
@@ -104,34 +104,34 @@ snippet try
 	} catch (error:ErrorType) {
 		${2}
 	} finally {
-		${3}
+		${0}
 	}
 # For Loop (same as c.snippet)
 snippet for for (..) {..}
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4}
+		${0}
 	}
 # Custom For Loop
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5}
+		${0}
 	}
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 # Ternary conditional
 snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
+	${1:/* condition */} ? ${2:a} : ${0:b}
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
-		${4}
+		${0}
 	}
 # FlxSprite (usefull when using the flixel library)
 snippet FlxSprite
@@ -150,7 +150,7 @@ snippet FlxSprite
 			override public function update():void
 			{
 				super.update();
-				${5}
+				${0}
 			}
 		}
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/apache.snippets b/sources_non_forked/vim-snippets/snippets/apache.snippets
index 6f0c8873..db3256e9 100644
--- a/sources_non_forked/vim-snippets/snippets/apache.snippets
+++ b/sources_non_forked/vim-snippets/snippets/apache.snippets
@@ -2,34 +2,34 @@
 # <Directory>
 snippet dir
 	<Directory ${1:/}>
-		DirectoryIndex ${2:index.html}
+		DirectoryIndex ${0:index.html}
 		Order Deny,Allow
 		Deny from All
 	</Directory>
 # <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
-		${2}
+		${0}
 	</FilesMatch>
 # <IfModule>
 snippet ifmodule
 	<IfModule ${1:mod_example.c}>
-		${2}
+		${0}
 	</IfModule>
 # <LimitExcept>
 snippet limitexcept
 	<LimitExcept ${1:POST GET}>
-		${2}
+		${0}
 	</LimitExcept>
 # <Proxy>
 snippet proxy
 	<Proxy ${1:*}>
-		${2}
+		${0}
 	</Proxy>
 # <VirtualHost>
 snippet virtualhost
 	<VirtualHost ${1:*}:${2:80}>
 		ServerAdmin ${3:webmaster@example.com}
 		DocumentRoot ${4:/www/example.com}
-		ServerName ${5:www.example.com}
+		ServerName ${0:www.example.com}
 	</VirtualHost>
diff --git a/sources_non_forked/vim-snippets/snippets/autoit.snippets b/sources_non_forked/vim-snippets/snippets/autoit.snippets
index c266e339..f973fbc3 100644
--- a/sources_non_forked/vim-snippets/snippets/autoit.snippets
+++ b/sources_non_forked/vim-snippets/snippets/autoit.snippets
@@ -1,19 +1,19 @@
 snippet if
 	If ${1:condition} Then
-		${2:; True code}
+		${0:; True code}
 	EndIf
 snippet el
 	Else
-		${1}
+		${0}
 snippet eif
 	ElseIf ${1:condition} Then
-		${2:; True code}
+		${0:; True code}
 # If/Else block
 snippet ife
 	If ${1:condition} Then
 		${2:; True code}
 	Else
-		${3:; Else code}
+		${0:; Else code}
 	EndIf
 # If/ElseIf/Else block - because there is eif this is not really neccessary
 snippet ifelif
@@ -22,45 +22,45 @@ snippet ifelif
 	ElseIf ${3:condition 2} Then
 		${4:; True code}
 	Else
-		${5:; Else code}
+		${0:; Else code}
 	EndIf
 # Switch block
 snippet switch
 	Switch (${1:condition})
-	Case {$2:case1}:
-		{$3:; Case 1 code}
+	Case ${2:case1}:
+		${3:; Case 1 code}
 	Case Else:
-		{$4:; Else code}
+		${0:; Else code}
 	EndSwitch
 # Select block
 snippet select
 	Select (${1:condition})
-	Case {$2:case1}:
-		{$3:; Case 1 code}
+	Case ${2:case1}:
+		${3:; Case 1 code}
 	Case Else:
-		{$4:; Else code}
+		${0:; Else code}
 	EndSelect
 # While loop
-snippet while
+snippet wh
 	While (${1:condition})
-		${2:; code...}
+		${0:; code...}
 	WEnd
 # For loop
 snippet for
 	For ${1:n} = ${3:1} to ${2:count}
-		${4:; code...}
+		${0:; code...}
 	Next
 # New Function
 snippet func
 	Func ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${4:Return}
+		${0:Return}
 	EndFunc
 # Message box
 snippet msg
-	MsgBox(${3:MsgType}, ${1:"Title"}, ${2:"Message Text"})
+	MsgBox(${0:MsgType}, ${1:"Title"}, ${2:"Message Text"})
 # Debug Message
 snippet debug
-	MsgBox(0, "Debug", ${1:"Debug Message"})
+	MsgBox(0, "Debug", ${0:"Debug Message"})
 # Show Variable Debug Message
 snippet showvar
-	MsgBox(0, "${1:VarName}", $1)
+	MsgBox(0, "${0:VarName}", $1)
diff --git a/sources_non_forked/vim-snippets/snippets/c.snippets b/sources_non_forked/vim-snippets/snippets/c.snippets
index 75780243..96e19a0a 100644
--- a/sources_non_forked/vim-snippets/snippets/c.snippets
+++ b/sources_non_forked/vim-snippets/snippets/c.snippets
@@ -3,29 +3,29 @@
 snippet main
 	int main(int argc, const char *argv[])
 	{
-		${1}
+		${0}
 		return 0;
 	}
 # main(void)
 snippet mainn
 	int main(void)
 	{
-		${1}
+		${0}
 		return 0;
 	}
 ##
 ## Preprocessor
 # #include <...>
 snippet inc
-	#include <${1:stdio}.h>${2}
+	#include <${1:stdio}.h>
 # #include "..."
 snippet Inc
-	#include "${1:`vim_snippets#Filename("$1.h")`}"${2}
+	#include "${1:`vim_snippets#Filename("$1.h")`}"
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1
 	#define ${1:SYMBOL} ${2:value}
-	#endif${3}
+	#endif
 # define
 snippet def
 	#define
@@ -33,11 +33,11 @@ snippet def
 snippet ifdef
 	#ifdef ${1:FOO}
 		${2:#define }
-	#endif${3}
+	#endif
 # if
 snippet #if
 	#if ${1:FOO}
-		${2}
+		${0}
 	#endif
 # header include guard
 snippet once
@@ -45,7 +45,7 @@ snippet once
 
 	#define $1
 
-	${2}
+	${0}
 
 	#endif /* end of include guard: $1 */
 ##
@@ -54,20 +54,20 @@ snippet once
 snippet if
 	if (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # else
 snippet el
 	else {
 		${1}
-	}${2}
+	}
 # else if
 snippet elif
 	else if (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # ifi
 snippet ifi
-	if (${1:/* condition */}) ${2};${3}
+	if (${1:/* condition */}) ${2};
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}
@@ -79,41 +79,41 @@ snippet switch
 			${4:break;}${5}
 		default:
 			${6}
-	}${7}
+	}
 # switch without default
 snippet switchndef
 	switch (${1:/* variable */}) {
 		case ${2:/* variable case */}:
 			${3}
 			${4:break;}${5}
-	}${6}
+	}
 # case
 snippet case
 	case ${1:/* variable case */}:
 		${2}
-		${3:break;}${4}
+		${3:break;}
 ##
 ## Loops
 # for
 snippet for
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
-	}${5}
+	}
 # for (custom)
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
 		${5}
-	}${6}
+	}
 # while
 snippet wh
 	while (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # do... while
 snippet do
 	do {
 		${2}
-	} while (${1:/* condition */});${3}
+	} while (${1:/* condition */});
 ##
 ## Functions
 # function definition
@@ -121,38 +121,38 @@ snippet fun
 	${1:void} ${2:function_name}(${3})
 	{
 		${4}
-	}${5}
+	}
 # function declaration
 snippet fund
-	${1:void} ${2:function_name}(${3});${4}
+	${1:void} ${2:function_name}(${3});
 ##
 ## Types
 # typedef
 snippet td
-	typedef ${1:int} ${2:MyCustomType};${3}
+	typedef ${1:int} ${2:MyCustomType};
 # struct
 snippet st
 	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
 		${2:/* data */}
-	}${3: /* optional variable list */};${4}
+	}${3: /* optional variable list */};
 # typedef struct
 snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
-	} ${1:`vim_snippets#Filename('$1_t', 'name')`};${4}
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
 # typedef enum
 snippet tde
 	typedef enum {
 		${1:/* data */}
-	} ${2:foo};${3}
+	} ${2:foo};
 ##
 ## Input/Output
 # printf
 snippet pr
-	printf("${1:%s}\n"${2});${3}
+	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});${4}
+	fprintf(${1:stderr}, "${2:%s}\n"${3});
 # getopt
 snippet getopt
 	int choice;
@@ -207,14 +207,14 @@ snippet getopt
 	{
 		while ( optind < argc )
 		{
-			${4}
+			${0}
 		}
 	}
 ##
 ## Miscellaneous
 # This is kind of convenient
 snippet .
-	[${1}]${2}
+	[${1}]
 # GPL
 snippet gpl
 	/*
@@ -234,4 +234,4 @@ snippet gpl
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
 
-	${2}
+	${0}
diff --git a/sources_non_forked/vim-snippets/snippets/chef.snippets b/sources_non_forked/vim-snippets/snippets/chef.snippets
index d44f535e..429146ad 100644
--- a/sources_non_forked/vim-snippets/snippets/chef.snippets
+++ b/sources_non_forked/vim-snippets/snippets/chef.snippets
@@ -17,7 +17,7 @@ snippet cookbook_file
 
 		${14:#}${15: action :create} # Create this file (Default)
 		${16:#}${17: action :create_if_missing} # Create only if it doesn't exist yet
-		${18:#}${19: action :delete} # Delete this file
+		${18:#}${0: action :delete} # Delete this file
 	end
 
 snippet execute
@@ -34,7 +34,7 @@ snippet execute
 		${18:#}umask ${19:nil} # Umask for files created by the command
 
 		${20:#}${21:action :run} # Run this command (Default)
-		${22:#}${23:action :nothing} # Do not run this command
+		${22:#}${0:action :nothing} # Do not run this command
 	end
 
 snippet link
@@ -46,7 +46,7 @@ snippet link
 		${8:#}group ${9} # The group of the symlink
 
 		${10:#}${11:action :create} # Create a link (Default)
-		${12:#}${13:action :delete} # Delete a link
+		${12:#}${0:action :delete} # Delete a link
 	end
 
 snippet package
@@ -61,7 +61,7 @@ snippet package
 		${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:#}${19:action :purge} # Purge a package (this usually entails removing configuration files as well as the package itself)
+		${18:#}${0:action :purge} # Purge a package (this usually entails removing configuration files as well as the package itself)
 	end
 
 snippet service
@@ -83,7 +83,7 @@ snippet service
 		${26:#}${27:action :start} # Start this service
 		${28:#}${29:action :stop} # Stop this service
 		${30:#}${31:action :restart} # Restart this service
-		${32:#}${33:action :reload} # Reload the configuration for this service
+		${32:#}${0:action :reload} # Reload the configuration for this service
 	end
 
 snippet file
@@ -97,7 +97,7 @@ snippet file
 
 		${12:#}${13:action :create} # Create this file (Default)
 		${14:#}${15:action :delete} # Delete this file
-		${16:#}${17:action :touch} # Touch this file (update the mtime/atime)
+		${16:#}${0:action :touch} # Touch this file (update the mtime/atime)
 	end
 
 snippet directory
@@ -109,7 +109,7 @@ snippet 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:#}${15:action :delete} # Delete this directory
+		${14:#}${0:action :delete} # Delete this directory
 	end
 
 snippet template
@@ -127,7 +127,7 @@ snippet template
 
 		${20:#}${21:action :create} # Create the file (Default)
 		${22:#}${23:action :delete} # Delete this file
-		${24:#}${25:action :touch} # Touch this file (update the mtime/atime)
+		${24:#}${0:action :touch} # Touch this file (update the mtime/atime)
 	end
 
 snippet svn
@@ -144,7 +144,7 @@ snippet svn
 
 		${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:#}${23:action :export} # Export the source, excluding or removing any version control artifacts
+		${22:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
 	end
 
 snippet git
@@ -162,7 +162,7 @@ snippet git
 
 		${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:#}${25:action :export} # Export the source, excluding or removing any version control artifacts
+		${24:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
 	end
 
 snippet deploy
@@ -200,5 +200,5 @@ snippet deploy
 
 		${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:#}${65::rollback} # Rollback the application to the previous release
+		${64:#}${0::rollback} # Rollback the application to the previous release
 	end
diff --git a/sources_non_forked/vim-snippets/snippets/clojure.snippets b/sources_non_forked/vim-snippets/snippets/clojure.snippets
index 59867b75..6fd653fc 100644
--- a/sources_non_forked/vim-snippets/snippets/clojure.snippets
+++ b/sources_non_forked/vim-snippets/snippets/clojure.snippets
@@ -1,90 +1,90 @@
 snippet comm
 	(comment
-	  ${1}
+	  ${0}
 	  )
 snippet condp
 	(condp ${1:pred} ${2:expr}
-	  ${3})
+	  ${0})
 snippet def
-	(def ${1})
+	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-	  ${5})
+	  ${0})
 snippet defmm
-	(defmulti ${1:name} "${2:doc-string}" ${3:dispatch-fn})
+	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defma
-	(defmacro ${1:name} "${2:doc-string}" ${3:dispatch-fn})
+	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defn
 	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
-	  ${4})
+	  ${0})
 snippet defp
 	(defprotocol ${1:name}
-	  ${2})
+	  ${0})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
 	  ${3:protocol}
-	  ${4})
+	  ${0})
 snippet deft
 	(deftest ${1:name}
 	    (is (= ${2:assertion})))
-	  ${3})
+	  ${0})
 snippet is
-	(is (= ${1} ${2}))
+	(is (= ${1} ${0}))
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
 	  ${3:Protocol}
-	  ${4})
+	  ${0})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-	  ${3})
+	  ${0})
 snippet fn
-	(fn [${1:arg-list}] ${2})
+	(fn [${1:arg-list}] ${0})
 snippet if
 	(if ${1:test-expr}
 	  ${2:then-expr}
-	  ${3:else-expr})
+	  ${0:else-expr})
 snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
-		(${4:else-expr}))
+		(${0:else-expr}))
 snippet imp
 	(:import [${1:package}])
-	& {:keys [${1:keys}] :or {${2:defaults}}}
+	& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
-		${3})
+		${0})
 snippet letfn
 	(letfn [(${1:name) [${2:args}]
-	          ${3})])
+	          ${0})])
 snippet map
-	(map ${1:func} ${2:coll})
+	(map ${1:func} ${0:coll})
 snippet mapl
-	(map #(${1:lambda}) ${2:coll})
+	(map #(${1:lambda}) ${0:coll})
 snippet met
 	(${1:name} [${2:this} ${3:args}]
-	  ${4})
+	  ${0})
 snippet ns
 	(ns ${1:name}
-	  ${2})
+	  ${0})
 snippet dotimes
 	(dotimes [_ 10]
 	  (time
 	    (dotimes [_ ${1:times}]
-	      ${2})))
+	      ${0})))
 snippet pmethod
-	(${1:name} [${2:this} ${3:args}])
+	(${1:name} [${2:this} ${0:args}])
 snippet refer
-	(:refer-clojure :exclude [${1}])
+	(:refer-clojure :exclude [${0}])
 snippet require
-	(:require [${1:namespace} :as [${2}]])
+	(:require [${1:namespace} :as [${0}]])
 snippet use
-	(:use [${1:namespace} :only [${2}]])
+	(:use [${1:namespace} :only [${0}]])
 snippet print
-	(println ${1})
+	(println ${0})
 snippet reduce
 	(reduce ${1:(fn [p n] ${3})} ${2})
 snippet when
-	(when ${1:test} ${2:body})
+	(when ${1:test} ${0:body})
 snippet when-let
 	(when-let [${1:result} ${2:test}]
-		${3:body})
+		${0:body})
diff --git a/sources_non_forked/vim-snippets/snippets/cmake.snippets b/sources_non_forked/vim-snippets/snippets/cmake.snippets
index 0c3a2157..ef2256a4 100644
--- a/sources_non_forked/vim-snippets/snippets/cmake.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cmake.snippets
@@ -8,7 +8,7 @@ snippet cmake
 		${$2_INCLUDE_DIR}
 	)
 
-	ADD_SUBDIRECTORY(${3:src})
+	ADD_SUBDIRECTORY(${0:src})
 
 	ADD_EXECUTABLE($1)
 
@@ -18,41 +18,41 @@ snippet cmake
 
 snippet include
 	INCLUDE_DIRECTORIES(
-		${${1:INCLUDE_DIR}}
+		${${0:INCLUDE_DIR}}
 	)
 
 snippet find
-	FIND_PACKAGE(${1:LIBRARY})
+	FIND_PACKAGE(${0:LIBRARY})
 
 snippet glob
-	FILE(GLOB ${1:SRCS} *.${2:cpp})
+	FILE(GLOB ${1:SRCS} *.${0:cpp})
 
 snippet subdir
-	ADD_SUBDIRECTORY(${1:src})
+	ADD_SUBDIRECTORY(${0:src})
 
 snippet lib
 	ADD_LIBRARY(${1:lib} ${2:STATIC}
-		${${3:SRCS}}
+		${${0:SRCS}}
 	)
 
 snippet link
 	TARGET_LINK_LIBRARIES(${1:bin}
-		${2:somelib}
+		${0:somelib}
 	)
 
 snippet bin
 	ADD_EXECUTABLE(${1:bin})
 
 snippet set
-	SET(${1:var} ${2:val})
+	SET(${1:var} ${0:val})
 
 snippet dep
 	ADD_DEPENDENCIES(${1:target}
-		${2:dep}
+		${0:dep}
 	)
 
 snippet props
 	SET_TARGET_PROPERTIES(${1:target}
 		${2:PROPERTIES} ${3:COMPILE_FLAGS}
-		${4:"-O3 -Wall -pedantic"}
+		${0:"-O3 -Wall -pedantic"}
 	)
diff --git a/sources_non_forked/vim-snippets/snippets/coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee.snippets
index 8e2f20e0..aca6e81a 100644
--- a/sources_non_forked/vim-snippets/snippets/coffee.snippets
+++ b/sources_non_forked/vim-snippets/snippets/coffee.snippets
@@ -2,94 +2,94 @@
 snippet forindo
 	for ${1:name} in ${2:array}
 		do ($1) ->
-			${3:// body}
+			${0:// body}
 # Array comprehension
 snippet fora
 	for ${1:name} in ${2:array}
-		${3:# body...}
+		${0:# body...}
 # Object comprehension
 snippet foro
 	for ${1:key}, ${2:value} of ${3:object}
-		${4:# body...}
+		${0:# body...}
 # Range comprehension (inclusive)
 snippet forr
 	for ${1:name} in [${2:start}..${3:finish}]
-		${4:# body...}
+		${0:# body...}
 snippet forrb
 	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
-		${5:# body...}
+		${0:# body...}
 # Range comprehension (exclusive)
 snippet forrex
 	for ${1:name} in [${2:start}...${3:finish}]
-		${4:# body...}
+		${0:# body...}
 snippet forrexb
 	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
-		${5:# body...}
+		${0:# body...}
 # Function
 snippet fun
 	(${1:args}) ->
-		${2:# body...}
+		${0:# body...}
 # Function (bound)
 snippet bfun
 	(${1:args}) =>
-		${2:# body...}
+		${0:# body...}
 # Class
 snippet cla class ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 snippet cla class .. constructor: ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		constructor: (${2:args}) ->
 			${3}
 
-		${4}
+		${0}
 snippet cla class .. extends ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
-		${3}
+		${0}
 snippet cla class .. extends .. constructor: ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		constructor: (${3:args}) ->
 			${4}
 
-		${5}
+		${0}
 # If
 snippet if
 	if ${1:condition}
-		${2:# body...}
+		${0:# body...}
 # If __ Else
 snippet ife
 	if ${1:condition}
 		${2:# body...}
 	else
-		${3:# body...}
+		${0:# body...}
 # Else if
 snippet eif
 	else if ${1:condition}
-		${2:# body...}
+		${0:# body...}
 # Ternary If
 snippet ifte
-	if ${1:condition} then ${2:value} else ${3:other}
+	if ${1:condition} then ${2:value} else ${0:other}
 # Unless
 snippet unl
-	${1:action} unless ${2:condition}
+	${1:action} unless ${0:condition}
 # Switch
 snippet swi
 	switch ${1:object}
 		when ${2:value}
-			${3:# body...}
+			${0:# body...}
 
 # Log
 snippet log
-	console.log ${1}
+	console.log ${0}
 # Try __ Catch
 snippet try
 	try
 		${1}
 	catch ${2:error}
-		${3}
+		${0}
 # Require
 snippet req
-	${2:$1} = require '${1:sys}'${3}
+	${2:$1} = require '${1:sys}'
 # Export
 snippet exp
-	${1:root} = exports ? this
+	${0:root} = exports ? this
diff --git a/sources_non_forked/vim-snippets/snippets/cpp.snippets b/sources_non_forked/vim-snippets/snippets/cpp.snippets
index e95d3534..cdccf1eb 100644
--- a/sources_non_forked/vim-snippets/snippets/cpp.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cpp.snippets
@@ -1,52 +1,52 @@
 ## STL Collections
 # std::array
 snippet array
-	std::array<${1:T}, ${2:N}> ${3};${4}
+	std::array<${1:T}, ${2:N}> ${3};
 # std::vector
 snippet vector
-	std::vector<${1:T}> ${2};${3}
+	std::vector<${1:T}> ${2};
 # std::deque
 snippet deque
-	std::deque<${1:T}> ${2};${3}
+	std::deque<${1:T}> ${2};
 # std::forward_list
 snippet flist
-	std::forward_list<${1:T}> ${2};${3}
+	std::forward_list<${1:T}> ${2};
 # std::list
 snippet list
-	std::list<${1:T}> ${2};${3}
+	std::list<${1:T}> ${2};
 # std::set
 snippet set
-	std::set<${1:T}> ${2};${3}
+	std::set<${1:T}> ${2};
 # std::map
 snippet map
-	std::map<${1:Key}, ${2:T}> ${3};${4}
+	std::map<${1:Key}, ${2:T}> ${3};
 # std::multiset
 snippet mset
-	std::multiset<${1:T}> ${2};${3}
+	std::multiset<${1:T}> ${2};
 # std::multimap
 snippet mmap
-	std::multimap<${1:Key}, ${2:T}> ${3};${4}
+	std::multimap<${1:Key}, ${2:T}> ${3};
 # std::unordered_set
 snippet uset
-	std::unordered_set<${1:T}> ${2};${3}
+	std::unordered_set<${1:T}> ${2};
 # std::unordered_map
 snippet umap
-	std::unordered_map<${1:Key}, ${2:T}> ${3};${4}
+	std::unordered_map<${1:Key}, ${2:T}> ${3};
 # std::unordered_multiset
 snippet umset
-	std::unordered_multiset<${1:T}> ${2};${3}
+	std::unordered_multiset<${1:T}> ${2};
 # std::unordered_multimap
 snippet ummap
-	std::unordered_multimap<${1:Key}, ${2:T}> ${3};${4}
+	std::unordered_multimap<${1:Key}, ${2:T}> ${3};
 # std::stack
 snippet stack
-	std::stack<${1:T}> ${2};${3}
+	std::stack<${1:T}> ${2};
 # std::queue
 snippet queue
-	std::queue<${1:T}> ${2};${3}
+	std::queue<${1:T}> ${2};
 # std::priority_queue
 snippet pqueue
-	std::priority_queue<${1:T}> ${2};${3}
+	std::priority_queue<${1:T}> ${2};
 ##
 ## Access Modifiers
 # private
@@ -75,57 +75,57 @@ snippet cl
 		~$1();
 
 	private:
-		${3:/* data */}
+		${0:/* data */}
 	};
 # member function implementation
 snippet mfun
 	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5}
+		${0}
 	}
 # namespace
 snippet ns
 	namespace ${1:`vim_snippets#Filename('', 'my')`} {
-		${2}
+		${0}
 	} /* namespace $1 */
 ##
 ## Input/Output
 # std::cout
 snippet cout
-	std::cout << ${1} << std::endl;${2}
+	std::cout << ${1} << std::endl;
 # std::cin
 snippet cin
-	std::cin >> ${1};${2}
+	std::cin >> ${1};
 ##
 ## Iteration
 # for i
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
-	}${5}
+	}
 
 # foreach
 snippet fore
 	for (${1:auto} ${2:i} : ${3:container}) {
 		${4}
-	}${5}
+	}
 # iterator
 snippet iter
 	for (${1:std::vector}<${2:type}>::${3:const_iterator} ${4:i} = ${5:container}.begin(); $4 != $5.end(); ++$4) {
 		${6}
-	}${7}
+	}
 
 # auto iterator
 snippet itera
-	for (auto ${1:i} = $1.begin(); $1 != $1.end(); ++$1) {
-		${2:std::cout << *$1 << std::endl;}
-	}${3}
+	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}}${4}
+	[${1}](${2}){${3}}
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
 		${3}
-	}${4}
+	}
diff --git a/sources_non_forked/vim-snippets/snippets/cs.snippets b/sources_non_forked/vim-snippets/snippets/cs.snippets
index 9a915f09..e537bce4 100644
--- a/sources_non_forked/vim-snippets/snippets/cs.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cs.snippets
@@ -59,203 +59,203 @@
 # entry point
 snippet sim
 	public static int Main(string[] args) {
-		${1}
+		${0}
 		return 0;
 	}
 snippet simc
 	public class Application {
 		public static int Main(string[] args) {
-			${1}
+			${0}
 			return 0;
 		}
 	}
 # if condition
 snippet if
 	if (${1}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ifs
 	if (${1})
-		${2}
+		${0}
 # ternary conditional
 snippet t
-	${1} ? ${2} : ${3}
+	${1} ? ${2} : ${0}
 snippet ?
-	${1} ? ${2} : ${3}
+	${1} ? ${2} : ${0}
 # do while loop
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1});
 # while loop
 snippet wh
 	while (${1}) {
-		${2}
+		${0}
 	}
 # for loop
 snippet for
 	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++}) {
-		${4}
+		${0}
 	}
 # foreach
 snippet fore
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 snippet foreach
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 snippet each
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 # interfaces
 snippet interface
 	public interface ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet if+
 	public interface ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # class bodies
 snippet class
 	public class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls
 	${2:public} class ${1:`vim_snippets#Filename()`} {
-		${3}
+		${0}
 	}
 snippet cls+
 	public class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls+^
 	public static class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls&
 	internal class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls&^
 	internal static class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls|
 	protected class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls|%
 	protected abstract class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # constructor
 snippet ctor
 	public ${1:`vim_snippets#Filename()`}() {
-		${2}
+		${0}
 	}
 # properties - auto properties by default.
 # default type is int with layout get / set.
 snippet prop
-	${1:public} ${2:int} ${3:} { get; set; }${4}
+	${1:public} ${2:int} ${3:} { get; set; }
 snippet p
-	${1:public} ${2:int} ${3:} { get; set; }${4}
+	${1:public} ${2:int} ${3:} { get; set; }
 snippet p+
-	public ${1:int} ${2:} { get; set; }${3}
+	public ${1:int} ${2:} { get; set; }
 snippet p+&
-	public ${1:int} ${2:} { get; internal set; }${3}
+	public ${1:int} ${2:} { get; internal set; }
 snippet p+|
-	public ${1:int} ${2:} { get; protected set; }${3}
+	public ${1:int} ${2:} { get; protected set; }
 snippet p+-
-	public ${1:int} ${2:} { get; private set; }${3}
+	public ${1:int} ${2:} { get; private set; }
 snippet p&
-	internal ${1:int} ${2:} { get; set; }${3}
+	internal ${1:int} ${2:} { get; set; }
 snippet p&|
-	internal ${1:int} ${2:} { get; protected set; }${3}
+	internal ${1:int} ${2:} { get; protected set; }
 snippet p&-
-	internal ${1:int} ${2:} { get; private set; }${3}
+	internal ${1:int} ${2:} { get; private set; }
 snippet p|
-	protected ${1:int} ${2:} { get; set; }${3}
+	protected ${1:int} ${2:} { get; set; }
 snippet p|-
-	protected ${1:int} ${2:} { get; private set; }${3}
+	protected ${1:int} ${2:} { get; private set; }
 snippet p-
-	private ${1:int} ${2:} { get; set; }${3}
+	private ${1:int} ${2:} { get; set; }
 # property - bool
 snippet pi
-	${1:public} int ${2:} { get; set; }${3}
+	${1:public} int ${2:} { get; set; }
 snippet pi+
-	public int ${1} { get; set; }${2}
+	public int ${1} { get; set; }
 snippet pi+&
-	public int ${1} { get; internal set; }${2}
+	public int ${1} { get; internal set; }
 snippet pi+|
-	public int ${1} { get; protected set; }${2}
+	public int ${1} { get; protected set; }
 snippet pi+-
-	public int ${1} { get; private set; }${2}
+	public int ${1} { get; private set; }
 snippet pi&
-	internal int ${1} { get; set; }${2}
+	internal int ${1} { get; set; }
 snippet pi&|
-	internal int ${1} { get; protected set; }${2}
+	internal int ${1} { get; protected set; }
 snippet pi&-
-	internal int ${1} { get; private set; }${2}
+	internal int ${1} { get; private set; }
 snippet pi|
-	protected int ${1} { get; set; }${2}
+	protected int ${1} { get; set; }
 snippet pi|-
-	protected int ${1} { get; private set; }${2}
+	protected int ${1} { get; private set; }
 snippet pi-
-	private int ${1} { get; set; }${2}
+	private int ${1} { get; set; }
 # property - bool
 snippet pb
-	${1:public} bool ${2:} { get; set; }${3}
+	${1:public} bool ${2:} { get; set; }
 snippet pb+
-	public bool ${1} { get; set; }${2}
+	public bool ${1} { get; set; }
 snippet pb+&
-	public bool ${1} { get; internal set; }${2}
+	public bool ${1} { get; internal set; }
 snippet pb+|
-	public bool ${1} { get; protected set; }${2}
+	public bool ${1} { get; protected set; }
 snippet pb+-
-	public bool ${1} { get; private set; }${2}
+	public bool ${1} { get; private set; }
 snippet pb&
-	internal bool ${1} { get; set; }${2}
+	internal bool ${1} { get; set; }
 snippet pb&|
-	internal bool ${1} { get; protected set; }${2}
+	internal bool ${1} { get; protected set; }
 snippet pb&-
-	internal bool ${1} { get; private set; }${2}
+	internal bool ${1} { get; private set; }
 snippet pb|
-	protected bool ${1} { get; set; }${2}
+	protected bool ${1} { get; set; }
 snippet pb|-
-	protected bool ${1} { get; private set; }${2}
+	protected bool ${1} { get; private set; }
 snippet pb-
-	private bool ${1} { get; set; }${2}
+	private bool ${1} { get; set; }
 # property - string
 snippet ps
-	${1:public} string ${2:} { get; set; }${3}
+	${1:public} string ${2:} { get; set; }
 snippet ps+
-	public string ${1} { get; set; }${2}
+	public string ${1} { get; set; }
 snippet ps+&
-	public string ${1} { get; internal set; }${2}
+	public string ${1} { get; internal set; }
 snippet ps+|
-	public string ${1} { get; protected set; }${2}
+	public string ${1} { get; protected set; }
 snippet ps+-
-	public string ${1} { get; private set; }${2}
+	public string ${1} { get; private set; }
 snippet ps&
-	internal string ${1} { get; set; }${2}
+	internal string ${1} { get; set; }
 snippet ps&|
-	internal string ${1} { get; protected set; }${2}
+	internal string ${1} { get; protected set; }
 snippet ps&-
-	internal string ${1} { get; private set; }${2}
+	internal string ${1} { get; private set; }
 snippet ps|
-	protected string ${1} { get; set; }${2}
+	protected string ${1} { get; set; }
 snippet ps|-
-	protected string ${1} { get; private set; }${2}
+	protected string ${1} { get; private set; }
 snippet ps-
-	private string ${1} { get; set; }${2}
+	private string ${1} { get; set; }
 # members - void
 snippet m
 	${1:public} ${2:void} ${3:}(${4:}) {
@@ -343,32 +343,32 @@ snippet ms-
 # structure
 snippet struct
 	public struct ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # enumeration
 snippet enum
 	public enum ${1} {
-		${2}
+		${0}
 	}
 # preprocessor directives
 snippet #if
 	#if
-		${1}
+		${0}
 	#endif
 # inline xml documentation
 snippet ///
 	/// <summary>
-	/// ${1}
+	/// ${0}
 	/// </summary>
 snippet <p
-	<param name="${1}">${2:$1}</param>${3}
+	<param name="${1}">${2:$1}</param>
 snippet <ex
-	<exception cref="${1:System.Exception}">${2}</exception>${3}
+	<exception cref="${1:System.Exception}">${2}</exception>
 snippet <r
-	<returns>${1}</returns>{${2}
+	<returns>${1}</returns>{
 snippet <s
-	<see cref="${1}"/>${2}
+	<see cref="${1}"/>
 snippet <rem
-	<remarks>${1}</remarks>${2}
+	<remarks>${1}</remarks>
 snippet <c
-	<code>${1}</code>${2}
+	<code>${1}</code>
diff --git a/sources_non_forked/vim-snippets/snippets/css.snippets b/sources_non_forked/vim-snippets/snippets/css.snippets
index 72212d2d..8886643a 100644
--- a/sources_non_forked/vim-snippets/snippets/css.snippets
+++ b/sources_non_forked/vim-snippets/snippets/css.snippets
@@ -1,50 +1,50 @@
 snippet .
 	${1} {
-		${2}
+		${0}
 	}
 snippet !
 	 !important
 snippet bdi:m+
-	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
 snippet bdi:m
-	-moz-border-image: ${1};
+	-moz-border-image: ${0};
 snippet bdrz:m
-	-moz-border-radius: ${1};
+	-moz-border-radius: ${0};
 snippet bxsh:m+
-	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh:m
-	-moz-box-shadow: ${1};
+	-moz-box-shadow: ${0};
 snippet bdi:w+
-	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
 snippet bdi:w
-	-webkit-border-image: ${1};
+	-webkit-border-image: ${0};
 snippet bdrz:w
-	-webkit-border-radius: ${1};
+	-webkit-border-radius: ${0};
 snippet bxsh:w+
-	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh:w
-	-webkit-box-shadow: ${1};
+	-webkit-box-shadow: ${0};
 snippet @f
 	@font-face {
 		font-family: ${1};
-		src: url(${2});
+		src: url(${0});
 	}
 snippet @i
-	@import url(${1});
+	@import url(${0});
 snippet @m
 	@media ${1:print} {
-		${2}
+		${0}
 	}
 snippet bg+
-	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${5:no-repeat};
+	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${0:no-repeat};
 snippet bga
-	background-attachment: ${1};
+	background-attachment: ${0};
 snippet bga:f
 	background-attachment: fixed;
 snippet bga:s
 	background-attachment: scroll;
 snippet bgbk
-	background-break: ${1};
+	background-break: ${0};
 snippet bgbk:bb
 	background-break: bounding-box;
 snippet bgbk:c
@@ -52,7 +52,7 @@ snippet bgbk:c
 snippet bgbk:eb
 	background-break: each-box;
 snippet bgcp
-	background-clip: ${1};
+	background-clip: ${0};
 snippet bgcp:bb
 	background-clip: border-box;
 snippet bgcp:cb
@@ -62,15 +62,15 @@ snippet bgcp:nc
 snippet bgcp:pb
 	background-clip: padding-box;
 snippet bgc
-	background-color: #${1:FFF};
+	background-color: #${0:FFF};
 snippet bgc:t
 	background-color: transparent;
 snippet bgi
-	background-image: url(${1});
+	background-image: url(${0});
 snippet bgi:n
 	background-image: none;
 snippet bgo
-	background-origin: ${1};
+	background-origin: ${0};
 snippet bgo:bb
 	background-origin: border-box;
 snippet bgo:cb
@@ -78,13 +78,13 @@ snippet bgo:cb
 snippet bgo:pb
 	background-origin: padding-box;
 snippet bgpx
-	background-position-x: ${1};
+	background-position-x: ${0};
 snippet bgpy
-	background-position-y: ${1};
+	background-position-y: ${0};
 snippet bgp
-	background-position: ${1:0} ${2:0};
+	background-position: ${1:0} ${0:0};
 snippet bgr
-	background-repeat: ${1};
+	background-repeat: ${0};
 snippet bgr:n
 	background-repeat: no-repeat;
 snippet bgr:x
@@ -94,7 +94,7 @@ snippet bgr:y
 snippet bgr:r
 	background-repeat: repeat;
 snippet bgz
-	background-size: ${1};
+	background-size: ${0};
 snippet bgz:a
 	background-size: auto;
 snippet bgz:ct
@@ -102,67 +102,67 @@ snippet bgz:ct
 snippet bgz:cv
 	background-size: cover;
 snippet bg
-	background: ${1};
+	background: ${0};
 snippet bg:ie
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${2:crop}');
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}');
 snippet bg:n
 	background: none;
 snippet bd+
-	border: ${1:1px} ${2:solid} #${3:000};
+	border: ${1:1px} ${2:solid} #${0:000};
 snippet bdb+
-	border-bottom: ${1:1px} ${2:solid} #${3:000};
+	border-bottom: ${1:1px} ${2:solid} #${0:000};
 snippet bdbc
-	border-bottom-color: #${1:000};
+	border-bottom-color: #${0:000};
 snippet bdbi
-	border-bottom-image: url(${1});
+	border-bottom-image: url(${0});
 snippet bdbi:n
 	border-bottom-image: none;
 snippet bdbli
-	border-bottom-left-image: url(${1});
+	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: ${1};
+	border-bottom-left-radius: ${0};
 snippet bdbri
-	border-bottom-right-image: url(${1});
+	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: ${1};
+	border-bottom-right-radius: ${0};
 snippet bdbs
-	border-bottom-style: ${1};
+	border-bottom-style: ${0};
 snippet bdbs:n
 	border-bottom-style: none;
 snippet bdbw
-	border-bottom-width: ${1};
+	border-bottom-width: ${0};
 snippet bdb
-	border-bottom: ${1};
+	border-bottom: ${0};
 snippet bdb:n
 	border-bottom: none;
 snippet bdbk
-	border-break: ${1};
+	border-break: ${0};
 snippet bdbk:c
 	border-break: close;
 snippet bdcl
-	border-collapse: ${1};
+	border-collapse: ${0};
 snippet bdcl:c
 	border-collapse: collapse;
 snippet bdcl:s
 	border-collapse: separate;
 snippet bdc
-	border-color: #${1:000};
+	border-color: #${0:000};
 snippet bdci
-	border-corner-image: url(${1});
+	border-corner-image: url(${0});
 snippet bdci:c
 	border-corner-image: continue;
 snippet bdci:n
 	border-corner-image: none;
 snippet bdf
-	border-fit: ${1};
+	border-fit: ${0};
 snippet bdf:c
 	border-fit: clip;
 snippet bdf:of
@@ -178,55 +178,55 @@ snippet bdf:sp
 snippet bdf:st
 	border-fit: stretch;
 snippet bdi
-	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	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} #${3:000};
+	border-left: ${1:1px} ${2:solid} #${0:000};
 snippet bdlc
-	border-left-color: #${1:000};
+	border-left-color: #${0:000};
 snippet bdli
-	border-left-image: url(${1});
+	border-left-image: url(${0});
 snippet bdli:n
 	border-left-image: none;
 snippet bdls
-	border-left-style: ${1};
+	border-left-style: ${0};
 snippet bdls:n
 	border-left-style: none;
 snippet bdlw
-	border-left-width: ${1};
+	border-left-width: ${0};
 snippet bdl
-	border-left: ${1};
+	border-left: ${0};
 snippet bdl:n
 	border-left: none;
 snippet bdlt
-	border-length: ${1};
+	border-length: ${0};
 snippet bdlt:a
 	border-length: auto;
 snippet bdrz
-	border-radius: ${1};
+	border-radius: ${0};
 snippet bdr+
-	border-right: ${1:1px} ${2:solid} #${3:000};
+	border-right: ${1:1px} ${2:solid} #${0:000};
 snippet bdrc
-	border-right-color: #${1:000};
+	border-right-color: #${0:000};
 snippet bdri
-	border-right-image: url(${1});
+	border-right-image: url(${0});
 snippet bdri:n
 	border-right-image: none;
 snippet bdrs
-	border-right-style: ${1};
+	border-right-style: ${0};
 snippet bdrs:n
 	border-right-style: none;
 snippet bdrw
-	border-right-width: ${1};
+	border-right-width: ${0};
 snippet bdr
-	border-right: ${1};
+	border-right: ${0};
 snippet bdr:n
 	border-right: none;
 snippet bdsp
-	border-spacing: ${1};
+	border-spacing: ${0};
 snippet bds
-	border-style: ${1};
+	border-style: ${0};
 snippet bds:ds
 	border-style: dashed;
 snippet bds:dtds
@@ -254,69 +254,69 @@ snippet bds:s
 snippet bds:w
 	border-style: wave;
 snippet bdt+
-	border-top: ${1:1px} ${2:solid} #${3:000};
+	border-top: ${1:1px} ${2:solid} #${0:000};
 snippet bdtc
-	border-top-color: #${1:000};
+	border-top-color: #${0:000};
 snippet bdti
-	border-top-image: url(${1});
+	border-top-image: url(${0});
 snippet bdti:n
 	border-top-image: none;
 snippet bdtli
-	border-top-left-image: url(${1});
+	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: ${1};
+	border-top-left-radius: ${0};
 snippet bdtri
-	border-top-right-image: url(${1});
+	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: ${1};
+	border-top-right-radius: ${0};
 snippet bdts
-	border-top-style: ${1};
+	border-top-style: ${0};
 snippet bdts:n
 	border-top-style: none;
 snippet bdtw
-	border-top-width: ${1};
+	border-top-width: ${0};
 snippet bdt
-	border-top: ${1};
+	border-top: ${0};
 snippet bdt:n
 	border-top: none;
 snippet bdw
-	border-width: ${1};
+	border-width: ${0};
 snippet bd
-	border: ${1};
+	border: ${0};
 snippet bd:n
 	border: none;
 snippet b
-	bottom: ${1};
+	bottom: ${0};
 snippet b:a
 	bottom: auto;
 snippet bxsh+
-	box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh
-	box-shadow: ${1};
+	box-shadow: ${0};
 snippet bxsh:n
 	box-shadow: none;
 snippet bxz
-	box-sizing: ${1};
+	box-sizing: ${0};
 snippet bxz:bb
 	box-sizing: border-box;
 snippet bxz:cb
 	box-sizing: content-box;
 snippet cps
-	caption-side: ${1};
+	caption-side: ${0};
 snippet cps:b
 	caption-side: bottom;
 snippet cps:t
 	caption-side: top;
 snippet cl
-	clear: ${1};
+	clear: ${0};
 snippet cl:b
 	clear: both;
 snippet cl:l
@@ -326,23 +326,23 @@ snippet cl:n
 snippet cl:r
 	clear: right;
 snippet cp
-	clip: ${1};
+	clip: ${0};
 snippet cp:a
 	clip: auto;
 snippet cp:r
-	clip: rect(${1:0} ${2:0} ${3:0} ${4:0});
+	clip: rect(${1:0} ${2:0} ${3:0} ${0:0});
 snippet c
-	color: #${1:000};
+	color: #${0:000};
 snippet ct
-	content: ${1};
+	content: ${0};
 snippet ct:a
-	content: attr(${1});
+	content: attr(${0});
 snippet ct:cq
 	content: close-quote;
 snippet ct:c
-	content: counter(${1});
+	content: counter(${0});
 snippet ct:cs
-	content: counters(${1});
+	content: counters(${0});
 snippet ct:ncq
 	content: no-close-quote;
 snippet ct:noq
@@ -352,11 +352,11 @@ snippet ct:n
 snippet ct:oq
 	content: open-quote;
 snippet coi
-	counter-increment: ${1};
+	counter-increment: ${0};
 snippet cor
-	counter-reset: ${1};
+	counter-reset: ${0};
 snippet cur
-	cursor: ${1};
+	cursor: ${0};
 snippet cur:a
 	cursor: auto;
 snippet cur:c
@@ -374,7 +374,7 @@ snippet cur:p
 snippet cur:t
 	cursor: text;
 snippet d
-	display: ${1};
+	display: ${0};
 snippet d:mib
 	display: -moz-inline-box;
 snippet d:mis
@@ -414,7 +414,7 @@ snippet d:tbr
 snippet d:tb
 	display: table;
 snippet ec
-	empty-cells: ${1};
+	empty-cells: ${0};
 snippet ec:h
 	empty-cells: hide;
 snippet ec:s
@@ -422,7 +422,7 @@ snippet ec:s
 snippet exp
 	expression()
 snippet fl
-	float: ${1};
+	float: ${0};
 snippet fl:l
 	float: left;
 snippet fl:n
@@ -430,9 +430,9 @@ snippet fl:n
 snippet fl:r
 	float: right;
 snippet f+
-	font: ${1:1em} ${2:Arial},${3:sans-serif};
+	font: ${1:1em} ${2:Arial},${0:sans-serif};
 snippet fef
-	font-effect: ${1};
+	font-effect: ${0};
 snippet fef:eb
 	font-effect: emboss;
 snippet fef:eg
@@ -442,13 +442,13 @@ snippet fef:n
 snippet fef:o
 	font-effect: outline;
 snippet femp
-	font-emphasize-position: ${1};
+	font-emphasize-position: ${0};
 snippet femp:a
 	font-emphasize-position: after;
 snippet femp:b
 	font-emphasize-position: before;
 snippet fems
-	font-emphasize-style: ${1};
+	font-emphasize-style: ${0};
 snippet fems:ac
 	font-emphasize-style: accent;
 snippet fems:c
@@ -460,27 +460,27 @@ snippet fems:dt
 snippet fems:n
 	font-emphasize-style: none;
 snippet fem
-	font-emphasize: ${1};
+	font-emphasize: ${0};
 snippet ff
-	font-family: ${1};
+	font-family: ${0};
 snippet ff:c
-	font-family: ${1:'Monotype Corsiva','Comic Sans MS'},cursive;
+	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive;
 snippet ff:f
-	font-family: ${1:Capitals,Impact},fantasy;
+	font-family: ${0:Capitals,Impact},fantasy;
 snippet ff:m
-	font-family: ${1:Monaco,'Courier New'},monospace;
+	font-family: ${0:Monaco,'Courier New'},monospace;
 snippet ff:ss
-	font-family: ${1:Helvetica,Arial},sans-serif;
+	font-family: ${0:Helvetica,Arial},sans-serif;
 snippet ff:s
-	font-family: ${1:Georgia,'Times New Roman'},serif;
+	font-family: ${0:Georgia,'Times New Roman'},serif;
 snippet fza
-	font-size-adjust: ${1};
+	font-size-adjust: ${0};
 snippet fza:n
 	font-size-adjust: none;
 snippet fz
-	font-size: ${1};
+	font-size: ${0};
 snippet fsm
-	font-smooth: ${1};
+	font-smooth: ${0};
 snippet fsm:aw
 	font-smooth: always;
 snippet fsm:a
@@ -488,7 +488,7 @@ snippet fsm:a
 snippet fsm:n
 	font-smooth: never;
 snippet fst
-	font-stretch: ${1};
+	font-stretch: ${0};
 snippet fst:c
 	font-stretch: condensed;
 snippet fst:e
@@ -508,7 +508,7 @@ snippet fst:uc
 snippet fst:ue
 	font-stretch: ultra-expanded;
 snippet fs
-	font-style: ${1};
+	font-style: ${0};
 snippet fs:i
 	font-style: italic;
 snippet fs:n
@@ -516,13 +516,13 @@ snippet fs:n
 snippet fs:o
 	font-style: oblique;
 snippet fv
-	font-variant: ${1};
+	font-variant: ${0};
 snippet fv:n
 	font-variant: normal;
 snippet fv:sc
 	font-variant: small-caps;
 snippet fw
-	font-weight: ${1};
+	font-weight: ${0};
 snippet fw:b
 	font-weight: bold;
 snippet fw:br
@@ -532,31 +532,31 @@ snippet fw:lr
 snippet fw:n
 	font-weight: normal;
 snippet f
-	font: ${1};
+	font: ${0};
 snippet h
-	height: ${1};
+	height: ${0};
 snippet h:a
 	height: auto;
 snippet l
-	left: ${1};
+	left: ${0};
 snippet l:a
 	left: auto;
 snippet lts
-	letter-spacing: ${1};
+	letter-spacing: ${0};
 snippet lh
-	line-height: ${1};
+	line-height: ${0};
 snippet lisi
-	list-style-image: url(${1});
+	list-style-image: url(${0});
 snippet lisi:n
 	list-style-image: none;
 snippet lisp
-	list-style-position: ${1};
+	list-style-position: ${0};
 snippet lisp:i
 	list-style-position: inside;
 snippet lisp:o
 	list-style-position: outside;
 snippet list
-	list-style-type: ${1};
+	list-style-type: ${0};
 snippet list:c
 	list-style-type: circle;
 snippet list:dclz
@@ -574,75 +574,75 @@ snippet list:s
 snippet list:ur
 	list-style-type: upper-roman;
 snippet lis
-	list-style: ${1};
+	list-style: ${0};
 snippet lis:n
 	list-style: none;
 snippet mb
-	margin-bottom: ${1};
+	margin-bottom: ${0};
 snippet mb:a
 	margin-bottom: auto;
 snippet ml
-	margin-left: ${1};
+	margin-left: ${0};
 snippet ml:a
 	margin-left: auto;
 snippet mr
-	margin-right: ${1};
+	margin-right: ${0};
 snippet mr:a
 	margin-right: auto;
 snippet mt
-	margin-top: ${1};
+	margin-top: ${0};
 snippet mt:a
 	margin-top: auto;
 snippet m
-	margin: ${1};
+	margin: ${0};
 snippet m:4
-	margin: ${1:0} ${2:0} ${3:0} ${4:0};
+	margin: ${1:0} ${2:0} ${3:0} ${0:0};
 snippet m:3
-	margin: ${1:0} ${2:0} ${3:0};
+	margin: ${1:0} ${2:0} ${0:0};
 snippet m:2
-	margin: ${1:0} ${2:0};
+	margin: ${1:0} ${0:0};
 snippet m:0
 	margin: 0;
 snippet m:a
 	margin: auto;
 snippet mah
-	max-height: ${1};
+	max-height: ${0};
 snippet mah:n
 	max-height: none;
 snippet maw
-	max-width: ${1};
+	max-width: ${0};
 snippet maw:n
 	max-width: none;
 snippet mih
-	min-height: ${1};
+	min-height: ${0};
 snippet miw
-	min-width: ${1};
+	min-width: ${0};
 snippet op
-	opacity: ${1};
+	opacity: ${0};
 snippet op:ie
-	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${1:100});
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100});
 snippet op:ms
-	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${1:100})';
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})';
 snippet orp
-	orphans: ${1};
+	orphans: ${0};
 snippet o+
-	outline: ${1:1px} ${2:solid} #${3:000};
+	outline: ${1:1px} ${2:solid} #${0:000};
 snippet oc
-	outline-color: ${1:#000};
+	outline-color: ${0:#000};
 snippet oc:i
 	outline-color: invert;
 snippet oo
-	outline-offset: ${1};
+	outline-offset: ${0};
 snippet os
-	outline-style: ${1};
+	outline-style: ${0};
 snippet ow
-	outline-width: ${1};
+	outline-width: ${0};
 snippet o
-	outline: ${1};
+	outline: ${0};
 snippet o:n
 	outline: none;
 snippet ovs
-	overflow-style: ${1};
+	overflow-style: ${0};
 snippet ovs:a
 	overflow-style: auto;
 snippet ovs:mq
@@ -654,7 +654,7 @@ snippet ovs:p
 snippet ovs:s
 	overflow-style: scrollbar;
 snippet ovx
-	overflow-x: ${1};
+	overflow-x: ${0};
 snippet ovx:a
 	overflow-x: auto;
 snippet ovx:h
@@ -664,7 +664,7 @@ snippet ovx:s
 snippet ovx:v
 	overflow-x: visible;
 snippet ovy
-	overflow-y: ${1};
+	overflow-y: ${0};
 snippet ovy:a
 	overflow-y: auto;
 snippet ovy:h
@@ -674,7 +674,7 @@ snippet ovy:s
 snippet ovy:v
 	overflow-y: visible;
 snippet ov
-	overflow: ${1};
+	overflow: ${0};
 snippet ov:a
 	overflow: auto;
 snippet ov:h
@@ -684,25 +684,25 @@ snippet ov:s
 snippet ov:v
 	overflow: visible;
 snippet pb
-	padding-bottom: ${1};
+	padding-bottom: ${0};
 snippet pl
-	padding-left: ${1};
+	padding-left: ${0};
 snippet pr
-	padding-right: ${1};
+	padding-right: ${0};
 snippet pt
-	padding-top: ${1};
+	padding-top: ${0};
 snippet p
-	padding: ${1};
+	padding: ${0};
 snippet p:4
-	padding: ${1:0} ${2:0} ${3:0} ${4:0};
+	padding: ${1:0} ${2:0} ${3:0} ${0:0};
 snippet p:3
-	padding: ${1:0} ${2:0} ${3:0};
+	padding: ${1:0} ${2:0} ${0:0};
 snippet p:2
-	padding: ${1:0} ${2:0};
+	padding: ${1:0} ${0:0};
 snippet p:0
 	padding: 0;
 snippet pgba
-	page-break-after: ${1};
+	page-break-after: ${0};
 snippet pgba:aw
 	page-break-after: always;
 snippet pgba:a
@@ -712,7 +712,7 @@ snippet pgba:l
 snippet pgba:r
 	page-break-after: right;
 snippet pgbb
-	page-break-before: ${1};
+	page-break-before: ${0};
 snippet pgbb:aw
 	page-break-before: always;
 snippet pgbb:a
@@ -722,13 +722,13 @@ snippet pgbb:l
 snippet pgbb:r
 	page-break-before: right;
 snippet pgbi
-	page-break-inside: ${1};
+	page-break-inside: ${0};
 snippet pgbi:a
 	page-break-inside: auto;
 snippet pgbi:av
 	page-break-inside: avoid;
 snippet pos
-	position: ${1};
+	position: ${0};
 snippet pos:a
 	position: absolute;
 snippet pos:f
@@ -738,7 +738,7 @@ snippet pos:r
 snippet pos:s
 	position: static;
 snippet q
-	quotes: ${1};
+	quotes: ${0};
 snippet q:en
 	quotes: '\201C' '\201D' '\2018' '\2019';
 snippet q:n
@@ -746,7 +746,7 @@ snippet q:n
 snippet q:ru
 	quotes: '\00AB' '\00BB' '\201E' '\201C';
 snippet rz
-	resize: ${1};
+	resize: ${0};
 snippet rz:b
 	resize: both;
 snippet rz:h
@@ -756,17 +756,17 @@ snippet rz:n
 snippet rz:v
 	resize: vertical;
 snippet r
-	right: ${1};
+	right: ${0};
 snippet r:a
 	right: auto;
 snippet tbl
-	table-layout: ${1};
+	table-layout: ${0};
 snippet tbl:a
 	table-layout: auto;
 snippet tbl:f
 	table-layout: fixed;
 snippet tal
-	text-align-last: ${1};
+	text-align-last: ${0};
 snippet tal:a
 	text-align-last: auto;
 snippet tal:c
@@ -776,7 +776,7 @@ snippet tal:l
 snippet tal:r
 	text-align-last: right;
 snippet ta
-	text-align: ${1};
+	text-align: ${0};
 snippet ta:c
 	text-align: center;
 snippet ta:l
@@ -784,7 +784,7 @@ snippet ta:l
 snippet ta:r
 	text-align: right;
 snippet td
-	text-decoration: ${1};
+	text-decoration: ${0};
 snippet td:l
 	text-decoration: line-through;
 snippet td:n
@@ -794,7 +794,7 @@ snippet td:o
 snippet td:u
 	text-decoration: underline;
 snippet te
-	text-emphasis: ${1};
+	text-emphasis: ${0};
 snippet te:ac
 	text-emphasis: accent;
 snippet te:a
@@ -810,7 +810,7 @@ snippet te:dt
 snippet te:n
 	text-emphasis: none;
 snippet th
-	text-height: ${1};
+	text-height: ${0};
 snippet th:a
 	text-height: auto;
 snippet th:f
@@ -820,11 +820,11 @@ snippet th:m
 snippet th:t
 	text-height: text-size;
 snippet ti
-	text-indent: ${1};
+	text-indent: ${0};
 snippet ti:-
 	text-indent: -9999px;
 snippet tj
-	text-justify: ${1};
+	text-justify: ${0};
 snippet tj:a
 	text-justify: auto;
 snippet tj:d
@@ -840,23 +840,23 @@ snippet tj:k
 snippet tj:t
 	text-justify: tibetan;
 snippet to+
-	text-outline: ${1:0} ${2:0} #${3:000};
+	text-outline: ${1:0} ${2:0} #${0:000};
 snippet to
-	text-outline: ${1};
+	text-outline: ${0};
 snippet to:n
 	text-outline: none;
 snippet tr
-	text-replace: ${1};
+	text-replace: ${0};
 snippet tr:n
 	text-replace: none;
 snippet tsh+
-	text-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet tsh
-	text-shadow: ${1};
+	text-shadow: ${0};
 snippet tsh:n
 	text-shadow: none;
 snippet tt
-	text-transform: ${1};
+	text-transform: ${0};
 snippet tt:c
 	text-transform: capitalize;
 snippet tt:l
@@ -866,7 +866,7 @@ snippet tt:n
 snippet tt:u
 	text-transform: uppercase;
 snippet tw
-	text-wrap: ${1};
+	text-wrap: ${0};
 snippet tw:no
 	text-wrap: none;
 snippet tw:n
@@ -876,11 +876,11 @@ snippet tw:s
 snippet tw:u
 	text-wrap: unrestricted;
 snippet t
-	top: ${1};
+	top: ${0};
 snippet t:a
 	top: auto;
 snippet va
-	vertical-align: ${1};
+	vertical-align: ${0};
 snippet va:bl
 	vertical-align: baseline;
 snippet va:b
@@ -898,7 +898,7 @@ snippet va:tt
 snippet va:t
 	vertical-align: top;
 snippet v
-	visibility: ${1};
+	visibility: ${0};
 snippet v:c
 	visibility: collapse;
 snippet v:h
@@ -906,7 +906,7 @@ snippet v:h
 snippet v:v
 	visibility: visible;
 snippet whsc
-	white-space-collapse: ${1};
+	white-space-collapse: ${0};
 snippet whsc:ba
 	white-space-collapse: break-all;
 snippet whsc:bs
@@ -918,7 +918,7 @@ snippet whsc:l
 snippet whsc:n
 	white-space-collapse: normal;
 snippet whs
-	white-space: ${1};
+	white-space: ${0};
 snippet whs:n
 	white-space: normal;
 snippet whs:nw
@@ -930,13 +930,13 @@ snippet whs:pw
 snippet whs:p
 	white-space: pre;
 snippet wid
-	widows: ${1};
+	widows: ${0};
 snippet w
-	width: ${1};
+	width: ${0};
 snippet w:a
 	width: auto;
 snippet wob
-	word-break: ${1};
+	word-break: ${0};
 snippet wob:ba
 	word-break: break-all;
 snippet wob:bs
@@ -948,9 +948,9 @@ snippet wob:l
 snippet wob:n
 	word-break: normal;
 snippet wos
-	word-spacing: ${1};
+	word-spacing: ${0};
 snippet wow
-	word-wrap: ${1};
+	word-wrap: ${0};
 snippet wow:no
 	word-wrap: none;
 snippet wow:n
@@ -960,7 +960,7 @@ snippet wow:s
 snippet wow:u
 	word-wrap: unrestricted;
 snippet z
-	z-index: ${1};
+	z-index: ${0};
 snippet z:a
 	z-index: auto;
 snippet zoo
diff --git a/sources_non_forked/vim-snippets/snippets/dart.snippets b/sources_non_forked/vim-snippets/snippets/dart.snippets
index a7452002..0093f2bf 100644
--- a/sources_non_forked/vim-snippets/snippets/dart.snippets
+++ b/sources_non_forked/vim-snippets/snippets/dart.snippets
@@ -1,82 +1,82 @@
 snippet lib
 	#library('${1}');
-	${2}
+	${0}
 snippet im
 	#import('${1}');
-	${2}
+	${0}
 snippet so
 	#source('${1}');
-	${2}
+	${0}
 snippet main
 	static void main() {
-	  ${1}
+	  ${0}
 	}
 snippet st
-	static ${1}
+	static ${0}
 snippet fi
-	final ${1}
+	final ${0}
 snippet re
-	return ${1}
+	return ${0}
 snippet br
 	break;
 snippet th
-	throw ${1}
+	throw ${0}
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet imp
-	implements ${1}
+	implements ${0}
 snippet ext
-	extends ${1}
+	extends ${0}
 snippet if
 	if (${1:true}) {
-	  ${2}
+	  ${0}
 	}
 snippet ife
 	if (${1:true}) {
 	  ${2}
 	} else {
-	  ${3}
+	  ${0}
 	}
 snippet el
 	else
 snippet sw
 	switch (${1}) {
-	  ${2}
+	  ${0}
 	}
 snippet cs
 	case ${1}:
-	  ${2}
+	  ${0}
 snippet de
 	default:
-	  ${1}
+	  ${0}
 snippet for
 	for (var ${2:i} = 0, len = ${1:things}.length; $2 < len; ${3:++}$2) {
-	  ${4:$1[$2]}
+	  ${0:$1[$2]}
 	}
 snippet fore
 	for (final ${2:item} in ${1:itemList}) {
-	  ${3}
+	  ${0}
 	}
 snippet wh
 	while (${1:/* condition */}) {
-	  ${2}
+	  ${0}
 	}
 snippet dowh
 	do {
-	  ${2}
-	} while (${1:/* condition */});
+	  ${0}
+	} while (${0:/* condition */});
 snippet as
-	assert(${1:/* condition */});
+	assert(${0:/* condition */});
 snippet try
 	try {
-	  ${2}
+	  ${0}
 	} catch (${1:Exception e}) {
 	}
 snippet tryf
 	try {
-	  ${2}
+	  ${0}
 	} catch (${1:Exception e}) {
 	} finally {
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/diff.snippets b/sources_non_forked/vim-snippets/snippets/diff.snippets
index 7ba288de..89bc31d7 100644
--- a/sources_non_forked/vim-snippets/snippets/diff.snippets
+++ b/sources_non_forked/vim-snippets/snippets/diff.snippets
@@ -7,5 +7,5 @@ snippet header DEP-3 style header
 	Author: ${6:`g:snips_author`}
 	Reviewed-by: ${7:name and email}
 	Last-Update: ${8:`strftime("%Y-%m-%d")`}
-	Applied-Upstream: ${9:upstream version|url|commit}
+	Applied-Upstream: ${0:upstream version|url|commit}
 
diff --git a/sources_non_forked/vim-snippets/snippets/django.snippets b/sources_non_forked/vim-snippets/snippets/django.snippets
index 5c72b2b9..cad80eb2 100644
--- a/sources_non_forked/vim-snippets/snippets/django.snippets
+++ b/sources_non_forked/vim-snippets/snippets/django.snippets
@@ -9,65 +9,65 @@
 # can either not specify them, or override them, e.g. auto_now_add=False.
 
 snippet auto
-	${1:FIELDNAME} = models.AutoField(${2})
+	${1:FIELDNAME} = models.AutoField(${0})
 snippet bool
-	${1:FIELDNAME} = models.BooleanField(${2:default=True})
+	${1:FIELDNAME} = models.BooleanField(${0:default=True})
 snippet char
-	${1:FIELDNAME} = models.CharField(max_length=${2}${3:, blank=True})
+	${1:FIELDNAME} = models.CharField(max_length=${2}${0:, blank=True})
 snippet comma
-	${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${3:, blank=True})
+	${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${0:, blank=True})
 snippet date
-	${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
+	${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}${3:, blank=True, null=True})
+	${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=${3})
+	${1:FIELDNAME} = models.DecimalField(max_digits=${2}, decimal_places=${0})
 snippet email
-	${1:FIELDNAME} = models.EmailField(max_length=${2:75}${3:, blank=True})
+	${1:FIELDNAME} = models.EmailField(max_length=${2:75}${0:, blank=True})
 snippet file
-	${1:FIELDNAME} = models.FileField(upload_to=${2:path/for/upload}${3:, max_length=100})
+	${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}${6:, blank=True, })
+	${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(${2})
+	${1:FIELDNAME} = models.FloatField(${0})
 snippet image
-	${1:FIELDNAME} = models.ImageField(upload_to=${2:path/for/upload}${3:, height_field=height, width_field=width}${4:, max_length=100})
+	${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(${2})
+	${1:FIELDNAME} = models.IntegerField(${0})
 snippet ip
-	${1:FIELDNAME} = models.IPAddressField(${2})
+	${1:FIELDNAME} = models.IPAddressField(${0})
 snippet nullbool
-	${1:FIELDNAME} = models.NullBooleanField(${2})
+	${1:FIELDNAME} = models.NullBooleanField(${0})
 snippet posint
-	${1:FIELDNAME} = models.PositiveIntegerField(${2})
+	${1:FIELDNAME} = models.PositiveIntegerField(${0})
 snippet possmallint
-	${1:FIELDNAME} = models.PositiveSmallIntegerField(${2})
+	${1:FIELDNAME} = models.PositiveSmallIntegerField(${0})
 snippet slug
-	${1:FIELDNAME} = models.SlugField(max_length=${2:50}${3:, blank=True})
+	${1:FIELDNAME} = models.SlugField(max_length=${2:50}${0:, blank=True})
 snippet smallint
-	${1:FIELDNAME} = models.SmallIntegerField(${2})
+	${1:FIELDNAME} = models.SmallIntegerField(${0})
 snippet text
-	${1:FIELDNAME} = models.TextField(${2:blank=True})
+	${1:FIELDNAME} = models.TextField(${0:blank=True})
 snippet time
-	${1:FIELDNAME} = models.TimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
+	${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}${4:, blank=True})
+	${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}${3:, blank=True})
+	${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=}${5:, to_field=''})
+	${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=''}${7:, db_table=''})
+	${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=}${6:, to_field=''})
+	${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}"""
-		${3}
+		${0}
 
 snippet model
 	class ${1:ModelName}(models.Model):
@@ -85,24 +85,24 @@ snippet model
 
 		@models.permalink
 		def get_absolute_url(self):
-			return ('${7:view_or_url_name}' ${8})
+			return ('${7:view_or_url_name}' ${0})
 
 snippet modeladmin
 	class ${1:ModelName}Admin(admin.ModelAdmin):
-		${2}
+		${0}
 
 	admin.site.register($1, $1Admin)
 
 snippet tabularinline
-	class ${1:ModelName}Inline(admin.TabularInline):
+	class ${0:ModelName}Inline(admin.TabularInline):
 		model = $1
 
 snippet stackedinline
-	class ${1:ModelName}Inline(admin.StackedInline):
+	class ${0:ModelName}Inline(admin.StackedInline):
 		model = $1
 
 snippet r2r
 	return render_to_response('${1:template.html}', {
 			${2}
-		}${3:, context_instance=RequestContext(request)}
+		}${0:, context_instance=RequestContext(request)}
 	)
diff --git a/sources_non_forked/vim-snippets/snippets/dosini.snippets b/sources_non_forked/vim-snippets/snippets/dosini.snippets
new file mode 100644
index 00000000..95c759cb
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index eb3319e0..54aa180b 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -1,127 +1,127 @@
 snippet do
 	do
-		${1}
+		${0}
 	end
 snippet if if .. do .. end
 	if ${1} do
-		${2}
+		${0}
 	end
 
 snippet if if .. do: ..
-	if ${1:condition}, do: ${2}
+	if ${1:condition}, do: ${0}
 
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
 		${2}
 	else
-		${3}
+		${0}
 	end
 
 snippet ife if .. do: .. else:
-	if ${1:condition}, do: ${2}, else: ${3}
+	if ${1:condition}, do: ${2}, else: ${0}
 
 snippet unless unless .. do .. end
 	unless ${1} do
-		${2}
+		${0}
 	end
 
 snippet unless unless .. do: ..
-	unless ${1:condition}, do: ${2}
+	unless ${1:condition}, do: ${0}
 
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
 		${2}
 	else
-		${3}
+		${0}
 	end
 
 snippet unlesse unless .. do: .. else:
-	unless ${1:condition}, do: ${2}, else: ${3}
+	unless ${1:condition}, do: ${2}, else: ${0}
 
 snippet cond
 	cond do
 	${1} ->
-		${2}
+		${0}
 	end
 
 snippet case
 	case ${1} do
 	${2} ->
-		${3}
+		${0}
 	end
 
 snippet def
 	def ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
-		${3}
+		${0}
 	end
 
 snippet defma
 	defmacro ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defmo
 	defmodule ${1:module_name} do
-		${2}
+		${0}
 	end
 
 snippet defp
 	defp ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defpr
-	defprotocol ${1:name}, [${2:function}]
+	defprotocol ${1:name}, [${0:function}]
 
 snippet defr
-	defrecord ${1:record_name}, ${2:fields}
+	defrecord ${1:record_name}, ${0:fields}
 
 snippet doc
 	@doc """
-	${1}
+	${0}
 	"""
 
 snippet fn
-	fn(${1:args}) -> ${2} end
+	fn(${1:args}) -> ${0} end
 
 snippet fun
         function do
-        	${1}
+        	${0}
         end
 
 snippet mdoc
 	@moduledoc """
-	${1}
+	${0}
 	"""
 
 snippet rec
 	receive do
 	${1} ->
-		${2}
+		${0}
 	end
 
 snippet req
-	require ${1:module_name}
+	require ${0:module_name}
 
 snippet imp
-	import ${1:module_name}
+	import ${0:module_name}
 
 snippet ali
-	alias ${1:module_name}
+	alias ${0:module_name}
 
 snippet test
 	test "${1:test_name}" do
-		${2}
+		${0}
 	end
 
 snippet try try .. rescue .. end
 	try do
 		${1}
 	rescue
-		${2} -> ${3}
+		${2} -> ${0}
 	end
diff --git a/sources_non_forked/vim-snippets/snippets/erlang.snippets b/sources_non_forked/vim-snippets/snippets/erlang.snippets
index cfad09a3..88458703 100644
--- a/sources_non_forked/vim-snippets/snippets/erlang.snippets
+++ b/sources_non_forked/vim-snippets/snippets/erlang.snippets
@@ -5,62 +5,65 @@ snippet mod
 	-compile([export_all]).
 
 	start() ->
-	    ${2}
+	    ${0}
 
 	stop() ->
 	    ok.
 # define directive
 snippet def
-	-define(${1:macro}, ${2:body}).${3}
+	-define(${1:macro}, ${2:body}).
 # export directive
 snippet exp
-	-export([${1:function}/${2:arity}]).
+	-export([${1:function}/${0:arity}]).
 # include directive
 snippet inc
-	-include("${1:file}").${2}
+	-include("${1:file}").
+# include_lib directive
+snippet incl
+	-include_lib("${1:lib}/include/${1}.hrl").${2}
 # behavior directive
 snippet beh
-	-behaviour(${1:behaviour}).${2}
+	-behaviour(${1:behaviour}).
 # if expression
 snippet if
 	if
 	    ${1:guard} ->
-	        ${2:body}
+	        ${0:body}
 	end
 # case expression
 snippet case
 	case ${1:expression} of
 	    ${2:pattern} ->
-	        ${3:body};
+	        ${0:body};
 	end
 # anonymous function
 snippet fun
-	fun (${1:Parameters}) -> ${2:body} end${3}
+	fun (${1:Parameters}) -> ${2:body} end
 # try...catch
 snippet try
 	try
 	    ${1}
 	catch
-	    ${2:_:_} -> ${3:got_some_exception}
+	    ${2:_:_} -> ${0:got_some_exception}
 	end
 # record directive
 snippet rec
 	-record(${1:record}, {
-	    ${2:field}=${3:value}}).${4}
+	    ${2:field}=${3:value}}).
 # todo comment
 snippet todo
-	%% TODO: ${1}
+	%% 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 ${1}
+	%% @doc ${0}
 # end of doc comment
 snippet %e
 	%% @end
 # specification comment
 snippet %s
-	%% @spec ${1}
+	%% @spec ${0}
 # private function marker
 snippet %p
 	%% @private
@@ -73,7 +76,7 @@ snippet application
 	-export([start/2, stop/1]).
 
 	start(_Type, _StartArgs) ->
-	    case ${2:root_supervisor}:start_link() of
+	    case ${0:root_supervisor}:start_link() of
 	        {ok, Pid} ->
 	            {ok, Pid};
 	        Other ->
@@ -100,14 +103,14 @@ snippet supervisor
 	    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
 
 	init([]) ->
-	    Server = {${2:my_server}, {$2, start_link, []},
+	    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(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(gen_server).
 
@@ -159,7 +162,7 @@ snippet gen_server
 	%%%===================================================================
 # common_test test_SUITE
 snippet testsuite
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
 
 	-include_lib("common_test/include/ct.hrl").
 	
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index e3f42136..95418350 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -4,124 +4,124 @@
 
 # Rails *****************************
 snippet rc
-	<% ${1} %>
+	<% ${0} %>
 snippet rce
-	<%= ${1} %>${2}
+	<%= ${1} %>
 snippet %
-	<% ${1} %>
+	<% ${0} %>
 snippet =
-	<%= ${1} %>${2}
+	<%= ${1} %>
 snippet end
-	<% end %>${1}
+	<% end %>
 snippet ead
 	<% ${1}.each do |${2}| %>
-		${3}
+		${0}
 	<% end %>
 snippet for
 	<% for ${2:item} in ${1} %>
-		${3}
+		${0}
 	<% end %>
 snippet rp
-	<%= render :partial => '${1:item}' %>
+	<%= render :partial => '${0:item}' %>
 snippet rpl
-	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'$4 } %>
+	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'${0} } %>
 snippet rps
-	<%= render :partial => '${1:item}', :status => ${2:500} %>
+	<%= render :partial => '${1:item}', :status => ${0:500} %>
 snippet rpc
-	<%= render :partial => '${1:item}', :collection => ${2:items} %>
+	<%= render :partial => '${1:item}', :collection => ${0:items} %>
 snippet lia
-	<%= link_to '${1:link text...}', :action => '${2:index}' %>
+	<%= link_to '${1:link text...}', :action => '${0:index}' %>
 snippet liai
-	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${3:@item} %>
+	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${0:@item} %>
 snippet lic
-	<%= link_to '${1:link text...}', :controller => '${2:items}' %>
+	<%= link_to '${1:link text...}', :controller => '${0:items}' %>
 snippet lica
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:index}' %>
+	<%= 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 => ${4:@item} %>
+	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:edit}', :id => ${0:@item} %>
 snippet yield
-	<%= yield ${1::content_symbol} %>${2}
+	<%= yield ${1::content_symbol} %>
 snippet conf
 	<% content_for :${1:head} do %>
-		${2}
+		${0}
 	<% end %>
 snippet cs
 	<%= collection_select <+object+>, <+method+>, <+collection+>, <+value_method+>, <+text_method+><+, <+[options]+>, <+[html_options]+>+> %>
 snippet ct
-	<%= content_tag '${1:DIV}', ${2:content}${3:,options} %>
+	<%= content_tag '${1:DIV}', ${2:content}${0:,options} %>
 snippet ff
 	<%= form_for @${1:model} do |f| %>
-		${2}
+		${0}
 	<% end %>
 snippet ffi
-	<%= ${1:f}.input :${2:attribute} %>
+	<%= ${1:f}.input :${0:attribute} %>
 snippet ffcb
-	<%= ${1:f}.check_box :${2:attribute} %>
+	<%= ${1:f}.check_box :${0:attribute} %>
 snippet ffe
 	<% error_messages_for :${1:model} %>
 
 	<%= form_for @${2:model} do |f| %>
-		${3}
+		${0}
 	<% end %>
 snippet ffff
-	<%= ${1:f}.file_field :${2:attribute} %>
+	<%= ${1:f}.file_field :${0:attribute} %>
 snippet ffhf
-	<%= ${1:f}.hidden_field :${2:attribute} %>
+	<%= ${1:f}.hidden_field :${0:attribute} %>
 snippet ffl
-	<%= ${1:f}.label :${2:attribute}, '${3:$2}' %>
+	<%= ${1:f}.label :${2:attribute}, '${0:$2}' %>
 snippet ffpf
-	<%= ${1:f}.password_field :${2:attribute} %>
+	<%= ${1:f}.password_field :${0:attribute} %>
 snippet ffrb
-	<%= ${1:f}.radio_button :${2:attribute}, :${3:tag_value} %>
+	<%= ${1:f}.radio_button :${2:attribute}, :${0:tag_value} %>
 snippet ffs
-	<%= ${1:f}.submit "${2:submit}" %>
+	<%= ${1:f}.submit "${0:submit}" %>
 snippet ffta
-	<%= ${1:f}.text_area :${2:attribute} %>
+	<%= ${1:f}.text_area :${0:attribute} %>
 snippet fftf
-	<%= ${1:f}.text_field :${2:attribute} %>
+	<%= ${1:f}.text_field :${0:attribute} %>
 snippet fields
 	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
-		${3}
+		${0}
 	<% end %>
 snippet i18
-	I18n.t('${1:type.key}')${2}
+	I18n.t('${1:type.key}')
 snippet it
-	<%= image_tag "${1}"${2} %>
+	<%= image_tag "${1}"${0} %>
 snippet jit
-	<%= javascript_include_tag ${1::all} %>
+	<%= javascript_include_tag ${0::all} %>
 snippet jsit
-	<%= javascript_include_tag "${1}" %>
+	<%= javascript_include_tag "${0}" %>
 snippet lim
-	<%= link_to ${1:model}.${2:name}, ${3:$1}_path(${4:$1}) %>
+	<%= 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}, ${5:@$3}) %>
+	<%= 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(${4:@$2}) %>
+	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${0:@$2}) %>
 snippet lip
-	<%= link_to "${1:Link text...}", ${2:model}_path(${3:@$2}) %>
+	<%= link_to "${1:Link text...}", ${2:model}_path(${0:@$2}) %>
 snippet lipp
-	<%= link_to "${1:Link text...}", ${2:model}s_path %>
+	<%= link_to "${1:Link text...}", ${0:model}s_path %>
 snippet lt
-	<%= link_to "${1:name}", ${2:dest} %>
+	<%= 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}, ${4:selected_value} %>
+	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${0:selected_value} %>
 snippet rf
-	<%= render :file => "${1:file}"${2} %>
+	<%= render :file => "${1:file}"${0} %>
 snippet rt
-	<%= render :template => "${1:file}"${2} %>
+	<%= render :template => "${1:file}"${0} %>
 snippet slt
-	<%= stylesheet_link_tag ${1::all}, :cache => ${2:true} %>
+	<%= stylesheet_link_tag ${1::all}, :cache => ${0:true} %>
 snippet sslt
-	<%= stylesheet_link_tag "${1}" %>
+	<%= stylesheet_link_tag "${0}" %>
 snippet if
 	<% if ${1} %>
-		${2}
+		${0}
 	<% end %>
 snippet ife
 	<% if ${1} %>
 		${2}
 	<% else %>
-		${3}
+		${0}
 	<% end %>
diff --git a/sources_non_forked/vim-snippets/snippets/falcon.snippets b/sources_non_forked/vim-snippets/snippets/falcon.snippets
index 78257b6e..c523980d 100644
--- a/sources_non_forked/vim-snippets/snippets/falcon.snippets
+++ b/sources_non_forked/vim-snippets/snippets/falcon.snippets
@@ -3,30 +3,30 @@ snippet #!
 
 # Import
 snippet imp
-	import ${1:module}
+	import ${0:module}
 
 # Function
 snippet fun
 	function ${2:function_name}(${3})
-		${4}
+		${0}
 	end
 
 # Class
 snippet class
 	class ${1:class_name}(${2:class_params})
-		${3:/* members/methods */}
+		${0:/* members/methods */}
 	end
 
 # If
 snippet if
 	if ${1:condition}
-		${2}
+		${0}
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2}
+		${0}
 	else
 	    ${1}
 	end
@@ -34,13 +34,13 @@ snippet ife
 # If else if
 snippet eif
 	elif ${1:condition}
-		${2}
+		${0}
 
 # Switch case
 snippet switch
 	switch ${1:expression}
 		case ${2:item}
-		case ${3:item}
+		case ${0:item}
 		default
 	end
 
@@ -48,24 +48,24 @@ snippet switch
 snippet select
 	select ${1:variable}
 		case ${2:TypeSpec}
-		case ${3:TypeSpec}
+		case ${0:TypeSpec}
 		default
 	end
 
 # For/in Loop
 snippet forin
 	for ${1:element} in ${2:container}
-		${3}
+		${0}
 	end
 
 # For/to Loop
 snippet forto
 	for ${1:lowerbound} to ${2:upperbound}
-		${3}
+		${0}
 	end
 
 # While Loop
-snippet while
+snippet wh
 	while ${1:conidition}
-		${2}
+		${0}
 	end
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index 94610fc8..0239a3fb 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -1,6 +1,20 @@
+# 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}, ${2:value})
+	append(${1:slice}, ${0:value})
 # bool
 snippet bl
 	bool
@@ -12,31 +26,31 @@ snippet br
 	break
 # channel
 snippet ch
-	chan ${1:int}
+	chan ${0:int}
 # case
 snippet cs
 	case ${1:value}:
-		${2}
+		${0}
 # const
 snippet c
-	const ${1:NAME} = ${2:0}
+	const ${1:NAME} = ${0:0}
 # constants with iota
 snippet co
 	const (
 		${1:NAME1} = iota
-		${2:NAME2}
+		${0:NAME2}
 	)
 # continue
 snippet cn
 	continue
 # defer
 snippet df
-	defer ${1:func}()
+	defer ${0:func}()
 # defer recover
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${1}
+			${0}
 		}
 	}()
 # gpl
@@ -58,7 +72,7 @@ snippet gpl
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
 
-	${2}
+	${0}
 # int
 snippet i
 	int
@@ -66,7 +80,7 @@ snippet i
 snippet im
 	import (
 		"${1:package}"
-	)${2}
+	)
 # interface
 snippet in
 	interface{}
@@ -74,23 +88,23 @@ snippet in
 snippet inf
 	interface ${1:name} {
 		${2:/* methods */}
-	}${3}
+	}
 # if condition
 snippet if
 	if ${1:/* condition */} {
 		${2}
-	}${3}
+	}
 # else snippet
 snippet el
 	else {
 		${1}
-	}${2}
+	}
 # error snippet
 snippet ir
 	if err != nil {
 		return err
 	}
-	${1}
+	${0}
 # false
 snippet f
 	false
@@ -113,64 +127,64 @@ snippet ie
 	} else {
 		${3}
 	}
-	${4}
+	${0}
 # for loop
 snippet fo
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
 		${4}
 	}
-	${5}
+	${0}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
 		${4}
 	}
-	${5}
+	${0}
 # function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
 		${4}
 	}
-	${5}
+	${0}
 # function on receiver
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5}
 	}
-	${6}
+	${0}
 # log printf
 snippet lf
-	log.Printf("%${1:s}", ${2:var})${3}
+	log.Printf("%${1:s}", ${2:var})
 # log printf
 snippet lp
-	log.Println("${1}")${2}
+	log.Println("${1}")
 # make
 snippet mk
-	make(${1:[]string}, ${2:0})
+	make(${1:[]string}, ${0:0})
 # map
 snippet mp
-	map[${1:string}]${2:int}
+	map[${1:string}]${0:int}
 # main()
 snippet main
 	func main() {
 		${1}
 	}
-	${2}
+	${0}
 # new
 snippet nw
-	new(${1:type})
+	new(${0:type})
 # panic
 snippet pn
-	panic("${1:msg}")
+	panic("${0:msg}")
 # print
 snippet pr
-	fmt.Printf("%${1:s}\n", ${2:var})${3}
+	fmt.Printf("%${1:s}\n", ${2:var})
 # range
 snippet rn
-	range ${1}
+	range ${0}
 # return
 snippet rt
-	return ${1}
+	return ${0}
 # result
 snippet rs
 	result
@@ -182,7 +196,7 @@ snippet sl
 	case ${4:v2} := <-${5:chan2}
 		${6}
 	default:
-		${7}
+		${0}
 	}
 # string
 snippet sr
@@ -192,7 +206,7 @@ snippet st
 	struct ${1:name} {
 		${2:/* data */}
 	}
-	${3}
+	${0}
 # switch
 snippet sw
 	switch ${1:var} {
@@ -201,21 +215,18 @@ snippet sw
 	case ${4:value2}:
 		${5}
 	default:
-		${6}
+		${0}
 	}
 snippet sp
-	fmt.Sprintf("%${1:s}", ${2:var})${3}
+	fmt.Sprintf("%${1:s}", ${2:var})
 # true
 snippet t
 	true
-# variable declaration
-snippet v
-	var ${1:t} ${2:string}
 # goroutine named function
 snippet g
-	go ${1:funcName}(${2})
+	go ${1:funcName}(${0})
 # goroutine anonymous function 
 snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}
-	}(${4})
+	}(${0})
diff --git a/sources_non_forked/vim-snippets/snippets/haml.snippets b/sources_non_forked/vim-snippets/snippets/haml.snippets
index fd66e742..09217c6c 100644
--- a/sources_non_forked/vim-snippets/snippets/haml.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haml.snippets
@@ -5,27 +5,33 @@ snippet t
 				${1:headers}
 		%tr
 			%td
-				${2:headers}
+				${0:headers}
 snippet ul
 	%ul
 		%li
-			${1:item}
+			${0:item}
 		%li
 snippet rp
-	= render :partial => "${1:item}"
+	= render :partial => "${0:item}"
 snippet rpc
-	= render :partial => "${1:item}", :collection => ${2:@$1s}
+	= render :partial => "${1:item}", :collection => ${0:@$1s}
 snippet rpl
-	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
 snippet rpo
-	= render :partial => "${1:item}", :object => ${2:@$1}
+	= 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}
 	- else
-		${3}
+		${0}
 snippet ifp
 	- if ${1:condition}.presence?
-		${2}
+		${0}
 snippet ntc
 	= number_to_currency(${1})
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index 3857d8b4..f5f15984 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -1,5 +1,5 @@
 snippet lang
-	{-# LANGUAGE ${1:OverloadedStrings} #-}
+	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}
@@ -10,26 +10,26 @@ snippet info
 	-- Stability   :  ${6:experimental}
 	-- Portability :  ${7:unknown}
 	--
-	-- ${8:Description}
+	-- ${0:Description}
 	--
 snippet import
-	import           ${1:Data.Text}
+	import           ${0:Data.Text}
 snippet import2
-	import           ${1:Data.Text} (${2:head})
+	import           ${1:Data.Text} (${0:head})
 snippet importq
-	import qualified ${1:Data.Text} as ${2:T}
+	import qualified ${1:Data.Text} as ${0:T}
 snippet inst
 	instance ${1:Monoid} ${2:Type} where
-		${3}
+		${0}
 snippet type
-	type ${1:Type} = ${2:Type}
+	type ${1:Type} = ${0:Type}
 snippet data
-	data ${1:Type} = ${2:$1} ${3:Int}
+	data ${1:Type} = ${2:$1} ${0:Int}
 snippet newtype
-	newtype ${1:Type} = ${2:$1} ${3:Int}
+	newtype ${1:Type} = ${2:$1} ${0:Int}
 snippet class
 	class ${1:Class} a where
-		${2}
+		${0}
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
 	)	where
@@ -37,46 +37,46 @@ snippet module
 
 snippet const
 	${1:name} :: ${2:a}
-	$1 = ${3:undefined}
+	$1 = ${0:undefined}
 snippet fn
 	${1:fn} :: ${2:a} -> ${3:a}
-	$1 ${4} = ${5:undefined}
+	$1 ${4} = ${0:undefined}
 snippet fn2
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
-	$1 ${5} = ${6:undefined}
+	$1 ${5} = ${0:undefined}
 snippet ap
-	${1:map} ${2:fn} ${3:list}
+	${1:map} ${2:fn} ${0:list}
 snippet do
 	do
 
 snippet λ
-	\${1:x} -> ${2}
+	\${1:x} -> ${0}
 snippet \
-	\${1:x} -> ${2}
+	\${1:x} -> ${0}
 snippet <-
-	${1:a} <- ${2:m a}
+	${1:a} <- ${0:m a}
 snippet ←
-	${1:a} <- ${2:m a}
+	${1:a} <- ${0:m a}
 snippet ->
-	${1:m a} -> ${2:a}
+	${1:m a} -> ${0:a}
 snippet →
-	${1:m a} -> ${2:a}
+	${1:m a} -> ${0:a}
 snippet tup
-	(${1:a}, ${2:b})
+	(${1:a}, ${0:b})
 snippet tup2
-	(${1:a}, ${2:b}, ${3:c})
+	(${1:a}, ${2:b}, ${0:c})
 snippet tup3
-	(${1:a}, ${2:b}, ${3:c}, ${4:d})
+	(${1:a}, ${2:b}, ${3:c}, ${0:d})
 snippet rec
 	${1:Record} { ${2:recFieldA} = ${3:undefined}
-				, ${4:recFieldB} = ${5:undefined}
+				, ${4:recFieldB} = ${0:undefined}
 				}
 snippet case
 	case ${1:something} of
-		${2} -> ${3}
+		${2} -> ${0}
 snippet let
 	let ${1} = ${2}
 	in ${3}
 snippet where
 	where
-		${1:fn} = ${2:undefined}
+		${1:fn} = ${0:undefined}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index a83089c8..f25e1bc7 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -97,353 +97,353 @@ snippet docx
 	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 # Attributes
 snippet attr
-	${1:attribute}="${2:property}"
+	${1:attribute}="${0:property}"
 snippet attr+
-	${1:attribute}="${2:property}" attr+${3}
+	${1:attribute}="${2:property}" attr+
 snippet .
-	class="${1}"${2}
+	class="${1}"
 snippet #
-	id="${1}"${2}
+	id="${1}"
 snippet alt
-	alt="${1}"${2}
+	alt="${1}"
 snippet charset
-	charset="${1:utf-8}"${2}
+	charset="${1:utf-8}"
 snippet data
-	data-${1}="${2:$1}"${3}
+	data-${1}="${2:$1}"
 snippet for
-	for="${1}"${2}
+	for="${1}"
 snippet height
-	height="${1}"${2}
+	height="${1}"
 snippet href
-	href="${1:#}"${2}
+	href="${1:#}"
 snippet lang
-	lang="${1:en}"${2}
+	lang="${1:en}"
 snippet media
-	media="${1}"${2}
+	media="${1}"
 snippet name
-	name="${1}"${2}
+	name="${1}"
 snippet rel
-	rel="${1}"${2}
+	rel="${1}"
 snippet scope
-	scope="${1:row}"${2}
+	scope="${1:row}"
 snippet src
-	src="${1}"${2}
+	src="${1}"
 snippet title=
-	title="${1}"${2}
+	title="${1}"
 snippet type
-	type="${1}"${2}
+	type="${1}"
 snippet value
-	value="${1}"${2}
+	value="${1}"
 snippet width
-	width="${1}"${2}
+	width="${1}"
 # Elements
 snippet a
-	<a href="${1:#}">${2:$1}</a>
+	<a href="${1:#}">${0:$1}</a>
 snippet a.
-	<a class="${1}" href="${2:#}">${3:$1}</a>
+	<a class="${1}" href="${2:#}">${0:$1}</a>
 snippet a#
-	<a id="${1}" href="${2:#}">${3:$1}</a>
+	<a id="${1}" href="${2:#}">${0:$1}</a>
 snippet a:ext
-	<a href="http://${1:example.com}">${2:$1}</a>
+	<a href="http://${1:example.com}">${0:$1}</a>
 snippet a:mail
-	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${0:email me}</a>
 snippet abbr
-	<abbr title="${1}">${2}</abbr>
+	<abbr title="${1}">${0}</abbr>
 snippet address
 	<address>
-		${1}
+		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
 snippet area+
 	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
-	area+${5}
+	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
 snippet article
 	<article>
-		${1}
+		${0}
 	</article>
 snippet article.
 	<article class="${1}">
-		${2}
+		${0}
 	</article>
 snippet article#
 	<article id="${1}">
-		${2}
+		${0}
 	</article>
 snippet aside
 	<aside>
-		${1}
+		${0}
 	</aside>
 snippet aside.
 	<aside class="${1}">
-		${2}
+		${0}
 	</aside>
 snippet aside#
 	<aside id="${1}">
-		${2}
+		${0}
 	</aside>
 snippet audio
-	<audio src="${1}>${2}</audio>
+	<audio src="${1}>${0}</audio>
 snippet b
-	<b>${1}</b>
+	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${2}" />
+	<base href="${1}" target="${0}" />
 snippet bdi
-	<bdi>${1}</bdo>
+	<bdi>${0}</bdo>
 snippet bdo
-	<bdo dir="${1}">${2}</bdo>
+	<bdo dir="${1}">${0}</bdo>
 snippet bdo:l
-	<bdo dir="ltr">${1}</bdo>
+	<bdo dir="ltr">${0}</bdo>
 snippet bdo:r
-	<bdo dir="rtl">${1}</bdo>
+	<bdo dir="rtl">${0}</bdo>
 snippet blockquote
 	<blockquote>
-		${1}
+		${0}
 	</blockquote>
 snippet body
 	<body>
-		${1}
+		${0}
 	</body>
 snippet br
-	<br />${1}
+	<br />
 snippet button
-	<button type="${1:submit}">${2}</button>
+	<button type="${1:submit}">${0}</button>
 snippet button.
-	<button class="${1:button}" type="${2:submit}">${3}</button>
+	<button class="${1:button}" type="${2:submit}">${0}</button>
 snippet button#
-	<button id="${1}" type="${2:submit}">${3}</button>
+	<button id="${1}" type="${2:submit}">${0}</button>
 snippet button:s
-	<button type="submit">${1}</button>
+	<button type="submit">${0}</button>
 snippet button:r
-	<button type="reset">${1}</button>
+	<button type="reset">${0}</button>
 snippet canvas
 	<canvas>
-		${1}
+		${0}
 	</canvas>
 snippet caption
-	<caption>${1}</caption>
+	<caption>${0}</caption>
 snippet cite
-	<cite>${1}</cite>
+	<cite>${0}</cite>
 snippet code
-	<code>${1}</code>
+	<code>${0}</code>
 snippet col
-	<col />${1}
+	<col />
 snippet col+
 	<col />
-	col+${1}
+	col+
 snippet colgroup
 	<colgroup>
-		${1}
+		${0}
 	</colgroup>
 snippet colgroup+
 	<colgroup>
 		<col />
-		col+${1}
+		col+${0}
 	</colgroup>
 snippet command
-	<command type="command" label="${1}" icon="${2}" />
+	<command type="command" label="${1}" icon="${0}" />
 snippet command:c
-	<command type="checkbox" label="${1}" icon="${2}" />
+	<command type="checkbox" label="${1}" icon="${0}" />
 snippet command:r
-	<command type="radio" radiogroup="${1}" label="${2}" icon="${3}" />
+	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}" />
 snippet datagrid
 	<datagrid>
-		${1}
+		${0}
 	</datagrid>
 snippet datalist
 	<datalist>
-		${1}
+		${0}
 	</datalist>
 snippet datatemplate
 	<datatemplate>
-		${1}
+		${0}
 	</datatemplate>
 snippet dd
-	<dd>${1}</dd>
+	<dd>${0}</dd>
 snippet dd.
-	<dd class="${1}">${2}</dd>
+	<dd class="${1}">${0}</dd>
 snippet dd#
-	<dd id="${1}">${2}</dd>
+	<dd id="${1}">${0}</dd>
 snippet del
-	<del>${1}</del>
+	<del>${0}</del>
 snippet details
-	<details>${1}</details>
+	<details>${0}</details>
 snippet dfn
-	<dfn>${1}</dfn>
+	<dfn>${0}</dfn>
 snippet dialog
 	<dialog>
-		${1}
+		${0}
 	</dialog>
 snippet div
 	<div>
-		${1}
+		${0}
 	</div>
 snippet div.
 	<div class="${1}">
-		${2}
+		${0}
 	</div>
 snippet div#
 	<div id="${1}">
-		${2}
+		${0}
 	</div>
 snippet dl
 	<dl>
-		${1}
+		${0}
 	</dl>
 snippet dl.
 	<dl class="${1}">
-		${2}
+		${0}
 	</dl>
 snippet dl#
 	<dl id="${1}">
-		${2}
+		${0}
 	</dl>
 snippet dl+
 	<dl>
 		<dt>${1}</dt>
 		<dd>${2}</dd>
-		dt+${3}
+		dt+${0}
 	</dl>
 snippet dt
-	<dt>${1}</dt>
+	<dt>${0}</dt>
 snippet dt.
-	<dt class="${1}">${2}</dt>
+	<dt class="${1}">${0}</dt>
 snippet dt#
-	<dt id="${1}">${2}</dt>
+	<dt id="${1}">${0}</dt>
 snippet dt+
 	<dt>${1}</dt>
 	<dd>${2}</dd>
-	dt+${3}
+	dt+${0}
 snippet em
-	<em>${1}</em>
+	<em>${0}</em>
 snippet embed
-	<embed src=${1} type="${2} />
+	<embed src=${1} type="${0} />
 snippet fieldset
 	<fieldset>
-		${1}
+		${0}
 	</fieldset>
 snippet fieldset.
 	<fieldset class="${1}">
-		${2}
+		${0}
 	</fieldset>
 snippet fieldset#
 	<fieldset id="${1}">
-		${2}
+		${0}
 	</fieldset>
 snippet fieldset+
 	<fieldset>
 		<legend><span>${1}</span></legend>
 		${2}
 	</fieldset>
-	fieldset+${3}
+	fieldset+${0}
 snippet figcaption
-	<figcaption>${1}</figcaption>
+	<figcaption>${0}</figcaption>
 snippet figure
-	<figure>${1}</figure>
+	<figure>${0}</figure>
 snippet footer
 	<footer>
-		${1}
+		${0}
 	</footer>
 snippet footer.
 	<footer class="${1}">
-		${2}
+		${0}
 	</footer>
 snippet footer#
 	<footer id="${1}">
-		${2}
+		${0}
 	</footer>
 snippet form
 	<form action="${1}" method="${2:get}" accept-charset="utf-8">
-		${3}
+		${0}
 	</form>
 snippet form.
 	<form class="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
-		${4}
+		${0}
 	</form>
 snippet form#
 	<form id="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
-		${4}
+		${0}
 	</form>
 snippet h1
-	<h1>${1}</h1>
+	<h1>${0}</h1>
 snippet h1.
-	<h1 class="${1}">${2}</h1>
+	<h1 class="${1}">${0}</h1>
 snippet h1#
-	<h1 id="${1}">${2}</h1>
+	<h1 id="${1}">${0}</h1>
 snippet h2
-	<h2>${1}</h2>
+	<h2>${0}</h2>
 snippet h2.
-	<h2 class="${1}">${2}</h2>
+	<h2 class="${1}">${0}</h2>
 snippet h2#
-	<h2 id="${1}">${2}</h2>
+	<h2 id="${1}">${0}</h2>
 snippet h3
-	<h3>${1}</h3>
+	<h3>${0}</h3>
 snippet h3.
-	<h3 class="${1}">${2}</h3>
+	<h3 class="${1}">${0}</h3>
 snippet h3#
-	<h3 id="${1}">${2}</h3>
+	<h3 id="${1}">${0}</h3>
 snippet h4
-	<h4>${1}</h4>
+	<h4>${0}</h4>
 snippet h4.
-	<h4 class="${1}">${2}</h4>
+	<h4 class="${1}">${0}</h4>
 snippet h4#
-	<h4 id="${1}">${2}</h4>
+	<h4 id="${1}">${0}</h4>
 snippet h5
-	<h5>${1}</h5>
+	<h5>${0}</h5>
 snippet h5.
-	<h5 class="${1}">${2}</h5>
+	<h5 class="${1}">${0}</h5>
 snippet h5#
-	<h5 id="${1}">${2}</h5>
+	<h5 id="${1}">${0}</h5>
 snippet h6
-	<h6>${1}</h6>
+	<h6>${0}</h6>
 snippet h6.
-	<h6 class="${1}">${2}</h6>
+	<h6 class="${1}">${0}</h6>
 snippet h6#
-	<h6 id="${1}">${2}</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>
-		${2}
+		${0}
 	</head>
 snippet header
 	<header>
-		${1}
+		${0}
 	</header>
 snippet header.
 	<header class="${1}">
-		${2}
+		${0}
 	</header>
 snippet header#
 	<header id="${1}">
-		${2}
+		${0}
 	</header>
 snippet hgroup
 	<hgroup>
-		${1}
+		${0}
 	</hgroup>
 snippet hgroup.
 	<hgroup class="${1}>
-		${2}
+		${0}
 	</hgroup>
 snippet hr
-	<hr />${1}
+	<hr />
 snippet html
 	<html>
-	${1}
+	${0}
 	</html>
 snippet xhtml
 	<html xmlns="http://www.w3.org/1999/xhtml">
-	${1}
+	${0}
 	</html>
 snippet html5
 	<!DOCTYPE html>
@@ -454,175 +454,175 @@ snippet html5
 			${2:meta}
 		</head>
 		<body>
-			${3:body}
+			${0:body}
 		</body>
 	</html>
 snippet i
-	<i>${1}</i>
+	<i>${0}</i>
 snippet iframe
-	<iframe src="${1}" frameborder="0"></iframe>${2}
+	<iframe src="${1}" frameborder="0"></iframe>
 snippet iframe.
-	<iframe class="${1}" src="${2}" frameborder="0"></iframe>${3}
+	<iframe class="${1}" src="${2}" frameborder="0"></iframe>
 snippet iframe#
-	<iframe id="${1}" src="${2}" frameborder="0"></iframe>${3}
+	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}" />${3}
+	<img src="${1}" alt="${2}" />
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}" />${4}
+	<img class="${1}" src="${2}" alt="${3}" />
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}" />${4}
+	<img id="${1}" src="${2}" alt="${3}" />
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />${5}
+	<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}" />${6}
+	<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}" />${4}
+	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<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}" />${5}
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}" />${3}
+	<input type="checkbox" name="${1}" id="${2:$1}" />
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}" />${3}
+	<input type="radio" name="${1}" id="${2:$1}" />
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<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}" />${4}
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
 snippet ins
-	<ins>${1}</ins>
+	<ins>${0}</ins>
 snippet kbd
-	<kbd>${1}</kbd>
+	<kbd>${0}</kbd>
 snippet keygen
-	<keygen>${1}</keygen>
+	<keygen>${0}</keygen>
 snippet label
-	<label for="${2:$1}">${1}</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}" />${7}
+	<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}">${6:$5}</option>
+		<option value="${5}">${0:$5}</option>
 	</select>
 snippet legend
-	<legend>${1}</legend>
+	<legend>${0}</legend>
 snippet legend+
-	<legend><span>${1}</span></legend>
+	<legend><span>${0}</span></legend>
 snippet li
-	<li>${1}</li>
+	<li>${0}</li>
 snippet li.
-	<li class="${1}">${2}</li>
+	<li class="${1}">${0}</li>
 snippet li+
 	<li>${1}</li>
-	li+${2}
+	li+
 snippet lia
-	<li><a href="${2:#}">${1}</a></li>
+	<li><a href="${0:#}">${1}</a></li>
 snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
-	lia+${3}
+	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}" />${5}
+	<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" />${2}
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+	<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" />${2}
+	<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" />${2}
+	<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}" />${2}
+	<link rel="apple-touch-icon" href="${1:favicon.png}" />
 snippet map
 	<map name="${1}">
-		${2}
+		${0}
 	</map>
 snippet map.
 	<map class="${1}" name="${2}">
-		${3}
+		${0}
 	</map>
 snippet map#
 	<map name="${1}" id="${2:$1}>
-		${3}
+		${0}
 	</map>
 snippet map+
 	<map name="${1}">
 		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
-	</map>${7}
+	</map>
 snippet mark
-	<mark>${1}</mark>
+	<mark>${0}</mark>
 snippet menu
 	<menu>
-		${1}
+		${0}
 	</menu>
 snippet menu:c
 	<menu type="context">
-		${1}
+		${0}
 	</menu>
 snippet menu:t
 	<menu type="toolbar">
-		${1}
+		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}" />${3}
+	<meta http-equiv="${1}" content="${2}" />
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />${3}
+	<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" />${3}
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />${3}
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
 snippet meter
-	<meter>${1}</meter>
+	<meter>${0}</meter>
 snippet nav
 	<nav>
-		${1}
+		${0}
 	</nav>
 snippet nav.
 	<nav class="${1}">
-		${2}
+		${0}
 	</nav>
 snippet nav#
 	<nav id="${1}">
-		${2}
+		${0}
 	</nav>
 snippet noscript
 	<noscript>
-		${1}
+		${0}
 	</noscript>
 snippet object
 	<object data="${1}" type="${2}">
 		${3}
-	</object>${4}
+	</object>
 # Embed QT Movie
 snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
@@ -635,198 +635,198 @@ snippet movie
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
 			pluginspage="http://www.apple.com/quicktime/download/" />
-	</object>${6}
+	</object>
 snippet ol
 	<ol>
-		${1}
+		${0}
 	</ol>
 snippet ol.
 	<ol class="${1}>
-		${2}
+		${0}
 	</ol>
 snippet ol#
 	<ol id="${1}>
-		${2}
+		${0}
 	</ol>
 snippet ol+
 	<ol>
 		<li>${1}</li>
-		li+${2}
+		li+${0}
 	</ol>
 snippet opt
-	<option value="${1}">${2:$1}</option>
+	<option value="${1}">${0:$1}</option>
 snippet opt+
 	<option value="${1}">${2:$1}</option>
-	opt+${3}
+	opt+${0}
 snippet optt
-	<option>${1}</option>
+	<option>${0}</option>
 snippet optgroup
 	<optgroup>
 		<option value="${1}">${2:$1}</option>
-		opt+${3}
+		opt+${0}
 	</optgroup>
 snippet output
-	<output>${1}</output>
+	<output>${0}</output>
 snippet p
-	<p>${1}</p>
+	<p>${0}</p>
 snippet param
-	<param name="${1}" value="${2}" />${3}
+	<param name="${1}" value="${2}" />
 snippet pre
 	<pre>
-		${1}
+		${0}
 	</pre>
 snippet progress
-	<progress>${1}</progress>
+	<progress>${0}</progress>
 snippet q
-	<q>${1}</q>
+	<q>${0}</q>
 snippet rp
-	<rp>${1}</rp>
+	<rp>${0}</rp>
 snippet rt
-	<rt>${1}</rt>
+	<rt>${0}</rt>
 snippet ruby
 	<ruby>
-		<rp><rt>${1}</rt></rp>
+		<rp><rt>${0}</rt></rp>
 	</ruby>
 snippet s
-	<s>${1}</s>
+	<s>${0}</s>
 snippet samp
 	<samp>
-		${1}
+		${0}
 	</samp>
 snippet script
 	<script type="text/javascript" charset="utf-8">
-		${1}
+		${0}
 	</script>
 snippet scriptsrc
-	<script src="${1}.js" type="text/javascript" charset="utf-8"></script>
+	<script src="${0}.js" type="text/javascript" charset="utf-8"></script>
 snippet section
 	<section>
-		${1}
+		${0}
 	</section>
 snippet section.
 	<section class="${1}">
-		${2}
+		${0}
 	</section>
 snippet section#
 	<section id="${1}">
-		${2}
+		${0}
 	</section>
 snippet select
 	<select name="${1}" id="${2:$1}">
-		${3}
+		${0}
 	</select>
 snippet select.
 	<select name="${1}" id="${2:$1}" class="${3}>
-		${4}
+		${0}
 	</select>
 snippet select+
 	<select name="${1}" id="${2:$1}">
 		<option value="${3}">${4:$3}</option>
-		opt+${5}
+		opt+${0}
 	</select>
 snippet small
-	<small>${1}</small>
+	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${3}" />
+	<source src="${1}" type="${2}" media="${0}" />
 snippet span
-	<span>${1}</span>
+	<span>${0}</span>
 snippet span.
-	<span class="${1}">${2}</span>
+	<span class="${1}">${0}</span>
 snippet span#
-	<span id="${1}">${2}</span>
+	<span id="${1}">${0}</span>
 snippet strong
-	<strong>${1}</strong>
+	<strong>${0}</strong>
 snippet style
 	<style type="text/css" media="${1:all}">
-		${2}
+		${0}
 	</style>
 snippet sub
-	<sub>${1}</sub>
+	<sub>${0}</sub>
 snippet summary
 	<summary>
-		${1}
+		${0}
 	</summary>
 snippet sup
-	<sup>${1}</sup>
+	<sup>${0}</sup>
 snippet table
 	<table border="${1:0}">
-		${2}
+		${0}
 	</table>
 snippet table.
 	<table class="${1}" border="${2:0}">
-		${3}
+		${0}
 	</table>
 snippet table#
 	<table id="${1}" border="${2:0}">
-		${3}
+		${0}
 	</table>
 snippet tbody
 	<tbody>
-		${1}
+		${0}
 	</tbody>
 snippet td
-	<td>${1}</td>
+	<td>${0}</td>
 snippet td.
-	<td class="${1}">${2}</td>
+	<td class="${1}">${0}</td>
 snippet td#
-	<td id="${1}">${2}</td>
+	<td id="${1}">${0}</td>
 snippet td+
 	<td>${1}</td>
-	td+${2}
+	td+${0}
 snippet textarea
-	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>${6}
+	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>
 snippet tfoot
 	<tfoot>
-		${1}
+		${0}
 	</tfoot>
 snippet th
-	<th>${1}</th>
+	<th>${0}</th>
 snippet th.
-	<th class="${1}">${2}</th>
+	<th class="${1}">${0}</th>
 snippet th#
-	<th id="${1}">${2}</th>
+	<th id="${1}">${0}</th>
 snippet th+
 	<th>${1}</th>
-	th+${2}
+	th+${0}
 snippet thead
 	<thead>
-		${1}
+		${0}
 	</thead>
 snippet time
-	<time datetime="${1}" pubdate="${2:$1}">${3:$1}</time>
+	<time datetime="${1}" pubdate="${2:$1}">${0:$1}</time>
 snippet title
-	<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+	<title>${0:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 snippet tr
 	<tr>
-		${1}
+		${0}
 	</tr>
 snippet tr+
 	<tr>
 		<td>${1}</td>
-		td+${2}
+		td+${0}
 	</tr>
 snippet track
-	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}</track>${6}
+	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}</track>
 snippet ul
 	<ul>
-		${1}
+		${0}
 	</ul>
 snippet ul.
 	<ul class="${1}">
-		${2}
+		${0}
 	</ul>
 snippet ul#
 	<ul id="${1}">
-		${2}
+		${0}
 	</ul>
 snippet ul+
 	<ul>
 		<li>${1}</li>
-		li+${2}
+		li+${0}
 	</ul>
 snippet var
-	<var>${1}</var>
+	<var>${0}</var>
 snippet video
-	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>${8}
+	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
-	<wbr />${1}
+	<wbr />
diff --git a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
index bc6d3e0a..43e5d4a4 100644
--- a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
@@ -18,31 +18,31 @@ snippet html5
 # ==== TAGS
 # you always need these:
 snippet .
-	class="${1}"${2}
+	class="${1}"
 snippet n
-	name="${1}"${2}
+	name="${1}"
 snippet r
-	rel="${1}"${2}
+	rel="${1}"
 snippet t
-	title="${1}"${2}
+	title="${1}"
 
 # not using # because id is faster to type
 snippet id
-	id="${1}"${2}
+	id="${1}"
 snippet idn
-	id="${1}" name="${2:$1}"
+	id="${1}" name="${0:$1}"
 
 snippet label_and_input
-	<label for="${2:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">${7}
+	<label for="${0:$1}">${1}</label>
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">
 
 
 # FORMS
 # use idn . or n to add id
 snippet input
-	<input type="${1:text}" value="${2}" ${3}>${7}
+	<input type="${1:text}" value="${2}" ${3}>
 snippet submit
-	<input type="submit" value="${2}" ${3}>${7}
+	<input type="submit" value="${2}" ${3}>
 snippet textarea
 	<textarea $1>$2</textarea>
 
@@ -61,14 +61,12 @@ snippet img
 	<img src="$1" alt="$2"/>
 # JS/CSS
 snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">${3}
-snippet css_block
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
-        </link>
-
+snippet css_block
+	<style type='text/css'>
+	</style>
 snippet script_block
 	<script type="text/javascript" charset="utf-8">
 	</script>
 snippet script_file
-	<script type="text/javascript" charset="utf-8">
-	</script>
+	<script src="${1}" type="text/javascript"></script>
diff --git a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
index 4ff5d336..be087cec 100644
--- a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
+++ b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
@@ -1,89 +1,89 @@
 # Generic tags
 
 snippet %
-	{% ${1} %}${2}
+	{% ${1} %}
 snippet %%
 	{% ${1:tag_name} %}
-	${2}
+	${0}
 	{% end$1 %}
 snippet {
-	{{ ${1} }}${2}
+	{{ ${1} }}
 # Template Tags
 
 snippet autoescape
 	{% autoescape ${1:off} %}
-		${2}
+		${0}
 	{% endautoescape %}
 snippet block
 	{% block ${1} %}
-		${2}
+		${0}
 	{% endblock %}
 snippet #
-	{# ${1:comment} #}
+	{# ${0:comment} #}
 snippet comment
 	{% comment %}
-		${1}
+		${0}
 	{% endcomment %}
 snippet cycle
 	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
 snippet debug
 	{% debug %}
 snippet extends
-	{% extends "${1:base.html}" %}
+	{% extends "${0:base.html}" %}
 snippet filter
 	{% filter ${1} %}
-		${2}
+		${0}
 	{% endfilter %}
 snippet firstof
 	{% firstof ${1} %}
 snippet for
 	{% for ${1} in ${2} %}
-		${3}
+		${0}
 	{% endfor %}
 snippet empty
 	{% empty %}
-	${1}
+	${0}
 snippet if
 	{% if ${1} %}
-		${2}
+		${0}
 	{% endif %}
 snippet el
 	{% else %}
 		${1}
 snippet eif
 	{% elif ${1} %}
-		${2}
+		${0}
 snippet ifchanged
 	{% ifchanged %}${1}{% endifchanged %}
 snippet ifequal
 	{% ifequal ${1} ${2} %}
-		${3}
+		${0}
 	{% endifequal %}
 snippet ifnotequal
 	{% ifnotequal ${1} ${2} %}
-		${3}
+		${0}
 	{% endifnotequal %}
 snippet include
-	{% include "${1}" %}
+	{% include "${0}" %}
 snippet load
-	{% load ${1} %}
+	{% load ${0} %}
 snippet now
-	{% now "${1:jS F Y H:i}" %}
+	{% now "${0:jS F Y H:i}" %}
 snippet regroup
-	{% regroup ${1} by ${2} as ${3} %}
+	{% regroup ${1} by ${2} as ${0} %}
 snippet spaceless
-	{% spaceless %}${1}{% endspaceless %}
+	{% spaceless %}${0}{% endspaceless %}
 snippet ssi
-	{% ssi ${1} %}
+	{% ssi ${0} %}
 snippet trans
-	{% trans "${1:string}" %}
+	{% trans "${0:string}" %}
 snippet url
-	{% url ${1} as ${2} %}
+	{% url ${1} as ${0} %}
 snippet widthratio
-	{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
 snippet with
 	{% with ${1} as ${2} %}
-		${3}
+		${0}
 	{% endwith %}
 
 # Template Filters
@@ -95,47 +95,47 @@ snippet with
 # Note: Template tags that take no arguments are not implemented.
 
 snippet add
-	add:"${1}"
+	add:"${0}"
 snippet center
-	center:"${1}"
+	center:"${0}"
 snippet cut
-	cut:"${1}"
+	cut:"${0}"
 snippet date
-	date:"${1}"
+	date:"${0}"
 snippet default
-	default:"${1}"
+	default:"${0}"
 snippet defaultifnone
-	default_if_none:"${1}"
+	default_if_none:"${0}"
 snippet dictsort
-	dictsort:"${1}"
+	dictsort:"${0}"
 snippet dictsortrev
-	dictsortreversed:"${1}"
+	dictsortreversed:"${0}"
 snippet divisibleby
-	divisibleby:"${1}"
+	divisibleby:"${0}"
 snippet floatformat
-	floatformat:"${1}"
+	floatformat:"${0}"
 snippet getdigit
-	get_digit:"${1}"
+	get_digit:"${0}"
 snippet join
-	join:"${1}"
+	join:"${0}"
 snippet lengthis
-	length_is:"${1}"
+	length_is:"${0}"
 snippet pluralize
-	pluralize:"${1}"
+	pluralize:"${0}"
 snippet removetags
-	removetags:"${1}"
+	removetags:"${0}"
 snippet slice
-	slice:"${1}"
+	slice:"${0}"
 snippet stringformat
-	stringformat:"${1}"
+	stringformat:"${0}"
 snippet time
-	time:"${1}"
+	time:"${0}"
 snippet truncatewords
-	truncatewords:${1}
+	truncatewords:${0}
 snippet truncatewordshtml
-	truncatewords_html:${1}
+	truncatewords_html:${0}
 snippet urlizetrunc
-	urlizetrunc:${1}
+	urlizetrunc:${0}
 snippet wordwrap
-	wordwrap:${1}
+	wordwrap:${0}
 
diff --git a/sources_non_forked/vim-snippets/snippets/htmltornado.snippets b/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
index e80499ce..46f5dab4 100644
--- a/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
+++ b/sources_non_forked/vim-snippets/snippets/htmltornado.snippets
@@ -1,55 +1,55 @@
 # Generic tags
 
 snippet {
-	{{ ${1} }}
+	{{ ${0} }}
 
 # Template tags
 
 snippet extends
-	{% extends "${1:base.html}" %}
+	{% extends "${0:base.html}" %}
 snippet autoescape
-	{% autoescape ${1:xhtml_escape | None} %}
+	{% autoescape ${0:xhtml_escape | None} %}
 snippet apply
 	{% apply ${1:function} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet block
 	{% block ${1} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet for
 	{% for ${1:item} in ${2} %}
-	  ${3}
+	  ${0}
 	{% end %}
 snippet from
-	{% from ${1:x} import ${2:y} %}
+	{% from ${1:x} import ${0:y} %}
 snippet if
 	{% if ${1:condition} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet eif
-	{% elif ${1:condition} %}
+	{% elif ${0:condition} %}
 snippet el
 	{% else %}
 snippet import
-	{% import ${1:module} %}
+	{% import ${0:module} %}
 snippet include
-	{% include "${1:filename}" %}
+	{% include "${0:filename}" %}
 snippet module
-	{% module ${1:expression} %}
+	{% module ${0:expression} %}
 snippet raw
-	{% raw ${1:expression} %}
+	{% raw ${0:expression} %}
 snippet set
-	{% set ${1:x} = ${2:y} %}
+	{% set ${1:x} = ${0:y} %}
 snippet try
 	{% try %}
 	  ${1}
 	{% except %}
 	  ${2}
 	{% finallly %}
-	  ${3}
+	  ${0}
 	{% end %}
-snippet while
+snippet wh
 	{% while ${1:condition} %}
-	  ${2}
+	  ${0}
 	{% end %}
diff --git a/sources_non_forked/vim-snippets/snippets/java.snippets b/sources_non_forked/vim-snippets/snippets/java.snippets
index a36e0f15..1595ffc1 100644
--- a/sources_non_forked/vim-snippets/snippets/java.snippets
+++ b/sources_non_forked/vim-snippets/snippets/java.snippets
@@ -9,16 +9,16 @@ snippet pr
 ## Annotations
 snippet before
 	@Before
-	static void ${1:intercept}(${2:args}) { ${3} }
+	static void ${1:intercept}(${2:args}) { ${0} }
 snippet mm
 	@ManyToMany
-	${1}
+	${0}
 snippet mo
 	@ManyToOne
-	${1}
+	${0}
 snippet om
 	@OneToMany${1:(cascade=CascadeType.ALL)}
-	${2}
+	${0}
 snippet oo
 	@OneToOne
 	${1}
@@ -39,11 +39,11 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}${3}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}
 snippet tc
-	public class ${1:`vim_snippets#Filename()`} extends ${2:TestCase}
+	public class ${1:`vim_snippets#Filename()`} extends ${0:TestCase}
 ##
 ## Class Enhancements
 snippet ext
@@ -54,40 +54,40 @@ snippet imp
 ## Comments
 snippet /*
 	/*
-	 * ${1}
+	 * ${0}
 	 */
 ##
 ## Constants
 snippet co
-	static public final ${1:String} ${2:var} = ${3};${4}
+	static public final ${1:String} ${2:var} = ${3};
 snippet cos
-	static public final String ${1:var} = "${2}";${3}
+	static public final String ${1:var} = "${2}";
 ##
 ## Control Statements
 snippet case
 	case ${1}:
-		${2}
+		${0}
 snippet def
 	default:
-		${2}
+		${0}
 snippet el
 	else
 snippet eif
-	else if (${1}) ${2}
+	else if (${1}) ${0}
 snippet if
-	if (${1}) ${2}
+	if (${1}) ${0}
 snippet sw
 	switch (${1}) {
-		${2}
+		${0}
 	}
 ##
 ## Create a Method
 snippet m
-	${1:void} ${2:method}(${3}) ${4:throws }${5}
+	${1:void} ${2:method}(${3}) ${4:throws }
 ##
 ## Create a Variable
 snippet v
-	${1:String} ${2:var}${3: = null}${4};${5}
+	${1:String} ${2:var}${3: = null}${4};
 ##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
@@ -101,107 +101,107 @@ snippet sy
 ##
 ## Error Methods
 snippet err
-	System.err.print("${1:Message}");
+	System.err.print("${0:Message}");
 snippet errf
-	System.err.printf("${1:Message}", ${2:exception});
+	System.err.printf("${1:Message}", ${0:exception});
 snippet errln
-	System.err.println("${1:Message}");
+	System.err.println("${0:Message}");
 ##
 ## Exception Handling
 snippet as
-	assert ${1:test} : "${2:Failure message}";${3}
+	assert ${1:test} : "${2:Failure message}";
 snippet ca
-	catch(${1:Exception} ${2:e}) ${3}
+	catch(${1:Exception} ${2:e}) ${0}
 snippet thr
 	throw
 snippet ths
 	throws
 snippet try
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	}
 snippet tryf
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
 ##
 ## Find Methods
 snippet findall
-	List<${1:listName}> ${2:items} = ${1}.findAll();${3}
+	List<${1:listName}> ${2:items} = ${1}.findAll();
 snippet findbyid
-	${1:var} ${2:item} = ${1}.findById(${3});${4}
+	${1:var} ${2:item} = ${1}.findById(${3});
 ##
 ## Javadocs
 snippet /**
 	/**
-	 * ${1}
+	 * ${0}
 	 */
 snippet @au
 	@author `system("grep \`id -un\` /etc/passwd | cut -d \":\" -f5 | cut -d \",\" -f1")`
 snippet @br
-	@brief ${1:Description}
+	@brief ${0:Description}
 snippet @fi
-	@file ${1:`vim_snippets#Filename()`}.java
+	@file ${0:`vim_snippets#Filename()`}.java
 snippet @pa
-	@param ${1:param}
+	@param ${0:param}
 snippet @re
-	@return ${1:param}
+	@return ${0:param}
 ##
 ## Logger Methods
 snippet debug
-	Logger.debug(${1:param});${2}
+	Logger.debug(${1:param});
 snippet error
-	Logger.error(${1:param});${2}
+	Logger.error(${1:param});
 snippet info
-	Logger.info(${1:param});${2}
+	Logger.info(${1:param});
 snippet warn
-	Logger.warn(${1:param});${2}
+	Logger.warn(${1:param});
 ##
 ## Loops
 snippet enfor
-	for (${1} : ${2}) ${3}
+	for (${1} : ${2}) ${0}
 snippet for
-	for (${1}; ${2}; ${3}) ${4}
+	for (${1}; ${2}; ${3}) ${0}
 snippet wh
-	while (${1}) ${2}
+	while (${1}) ${0}
 ##
 ## Main method
 snippet main
 	public static void main (String[] args) {
-		${1}
+		${0}
 	}
 ##
 ## Print Methods
 snippet print
-	System.out.print("${1:Message}");
+	System.out.print("${0:Message}");
 snippet printf
-	System.out.printf("${1:Message}", ${2:args});
+	System.out.printf("${1:Message}", ${0:args});
 snippet println
-	System.out.println(${1});
+	System.out.println(${0});
 ##
 ## Render Methods
 snippet ren
-	render(${1:param});${2}
+	render(${1:param});
 snippet rena
-	renderArgs.put("${1}", ${2});${3}
+	renderArgs.put("${1}", ${2});
 snippet renb
-	renderBinary(${1:param});${2}
+	renderBinary(${1:param});
 snippet renj
-	renderJSON(${1:param});${2}
+	renderJSON(${1:param});
 snippet renx
-	renderXml(${1:param});${2}
+	renderXml(${1:param});
 ##
 ## Setter and Getter Methods
 snippet set
-	${1:public} void set${3:}(${2:String} ${4:}){
+	${1:public} void set${3:}(${2:String} ${0:}){
 		this.$4 = $4;
 	}
 snippet get
 	${1:public} ${2:String} get${3:}(){
-		return this.${4:};
+		return this.${0:};
 	}
 ##
 ## Terminate Methods or Loops
@@ -213,12 +213,12 @@ snippet br
 ## Test Methods
 snippet t
 	public void test${1:Name}() throws Exception {
-		${2}
+		${0}
 	}
 snippet test
 	@Test
 	public void test${1:Name}() throws Exception {
-		${2}
+		${0}
 	}
 ##
 ## Utils
@@ -227,14 +227,14 @@ snippet Sc
 ##
 ## Miscellaneous
 snippet action
-	public static void ${1:index}(${2:args}) { ${3} }
+	public static void ${1:index}(${2:args}) { ${0} }
 snippet rnf
-	notFound(${1:param});${2}
+	notFound(${1:param});
 snippet rnfin
-	notFoundIfNull(${1:param});${2}
+	notFoundIfNull(${1:param});
 snippet rr
-	redirect(${1:param});${2}
+	redirect(${1:param});
 snippet ru
-	unauthorized(${1:param});${2}
+	unauthorized(${1:param});
 snippet unless
-	(unless=${1:param});${2}
+	(unless=${1:param});
diff --git a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets b/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
index 014c6158..ef6f66c7 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
@@ -1,9 +1,9 @@
 snippet add
-	${1:obj}.add('${2:selector expression}')${3}
+	${1:obj}.add('${2:selector expression}')
 snippet addClass
-	${1:obj}.addClass('${2:class name}')${3}
+	${1:obj}.addClass('${2:class name}')
 snippet after
-	${1:obj}.after('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.after('${2:Some text <b>and bold!</b>}')
 snippet ajax
 	$.ajax({
 		url: '${1:mydomain.com/url}',
@@ -17,41 +17,41 @@ snippet ajax
 			${6:// success callback}
 		},
 		error: function (jqXHR, textStatus, errorThrown) {
-			${7:// error callback}
+			${0:// error callback}
 		}
 	});
 snippet ajaxcomplete
 	${1:obj}.ajaxComplete(function (${1:e}, xhr, settings) {
-		${2:// callback}
+		${0:// callback}
 	});
 snippet ajaxerror
 	${1:obj}.ajaxError(function (${1:e}, xhr, settings, thrownError) {
 		${2:// error callback}
 	});
-	${3}
+	${0}
 snippet ajaxget
 	$.get('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet ajaxpost
 	$.post('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet ajaxprefilter
 	$.ajaxPrefilter(function (${1:options}, ${2:originalOptions}, jqXHR) {
-		${3: // Modify options, control originalOptions, store jqXHR, etc}
+		${0: // Modify options, control originalOptions, store jqXHR, etc}
 	});
 snippet ajaxsend
 	${1:obj}.ajaxSend(function (${1:request, settings}) {
 		${2:// error callback}
 	});
-	${3}
+	${0}
 snippet ajaxsetup
 	$.ajaxSetup({
 		url: "${1:mydomain.com/url}",
@@ -65,525 +65,525 @@ snippet ajaxsetup
 			${6:// success callback}
 		},
 		error: function (jqXHR, textStatus, errorThrown) {
-			${7:// error callback}
+			${0:// error callback}
 		}
 	});
 snippet ajaxstart
 	$.ajaxStart(function () {
 		${1:// handler for when an AJAX call is started and no other AJAX calls are in progress};
 	});
-	${2}
+	${0}
 snippet ajaxstop
 	$.ajaxStop(function () {
 		${1:// handler for when all AJAX calls have been completed};
 	});
-	${2}
+	${0}
 snippet ajaxsuccess
 	$.ajaxSuccess(function (${1:e}, xhr, settings) {
 		${2:// handler for when any AJAX call is successfully completed};
 	});
-	${2}
+	${0}
 snippet andself
-	${1:obj}.andSelf()${2}
+	${1:obj}.andSelf()
 snippet animate
-	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})${4}
+	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})
 snippet append
-	${1:obj}.append('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.append('${2:Some text <b>and bold!</b>}')
 snippet appendTo
-	${1:obj}.appendTo('${2:selector expression}')${3}
+	${1:obj}.appendTo('${2:selector expression}')
 snippet attr
-	${1:obj}.attr('${2:attribute}', '${3:value}')${4}
+	${1:obj}.attr('${2:attribute}', '${3:value}')
 snippet attrm
-	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})${6}
+	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})
 snippet before
-	${1:obj}.before('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.before('${2:Some text <b>and bold!</b>}')
 snippet bind
 	${1:obj}.bind('${2:event name}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet blur
 	${1:obj}.blur(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet C
-	$.Callbacks()${1}
+	$.Callbacks()
 snippet Cadd
-	${1:callbacks}.add(${2:callbacks})${3}
+	${1:callbacks}.add(${2:callbacks})
 snippet Cdis
-	${1:callbacks}.disable()${2}
+	${1:callbacks}.disable()
 snippet Cempty
-	${1:callbacks}.empty()${2}
+	${1:callbacks}.empty()
 snippet Cfire
-	${1:callbacks}.fire(${2:args})${3}
+	${1:callbacks}.fire(${2:args})
 snippet Cfired
-	${1:callbacks}.fired()${2}
+	${1:callbacks}.fired()
 snippet Cfirew
-	${1:callbacks}.fireWith(${2:this}, ${3:args})${4}
+	${1:callbacks}.fireWith(${2:this}, ${3:args})
 snippet Chas
-	${1:callbacks}.has(${2:callback})${3}
+	${1:callbacks}.has(${2:callback})
 snippet Clock
-	${1:callbacks}.lock()${2}
+	${1:callbacks}.lock()
 snippet Clocked
-	${1:callbacks}.locked()${2}
+	${1:callbacks}.locked()
 snippet Crem
-	${1:callbacks}.remove(${2:callbacks})${3}
+	${1:callbacks}.remove(${2:callbacks})
 snippet change
 	${1:obj}.change(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet children
-	${1:obj}.children('${2:selector expression}')${3}
+	${1:obj}.children('${2:selector expression}')
 snippet clearq
-	${1:obj}.clearQueue(${2:'queue name'})${3}
+	${1:obj}.clearQueue(${2:'queue name'})
 snippet click
 	${1:obj}.click(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet clone
-	${1:obj}.clone()${2}
+	${1:obj}.clone()
 snippet contains
-	$.contains(${1:container}, ${2:contents});
+	$.contains(${1:container}, ${0:contents});
 snippet css
-	${1:obj}.css('${2:attribute}', '${3:value}')${4}
+	${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) {
-			${3: // handle setting the CSS value}
+			${0: // handle setting the CSS value}
 		}
 	};
 snippet cssm
-	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})${6}
+	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})
 snippet D
-	$.Deferred()${1}
+	$.Deferred()
 snippet Dalways
-	${1:deferred}.always(${2:callbacks})${3}
+	${1:deferred}.always(${2:callbacks})
 snippet Ddone
-	${1:deferred}.done(${2:callbacks})${3}
+	${1:deferred}.done(${2:callbacks})
 snippet Dfail
-	${1:deferred}.fail(${2:callbacks})${3}
+	${1:deferred}.fail(${2:callbacks})
 snippet Disrej
-	${1:deferred}.isRejected()${2}
+	${1:deferred}.isRejected()
 snippet Disres
-	${1:deferred}.isResolved()${2}
+	${1:deferred}.isResolved()
 snippet Dnotify
-	${1:deferred}.notify(${2:args})${3}
+	${1:deferred}.notify(${2:args})
 snippet Dnotifyw
-	${1:deferred}.notifyWith(${2:this}, ${3:args})${4}
+	${1:deferred}.notifyWith(${2:this}, ${3:args})
 snippet Dpipe
-	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})${5}
+	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})
 snippet Dprog
-	${1:deferred}.progress(${2:callbacks})${3}
+	${1:deferred}.progress(${2:callbacks})
 snippet Dprom
-	${1:deferred}.promise(${2:target})${3}
+	${1:deferred}.promise(${2:target})
 snippet Drej
-	${1:deferred}.reject(${2:args})${3}
+	${1:deferred}.reject(${2:args})
 snippet Drejw
-	${1:deferred}.rejectWith(${2:this}, ${3:args})${4}
+	${1:deferred}.rejectWith(${2:this}, ${3:args})
 snippet Dres
-	${1:deferred}.resolve(${2:args})${3}
+	${1:deferred}.resolve(${2:args})
 snippet Dresw
-	${1:deferred}.resolveWith(${2:this}, ${3:args})${4}
+	${1:deferred}.resolveWith(${2:this}, ${3:args})
 snippet Dstate
-	${1:deferred}.state()${2}
+	${1:deferred}.state()
 snippet Dthen
-	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})${5}
+	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})
 snippet Dwhen
-	$.when(${1:deferreds})${2}
+	$.when(${1:deferreds})
 snippet data
-	${1:obj}.data(${2:obj})${3}
+	${1:obj}.data(${2:obj})
 snippet dataa
-	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})${4}
+	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})
 snippet dblclick
 	${1:obj}.dblclick(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet delay
-	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})${4}
+	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})
 snippet dele
 	${1:obj}.delegate('${2:selector expression}', '${3:event name}', function (${4:e}) {
-		${5:// event handler}
+		${0:// event handler}
 	});
 snippet deq
-	${1:obj}.dequeue(${2:'queue name'})${3}
+	${1:obj}.dequeue(${2:'queue name'})
 snippet deqq
-	$.dequeue('${1:selector expression}'${2:, 'queue name'})${3}
+	$.dequeue('${1:selector expression}'${2:, 'queue name'})
 snippet detach
-	${1:obj}.detach('${2:selector expression}')${3}
+	${1:obj}.detach('${2:selector expression}')
 snippet die
-	${1:obj}.die(${2:event}, ${3:handler})${4}
+	${1:obj}.die(${2:event}, ${3:handler})
 snippet each
 	${1:obj}.each(function (index) {
-		${2:this.innerHTML = this + " is the element, " + index + " is the position";}
+		${0:this.innerHTML = this + " is the element, " + index + " is the position";}
 	});
 snippet el
-	$('<${1}/>'${2:, {}})${3}
+	$('<${1}/>'${2:, {}})
 snippet eltrim
-	$.trim('${1:string}')${2}
+	$.trim('${1:string}')
 snippet empty
-	${1:obj}.empty()${2}
+	${1:obj}.empty()
 snippet end
-	${1:obj}.end()${2}
+	${1:obj}.end()
 snippet eq
-	${1:obj}.eq(${2:element index})${3}
+	${1:obj}.eq(${2:element index})
 snippet error
 	${1:obj}.error(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet eventsmap
 	{
-		:f${1}
+		:f${0}
 	}
 snippet extend
-	$.extend(${1:true, }${2:target}, ${3:obj})${4}
+	$.extend(${1:true, }${2:target}, ${3:obj})
 snippet fadein
-	${1:obj}.fadeIn('${2:slow/400/fast}')${3}
+	${1:obj}.fadeIn('${2:slow/400/fast}')
 snippet fadeinc
 	${1:obj}.fadeIn('slow/400/fast', function () {
-		${2:// callback};
+		${0:// callback};
 	});
 snippet fadeout
-	${1:obj}.fadeOut('${2:slow/400/fast}')${3}
+	${1:obj}.fadeOut('${2:slow/400/fast}')
 snippet fadeoutc
 	${1:obj}.fadeOut('slow/400/fast', function () {
-		${2:// callback};
+		${0:// callback};
 	});
 snippet fadeto
-	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})${4}
+	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})
 snippet fadetoc
 	${1:obj}.fadeTo('slow/400/fast', ${2:0.5}, function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet filter
-	${1:obj}.filter('${2:selector expression}')${3}
+	${1:obj}.filter('${2:selector expression}')
 snippet filtert
 	${1:obj}.filter(function (${2:index}) {
 		${3}
-	})${4}
+	})
 snippet find
-	${1:obj}.find('${2:selector expression}')${3}
+	${1:obj}.find('${2:selector expression}')
 snippet focus
 	${1:obj}.focus(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet focusin
 	${1:obj}.focusIn(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet focusout
 	${1:obj}.focusOut(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet get
-	${1:obj}.get(${2:element index})${3}
+	${1:obj}.get(${2:element index})
 snippet getjson
 	$.getJSON('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet getscript
 	$.getScript('${1:mydomain.com/url}', function (script, textStatus, jqXHR) {
-		${2:// callback}
+		${0:// callback}
 	});
 snippet grep
 	$.grep(${1:array}, function (item, index) {
 		${2}
-	}${3:, true});
+	}${0:, true});
 snippet hasc
-	${1:obj}.hasClass('${2:className}')${3}
+	${1:obj}.hasClass('${2:className}')
 snippet hasd
-	$.hasData('${1:selector expression}');
+	$.hasData('${0:selector expression}');
 snippet height
-	${1:obj}.height(${2:integer})${3}
+	${1:obj}.height(${2:integer})
 snippet hide
-	${1:obj}.hide('${2:slow/400/fast}')${3}
+	${1:obj}.hide('${2:slow/400/fast}')
 snippet hidec
 	${1:obj}.hide('${2:slow/400/fast}', function () {
-		${3:// callback}
+		${0:// callback}
 	});
 snippet hover
 	${1:obj}.hover(function (${2:e}) {
 		${3:// event handler}
 	}, function ($2) {
 		${4:// event handler}
-	});${5}
+	});
 snippet html
-	${1:obj}.html('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.html('${2:Some text <b>and bold!</b>}')
 snippet inarr
-	$.inArray(${1:value}, ${2:array});
+	$.inArray(${1:value}, ${0:array});
 snippet insa
-	${1:obj}.insertAfter('${2:selector expression}')${3}
+	${1:obj}.insertAfter('${2:selector expression}')
 snippet insb
-	${1:obj}.insertBefore('${2:selector expression}')${3}
+	${1:obj}.insertBefore('${2:selector expression}')
 snippet is
-	${1:obj}.is('${2:selector expression}')${3}
+	${1:obj}.is('${2:selector expression}')
 snippet isarr
-	$.isArray(${1:obj})${2}
+	$.isArray(${1:obj})
 snippet isempty
-	$.isEmptyObject(${1:obj})${2}
+	$.isEmptyObject(${1:obj})
 snippet isfunc
-	$.isFunction(${1:obj})${2}
+	$.isFunction(${1:obj})
 snippet isnum
-	$.isNumeric(${1:value})${2}
+	$.isNumeric(${1:value})
 snippet isobj
-	$.isPlainObject(${1:obj})${2}
+	$.isPlainObject(${1:obj})
 snippet iswin
-	$.isWindow(${1:obj})${2}
+	$.isWindow(${1:obj})
 snippet isxml
-	$.isXMLDoc(${1:node})${2}
+	$.isXMLDoc(${1:node})
 snippet jj
-	$('${1:selector}')${2}
+	$('${1:selector}')
 snippet kdown
 	${1:obj}.keydown(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet kpress
 	${1:obj}.keypress(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet kup
 	${1:obj}.keyup(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet last
-	${1:obj}.last('${1:selector expression}')${3}
+	${1:obj}.last('${1:selector expression}')
 snippet live
 	${1:obj}.live('${2:events}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet load
 	${1:obj}.load(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet loadf
 	${1:obj}.load('${2:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (responseText, textStatus, xhr) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	});
 snippet makearray
-	$.makeArray(${1:obj});
+	$.makeArray(${0:obj});
 snippet map
 	${1:obj}.map(function (${2:index}, ${3:element}) {
-		${4:// callback}
+		${0:// callback}
 	});
 snippet mapp
 	$.map(${1:arrayOrObject}, function (${2:value}, ${3:indexOrKey}) {
-		${4:// callback}
+		${0:// callback}
 	});
 snippet merge
-	$.merge(${1:target}, ${2:original});
+	$.merge(${1:target}, ${0:original});
 snippet mdown
 	${1:obj}.mousedown(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet menter
 	${1:obj}.mouseenter(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mleave
 	${1:obj}.mouseleave(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mmove
 	${1:obj}.mousemove(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mout
 	${1:obj}.mouseout(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mover
 	${1:obj}.mouseover(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mup
 	${1:obj}.mouseup(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet next
-	${1:obj}.next('${2:selector expression}')${3}
+	${1:obj}.next('${2:selector expression}')
 snippet nexta
-	${1:obj}.nextAll('${2:selector expression}')${3}
+	${1:obj}.nextAll('${2:selector expression}')
 snippet nextu
-	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet not
-	${1:obj}.not('${2:selector expression}')${3}
+	${1:obj}.not('${2:selector expression}')
 snippet off
-	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})${5}
+	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})
 snippet offset
-	${1:obj}.offset()${2}
+	${1:obj}.offset()
 snippet offsetp
-	${1:obj}.offsetParent()${2}
+	${1:obj}.offsetParent()
 snippet on
 	${1:obj}.on('${2:events}', '${3:selector expression}', function (${4:e}) {
-		${5:// event handler}
+		${0:// event handler}
 	});
 snippet one
 	${1:obj}.one('${2:event name}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet outerh
-	${1:obj}.outerHeight()${2}
+	${1:obj}.outerHeight()
 snippet outerw
-	${1:obj}.outerWidth()${2}
+	${1:obj}.outerWidth()
 snippet param
-	$.param(${1:obj})${2}
+	$.param(${1:obj})
 snippet parent
-	${1:obj}.parent('${2:selector expression}')${3}
+	${1:obj}.parent('${2:selector expression}')
 snippet parents
-	${1:obj}.parents('${2:selector expression}')${3}
+	${1:obj}.parents('${2:selector expression}')
 snippet parentsu
-	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet parsejson
-	$.parseJSON(${1:data})${2}
+	$.parseJSON(${1:data})
 snippet parsexml
-	$.parseXML(${1:data})${2}
+	$.parseXML(${1:data})
 snippet pos
-	${1:obj}.position()${2}
+	${1:obj}.position()
 snippet prepend
-	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')
 snippet prependto
-	${1:obj}.prependTo('${2:selector expression}')${3}
+	${1:obj}.prependTo('${2:selector expression}')
 snippet prev
-	${1:obj}.prev('${2:selector expression}')${3}
+	${1:obj}.prev('${2:selector expression}')
 snippet preva
-	${1:obj}.prevAll('${2:selector expression}')${3}
+	${1:obj}.prevAll('${2:selector expression}')
 snippet prevu
-	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet promise
-	${1:obj}.promise(${2:'fx'}, ${3:target})${4}
+	${1:obj}.promise(${2:'fx'}, ${3:target})
 snippet prop
-	${1:obj}.prop('${2:property name}')${3}
+	${1:obj}.prop('${2:property name}')
 snippet proxy
-	$.proxy(${1:function}, ${2:this})${3}
+	$.proxy(${1:function}, ${2:this})
 snippet pushstack
-	${1:obj}.pushStack(${2:elements})${3}
+	${1:obj}.pushStack(${2:elements})
 snippet queue
-	${1:obj}.queue(${2:name}${3:, newQueue})${4}
+	${1:obj}.queue(${2:name}${3:, newQueue})
 snippet queuee
-	$.queue(${1:element}${2:, name}${3:, newQueue})${4}
+	$.queue(${1:element}${2:, name}${3:, newQueue})
 snippet ready
 	$(function () {
-		${1}
+		${0}
 	});
 snippet rem
-	${1:obj}.remove()${2}
+	${1:obj}.remove()
 snippet rema
-	${1:obj}.removeAttr('${2:attribute name}')${3}
+	${1:obj}.removeAttr('${2:attribute name}')
 snippet remc
-	${1:obj}.removeClass('${2:class name}')${3}
+	${1:obj}.removeClass('${2:class name}')
 snippet remd
-	${1:obj}.removeData('${2:key name}')${3}
+	${1:obj}.removeData('${2:key name}')
 snippet remdd
-	$.removeData(${1:element}${2:, 'key name}')${3}
+	$.removeData(${1:element}${2:, 'key name}')
 snippet remp
-	${1:obj}.removeProp('${2:property name}')${3}
+	${1:obj}.removeProp('${2:property name}')
 snippet repa
-	${1:obj}.replaceAll(${2:target})${3}
+	${1:obj}.replaceAll(${2:target})
 snippet repw
-	${1:obj}.replaceWith(${2:content})${3}
+	${1:obj}.replaceWith(${2:content})
 snippet reset
 	${1:obj}.reset(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet resize
 	${1:obj}.resize(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet scroll
 	${1:obj}.scroll(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet scrolll
-	${1:obj}.scrollLeft(${2:value})${3}
+	${1:obj}.scrollLeft(${2:value})
 snippet scrollt
-	${1:obj}.scrollTop(${2:value})${3}
+	${1:obj}.scrollTop(${2:value})
 snippet sdown
-	${1:obj}.slideDown('${2:slow/400/fast}')${3}
+	${1:obj}.slideDown('${2:slow/400/fast}')
 snippet sdownc
 	${1:obj}.slideDown('${2:slow/400/fast}', function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet select
 	${1:obj}.select(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet serialize
-	${1:obj}.serialize()${2}
+	${1:obj}.serialize()
 snippet serializea
-	${1:obj}.serializeArray()${2}
+	${1:obj}.serializeArray()
 snippet show
-	${1:obj}.show('${2:slow/400/fast}')${3}
+	${1:obj}.show('${2:slow/400/fast}')
 snippet showc
 	${1:obj}.show('${2:slow/400/fast}', function () {
-		${3:// callback}
+		${0:// callback}
 	});
 snippet sib
-	${1:obj}.siblings('${2:selector expression}')${3}
+	${1:obj}.siblings('${2:selector expression}')
 snippet size
-	${1:obj}.size()${2}
+	${1:obj}.size()
 snippet slice
-	${1:obj}.slice(${2:start}${3:, end})${4}
+	${1:obj}.slice(${2:start}${3:, end})
 snippet stoggle
-	${1:obj}.slideToggle('${2:slow/400/fast}')${3}
+	${1:obj}.slideToggle('${2:slow/400/fast}')
 snippet stop
-	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})${5}
+	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})
 snippet submit
 	${1:obj}.submit(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet sup
-	${1:obj}.slideUp('${2:slow/400/fast}')${3}
+	${1:obj}.slideUp('${2:slow/400/fast}')
 snippet supc
 	${1:obj}.slideUp('${2:slow/400/fast}', function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet text
-	${1:obj}.text(${2:'some text'})${3}
+	${1:obj}.text(${2:'some text'})
 snippet this
-	$(this)${1}
+	$(this)
 snippet toarr
-	${1:obj}.toArray()
+	${0:obj}.toArray()
 snippet tog
 	${1:obj}.toggle(function (${2:e}) {
 		${3:// event handler}
 	}, function ($2) {
 		${4:// event handler}
 	});
-	${4}
+	${0}
 snippet togclass
-	${1:obj}.toggleClass('${2:class name}')${3}
+	${1:obj}.toggleClass('${2:class name}')
 snippet togsh
-	${1:obj}.toggle('${2:slow/400/fast}')${3}
+	${1:obj}.toggle('${2:slow/400/fast}')
 snippet trig
-	${1:obj}.trigger('${2:event name}')${3}
+	${1:obj}.trigger('${2:event name}')
 snippet trigh
-	${1:obj}.triggerHandler('${2:event name}')${3}
+	${1:obj}.triggerHandler('${2:event name}')
 snippet $trim
-	$.trim(${1:str})${2}
+	$.trim(${1:str})
 snippet $type
-	$.type(${1:obj})${2}
+	$.type(${1:obj})
 snippet unbind
-	${1:obj}.unbind('${2:event name}')${3}
+	${1:obj}.unbind('${2:event name}')
 snippet undele
-	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})${5}
+	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})
 snippet uniq
-	$.unique(${1:array})${2}
+	$.unique(${1:array})
 snippet unload
 	${1:obj}.unload(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet unwrap
-	${1:obj}.unwrap()${2}
+	${1:obj}.unwrap()
 snippet val
-	${1:obj}.val('${2:text}')${3}
+	${1:obj}.val('${2:text}')
 snippet width
-	${1:obj}.width(${2:integer})${3}
+	${1:obj}.width(${2:integer})
 snippet wrap
-	${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')${3}
+	${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')
diff --git a/sources_non_forked/vim-snippets/snippets/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript.snippets
index fedb943d..0a046dbf 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript.snippets
@@ -2,45 +2,45 @@
 snippet proto
 	${1:class_name}.prototype.${2:method_name} =
 	function(${3:first_argument}) {
-		${4:// body...}
+		${0:// body...}
 	};
 # Function
 snippet fun
 	function ${1:function_name}(${2:argument}) {
-		${3:// body...}
+		${0:// body...}
 	}
 # Anonymous Function
 snippet f
 	function (${1}) {
-		${3}
+		${0}
 	}${2:;}
 # Immediate function
 snippet (f
 	(function (${1}) {
-		${3}
+		${0}
 	}(${2}));
 # if
 snippet if
 	if (${1:true}) {
-		${2}
+		${0}
 	}
 # if ... else
 snippet ife
 	if (${1:true}) {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 # tertiary conditional
 snippet ter
-	${1:/* condition */} ? ${2:a} : ${3:b}
+	${1:/* condition */} ? ${2:a} : ${0:b}
 # switch
 snippet switch
 	switch (${1:expression}) {
 		case '${3:case}':
 			${4}
 			break;
-		${5}
+		${0}
 		default:
 			${2}
 	}
@@ -49,85 +49,85 @@ snippet case
 	case '${1:case}':
 		${2}
 		break;
-	${3}
+	${0}
 # for (...) {...}
 snippet for
 	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
-		var ${3:v} = $1[$2];${4:}
+		var ${3:v} = $1[$2];${0:}
 	}
 # for (...) {...} (Improved Native For-Loop)
 snippet forr
 	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
-		var ${3:v} = $1[$2];${4:}
+		var ${3:v} = $1[$2];${0:}
 	}
 # while (...) {...}
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 # try
 snippet try
 	try {
 		${1}
 	} catch (${2:e}) {
-		${3:/* handle error */}
+		${0:/* handle error */}
 	}
 # do...while
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:/* condition */});
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${4}
+		${0}
 	}${3:,}
 # setTimeout function
 snippet timeout
-	setTimeout(function () {${3}}${2}, ${1:10});
+	setTimeout(function () {${0}}${2}, ${1:10});
 # Get Elements
 snippet get
-	getElementsBy${1:TagName}('${2}')${3}
+	getElementsBy${1:TagName}('${2}')
 # Get Element
 snippet gett
-	getElementBy${1:Id}('${2}')${3}
+	getElementBy${1:Id}('${2}')
 # console.log (Firebug)
 snippet cl
-	console.log(${1});
+	console.log(${0});
 # return
 snippet ret
-	return ${1:result}
+	return ${0:result}
 # for (property in object ) { ... }
 snippet fori
 	for (var ${1:prop} in ${2:Things}) {
-		${3:$2[$1]}
+		${0:$2[$1]}
 	}
 # hasOwnProperty
 snippet has
-	hasOwnProperty(${1})
+	hasOwnProperty(${0})
 # docstring
 snippet /**
 	/**
-	 * ${1:description}
+	 * ${0:description}
 	 *
 	 */
 snippet @par
-	@param {${1:type}} ${2:name} ${3:description}
+	@param {${1:type}} ${2:name} ${0:description}
 snippet @ret
-	@return {${1:type}} ${2:description}
+	@return {${1:type}} ${0:description}
 # JSON.parse
 snippet jsonp
-	JSON.parse(${1:jstr});
+	JSON.parse(${0:jstr});
 # JSON.stringify
 snippet jsons
-	JSON.stringify(${1:object});
+	JSON.stringify(${0:object});
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {
 		${3}
 
 		$1 = function ($2) {
-			${4}
+			${0}
 		};
 	};
 # singleton
@@ -150,7 +150,7 @@ snippet sing
 		// reset the constructor pointer
 		instance.constructor = $1;
 
-		${3}
+		${0}
 
 		return instance;
 	}
@@ -176,7 +176,7 @@ snippet props
 				value        : ${4:value},
 				writeable    : ${5:boolean},
 				enumerable   : ${6:boolean},
-				configurable : ${7:boolean}
+				configurable : ${0:boolean}
 			}
 		}
 	);
@@ -195,6 +195,6 @@ snippet prop
 			value        : ${3:value},
 			writeable    : ${4:boolean},
 			enumerable   : ${5:boolean},
-			configurable : ${6:boolean}
+			configurable : ${0:boolean}
 		}
 	);
diff --git a/sources_non_forked/vim-snippets/snippets/jsp.snippets b/sources_non_forked/vim-snippets/snippets/jsp.snippets
index a5239f5e..db185b2a 100644
--- a/sources_non_forked/vim-snippets/snippets/jsp.snippets
+++ b/sources_non_forked/vim-snippets/snippets/jsp.snippets
@@ -10,90 +10,90 @@ snippet jstl:fn
 snippet cpath
 	${pageContext.request.contextPath}
 snippet cout
-	<c:out value="${1}" default="${2}" />
+	<c:out value="${1}" default="${0}" />
 snippet cset
-	<c:set var="${1}" value="${2}" />
+	<c:set var="${1}" value="${0}" />
 snippet cremove
-	<c:remove var="${1}" scope="${2:page}" />
+	<c:remove var="${1}" scope="${0:page}" />
 snippet ccatch
-	<c:catch var="${1}" />
+	<c:catch var="${0}" />
 snippet cif
 	<c:if test="${${1}}">
-		${2}
+		${0}
 	</c:if>
 snippet cchoose
 	<c:choose>
-		${1}
+		${0}
 	</c:choose>
 snippet cwhen
 	<c:when test="${${1}}">
-		${2}
+		${0}
 	</c:when>
 snippet cother
 	<c:otherwise>
-		${1}
+		${0}
 	</c:otherwise>
 snippet cfore
 	<c:forEach items="${${1}}" var="${2}" varStatus="${3}">
-		${4:<c:out value="$2" />}
+		${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:,}">
-		${5:<c:out value="$3" />}
+		${0:<c:out value="$3" />}
 	</c:forTokens>
 snippet cparam
-	<c:param name="${1}" value="${2}" />
+	<c:param name="${1}" value="${0}" />
 snippet cparam+
 	<c:param name="${1}" value="${2}" />
-	cparam+${3}
+	cparam+${0}
 snippet cimport
 	<c:import url="${1}" />
 snippet cimport+
 	<c:import url="${1}">
 		<c:param name="${2}" value="${3}" />
-		cparam+${4}
+		cparam+${0}
 	</c:import>
 snippet curl
 	<c:url value="${1}" var="${2}" />
-	<a href="${$2}">${3}</a>
+	<a href="${$2}">${0}</a>
 snippet curl+
 	<c:url value="${1}" var="${2}">
 		<c:param name="${4}" value="${5}" />
-		cparam+${6}
+		cparam+${0}
 	</c:url>
 	<a href="${$2}">${3}</a>
 snippet credirect
-	<c:redirect url="${1}" />
+	<c:redirect url="${0}" />
 snippet contains
-	${fn:contains(${1:string}, ${2:substr})}
+	${fn:contains(${1:string}, ${0:substr})}
 snippet contains:i
-	${fn:containsIgnoreCase(${1:string}, ${2:substr})}
+	${fn:containsIgnoreCase(${1:string}, ${0:substr})}
 snippet endswith
-	${fn:endsWith(${1:string}, ${2:suffix})}
+	${fn:endsWith(${1:string}, ${0:suffix})}
 snippet escape
-	${fn:escapeXml(${1:string})}
+	${fn:escapeXml(${0:string})}
 snippet indexof
-	${fn:indexOf(${1:string}, ${2:substr})}
+	${fn:indexOf(${1:string}, ${0:substr})}
 snippet join
-	${fn:join(${1:collection}, ${2:delims})}
+	${fn:join(${1:collection}, ${0:delims})}
 snippet length
-	${fn:length(${1:collection_or_string})}
+	${fn:length(${0:collection_or_string})}
 snippet replace
-	${fn:replace(${1:string}, ${2:substr}, ${3:replace})}
+	${fn:replace(${1:string}, ${2:substr}, ${0:replace})}
 snippet split
-	${fn:split(${1:string}, ${2:delims})}
+	${fn:split(${1:string}, ${0:delims})}
 snippet startswith
-	${fn:startsWith(${1:string}, ${2:prefix})}
+	${fn:startsWith(${1:string}, ${0:prefix})}
 snippet substr
-	${fn:substring(${1:string}, ${2:begin}, ${3:end})}
+	${fn:substring(${1:string}, ${2:begin}, ${0:end})}
 snippet substr:a
-	${fn:substringAfter(${1:string}, ${2:substr})}
+	${fn:substringAfter(${1:string}, ${0:substr})}
 snippet substr:b
-	${fn:substringBefore(${1:string}, ${2:substr})}
+	${fn:substringBefore(${1:string}, ${0:substr})}
 snippet lc
-	${fn:toLowerCase(${1:string})}
+	${fn:toLowerCase(${0:string})}
 snippet uc
-	${fn:toUpperCase(${1:string})}
+	${fn:toUpperCase(${0:string})}
 snippet trim
-	${fn:trim(${1:string})}
+	${fn:trim(${0:string})}
diff --git a/sources_non_forked/vim-snippets/snippets/ledger.snippets b/sources_non_forked/vim-snippets/snippets/ledger.snippets
index 293d4b65..b401f616 100644
--- a/sources_non_forked/vim-snippets/snippets/ledger.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ledger.snippets
@@ -2,4 +2,4 @@
 snippet ent
 	`strftime("%Y/%m/%d")` ${1:transaction}
 	    ${2:account}    ${3:value}
-	    ${4:account}
+	    ${0:account}
diff --git a/sources_non_forked/vim-snippets/snippets/ls.snippets b/sources_non_forked/vim-snippets/snippets/ls.snippets
new file mode 100644
index 00000000..909b35ee
--- /dev/null
+++ b/sources_non_forked/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}
+	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/sources_non_forked/vim-snippets/snippets/lua.snippets b/sources_non_forked/vim-snippets/snippets/lua.snippets
index 34ae25eb..b7de2deb 100644
--- a/sources_non_forked/vim-snippets/snippets/lua.snippets
+++ b/sources_non_forked/vim-snippets/snippets/lua.snippets
@@ -2,20 +2,20 @@ snippet #!
 	#!/usr/bin/env lua
 	$1
 snippet local
-	local ${1:x} = ${2:1}
+	local ${1:x} = ${0:1}
 snippet fun
 	function ${1:fname}(${2:...})
-		${3:-- body}
+		${0:-- body}
 	end
 snippet for
 	for ${1:i}=${2:1},${3:10} do
-		${4:print(i)}
+		${0:print(i)}
 	end
 snippet forp
 	for ${1:i},${2:v} in pairs(${3:table_name}) do
-	   ${4:-- body}
+	   ${0:-- body}
 	end
 snippet fori
 	for ${1:i},${2:v} in ipairs(${3:table_name}) do
-	   ${4:-- body}
+	   ${0:-- body}
 	end
diff --git a/sources_non_forked/vim-snippets/snippets/make.snippets b/sources_non_forked/vim-snippets/snippets/make.snippets
index ba8e2b29..121e6238 100644
--- a/sources_non_forked/vim-snippets/snippets/make.snippets
+++ b/sources_non_forked/vim-snippets/snippets/make.snippets
@@ -1,4 +1,4 @@
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
-		${3}
+		${0}
 	endif
diff --git a/sources_non_forked/vim-snippets/snippets/mako.snippets b/sources_non_forked/vim-snippets/snippets/mako.snippets
index 0f64187f..2264eac6 100644
--- a/sources_non_forked/vim-snippets/snippets/mako.snippets
+++ b/sources_non_forked/vim-snippets/snippets/mako.snippets
@@ -1,54 +1,54 @@
 snippet def
 	<%def name="${1:name}">
-		${2:}
+		${0:}
 	</%def>
 snippet call
 	<%call expr="${1:name}">
-		${2:}
+		${0:}
 	</%call>
 snippet doc
 	<%doc>
-		${1:}
+		${0:}
 	</%doc>
 snippet text
 	<%text>
-		${1:}
+		${0:}
 	</%text>
 snippet for
 	% for ${1:i} in ${2:iter}:
-		${3:}
+		${0:}
 	% endfor
 snippet if if
 	% if ${1:condition}:
-		${2:}
+		${0:}
 	% endif
 snippet ife if/else
 	% if ${1:condition}:
 		${2:}
 	% else:
-		${3:}
+		${0:}
 	% endif
 snippet try
 	% try:
 		${1:}
 	% except${2:}:
-		${3:pass}
+		${0:pass}
 	% endtry
 snippet wh
 	% while ${1:}:
-		${2:}
+		${0:}
 	% endwhile
 snippet $
-	${ ${1:} }
+	${ ${0:} }
 snippet <%
-	<% ${1:} %>
+	<% ${0:} %>
 snippet <!%
-	<!% ${1:} %>
+	<!% ${0:} %>
 snippet inherit
-	<%inherit file="${1:filename}" />
+	<%inherit file="${0:filename}" />
 snippet include
-	<%include file="${1:filename}" />
+	<%include file="${0:filename}" />
 snippet namespace
-	<%namespace file="${1:name}" />
+	<%namespace file="${0:name}" />
 snippet page
-	<%page args="${1:}" />
+	<%page args="${0:}" />
diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/sources_non_forked/vim-snippets/snippets/markdown.snippets
index 9788959f..fd2f2971 100644
--- a/sources_non_forked/vim-snippets/snippets/markdown.snippets
+++ b/sources_non_forked/vim-snippets/snippets/markdown.snippets
@@ -3,85 +3,85 @@
 # Includes octopress (http://octopress.org/) snippets
 
 snippet [
-	[${1:text}](http://${2:address} "${3:title}")
+	[${1:text}](http://${2:address} "${0:title}")
 snippet [*
-	[${1:link}](${2:`@*`} "${3:title}")${4}
+	[${1:link}](${2:`@*`} "${3:title}")
 
 snippet [:
-	[${1:id}]: http://${2:url} "${3:title}"
+	[${1:id}]: http://${2:url} "${0:title}"
 snippet [:*
-	[${1:id}]: ${2:`@*`} "${3:title}"
+	[${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ![
-	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
+	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
 snippet ![*
-	![${1:alt}](${2:`@*`} "${3:title}")${4}
+	![${1:alt}](${2:`@*`} "${3:title}")
 
 snippet ![:
-	![${1:id}]: ${2:url} "${3:title}"
+	![${1:id}]: ${2:url} "${0:title}"
 snippet ![:*
-	![${1:id}]: ${2:`@*`} "${3:title}"
+	![${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ===
-	`repeat('=', strlen(getline(line(".") - 1)))`
+	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
-	${1}
+	${0}
 snippet ---
-	`repeat('-', strlen(getline(line(".") - 1)))`
+	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
-	${1}
+	${0}
 
 snippet blockquote
 	{% blockquote %}
-	${1:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet blockquote-author
 	{% blockquote ${1:author}, ${2:title} %}
-	${3:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet blockquote-link
 	{% blockquote ${1:author} ${2:URL} ${3:link_text} %}
-	${4:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet bt-codeblock-short
 	```
-	${1:code_snippet}
+	${0:code_snippet}
 	```
 
 snippet bt-codeblock-full
 	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${5:code_snippet}
+	${0:code_snippet}
 	```
 
 snippet codeblock-short
 	{% codeblock %}
-	${1:code_snippet}
+	${0:code_snippet}
 	{% endcodeblock %}
 
 snippet codeblock-full
 	{% codeblock ${1:title} lang:${2:language} ${3:URL} ${4:link_text} %}
-	${5:code_snippet}
+	${0:code_snippet}
 	{% endcodeblock %}
 
 snippet gist-full
-	{% gist ${1:gist_id} ${2:filename} %}
+	{% gist ${1:gist_id} ${0:filename} %}
 
 snippet gist-short
-	{% gist ${1:gist_id} %}
+	{% gist ${0:gist_id} %}
 
 snippet img
-	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${6:alt_text} %}
+	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${0:alt_text} %}
 
 snippet youtube
-	{% youtube ${1:video_id} %}
+	{% 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} "} ${3:text}
+	${1:text} {" ${2:quote} "} ${0:text}
 	{% endpullquote %}
diff --git a/sources_non_forked/vim-snippets/snippets/objc.snippets b/sources_non_forked/vim-snippets/snippets/objc.snippets
index c819c776..24cfb972 100644
--- a/sources_non_forked/vim-snippets/snippets/objc.snippets
+++ b/sources_non_forked/vim-snippets/snippets/objc.snippets
@@ -1,21 +1,21 @@
 # #import <...>
 snippet Imp
-	#import <${1:Cocoa/Cocoa.h}>${2}
+	#import <${1:Cocoa/Cocoa.h}>
 # #import "..."
 snippet imp
-	#import "${1:`vim_snippets#Filename()`.h}"${2}
+	#import "${1:`vim_snippets#Filename()`.h}"
 # @selector(...)
 snippet sel
-	@selector(${1:method}:)${3}
+	@selector(${1:method}:)
 # @"..." string
 snippet s
-	@"${1}"${2}
+	@"${1}"
 # Object
 snippet o
-	${1:NSObject} *${2:foo} = [${3:$1 alloc}]${4};${5}
+	${1:NSObject} *${2:foo} = [${3:$1 alloc}]${4};
 # NSLog(...)
 snippet log
-	NSLog(@"${1:%@}"${2});${3}
+	NSLog(@"${1:%@}"${2});
 # Class
 snippet objc
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
@@ -24,45 +24,45 @@ snippet objc
 	@end
 
 	@implementation $1
-	${3}
+	${0}
 	@end
 # Class Interface
 snippet int
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
-	${4}
+	${0}
 	@end
 snippet @interface
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
-	${4}
+	${0}
 	@end
 # Class Implementation
 snippet impl
 	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
-	${2}
+	${0}
 	@end
 snippet @implementation
 	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
-	${2}
+	${0}
 	@end
 # Protocol
 snippet pro
 	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
-	${3}
+	${0}
 	@end
 snippet @protocol
 	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
-	${3}
+	${0}
 	@end
 # init Definition
 snippet init
 	- (id)init
 	{
 		if (self = [super init]) {
-			${1}
+			${0}
 		}
 		return self;
 	}
@@ -70,61 +70,61 @@ snippet init
 snippet dealloc
 	- (void) dealloc
 	{
-		${1:deallocations}
+		${0:deallocations}
 		[super dealloc];
 	}
 snippet su
-	[super ${1:init}]${2}
+	[super ${1:init}]
 snippet ibo
-	IBOutlet ${1:NSSomeClass} *${2:$1};${3}
+	IBOutlet ${1:NSSomeClass} *${2:$1};
 # Category
 snippet cat
 	@interface ${1:NSObject} (${2:MyCategory})
 	@end
 
 	@implementation $1 ($2)
-	${3}
+	${0}
 	@end
 # Category Interface
 snippet cath
 	@interface ${1:`vim_snippets#Filename('$1', 'NSObject')`} (${2:MyCategory})
-	${3}
+	${0}
 	@end
 # Method
 snippet m
 	- (${1:id})${2:method}
 	{
-		${3}
+		${0}
 	}
 # Method declaration
 snippet md
-	- (${1:id})${2:method};${3}
+	- (${1:id})${2:method};
 # IBAction declaration
 snippet ibad
-	- (IBAction)${1:method}:(${2:id})sender;${3}
+	- (IBAction)${1:method}:(${2:id})sender;
 # IBAction method
 snippet iba
 	- (IBAction)${1:method}:(${2:id})sender
 	{
-		${3}
+		${0}
 	}
 # awakeFromNib method
 snippet wake
 	- (void)awakeFromNib
 	{
-		${1}
+		${0}
 	}
 # Class Method
 snippet M
 	+ (${1:id})${2:method}
 	{
-		${3:return nil;}
+		${0:return nil;}
 	}
 # Sub-method (Call super)
 snippet sm
 	- (${1:id})${2:method}
 	{
-		[super $2];${3}
+		[super $2];${0}
 		return self;
 	}
 # Accessor Methods For:
@@ -140,29 +140,29 @@ snippet objacc
 		[$3 retain];
 		[$2 release];
 		$2 = $3;
-	}${4}
+	}
 # for (object in array)
 snippet forin
 	for (${1:Class} *${2:some$1} in ${3:array}) {
-		${4}
+		${0}
 	}
 snippet fore
 	for (${1:object} in ${2:array}) {
-		${3:statements}
+		${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];
-		${4}
+		${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];
-		${4}
+		${0}
 	}
 # Try / Catch Block
 snippet	@try
@@ -173,75 +173,75 @@ snippet	@try
 		${2:handler}
 	}
 	@finally {
-		${3:statements}
+		${0:statements}
 	}
 snippet @catch
 	@catch (${1:exception}) {
-		${2:handler}
+		${0:handler}
 	}
 snippet @finally
 	@finally {
-		${1:statements}
+		${0:statements}
 	}
 # IBOutlet
 # @property (Objective-C 2.0)
 snippet prop
-	@property (${1:retain}) ${2:NSSomeClass} ${3:*$2};${4}
+	@property (${1:retain}) ${2:NSSomeClass} ${3:*$2};
 # @synthesize (Objective-C 2.0)
 snippet syn
-	@synthesize ${1:property};${2}
+	@synthesize ${1:property};
 # [[ alloc] init]
 snippet alloc
-	[[${1:foo} alloc] init${2}];${3}
+	[[${1:foo} alloc] init${2}];
 snippet a
-	[[${1:foo} alloc] init${2}];${3}
+	[[${1:foo} alloc] init${2}];
 # retain
 snippet ret
-	[${1:foo} retain];${2}
+	[${1:foo} retain];
 # release
 snippet rel
-	[${1:foo} release];
+	[${0:foo} release];
 # autorelease
 snippet arel
-	[${1:foo} autorelease];
+	[${0:foo} autorelease];
 # autorelease pool
 snippet pool
 	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
-	${2}
+	${0}
 	[$1 drain];
 # Throw an exception
 snippet except
 	NSException *${1:badness};
 	$1 = [NSException exceptionWithName:@"${2:$1Name}"
-	                             reason:@"${3}"
+	                             reason:@"${0}"
 	                           userInfo:nil];
 	[$1 raise];
 snippet prag
-	#pragma mark ${1:-}
+	#pragma mark ${0:-}
 snippet cl
-	@class ${1:Foo};${2}
+	@class ${1:Foo};
 snippet color
-	[[NSColor ${1:blackColor}] set];
+	[[NSColor ${0:blackColor}] set];
 # NSArray
 snippet array
-	NSMutableArray *${1:array} = [NSMutable array];${2}
+	NSMutableArray *${1:array} = [NSMutable array];
 snippet nsa
-	NSArray ${1}
+	NSArray ${0}
 snippet nsma
-	NSMutableArray ${1}
+	NSMutableArray ${0}
 snippet aa
-	NSArray * array;${1}
+	NSArray * array;
 snippet ma
-	NSMutableArray * array;${1}
+	NSMutableArray * array;
 # NSDictionary
 snippet dict
-	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];${2}
+	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];
 snippet nsd
-	NSDictionary ${1}
+	NSDictionary ${0}
 snippet nsmd
-	NSMutableDictionary ${1}
+	NSMutableDictionary ${0}
 # NSString
 snippet nss
-	NSString ${1}
+	NSString ${0}
 snippet nsms
-	NSMutableString ${1}
+	NSMutableString ${0}
diff --git a/sources_non_forked/vim-snippets/snippets/openfoam.snippets b/sources_non_forked/vim-snippets/snippets/openfoam.snippets
index ff690cca..950cbda2 100644
--- a/sources_non_forked/vim-snippets/snippets/openfoam.snippets
+++ b/sources_non_forked/vim-snippets/snippets/openfoam.snippets
@@ -1,7 +1,7 @@
 # 0/*
 snippet fv
 	type		fixedValue;
-	value		uniform ${1};
+	value		uniform ${0};
 snippet zg
 	type		zeroGradient;
 snippet sym
@@ -17,7 +17,7 @@ snippet forces
 		outputInterval		${2:1};
 		patches				(${3});
 		log					${4:true};
-		CofR				(${5:0 0 0});
+		CofR				(${0:0 0 0});
 	}
 # system/fvSolution
 # solvers
@@ -26,7 +26,7 @@ snippet gamg
 	{
 		solver          GAMG;
 		tolerance       1e-${2:6};
-		relTol          ${3:0.0};
+		relTol          ${0:0.0};
 		smoother        GaussSeidel;
 		cacheAgglomeration true;
 		nCellsInCoarsestLevel 10;
@@ -39,7 +39,7 @@ snippet pbicg
 		solver          PBiCG;
 		preconditioner  DILU;
 		tolerance       1e-${2:6};
-		relTol          ${3:0.0};
+		relTol          ${0:0.0};
 	}
 # PIMPLE
 snippet pimple
@@ -49,5 +49,5 @@ snippet pimple
 		nCorrectors     	${2:inner};
 		nNonOrthogonalCorrectors ${3:nonOrtho};
 		pRefCell        	${4:cell};
-		pRefValue       	${5:value for $4};
+		pRefValue       	${0:value for $4};
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/perl.snippets b/sources_non_forked/vim-snippets/snippets/perl.snippets
index 48d3f226..ea414271 100644
--- a/sources_non_forked/vim-snippets/snippets/perl.snippets
+++ b/sources_non_forked/vim-snippets/snippets/perl.snippets
@@ -8,12 +8,12 @@ snippet .
 # Function
 snippet sub
 	sub ${1:function_name} {
-		${2}
+		${0}
 	}
 # Conditional
 snippet if
 	if (${1}) {
-		${2}
+		${0}
 	}
 # Conditional if..else
 snippet ife
@@ -21,7 +21,7 @@ snippet ife
 		${2}
 	}
 	else {
-		${3}
+		${0}
 	}
 # Conditional if..elsif..else
 snippet ifee
@@ -32,23 +32,23 @@ snippet ifee
 		${4:# elsif...}
 	}
 	else {
-		${5}
+		${0}
 	}
 snippet eif
 	elsif (${1}) {
-		${2}
+		${0}
 	}
 # Conditional One-line
 snippet xif
-	${1:expression} if ${2:condition};${3}
+	${1:expression} if ${2:condition};
 # Unless conditional
 snippet unless
 	unless (${1}) {
-		${2}
+		${0}
 	}
 # Unless conditional One-line
 snippet xunless
-	${1:expression} unless ${2:condition};${3}
+	${1:expression} unless ${2:condition};
 # Try/Except
 snippet eval
 	local $@;
@@ -56,37 +56,37 @@ snippet eval
 		${1:# do something risky...}
 	};
 	if (my $e = $@) {
-		${2:# handle failure...}
+		${0:# handle failure...}
 	}
 # While Loop
 snippet wh
 	while (${1}) {
-		${2}
+		${0}
 	}
 # While Loop One-line
 snippet xwh
-	${1:expression} while ${2:condition};${3}
+	${1:expression} while ${2:condition};
 # C-style For Loop
 snippet cfor
 	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4}
+		${0}
 	}
 # For loop one-line
 snippet xfor
-	${1:expression} for @${2:array};${3}
+	${1:expression} for @${2:array};
 # Foreach Loop
 snippet for
 	foreach my $${1:x} (@${2:array}) {
-		${3}
+		${0}
 	}
 # Foreach Loop One-line
 snippet fore
-	${1:expression} foreach @${2:array};${3}
+	${1:expression} foreach @${2:array};
 # Package
 snippet package
 	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`};
 
-	${2}
+	${0}
 
 	1;
 
@@ -95,7 +95,7 @@ snippet package
 snippet packagev514
 	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
 
-	${3}
+	${0}
 
 	1;
 
@@ -106,14 +106,14 @@ snippet moose
 	use namespace::autoclean;
 	${1:#}BEGIN {extends '${2:ParentClass}'};
 
-	${3}
+	${0}
 # parent
 snippet parent
-	use parent qw(${1:Parent Class});
+	use parent qw(${0:Parent Class});
 # Read File
 snippet slurp
 	my $${1:var} = do { local $/; open my $file, '<', "${2:file}"; <$file> };
-	${3}
+	${0}
 # strict warnings
 snippet strwar
 	use strict;
@@ -121,7 +121,7 @@ snippet strwar
 # older versioning with perlcritic bypass
 snippet vers
 	## no critic
-	our $VERSION = '${1:version}';
+	our $VERSION = '${0:version}';
 	eval $VERSION;
 	## use critic
 # new 'switch' like feature
@@ -131,7 +131,7 @@ snippet switch
 # Anonymous subroutine
 snippet asub
 	sub {
-		${1}
+		${0}
 	}
 
 
@@ -139,56 +139,56 @@ snippet asub
 # Begin block
 snippet begin
 	BEGIN {
-		${1}
+		${0}
 	}
 
 # call package function with some parameter
 snippet pkgmv
-	__PACKAGE__->${1:package_method}(${2:var})
+	__PACKAGE__->${1:package_method}(${0:var})
 
 # call package function without a parameter
 snippet pkgm
-	__PACKAGE__->${1:package_method}()
+	__PACKAGE__->${0:package_method}()
 
 # call package "get_" function without a parameter
 snippet pkget
-	__PACKAGE__->get_${1:package_method}()
+	__PACKAGE__->get_${0:package_method}()
 
 # call package function with a parameter
 snippet pkgetv
-	__PACKAGE__->get_${1:package_method}(${2:var})
+	__PACKAGE__->get_${1:package_method}(${0:var})
 
 # complex regex
 snippet qrx
 	qr/
-	     ${1:regex}
+	     ${0:regex}
 	/xms
 
 #simpler regex
 snippet qr/
-	qr/${1:regex}/x
+	qr/${0:regex}/x
 
 #given
 snippet given
 	given ($${1:var}) {
 		${2:# cases}
-		${3:# default}
+		${0:# default}
 	}
 
 # switch-like case
 snippet when
 	when (${1:case}) {
-		${2}
+		${0}
 	}
 
 # hash slice
 snippet hslice
-	@{ ${1:hash}  }{ ${2:array} }
+	@{ ${1:hash}  }{ ${0:array} }
 
 
 # map
 snippet map
-	map {  ${2: body }    }  ${1: @array } ;
+	map {  ${0: body }    }  ${1: @array } ;
 
 
 
@@ -206,7 +206,7 @@ snippet ppod
 
 	=head1 DESCRIPTION
 
-	${4:# longer description...}
+	${0:# longer description...}
 
 
 	=head1 INTERFACE
@@ -222,13 +222,13 @@ snippet ppod
 snippet psub
 	=head2 ${1:MethodName}
 
-	${2:Summary....}
+	${0:Summary....}
 
 # Heading for inline subroutine pod
 snippet psubi
 	=head2 ${1:MethodName}
 
-	${2:Summary...}
+	${0:Summary...}
 
 
 	=cut
@@ -241,7 +241,7 @@ snippet subpod
 	=cut
 
 	sub ${1:subroutine_name} {
-		${2}
+		${0}
 	}
 # Subroutine signature
 snippet parg
@@ -269,7 +269,7 @@ snippet parg
 
 
 	=item
-	C<${3:...return data}>
+	C<${0:...return data}>
 
 
 	=back
@@ -287,7 +287,7 @@ snippet has
 		default => sub {
 			${4:defaultvalue}
 		},
-		${5:# other attributes}
+		${0:# other attributes}
 	);
 
 
@@ -295,7 +295,7 @@ snippet has
 snippet override
 	override ${1:attribute} => sub {
 		${2:# my $self = shift;};
-		${3:# my ($self, $args) = @_;};
+		${0:# my ($self, $args) = @_;};
 	};
 
 
@@ -311,18 +311,18 @@ snippet tlib
 
 #test methods
 snippet tmeths
-	$ENV{TEST_METHOD} = '${1:regex}';
+	$ENV{TEST_METHOD} = '${0:regex}';
 
 # runtestclass
 snippet trunner
-	use ${1:test_class};
+	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;
-		${4}
+		${0}
 
 	}
 
@@ -330,14 +330,14 @@ snippet tsub
 snippet trsub
 	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
 		my ($self) = @_;
-		${3}
+		${0}
 	};
 
 #prep test method
 snippet tprep
 	sub prep${1:number}_${2:test_case} :Test(startup) {
 		my $self = shift;
-		${4}
+		${0}
 	}
 
 # cause failures to print stack trace
diff --git a/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index b85d96e6..1793d41c 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -1,54 +1,54 @@
 snippet <?
 	<?php
 
-	${1}
+	${0}
 snippet ec
-	echo ${1};
+	echo ${0};
 snippet <?e
-	<?php echo ${1} ?>
+	<?php echo ${0} ?>
 # this one is for php5.4
 snippet <?=
-	<?=${1}?>
+	<?=${0}?>
 snippet ?=
-	<?= ${1} ?>
+	<?= ${0} ?>
 snippet ?
-	<?php ${1} ?>
+	<?php ${0} ?>
 snippet ?f
 	<?php foreach ($${1:vars} as $${2:$var}): ?>
-		${3}
+		${0}
 	<?php endforeach ?>
 snippet ?i
 	<?php if ($${1:var}): ?>
-		${2}
+		${0}
 	<?php endif ?>
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
-	${2}
+	${0}
 snippet use
 	use ${1:Foo\Bar\Baz};
-	${2}
+	${0}
 snippet	c
 	class ${1:`vim_snippets#Filename()`}
 	{
-		${2}
+		${0}
 	}
 snippet i
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${2}
+		${0}
 	}
 snippet t.
-	$this->${1}
+	$this->
 snippet f
 	function ${1:foo}(${2:array }${3:$bar})
 	{
-		${4}
+		${0}
 	}
 # method
 snippet m
 	${1:protected} function ${2:foo}()
 	{
-		${3}
+		${0}
 	}
 # setter method
 snippet sm
@@ -63,7 +63,7 @@ snippet sm
 	{
 		$this->${8:$1} = $$1;
 		return $this;
-	}${9}
+	}
 # getter method
 snippet gm
 	/**
@@ -74,50 +74,50 @@ snippet gm
 	${3:public} function get${4:$2}()
 	{
 		return $this->${5:$1};
-	}${6}
+	}
 #setter
 snippet $s
-	${1:$foo}->set${2:Bar}(${3});
+	${1:$foo}->set${2:Bar}(${0});
 #getter
 snippet $g
-	${1:$foo}->get${2:Bar}();
+	${1:$foo}->get${0:Bar}();
 
 # Tertiary conditional
 snippet =?:
-	$${1:foo} = ${2:true} ? ${3:a} : ${4};
+	$${1:foo} = ${2:true} ? ${3:a} : ${0};
 snippet ?:
-	${1:true} ? ${2:a} : ${3}
+	${1:true} ? ${2:a} : ${0}
 
 snippet C
-	$_COOKIE['${1:variable}']${2}
+	$_COOKIE['${1:variable}']
 snippet E
-	$_ENV['${1:variable}']${2}
+	$_ENV['${1:variable}']
 snippet F
-	$_FILES['${1:variable}']${2}
+	$_FILES['${1:variable}']
 snippet G
-	$_GET['${1:variable}']${2}
+	$_GET['${1:variable}']
 snippet P
-	$_POST['${1:variable}']${2}
+	$_POST['${1:variable}']
 snippet R
-	$_REQUEST['${1:variable}']${2}
+	$_REQUEST['${1:variable}']
 snippet S
-	$_SERVER['${1:variable}']${2}
+	$_SERVER['${1:variable}']
 snippet SS
-	$_SESSION['${1:variable}']${2}
+	$_SESSION['${1:variable}']
 
 # the following are old ones
 snippet inc
-	include '${1:file}';${2}
+	include '${1:file}';
 snippet inc1
-	include_once '${1:file}';${2}
+	include_once '${1:file}';
 snippet req
-	require '${1:file}';${2}
+	require '${1:file}';
 snippet req1
-	require_once '${1:file}';${2}
+	require_once '${1:file}';
 # Start Docblock
 snippet /*
 	/**
-	 * ${1}
+	 * ${0}
 	 */
 # Class - post doc
 snippet doc_cp
@@ -127,14 +127,14 @@ snippet doc_cp
 	 * @package ${2:default}
 	 * @subpackage ${3:default}
 	 * @author ${4:`g:snips_author`}
-	 */${5}
+	 */
 # Class Variable - post doc
 snippet doc_vp
 	/**
 	 * ${1:undocumented class variable}
 	 *
 	 * @var ${2:string}
-	 */${3}
+	 */
 # Class Variable
 snippet doc_v
 	/**
@@ -142,7 +142,7 @@ snippet doc_v
 	 *
 	 * @var ${4:string}
 	 */
-	${1:var} $${2};${5}
+	${1:var} $${2};
 # Class
 snippet doc_c
 	/**
@@ -154,19 +154,19 @@ snippet doc_c
 	 */
 	${1:}class ${2:}
 	{
-		${7}
+		${0}
 	} // END $1class $2
 # Constant Definition - post doc
 snippet doc_dp
 	/**
 	 * ${1:undocumented constant}
-	 */${2}
+	 */
 # Constant Definition
 snippet doc_d
 	/**
 	 * ${3:undocumented constant}
 	 */
-	define(${1}, ${2});${4}
+	define(${1}, ${2});
 # Function - post doc
 snippet doc_fp
 	/**
@@ -174,7 +174,7 @@ snippet doc_fp
 	 *
 	 * @return ${2:void}
 	 * @author ${3:`g:snips_author`}
-	 */${4}
+	 */
 # Function signature
 snippet doc_s
 	/**
@@ -183,7 +183,7 @@ snippet doc_s
 	 * @return ${5:void}
 	 * @author ${6:`g:snips_author`}
 	 */
-	${1}function ${2}(${3});${7}
+	${1}function ${2}(${3});
 # Function
 snippet doc_f
 	/**
@@ -193,7 +193,7 @@ snippet doc_f
 	 * @author ${6:`g:snips_author`}
 	 */
 	${1}function ${2}(${3})
-	{${7}
+	{${0}
 	}
 # Header
 snippet doc_h
@@ -203,7 +203,7 @@ snippet doc_h
 	 * @author ${2:`g:snips_author`}
 	 * @version ${3:$Id$}
 	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
-	 * @package ${5:default}
+	 * @package ${0:default}
 	 */
 
 # Interface
@@ -216,7 +216,7 @@ snippet interface
 	 */
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${5}
+		${0}
 	}
 # class ...
 snippet class
@@ -231,7 +231,7 @@ snippet class
 		 */
 		${5:public} function ${6:__construct}(${7:argument})
 		{
-			${8}
+			${0}
 		}
 	}
 snippet nc
@@ -239,30 +239,34 @@ snippet nc
 
 	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
-		${4}
+		${0}
 	}
 # define(...)
 snippet def
-	define('${1}'${2});${3}
+	define('${1}'${2});
 # defined(...)
 snippet def?
-	${1}defined('${2}')${3}
+	${1}defined('${2}')
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 # do ... while
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:/* condition */});
 snippet if
 	if (${1:/* condition */}) {
+		${0}
+	}
+snippet ifn
+	if (!${1:/* condition */}) {
 		${2}
 	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
-		${2}
+		${0}
 	<?php endif; ?>
 snippet ife
 	if (${1:/* condition */}) {
@@ -270,28 +274,28 @@ snippet ife
 	} else {
 		${3}
 	}
-	${4}
+	${0}
 snippet ifeil
 	<?php if (${1:/* condition */}): ?>
 		${2:<!-- html... -->}
 	<?php else: ?>
 		${3:<!-- html... -->}
 	<?php endif; ?>
-	${4}
+	${0}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet eif
 	elseif (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 snippet switch
 	switch ($${1:variable}) {
 		case '${2:value}':
 			${3}
 			break;
-		${5}
+		${0}
 		default:
 			${4}
 			break;
@@ -299,52 +303,52 @@ snippet switch
 snippet case
 	case '${1:value}':
 		${2}
-		break;${3}
+		break;
 snippet for
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4}
+		${0}
 	}
 snippet foreach
 	foreach ($${1:variable} as $${2:value}) {
-		${3}
+		${0}
 	}
 snippet foreachil
 	<?php foreach ($${1:variable} as $${2:value}): ?>
-		${3:<!-- html... -->}
+		${0:<!-- html... -->}
 	<?php endforeach; ?>
 snippet foreachk
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${4}
+		${0}
 	}
 snippet foreachkil
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
-		${4:<!-- html... -->}
+		${0:<!-- html... -->}
 	<?php endforeach; ?>
 # $... = array (...)
 snippet array
-	$${1:arrayName} = array('${2}' => ${3});${4}
+	$${1:arrayName} = array('${2}' => ${3});
 snippet try
 	try {
-		${2}
+		${0}
 	} catch (${1:Exception} $e) {
 	}
 # lambda with closure
 snippet lambda
 	${1:static }function (${2:args}) use (${3:&$x, $y /*put vars in scope (closure) */}) {
-		${4}
+		${0}
 	};
 # pre_dump();
 snippet pd
-	echo '<pre>'; var_dump(${1}); echo '</pre>';
+	echo '<pre>'; var_dump(${0}); echo '</pre>';
 # pre_dump(); die();
 snippet pdd
-	echo '<pre>'; var_dump(${1}); echo '</pre>'; die(${2:});
+	echo '<pre>'; var_dump(${1}); echo '</pre>'; die(${0:});
 snippet vd
-	var_dump(${1});
+	var_dump(${0});
 snippet vdd
-	var_dump(${1}); die(${2:});
+	var_dump(${1}); die(${0:});
 snippet vdf
-	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');${3}
+	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);
@@ -372,13 +376,13 @@ snippet gs
 	{
 		$this->$4 = $$1;
 		return $this;
-	}${8}
+	}
 # anotation, get, and set, useful for doctrine
 snippet ags
 	/**
 	 * ${1:description}
 	 *
-	 * @${7}
+	 * @${0}
 	 */
 	${2:protected} $${3:foo};
 
@@ -398,10 +402,158 @@ snippet retf
 	return false;
 snippet am
 	$${1:foo} = array_map(function($${2:v}) {
-		${3}
+		${0}
 		return $$2;
 	}, $$1);
 snippet aw
 	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
-		$$2 = ${4};
+		$$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 = array($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 = array(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 = array(
+					$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
+
+snippet is
+	isset($1{VISUAL})
diff --git a/sources_non_forked/vim-snippets/snippets/plsql.snippets b/sources_non_forked/vim-snippets/snippets/plsql.snippets
index dba25eee..2920758a 100644
--- a/sources_non_forked/vim-snippets/snippets/plsql.snippets
+++ b/sources_non_forked/vim-snippets/snippets/plsql.snippets
@@ -2,28 +2,28 @@
 snippet ps
 	create or replace package ${1:name}
 	as
-		${2:-- spec}
+		${0:-- spec}
 	end; -- end of package spec $1
 # create package body
 snippet pb
 	create or replace package body ${1:name}
 	as
-		${2:-- body}
+		${0:-- body}
 	end; -- end of package body $1;
 # package procedure spec
 snippet pps
-	procedure ${1:name}(${2:args});
+	procedure ${1:name}(${0:args});
 # package procedure body
 snippet ppb
 	procedure ${1:name}(${2:args})
 	as
 	begin
-		${3:-- body}
+		${0:-- body}
 	end $2;
 # package function spec
 snippet pfs
 	function ${1:name}(${2:args})
-	  return ${3:type};
+	  return ${0:type};
 # package function body
 snippet pfb
 	function ${1:name}(${2:args})
@@ -31,7 +31,7 @@ snippet pfb
 	as
 		l_res	$3;
 	begin
-		${4:-- body};
+		${0:-- body};
 		return l_res;
 	end $1;
 # snow errors
@@ -39,71 +39,71 @@ snippet err
 	show errors;
 # proc/func in parameter
 snippet p
-	${1:name} ${2:in} ${3:type} ${4: := null}
+	${1:name} ${2:in} ${3:type} ${0: := null}
 # package type: record
 snippet tr
-	type tr_${1:name} is record (${2:/* columns */});
+	type tr_${1:name} is record (${0:/* columns */});
 # package type: nested table
 snippet tt
-	type tt_${1:name} is table of tr_${2:name};
+	type tt_${1:name} is table of tr_${0:name};
 # package type: indexed table
 snippet tti
-	type tt_${1:name} is table of tr_${2:name} index by binary_integer;
+	type tt_${1:name} is table of tr_${0:name} index by binary_integer;
 # proc/func comment
 snippet doc
 	/*
-	 *	${1: comment ...}
+	 *	${0: comment ...}
 	 */
 # plsql block
 snippet beg
 	begin
-		${1}
+		${0}
 	end;
 # plsql block with declare part
 snippet dec
 	declare
 		${1}
 	begin
-		${2}
+		${0}
 	end;
 # return pipe row
 snippet rpipe
-	for ${1:i} in 1 .. ${2:l_res}.count loop
+	for ${1:i} in 1 .. ${0:l_res}.count loop
 		pipe row( $2($1) );
 	end loop;
 	return;
 # bulk collect
 snippet bc
-	bulk collect into ${1}
+	bulk collect into ${0}
 # local variable
 snippet l
-	l_${1}		${2:number};
+	l_${1}		${0:number};
 # output
 snippet log
-	dbms_output.put_line('${1}');
+	dbms_output.put_line('${0}');
 # for loop
 snippet for
 	for ${1:i} in ${2:1}..${3:42} loop
-		${3}
+		${0}
 	end loop;
 # for loop with select
 snippet fors
 	for ${1:rec} in (${2: select}) loop
-		${3}
+		${0}
 	end loop;
 # for loop with collection
 snippet forc
 	for ${1:i} in ${2:l_var}.first .. $2.last loop
-		${3: -- dbms_output.put_line($2($1)); }
+		${0: -- dbms_output.put_line($2($1)); }
 	end loop;
 # if
 snippet if
 	if ${1} then
-		${2}
+		${0}
 	end if;
 snippet ife
 	if ${1} then
 		${2}
 	else
-		${3}
+		${0}
 	end if;
diff --git a/sources_non_forked/vim-snippets/snippets/po.snippets b/sources_non_forked/vim-snippets/snippets/po.snippets
index e693a60e..84916fa4 100644
--- a/sources_non_forked/vim-snippets/snippets/po.snippets
+++ b/sources_non_forked/vim-snippets/snippets/po.snippets
@@ -2,4 +2,4 @@ snippet msg
 	msgid "${1}"
 	msgstr "${2}"
 
-	${3}
+	${0}
diff --git a/sources_non_forked/vim-snippets/snippets/processing.snippets b/sources_non_forked/vim-snippets/snippets/processing.snippets
index 27f3e005..015af4a5 100644
--- a/sources_non_forked/vim-snippets/snippets/processing.snippets
+++ b/sources_non_forked/vim-snippets/snippets/processing.snippets
@@ -7,13 +7,13 @@ snippet doc
 	 *	@author ${2:name}
 	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
 	 */
-	${4}
+	${0}
 # doc comment
 snippet docc
 	/**
 	 *	${1:@private}$0
 	 */
-	${2}
+	${0}
 # class
 snippet class
 	${1:public }class ${2:`fnamemodify(bufname("%"),":t:r")`} ${3:extends}
@@ -36,36 +36,36 @@ snippet package
 	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
 	 */
 
-	package ${4:package};
+	package ${0:package};
 # function
 snippet fun
 	${1:void/private/protected/public}${2: static} ${3:name}(${4}) {
 		${5://if not void return null;}
 	}
-	${6}
+	${0}
 snippet fn
 	${1:void }${2:name}(${3}) {
 		${4://if not void return null;}
 	}
-	${5}
+	${0}
 #	constant
 snippet const
-	static final ${1:Object} ${2:VAR_NAM} = ${3};
+	static final ${1:Object} ${2:VAR_NAM} = ${0};
 # var
 snippet var
-	${1:private/public }${2:static }${3:String} ${4:str}${5: =}${6:value};
+	${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(${5});
+	${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:++}) {
-		${4:$1[$2]}
+		${0:$1[$2]}
 	};
 #loop while
-snippet while
+snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 #break
 snippet break
@@ -73,7 +73,7 @@ snippet break
 #case
 snippet case
 	case ${1:expression} :
-		${2}
+		${0}
 	break;
 #default
 snippet default
@@ -86,20 +86,20 @@ snippet switch
 		case '${3:case}':
 			${4}
 			break;
-		${5}
+		${0}
 		default:
 			${2}
 	}
 #try
 snippet try
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	}
 #try catch finally
 snippet tryf
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
@@ -109,29 +109,29 @@ snippet throw
 #ternary
 snippet ?
 	? ${1:trueExpression} : ${2:falseExpression}
-	${3}
+	${0}
 snippet if
-	if (${1:true}) {${2}}
+	if (${1:true}) {${0}}
 # if ... else
 snippet ife
 	if (${1:true}) {${2}}
-	else{${3}}
+	else{${0}}
 #get
 snippet get
 	public ${1:String} get${2}() {
-		return ${2:fieldName};
+		return ${0:fieldName};
 	}
 #set
 snippet set
-	public void set${1}(${2:String} new${1}) {
+	public void set${1}(${0:String} new${1}) {
 		${1:fieldName} = new${1};
 	}
 #printIn
 snippet println
-	println("${1:`fnamemodify(bufname("%"),":t:r")`}::${2:method}() "${3: +} ${4});
+	println("${1:`fnamemodify(bufname("%"),":t:r")`}::${2:method}() "${3: +} ${0});
 #println string
 snippet pr
-	println("${1}");
+	println("${0}");
 #setup draw
 snippet setup
 	void setup(){
@@ -139,7 +139,7 @@ snippet setup
 	}
 
 	void draw(){
-		${2}
+		${0}
 	}
 #setup OPENGL
 snippet opengl
@@ -168,7 +168,7 @@ snippet opengl
 	}
 
 	void initGL(){
-		${5}
+		${0}
 	}
 
 	void getOpenGLErrors(){
@@ -201,14 +201,14 @@ snippet opengl
 #GL Functions
 snippet gl begin gl
 	pgl.beginGL();
-		${1}
+		${0}
 	pgl.endGL();
 snippet gl gl swap interval
 	// specify the minimum swap interval for buffer swaps.
-	gl.setSwapInterval(${1:interval});
+	gl.setSwapInterval(${0:interval});
 snippet gl gl call list
 	// execute a display list
-	gl.glCallList(${1:list});
+	gl.glCallList(${0:list});
 snippet gl gl gen buffers
 	// import java.nio.IntBuffer;
 	// import java.nio.FloatBuffer;
@@ -219,7 +219,7 @@ snippet gl gl gen buffers
 	gl.glGenBuffers($1, bufferObjects);
 
 	int vertexCount = ${2:3};
-	int numCoordinates = ${3:3};
+	int numCoordinates = ${0:3};
 	// vertexCount * numCoordinates
 	FloatBuffer vertices = BufferUtil.newFloatBuffer(vertexCount * numCoordinates);
 	float[] v = {0.0f, 0.0f, 0.0f,
@@ -231,554 +231,475 @@ snippet gl gl gen buffers
 	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
-	${2:// A buffer ID of zero unbinds a buffer object}
+	${0:// A buffer ID of zero unbinds a buffer object}
 	gl.glBindBuffer(GL.GL_ARRAY_BUFFER, ${1:0});
 snippet gl gl delete buffers
-	${3:// Parameters are the same for glGenBuffers}
+	${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(${1:flag});
+	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}, ${2:0.0f});
+	gl.glTexCoord2f(${1:0.0f}, ${0:0.0f});
 snippet gl gl vertex 2f
-	gl.glVertex2f(${1:0.0f}, ${2:0.0f});
+	gl.glVertex2f(${1:0.0f}, ${0:0.0f});
 snippet gl gl vertex 3f
-	gl.glVertex3f(${1:0.0f}, ${2:0.0f}, ${3:0.0f});
+	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}, ${3:z});
+	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}, ${4:z});
+	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}, ${3:z});
+	gl.glScalef(${1:x}, ${2:y}, ${0:z});
 snippet gl gl color 4f
-	gl.glColor4f(${1:red}, ${2:green}, ${3:blue}, ${4:alpha});
+	gl.glColor4f(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
 snippet gl gl clear color
-	gl.glClearColor(${1:red}, ${2:green}, ${3:blue}, ${4:alpha});
+	gl.glClearColor(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
 snippet gl gl color 3f
-	gl.glColor3f(${1:red}, ${2:green}, ${3:blue});
+	gl.glColor3f(${1:red}, ${2:green}, ${0:blue});
 snippet gl gl push matrix
 	// spush and pop the current matrix stack
 	gl.glPushMatrix();
-	${1}
+	${0}
 	gl.glPopMatrix();
 snippet gl gl gen lists
-	gl.glGenLists(${1:1})
+	gl.glGenLists(${0:1})
 snippet gl gl flush
 	// Empties buffers. Call this when all previous issues commands completed
 	gl.glFlush();
-	${1}
+	${0}
 snippet gl gl get error
 	println(gl.glGetError());
 snippet gl gl clear
-	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${3:GL.GL_DEPTH_BUFFER_BIT});
+	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${0:GL.GL_DEPTH_BUFFER_BIT});
 
 #frame operations
-snippet fr framerate
+snippet frameRate
 	frameRate(${1:30});
-	${2}
-snippet fr frameRate
-	frameRate
-snippet fr frameCount
-	frameCount
-snippet fr saveFrame
-	saveFrame("${1:filename-####}${2:.ext}");
+	${0}
+snippet saveFrame
+	saveFrame("${1:filename-####}${0:.ext}");
 
 #size
-snippet size normal size
-	size(${1:200}, ${2:200}${3:, P3D});
-snippet size opengl size
-	size(${1:200}, ${2:200}${3:, OPENGL});
+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, }${5:value3)};
+	color ${1:c}${2: = color(}${3:value1, }${4:value2, }${0:value3)};
 #char
 snippet char
-	char ${1:m}${2: = "}${3:char"};
+	char ${1:m}${2: = "}${0:char"};
 #float
 snippet float
-	float ${1:f}${2: = }${3:0.0f};
+	float ${1:f}${2: = }${0:0.0f};
 #int
 snippet int
-	int ${1:f}${2: = }${3:0};
+	int ${1:f}${2: = }${0:0};
 #boolean
 snippet boolean
-	boolean ${1:b}${2: = }${3:true};
+	boolean ${1:b}${2: = }${0:true};
 #byte
 snippet byte
-	byte ${1:b}${2: = }${3:127};
+	byte ${1:b}${2: = }${0:127};
 #string
 snippet string
-	String ${1:str}${2: = "}${3:CCCP"};
+	String ${1:str}${2: = "}${0:CCCP"};
 #array
 snippet array
-	${1:int}[] ${2:numbers}${3: = new $1}[${4:length}];
+	${1:int}[] ${2:numbers}${3: = new $1}[${0:length}];
 #object
 snippet object
-	${1:Object} ${2:o}${3: = new $1}(${4});
+	${1:Object} ${2:o}${3: = new $1}(${0});
 
 #curve
-snippet curve curve
-	curve(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${8:y4});
-snippet curve 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}, ${12:z4});
-snippet curve curve Detail
-	curveDetail(${1:detail});
-snippet curve curve point
-	curvePoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
-snippet curve curve tightness
-	curveTightness(${1:squishy});
+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
-	bezier(${1:x1}, ${2:y1}, ${3:cx1}, ${4:cy1}, ${5:cx2}, ${6:cy2}, ${7:x2}, ${8:y2});
-snippet bezier 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}, ${12:z2});
-snippet bezier bezier detail
-	bezierDetail(${1:detail});
-snippet bezier bezier tangent
-	bezierTangent(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
-snippet bezier bezier point
-	bezierPoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
+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
-	vertex(${1:x}, ${2:y}${3:, }${4:u}${5:, }${6:v});
-snippet vertex vertex 3D
-	vertex(${1:x}, ${2:y}, ${3:z}${4:, }${5:u}${6:, }${7:v});
-snippet vertex vertex bezier
-	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cx2}, ${4:cy2}, ${5:x}, ${6:y});
-snippet vertex vertex bezier 3D
-	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cz1}, ${4:cx2}, ${5:cy2}, ${6:cz2}, ${7:x}, ${8:y}, ${9:z});
-snippet vertex vertex curve
-	curveVertex(${1:x}, ${2:y});
-snippet vertex vertex curve 3D
-	curveVertex(${1:x}, ${2:y}, ${3:z});
+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
-	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
-snippet stroke stroke weight
-	strokeWeight(${1:1});
-snippet stroke no stroke
-	noStroke();
+snippet stroke
+	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+snippet strokeWeight
+	strokeWeight(${0:1});
 
 #mouse
-snippet mouse mouse x
-	mouseX
-snippet mouse mouse y
-	mouseY
-snippet mouse mouse drag
+snippet mouseDragged
 	void mouseDragged(){
-		${1}
+		${0}
 	}
-snippet mouse mouse move
+snippet mouseMoved
 	void mouseMoved(){
-		${1}
+		${0}
 	}
-snippet mouse mouse release
+snippet mouseReleased
 	void mouseReleased(){
-		${1}
+		${0}
 	}
-snippet mouse mouse pressed
+snippet mousePressed
 	void mousePressed(){
-		${1}
+		${0}
 	}
-snippet mouse mouse pressed?
-	mousePressed
-snippet mouse mouse button?
-	mouseButton
-snippet mouse pmouse X
-	pmouseX
-snippet mouse pmouse Y
-	pmouseY
 
 #key
-snippet key keycode?
-	keyCode
-snippet key key
-	key
-snippet key key released
+snippet keyReleased
 	void keyReleased(){
-		${1}
+		${0}
 	}
-snippet key key typed
+snippet keyTyped
 	void keyTyped(){
-		${1}
+		${0}
 	}
-snippet key key pressed
+snippet keyPressed
 	void keyPressed(){
-		${1}
+		${0}
 	}
-snippet key key pressed?
-	keyPressed
 
 #file
-snippet file load string
-	loadStrings("${1:filename}");
-snippet file save string
-	saveStrings(${1:filename}, ${2:strings});
-snippet file load bytes
-	loadBytes("${1:filename}");
-snippet file begin record
-	beginRecord(${1:renderer}, ${2:filename});
-snippet file end record
-	endRecord();
-snippet file save bytes
-	saveBytes(${1:filename}, ${2:bytes});
-snippet file create writer
-	createWriter(${1:filename});
-snippet file create reader
-	createReader(${1:filename});
-
-#time
-snippet time hour
-	hour()
-snippet time milliseconds
-	millis()
-snippet time year
-	year()
-snippet time minutes
-	minutes()
-snippet time month
-	month()
-snippet time second
-	second()
+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 matrix reset matrix
-	translate(${1:x}, ${2:y}, ${3:z});
-snippet matrix print matrix
-	printMatrix();
-snippet matrix push matrix
+snippet pushMatrix
 	pushMatrix();
-	${1:};
+	${0:};
 	popMatrix();
 
 
 #text
-snippet txt text data
-	text(${1:data}, ${2:x}, ${3:y}${4:, }${5:z});
-snippet txt text string data
-	text(${1:stringdata}, ${2:x}, ${3:y}, ${4:width}, ${5:height}${6:, }${7:z});
-snippet txt text size
-	textSize(${1:size});
-snippet txt text leading
-	textLeading(${1:size});
-snippet txt text width
-	textWidth(${1:data});
-snippet txt text descent
-	textDescent();
-snippet txt text ascent
-	textAscent();
-snippet txt font
+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("${2:FFScala-32.vlw}");
+	$1 = loadFont("${0:FFScala-32.vlw}");
 #load font
-snippet txt load font
-	${1:font} = loadFont("${2:FFScala-32.vlw}");
-snippet txt text font
-	textFont(${1:font}${2:, }${3:size});
+snippet loadFont
+	${1:font} = loadFont("${0:FFScala-32.vlw}");
+snippet textFont
+	textFont(${1:font}${2:, }${0:size});
 
 #math
-snippet math tangent
-	tan(${1:rad});
-snippet math atan
-	atan(${1:rad});
-snippet math atan2
-	atan2(${1:rad});
-snippet math sin
-	sin(${1:rad});
-snippet math asin
-	asin(${1:rad});
-snippet math cos
-	cos(${1:rad});
-snippet math acos
-	acos(${1:rad});
-snippet math degrees
-	degrees(${1:rad});
-snippet math radians
-	radians(${1:deg});
-snippet math random seed
-	randomSeed(${1:value});
-snippet math random
-	random(${1:value1}${2:, }${3:value2});
-snippet math half PI
-	HALF_PI
-snippet math 2 PI
-	TWO_PI
-snippet math PI
-	PI
-snippet math pow
-	pow(${1:num}, ${2:exponent});
-snippet math floor
-	floor(${1:value});
-snippet math sqrt
-	sqrt(${1:value});
-snippet math abs
-	abs(${1:value});
-snippet math sq
-	sq(${1:value});
-snippet math ceil
-	ceil(${1:value});
-snippet math exp
-	exp(${1:value});
-snippet math round
-	round(${1:value}};
-snippet math min
-	min(${1:value1}, ${2:value2}${3:, }${4:value3});
-snippet math max
-	max(${1:value1}, ${2:value2}${3:, }${4:value3});
-snippet math array max
-	max(${1:array});
-snippet math array min
-	min(${1:array});
-snippet math logarithm
-	log(${1:value});
-snippet math map
-	map(${1:value}, ${2:low1}, ${4:high1}, ${5:low2}, ${6:high2});
-snippet math normalize
-	norm(${1:value}, ${2:low}, ${3:high});
-snippet math constrain
-	constrain(${1:value}, ${2:min}, ${3:max});
-snippet math magnitude of a vector
-	mag(${1:a}, ${2:b}${3:, }${4:c});
-snippet math distance
-	dist(${1:x1}, ${2:y1}, ${4:x2}, ${5:y2});
-snippet math distance 3D
-	dist(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2});
+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 set noise
-	noise(${1:x}${2:, }${3:y}${4:, }${5:z});
-snippet noise noise detail
-	noiseDetail(${1:octaves}${2:, }${3:falloff});
-snippet noise noise seed
-	noiseSeed(${1:x});
+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 material shininess
-	shininess(${1:shine});
-snippet material specular
-	specular(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
-snippet material ambient
-	ambient(${1:value1}, ${2:value2}, ${3:value3});
-snippet material emissive
-	emissive(${1:value1}, ${2:value2}, ${3:value3});
+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 light no light
-	noLights();
-snippet light light
-	lights();
-snippet light diretional light
-	directionalLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${6:nz});
-snippet light point light
-	pointLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${6:nz});
-snippet light falloff light
-	lightFalloff(${1:constant}, ${2:linear}, ${3:quadratic});
-snippet light normal light
-	normal(${1:nx}, ${2:ny}, ${3:nz});
-snippet light specular light
-	lightFalloff(${1:v1}, ${2:v2}, ${3:v3});
-snippet light ambient light
-	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${6:z}});
-snippet light spot light
-	spotLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:x}, ${5:y}, ${6:z}, ${7:nx}, ${8:ny}, ${9:nz}, ${10:angle}, ${11:concentration});
+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 cam camera
-	camera(${1:eyeX}, ${2:eyeY}, ${3:eyeZ}, ${4:centerX}, ${5:centerY}, ${6:centerZ}, ${7:upX}, ${8:upY}, ${9:upZ});
-snippet cam ortho
-	ortho(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${6:far});
-snippet cam begin camera
-	beginCamera();
-snippet cam end camera
-	endCamera();
-snippet cam print camera
-	printCamera();
-snippet cam print camera projection
-	printProjection();
-snippet cam perspective camera
-	perspective(${1:fov}, ${2:aspect}, ${3:zNear}, ${4:zFar});
-snippet cam frustrum
-	frustrum(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${6:far});
+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 trans rotate
-	rotate${1:X}(${1:angle});
-snippet trans translate
-	translate(${1:x}, ${2:y}${3:, }${4:z});
-snippet trans scale size
-	scale(${1:size});
-snippet trans scale
-	scale(${1:x}, ${2:y}${3:, }${4:z});
+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}, ${5:z});
+	${1:model/screen}${2:X}(${3:x}, ${4:y}, ${0:z});
 
 #effects
-snippet fx brightness
-	brightness(${1:color});
-snippet fx lerp color
-	lerpColor(${1:c1}, ${2:c2}, ${3:amt});
-snippet fx saturation
-	saturation(${1:color});
-snippet fx hue
-	hue(${1:color});
-snippet fx alpha
-	alpha(${1:color});
-snippet fx tint
-	tint(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
-snippet fx notint
-	noTint();
+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 px set pixel
-	set(${1:x}, ${2:y}, ${3:color/image});
-snippet px update pixel
-	updatePixels();
-snippet px load pixel
-	loadPixels();
-snippet px pixels
-	pixels[${1:index}]
-snippet px get pixel
-	get(${1:x}, ${2:y}${3:, }${4:width}${5:, }${6:height});
+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 geof triangle
-	triangle(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3});
-snippet geof line
-	line(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2});
-snippet geof line 3D
-	line(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2});
-snippet geof arc
-	arc(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:start}, ${6:stop});
-snippet geof point
-	point(${1:x}, ${2:y}${3:, }${4:z});
-snippet geof quad
-	quad(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${8:y4});
-snippet geof ellipse
-	ellipse(${1:x}, ${2:y}, ${3:width}, ${4:height});
-snippet geof rect
-	rect(${1:x}, ${2:y}, ${3:width}, ${4:height});
-snippet geof box
-	box(${1:width}, ${2:height}, ${3:depth});
-snippet geof sphere
-	sphere(${1:radius});
-snippet geof sphere details
-	sphereDetail(${1:n});
-snippet geof set smooth
-	smooth();
-snippet geof set no smooth
-	noSmooth();
+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 arrop normal split
-	split("${1:str}"${2: , }${3:delimiter});
-snippet arrop split Tokens
-	splitTokens(${1:str}${2:, }${3:tokens});
-snippet arrop join
-	join(${1:strgArray}${2: , }${3:seperator});
-snippet arrop shorten
-	shorten(${1:array});
-snippet arrop concat
-	concat(${1:array1}, ${2:array2});
-snippet arrop subset
-	subset(${1:array}, ${2:offset});
-snippet arrop append
-	append(${1:array}, ${2:element});
-snippet arrop reverse
-	reverse(${1:array});
-snippet arrop splice
-	splice(${1:array}, ${2:value/array2}, ${3:index});
-snippet arrop sort
-	sort(${1:dataArray}${2:, }${3:count});
-snippet arrop expand
-	expand(${1:array}${2:, }${3:newSize});
-snippet arrop array copy
-	arrayCopy(${1:src}, ${2:dest}, ${3:, }${3:length});
+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 strop str
-	str("${1:str}");
-snippet strop match
-	match(${1:str}, ${2:regexp});
-snippet strop trim
-	trim(${1:str});
-snippet strop nf
-	nf(${2:value}, ${3:left}${4:, }${5:right});
-snippet strop nfs
-	nfs(${2:value}, ${3:left}${4:, }${5:right});
-snippet strop nfp
-	nfp(${2:value}, ${3:left}${4:, }${5:right});
-snippet strop nfc
-	nfc(${1:value}${2:, }${3:right});
+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 convert unbinary
-	unbinary("${1:str}"});
-snippet convert hexadecimal
-	hex(${1:c});
-snippet convert unhex
-	unhex(${1:c});
-snippet convert binary
-	binary(${1:value}${2:, }${3:digits});
+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 image load image
-	loadImage(${1:filename});
-snippet image image
-	image(${1:img}, ${2:x}, ${3:y}${4:, }${5:width}${6:, }${7:height});
-snippet copy copy
-	copy(${1:srcImg}${2:, }${3:x}, ${4:y}, ${5:width}, ${6:height}, ${7:dx}, ${8:dy}, ${9:dwidth}, ${10:dheight});
+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:, }${5:alpha});
+	background(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 snippet pg
 	PGraphics pg;
-	pg = createGraphics(${1:width}, ${2:height}${3:, }${4:applet});
+	pg = createGraphics(${1:width}, ${2:height}${3:, }${0:applet});
 snippet pimage
-	PImage(${1:width}, ${2:height});
+	PImage(${1:width}, ${0:height});
 
 #UTILS
-#nofill
-snippet nofill
-	noFill();
 #fill
 snippet fill
-	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 #red
 snippet red
-	red(${1:color});
+	red(${0:color});
 #green
 snippet green
-	green(${1:color});
+	green(${0:color});
 #blue
 snippet blue
-	blue(${1:color});
+	blue(${0:color});
 #status
 snippet status
-	status(${1:text});
+	status(${0:text});
 #param
 snippet param
-	param(${1:s});
+	param(${0:s});
 #link
 snippet link
-	link(${1:url}${2:, }${3:target});
+	link(${1:url}${2:, }${0:target});
 #@param
 snippet @
-	@${1:param/return/private/public}  ${1:parameter}  ${2:description}
+	@${1:param/return/private/public}  ${1:parameter}  ${0:description}
diff --git a/sources_non_forked/vim-snippets/snippets/progress.snippets b/sources_non_forked/vim-snippets/snippets/progress.snippets
index 0f1f436d..dee07a8b 100644
--- a/sources_non_forked/vim-snippets/snippets/progress.snippets
+++ b/sources_non_forked/vim-snippets/snippets/progress.snippets
@@ -1,9 +1,9 @@
 # Progress/OpenEdge ABL snippets
 # define
 snippet defbuf
-	DEFINE BUFFER b_${1:TableName} FOR $1 ${2}.
+	DEFINE BUFFER b_${1:TableName} FOR $1 ${0}.
 snippet defvar
-	DEFINE VARIABLE ${1:VariableName} AS ${2}.
+	DEFINE VARIABLE ${1:VariableName} AS ${0}.
 snippet nl
 	NO-LOCK
 snippet ne
@@ -11,25 +11,25 @@ snippet ne
 snippet nle
 	NO-LOCK NO-ERROR
 snippet ini
-	INITIAL ${1:?}
+	INITIAL ${0:?}
 snippet nu
 	NO-UNDO
 snippet err
 	ERROR
 snippet ff
 	FIND FIRST ${1:BufferName}
-	${2:WHERE $1.${3}} ${4}
+	${2:WHERE $1.${3}} ${0}
 snippet input
-	DEFINE INPUT PARAMETER ${1:ParamName} AS ${2}.
+	DEFINE INPUT PARAMETER ${1:ParamName} AS ${0}.
 snippet output
-	DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${2:ParamType}.
+	DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${0:ParamType}.
 snippet proc
 
 	/******************************************************************************/
 
 	PROCEDURE ${1:ProcName}:
 
-		${2}
+		${0}
 
 	END PROCEDURE. /* $1 */
 
@@ -43,7 +43,7 @@ snippet if
 	${3:ELSE ${4:OtherWise}}
 snippet do
 	DO${1: Clauses}:
-		${2}
+		${0}
 	END.
 # datatypes
 snippet int
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index e95b9c7a..d35608dd 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -3,97 +3,178 @@
 # 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')`} {
-		${2}
+		${0}
 	}
 snippet node
 	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
-		${2}
+		${0}
 	}
 snippet case
 	case $${1:variable} {
-		default: { ${2} }
+		default: { ${0} }
 	}
 snippet ife
 	if $${1:variable} {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 snippet if
 	if $${1:variable} {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ?
 	? {
-		'${1}'	=> ${2}
+		'${1}'	=> ${0}
 	  }
 #
 # blocks etc and general syntax sugar
 snippet [
-	[ ${1} ]${2}
+	[ ${1} ]
 snippet >
-	${1}	=> ${2}
+	${1}	=> ${0}
 snippet p:
-	"puppet://puppet/${1:module name}/${2:file name}"
+	"puppet://puppet/${1:module name}/${0:file name}"
 #
 # Functions
 snippet alert
-	alert("${1:message}")${2}
+	alert("${1:message}")
 snippet crit
-	crit("${1:message}")${2}
+	crit("${1:message}")
 snippet debug
-	debug("${1:message}")${2}
+	debug("${1:message}")
 snippet defined
-	defined(${1:Resource}["${2:name}"])${3}
+	defined(${1:Resource}["${2:name}"])
 snippet emerg
-	emerg("${1:message}")${2}
+	emerg("${1:message}")
 snippet extlookup Simple extlookup
-	extlookup("${1:variable}")${2}
+	extlookup("${1:variable}")
 snippet extlookup Extlookup with defaults
-	extlookup("${1:variable}", "${2:default}")${3}
+	extlookup("${1:variable}", "${2:default}")
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup("${1:variable}", "${2:default}", "${3:data source}")${4}
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
 snippet fail
-	fail("${1:message}")${2}
+	fail("${1:message}")
 snippet info
-	info("${1:message}")${2}
+	info("${1:message}")
 snippet inline_template
-	inline_template("<%= ${1} %>")${2}
+	inline_template("<%= ${1} %>")
 snippet notice
-	notice("${1:message}")${2}
+	notice("${1:message}")
 snippet realize
-	realize(${1:Resource}[${2:name}])${3}
+	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")${4}
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
 snippet inc
-	include ${1:classname}${2}
+	include ${1:classname}
 snippet split
-	split(${1:hay stack}, "${2:patten}")${3}
+	split(${1:hay stack}, "${2:patten}")
 snippet versioncmp
-	versioncmp("${1:version}", "${2:version}")${3}
+	versioncmp("${1:version}", "${2:version}")
 snippet warning
-	warning("${1:message}")${2}
+	warning("${1:message}")
 #
 # Types
 snippet cron
 	cron{ "${1:name}":
 		command	=> "${2}",
 		user	=> "${3:root}",
-		${4}	=> ${5}
+		${4}	=> ${0}
 	}
 
 snippet exec
 	exec{ "${1:name}":
 		command	=> "${2:$1}",
 		user	=> "${3:root}",
-		${4}	=> ${5}
+		${4}	=> ${0}
 	}
 
 snippet user
@@ -101,55 +182,55 @@ snippet user
 		comment		=> "${2:$1}",
 		ensure		=> present,
 		managehome	=> true,
-		home		=> "${3:/home/$1}"
+		home		=> "${0:/home/$1}"
 	}
 
 snippet group
 	group{ "${1:group}":
-		ensure	=> ${2:present}
+		ensure	=> ${0:present}
 	}
 
 snippet host
 	host{ "${1:hostname}":
-		ip	=> ${2:127.0.0.1}
+		ip	=> ${0:127.0.0.1}
 	}
 
 snippet mailalias
 	mailalias{ "${1:localpart}":
-		recipient	=> "${2:recipient}"
+		recipient	=> "${0:recipient}"
 	}
 
 snippet mount
 	mount{ "${1:destination path}":
 		ensure	=> ${2:mounted},
-		device	=> "${3:device name or path}"
+		device	=> "${0:device name or path}"
 	}
 
 snippet package
 	package{ "${1:package name}":
-		ensure	=> ${2:present}
+		ensure	=> ${0:present}
 	}
 
 snippet yumrepo
 	yumrepo{ "${1:repo name}":
 		descr	=> "${2:$1}",
-		enabled	=> ${3:1}
+		enabled	=> ${0:1}
 	}
 
 snippet define
 	define ${1} (${2}) {
-		${3}
+		${0}
 	}
 
 snippet service
 	service{ "${1:service}":
 		enable		=> ${2:true},
-		ensure		=> ${3:running},
+		ensure		=> ${0:running},
 		hasstatus	=> true,
 	}
 
 snippet file
 	file{ "${1:path}":
-		${2}	=> ${3}
+		${2}	=> ${0}
 	}
 
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index a2008682..d38df5b1 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -1,12 +1,12 @@
 snippet #!
 	#!/usr/bin/env python
 snippet imp
-	import ${1:module}
+	import ${0:module}
 snippet uni
 	def __unicode__(self):
-		${1:representation}
+		${0:representation}
 snippet from
-	from ${1:package} import ${2:module}
+	from ${1:package} import ${0:module}
 # Module Docstring
 snippet docs
 	"""
@@ -14,21 +14,21 @@ snippet docs
 	Author: `g:snips_author`
 	Email: `g:snips_email`
 	Github: `g:snips_github`
-	Description: ${2}
+	Description: ${0}
 	"""
 
 snippet wh
 	while ${1:condition}:
-		${2}
+		${0}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
 		${1}
-		if ${2:condition}:
+		if ${0:condition}:
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${3}
+		${0}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -36,19 +36,19 @@ snippet cl
 		def __init__(self, ${4:arg}):
 			${5:super($1, self).__init__()}
 			self.$4 = $4
-			${6}
+			${0}
 # New Function
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		"""${3:docstring for $1}"""
-		${4}
+		${0}
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3}
+		${0}
 # New Method
 snippet defs
 	def ${1:mname}(self, ${2:arg}):
-		${3}
+		${0}
 # New Property
 snippet property
 	def ${1:foo}():
@@ -58,23 +58,23 @@ snippet property
 		def fset(self, value):
 			${4:self._$1 = value}
 		def fdel(self):
-			${5:del self._$1}
+			${0:del self._$1}
 		return locals()
 	$1 = property(**$1())
 # Ifs
 snippet if
 	if ${1:condition}:
-		${2}
+		${0}
 snippet el
 	else:
-		${1}
+		${0}
 snippet ei
 	elif ${1:condition}:
-		${2}
+		${0}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
-		${3}
+		${0}
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -84,28 +84,28 @@ snippet cascii
 	# -*- coding: ascii -*-
 # Lambda
 snippet ld
-	${1:var} = lambda ${2:vars} : ${3:action}
+	${1:var} = lambda ${2:vars} : ${0:action}
 snippet .
 	self.
 snippet try Try/Except
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
+		${0:raise $3}
 snippet try Try/Except/Else
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5}
+		${0}
 snippet try Try/Except/Finally
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
-		${5}
+		${0}
 snippet try Try/Except/Else/Finally
 	try:
 		${1}
@@ -114,14 +114,14 @@ snippet try Try/Except/Else/Finally
 	else:
 		${5}
 	finally:
-		${6}
+		${0}
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
-		${1:main()}
+		${0:main()}
 # __magic__
 snippet _
-	__${1:init}__${2}
+	__${1:init}__
 # python debugger (pdb)
 snippet pdb
 	import pdb; pdb.set_trace()
@@ -135,23 +135,26 @@ snippet pdbbb
 snippet pudb
 	import pudb; pudb.set_trace()
 snippet pprint
-	import pprint; pprint.pprint(${1})${2}
+	import pprint; pprint.pprint(${1})
 snippet "
 	"""
-	${1:doc}
+	${0:doc}
 	"""
+# assertions
+snippet a=
+	self.assertEqual(${0}, ${1})
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
-		${3}
+		${0}
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
 
 		def test_${2:description}(self):
-			${3}
+			${0}
 snippet fut
-	from __future__ import ${1}
+	from __future__ import ${0}
 #getopt
 snippet getopt
 	try:
@@ -166,25 +169,25 @@ snippet getopt
 
 	for option, argument in opts:
 		if option in ("-h", "--help"):
-			${4}
+			${0}
 		elif option in ("-v", "--verbose"):
 			verbose = argument
 # logging
 # glog = get log
 snippet glog
 	import logging
-	logger = logging.getLogger(${1:__name__})
+	logger = logging.getLogger(${0:__name__})
 snippet le
-	logger.error(${1:msg})
+	logger.error(${0:msg})
 # conflict with lambda=ld, therefor we change into Logger.debuG
 snippet lg
-	logger.debug(${1:msg})
+	logger.debug(${0:msg})
 snippet lw
-	logger.warning(${1:msg})
+	logger.warning(${0:msg})
 snippet lc
-	logger.critical(${1:msg})
+	logger.critical(${0:msg})
 snippet li
-	logger.info(${1:msg})
+	logger.info(${0:msg})
 snippet epydoc
 	"""
 	${1:Description}
@@ -195,5 +198,5 @@ snippet epydoc
 	@return: ${5: Description}
 	@rtype : ${6: Type}
 
-	@raise e: ${7: Description}
+	@raise e: ${0: Description}
 	"""
diff --git a/sources_non_forked/vim-snippets/snippets/r.snippets b/sources_non_forked/vim-snippets/snippets/r.snippets
index 2436f56e..c7ca5aca 100644
--- a/sources_non_forked/vim-snippets/snippets/r.snippets
+++ b/sources_non_forked/vim-snippets/snippets/r.snippets
@@ -3,119 +3,119 @@ snippet #!
 
 # includes
 snippet lib
-	library(${1:package})
+	library(${0:package})
 snippet req
-	require(${1:package})
+	require(${0:package})
 snippet source
-	source('${1:file}')
+	source('${0:file}')
 
 # conditionals
 snippet if
 	if (${1:condition}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ei
 	else if (${1:condition}) {
-		${2}
+		${0}
 	}
 
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {
-		${3}
+		${0}
 	}
 snippet ret
-	return(${1})
+	return(${0})
 
 # dataframes, lists, etc
 snippet df
-	${1:name}[${2:rows}, ${3:cols}]
+	${1:name}[${2:rows}, ${0:cols}]
 snippet c
-	c(${1:items})
+	c(${0:items})
 snippet li
-	list(${1:items})
+	list(${0:items})
 snippet mat
-	matrix(${1:data}, nrow=${2:rows}, ncol=${3:cols})
+	matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
 
 # apply functions
 snippet apply
-	apply(${1:array}, ${2:margin}, ${3:function})
+	apply(${1:array}, ${2:margin}, ${0:function})
 snippet lapply
-	lapply(${1:list}, ${2:function})
+	lapply(${1:list}, ${0:function})
 snippet sapply
-	lapply(${1:list}, ${2:function})
+	lapply(${1:list}, ${0:function})
 snippet vapply
-	vapply(${1:list}, ${2:function}, ${3:type})
+	vapply(${1:list}, ${2:function}, ${0:type})
 snippet mapply
-	mapply(${1:function}, ${2:...})
+	mapply(${1:function}, ${0:...})
 snippet tapply
-	tapply(${1:vector}, ${2:index}, ${3:function})
+	tapply(${1:vector}, ${2:index}, ${0:function})
 snippet rapply
-	rapply(${1:list}, ${2:function})
+	rapply(${1:list}, ${0:function})
 
 # plyr functions
 snippet dd
-	ddply(${1:frame}, ${2:variables}, ${3:function})
+	ddply(${1:frame}, ${2:variables}, ${0:function})
 snippet dl
-	dlply(${1:frame}, ${2:variables}, ${3:function})
+	dlply(${1:frame}, ${2:variables}, ${0:function})
 snippet da
-	daply(${1:frame}, ${2:variables}, ${3:function})
+	daply(${1:frame}, ${2:variables}, ${0:function})
 snippet d_
-	d_ply(${1:frame}, ${2:variables}, ${3:function})
+	d_ply(${1:frame}, ${2:variables}, ${0:function})
 
 snippet ad
-	adply(${1:array}, ${2:margin}, ${3:function})
+	adply(${1:array}, ${2:margin}, ${0:function})
 snippet al
-	alply(${1:array}, ${2:margin}, ${3:function})
+	alply(${1:array}, ${2:margin}, ${0:function})
 snippet aa
-	aaply(${1:array}, ${2:margin}, ${3:function})
+	aaply(${1:array}, ${2:margin}, ${0:function})
 snippet a_
-	a_ply(${1:array}, ${2:margin}, ${3:function})
+	a_ply(${1:array}, ${2:margin}, ${0:function})
 
 snippet ld
-	ldply(${1:list}, ${2:function})
+	ldply(${1:list}, ${0:function})
 snippet ll
-	llply(${1:list}, ${2:function})
+	llply(${1:list}, ${0:function})
 snippet la
-	laply(${1:list}, ${2:function})
+	laply(${1:list}, ${0:function})
 snippet l_
-	l_ply(${1:list}, ${2:function})
+	l_ply(${1:list}, ${0:function})
 
 snippet	md
-	mdply(${1:matrix}, ${2:function})
+	mdply(${1:matrix}, ${0:function})
 snippet	ml
-	mlply(${1:matrix}, ${2:function})
+	mlply(${1:matrix}, ${0:function})
 snippet	ma
-	maply(${1:matrix}, ${2:function})
+	maply(${1:matrix}, ${0:function})
 snippet	m_
-	m_ply(${1:matrix}, ${2:function})
+	m_ply(${1:matrix}, ${0:function})
 
 # plot functions
 snippet pl
-	plot(${1:x}, ${2:y})
+	plot(${1:x}, ${0:y})
 snippet ggp
-	ggplot(${1:data}, aes(${2:aesthetics}))
+	ggplot(${1:data}, aes(${0:aesthetics}))
 snippet img
 	${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
-	${6:plot}
+	${0:plot}
 	dev.off()
 
 # statistical test functions
 snippet fis
-	fisher.test(${1:x}, ${2:y})
+	fisher.test(${1:x}, ${0:y})
 snippet chi
-	chisq.test(${1:x}, ${2:y})
+	chisq.test(${1:x}, ${0:y})
 snippet tt
-	t.test(${1:x}, ${2:y})
+	t.test(${1:x}, ${0:y})
 snippet wil
-	wilcox.test(${1:x}, ${2:y})
+	wilcox.test(${1:x}, ${0:y})
 snippet cor
-	cor.test(${1:x}, ${2:y})
+	cor.test(${1:x}, ${0:y})
 snippet fte
-	var.test(${1:x}, ${2:y})
+	var.test(${1:x}, ${0:y})
 snippet kvt
-	kv.test(${1:x}, ${2:y})
+	kv.test(${1:x}, ${0:y})
diff --git a/sources_non_forked/vim-snippets/snippets/rst.snippets b/sources_non_forked/vim-snippets/snippets/rst.snippets
index 6cb79922..f4d99d7a 100644
--- a/sources_non_forked/vim-snippets/snippets/rst.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rst.snippets
@@ -1,69 +1,69 @@
 # rst
 
 snippet :
-	:${1:field name}: ${2:field body}
+	:${1:field name}: ${0:field body}
 snippet *
-	*${1:Emphasis}* ${2}
+	*${1:Emphasis}* ${0}
 snippet **
-	**${1:Strong emphasis}** ${2}
+	**${1:Strong emphasis}** ${0}
 snippet _
 	\`${1:hyperlink-name}\`_
-	.. _\`$1\`: ${2:link-block}
+	.. _\`$1\`: ${0:link-block}
 snippet =
 	${1:Title}
 	=====${2:=}
-	${3}
+	${0}
 snippet -
 	${1:Title}
 	-----${2:-}
-	${3}
+	${0}
 #some directive
 snippet img:
-	.. |${2:alias}| image:: ${1:img}
+	.. |${0:alias}| image:: ${1:img}
 snippet fig:
 	.. figure:: ${1:img}
-		:alt: ${2:alter text}
+		:alt: ${0:alter text}
 
 		$2
 snippet cont:
 	.. contents::
-		${1:content}
+		${0:content}
 snippet code:
 	.. code:: ${1:type}
 
-		${2:write some code}
+		${0:write some code}
 snippet tip:
 	.. tip::
-		${1:my tips}
+		${0:my tips}
 snippet not:
 	.. note::
-		${1:my notes}
+		${0:my notes}
 snippet	war:
 	.. warning::
-		${1:attention!}
+		${0:attention!}
 snippet imp:
 	.. important::
-		${1:this is importatnt}
+		${0:this is importatnt}
 snippet att:
 	.. attention::
-		${1:hey!}
+		${0:hey!}
 snippet dan:
 	.. danger::
-		${1:ah!}
+		${0:ah!}
 snippet err:
 	.. error::
-		${1:Error occur}
+		${0:Error occur}
 snippet cau:
 	.. caution::
-		${1:Watch out!}
+		${0:Watch out!}
 #Spinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
 
-		${2}
+		${0}
 # CJK optimize, CJK has no space between charaters
 snippet *c
-	\ *${1:Emphasis}*\ ${2}
+	\ *${1:Emphasis}*\ ${0}
 snippet **c
-	\ **${1:Strong emphasis}**\ ${2}
+	\ **${1:Strong emphasis}**\ ${0}
 
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 73db3667..278c3615 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -14,30 +14,30 @@ snippet #!
 # New Block
 snippet =b
 	=begin rdoc
-		${1}
+		${0}
 	=end
 snippet prot
 	protected
 
-	${1}
+	${0}
 snippet priv
 	private
 
-	${1}
+	${0}
 snippet y
-	:yields: ${1:arguments}
+	:yields: ${0:arguments}
 snippet rb
 	#!/usr/bin/env ruby -wKU
 snippet beg
 	begin
-		${3}
+		${0}
 	rescue ${1:Exception} => ${2:e}
 	end
 
 snippet req require
-	require "${1}"${2}
+	require "${1}"
 snippet reqr
-	require_relative "${1}"${2}
+	require_relative "${1}"
 snippet #
 	# =>
 snippet end
@@ -45,77 +45,83 @@ snippet end
 snippet case
 	case ${1:object}
 	when ${2:condition}
-		${3}
+		${0}
 	end
 snippet when
 	when ${1:condition}
-		${2}
+		${0}
 snippet def
 	def ${1:method_name}
-		${2}
+		${0}
 	end
 snippet deft
 	def test_${1:case_name}
-		${2}
+		${0}
+	end
+snippet descendants
+	class Class
+		def descendants
+			ObjectSpace.each_object(::Class).select {|klass| klass < self }
+		end
 	end
 snippet if
 	if ${1:condition}
-		${2}
+		${0}
 	end
 snippet ife
 	if ${1:condition}
 		${2}
 	else
-		${3}
+		${0}
 	end
 snippet eif
 	elsif ${1:condition}
-		${2}
+		${0}
 snippet unless
 	unless ${1:condition}
-		${2}
+		${0}
 	end
-snippet while
+snippet wh
 	while ${1:condition}
-		${2}
+		${0}
 	end
 snippet for
 	for ${1:e} in ${2:c}
-		${3}
+		${0}
 	end
 snippet until
 	until ${1:condition}
-		${2}
+		${0}
 	end
 snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 	end
 snippet cla class .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
-			${3}
+			${0}
 		end
 	end
 snippet cla class .. < ParentClass .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
 		def initialize(${3:args})
-			${4}
+			${0}
 		end
 	end
 snippet cla ClassName = Struct .. do .. end
 	${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
 		def ${3:method_name}
-			${4}
+			${0}
 		end
 	end
 snippet cla class BlankSlate .. initialize .. end
-	class ${1:BlankSlate}
+	class ${0:BlankSlate}
 		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
 	end
 snippet cla class << self .. end
 	class << ${1:self}
-		${2}
+		${0}
 	end
 # class .. < DelegateClass .. initialize .. end
 snippet cla-
@@ -123,23 +129,23 @@ snippet cla-
 		def initialize(${3:args})
 			super(${4:del_obj})
 
-			${5}
+			${0}
 		end
 	end
 snippet mod module .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 	end
 snippet mod module .. module_function .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module_function
 
-		${2}
+		${0}
 	end
 snippet mod module .. ClassMethods .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module ClassMethods
-			${2}
+			${0}
 		end
 
 		module InstanceMethods
@@ -153,35 +159,35 @@ snippet mod module .. ClassMethods .. end
 	end
 # attr_reader
 snippet r
-	attr_reader :${1:attr_names}
+	attr_reader :${0:attr_names}
 # attr_writer
 snippet w
-	attr_writer :${1:attr_names}
+	attr_writer :${0:attr_names}
 # attr_accessor
 snippet rw
-	attr_accessor :${1:attr_names}
+	attr_accessor :${0:attr_names}
 snippet atp
-	attr_protected :${1:attr_names}
+	attr_protected :${0:attr_names}
 snippet ata
-	attr_accessible :${1:attr_names}
+	attr_accessible :${0:attr_names}
 snippet ana
-	accepts_nested_attributes_for :${1:association}
+	accepts_nested_attributes_for :${0:association}
 # ivc == instance variable cache
 snippet ivc
-	@${1:variable_name} ||= ${2:chached_value}
+	@${1:variable_name} ||= ${0:chached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable
 
 	def each(&block)
-		${1}
+		${0}
 	end
 # include Comparable
 snippet Comp
 	include Comparable
 
 	def <=>(other)
-		${1}
+		${0}
 	end
 # extend Forwardable
 snippet Forw-
@@ -189,266 +195,266 @@ snippet Forw-
 # def self
 snippet defs
 	def self.${1:class_method_name}
-		${2}
+		${0}
 	end
 # def initialize
 snippet definit
 	def initialize(${1:args})
-		${2}
+		${0}
 	end
 # def method_missing
 snippet defmm
 	def method_missing(meth, *args, &blk)
-		${1}
+		${0}
 	end
 snippet defd
-	def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}
+	def_delegator :${1:@del_obj}, :${2:del_meth}, :${0:new_name}
 snippet defds
-	def_delegators :${1:@del_obj}, :${2:del_methods}
+	def_delegators :${1:@del_obj}, :${0:del_methods}
 snippet am
-	alias_method :${1:new_name}, :${2:old_name}
+	alias_method :${1:new_name}, :${0:old_name}
 snippet app
 	if __FILE__ == $PROGRAM_NAME
-		${1}
+		${0}
 	end
 # usage_if()
 snippet usai
 	if ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}
+		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}"${3}
+		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
 	end
 snippet array
-	Array.new(${1:10}) { |${2:i}| ${3} }
+	Array.new(${1:10}) { |${2:i}| ${0} }
 snippet hash
-	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${3} }
+	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${0} }
 snippet file File.foreach() { |line| .. }
-	File.foreach(${1:"path/to/file"}) { |${2:line}| ${3} }
+	File.foreach(${1:"path/to/file"}) { |${2:line}| ${0} }
 snippet file File.read()
-	File.read(${1:"path/to/file"})${2}
+	File.read(${1:"path/to/file"})
 snippet Dir Dir.global() { |file| .. }
-	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${3} }
+	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${0} }
 snippet Dir Dir[".."]
-	Dir[${1:"glob/**/*.rb"}]${2}
+	Dir[${1:"glob/**/*.rb"}]
 snippet dir
 	Filename.dirname(__FILE__)
 snippet deli
-	delete_if { |${1:e}| ${2} }
+	delete_if { |${1:e}| ${0} }
 snippet fil
-	fill(${1:range}) { |${2:i}| ${3} }
+	fill(${1:range}) { |${2:i}| ${0} }
 # flatten_once()
 snippet flao
-	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}${3}
+	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}
 snippet zip
-	zip(${1:enums}) { |${2:row}| ${3} }
+	zip(${1:enums}) { |${2:row}| ${0} }
 # downto(0) { |n| .. }
 snippet dow
-	downto(${1:0}) { |${2:n}| ${3} }
+	downto(${1:0}) { |${2:n}| ${0} }
 snippet ste
-	step(${1:2}) { |${2:n}| ${3} }
+	step(${1:2}) { |${2:n}| ${0} }
 snippet tim
-	times { |${1:n}| ${2} }
+	times { |${1:n}| ${0} }
 snippet upt
-	upto(${1:1.0/0.0}) { |${2:n}| ${3} }
+	upto(${1:1.0/0.0}) { |${2:n}| ${0} }
 snippet loo
-	loop { ${1} }
+	loop { ${0} }
 snippet ea
-	each { |${1:e}| ${2} }
+	each { |${1:e}| ${0} }
 snippet ead
 	each do |${1:e}|
-		${2}
+		${0}
 	end
 snippet eab
-	each_byte { |${1:byte}| ${2} }
+	each_byte { |${1:byte}| ${0} }
 snippet eac- each_char { |chr| .. }
-	each_char { |${1:chr}| ${2} }
+	each_char { |${1:chr}| ${0} }
 snippet eac- each_cons(..) { |group| .. }
-	each_cons(${1:2}) { |${2:group}| ${3} }
+	each_cons(${1:2}) { |${2:group}| ${0} }
 snippet eai
-	each_index { |${1:i}| ${2} }
+	each_index { |${1:i}| ${0} }
 snippet eaid
 	each_index do |${1:i}|
-		${2}
+		${0}
 	end
 snippet eak
-	each_key { |${1:key}| ${2} }
+	each_key { |${1:key}| ${0} }
 snippet eakd
 	each_key do |${1:key}|
-		${2}
+		${0}
 	end
 snippet eal
-	each_line { |${1:line}| ${2} }
+	each_line { |${1:line}| ${0} }
 snippet eald
 	each_line do |${1:line}|
-		${2}
+		${0}
 	end
 snippet eap
-	each_pair { |${1:name}, ${2:val}| ${3} }
+	each_pair { |${1:name}, ${2:val}| ${0} }
 snippet eapd
 	each_pair do |${1:name}, ${2:val}|
-		${3}
+		${0}
 	end
 snippet eas-
-	each_slice(${1:2}) { |${2:group}| ${3} }
+	each_slice(${1:2}) { |${2:group}| ${0} }
 snippet easd-
 	each_slice(${1:2}) do |${2:group}|
-		${3}
+		${0}
 	end
 snippet eav
-	each_value { |${1:val}| ${2} }
+	each_value { |${1:val}| ${0} }
 snippet eavd
 	each_value do |${1:val}|
-		${2}
+		${0}
 	end
 snippet eawi
-	each_with_index { |${1:e}, ${2:i}| ${3} }
+	each_with_index { |${1:e}, ${2:i}| ${0} }
 snippet eawid
 	each_with_index do |${1:e}, ${2:i}|
-		${3}
+		${0}
 	end
 snippet eawo
-	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${4} }
+	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${0} }
 snippet eawod
 	each_with_object(${1:init}) do |${2:e}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet reve
-	reverse_each { |${1:e}| ${2} }
+	reverse_each { |${1:e}| ${0} }
 snippet reved
 	reverse_each do |${1:e}|
-		${2}
+		${0}
 	end
 snippet inj
-	inject(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+	inject(${1:init}) { |${2:mem}, ${3:var}| ${0} }
 snippet injd
 	inject(${1:init}) do |${2:mem}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet red
-	reduce(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+	reduce(${1:init}) { |${2:mem}, ${3:var}| ${0} }
 snippet redd
 	reduce(${1:init}) do |${2:mem}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet map
-	map { |${1:e}| ${2} }
+	map { |${1:e}| ${0} }
 snippet mapd
 	map do |${1:e}|
-		${2}
+		${0}
 	end
 snippet mapwi-
-	enum_with_index.map { |${1:e}, ${2:i}| ${3} }
+	enum_with_index.map { |${1:e}, ${2:i}| ${0} }
 snippet sor
-	sort { |a, b| ${1} }
+	sort { |a, b| ${0} }
 snippet sorb
-	sort_by { |${1:e}| ${2} }
+	sort_by { |${1:e}| ${0} }
 snippet ran
 	sort_by { rand }
 snippet all
-	all? { |${1:e}| ${2} }
+	all? { |${1:e}| ${0} }
 snippet any
-	any? { |${1:e}| ${2} }
+	any? { |${1:e}| ${0} }
 snippet cl
-	classify { |${1:e}| ${2} }
+	classify { |${1:e}| ${0} }
 snippet col
-	collect { |${1:e}| ${2} }
+	collect { |${1:e}| ${0} }
 snippet cold
 	collect do |${1:e}|
-		${2}
+		${0}
 	end
 snippet det
-	detect { |${1:e}| ${2} }
+	detect { |${1:e}| ${0} }
 snippet detd
 	detect do |${1:e}|
-		${2}
+		${0}
 	end
 snippet fet
-	fetch(${1:name}) { |${2:key}| ${3} }
+	fetch(${1:name}) { |${2:key}| ${0} }
 snippet fin
-	find { |${1:e}| ${2} }
+	find { |${1:e}| ${0} }
 snippet find
 	find do |${1:e}|
-		${2}
+		${0}
 	end
 snippet fina
-	find_all { |${1:e}| ${2} }
+	find_all { |${1:e}| ${0} }
 snippet finad
 	find_all do |${1:e}|
-		${2}
+		${0}
 	end
 snippet gre
-	grep(${1:/pattern/}) { |${2:match}| ${3} }
+	grep(${1:/pattern/}) { |${2:match}| ${0} }
 snippet sub
-	${1:g}sub(${2:/pattern/}) { |${3:match}| ${4} }
+	${1:g}sub(${2:/pattern/}) { |${3:match}| ${0} }
 snippet sca
-	scan(${1:/pattern/}) { |${2:match}| ${3} }
+	scan(${1:/pattern/}) { |${2:match}| ${0} }
 snippet scad
 	scan(${1:/pattern/}) do |${2:match}|
-		${3}
+		${0}
 	end
 snippet max
-	max { |a, b| ${1} }
+	max { |a, b| ${0} }
 snippet min
-	min { |a, b| ${1} }
+	min { |a, b| ${0} }
 snippet par
-	partition { |${1:e}| ${2} }
+	partition { |${1:e}| ${0} }
 snippet pard
 	partition do |${1:e}|
-		${2}
+		${0}
 	end
 snippet rej
-	reject { |${1:e}| ${2} }
+	reject { |${1:e}| ${0} }
 snippet rejd
 	reject do |${1:e}|
-		${2}
+		${0}
 	end
 snippet sel
-	select { |${1:e}| ${2} }
+	select { |${1:e}| ${0} }
 snippet seld
 	select do |${1:e}|
-		${2}
+		${0}
 	end
 snippet lam
-	lambda { |${1:args}| ${2} }
+	lambda { |${1:args}| ${0} }
 # I'm pretty sure that ruby users expect do to expand to do .. end
 snippet do
 	do
-		${1}
+		${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 |${0:v}|
-		${1}
+	do |${1:v}|
+		${2}
 	end
 snippet :
-	:${1:key} => ${2:"value"}${3}
+	:${1:key} => ${2:"value"}
 snippet ope
-	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${4} }
+	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${0} }
 # path_from_here()
 snippet fpath
-	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])${2}
+	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])
 # unix_filter {}
 snippet unif
 	ARGF.each_line${1} do |${2:line}|
-		${3}
+		${0}
 	end
 # option_parse {}
 snippet optp
 	require "optparse"
 
-	options = {${1:default => "args"}}
+	options = {${0:default => "args"}}
 
 	ARGV.options do |opts|
 		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}
 snippet opt
 	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},
 	         "${4:Option description.}") do |${5:opt}|
-		${6}
+		${0}
 	end
 snippet tc
 	require "test/unit"
@@ -457,98 +463,98 @@ snippet tc
 
 	class Test${2:$1} < Test::Unit::TestCase
 		def test_${3:case_name}
-			${4}
+			${0}
 		end
 	end
 snippet ts
 	require "test/unit"
 
 	require "tc_${1:test_case_file}"
-	require "tc_${2:test_case_file}"${3}
+	require "tc_${2:test_case_file}"
 snippet as
-	assert ${1:test}, "${2:Failure message.}"${3}
+	assert ${1:test}, "${2:Failure message.}"
 snippet ase
-	assert_equal ${1:expected}, ${2:actual}${3}
+	assert_equal ${1:expected}, ${2:actual}
 snippet asne
-	assert_not_equal ${1:unexpected}, ${2:actual}${3}
+	assert_not_equal ${1:unexpected}, ${2:actual}
 snippet asid
-	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}${4}
+	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}
 snippet asio
-	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}${3}
+	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}
 snippet asko
-	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}${3}
+	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}
 snippet asn
-	assert_nil ${1:instance}${2}
+	assert_nil ${1:instance}
 snippet asnn
-	assert_not_nil ${1:instance}${2}
+	assert_not_nil ${1:instance}
 snippet asm
-	assert_match /${1:expected_pattern}/, ${2:actual_string}${3}
+	assert_match /${1:expected_pattern}/, ${2:actual_string}
 snippet asnm
-	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}${3}
+	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}
 snippet aso
-	assert_operator ${1:left}, :${2:operator}, ${3:right}${4}
+	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
-	assert_raise ${1:Exception} { ${2} }
+	assert_raise ${1:Exception} { ${0} }
 snippet asrd
 	assert_raise ${1:Exception} do
-		${2}
+		${0}
 	end
 snippet asnr
-	assert_nothing_raised ${1:Exception} { ${2} }
+	assert_nothing_raised ${1:Exception} { ${0} }
 snippet asnrd
 	assert_nothing_raised ${1:Exception} do
-		${2}
+		${0}
 	end
 snippet asrt
-	assert_respond_to ${1:object}, :${2:method}${3}
+	assert_respond_to ${1:object}, :${2:method}
 snippet ass assert_same(..)
-	assert_same ${1:expected}, ${2:actual}${3}
+	assert_same ${1:expected}, ${2:actual}
 snippet ass assert_send(..)
-	assert_send [${1:object}, :${2:message}, ${3:args}]${4}
+	assert_send [${1:object}, :${2:message}, ${3:args}]
 snippet asns
-	assert_not_same ${1:unexpected}, ${2:actual}${3}
+	assert_not_same ${1:unexpected}, ${2:actual}
 snippet ast
-	assert_throws :${1:expected} { ${2} }
+	assert_throws :${1:expected} { ${0} }
 snippet astd
 	assert_throws :${1:expected} do
-		${2}
+		${0}
 	end
 snippet asnt
-	assert_nothing_thrown { ${1} }
+	assert_nothing_thrown { ${0} }
 snippet asntd
 	assert_nothing_thrown do
-		${1}
+		${0}
 	end
 snippet fl
-	flunk "${1:Failure message.}"${2}
+	flunk "${1:Failure message.}"
 # Benchmark.bmbm do .. end
 snippet bm-
 	TESTS = ${1:10_000}
 	Benchmark.bmbm do |results|
-		${2}
+		${0}
 	end
 snippet rep
-	results.report("${1:name}:") { TESTS.times { ${2} }}
+	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) }${4}
+	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) }${3}
+	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}))${2}
+	Marshal.load(Marshal.dump(${1:obj_to_copy}))
 snippet Pn-
-	PStore.new(${1:"file_name.pstore"})${2}
+	PStore.new(${1:"file_name.pstore"})
 snippet tra
-	transaction(${1:true}) { ${2} }
+	transaction(${1:true}) { ${0} }
 # xmlread(..)
 snippet xml-
-	REXML::Document.new(File.read(${1:"path/to/file"}))${2}
+	REXML::Document.new(File.read(${1:"path/to/file"}))
 # xpath(..) { .. }
 snippet xpa
 	elements.each(${1:"//Xpath"}) do |${2:node}|
-		${3}
+		${0}
 	end
 # class_from_name()
 snippet clafn
@@ -558,16 +564,16 @@ snippet sinc
 	class << self; self end
 snippet nam
 	namespace :${1:`vim_snippets#Filename()`} do
-		${2}
+		${0}
 	end
 snippet tas
 	desc "${1:Task description}"
 	task :${2:task_name => [:dependent, :tasks]} do
-		${3}
+		${0}
 	end
 # block
 snippet b
-	{ |${1:var}| ${2} }
+	{ |${1:var}| ${0} }
 snippet begin
 	begin
 		raise 'A test exception.'
@@ -585,42 +591,43 @@ snippet debug
 	require 'ruby-debug'; debugger; true;
 snippet pry
 	require 'pry'; binding.pry
-
+snippet strf
+	strftime("${1:%Y-%m-%d %H:%M:%S %z}")${0}
 #############################################
 # Rails snippets - for pure Ruby, see above #
 #############################################
 snippet art
 	assert_redirected_to ${1::action => "${2:index}"}
 snippet artnp
-	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${4:@$2})
+	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
 snippet artnpp
-	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1})
+	assert_redirected_to ${1:parent}_${2:child}_path(${0:@$1})
 snippet artp
-	assert_redirected_to ${1:model}_path(${2:@$1})
+	assert_redirected_to ${1:model}_path(${0:@$1})
 snippet artpp
-	assert_redirected_to ${1:model}s_path
+	assert_redirected_to ${0:model}s_path
 snippet asd
 	assert_difference "${1:Model}.${2:count}", ${3:1} do
-		${4}
+		${0}
 	end
 snippet asnd
 	assert_no_difference "${1:Model}.${2:count}" do
-		${3}
+		${0}
 	end
 snippet asre
-	assert_response :${1:success}, @response.body${2}
+	assert_response :${1:success}, @response.body
 snippet asrj
-	assert_rjs :${1:replace}, "${2:dom id}"
+	assert_rjs :${1:replace}, "${0:dom id}"
 snippet ass assert_select(..)
 	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
 snippet bf
-	before_filter :${1:method}
+	before_filter :${0:method}
 snippet bt
-	belongs_to :${1:association}
+	belongs_to :${0:association}
 snippet btp
-	belongs_to :${1:association}, :polymorphic => true${2}
+	belongs_to :${1:association}, :polymorphic => true
 snippet crw
-	cattr_accessor :${1:attr_names}
+	cattr_accessor :${0:attr_names}
 snippet defcreate
 	def create
 		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
@@ -635,7 +642,7 @@ snippet defcreate
 				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
-	end${3}
+	end
 snippet defdestroy
 	def destroy
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -645,10 +652,10 @@ snippet defdestroy
 			format.html { redirect_to($1s_url) }
 			format.xml  { head :ok }
 		end
-	end${3}
+	end
 snippet defedit
 	def edit
-		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+		@${1:model_class_name} = ${0:ModelClassName}.find(params[:id])
 	end
 snippet defindex
 	def index
@@ -658,7 +665,7 @@ snippet defindex
 			format.html # index.html.erb
 			format.xml  { render :xml => @$1s }
 		end
-	end${3}
+	end
 snippet defnew
 	def new
 		@${1:model_class_name} = ${2:ModelClassName}.new
@@ -667,7 +674,7 @@ snippet defnew
 			format.html # new.html.erb
 			format.xml  { render :xml => @$1 }
 		end
-	end${3}
+	end
 snippet defshow
 	def show
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -676,7 +683,7 @@ snippet defshow
 			format.html # show.html.erb
 			format.xml  { render :xml => @$1 }
 		end
-	end${3}
+	end
 snippet defupdate
 	def update
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -691,134 +698,134 @@ snippet defupdate
 				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
-	end${3}
+	end
 snippet dele delegate .. to
-	delegate :${1:methods}, :to => :${2:object}
+	delegate :${1:methods}, :to => :${0:object}
 snippet dele delegate .. to .. prefix .. allow_nil
-	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${4:allow_nil}
+	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${0:allow_nil}
 snippet flash
-	flash[:${1:notice}] = "${2}"
+	flash[:${1:notice}] = "${0}"
 snippet habtm
-	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4}
+	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"
 snippet hm
-	has_many :${1:object}
+	has_many :${0:object}
 snippet hmd
-	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy${4}
+	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy
 snippet hmt
-	has_many :${1:object}, :through => :${2:object}
+	has_many :${1:object}, :through => :${0:object}
 snippet ho
-	has_one :${1:object}
+	has_one :${0:object}
 snippet hod
-	has_one :${1:object}, dependent: :${2:destroy}
+	has_one :${1:object}, dependent: :${0:destroy}
 snippet i18
-	I18n.t('${1:type.key}')${2}
+	I18n.t('${1:type.key}')
 snippet ist
-	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${3} %>
+	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${0} %>
 snippet log
-	Rails.logger.${1:debug} ${2}
+	Rails.logger.${1:debug} ${0}
 snippet log2
-	RAILS_DEFAULT_LOGGER.${1:debug} ${2}
+	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
 snippet logd
-	logger.debug { "${1:message}" }${2}
+	logger.debug { "${1:message}" }
 snippet loge
-	logger.error { "${1:message}" }${2}
+	logger.error { "${1:message}" }
 snippet logf
-	logger.fatal { "${1:message}" }${2}
+	logger.fatal { "${1:message}" }
 snippet logi
-	logger.info { "${1:message}" }${2}
+	logger.info { "${1:message}" }
 snippet logw
-	logger.warn { "${1:message}" }${2}
+	logger.warn { "${1:message}" }
 snippet mapc
-	${1:map}.${2:connect} '${3:controller/:action/:id}'
+	${1:map}.${2:connect} '${0:controller/:action/:id}'
 snippet mapca
-	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5}
+	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
 snippet mapr
-	${1:map}.resource :${2:resource}
+	${1:map}.resource :${0:resource}
 snippet maprs
-	${1:map}.resources :${2:resource}
+	${1:map}.resources :${0:resource}
 snippet mapwo
 	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
-		${4}
+		${0}
 	end
 snippet mbs
-	before_save :${1:method}
+	before_save :${0:method}
 snippet mcht
 	change_table :${1:table_name} do |t|
-		${2}
+		${0}
 	end
 snippet mp
-	map(&:${1:id})
+	map(&:${0:id})
 snippet mrw
-	mattr_accessor :${1:attr_names}
+	mattr_accessor :${0:attr_names}
 snippet oa
-	order("${1:field}")
+	order("${0:field}")
 snippet od
-	order("${1:field} DESC")
+	order("${0:field} DESC")
 snippet pa
-	params[:${1:id}]${2}
+	params[:${1:id}]
 snippet ra
-	render :action => "${1:action}"
+	render :action => "${0:action}"
 snippet ral
-	render :action => "${1:action}", :layout => "${2:layoutname}"
+	render :action => "${1:action}", :layout => "${0:layoutname}"
 snippet rest
 	respond_to do |format|
-		format.${1:html} { ${2} }
+		format.${1:html} { ${0} }
 	end
 snippet rf
-	render :file => "${1:filepath}"
+	render :file => "${0:filepath}"
 snippet rfu
-	render :file => "${1:filepath}", :use_full_path => ${2:false}
+	render :file => "${1:filepath}", :use_full_path => ${0:false}
 snippet ri
-	render :inline => "${1:<%= 'hello' %>}"
+	render :inline => "${0:<%= 'hello' %>}"
 snippet ril
-	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${4} }
+	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${0} }
 snippet rit
-	render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
+	render :inline => "${1:<%= 'hello' %>}", :type => ${0::rxml}
 snippet rjson
-	render :json => ${1:text to render}
+	render :json => ${0:text to render}
 snippet rl
-	render :layout => "${1:layoutname}"
+	render :layout => "${0:layoutname}"
 snippet rn
-	render :nothing => ${1:true}
+	render :nothing => ${0:true}
 snippet rns
-	render :nothing => ${1:true}, :status => ${2:401}
+	render :nothing => ${1:true}, :status => ${0:401}
 snippet rp
-	render :partial => "${1:item}"
+	render :partial => "${0:item}"
 snippet rpc
-	render :partial => "${1:item}", :collection => ${2:@$1s}
+	render :partial => "${1:item}", :collection => ${0:@$1s}
 snippet rpl
-	render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+	render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
 snippet rpo
-	render :partial => "${1:item}", :object => ${2:@$1}
+	render :partial => "${1:item}", :object => ${0:@$1}
 snippet rps
-	render :partial => "${1:item}", :status => ${2:500}
+	render :partial => "${1:item}", :status => ${0:500}
 snippet rt
-	render :text => "${1:text to render}"
+	render :text => "${0:text to render}"
 snippet rtl
-	render :text => "${1:text to render}", :layout => "${2:layoutname}"
+	render :text => "${1:text to render}", :layout => "${0:layoutname}"
 snippet rtlt
-	render :text => "${1:text to render}", :layout => ${2:true}
+	render :text => "${1:text to render}", :layout => ${0:true}
 snippet rts
-	render :text => "${1:text to render}", :status => ${2:401}
+	render :text => "${1:text to render}", :status => ${0:401}
 snippet ru
 	render :update do |${1:page}|
-		$1.${2}
+		$1.${0}
 	end
 snippet rxml
-	render :xml => ${1:text to render}
+	render :xml => ${0:text to render}
 snippet sc
-	scope :${1:name}, -> { where(${2:field}: ${3:value}) }
+	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
 snippet sl
 	scope :${1:name}, lambda do |${2:value}|
-		where("${3:field = ?}", ${4:bind var})
+		where("${3:field = ?}", ${0:bind var})
 	end
 snippet sha1
-	Digest::SHA1.hexdigest(${1:string})
+	Digest::SHA1.hexdigest(${0:string})
 snippet sweeper
 	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
 		observe $1
 
-		def after_save(${2:model_class_name})
+		def after_save(${0:model_class_name})
 			expire_cache($2)
 		end
 
@@ -831,66 +838,66 @@ snippet sweeper
 		end
 	end
 snippet va validates_associated
-	validates_associated :${1:attribute}
+	validates_associated :${0:attribute}
 snippet va validates .., :acceptance => true
-	validates :${1:terms}, :acceptance => true
+	validates :${0:terms}, :acceptance => true
 snippet vc
-	validates :${1:attribute}, :confirmation => true
+	validates :${0:attribute}, :confirmation => true
 snippet ve
-	validates :${1:attribute}, :exclusion => { :in => ${2:%w( mov avi )} }
+	validates :${1:attribute}, :exclusion => { :in => ${0:%w( mov avi )} }
 snippet vf
-	validates :${1:attribute}, :format => { :with => /${2:regex}/ }
+	validates :${1:attribute}, :format => { :with => /${0:regex}/ }
 snippet vi
-	validates :${1:attribute}, :inclusion => { :in => %w(${2: mov avi }) }
+	validates :${1:attribute}, :inclusion => { :in => %w(${0: mov avi }) }
 snippet vl
-	validates :${1:attribute}, :length => { :in => ${2:3}..${3:20} }
+	validates :${1:attribute}, :length => { :in => ${2:3}..${0:20} }
 snippet vn
-	validates :${1:attribute}, :numericality => true
+	validates :${0:attribute}, :numericality => true
 snippet vp
-	validates :${1:attribute}, :presence => true
+	validates :${0:attribute}, :presence => true
 snippet vu
-	validates :${1:attribute}, :uniqueness => true
+	validates :${0:attribute}, :uniqueness => true
 snippet format
-	format.${1:js|xml|html} { ${2} }
+	format.${1:js|xml|html} { ${0} }
 snippet wc
-	where(${1:"conditions"}${2:, bind_var})
-snippet wh
-	where(${1:field} => ${2:value})
+	where(${1:"conditions"}${0:, bind_var})
+snippet wf
+	where(${1:field} => ${0:value})
 snippet xdelete
-	xhr :delete, :${1:destroy}, :id => ${2:1}${3}
+	xhr :delete, :${1:destroy}, :id => ${2:1}
 snippet xget
-	xhr :get, :${1:show}, :id => ${2:1}${3}
+	xhr :get, :${1:show}, :id => ${2:1}
 snippet xpost
-	xhr :post, :${1:create}, :${2:object} => { ${3} }
+	xhr :post, :${1:create}, :${2:object} => { ${0} }
 snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}
+	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
 snippet test
 	test "should ${1:do something}" do
-		${2}
+		${0}
 	end
 ###########################
 #   migrations snippets   #
 ###########################
 snippet mac
-	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
+	add_column :${1:table_name}, :${2:column_name}, :${0:data_type}
 snippet mai
-	add_index :${1:table_name}, :${2:column_name}
+	add_index :${1:table_name}, :${0:column_name}
 snippet mrc
-	remove_column :${1:table_name}, :${2:column_name}
+	remove_column :${1:table_name}, :${0:column_name}
 snippet mrnc
-	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}
+	rename_column :${1:table_name}, :${2:old_column_name}, :${0:new_column_name}
 snippet mcc
-	change_column :${1:table}, :${2:column}, :${3:type}
+	change_column :${1:table}, :${2:column}, :${0:type}
 snippet mnc
-	t.${1:string} :${2:title}${3:, null: false}${4}
+	t.${1:string} :${2:title}${3:, null: false}
 snippet mct
 	create_table :${1:table_name} do |t|
-		${2}
+		${0}
 	end
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def up
-			${2}
+			${0}
 		end
 
 		def down
@@ -899,180 +906,182 @@ snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. en
 snippet migration class .. < ActiveRecord::Migration .. def change .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def change
-			${2}
+			${0}
 		end
 	end
 snippet trc
-	t.remove :${1:column}
+	t.remove :${0:column}
 snippet tre
 	t.rename :${1:old_column_name}, :${2:new_column_name}
-	${3}
+	${0}
 snippet tref
-	t.references :${1:model}
+	t.references :${0:model}
 snippet tcb
 	t.boolean :${1:title}
-	${2}
+	${0}
 snippet tcbi
 	t.binary :${1:title}, :limit => ${2:2}.megabytes
-	${3}
+	${0}
 snippet tcd
 	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
-	${4}
+	${0}
 snippet tcda
 	t.date :${1:title}
-	${2}
+	${0}
 snippet tcdt
 	t.datetime :${1:title}
-	${2}
+	${0}
 snippet tcf
 	t.float :${1:title}
-	${2}
+	${0}
 snippet tch
 	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
-	${5}
+	${0}
 snippet tci
 	t.integer :${1:title}
-	${2}
+	${0}
 snippet tcl
 	t.integer :lock_version, :null => false, :default => 0
-	${1}
+	${0}
 snippet tcr
 	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
-	${3}
+	${0}
 snippet tcs
 	t.string :${1:title}
-	${2}
+	${0}
 snippet tct
 	t.text :${1:title}
-	${2}
+	${0}
 snippet tcti
 	t.time :${1:title}
-	${2}
+	${0}
 snippet tcts
 	t.timestamp :${1:title}
-	${2}
+	${0}
 snippet tctss
 	t.timestamps
-	${1}
+	${0}
 ##########################
 #     Rspec snippets     #
 ##########################
 snippet desc
-	describe ${1:class_name} do
-		${2}
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
 	end
 snippet descm
 	describe "${1:#method}" do
-		${2:pending "Not implemented"}
+		${0:pending "Not implemented"}
 	end
 snippet cont
 	context "${1:message}" do
-		${2}
+		${0}
 	end
 snippet bef
 	before :${1:each} do
-		${2}
+		${0}
 	end
 snippet aft
 	after :${1:each} do
-		${2}
+		${0}
 	end
 snippet let
-	let(:${1:object}) ${2}
+	let(:${1:object}) ${0}
 snippet let!
-	let!(:${1:object}) ${2}
+	let!(:${1:object}) ${0}
 snippet subj
-	subject { ${1} }
+	subject { ${0} }
 snippet s.
-	subject.${1:method}
+	subject.${0:method}
 snippet spec
-	specify { subject.${1} }
+	specify { subject.${0} }
 snippet exp
-	expect { ${1:object} }.to ${2}
-snippet raise
-	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
+	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 ${1:"shared examples name"}
+	shared_examples ${0:"shared examples name"}
 snippet ibl
-	it_behaves_like ${1:"shared examples name"}
+	it_behaves_like ${0:"shared examples name"}
 snippet it
 	it "${1:spec_name}" do
-		${2}
+		${0}
 	end
 snippet its
-	its(:${1:method}) { should ${2} }
+	its(:${1:method}) { should ${0} }
 snippet is
-	it { should ${1} }
+	it { should ${0} }
 snippet isn
-	it { should_not ${1} }
+	it { should_not ${0} }
 #ShouldaMatchers#ActionController
 snippet isfp
-	it { should filter_param :${1:key} }
+	it { should filter_param :${0:key} }
 snippet isrt
-	it { should redirect_to ${1:url} }
+	it { should redirect_to ${0:url} }
 snippet isrtp
-	it { should render_template ${1} }
+	it { should render_template ${0} }
 snippet isrwl
-	it { should render_with_layout ${1} }
+	it { should render_with_layout ${0} }
 snippet isrf
-	it { should rescue_from ${1:exception} }
+	it { should rescue_from ${0:exception} }
 snippet isrw
-	it { should respond_with ${1:status} }
+	it { should respond_with ${0:status} }
 snippet isr
-	it { should route(:${1:method}, '${2:path}') }
+	it { should route(:${1:method}, '${0:path}') }
 snippet isss
-	it { should set_session :${1:key} }
+	it { should set_session :${0:key} }
 snippet issf
-	it { should set_the_flash('${1}') }
+	it { should set_the_flash('${0}') }
 #ShouldaMatchers#ActiveModel
 snippet isama
-	it { should allow_mass_assignment_of :${1} }
+	it { should allow_mass_assignment_of :${0} }
 snippet isav
-	it { should allow_value(${1}).for :${2} }
+	it { should allow_value(${1}).for :${0} }
 snippet isee
-	it { should ensure_exclusion_of :${1} }
+	it { should ensure_exclusion_of :${0} }
 snippet isei
-	it { should ensure_inclusion_of :${1} }
+	it { should ensure_inclusion_of :${0} }
 snippet isel
-	it { should ensure_length_of :${1} }
+	it { should ensure_length_of :${0} }
 snippet isva
-	it { should validate_acceptance_of :${1} }
+	it { should validate_acceptance_of :${0} }
 snippet isvc
-	it { should validate_confirmation_of :${1} }
+	it { should validate_confirmation_of :${0} }
 snippet isvn
-	it { should validate_numericality_of :${1} }
+	it { should validate_numericality_of :${0} }
 snippet isvp
-	it { should validate_presence_of :${1} }
+	it { should validate_presence_of :${0} }
 snippet isvu
-	it { should validate_uniqueness_of :${1} }
+	it { should validate_uniqueness_of :${0} }
 #ShouldaMatchers#ActiveRecord
 snippet isana
-	it { should accept_nested_attributes_for :${1} }
+	it { should accept_nested_attributes_for :${0} }
 snippet isbt
-	it { should belong_to :${1} }
+	it { should belong_to :${0} }
 snippet isbtcc
-	it { should belong_to(:${1}).counter_cache ${2:true} }
+	it { should belong_to(:${1}).counter_cache ${0:true} }
 snippet ishbtm
-	it { should have_and_belong_to_many :${1} }
+	it { should have_and_belong_to_many :${0} }
 snippet isbv
-	it { should be_valid }${1}
+	it { should be_valid }
 snippet ishc
-	it { should have_db_column :${1} }
+	it { should have_db_column :${0} }
 snippet ishi
-	it { should have_db_index :${1} }
+	it { should have_db_index :${0} }
 snippet ishm
-	it { should have_many :${1} }
+	it { should have_many :${0} }
 snippet ishmt
-	it { should have_many(:${1}).through :${2} }
+	it { should have_many(:${1}).through :${0} }
 snippet isho
-	it { should have_one :${1} }
+	it { should have_one :${0} }
 snippet ishro
-	it { should have_readonly_attribute :${1} }
+	it { should have_readonly_attribute :${0} }
 snippet iss
-	it { should serialize :${1} }
+	it { should serialize :${0} }
 snippet isres
-	it { should respond_to :${1} }
+	it { should respond_to :${0} }
 snippet isresw
-	it { should respond_to(:${1}).with(${2}).arguments }
+	it { should respond_to(:${1}).with(${0}).arguments }
 snippet super_call
-      ${1:super_class}.instance_method(:${2:method}).bind(self).call
+	${1:super_class}.instance_method(:${0:method}).bind(self).call
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index e3999f85..5eddb2c3 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -7,45 +7,45 @@
 #if
 snippet if
 	if(${1:obj}) {
-		${2}
+		${0}
 	}
 #if not
 snippet ifn
 	if(!${1:obj}) {
-		${2}
+		${0}
 	}
 #if-else
 snippet ife
 	if(${1:obj}) {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 #if-else-if
 snippet ifelif
 	if(${1:obj}) {
 		${2}
 	} else if(${3:obj}) {
-		${4}
+		${0}
 	}
 snippet eif
 	else if(${3:obj}) {
-		${4}
+		${0}
 	}
 #while loop
-snippet while
+snippet wh
 	while (${1:obj}) {
-		${2}
+		${0}
 	}
 #for loop(classic)
 snippet for
 	for (${1:item} <- ${2:obj}) {
-		${3}
+		${0}
 	}
 #for loop(indexed)
 snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
-		${4}
+		${0}
 	}
 #exceptions
 snippet try
@@ -55,52 +55,52 @@ snippet try
 		case e: FileNotFoundException => ${2}
 		case e: IOException => ${3}
 	} finally {
-		${4}
+		${0}
 	}
 #match
 snippet match
 	${1: obj} match {
 		case ${2:e} => ${3}
-		case _ => ${4}
+		case _ => ${0}
 	}
 #case
 snippet case
-	case ${1:value} => ${2}
+	case ${1:value} => ${0}
 ############################
 # methods and arguments
 #
 #arg
 snippet arg
-	${1:a}: ${2:T}${3:, arg}
+	${1:a}: ${2:T}${0:, arg}
 #args
 snippet args
-	${1:args}: ${2:T}*
+	${1:args}: ${0:T}*
 #def
 snippet def
-	def ${1:name}(${2:arg}) = ${3:}
+	def ${1:name}(${2:arg}) = ${0:}
 #private def
 snippet prdef
-	private def ${1:name}(${2:arg}) = ${3:}
+	private def ${1:name}(${2:arg}) = ${0:}
 #override def
 snippet ovdef
-	override def ${1:name}(${2:arg}) = ${3:}
+	override def ${1:name}(${2:arg}) = ${0:}
 #first class function(see scalabook p 188)
 snippet fcf
-	(${1:a}: ${2:T}) => $1 ${3}
+	(${1:a}: ${2:T}) => $1 ${0}
 snippet =>
-	${1:name} => ${2}
+	${1:name} => ${0}
 #recursion
 snippet rec
-	def ${1:name}(${2:arg}) =
+	def ${1:name}(${0:arg}) =
 		if($2) $2
 		else $1($2)
 #curried method
 snippet crdef
-	def ${1:name}(${2:arg})(${3:arg}) = ${4:}
+	def ${1:name}(${2:arg})(${3:arg}) = ${0:}
 #main method
 #check validity of T
 snippet main
-	def main(args: Array[String]):${1:T} = ${2:}
+	def main(args: Array[String]):${1:T} = ${0:}
 ############################
 # basic types(general purpose)
 # you might want to use basic types snippets
@@ -165,30 +165,30 @@ snippet chr
 snippet lng
 	Long
 snippet arr
-	Array${1:[T]}${2:()}
+	Array${1:[T]}${0:()}
 snippet buf
-	Buffer${1:[T]}${2:()}
+	Buffer${1:[T]}${0:()}
 snippet list
-	List${1:[T]}${2:()}
+	List${1:[T]}${0:()}
 snippet tpl
-	Tuple${1:2}[${2:T},${3:T}]
+	Tuple${1:2}[${2:T},${0:T}]
 snippet set
-	Set${1:[T]}${2:()}
+	Set${1:[T]}${0:()}
 snippet hset
-	HashSet${1:[T]}${2:()}
+	HashSet${1:[T]}${0:()}
 snippet mhset
-	mutable.HashSet${1:[T]}${2:()}
+	mutable.HashSet${1:[T]}${0:()}
 #for maps
 snippet keyval
-	${1:key}->${2:val}${3:, keyval}
+	${1:key}->${2:val}${0:, keyval}
 snippet map
-	Map[${1:T},${2:T}]${3:(keyval)}
+	Map[${1:T},${2:T}]${0:(keyval)}
 snippet hmap
-	HashMap[${1:T},${2:T}]${3:(keyval)}
+	HashMap[${1:T},${2:T}]${0:(keyval)}
 snippet mmap
-	mutable.Map[${1:T},${2:T}]${3:(keyval)}
+	mutable.Map[${1:T},${2:T}]${0:(keyval)}
 snippet mhmap
-	mutable.HashMap[${1:T},${2:T}]${3:(keyval)}
+	mutable.HashMap[${1:T},${2:T}]${0:(keyval)}
 #TODO add TreeMap and TreeSet
 #asInstanceOf[]
 snippet as
@@ -200,61 +200,61 @@ snippet as
 
 #scope() with one arg
 snippet (a
-	(${1:a} => ${2})
+	(${1:a} => ${0})
 #scope() with two args
 snippet {(
 	{(${1:a},${2:b}) =>
-		${3}
+		${0}
 	}
 #filter
 snippet filter
-	${1:name}.filter (a
+	${0:name}.filter (a
 #map function
 snippet mapf
-	${1:name}.map (a
+	${0:name}.map (a
 #flatmap
 snippet flatmap
-	${1:name}.flatMap${2:[T]}(a
+	${1:name}.flatMap${0:[T]}(a
 #fold left
 snippet fldl
-	${1:name}.foldLeft(${2:first}) {(
+	${1:name}.foldLeft(${0:first}) {(
 #fold right
 snippet fldr
-	${1:name}.foldRight(${2:first}) {(
+	${1:name}.foldRight(${0:first}) {(
 #fold left operator(if u wanna reduce readability of ur code)
 #use wildcard symbols
 snippet /:
-	(${1:first}/:${2:name})(${3})
+	(${1:first}/:${2:name})(${0})
 #fold right operator
 snippet :\
-	(${1:first}:\${2:name})(${3})
+	(${1:first}:\${2:name})(${0})
 #reduce left
 snippet redl
-	${1:name}.reduceLeft[${2:T}] {(
+	${1:name}.reduceLeft[${0:T}] {(
 #reduce right
 snippet redr
-	${1:name}.reduceRight[${2:T}] {(
+	${1:name}.reduceRight[${0:T}] {(
 #zipWithIndex(safe way).
 #see http://daily-scala.blogspot.com/2010/05/zipwithindex.html
 snippet zipwi
-	${1:name}.view.zipWithIndex
+	${0:name}.view.zipWithIndex
 #split
 snippet spl
-	${1:name}.split("${2:,}")
+	${1:name}.split("${0:,}")
 #end
 snippet val
-	val ${1:name}${2:: T} = ${3:value}
+	val ${1:name}${2:: T} = ${0:value}
 snippet var
-	var ${1:name}${2:: T} = ${3:value}
+	var ${1:name}${2:: T} = ${0:value}
 ############################
 # classes
 #
 #extends
 snippet extends
-	extends ${1:what}
+	extends ${0:what}
 #with
 snippet with
-	with ${1:what}${2: with}
+	with ${1:what}${0: with}
 #auxiliary constructor(a. this)
 snippet athis
 	def this(arg) = this(arg)
@@ -262,63 +262,63 @@ snippet athis
 snippet abstract
 	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6}
+		${0}
 	}
 #class
 snippet class
 	class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6}
+		${0}
 	}
 #object
 snippet object
-	object ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+	object ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
 #trait
 snippet trait
 	trait ${1:name}${2: extends }${3: with} {
-		${4:}
+		${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}
-		${6}
+		${0}
 	}
 #case class
 snippet casecl
-	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
 ############################
 # testing
 #
 #scalatest imports
 snippet scalatest
 	${1:import org.scalatest.Suite}
-	${2:import org.scalatest.FunSuite}
+	${0:import org.scalatest.FunSuite}
 #assert
 snippet assert
-	assert(${1:a}==${2:b})
+	assert(${1:a}==${0:b})
 #ensuring(p 296)
 snippet ensuring
-	ifel ensuring(${1:a}==${2:b})
+	ifel ensuring(${1:a}==${0:b})
 #expect
 snippet expect
-	expect(${1:what}) {
+	expect(${0:what}) {
 #intercept
 snippet intercept
-	intercept[${1:IllegalArgumentException}] {
+	intercept[${0:IllegalArgumentException}] {
 #test
 snippet test
-	test("${1:description}") {
+	test("${0:description}") {
 #suite
 snippet suite
-	class ${1:name} extends Suite {
+	class ${0:name} extends Suite {
 		def test() {
 	}
 #funsuite
 snippet fsuite
 	class ${1:name} extends FunSuite {
-		test("${2:description}") {
+		test("${0:description}") {
 	}
 ############################
 # SBT
@@ -327,7 +327,7 @@ snippet webproject
 	import sbt._
 
 	class ${1:Name}(info: ProjectInfo) extends DefaultWebProject(info) {
-		val liftVersion = "${2:2.3}"
+		val liftVersion = "${0:2.3}"
 
 		override def libraryDependencies = Set(
 
@@ -337,9 +337,9 @@ snippet webproject
 	}
 #depencies
 snippet liftjar
-	"net.liftweb" %% "${1:lib}" % liftVersion % "compile->default",
+	"net.liftweb" %% "${0:lib}" % liftVersion % "compile->default",
 snippet jettyjar
-	"org.mortbay.jetty" % "jetty" % "${1:version}" % "test->default",
+	"org.mortbay.jetty" % "jetty" % "${0:version}" % "test->default",
 ############################
 # Lift
 #
diff --git a/sources_non_forked/vim-snippets/snippets/sh.snippets b/sources_non_forked/vim-snippets/snippets/sh.snippets
index e2853b64..6bf7089c 100644
--- a/sources_non_forked/vim-snippets/snippets/sh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/sh.snippets
@@ -4,38 +4,38 @@ snippet #!
 
 snippet if
 	if [[ ${1:condition} ]]; then
-		${2:#statements}
+		${0:#statements}
 	fi
 snippet elif
 	elif [[ ${1:condition} ]]; then
-		${2:#statements}
+		${0:#statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack} ; do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet wh
 	while [[ ${1:condition} ]]; do
-		${2:#statements}
+		${0:#statements}
 	done
 snippet until
 	until [[ ${1:condition} ]]; do
-		${2:#statements}
+		${0:#statements}
 	done
 snippet case
 	case ${1:word} in
 		${2:pattern})
-			${3};;
+			${0};;
 	esac
 snippet go
 	while getopts '${1:o}' ${2:opts}
 	do
 		case $$2 in
 		${3:o0})
-			${4:#staments};;
+			${0:#staments};;
 		esac
 	done
 # Set SCRIPT_DIR variable to directory script is located.
@@ -82,3 +82,11 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi
+snippet fun
+	${1:function_name}() {
+		${0:#function_body}
+	}
+snippet ffun
+	function ${1:function_name}() {
+		${0:#function_body}
+	}
diff --git a/sources_non_forked/vim-snippets/snippets/snippets.snippets b/sources_non_forked/vim-snippets/snippets/snippets.snippets
index 4223fa39..a97c0169 100644
--- a/sources_non_forked/vim-snippets/snippets/snippets.snippets
+++ b/sources_non_forked/vim-snippets/snippets/snippets.snippets
@@ -1,9 +1,9 @@
 # snippets for making snippets :)
 snippet snip
 	snippet ${1:trigger}
-		${2}
+		${0}
 snippet msnip
 	snippet ${1:trigger} ${2:description}
-		${3}
+		${0}
 snippet v
 	{VISUAL}
diff --git a/sources_non_forked/vim-snippets/snippets/sql.snippets b/sources_non_forked/vim-snippets/snippets/sql.snippets
index eb4b37ca..556fae0a 100644
--- a/sources_non_forked/vim-snippets/snippets/sql.snippets
+++ b/sources_non_forked/vim-snippets/snippets/sql.snippets
@@ -1,26 +1,26 @@
 snippet tbl
 	create table ${1:table} (
-		${2:columns}
+		${0:columns}
 	);
 snippet col
-	${1:name}	${2:type}	${3:default ''}	${4:not null}
+	${1:name}	${2:type}	${3:default ''}	${0:not null}
 snippet ccol
-	${1:name}	varchar2(${2:size})	${3:default ''}	${4:not null}
+	${1:name}	varchar2(${2:size})	${3:default ''}	${0:not null}
 snippet ncol
-	${1:name}	number	${3:default 0}	${4:not null}
+	${1:name}	number	${3:default 0}	${0:not null}
 snippet dcol
-	${1:name}	date	${3:default sysdate}	${4:not null}
+	${1:name}	date	${3:default sysdate}	${0:not null}
 snippet ind
-	create index ${3:$1_$2} on ${1:table}(${2:column});
+	create index ${0:$1_$2} on ${1:table}(${2:column});
 snippet uind
-	create unique index ${1:name} on ${2:table}(${3:column});
+	create unique index ${1:name} on ${2:table}(${0:column});
 snippet tblcom
-	comment on table ${1:table} is '${2:comment}';
+	comment on table ${1:table} is '${0:comment}';
 snippet colcom
-	comment on column ${1:table}.${2:column} is '${3:comment}';
+	comment on column ${1:table}.${2:column} is '${0:comment}';
 snippet addcol
-	alter table ${1:table} add (${2:column} ${3:type});
+	alter table ${1:table} add (${2:column} ${0:type});
 snippet seq
-	create sequence ${1:name} start with ${2:1} increment by ${3:1} minvalue ${4:1};
+	create sequence ${1:name} start with ${2:1} increment by ${3:1} minvalue ${0:1};
 snippet s*
-	select * from ${1:table}
+	select * from ${0:table}
diff --git a/sources_non_forked/vim-snippets/snippets/tcl.snippets b/sources_non_forked/vim-snippets/snippets/tcl.snippets
index 8c0674e4..9da703ce 100644
--- a/sources_non_forked/vim-snippets/snippets/tcl.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tcl.snippets
@@ -5,26 +5,26 @@ snippet #!
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
-		${3}
+		${0}
 	}
 #xif
 snippet xif
-	${1:expr}? ${2:true} : ${3:false}
+	${1:expr}? ${2:true} : ${0:false}
 # Conditional
 snippet if
 	if {${1}} {
-		${2}
+		${0}
 	}
 # Conditional if..else
 snippet ife
 	if {${1}} {
 		${2}
 	} else {
-		${3:# else...}
+		${0:# else...}
 	}
 snippet eif
 	elseif {${1}} {
-		${2}
+		${0}
 	}
 # Conditional if..elsif..else
 snippet ifee
@@ -33,51 +33,51 @@ snippet ifee
 	} elseif {${3}} {
 		${4:# elsif...}
 	} else {
-		${5:# else...}
+		${0:# else...}
 	}
 # If catch then
 snippet ifc
 	if { [catch {${1:#do something...}} ${2:err}] } {
-		${3:# handle failure...}
+		${0:# handle failure...}
 	}
 # Catch
 snippet catch
-	catch {${1}} ${2:err} ${3:options}
+	catch {${1}} ${2:err} ${0:options}
 # While Loop
 snippet wh
 	while {${1}} {
-		${2}
+		${0}
 	}
 # For Loop
 snippet for
 	for {set ${2:var} 0} {$$2 < ${1:count}} {${3:incr} $2} {
-		${4}
+		${0}
 	}
 # Foreach Loop
 snippet fore
 	foreach ${1:x} {${2:#list}} {
-		${3}
+		${0}
 	}
 # after ms script...
 snippet af
-	after ${1:ms} ${2:#do something}
+	after ${1:ms} ${0:#do something}
 # after cancel id
 snippet afc
-	after cancel ${1:id or script}
+	after cancel ${0:id or script}
 # after idle
 snippet afi
-	after idle ${1:script}
+	after idle ${0:script}
 # after info id
 snippet afin
-	after info ${1:id}
+	after info ${0:id}
 # Expr
 snippet exp
-	expr {${1:#expression here}}
+	expr {${0:#expression here}}
 # Switch
 snippet sw
 	switch ${1:var} {
 		${3:pattern 1} {
-			${4:#do something}
+			${0:#do something}
 		}
 		default {
 			${2:#do something}
@@ -87,10 +87,10 @@ snippet sw
 snippet ca
 	${1:pattern} {
 		${2:#do something}
-	}${3}
+	}
 # Namespace eval
 snippet ns
-	namespace eval ${1:path} {${2:#script...}}
+	namespace eval ${1:path} {${0:#script...}}
 # Namespace current
 snippet nsc
 	namespace current
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index 649e06b7..f3c090e6 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -1,205 +1,205 @@
 #PREAMBLE
 #newcommand
 snippet nc
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${4}
+	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up
-	\usepackage[${1:options}]{${2:package}} ${3}
+	\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
 snippet nuc
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${4}
+	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
 snippet dmo
-	\DeclareMathOperator{${1}}{${2}} ${3}
+	\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
 snippet begin
 	\begin{${1:env}}
-		${2}
+		${0}
 	\end{$1}
 # Tabular
 snippet tab
 	\begin{${1:tabular}}{${2:c}}
-	${3}
+	${0}
 	\end{$1}
 snippet thm
 	\begin[${1:author}]{${2:thm}}
-	${3}
+	${0}
 	\end{$2}
 snippet center
 	\begin{center}
-		${1}
+		${0}
 	\end{center}
 # Align(ed)
 snippet ali
 	\begin{align${1:ed}}
-		${2}
+		${0}
 	\end{align$1}
 # Gather(ed)
 snippet gat
 	\begin{gather${1:ed}}
-		${2}
+		${0}
 	\end{gather$1}
 # Equation
 snippet eq
 	\begin{equation}
-		${1}
+		${0}
 	\end{equation}
 # Equation
 snippet eq*
 	\begin{equation*}
-		${1}
+		${0}
 	\end{equation*}
 # Unnumbered Equation
 snippet \
 	\[
-		${1}
+		${0}
 	\]
 # Equation array
 snippet eqnarray
 	\begin{eqnarray}
-		${1}
+		${0}
 	\end{eqnarray}
 # Enumerate
 snippet enum
 	\begin{enumerate}
-		\item ${1}
+		\item ${0}
 	\end{enumerate}
 # Itemize
 snippet itemize
 	\begin{itemize}
-		\item ${1}
+		\item ${0}
 	\end{itemize}
 snippet item
 	\item ${1}
 # Description
 snippet desc
 	\begin{description}
-		\item[${1}] ${2}
+		\item[${1}] ${0}
 	\end{description}
 # Endless new item
 snippet ]i
 	\item ${1}
-	${2:]i}
+	${0:]i}
 # Matrix
 snippet mat
 	\begin{${1:p/b/v/V/B/small}matrix}
-		${2}
+		${0}
 	\end{$1matrix}
 # Cases
 snippet cas
 	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
-		${3}
+		${0}
 	\end{cases}
 # Split
 snippet spl
 	\begin{split}
-		${1}
+		${0}
 	\end{split}
 # Part
 snippet part
 	\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
-	${3}
+	${0}
 	% part $2 (end)
 # Chapter
 snippet cha
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
-	${3}
+	${0}
 # Section
 snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
-	${3}
+	${0}
 # Section without number
 snippet sec*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
-	${3}
+	${0}
 # Sub Section
 snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
-	${3}
+	${0}
 # Sub Section without number
 snippet sub*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
-	${3}
+	${0}
 # Sub Sub Section
 snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
-	${3}
+	${0}
 # Sub Sub Section without number
 snippet subs*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
-	${3}
+	${0}
 # Paragraph
 snippet par
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
-	${3}
+	${0}
 # Sub Paragraph
 snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
-	${3}
+	${0}
 snippet ni
 	\noindent
-	${1}
+	${0}
 #References
 snippet itd
-	\item[${1:description}] ${2:item}
+	\item[${1:description}] ${0:item}
 snippet figure
-	${1:Figure}~\ref{${2:fig:}}${3}
+	${1:Figure}~\ref{${2:fig:}}
 snippet table
-	${1:Table}~\ref{${2:tab:}}${3}
+	${1:Table}~\ref{${2:tab:}}
 snippet listing
-	${1:Listing}~\ref{${2:list}}${3}
+	${1:Listing}~\ref{${2:list}}
 snippet section
-	${1:Section}~\ref{sec:${2}} ${3}
+	${1:Section}~\ref{sec:${2}} ${0}
 snippet page
-	${1:page}~\pageref{${2}} ${3}
+	${1:page}~\pageref{${2}} ${0}
 snippet index
-	\index{${1:index}} ${2}
+	\index{${1:index}} ${0}
 #Citations
 snippet citen
-	\cite{$1} ${2}
+	\cite{$1} ${0}
 # bibtex commands
 snippet citep
-	\citep{$1} ${2}
+	\citep{$1} ${0}
 snippet citet
-	\citet{$1} ${2}
+	\citet{$1} ${0}
 snippet cite
-	\cite[${1}]{${2}} ${3}
+	\cite[${1}]{${2}} ${0}
 snippet fcite
-	\footcite[${1}]{${2}}${3}
+	\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it
-	\textit{${1:text}}
+	\textit{${0:text}}
 snippet bf
-	\textbf{${1:text}}
+	\textbf{${0:text}}
 snippet under
-	\underline{${1:text}}
+	\underline{${0:text}}
 snippet emp
-	\emph{${1:text}}
+	\emph{${0:text}}
 snippet sc
-	\textsc{${1:text}}
+	\textsc{${0:text}}
 #Choosing font
 snippet sf
-	\textsf{${1:text}}
+	\textsf{${0:text}}
 snippet rm
-	\textrm{${1:text}}
+	\textrm{${0:text}}
 snippet tt
-	\texttt{${1:text}}
+	\texttt{${0:text}}
 #misc
 snippet ft
-	\footnote{${1:text}}
+	\footnote{${0:text}}
 snippet fig
 	\begin{figure}
 	\begin{center}
@@ -208,7 +208,7 @@ snippet fig
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
-	${5}
+	${0}
 snippet tikz
 	\begin{figure}
 	\begin{center}
@@ -219,33 +219,33 @@ snippet tikz
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
-	${5}
+	${0}
 #math
 snippet stackrel
-	\stackrel{${1:above}}{${2:below}} ${3}
+	\stackrel{${1:above}}{${2:below}} ${0}
 snippet frac
-	\frac{${1:num}}{${2:denom}} ${3}
+	\frac{${1:num}}{${2:denom}} ${0}
 snippet sum
-	\sum^{${1:n}}_{${2:i=1}} ${3}
+	\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim
-	\lim_{${1:x \to +\infty}} ${2}
+	\lim_{${1:x \to +\infty}} ${0}
 snippet frame
 	\begin{frame}[<+->]
 		\frametitle{${1:title}}
 
-		${2}
+		${0}
 	\end{frame}
 snippet block
 	\begin{block}{${1:title}}
-	${2}
+	${0}
 	\end{block}
 snippet alert
 	\begin{alertblock}{${1:title}}
-	${2}
+	${0}
 	\end{alertblock}
 snippet example
 	\begin{exampleblock}{${1:title}}
-	${2}
+	${0}
 	\end{exampleblock}
 snippet col2
 	\begin{columns}
@@ -253,6 +253,6 @@ snippet col2
 			${1}
 		\end{column}
 		\begin{column}{0.5\textwidth}
-			${2}
+			${0}
 		\end{column}
 	\end{columns}
diff --git a/sources_non_forked/vim-snippets/snippets/textile.snippets b/sources_non_forked/vim-snippets/snippets/textile.snippets
index 9ad97be5..1522bad4 100644
--- a/sources_non_forked/vim-snippets/snippets/textile.snippets
+++ b/sources_non_forked/vim-snippets/snippets/textile.snippets
@@ -3,28 +3,28 @@ snippet header
 	---
 	title: ${1:title}
 	layout: post
-	date: ${2:date} ${3:hour:minute:second} -05:00
+	date: ${2:date} ${0:hour:minute:second} -05:00
 	---
 
 # Image
 snippet img
-	!${1:url}(${2:title}):${3:link}!
+	!${1:url}(${2:title}):${0:link}!
 
 # Table
 snippet |
-	|${1}|${2}
+	|${1}|
 
 # Link
 snippet link
-	"${1:link text}":${2:url}
+	"${1:link text}":${0:url}
 
 # Acronym
 snippet (
-	(${1:Expand acronym})${2}
+	(${1:Expand acronym})
 
 # Footnote
 snippet fn
-	[${1:ref number}] ${3}
+	[${1:ref number}] ${0}
 
 	fn$1. ${2:footnote}
 
diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/sources_non_forked/vim-snippets/snippets/vim.snippets
index 6dd502ff..dd1e65e8 100644
--- a/sources_non_forked/vim-snippets/snippets/vim.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vim.snippets
@@ -2,50 +2,50 @@ snippet header
 	" File: ${1:`expand('%:t')`}
 	" Author: ${2:`g:snips_author`}
 	" Description: ${3}
-	${4:" Last Modified: `strftime("%B %d, %Y")`}
+	${0:" Last Modified: `strftime("%B %d, %Y")`}
 snippet guard
 	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
-	let $1 = 1${3}
+	let $1 = 1${0}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4}
+		${0}
 	endf
 snippet t
 	try
 		${1}
 	catch ${2}
-		${3}
+		${0}
 	endtry
 snippet for
 	for ${1} in ${2}
-		${3}
+		${0}
 	endfor
 snippet forkv
 	for [${1},${2}] in items(${3})
-		${4}
+		${0}
             unlet $1 $2
 	endfor
 
 snippet wh
 	while ${1}
-		${2}
+		${0}
 	endw
 snippet if
 	if ${1}
-		${2}
+		${0}
 	endif
 snippet ife
 	if ${1}
 		${2}
 	else
-		${3}
+		${0}
 	endif
 snippet au
 	augroup ${1:AU_NAME}
 		" this one is which you're most likely to use?
-		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${4}
+		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup end
 snippet bun
-	Bundle '${1}'
+	Bundle '${0}'
diff --git a/sources_non_forked/vim-snippets/snippets/xslt.snippets b/sources_non_forked/vim-snippets/snippets/xslt.snippets
index 6e25fd59..700e77d7 100644
--- a/sources_non_forked/vim-snippets/snippets/xslt.snippets
+++ b/sources_non_forked/vim-snippets/snippets/xslt.snippets
@@ -1,23 +1,23 @@
 snippet apply-templates with-param
 	<xsl:apply-templates select="${1:*}">
 		<xsl:with-param name="${2:param}">${3}</xsl:with-param>${4}
-	</xsl:apply-templates>${5}
+	</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>${6}
+	</xsl:apply-templates>
 
 snippet apply-templates plain
-	<xsl:apply-templates select="${1:*}" />${2}
+	<xsl:apply-templates select="${1:*}" />
 
 snippet attribute blank
-	<xsl:attribute name="${1:name}">${2}</xsl:attribute>${3}
+	<xsl:attribute name="${1:name}">${2}</xsl:attribute>
 
 snippet attribute value-of
 	<xsl:attribute name="${1:name}">
 		<xsl:value-of select="${2:*}" />
-	</xsl:attribute>${3}
+	</xsl:attribute>
 
 snippet call-template
 	<xsl:call-template name="${1:template}" />
@@ -25,73 +25,73 @@ snippet call-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>${5}
+	</xsl:call-template>
 
 snippet choose
 	<xsl:choose>
 		<xsl:when test="${1:value}">
 			${2}
-		</xsl:when>${3}
+		</xsl:when>
 	</xsl:choose>
 
 snippet copy-of
-	<xsl:copy-of select="${1:*}" />${2}
+	<xsl:copy-of select="${1:*}" />
 
 snippet for-each
 	<xsl:for-each select="${1:*}">${2}
-	</xsl:for-each>${3}
+	</xsl:for-each>
 
 snippet if
 	<xsl:if test="${1:test}">${2}
-	</xsl:if>${3}
+	</xsl:if>
 
 snippet import
-	<xsl:import href="${1:stylesheet}" />${2}
+	<xsl:import href="${1:stylesheet}" />
 
 snippet include
-	<xsl:include href="${1:stylesheet}" />${2}
+	<xsl:include href="${1:stylesheet}" />
 
 snippet otherwise
-	<xsl:otherwise>${1}
+	<xsl:otherwise>${0}
 	</xsl:otherwise>
 
 snippet param
 	<xsl:param name="${1:name}">${2}
-	</xsl:param>${3}
+	</xsl:param>
 
 snippet stylesheet
 	<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${1}
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${0}
 	</xsl:stylesheet>
 
 snippet template
-	<xsl:template match="${1:*}">${3}
+	<xsl:template match="${1:*}">${0}
 	</xsl:template>
 
 snippet template named
-	<xsl:template name="${1:name}">${2}
+	<xsl:template name="${1:name}">${0}
 	</xsl:template>
 
 snippet text
-	<xsl:text>${1}</xsl:text>
+	<xsl:text>${0}</xsl:text>
 
 snippet value-of
-	<xsl:value-of select="${1:*}" />${2}
+	<xsl:value-of select="${1:*}" />
 
 snippet variable blank
-	<xsl:variable name="${1:name}">${2}
+	<xsl:variable name="${1:name}">${0}
 	</xsl:variable>
 
 snippet variable select
-	<xsl:variable select="${1:*}" />${2}
+	<xsl:variable select="${1:*}" />
 
 snippet when
-	<xsl:when test="${1:test}">${2}
+	<xsl:when test="${1:test}">${0}
 	</xsl:when>
 
 snippet with-param
-	<xsl:with-param name="${1:name}">${2}</xsl:with-param>
+	<xsl:with-param name="${1:name}">${0}</xsl:with-param>
 
 snippet with-param select
-	<xsl:with-param name="${1:name}" select="${2:*}" />
+	<xsl:with-param name="${1:name}" select="${0:*}" />
 
diff --git a/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets b/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
index df5d5eb7..e827901e 100644
--- a/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
+++ b/sources_non_forked/vim-snippets/snippets/yii-chtml.snippets
@@ -1,248 +1,248 @@
 #--------------------Yii CHtml---------------------------------
 #Yii CHtml::radioButton
 snippet yhrb
-	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} );
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${0:optionValue} );
 
 #Yii CHtml::asset
 snippet yhass
-	echo CHtml::asset('${1:path}');
+	echo CHtml::asset('${0:path}');
 
 #Yii CHtml::activeLabelEx
 snippet yhale
-	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::encodeArray
 snippet yheca
-	echo CHtml::encodeArray(array(${1}));
+	echo CHtml::encodeArray(array(${0}));
 
 #Yii CHtml::normalizeUrl
 snippet yhnurl
-	echo CHtml::normalizeUrl(array('${1}'));
+	echo CHtml::normalizeUrl(array('${0}'));
 
 #Yii CHtml::resetButton
 snippet yhsb
-	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::linkButton
 snippet yhlinkb
-	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${6:optionValue}));
+	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}, '${2:attribute}');
+	echo CHtml::activeId(${1:model}, '${0:attribute}');
 
 #Yii CHtml::activeCheckBox
 snippet yhacb
-	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::encode
 snippet yhec
-	echo CHtml::encode(${1:text});
+	echo CHtml::encode(${0:text});
 
 #Yii CHtml::metaTag
 snippet yhmtag
-	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue}));
+	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}'=>${5:optionValue}));
+	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}'=>${5:optionValue}));
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::script
 snippet yhjs
-	echo CHtml::script('${1:test}');
+	echo CHtml::script('${0:test}');
 
 #Yii CHtml::ajax
 snippet yhaj
-	echo CHtml::ajax(array(${1}));
+	echo CHtml::ajax(array(${0}));
 
 #Yii CHtml::textField
 snippet yhtf
-	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	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}','${4:groupField}');
+	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}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${5:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::closeTag
 snippet yhct
-	echo CHtml::closeTag('${1:tag}');
+	echo CHtml::closeTag('${0:tag}');
 
 #Yii CHtml::activeInputField
 snippet yhaif
-	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::scriptFile
 snippet yhjsf
-	echo CHtml::scriptFile('${1:url}');
+	echo CHtml::scriptFile('${0:url}');
 
 #Yii CHtml::radioButtonList
 snippet yhrbl
-	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::cssFile
 snippet yhcssf
-	echo CHtml::cssFile('${1:url}','${2:media}');
+	echo CHtml::cssFile('${1:url}','${0:media}');
 
 #Yii CHtml::error
 snippet yherr
-	echo CHtml::error(${1:model}, '${2:attribute}');
+	echo CHtml::error(${1:model}, '${0:attribute}');
 
 #Yii CHtml::passwordField
 snippet yhpf
-	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::cdata
 snippet yhc
-	echo CHtml::cdata(${1:text});
+	echo CHtml::cdata(${0:text});
 
 #Yii CHtml::link
 snippet yhlink
-	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::errorSummary
 snippet yherrs
-	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}');
+	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},${5:true});
+	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}'=>${6:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeName
 snippet yhan
-	echo CHtml::activeName(${1:model}, '${2:attribute}');
+	echo CHtml::activeName(${1:model}, '${0:attribute}');
 
 #Yii CHtml::statefulForm
 snippet yhsform
-	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::css
 snippet yhcss
-	echo CHtml::css('${1:test}','${2:media}');
+	echo CHtml::css('${1:test}','${0:media}');
 
 #Yii CHtml::imageButton
 snippet yhimgb
-	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue}));
+	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}'=>${6:optionValue}));
+	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}'=>${3:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${5:optionValue}));
+	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}'=>${3:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${6:optionValue}));
+	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}'=>${3:optionValue}));
+	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}'=>${5:optionValue}));
+	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}'=>${5:optionValue}));
+	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}'=>${4:optionValue}));
+	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}));
-	${5}
+	${0}
 	echo CHtml::endForm();
 
 #Yii CHtml::activeDropDownList
 snippet yhaddl
-	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	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}'=>${4:optionValue}));
+	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}'=>${4:optionValue}));
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 
diff --git a/sources_non_forked/vim-snippets/snippets/yii.snippets b/sources_non_forked/vim-snippets/snippets/yii.snippets
index da48ee23..1f9fc6f7 100644
--- a/sources_non_forked/vim-snippets/snippets/yii.snippets
+++ b/sources_non_forked/vim-snippets/snippets/yii.snippets
@@ -1,22 +1,22 @@
 #Yii session offset
 snippet yse
-	Yii::app()->session['${1}'];
+	Yii::app()->session['${0}'];
 
 #Yii renderDynamic
 snippet yrd
-	$this->renderDynamic('${1:callback}');
+	$this->renderDynamic('${0:callback}');
 
 #Yii set cache
 snippet ycas
-	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5}));
+	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(${5}));
+	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('${1:file}');
+	Yii::app()->clientScript->registerCssFile('${0:file}');
 
 #Yii requestType
 snippet yreqtype
@@ -28,15 +28,15 @@ snippet yisajax
 
 #Yii translate
 snippet yt
-	Yii::t('${1:category}', '${2:message}',array(${3}));
+	Yii::t('${1:category}', '${2:message}',array(${0}));
 
 #Yii register CSS
 snippet yregc
-	Yii::app()->clientScript->registerCss('${1:id}', '${2}');
+	Yii::app()->clientScript->registerCss('${1:id}', '${0}');
 
 #Yii log
 snippet ylog
-	Yii::log('${1:msg}', '${2:info}');
+	Yii::log('${1:msg}', '${0:info}');
 
 #Yii userHostAddress
 snippet yuserip
@@ -44,15 +44,15 @@ snippet yuserip
 
 #Yii register script file
 snippet yregsf
-	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END});
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${0:END});
 
 #Yii CLinkPager
 snippet ylinkpager
-	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'}))
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${0}'}))
 
 #Yii CJSON::encode
 snippet yjec
-	CJSON::encode(${1:text});
+	CJSON::encode(${0:text});
 
 #CActiveDataProvider
 snippet yadp
@@ -67,16 +67,16 @@ snippet yadp
 			'pageSize'=>${5},
 		),
 	));
-	${6}
+	${0}
 	// $dataProvider->getData() will return a list of Post objects
 
 #Yii renderDynamic internal
 snippet yrdi
-	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value}));
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${0:value}));
 
 #Yii register script
 snippet yregs
-	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY});
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${0:READY});
 
 #Yii Flush cache
 snippet ycaf
@@ -84,11 +84,11 @@ snippet ycaf
 
 #Yii Yii::app()->request->cookies
 snippet yco
-	Yii::app()->request->cookies['${1}']
+	Yii::app()->request->cookies['${0}']
 
 #Yii user->
 snippet yuser
-	Yii::app()->user->${1}
+	Yii::app()->user->
 
 #Yii refresh
 snippet yrf
@@ -96,15 +96,15 @@ snippet yrf
 
 #Yii import
 snippet yimp
-	Yii::import('${1}');
+	Yii::import('${0}');
 
 #Yii trace
 snippet ytrace
-	Yii::trace('${1:msg}');
+	Yii::trace('${0:msg}');
 
 #Yii params
 snippet ypar
-	Yii::app()->params['${1}']
+	Yii::app()->params['${0}']
 
 #Yii isPostRequest
 snippet yispost
@@ -114,85 +114,85 @@ snippet yispost
 snippet yifisajax
 	if(Yii::app()->request->isAjaxRequest == TRUE)
 	{
-		${1}
+		${0}
 	}
 
 #Yii Yii::app()->cache->delete
 snippet ydelcache
-	Yii::app()->cache->delete('${1:key}');
+	Yii::app()->cache->delete('${0:key}');
 
 #Yii render view
 snippet yr
-	$this->render('${1:view}',array('${2:key}'=>${3:value}));
+	$this->render('${1:view}',array('${2:key}'=>${0:value}));
 
 #Yii redirect
 snippet yre
-	$this->redirect(array('${1:controller}/${2:action}'));
+	$this->redirect(array('${1:controller}/${0:action}'));
 
 #Yii Get cache
 snippet ycag
-	Yii::app()->cache->get('${1:key}');
+	Yii::app()->cache->get('${0:key}');
 
 #Yii render text
 snippet yrt
-	$this->renderText('${1}');
+	$this->renderText('${0}');
 
 #Yii render partial
 snippet yrp
-	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value}));
+	$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}'=>${4:value}));
+	${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}'=>${4:value}));
+	${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}'=>${5:value}));
+	${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}'=>${6:value}));
+	${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}'=>${4:value}));
+	${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}'=>${5:value}));
+	${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}'=>${4:value}));
+	${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}'=>${4:value}));
+	${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}'=>${5:value}));
+	${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}'=>${5:value}));
+	${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}'=>${4:value}));
+	${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}'=>${6:value}));
+	${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}'=>${4:value}));
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${0:value}));
 
 #Yii Create model class
 snippet ymodel
@@ -214,7 +214,7 @@ snippet ymodel
 		 */
 		public function tableName()
 		{
-			return '${3:table_name}';
+			return '${0:table_name}';
 		}
 
 		/**
@@ -258,7 +258,7 @@ snippet ycontroller
 	{
 		  public function action${4:Index}()
 		  {
-		      ${5}
+		      ${0}
 		  }
 
 		// -----------------------------------------------------------
@@ -294,7 +294,7 @@ snippet ycontroller
 snippet yact
 	public function action${1:Index}(${2:params})
 	{
-		${3}
+		${0}
 	}
 
 
diff --git a/sources_non_forked/vim-snippets/snippets/zsh.snippets b/sources_non_forked/vim-snippets/snippets/zsh.snippets
index b3fdb8c7..04577a96 100644
--- a/sources_non_forked/vim-snippets/snippets/zsh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/zsh.snippets
@@ -4,59 +4,59 @@ snippet #!
 
 snippet if
 	if ${1:condition}; then
-		${2:# statements}
+		${0:# statements}
 	fi
 snippet ife
 	if ${1:condition}; then
 		${2:# statements}
 	else
-		${3:# statements}
+		${0:# statements}
 	fi
 snippet eif
 	elif ${1:condition} ; then
-		${2:# statements}
+		${0:# statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack} ; do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet fore
 	for ${1:item} in ${2:list}; do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet wh
 	while ${1:condition}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet until
 	until ${1:condition}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet repeat
 	repeat ${1:integer}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet case
 	case ${1:word} in
 		${2:pattern})
-			${3};;
+			${0};;
 	esac
 snippet select
 	select ${1:answer} in ${2:choices}; do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet (
-	( ${1:#statements} )
+	( ${0:#statements} )
 snippet {
-	{ ${1:#statements} }
+	{ ${0:#statements} }
 snippet [
-	[[ ${1:test} ]]
+	[[ ${0:test} ]]
 snippet always
-	{ ${1:try} } always { ${2:always} }
+	{ ${1:try} } always { ${0:always} }
 snippet fun
 	function ${1:name} (${2:args}) {
-		${3:# body}
+		${0:# body}
 	}
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index e3871570..05b1c5c3 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -379,6 +379,12 @@ function! s:dosurround(...) " {{{1
   let strcount = (scount == 1 ? "" : scount)
   if char == '/'
     exe 'norm! '.strcount.'[/d'.strcount.']/'
+  elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>"''`]'
+    exe 'norm! T'.char
+    if getline('.')[col('.')-1] == char
+      exe 'norm! l'
+    endif
+    exe 'norm! dt'.char
   else
     exe 'norm! d'.strcount.'i'.char
   endif
@@ -403,6 +409,9 @@ function! s:dosurround(...) " {{{1
     norm! "_x
     call setreg('"','/**/',"c")
     let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','')
+  elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>]'
+    exe 'norm! F'.char
+    exe 'norm! df'.char
   else
     " One character backwards
     call search('.','bW')
diff --git a/update_plugins.py b/update_plugins.py
index 381c0161..9931b378 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -31,6 +31,8 @@ vim-snippets https://github.com/honza/vim-snippets
 vim-surround https://github.com/tpope/vim-surround
 vim-expand-region https://github.com/terryma/vim-expand-region
 vim-multiple-cursors https://github.com/terryma/vim-multiple-cursors
+vim-fugitive https://github.com/tpope/vim-fugitive
+vim-airline https://github.com/bling/vim-airline
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 6ac0d330..b9cd642f 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -99,3 +99,9 @@ let g:multi_cursor_next_key="\<C-s>"
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 vmap Si S(i_<esc>f)
 au FileType mako vmap Si S"i${ _(<esc>2f"a) }<esc>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => vim-airline config (force color)
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:airline_theme="luna"

From 9ef4d4a8ed8cb141cf41d282bf87645415735b84 Mon Sep 17 00:00:00 2001
From: Amir Salihefendic <amix@amix.dk>
Date: Sat, 16 Nov 2013 19:52:29 +0000
Subject: [PATCH 05/61] Update README.md

Updated link to ack.vim
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 775bc586..77b710d0 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [snipMate.vim](https://github.com/garbas/vim-snipmate): snipMate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim
 * [bufexplorer.zip](https://github.com/vim-scripts/bufexplorer.zip): Buffer Explorer / Browser. This plugin can be opened with `<leader+o>`
 * [NERD Tree](https://github.com/scrooloose/nerdtree): A tree explorer plugin for vim
-* [ack.vim](github.com/mileszs/ack.vim): Vim plugin for the Perl module / CLI script 'ack'
+* [ack.vim](https://github.com/mileszs/ack.vim): Vim plugin for the Perl module / CLI script 'ack'
 * [ctrlp.vim](https://github.com/kien/ctrlp.vim): Fuzzy file, buffer, mru and tag finder. In my config it's mapped to `<Ctrl+F>`, because `<Ctrl+P>` is used by YankRing
 * [mru.vim](https://github.com/vim-scripts/mru.vim): Plugin to manage Most Recently Used (MRU) files. Includes my own fork which adds syntax highlighting to MRU. This plugin can be opened with `<leader+f>`
 * [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`

From d597a38b7abbb97bde6aaa034b43b273e7b8f866 Mon Sep 17 00:00:00 2001
From: Felix Wong <felix@fawong.com>
Date: Sat, 28 Dec 2013 00:22:23 -0800
Subject: [PATCH 06/61] pretty sure .svn not needed anymore

---
 autoload/.svn/entries                         |   99 --
 autoload/.svn/text-base/fuf.vim.svn-base      | 1155 -----------------
 autoload/.svn/text-base/snipMate.vim.svn-base |  433 ------
 3 files changed, 1687 deletions(-)
 delete mode 100644 autoload/.svn/entries
 delete mode 100644 autoload/.svn/text-base/fuf.vim.svn-base
 delete mode 100644 autoload/.svn/text-base/snipMate.vim.svn-base

diff --git a/autoload/.svn/entries b/autoload/.svn/entries
deleted file mode 100644
index b5d86893..00000000
--- a/autoload/.svn/entries
+++ /dev/null
@@ -1,99 +0,0 @@
-10
-
-dir
-24
-svn://orangoo.com/vim/autoload
-svn://orangoo.com/vim
-
-
-
-2010-01-15T19:53:13.037300Z
-2
-amix
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-f0bd9f4a-2ac3-40fc-bab3-7711922a5bd5
-
-fuf
-dir
-
-fuf.vim
-file
-
-
-
-
-2009-12-03T15:37:36.000000Z
-cd795290ec0c8e87d61563c8553f6a5a
-2010-01-15T19:52:41.083563Z
-1
-amix
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-34950
-
-snipMate.vim
-file
-
-
-
-
-2010-01-15T16:14:44.000000Z
-935ed920e29eeb56885cba09798db5ce
-2010-01-15T19:52:41.083563Z
-1
-amix
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14083
-
diff --git a/autoload/.svn/text-base/fuf.vim.svn-base b/autoload/.svn/text-base/fuf.vim.svn-base
deleted file mode 100644
index 0a91d3a5..00000000
--- a/autoload/.svn/text-base/fuf.vim.svn-base
+++ /dev/null
@@ -1,1155 +0,0 @@
-"=============================================================================
-" Copyright (c) 2007-2009 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if exists('g:loaded_autoload_fuf') || v:version < 702
-  finish
-endif
-let g:loaded_autoload_fuf = 1
-
-" }}}1
-"=============================================================================
-" GLOBAL FUNCTIONS {{{1
-
-
-
-function fuf#getPathSeparator()
-  return (!&shellslash && (has('win32') || has('win64')) ? '\' : '/')
-endfunction
-
-" Removes duplicates
-" this function doesn't change list of argument.
-function fuf#unique(items)
-  let sorted = sort(a:items)
-  if len(sorted) < 2
-    return sorted
-  endif
-  let last = remove(sorted, 0)
-  let result = [last]
-  for item in sorted
-    if item != last
-      call add(result, item)
-      let last = item
-    endif
-  endfor
-  return result
-endfunction
-
-" [ [0], [1,2], [3] ] -> [ 0, 1, 2, 3 ]
-" this function doesn't change list of argument.
-function fuf#concat(items)
-  let result = []
-  for l in a:items
-    let result += l
-  endfor
-  return result
-endfunction
-
-" filter() with the maximum number of items
-" this function doesn't change list of argument.
-function fuf#filterWithLimit(items, expr, limit)
-  if a:limit <= 0
-    return filter(copy(a:items), a:expr)
-  endif
-  let result = []
-  let stride = a:limit * 3 / 2 " x1.5
-  for i in range(0, len(a:items) - 1, stride)
-    let result += filter(a:items[i : i + stride - 1], a:expr)
-    if len(result) >= a:limit
-      return remove(result, 0, a:limit - 1)
-    endif
-  endfor
-  return result
-endfunction
-
-"
-function fuf#countModifiedFiles(files, time)
-  return len(filter(copy(a:files), 'getftime(v:val) > a:time'))
-endfunction
-
-"
-function fuf#getCurrentTagFiles()
-  return sort(filter(map(tagfiles(), 'fnamemodify(v:val, '':p'')'), 'filereadable(v:val)'))
-endfunction
-
-"
-function fuf#mapToSetSerialIndex(in, offset)
-  for i in range(len(a:in))
-    let a:in[i].index = i + a:offset
-  endfor
-  return a:in
-endfunction
-
-"
-function fuf#updateMruList(mrulist, newItem, maxItem, exclude)
-  let result = copy(a:mrulist)
-  let result = filter(result,'v:val.word != a:newItem.word')
-  let result = insert(result, a:newItem)
-  let result = filter(result, 'v:val.word !~ a:exclude')
-  return result[0 : a:maxItem - 1]
-endfunction
-
-" takes suffix number. if no digits, returns -1
-function fuf#suffixNumber(str)
-  let s = matchstr(a:str, '\d\+$')
-  return (len(s) ? str2nr(s) : -1)
-endfunction
-
-" "foo/bar/buz/hoge" -> { head: "foo/bar/buz/", tail: "hoge" }
-function fuf#splitPath(path)
-  let head = matchstr(a:path, '^.*[/\\]')
-  return  {
-        \   'head' : head,
-        \   'tail' : a:path[strlen(head):]
-        \ }
-endfunction
-
-" "foo/.../bar/...hoge" -> "foo/.../bar/../../hoge"
-function fuf#expandTailDotSequenceToParentDir(pattern)
-  return substitute(a:pattern, '^\(.*[/\\]\)\?\zs\.\(\.\+\)\ze[^/\\]*$',
-        \           '\=repeat(".." . fuf#getPathSeparator(), len(submatch(2)))', '')
-endfunction
-
-"
-function fuf#hash224(str)
-  let a = 0x00000800 " shift 11 bit 
-  let b = 0x001fffff " extract 11 bit
-  let nHash = 7
-  let hashes = repeat([0], nHash)
-  for i in range(len(a:str))
-    let iHash = i % nHash
-    let hashes[iHash] = hashes[iHash] * a + hashes[iHash] / b
-    let hashes[iHash] += char2nr(a:str[i])
-  endfor
-  return join(map(hashes, 'printf("%08x", v:val)'), '')
-endfunction
-
-"
-function fuf#formatPrompt(prompt, partialMatching)
-  let indicator = (a:partialMatching ? '!' : '')
-  return substitute(a:prompt, '[]', indicator, 'g')
-endfunction
-
-"
-function fuf#getFileLines(file)
-  let bufnr = (type(a:file) ==# type(0) ? a:file : bufnr('^' . a:file . '$'))
-  let lines = getbufline(bufnr, 1, '$')
-  if !empty(lines)
-    return lines
-  endif
-  try
-    return readfile(expand(a:file))
-  catch /.*/ 
-  endtry
-  return []
-endfunction
-
-"
-function fuf#makePreviewLinesAround(lines, indices, page, maxHeight)
-  let index = ((empty(a:indices) ? 0 : a:indices[0])
-        \ + a:page * a:maxHeight) % len(a:lines)
-  if empty(a:lines) || a:maxHeight <= 0
-    return []
-  endif
-  let beg = max([0, index - a:maxHeight / 2])
-  let end = min([beg + a:maxHeight, len(a:lines)])
-  let beg = max([0, end - a:maxHeight])
-  let lines = []
-  for i in range(beg, end - 1)
-    let mark = (count(a:indices, i) ? '>' : ' ')
-    call add(lines, printf('%s%4d ', mark, i + 1) . a:lines[i])
-  endfor
-  return lines
-endfunction
-
-" a:file: a path string or a buffer number
-function fuf#makePreviewLinesForFile(file, count, maxHeight)
-  let lines = fuf#getFileLines(a:file)
-  if empty(lines)
-    return []
-  endif
-  let bufnr = (type(a:file) ==# type(0) ? a:file : bufnr('^' . a:file . '$'))
-  if exists('s:bufferCursorPosMap[bufnr]')
-    let indices = [s:bufferCursorPosMap[bufnr][1] - 1]
-  else
-    let indices = []
-  endif
-  return fuf#makePreviewLinesAround(
-        \ lines, indices, a:count, a:maxHeight)
-endfunction
-
-"
-function fuf#echoWithHl(msg, hl)
-  execute "echohl " . a:hl
-  echo a:msg
-  echohl None
-endfunction
-
-"
-function fuf#inputHl(prompt, text, hl)
-  execute "echohl " . a:hl
-  let s = input(a:prompt, a:text)
-  echohl None
-  return s
-endfunction
-
-"
-function fuf#openBuffer(bufNr, mode, reuse)
-  if a:reuse && ((a:mode == s:OPEN_TYPE_SPLIT &&
-        \         s:moveToWindowOfBufferInCurrentTabPage(a:bufNr)) ||
-        \        (a:mode == s:OPEN_TYPE_VSPLIT &&
-        \         s:moveToWindowOfBufferInCurrentTabPage(a:bufNr)) ||
-        \        (a:mode == s:OPEN_TYPE_TAB &&
-        \         s:moveToWindowOfBufferInOtherTabPage(a:bufNr)))
-    return
-  endif
-  execute printf({
-        \   s:OPEN_TYPE_CURRENT : '%sbuffer'          ,
-        \   s:OPEN_TYPE_SPLIT   : '%ssbuffer'         ,
-        \   s:OPEN_TYPE_VSPLIT  : 'vertical %ssbuffer',
-        \   s:OPEN_TYPE_TAB     : 'tab %ssbuffer'     ,
-        \ }[a:mode], a:bufNr)
-endfunction
-
-"
-function fuf#openFile(path, mode, reuse)
-  let bufNr = bufnr('^' . a:path . '$')
-  if bufNr > -1
-    call fuf#openBuffer(bufNr, a:mode, a:reuse)
-  else
-    execute {
-          \   s:OPEN_TYPE_CURRENT : 'edit '   ,
-          \   s:OPEN_TYPE_SPLIT   : 'split '  ,
-          \   s:OPEN_TYPE_VSPLIT  : 'vsplit ' ,
-          \   s:OPEN_TYPE_TAB     : 'tabedit ',
-          \ }[a:mode] . fnameescape(fnamemodify(a:path, ':~:.'))
-  endif
-endfunction
-
-"
-function fuf#openTag(tag, mode)
-  execute {
-        \   s:OPEN_TYPE_CURRENT : 'tjump '          ,
-        \   s:OPEN_TYPE_SPLIT   : 'stjump '         ,
-        \   s:OPEN_TYPE_VSPLIT  : 'vertical stjump ',
-        \   s:OPEN_TYPE_TAB     : 'tab stjump '     ,
-        \ }[a:mode] . a:tag
-endfunction
-
-"
-function fuf#openHelp(tag, mode)
-  execute {
-        \   s:OPEN_TYPE_CURRENT : 'help '         ,
-        \   s:OPEN_TYPE_SPLIT   : 'help '         ,
-        \   s:OPEN_TYPE_VSPLIT  : 'vertical help ',
-        \   s:OPEN_TYPE_TAB     : 'tab help '   ,
-        \ }[a:mode] . a:tag
-endfunction
-
-"
-function fuf#prejump(mode)
-  execute {
-        \   s:OPEN_TYPE_CURRENT : ''         ,
-        \   s:OPEN_TYPE_SPLIT   : 'split'    ,
-        \   s:OPEN_TYPE_VSPLIT  : 'vsplit'   ,
-        \   s:OPEN_TYPE_TAB     : 'tab split',
-        \ }[a:mode] 
-endfunction
-
-"
-function fuf#compareRanks(i1, i2)
-  if exists('a:i1.ranks') && exists('a:i2.ranks')
-    for i in range(min([len(a:i1.ranks), len(a:i2.ranks)]))
-      if     a:i1.ranks[i] > a:i2.ranks[i]
-        return +1
-      elseif a:i1.ranks[i] < a:i2.ranks[i]
-        return -1
-      endif
-    endfor
-  endif
-  return 0
-endfunction
-
-"
-function fuf#makePathItem(fname, menu, appendsDirSuffix)
-  let pathPair = fuf#splitPath(a:fname)
-  let dirSuffix = (a:appendsDirSuffix && isdirectory(a:fname)
-        \          ? fuf#getPathSeparator()
-        \          : '')
-  return {
-        \   'word'              : a:fname . dirSuffix,
-        \   'wordForPrimaryHead': s:toLowerForIgnoringCase(pathPair.head),
-        \   'wordForPrimaryTail': s:toLowerForIgnoringCase(pathPair.tail),
-        \   'wordForBoundary'   : s:toLowerForIgnoringCase(s:getWordBoundaries(pathPair.tail)),
-        \   'wordForRefining'   : s:toLowerForIgnoringCase(a:fname . dirSuffix),
-        \   'wordForRank'       : s:toLowerForIgnoringCase(pathPair.tail),
-        \   'menu'              : a:menu,
-        \ }
-endfunction
-
-"
-function fuf#makeNonPathItem(word, menu)
-  let wordL = s:toLowerForIgnoringCase(a:word)
-  return {
-        \   'word'           : a:word,
-        \   'wordForPrimary' : wordL,
-        \   'wordForBoundary': s:toLowerForIgnoringCase(s:getWordBoundaries(a:word)),
-        \   'wordForRefining': wordL,
-        \   'wordForRank'    : wordL,
-        \   'menu'           : a:menu,
-        \ }
-endfunction
-
-"
-function s:interpretPrimaryPatternForPathTail(pattern)
-  let pattern = fuf#expandTailDotSequenceToParentDir(a:pattern)
-  let pairL = fuf#splitPath(s:toLowerForIgnoringCase(pattern))
-  return {
-        \   'primary'       : pattern,
-        \   'primaryForRank': pairL.tail,
-        \   'matchingPairs' : [['v:val.wordForPrimaryTail', pairL.tail],],
-        \ }
-endfunction
-
-"
-function s:interpretPrimaryPatternForPath(pattern)
-  let pattern = fuf#expandTailDotSequenceToParentDir(a:pattern)
-  let patternL = s:toLowerForIgnoringCase(pattern)
-  let pairL = fuf#splitPath(patternL)
-  if g:fuf_splitPathMatching
-    let matches = [
-        \     ['v:val.wordForPrimaryHead', pairL.head],
-        \     ['v:val.wordForPrimaryTail', pairL.tail],
-        \   ]
-  else
-    let matches = [
-          \     ['v:val.wordForPrimaryHead . v:val.wordForPrimaryTail', patternL],
-          \   ]
-  endif
-  return {
-        \   'primary'       : pattern,
-        \   'primaryForRank': pairL.tail,
-        \   'matchingPairs' : matches,
-        \ }
-endfunction
-
-"
-function s:interpretPrimaryPatternForNonPath(pattern)
-  let patternL = s:toLowerForIgnoringCase(a:pattern)
-  return {
-        \   'primary'       : a:pattern,
-        \   'primaryForRank': patternL,
-        \   'matchingPairs' : [['v:val.wordForPrimary', patternL],],
-        \ }
-endfunction
-
-"
-function fuf#makePatternSet(patternBase, interpreter, partialMatching)
-  let MakeMatchingExpr = function(a:partialMatching
-        \                         ? 's:makePartialMatchingExpr'
-        \                         : 's:makeFuzzyMatchingExpr')
-  let [primary; refinings] = split(a:patternBase, g:fuf_patternSeparator, 1)
-  let elements = call(a:interpreter, [primary])
-  let primaryExprs  = map(elements.matchingPairs, 'MakeMatchingExpr(v:val[0], v:val[1])')
-  let refiningExprs = map(refinings, 's:makeRefiningExpr(v:val)')
-  return  {
-        \   'primary'       : elements.primary,
-        \   'primaryForRank': elements.primaryForRank,
-        \   'filteringExpr' : join(primaryExprs + refiningExprs, ' && '),
-        \ }
-endfunction
-
-"
-function fuf#enumExpandedDirsEntries(dir, exclude)
-  " Substitutes "\" because on Windows, "**\" doesn't include ".\",
-  " but "**/" include "./". I don't know why.
-  let dirNormalized = substitute(a:dir, '\', '/', 'g')
-  let entries = split(glob(dirNormalized . "*" ), "\n") +
-        \       split(glob(dirNormalized . ".*"), "\n")
-  " removes "*/." and "*/.."
-  call filter(entries, 'v:val !~ ''\v(^|[/\\])\.\.?$''')
-  call map(entries, 'fuf#makePathItem(v:val, "", 1)')
-  if len(a:exclude)
-    call filter(entries, 'v:val.word !~ a:exclude')
-  endif
-  return entries
-endfunction
-
-"
-function fuf#mapToSetAbbrWithSnippedWordAsPath(items)
-  let maxLenStats = {}
-  call map(a:items, 's:makeFileAbbrInfo(v:val, maxLenStats)')
-  let snippedHeads =
-        \ map(maxLenStats, 's:getSnippedHead(v:key[: -2], v:val)')
-  return map(a:items, 's:setAbbrWithFileAbbrData(v:val, snippedHeads)')
-endfunction
-
-"
-function fuf#setAbbrWithFormattedWord(item, abbrIndex)
-  let lenMenu = (exists('a:item.menu') ? len(a:item.menu) + 2 : 0)
-  let abbrPrefix = (exists('a:item.abbrPrefix') ? a:item.abbrPrefix : '')
-  let a:item.abbr = abbrPrefix . a:item.word
-  if a:abbrIndex
-    let a:item.abbr = printf('%4d: ', a:item.index) . a:item.abbr
-  endif
-  let a:item.abbr = s:snipTail(a:item.abbr, g:fuf_maxMenuWidth - lenMenu, s:ABBR_SNIP_MASK)
-  return a:item
-endfunction
-
-"
-function fuf#defineLaunchCommand(CmdName, modeName, prefixInitialPattern)
-  execute printf('command! -bang -narg=? %s call fuf#launch(%s, %s . <q-args>, len(<q-bang>))',
-        \        a:CmdName, string(a:modeName), a:prefixInitialPattern)
-endfunction
-
-"
-function fuf#defineKeyMappingInHandler(key, func)
-    " hacks to be able to use feedkeys().
-    execute printf(
-          \ 'inoremap <buffer> <silent> %s <C-r>=fuf#getRunningHandler().%s ? "" : ""<CR>',
-          \ a:key, a:func)
-endfunction
-
-"
-function fuf#launch(modeName, initialPattern, partialMatching)
-  if exists('s:runningHandler')
-    call fuf#echoWithHl('FuzzyFinder is running.', 'WarningMsg')
-  endif
-  if count(g:fuf_modes, a:modeName) == 0
-    echoerr 'This mode is not available: ' . a:modeName
-    return
-  endif
-  let s:runningHandler = fuf#{a:modeName}#createHandler(copy(s:handlerBase))
-  let s:runningHandler.info = fuf#loadInfoFile(s:runningHandler.getModeName())
-  let s:runningHandler.partialMatching = a:partialMatching
-  let s:runningHandler.bufNrPrev = bufnr('%')
-  let s:runningHandler.lastCol = -1
-  call s:runningHandler.onModeEnterPre()
-  call s:setTemporaryGlobalOption('completeopt', 'menuone')
-  call s:setTemporaryGlobalOption('ignorecase', 0)
-  if s:runningHandler.getPreviewHeight() > 0
-    call s:setTemporaryGlobalOption(
-          \ 'cmdheight', s:runningHandler.getPreviewHeight() + 1)
-  endif
-  call s:activateFufBuffer()
-  augroup FufLocal
-    autocmd!
-    autocmd CursorMovedI <buffer>        call s:runningHandler.onCursorMovedI()
-    autocmd InsertLeave  <buffer> nested call s:runningHandler.onInsertLeave()
-  augroup END
-  for [key, func] in [
-        \   [ g:fuf_keyOpen          , 'onCr(' . s:OPEN_TYPE_CURRENT . ', 0)' ],
-        \   [ g:fuf_keyOpenSplit     , 'onCr(' . s:OPEN_TYPE_SPLIT   . ', 0)' ],
-        \   [ g:fuf_keyOpenVsplit    , 'onCr(' . s:OPEN_TYPE_VSPLIT  . ', 0)' ],
-        \   [ g:fuf_keyOpenTabpage   , 'onCr(' . s:OPEN_TYPE_TAB     . ', 0)' ],
-        \   [ '<BS>'                 , 'onBs()'                               ],
-        \   [ '<C-h>'                , 'onBs()'                               ],
-        \   [ g:fuf_keyPreview       , 'onPreviewBase()'                      ],
-        \   [ g:fuf_keyNextMode      , 'onSwitchMode(+1)'                     ],
-        \   [ g:fuf_keyPrevMode      , 'onSwitchMode(-1)'                     ],
-        \   [ g:fuf_keySwitchMatching, 'onSwitchMatching()'                   ],
-        \   [ g:fuf_keyPrevPattern   , 'onRecallPattern(+1)'                  ],
-        \   [ g:fuf_keyNextPattern   , 'onRecallPattern(-1)'                  ],
-        \ ]
-    call fuf#defineKeyMappingInHandler(key, func)
-  endfor
-  " Starts Insert mode and makes CursorMovedI event now. Command prompt is
-  " needed to forces a completion menu to update every typing.
-  call setline(1, s:runningHandler.getPrompt() . a:initialPattern)
-  call s:runningHandler.onModeEnterPost()
-  call feedkeys("A", 'n') " startinsert! does not work in InsertLeave event handler
-  redraw
-endfunction
-
-"
-function fuf#loadInfoFile(modeName)
-  try
-    let lines = readfile(expand(g:fuf_infoFile))
-    " compatibility check
-    if count(lines, s:INFO_FILE_VERSION_LINE) == 0
-      call s:warnOldInfoFile()
-      let g:fuf_infoFile = ''
-      throw 1
-    endif
-  catch /.*/ 
-    let lines = []
-  endtry
-  let s:lastInfoMap = s:deserializeInfoMap(lines)
-  if !exists('s:lastInfoMap[a:modeName]')
-    let s:lastInfoMap[a:modeName] = {}
-  endif
-  return extend(s:lastInfoMap[a:modeName], { 'data': [], 'stats': [] }, 'keep')
-endfunction
-
-" if a:modeName is empty, a:info is treated as a map of information
-function fuf#saveInfoFile(modeName, info)
-  if empty(a:modeName)
-    let s:lastInfoMap = a:info
-  else
-    let s:lastInfoMap[a:modeName] = a:info
-  endif
-  let lines = [ s:INFO_FILE_VERSION_LINE ] + s:serializeInfoMap(s:lastInfoMap)
-  try
-    call writefile(lines, expand(g:fuf_infoFile))
-  catch /.*/ 
-  endtry
-endfunction
-
-"
-function fuf#editInfoFile()
-  new
-  silent file `='[fuf-info]'`
-  let s:bufNrInfo = bufnr('%')
-  setlocal filetype=vim
-  setlocal bufhidden=delete
-  setlocal buftype=acwrite
-  setlocal noswapfile
-  augroup FufInfo
-    autocmd!
-    autocmd BufWriteCmd <buffer> call s:onBufWriteCmdInfoFile()
-  augroup END
-  execute '0read ' . expand(g:fuf_infoFile)
-  setlocal nomodified
-endfunction
-
-" 
-function fuf#getRunningHandler()
-  return s:runningHandler
-endfunction
-
-" 
-function fuf#onComplete(findstart, base)
-  return s:runningHandler.onComplete(a:findstart, a:base)
-endfunction
-
-" }}}1
-"=============================================================================
-" LOCAL FUNCTIONS/VARIABLES {{{1
-
-let s:INFO_FILE_VERSION_LINE = "VERSION\t300"
-let s:ABBR_SNIP_MASK = '...'
-let s:OPEN_TYPE_CURRENT = 1
-let s:OPEN_TYPE_SPLIT   = 2
-let s:OPEN_TYPE_VSPLIT  = 3
-let s:OPEN_TYPE_TAB     = 4
-
-" wildcard -> regexp
-function s:convertWildcardToRegexp(expr)
-  let re = escape(a:expr, '\')
-  for [pat, sub] in [ [ '*', '\\.\\*' ], [ '?', '\\.' ], [ '[', '\\[' ], ]
-    let re = substitute(re, pat, sub, 'g')
-  endfor
-  return '\V' . re
-endfunction
-
-" a:pattern: 'str' -> '\V\.\*s\.\*t\.\*r\.\*'
-function s:makeFuzzyMatchingExpr(target, pattern)
-  let wi = ''
-  for c in split(a:pattern, '\zs')
-    if wi =~# '[^*?]$' && c !~ '[*?]'
-      let wi .= '*'
-    endif
-    let wi .= c
-  endfor
-  return s:makePartialMatchingExpr(a:target, wi)
-endfunction
-
-" a:pattern: 'str' -> '\Vstr'
-"            'st*r' -> '\Vst\.\*r'
-function s:makePartialMatchingExpr(target, pattern)
-  let patternMigemo = s:makeAdditionalMigemoPattern(a:pattern)
-  if a:pattern !~ '[*?]' && empty(patternMigemo)
-    " NOTE: stridx is faster than regexp matching
-    return 'stridx(' . a:target . ', ' . string(a:pattern) . ') >= 0'
-  endif
-  return a:target . ' =~# ' .
-        \ string(s:convertWildcardToRegexp(a:pattern)) . patternMigemo
-endfunction
-
-" 
-function s:makeRefiningExpr(pattern)
-  let expr = s:makePartialMatchingExpr('v:val.wordForRefining', a:pattern)
-  if a:pattern =~# '\D'
-    return expr
-  else
-    return '(' . expr . ' || v:val.index == ' . string(a:pattern) . ')'
-  endif
-endfunction
-
-" 
-function s:makeAdditionalMigemoPattern(pattern)
-  if !g:fuf_useMigemo || a:pattern =~# '[^\x01-\x7e]'
-    return ''
-  endif
-  return '\|\m' . substitute(migemo(a:pattern), '\\_s\*', '.*', 'g')
-endfunction
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function s:snipHead(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  return a:mask . a:str[-a:len + len(a:mask):]
-endfunction
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function s:snipTail(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  return a:str[:a:len - 1 - len(a:mask)] . a:mask
-endfunction
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function s:snipMid(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  let len_head = (a:len - len(a:mask)) / 2
-  let len_tail = a:len - len(a:mask) - len_head
-  return  (len_head > 0 ? a:str[: len_head - 1] : '') . a:mask .
-        \ (len_tail > 0 ? a:str[-len_tail :] : '')
-endfunction
-
-"
-function s:getWordBoundaries(word)
-  return substitute(a:word, '\a\zs\l\+\|\zs\A', '', 'g')
-endfunction
-
-"
-function s:toLowerForIgnoringCase(str)
-    return (g:fuf_ignoreCase ? tolower(a:str) : a:str)
-endfunction
-
-"
-function s:setRanks(item, pattern, exprBoundary, stats)
-  "let word2 = substitute(a:eval_word, '\a\zs\l\+\|\zs\A', '', 'g')
-  let a:item.ranks = [
-        \   s:evaluateLearningRank(a:item.word, a:stats),
-        \   -s:scoreSequentialMatching(a:item.wordForRank, a:pattern),
-        \   -s:scoreBoundaryMatching(a:item.wordForBoundary, 
-        \                            a:pattern, a:exprBoundary),
-        \   a:item.index,
-        \ ]
-  return a:item
-endfunction
-
-" 
-function s:evaluateLearningRank(word, stats)
-  for i in range(len(a:stats))
-    if a:stats[i].word ==# a:word
-      return i
-    endif
-  endfor
-  return len(a:stats)
-endfunction
-
-let g:s = ""
-" range of return value is [0.0, 1.0]
-function s:scoreSequentialMatching(word, pattern)
-  if empty(a:pattern)
-    return 0.0
-  endif
-  let pos = stridx(a:word, a:pattern)
-  if pos < 0
-    return 0.0
-  endif
-  let lenRest = len(a:word) - len(a:pattern) - pos
-  return (pos == 0 ? 0.5 : 0.0) + 0.5 / (lenRest + 1)
-endfunction
-
-" range of return value is [0.0, 1.0]
-function s:scoreBoundaryMatching(wordForBoundary, pattern, exprBoundary)
-  if empty(a:pattern)
-    return 0.0
-  endif
-  if !eval(a:exprBoundary)
-    return 0
-  endif
-  return 0.5 + 0.5 * s:scoreSequentialMatching(a:wordForBoundary, a:pattern)
-endfunction
-
-"
-function s:highlightPrompt(prompt)
-  syntax clear
-  execute printf('syntax match %s /^\V%s/', g:fuf_promptHighlight, escape(a:prompt, '\'))
-endfunction
-
-"
-function s:highlightError()
-  syntax clear
-  syntax match Error  /^.*$/
-endfunction
-
-" returns 0 if the buffer is not found.
-function s:moveToWindowOfBufferInCurrentTabPage(bufNr)
-  if count(tabpagebuflist(), a:bufNr) == 0
-    return 0
-  endif
-  execute bufwinnr(a:bufNr) . 'wincmd w'
-  return 1
-endfunction
-
-" returns 0 if the buffer is not found.
-function s:moveToOtherTabPageOpeningBuffer(bufNr)
-  for tabNr in range(1, tabpagenr('$'))
-    if tabNr != tabpagenr() && count(tabpagebuflist(tabNr), a:bufNr) > 0
-      execute 'tabnext ' . tabNr
-      return 1
-    endif
-  endfor
-  return 0
-endfunction
-
-" returns 0 if the buffer is not found.
-function s:moveToWindowOfBufferInOtherTabPage(bufNr)
-  if !s:moveToOtherTabPageOpeningBuffer(a:bufNr)
-    return 0
-  endif
-  return s:moveToWindowOfBufferInCurrentTabPage(a:bufNr)
-endfunction
-
-"
-function s:expandAbbrevMap(pattern, abbrevMap)
-  let result = [a:pattern]
-  for [pattern, subs] in items(a:abbrevMap)
-    let exprs = result
-    let result = []
-    for expr in exprs
-      let result += map(copy(subs), 'substitute(expr, pattern, escape(v:val, ''\''), "g")')
-    endfor
-  endfor
-  return fuf#unique(result)
-endfunction
-
-"
-function s:makeFileAbbrInfo(item, maxLenStats)
-  let head = matchstr(a:item.word, '^.*[/\\]\ze.')
-  let a:item.abbr = { 'head' : head,
-        \             'tail' : a:item.word[strlen(head):],
-        \             'key' : head . '.',
-        \             'prefix' : printf('%4d: ', a:item.index), }
-  if exists('a:item.abbrPrefix')
-    let a:item.abbr.prefix .= a:item.abbrPrefix
-  endif
-  let len = len(a:item.abbr.prefix) + len(a:item.word) +
-        \   (exists('a:item.menu') ? len(a:item.menu) + 2 : 0)
-  if !exists('a:maxLenStats[a:item.abbr.key]') || len > a:maxLenStats[a:item.abbr.key]
-    let a:maxLenStats[a:item.abbr.key] = len
-  endif
-  return a:item
-endfunction
-
-"
-function s:getSnippedHead(head, baseLen)
-  return s:snipMid(a:head, len(a:head) + g:fuf_maxMenuWidth - a:baseLen, s:ABBR_SNIP_MASK)
-endfunction
-
-"
-function s:setAbbrWithFileAbbrData(item, snippedHeads)
-  let lenMenu = (exists('a:item.menu') ? len(a:item.menu) + 2 : 0)
-  let abbr = a:item.abbr.prefix . a:snippedHeads[a:item.abbr.key] . a:item.abbr.tail
-  let a:item.abbr = s:snipTail(abbr, g:fuf_maxMenuWidth - lenMenu, s:ABBR_SNIP_MASK)
-  return a:item
-endfunction
-
-let s:bufNrFuf = -1
-
-"
-function s:openFufBuffer()
-  if !bufexists(s:bufNrFuf)
-    topleft 1new
-    silent file `='[fuf]'`
-    let s:bufNrFuf = bufnr('%')
-  elseif bufwinnr(s:bufNrFuf) == -1
-    topleft 1split
-    execute 'silent ' . s:bufNrFuf . 'buffer'
-    delete _
-  elseif bufwinnr(s:bufNrFuf) != bufwinnr('%')
-    execute bufwinnr(s:bufNrFuf) . 'wincmd w'
-  endif
-endfunction
-
-function s:setLocalOptionsForFufBuffer()
-  setlocal filetype=fuf
-  setlocal bufhidden=delete
-  setlocal buftype=nofile
-  setlocal noswapfile
-  setlocal nobuflisted
-  setlocal modifiable
-  setlocal nocursorline   " for highlighting
-  setlocal nocursorcolumn " for highlighting
-  setlocal omnifunc=fuf#onComplete
-endfunction
-
-"
-function s:activateFufBuffer()
-  " lcd . : To avoid the strange behavior that unnamed buffer changes its cwd
-  "         if 'autochdir' was set on.
-  lcd .
-  let cwd = getcwd()
-  call s:openFufBuffer()
-  " lcd ... : countermeasure against auto-cd script
-  lcd `=cwd`
-  call s:setLocalOptionsForFufBuffer()
-  redraw " for 'lazyredraw'
-  if exists(':AcpLock')
-    AcpLock
-  elseif exists(':AutoComplPopLock')
-    AutoComplPopLock
-  endif
-endfunction
-
-"
-function s:deactivateFufBuffer()
-  if exists(':AcpUnlock')
-    AcpUnlock
-  elseif exists(':AutoComplPopUnlock')
-    AutoComplPopUnlock
-  endif
-  " must close after returning to previous window
-  wincmd p
-  execute s:bufNrFuf . 'bdelete'
-endfunction
-
-let s:originalGlobalOptions = {}
-
-" 
-function s:setTemporaryGlobalOption(name, value)
-  call extend(s:originalGlobalOptions, { a:name : eval('&' . a:name) }, 'keep')
-  execute printf('let &%s = a:value', a:name)
-endfunction
-
-"
-function s:restoreTemporaryGlobalOptions()
-  for [name, value] in items(s:originalGlobalOptions)
-    execute printf('let &%s = value', name)
-  endfor
-  let s:originalGlobalOptions = {}
-endfunction
-
-"
-function s:warnOldInfoFile()
-  call fuf#echoWithHl(printf("=================================================================\n" .
-        \                    "  Sorry, but your information file for FuzzyFinder is no longer  \n" .
-        \                    "  compatible with this version of FuzzyFinder. Please remove     \n" .
-        \                    "  %-63s\n" .
-        \                    "=================================================================\n" ,
-        \                    '"' . expand(g:fuf_infoFile) . '".'),
-        \           'WarningMsg')
-  echohl Question
-  call input('Press Enter')
-  echohl None
-endfunction
-
-"
-function s:serializeInfoMap(infoMap)
-  let lines = []
-  for [m, info] in items(a:infoMap)
-    for [key, value] in items(info)
-      let lines += map(copy(value), 'm . "\t" . key . "\t" . string(v:val)')
-    endfor
-  endfor
-  return lines
-endfunction
-
-"
-function s:deserializeInfoMap(lines)
-  let infoMap = {}
-  for e in filter(map(a:lines, 'matchlist(v:val, ''^\v(\S+)\s+(\S+)\s+(.+)$'')'), '!empty(v:val)')
-    if !exists('infoMap[e[1]]')
-      let infoMap[e[1]] = {}
-    endif
-    if !exists('infoMap[e[1]][e[2]]')
-      let infoMap[e[1]][e[2]] = []
-    endif
-    call add(infoMap[e[1]][e[2]], eval(e[3]))
-  endfor
-  return infoMap
-endfunction
-
-"
-function s:onBufWriteCmdInfoFile()
-  call fuf#saveInfoFile('', s:deserializeInfoMap(getline(1, '$')))
-  setlocal nomodified
-  execute printf('%dbdelete! ', s:bufNrInfo)
-  echo "Information file updated"
-endfunction
-
-" }}}1
-"=============================================================================
-" s:handlerBase {{{1
-
-let s:handlerBase = {}
-
-"-----------------------------------------------------------------------------
-" PURE VIRTUAL FUNCTIONS {{{2
-"
-" "
-" s:handler.getModeName()
-" 
-" "
-" s:handler.getPrompt()
-" 
-" " returns true if the mode deals with file paths.
-" s:handler.targetsPath()
-"
-" "
-" s:handler.getCompleteItems(patternSet)
-" 
-" "
-" s:handler.onOpen(word, mode)
-" 
-" " Before entering FuzzyFinder buffer. This function should return in a short time.
-" s:handler.onModeEnterPre()
-"
-" " After entering FuzzyFinder buffer.
-" s:handler.onModeEnterPost()
-"
-" " After leaving FuzzyFinder buffer.
-" s:handler.onModeLeavePost(opened)
-"
-" }}}2
-"-----------------------------------------------------------------------------
-
-"
-function s:handlerBase.concretize(deriv)
-  call extend(self, a:deriv, 'error')
-  return self
-endfunction
-
-"
-function s:handlerBase.addStat(pattern, word)
-  let stat = { 'pattern' : a:pattern, 'word' : a:word }
-  call filter(self.info.stats, 'v:val !=# stat')
-  call insert(self.info.stats, stat)
-  let self.info.stats = self.info.stats[0 : g:fuf_learningLimit - 1]
-endfunction
-
-"
-function s:handlerBase.getMatchingCompleteItems(patternBase)
-  let MakeMatchingExpr = function(self.partialMatching
-        \                         ? 's:makePartialMatchingExpr'
-        \                         : 's:makeFuzzyMatchingExpr')
-  let patternSet = self.makePatternSet(a:patternBase)
-  let exprBoundary = s:makeFuzzyMatchingExpr('a:wordForBoundary', patternSet.primaryForRank)
-  let stats = filter(
-        \ copy(self.info.stats), 'v:val.pattern ==# patternSet.primaryForRank')
-  let items = self.getCompleteItems(patternSet.primary)
-  " NOTE: In order to know an excess, plus 1 to limit number
-  let items = fuf#filterWithLimit(
-        \ items, patternSet.filteringExpr, g:fuf_enumeratingLimit + 1)
-  return map(items,
-        \ 's:setRanks(v:val, patternSet.primaryForRank, exprBoundary, stats)')
-endfunction
-
-"
-function s:handlerBase.onComplete(findstart, base)
-  if a:findstart
-    return 0
-  elseif  !self.existsPrompt(a:base)
-    return []
-  endif
-  call s:highlightPrompt(self.getPrompt())
-  let items = []
-  for patternBase in s:expandAbbrevMap(self.removePrompt(a:base), g:fuf_abbrevMap)
-    let items += self.getMatchingCompleteItems(patternBase)
-    if len(items) > g:fuf_enumeratingLimit
-      let items = items[ : g:fuf_enumeratingLimit - 1]
-      call s:highlightError()
-      break
-    endif
-  endfor
-  if empty(items)
-    call s:highlightError()
-  else
-    call sort(items, 'fuf#compareRanks')
-    call feedkeys("\<C-p>\<Down>", 'n')
-    let self.lastFirstWord = items[0].word
-  endif
-  return items
-endfunction
-
-"
-function s:handlerBase.existsPrompt(line)
-  return  strlen(a:line) >= strlen(self.getPrompt()) &&
-        \ a:line[:strlen(self.getPrompt()) -1] ==# self.getPrompt()
-endfunction
-
-"
-function s:handlerBase.removePrompt(line)
-  return a:line[(self.existsPrompt(a:line) ? strlen(self.getPrompt()) : 0):]
-endfunction
-
-"
-function s:handlerBase.restorePrompt(line)
-  let i = 0
-  while i < len(self.getPrompt()) && i < len(a:line) && self.getPrompt()[i] ==# a:line[i]
-    let i += 1
-  endwhile
-  return self.getPrompt() . a:line[i : ]
-endfunction
-
-"
-function s:handlerBase.onCursorMovedI()
-  if !self.existsPrompt(getline('.'))
-    call setline('.', self.restorePrompt(getline('.')))
-    call feedkeys("\<End>", 'n')
-  elseif col('.') <= len(self.getPrompt())
-    " if the cursor is moved before command prompt
-    call feedkeys(repeat("\<Right>", len(self.getPrompt()) - col('.') + 1), 'n')
-  elseif col('.') > strlen(getline('.')) && col('.') != self.lastCol
-    " if the cursor is placed on the end of the line and has been actually moved.
-    let self.lastCol = col('.')
-    let self.lastPattern = self.removePrompt(getline('.'))
-    call feedkeys("\<C-x>\<C-o>", 'n')
-  endif
-endfunction
-
-"
-function s:handlerBase.onInsertLeave()
-  unlet s:runningHandler
-  let lastPattern = self.removePrompt(getline('.'))
-  call s:restoreTemporaryGlobalOptions()
-  call s:deactivateFufBuffer()
-  call fuf#saveInfoFile(self.getModeName(), self.info)
-  let fOpen = exists('s:reservedCommand')
-  if fOpen
-    call self.onOpen(s:reservedCommand[0], s:reservedCommand[1])
-    unlet s:reservedCommand
-  endif
-  call self.onModeLeavePost(fOpen)
-  if exists('s:reservedMode')
-    call fuf#launch(s:reservedMode, lastPattern, self.partialMatching)
-    unlet s:reservedMode
-  endif
-endfunction
-
-"
-function s:handlerBase.onCr(openType, fCheckDir)
-  if pumvisible()
-    call feedkeys(printf("\<C-y>\<C-r>=fuf#getRunningHandler().onCr(%d, %d) ? '' : ''\<CR>",
-          \              a:openType, self.targetsPath()), 'n')
-    return
-  endif
-  if !empty(self.lastPattern)
-    call self.addStat(self.lastPattern, self.removePrompt(getline('.')))
-  endif
-  if a:fCheckDir && getline('.') =~# '[/\\]$'
-    " To clear i_<C-r> expression (fuf#getRunningHandler().onCr...)
-    echo ''
-    return
-  endif
-  let s:reservedCommand = [self.removePrompt(getline('.')), a:openType]
-  call feedkeys("\<Esc>", 'n') " stopinsert behavior is strange...
-endfunction
-
-"
-function s:handlerBase.onBs()
-  let pattern = self.removePrompt(getline('.')[ : col('.') - 2])
-  if empty(pattern)
-    let numBs = 0
-  elseif !g:fuf_smartBs
-    let numBs = 1
-  elseif pattern[-len(g:fuf_patternSeparator) : ] ==# g:fuf_patternSeparator
-    let numBs = len(split(pattern, g:fuf_patternSeparator, 1)[-2])
-          \   + len(g:fuf_patternSeparator)
-  elseif self.targetsPath() && pattern[-1 : ] =~# '[/\\]'
-    let numBs = len(matchstr(pattern, '[^/\\]*.$'))
-  else
-    let numBs = 1
-  endif
-  call feedkeys((pumvisible() ? "\<C-e>" : "") . repeat("\<BS>", numBs), 'n')
-endfunction
-
-"
-function s:handlerBase.onPreviewBase()
-  if self.getPreviewHeight() <= 0
-    return
-  elseif !pumvisible()
-    return
-  elseif !self.existsPrompt(getline('.'))
-    let word = self.removePrompt(getline('.'))
-  elseif !exists('self.lastFirstWord')
-    return
-  else
-    let word = self.lastFirstWord
-  endif
-  redraw
-  if exists('self.lastPreviewInfo') && self.lastPreviewInfo.word ==# word
-    let self.lastPreviewInfo.count += 1
-  else
-    let self.lastPreviewInfo = {'word': word, 'count': 0}
-  endif
-  let lines = self.makePreviewLines(word, self.lastPreviewInfo.count)
-  let lines = lines[: self.getPreviewHeight() - 1]
-  call map(lines, 'substitute(v:val, "\t", repeat(" ", &tabstop), "g")')
-  call map(lines, 's:snipTail(v:val, &columns - 1, s:ABBR_SNIP_MASK)')
-  echo join(lines, "\n")
-endfunction
-
-"
-function s:handlerBase.onSwitchMode(shift)
-  let modes = copy(g:fuf_modes)
-  call map(modes, '{ "ranks": [ fuf#{v:val}#getSwitchOrder(), v:val ] }')
-  call filter(modes, 'v:val.ranks[0] >= 0')
-  call sort(modes, 'fuf#compareRanks')
-  let s:reservedMode = self.getModeName()
-  for i in range(len(modes))
-    if modes[i].ranks[1] ==# self.getModeName()
-      let s:reservedMode = modes[(i + a:shift) % len(modes)].ranks[1]
-      break
-    endif
-  endfor
-  call feedkeys("\<Esc>", 'n') " stopinsert doesn't work.
-endfunction
-
-"
-function s:handlerBase.onSwitchMatching()
-  let self.partialMatching = !self.partialMatching
-  let self.lastCol = -1
-  call setline('.', self.restorePrompt(self.lastPattern))
-  call feedkeys("\<End>", 'n')
-  "call self.onCursorMovedI()
-endfunction
-
-"
-function s:handlerBase.onRecallPattern(shift)
-  let patterns = map(copy(self.info.stats), 'v:val.pattern')
-  if !exists('self.indexRecall')
-    let self.indexRecall = -1
-  endif
-  let self.indexRecall += a:shift
-  if self.indexRecall < 0
-    let self.indexRecall = -1
-  elseif self.indexRecall >= len(patterns)
-    let self.indexRecall = len(patterns) - 1
-  else
-    call setline('.', self.getPrompt() . patterns[self.indexRecall])
-    call feedkeys("\<End>", 'n')
-  endif
-endfunction
-
-" }}}1
-"=============================================================================
-" INITIALIZATION {{{1
-
-augroup FufGlobal
-  autocmd!
-  autocmd BufLeave * let s:bufferCursorPosMap[bufnr('')] = getpos('.')
-augroup END
-
-let s:bufferCursorPosMap = {}
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
-
diff --git a/autoload/.svn/text-base/snipMate.vim.svn-base b/autoload/.svn/text-base/snipMate.vim.svn-base
deleted file mode 100644
index dcd28f66..00000000
--- a/autoload/.svn/text-base/snipMate.vim.svn-base
+++ /dev/null
@@ -1,433 +0,0 @@
-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
-
-fun s:RemoveSnippet()
-	unl! g:snipPos s:curPos s:snipLen s:endCol s:endLine s:prevLen
-	     \ s:lastBuf s:oldWord
-	if exists('s:update')
-		unl s:startCol s:origWordLen s:update
-		if exists('s:oldVars') | unl s:oldVars s:oldEndCol | endif
-	endif
-	aug! snipMateAutocmds
-endf
-
-fun snipMate#expandSnip(snip, col)
-	let lnum = line('.') | let col = a:col
-
-	let snippet = s:ProcessSnippet(a:snip)
-	" Avoid error if eval evaluates to nothing
-	if snippet == '' | return '' | endif
-
-	" Expand snippet onto current position with the tab stops removed
-	let snipLines = split(substitute(snippet, '$\d\+\|${\d\+.\{-}}', '', 'g'), "\n", 1)
-
-	let line = getline(lnum)
-	let afterCursor = strpart(line, col - 1)
-	" Keep text after the cursor
-	if afterCursor != "\t" && afterCursor != ' '
-		let line = strpart(line, 0, col - 1)
-		let snipLines[-1] .= afterCursor
-	else
-		let afterCursor = ''
-		" For some reason the cursor needs to move one right after this
-		if line != '' && col == 1 && &ve != 'all' && &ve != 'onemore'
-			let col += 1
-		endif
-	endif
-
-	call setline(lnum, line.snipLines[0])
-
-	" Autoindent snippet according to previous indentation
-	let indent = matchend(line, '^.\{-}\ze\(\S\|$\)') + 1
-	call append(lnum, map(snipLines[1:], "'".strpart(line, 0, indent - 1)."'.v:val"))
-
-	" Open any folds snippet expands into
-	if &fen | sil! exe lnum.','.(lnum + len(snipLines) - 1).'foldopen' | endif
-
-	let [g:snipPos, s:snipLen] = s:BuildTabStops(snippet, lnum, col - indent, indent)
-
-	if s:snipLen
-		aug snipMateAutocmds
-			au CursorMovedI * call s:UpdateChangedSnip(0)
-			au InsertEnter * call s:UpdateChangedSnip(1)
-		aug END
-		let s:lastBuf = bufnr(0) " Only expand snippet while in current buffer
-		let s:curPos = 0
-		let s:endCol = g:snipPos[s:curPos][1]
-		let s:endLine = g:snipPos[s:curPos][0]
-
-		call cursor(g:snipPos[s:curPos][0], g:snipPos[s:curPos][1])
-		let s:prevLen = [line('$'), col('$')]
-		if g:snipPos[s:curPos][2] != -1 | return s:SelectWord() | endif
-	else
-		unl g:snipPos s:snipLen
-		" Place cursor at end of snippet if no tab stop is given
-		let newlines = len(snipLines) - 1
-		call cursor(lnum + newlines, indent + len(snipLines[-1]) - len(afterCursor)
-					\ + (newlines ? 0: col - 1))
-	endif
-	return ''
-endf
-
-" Prepare snippet to be processed by s:BuildTabStops
-fun s:ProcessSnippet(snip)
-	let snippet = a:snip
-	" Evaluate eval (`...`) expressions.
-	" Using a loop here instead of a regex fixes a bug with nested "\=".
-	if stridx(snippet, '`') != -1
-		while match(snippet, '`.\{-}`') != -1
-			let snippet = substitute(snippet, '`.\{-}`',
-						\ substitute(eval(matchstr(snippet, '`\zs.\{-}\ze`')),
-						\ "\n\\%$", '', ''), '')
-		endw
-		let snippet = substitute(snippet, "\r", "\n", 'g')
-	endif
-
-	" Place all text after a colon in a tab stop after the tab stop
-	" (e.g. "${#:foo}" becomes "${:foo}foo").
-	" This helps tell the position of the tab stops later.
-	let snippet = substitute(snippet, '${\d\+:\(.\{-}\)}', '&\1', 'g')
-
-	" Update the a:snip so that all the $# become the text after
-	" the colon in their associated ${#}.
-	" (e.g. "${1:foo}" turns all "$1"'s into "foo")
-	let i = 1
-	while stridx(snippet, '${'.i) != -1
-		let s = matchstr(snippet, '${'.i.':\zs.\{-}\ze}')
-		if s != ''
-			let snippet = substitute(snippet, '$'.i, s.'&', 'g')
-		endif
-		let i += 1
-	endw
-
-	if &et " Expand tabs to spaces if 'expandtab' is set.
-		return substitute(snippet, '\t', repeat(' ', &sts ? &sts : &sw), 'g')
-	endif
-	return snippet
-endf
-
-" Counts occurences of haystack in needle
-fun s:Count(haystack, needle)
-	let counter = 0
-	let index = stridx(a:haystack, a:needle)
-	while index != -1
-		let index = stridx(a:haystack, a:needle, index+1)
-		let counter += 1
-	endw
-	return counter
-endf
-
-" Builds a list of a list of each tab stop in the snippet containing:
-" 1.) The tab stop's line number.
-" 2.) The tab stop's column number
-"     (by getting the length of the string between the last "\n" and the
-"     tab stop).
-" 3.) The length of the text after the colon for the current tab stop
-"     (e.g. "${1:foo}" would return 3). If there is no text, -1 is returned.
-" 4.) If the "${#:}" construct is given, another list containing all
-"     the matches of "$#", to be replaced with the placeholder. This list is
-"     composed the same way as the parent; the first item is the line number,
-"     and the second is the column.
-fun s:BuildTabStops(snip, lnum, col, indent)
-	let snipPos = []
-	let i = 1
-	let withoutVars = substitute(a:snip, '$\d\+', '', 'g')
-	while stridx(a:snip, '${'.i) != -1
-		let beforeTabStop = matchstr(withoutVars, '^.*\ze${'.i.'\D')
-		let withoutOthers = substitute(withoutVars, '${\('.i.'\D\)\@!\d\+.\{-}}', '', 'g')
-
-		let j = i - 1
-		call add(snipPos, [0, 0, -1])
-		let snipPos[j][0] = a:lnum + s:Count(beforeTabStop, "\n")
-		let snipPos[j][1] = a:indent + len(matchstr(withoutOthers, '.*\(\n\|^\)\zs.*\ze${'.i.'\D'))
-		if snipPos[j][0] == a:lnum | let snipPos[j][1] += a:col | endif
-
-		" Get all $# matches in another list, if ${#:name} is given
-		if stridx(withoutVars, '${'.i.':') != -1
-			let snipPos[j][2] = len(matchstr(withoutVars, '${'.i.':\zs.\{-}\ze}'))
-			let dots = repeat('.', snipPos[j][2])
-			call add(snipPos[j], [])
-			let withoutOthers = substitute(a:snip, '${\d\+.\{-}}\|$'.i.'\@!\d\+', '', 'g')
-			while match(withoutOthers, '$'.i.'\(\D\|$\)') != -1
-				let beforeMark = matchstr(withoutOthers, '^.\{-}\ze'.dots.'$'.i.'\(\D\|$\)')
-				call add(snipPos[j][3], [0, 0])
-				let snipPos[j][3][-1][0] = a:lnum + s:Count(beforeMark, "\n")
-				let snipPos[j][3][-1][1] = a:indent + (snipPos[j][3][-1][0] > a:lnum
-				                           \ ? len(matchstr(beforeMark, '.*\n\zs.*'))
-				                           \ : a:col + len(beforeMark))
-				let withoutOthers = substitute(withoutOthers, '$'.i.'\ze\(\D\|$\)', '', '')
-			endw
-		endif
-		let i += 1
-	endw
-	return [snipPos, i - 1]
-endf
-
-fun snipMate#jumpTabStop(backwards)
-	let leftPlaceholder = exists('s:origWordLen')
-	                      \ && s:origWordLen != g:snipPos[s:curPos][2]
-	if leftPlaceholder && exists('s:oldEndCol')
-		let startPlaceholder = s:oldEndCol + 1
-	endif
-
-	if exists('s:update')
-		call s:UpdatePlaceholderTabStops()
-	else
-		call s:UpdateTabStops()
-	endif
-
-	" Don't reselect placeholder if it has been modified
-	if leftPlaceholder && g:snipPos[s:curPos][2] != -1
-		if exists('startPlaceholder')
-			let g:snipPos[s:curPos][1] = startPlaceholder
-		else
-			let g:snipPos[s:curPos][1] = col('.')
-			let g:snipPos[s:curPos][2] = 0
-		endif
-	endif
-
-	let s:curPos += a:backwards ? -1 : 1
-	" Loop over the snippet when going backwards from the beginning
-	if s:curPos < 0 | let s:curPos = s:snipLen - 1 | endif
-
-	if s:curPos == s:snipLen
-		let sMode = s:endCol == g:snipPos[s:curPos-1][1]+g:snipPos[s:curPos-1][2]
-		call s:RemoveSnippet()
-		return sMode ? "\<tab>" : TriggerSnippet()
-	endif
-
-	call cursor(g:snipPos[s:curPos][0], g:snipPos[s:curPos][1])
-
-	let s:endLine = g:snipPos[s:curPos][0]
-	let s:endCol = g:snipPos[s:curPos][1]
-	let s:prevLen = [line('$'), col('$')]
-
-	return g:snipPos[s:curPos][2] == -1 ? '' : s:SelectWord()
-endf
-
-fun s:UpdatePlaceholderTabStops()
-	let changeLen = s:origWordLen - g:snipPos[s:curPos][2]
-	unl s:startCol s:origWordLen s:update
-	if !exists('s:oldVars') | return | endif
-	" Update tab stops in snippet if text has been added via "$#"
-	" (e.g., in "${1:foo}bar$1${2}").
-	if changeLen != 0
-		let curLine = line('.')
-
-		for pos in g:snipPos
-			if pos == g:snipPos[s:curPos] | continue | endif
-			let changed = pos[0] == curLine && pos[1] > s:oldEndCol
-			let changedVars = 0
-			let endPlaceholder = pos[2] - 1 + pos[1]
-			" Subtract changeLen from each tab stop that was after any of
-			" the current tab stop's placeholders.
-			for [lnum, col] in s:oldVars
-				if lnum > pos[0] | break | endif
-				if pos[0] == lnum
-					if pos[1] > col || (pos[2] == -1 && pos[1] == col)
-						let changed += 1
-					elseif col < endPlaceholder
-						let changedVars += 1
-					endif
-				endif
-			endfor
-			let pos[1] -= changeLen * changed
-			let pos[2] -= changeLen * changedVars " Parse variables within placeholders
-                                                  " e.g., "${1:foo} ${2:$1bar}"
-
-			if pos[2] == -1 | continue | endif
-			" Do the same to any placeholders in the other tab stops.
-			for nPos in pos[3]
-				let changed = nPos[0] == curLine && nPos[1] > s:oldEndCol
-				for [lnum, col] in s:oldVars
-					if lnum > nPos[0] | break | endif
-					if nPos[0] == lnum && nPos[1] > col
-						let changed += 1
-					endif
-				endfor
-				let nPos[1] -= changeLen * changed
-			endfor
-		endfor
-	endif
-	unl s:endCol s:oldVars s:oldEndCol
-endf
-
-fun s:UpdateTabStops()
-	let changeLine = s:endLine - g:snipPos[s:curPos][0]
-	let changeCol = s:endCol - g:snipPos[s:curPos][1]
-	if exists('s:origWordLen')
-		let changeCol -= s:origWordLen
-		unl s:origWordLen
-	endif
-	let lnum = g:snipPos[s:curPos][0]
-	let col = g:snipPos[s:curPos][1]
-	" Update the line number of all proceeding tab stops if <cr> has
-	" been inserted.
-	if changeLine != 0
-		let changeLine -= 1
-		for pos in g:snipPos
-			if pos[0] >= lnum
-				if pos[0] == lnum | let pos[1] += changeCol | endif
-				let pos[0] += changeLine
-			endif
-			if pos[2] == -1 | continue | endif
-			for nPos in pos[3]
-				if nPos[0] >= lnum
-					if nPos[0] == lnum | let nPos[1] += changeCol | endif
-					let nPos[0] += changeLine
-				endif
-			endfor
-		endfor
-	elseif changeCol != 0
-		" Update the column of all proceeding tab stops if text has
-		" been inserted/deleted in the current line.
-		for pos in g:snipPos
-			if pos[1] >= col && pos[0] == lnum
-				let pos[1] += changeCol
-			endif
-			if pos[2] == -1 | continue | endif
-			for nPos in pos[3]
-				if nPos[0] > lnum | break | endif
-				if nPos[0] == lnum && nPos[1] >= col
-					let nPos[1] += changeCol
-				endif
-			endfor
-		endfor
-	endif
-endf
-
-fun s:SelectWord()
-	let s:origWordLen = g:snipPos[s:curPos][2]
-	let s:oldWord = strpart(getline('.'), g:snipPos[s:curPos][1] - 1,
-				\ s:origWordLen)
-	let s:prevLen[1] -= s:origWordLen
-	if !empty(g:snipPos[s:curPos][3])
-		let s:update = 1
-		let s:endCol = -1
-		let s:startCol = g:snipPos[s:curPos][1] - 1
-	endif
-	if !s:origWordLen | return '' | endif
-	let l = col('.') != 1 ? 'l' : ''
-	if &sel == 'exclusive'
-		return "\<esc>".l.'v'.s:origWordLen."l\<c-g>"
-	endif
-	return s:origWordLen == 1 ? "\<esc>".l.'gh'
-							\ : "\<esc>".l.'v'.(s:origWordLen - 1)."l\<c-g>"
-endf
-
-" This updates the snippet as you type when text needs to be inserted
-" into multiple places (e.g. in "${1:default text}foo$1bar$1",
-" "default text" would be highlighted, and if the user types something,
-" UpdateChangedSnip() would be called so that the text after "foo" & "bar"
-" are updated accordingly)
-"
-" It also automatically quits the snippet if the cursor is moved out of it
-" while in insert mode.
-fun s:UpdateChangedSnip(entering)
-	if exists('g:snipPos') && bufnr(0) != s:lastBuf
-		call s:RemoveSnippet()
-	elseif exists('s:update') " If modifying a placeholder
-		if !exists('s:oldVars') && s:curPos + 1 < s:snipLen
-			" Save the old snippet & word length before it's updated
-			" s:startCol must be saved too, in case text is added
-			" before the snippet (e.g. in "foo$1${2}bar${1:foo}").
-			let s:oldEndCol = s:startCol
-			let s:oldVars = deepcopy(g:snipPos[s:curPos][3])
-		endif
-		let col = col('.') - 1
-
-		if s:endCol != -1
-			let changeLen = col('$') - s:prevLen[1]
-			let s:endCol += changeLen
-		else " When being updated the first time, after leaving select mode
-			if a:entering | return | endif
-			let s:endCol = col - 1
-		endif
-
-		" If the cursor moves outside the snippet, quit it
-		if line('.') != g:snipPos[s:curPos][0] || col < s:startCol ||
-					\ col - 1 > s:endCol
-			unl! s:startCol s:origWordLen s:oldVars s:update
-			return s:RemoveSnippet()
-		endif
-
-		call s:UpdateVars()
-		let s:prevLen[1] = col('$')
-	elseif exists('g:snipPos')
-		if !a:entering && g:snipPos[s:curPos][2] != -1
-			let g:snipPos[s:curPos][2] = -2
-		endif
-
-		let col = col('.')
-		let lnum = line('.')
-		let changeLine = line('$') - s:prevLen[0]
-
-		if lnum == s:endLine
-			let s:endCol += col('$') - s:prevLen[1]
-			let s:prevLen = [line('$'), col('$')]
-		endif
-		if changeLine != 0
-			let s:endLine += changeLine
-			let s:endCol = col
-		endif
-
-		" Delete snippet if cursor moves out of it in insert mode
-		if (lnum == s:endLine && (col > s:endCol || col < g:snipPos[s:curPos][1]))
-			\ || lnum > s:endLine || lnum < g:snipPos[s:curPos][0]
-			call s:RemoveSnippet()
-		endif
-	endif
-endf
-
-" This updates the variables in a snippet when a placeholder has been edited.
-" (e.g., each "$1" in "${1:foo} $1bar $1bar")
-fun s:UpdateVars()
-	let newWordLen = s:endCol - s:startCol + 1
-	let newWord = strpart(getline('.'), s:startCol, newWordLen)
-	if newWord == s:oldWord || empty(g:snipPos[s:curPos][3])
-		return
-	endif
-
-	let changeLen = g:snipPos[s:curPos][2] - newWordLen
-	let curLine = line('.')
-	let startCol = col('.')
-	let oldStartSnip = s:startCol
-	let updateTabStops = changeLen != 0
-	let i = 0
-
-	for [lnum, col] in g:snipPos[s:curPos][3]
-		if updateTabStops
-			let start = s:startCol
-			if lnum == curLine && col <= start
-				let s:startCol -= changeLen
-				let s:endCol -= changeLen
-			endif
-			for nPos in g:snipPos[s:curPos][3][(i):]
-				" This list is in ascending order, so quit if we've gone too far.
-				if nPos[0] > lnum | break | endif
-				if nPos[0] == lnum && nPos[1] > col
-					let nPos[1] -= changeLen
-				endif
-			endfor
-			if lnum == curLine && col > start
-				let col -= changeLen
-				let g:snipPos[s:curPos][3][i][1] = col
-			endif
-			let i += 1
-		endif
-
-		" "Very nomagic" is used here to allow special characters.
-		call setline(lnum, substitute(getline(lnum), '\%'.col.'c\V'.
-						\ escape(s:oldWord, '\'), escape(newWord, '\&'), ''))
-	endfor
-	if oldStartSnip != s:startCol
-		call cursor(0, startCol + s:startCol - oldStartSnip)
-	endif
-
-	let s:oldWord = newWord
-	let g:snipPos[s:curPos][2] = newWordLen
-endf
-" vim:noet:sw=4:ts=4:ft=vim

From cff6903b729fbf273e1b31faf117b549da98197f Mon Sep 17 00:00:00 2001
From: Felix Wong <felix@fawong.com>
Date: Sat, 28 Dec 2013 00:23:35 -0800
Subject: [PATCH 07/61] updated link for zencoding

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 77b710d0..63ac00a6 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [ctrlp.vim](https://github.com/kien/ctrlp.vim): Fuzzy file, buffer, mru and tag finder. In my config it's mapped to `<Ctrl+F>`, because `<Ctrl+P>` is used by YankRing
 * [mru.vim](https://github.com/vim-scripts/mru.vim): Plugin to manage Most Recently Used (MRU) files. Includes my own fork which adds syntax highlighting to MRU. This plugin can be opened with `<leader+f>`
 * [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`
-* [zencoding](https://github.com/mattn/zencoding-vim): Expanding abbreviation like zen-coding, very useful for editing XML, HTML.
+* [zencoding](https://github.com/mattn/emmet-vim): Expanding abbreviation like zen-coding, very useful for editing XML, HTML.
 * [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object): Defines a new text object representing lines of code at the same indent level. Useful for python/vim scripts
 * [taglist.vim](https://github.com/vim-scripts/taglist.vim): Source code browser (supports C/C++, java, perl, python, tcl, sql, php, etc)
 * [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors): Sublime Text style multiple selections for Vim, CTRL+N is remapped to CTRL+S (due to YankRing)

From 08a64d943dab56ca8b5896a150531487ac0fa1c6 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 28 Dec 2013 18:23:13 +0000
Subject: [PATCH 08/61] Updated plugins. Fixed some issues related to empty
 space and peaksea. Using Source Code Pro as default font

---
 sources_forked/peaksea/colors/peaksea.vim     |  2 +-
 sources_non_forked/vim-airline/README.md      |  9 +-
 .../autoload/airline/extensions.vim           |  4 +
 .../autoload/airline/extensions/branch.vim    |  9 +-
 .../autoload/airline/extensions/eclim.vim     | 16 ++--
 .../autoload/airline/extensions/hunks.vim     |  6 +-
 .../autoload/airline/extensions/quickfix.vim  |  2 +-
 .../autoload/airline/extensions/tabline.vim   | 43 ++++++---
 .../tabline/{formatters.vim => default.vim}   | 35 ++------
 .../extensions/tabline/unique_tail.vim        | 27 ++++++
 .../tabline/unique_tail_improved.vim          | 88 +++++++++++++++++++
 .../autoload/airline/extensions/tmuxline.vim  | 26 ++++++
 .../airline/extensions/whitespace.vim         |  4 +-
 .../autoload/airline/themes/kolor.vim         | 59 +++++++++++++
 .../vim-airline/doc/airline.txt               | 30 ++++++-
 .../vim-bundle-mako/indent/mako.vim           |  1 +
 .../vim-bundle-mako/syntax/mako.vim           |  3 +
 .../vim-coffee-script/compiler/coffee.vim     |  4 +-
 .../vim-fugitive/plugin/fugitive.vim          |  9 +-
 sources_non_forked/vim-less/README.md         |  2 +-
 sources_non_forked/vim-less/indent/less.vim   |  9 +-
 sources_non_forked/vim-less/syntax/less.vim   |  2 +-
 .../vim-markdown/ftplugin/markdown.vim        |  1 +
 .../vim-markdown/syntax/markdown.vim          |  1 +
 .../vim-snipmate/Contributors.md              |  1 +
 .../vim-snipmate/autoload/snipMate.vim        | 23 +++--
 .../vim-snippets/UltiSnips/eruby.snippets     |  8 ++
 .../UltiSnips/php/symfony2.snippets           | 48 +++++++---
 .../vim-snippets/UltiSnips/twig.snippets      | 33 +++++++
 .../vim-snippets/snippets/php.snippets        | 41 +++++++++
 .../vim-snippets/snippets/puppet.snippets     | 20 +++--
 .../vim-snippets/snippets/ruby.snippets       |  2 +-
 .../vim-snippets/snippets/slim.snippets       | 64 ++++++++++++++
 vimrcs/extended.vim                           |  6 +-
 vimrcs/plugins_config.vim                     |  5 ++
 35 files changed, 553 insertions(+), 90 deletions(-)
 rename sources_non_forked/vim-airline/autoload/airline/extensions/tabline/{formatters.vim => default.vim} (54%)
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/kolor.vim
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/twig.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/slim.snippets

diff --git a/sources_forked/peaksea/colors/peaksea.vim b/sources_forked/peaksea/colors/peaksea.vim
index 7b95aadd..f3eafe43 100644
--- a/sources_forked/peaksea/colors/peaksea.vim
+++ b/sources_forked/peaksea/colors/peaksea.vim
@@ -281,7 +281,7 @@ elseif &background=='dark'
   hi ModeMsg		guifg=fg	guibg=#000080	gui=NONE
   hi VisualNOS		guifg=fg	guibg=#000080	gui=NONE
   hi SpecialKey		guifg=#b0d0f0	guibg=NONE	gui=NONE
-  hi NonText		guifg=#6080f0	guibg=#101010	gui=NONE
+  hi NonText		guifg=#202020	guibg=#202020	gui=NONE
   hi Directory		guifg=#80c0e0	guibg=NONE	gui=NONE
   hi ErrorMsg		guifg=#d0d090	guibg=#800000	gui=NONE
   hi MoreMsg		guifg=#c0e080	guibg=NONE	gui=NONE
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index dd59b889..3ff5ac3a 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -7,7 +7,7 @@ Lean &amp; mean status/tabline for vim that's light as air.
 # 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], [syntastic][5], [eclim][34], [lawrencium][21] and [virtualenv][31].
+*  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], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35].
 *  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 colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
@@ -67,6 +67,9 @@ vim-airline integrates with a variety of plugins out of the box.  These extensio
 #### [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)
+
 ## Extras
 
 vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
@@ -125,6 +128,9 @@ This plugin follows the standard runtime path structure, and as such it can be i
 
 `: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.
@@ -197,3 +203,4 @@ MIT License. Copyright (c) 2013 Bailey Ling.
 [32]: https://github.com/chriskempson/base16-vim
 [33]: https://github.com/bling/vim-airline/wiki/Test-Plan
 [34]: http://eclim.org
+[35]: https://github.com/edkolev/tmuxline.vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 8707dbd7..790bfd1b 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -195,6 +195,10 @@ function! airline#extensions#load()
     call airline#extensions#tabline#init(s:ext)
   endif
 
+  if get(g:, 'airline#extensions#tmuxline#enabled', 1) && exists(':Tmuxline')
+    call airline#extensions#tmuxline#init(s:ext)
+  endif
+
   " load all other extensions not part of the default distribution
   for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
     " we have to check both resolved and unresolved paths, since it's possible
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 87a70693..2177f64c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -14,7 +14,7 @@ let s:empty_message = get(g:, 'airline#extensions#branch#empty_message',
       \ get(g:, 'airline_branch_empty_message', ''))
 let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
 
-function! airline#extensions#branch#get_head()
+function! airline#extensions#branch#head()
   let head = ''
 
   if s:has_fugitive && !exists('b:mercurial_dir')
@@ -42,6 +42,13 @@ function! airline#extensions#branch#get_head()
   endif
 
   return empty(head) || !s:check_in_path()
+        \ ? ''
+        \ : head
+endfunction
+
+function! airline#extensions#branch#get_head()
+  let head = airline#extensions#branch#head()
+  return empty(head)
         \ ? s:empty_message
         \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head)
 endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
index ff6a84fe..68360466 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -17,12 +17,18 @@ endfunction
 
 function! airline#extensions#eclim#get_warnings()
   let eclimList = eclim#display#signs#GetExisting()
+
   if !empty(eclimList)
-    let errorsLine = eclimList[0]['line']
-    let errorsNumber = len(eclimList)
-    let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
-    if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
-      return errors.(g:airline_symbols.space)
+    " Remove any non-eclim signs (see eclim#display#signs#Update)
+    call filter(eclimList, "v:val.name =~ '^\(qf_\)\?\(error\|info\|warning\)$'")
+
+    if !empty(eclimList)
+      let errorsLine = eclimList[0]['line']
+      let errorsNumber = len(eclimList)
+      let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
+      if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+        return errors.(g:airline_symbols.space)
+      endif
     endif
   endif
   return ''
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
index 73c0e2ea..084dd7b5 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
@@ -16,8 +16,12 @@ function! s:get_hunks_signify()
   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)
+  if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
     return ''
   endif
   return GitGutterGetHunkSummary()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
index 7afad864..f000e027 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -24,7 +24,7 @@ function! s:get_text()
 
   let nr = bufnr('%')
   for buf in split(buffers, '\n')
-    if match(buf, '\v^\s+'.nr) > -1
+    if match(buf, '\v^\s*'.nr) > -1
       if match(buf, '\[Quickfix List\]') > -1
         return g:airline#extensions#quickfix#quickfix_text
       else
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index b80d16e6..cf3d7df2 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -5,6 +5,7 @@ let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
 let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
 let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
 
 let s:builder_context = {
       \ 'active'        : 1,
@@ -103,7 +104,7 @@ function! airline#extensions#tabline#title(n)
 endfunction
 
 function! airline#extensions#tabline#get_buffer_name(nr)
-  return airline#extensions#tabline#formatters#{s:formatter}(a:nr, get(s:, 'current_buffer_list', []))
+  return airline#extensions#tabline#{s:formatter}#format(a:nr, get(s:, 'current_buffer_list', s:get_buffer_list()))
 endfunction
 
 function! s:get_buffer_list()
@@ -179,9 +180,16 @@ function! s:get_visible_buffers()
   return buffers
 endfunction
 
+let s:current_bufnr = -1
+let s:current_tabnr = -1
+let s:current_tabline = ''
 function! s:get_buffers()
-  let b = airline#builder#new(s:builder_context)
   let cur = bufnr('%')
+  if cur == s:current_bufnr
+    return s:current_tabline
+  endif
+
+  let b = airline#builder#new(s:builder_context)
   let tab_bufs = tabpagebuflist(tabpagenr())
   for nr in s:get_visible_buffers()
     if nr < 0
@@ -207,13 +215,22 @@ function! s:get_buffers()
   call b.add_section('airline_tabfill', '')
   call b.split()
   call b.add_section('airline_tabtype', ' buffers ')
-  return b.build()
+
+  let s:current_bufnr = cur
+  let s:current_tabline = b.build()
+  return s:current_tabline
 endfunction
 
 function! s:get_tabs()
+  let curbuf = bufnr('%')
+  let curtab = tabpagenr()
+  if curbuf == s:current_bufnr && curtab == s:current_tabnr
+    return s:current_tabline
+  endif
+
   let b = airline#builder#new(s:builder_context)
   for i in range(1, tabpagenr('$'))
-    if i == tabpagenr()
+    if i == curtab
       let group = 'airline_tabsel'
       if g:airline_detect_modified
         for bi in tabpagebuflist(i)
@@ -226,18 +243,24 @@ function! s:get_tabs()
       let group = 'airline_tab'
     endif
     let val = '%('
-    if s:tab_nr_type == 0
-      let val .= ' %{len(tabpagebuflist('.i.'))}'
-    else
-      let val .= (g:airline_symbols.space).i
+    if s:show_tab_nr
+      if s:tab_nr_type == 0
+        let val .= ' %{len(tabpagebuflist('.i.'))}'
+      else
+        let val .= (g:airline_symbols.space).i
+      endif
     endif
     call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
   endfor
+
   call b.add_raw('%T')
   call b.add_section('airline_tabfill', '')
   call b.split()
   call b.add_section('airline_tab', ' %999XX ')
   call b.add_section('airline_tabtype', ' tabs ')
-  return b.build()
-endfunction
 
+  let s:current_bufnr = curbuf
+  let s:current_tabnr = curtab
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
similarity index 54%
rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim
rename to sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
index 656ba225..f1c87e4f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
@@ -7,7 +7,7 @@ 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(bufnr, buffers)
+function! airline#extensions#tabline#default#format(bufnr, buffers)
   let _ = ''
 
   let name = bufname(a:bufnr)
@@ -21,40 +21,15 @@ function! airline#extensions#tabline#formatters#default(bufnr, buffers)
     endif
   endif
 
-  return s:wrap_name(a:bufnr, _)
+  return airline#extensions#tabline#default#wrap_name(a:bufnr, _)
 endfunction
 
-function! airline#extensions#tabline#formatters#unique_tail(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, ':t')
-      if has_key(tails, tail)
-        let duplicates[nr] = nr
-      endif
-      let tails[tail] = 1
-      let map[nr] = s:wrap_name(nr, tail)
-    endif
-  endfor
-
-  for nr in values(duplicates)
-    let map[nr] = s:wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
-  endfor
-
-  return map[a:bufnr]
-endfunction
-
-function! s:wrap_name(bufnr, buffer_name)
+function! airline#extensions#tabline#default#wrap_name(bufnr, buffer_name)
   let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
-  let _ .= a:buffer_name
+  let _ .= substitute(a:buffer_name, '\\', '/', 'g')
+
   if getbufvar(a:bufnr, '&modified') == 1
     let _ .= s:buf_modified_symbol
   endif
   return _
 endfunction
-
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
new file mode 100644
index 00000000..eb622f5e
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
@@ -0,0 +1,27 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#extensions#tabline#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, ':t')
+      if has_key(tails, tail)
+        let duplicates[nr] = nr
+      endif
+      let tails[tail] = 1
+      let map[nr] = airline#extensions#tabline#default#wrap_name(nr, tail)
+    endif
+  endfor
+
+  for nr in values(duplicates)
+    let map[nr] = airline#extensions#tabline#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+  endfor
+
+  return map[a:bufnr]
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
new file mode 100644
index 00000000..12b28ae6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -0,0 +1,88 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:skip_symbol = '…'
+
+function! airline#extensions#tabline#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#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
+      let do_deduplicate = 1
+      let tokens = reverse(split(substitute(fnamemodify(name, ':p:.:h'), '\\', '/', 'g'), '/'))
+      let token_index = 0
+      for token in tokens
+        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#default#wrap_name(a:bufnr, join(buf_name, '/'))
+  else
+    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
+  endif
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
new file mode 100644
index 00000000..4bc0a5f9
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
@@ -0,0 +1,26 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index c8910af6..002fba1d 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -16,10 +16,12 @@ let s:default_checks = ['indent', 'trailing']
 let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
 let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
 
+let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
+
 let s:enabled = 1
 
 function! airline#extensions#whitespace#check()
-  if &readonly || !&modifiable || !s:enabled
+  if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
     return ''
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kolor.vim b/sources_non_forked/vim-airline/autoload/airline/themes/kolor.vim
new file mode 100644
index 00000000..e61f56f2
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 2816c290..bfe7cb3f 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -355,6 +355,9 @@ eclim <https://eclim.org>
 * configure which whitespace checks to enable. >
   let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ]
 <
+* 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
 <
@@ -376,11 +379,14 @@ eclim <https://eclim.org>
   let g:airline#extensions#tabline#tab_nr_type = 0 " # of splits (default)
   let g:airline#extensions#tabline#tab_nr_type = 1 " tab number
 <
+* enable/disable displaying tab number in tabs mode. >
+  let g:airline#extensions#tabline#show_tab_nr = 1
+
 * defines the name of a formatter for how buffer names are displayed. >
   let g:airline#extensions#tabline#formatter = 'default'
 
   " here is how you can define a 'foo' formatter:
-  function! airline#extensions#tabline#formatters#foo(bufnr, buffers)
+  function! airline#extensions#tabline#foo#format(bufnr, buffers)
     return fnamemodify(bufname(a:bufnr), ':t')
   endfunction
   let g:airline#extensions#tabline#formatter = 'foo'
@@ -403,6 +409,10 @@ eclim <https://eclim.org>
   " 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
@@ -423,6 +433,24 @@ eclim <https://eclim.org>
 <
 Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
 
+-------------------------------------                    *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"
+<
+
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
 
diff --git a/sources_non_forked/vim-bundle-mako/indent/mako.vim b/sources_non_forked/vim-bundle-mako/indent/mako.vim
index bd85ac5e..8f6b97b6 100644
--- a/sources_non_forked/vim-bundle-mako/indent/mako.vim
+++ b/sources_non_forked/vim-bundle-mako/indent/mako.vim
@@ -257,6 +257,7 @@ endif
 
 " [-- <Mako Elements> --]
 call <SID>MakoIndentPush('%def')
+call <SID>MakoIndentPush('%block')
 call <SID>MakoIndentPush('%call')
 call <SID>MakoIndentPush('%doc')
 call <SID>MakoIndentPush('%text')
diff --git a/sources_non_forked/vim-bundle-mako/syntax/mako.vim b/sources_non_forked/vim-bundle-mako/syntax/mako.vim
index 8fc489ba..36bc4a7c 100644
--- a/sources_non_forked/vim-bundle-mako/syntax/mako.vim
+++ b/sources_non_forked/vim-bundle-mako/syntax/mako.vim
@@ -60,6 +60,9 @@ syn region makoAttributeValue containedin=MakoTag contained start=/'/ skip=/\\'/
 syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\|block\|[a-zA-Z_][a-zA-Z0-9_]*:[a-zA-Z_][a-zA-Z0-9_]*\)\>" end="/\?>"
 syn match makoDelim "</%\(def\|call\|namespace\|block\|[a-zA-Z_][a-zA-Z0-9_]*:[a-zA-Z_][a-zA-Z0-9_]*\)>"
 
+syn region  makoJavaScript matchgroup=makoDelim start=+<%block .*js.*>+ keepend end=+</%block>+ contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc,makoLine,makoBlock,makoVariable
+syn region makoCssStyle matchgroup=makoDelim start=+<%block .*css.*>+ keepend end=+</%block>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc,makoLine,makoBlock,makoVariable
+
 " Newline Escapes
 syn match makoEscape /\\$/
 
diff --git a/sources_non_forked/vim-coffee-script/compiler/coffee.vim b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
index a70fa64c..9a91d354 100644
--- a/sources_non_forked/vim-coffee-script/compiler/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
@@ -75,8 +75,8 @@ augroup CoffeeUpdateMakePrg
 
   " Set autocmd locally if compiler was set locally.
   if &l:makeprg =~ s:pat
-    autocmd BufFilePost,BufWritePost <buffer> call s:UpdateMakePrg()
+    autocmd BufWritePre,BufFilePost <buffer> call s:UpdateMakePrg()
   else
-    autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
+    autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 51e52d88..d81705e1 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -130,6 +130,12 @@ function! fugitive#extract_git_dir(path) abort
   let root = s:shellslash(simplify(fnamemodify(a:path, ':p:s?[\/]$??')))
   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
     let dir = s:sub(root, '[\/]$', '') . '/.git'
     let type = getftype(dir)
     if type ==# 'dir' && fugitive#is_git_dir(dir)
@@ -163,7 +169,7 @@ function! fugitive#detect(path)
     endif
   endif
   if exists('b:git_dir')
-    silent doautocmd User Fugitive
+    silent doautocmd User FugitiveBoot
     cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
     nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
     let buffer = fugitive#buffer()
@@ -176,6 +182,7 @@ function! fugitive#detect(path)
         call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
       endif
     endif
+    silent doautocmd User Fugitive
   endif
 endfunction
 
diff --git a/sources_non_forked/vim-less/README.md b/sources_non_forked/vim-less/README.md
index 697ad124..e9d9b5f7 100644
--- a/sources_non_forked/vim-less/README.md
+++ b/sources_non_forked/vim-less/README.md
@@ -35,7 +35,7 @@ in `after/syntax/css.vim` or `after/syntax/css/*.vim`.
 ### Map
 .less to .css , lessc is required.
 
-    nnoremap ,m :w <BAR> !lessc % > %:t:r.css<CR><space>
+    nnoremap <Leader>m :w <BAR> !lessc % > %:t:r.css<CR><space>
 
 
 ## Credits
diff --git a/sources_non_forked/vim-less/indent/less.vim b/sources_non_forked/vim-less/indent/less.vim
index fea8846d..556c2d08 100644
--- a/sources_non_forked/vim-less/indent/less.vim
+++ b/sources_non_forked/vim-less/indent/less.vim
@@ -1,11 +1,10 @@
 " Vim indent file
-" Language:	    LessCSS
-" Maintainer:	Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change:	2011 Sep 26
+" Language:            LessCSS
+" Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
+" Last Change:        2011 Sep 26
 
 if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/css.vim
-
+runtime! indent/css.vim
\ No newline at end of file
diff --git a/sources_non_forked/vim-less/syntax/less.vim b/sources_non_forked/vim-less/syntax/less.vim
index fa5a247e..44bf470e 100644
--- a/sources_non_forked/vim-less/syntax/less.vim
+++ b/sources_non_forked/vim-less/syntax/less.vim
@@ -35,7 +35,7 @@ syn match lessClass "[[:alnum:]_-]\+" contained
 " string functions
 syn keyword lessFunction escape e % containedin=cssDefinition contained
 " misc functions
-syn keyword lessFunction color unit containedin=cssDefinition contained
+syn keyword lessFunction unit containedin=cssDefinition contained
 " math functions
 syn keyword lessFunction ceil floor percentage round containedin=cssDefinition contained
 " color definition
diff --git a/sources_non_forked/vim-markdown/ftplugin/markdown.vim b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
index 022da06e..5d6ebecd 100644
--- a/sources_non_forked/vim-markdown/ftplugin/markdown.vim
+++ b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
@@ -1,6 +1,7 @@
 " Vim filetype plugin
 " Language:		Markdown
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:		2013 May 30
 
 if exists("b:did_ftplugin")
   finish
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 3024f2f7..4ba02b26 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -2,6 +2,7 @@
 " Language:     Markdown
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:    *.markdown
+" Last Change:  2013 May 30
 
 if exists("b:current_syntax")
   finish
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 33380c1d..117ea62b 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -8,6 +8,7 @@ It is currently maintained by [Rok Garbas](rok@garbas.si), [Marc
 Weber](marco-oweber@gmx.de), and [Adnan Zafar](https://github.com/ajzafar) with
 additional contributions from:
 
+* [907th](https://github.com/907th)
 * [alderz](https://github.com/alderz)
 * [asymmetric](https://github.com/asymmetric)
 * [bpugh](https://github.com/bpugh)
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index bb3ecdfd..19304995 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -706,12 +706,25 @@ fun! s:ChooseSnippet(snippets)
 	return funcref#Call(a:snippets[keys(a:snippets)[idx]])
 endf
 
-fun! snipMate#ShowAvailableSnips()
-	let col   = col('.')
-	let word  = matchstr(getline('.'), '\S\+\%'.col.'c')
+fun! snipMate#WordBelowCursor()
+	return matchstr(getline('.'), '\S\+\%' . col('.') . 'c')
+endf
 
-	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(word, '*', 0),'v:val[0]')
-	let matches = filter(snippets, "v:val =~# '\\V\\^" . escape(word, '\') . "'")
+fun! snipMate#GetSnippetsForWordBelowCursorForComplete(word)
+	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(a:word, '*', 0), 'v:val[0]')
+	return filter(snippets, "v:val =~# '\\V\\^" . escape(a:word, '\') . "'")
+endf
+
+fun! snipMate#CanBeTriggered()
+	let word    = snipMate#WordBelowCursor()
+	let matches = snipMate#GetSnippetsForWordBelowCursorForComplete(word)
+	return len(matches) > 0
+endf
+
+fun! snipMate#ShowAvailableSnips()
+	let col     = col('.')
+	let word    = snipMate#WordBelowCursor()
+	let matches = snipMate#GetSnippetsForWordBelowCursorForComplete(word)
 
 	" Pretty hacky, but really can't have the tab swallowed!
 	if len(matches) == 0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index 88f71791..cd462fb2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -24,6 +24,14 @@ def textmate_var(var, snip):
 endglobal
 
 
+snippet % "<% ${0} %>"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+endsnippet
+
+snippet = "<%= ${0} %>"
+`!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            #
 ###########################################################################
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
index b5ff0ee3..77f923f6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
@@ -1,7 +1,7 @@
 # sugguestion? report bugs? 
 # go to https://github.com/chrisyue/vim-snippets/issues
 
-snippet contr "symfony2 controller" b
+snippet contr "Symfony2 controller" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -25,19 +25,19 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet act "symfony2 action" b
+snippet act "Symfony2 action" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"POST"}})
+ * @Template()
  */
 public function ${1}Action(${2})
 {
 	${6}
-	return $this->redirect($this->generateUrl('home', [], false));
 }
 endsnippet
 
-snippet actt "symfony2 action and template" b
+snippet actt "Symfony2 action and template" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"GET"}})
@@ -51,7 +51,7 @@ public function ${1}Action(${2})
 abspath = os.path.abspath(path)`
 endsnippet
 
-snippet comm "symfony2 command" b
+snippet comm "Symfony2 command" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -74,14 +74,12 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	protected function configure()
 	{
-		$this
-			->setName('${1}')
+		$this->setName('${1}')
 			->setDescription('${2}')
 			->setDefinition([
 				new InputArgument('', InputArgument::REQUIRED, ''),
 				new InputOption('', null, InputOption::VALUE_NONE, ''),
-			])
-		;
+			]);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output)
@@ -90,7 +88,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet subs "symfony2 subscriber" b
+snippet subs "Symfony2 subscriber" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -121,7 +119,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet transf "symfony2 form data transformer" b
+snippet transf "Symfony2 form data transformer" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -155,7 +153,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet ent "symfony2 doctrine entity" b
+snippet ent "Symfony2 doctrine entity" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -192,7 +190,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet form "symfony2 form type" b
+snippet form "Symfony2 form type" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -235,3 +233,27 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	}
 }
 endsnippet
+
+snippet ev "Symfony2 event" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * ${2:@author `whoami`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Event
+{
+}
+endsnippet
+
+snippet redir "Symfony2 redirect"
+$this->redirect($this->generateUrl('${1}', ${2}));
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/twig.snippets b/sources_non_forked/vim-snippets/UltiSnips/twig.snippets
new file mode 100644
index 00000000..9db43f7d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/twig.snippets
@@ -0,0 +1,33 @@
+snippet bl "twig block" b
+{% block ${1} %}
+${2}
+{% endblock $1 %}
+endsnippet
+
+snippet js "twig javascripts" b
+{% javascripts '${1}' %}
+	<script src="{{ asset_url }}"></script>
+{% endjavascripts %}
+endsnippet
+
+snippet css "twig stylesheets" b
+{% stylesheets '${1}' %}
+	<link rel="stylesheet" href="{{ asset_url }}">
+{% endstylesheets %}
+endsnippet
+
+snippet if "twig if" b
+{% if ${1} %}
+${2}
+{% endif %}
+endsnippet
+
+snippet for "twig for" b
+{% for ${1} in ${2} %}
+${3}
+{% endfor %}
+endsnippet
+
+snippet ext "twig extends" b
+{% extends ${1} %}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index 1793d41c..d7b21eb5 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -557,3 +557,44 @@ snippet CSVIterator
 
 snippet is
 	isset($1{VISUAL})
+
+# phpunit	
+snippet ase
+	$this->assertEquals(${1:expected}, ${2:actual});
+
+snippet asne
+	$this->assertNotEquals(${1:expected}, ${2:actual});
+
+snippet asf
+	$this->assertFalse(${1:Something});
+
+snippet ast
+	$this->assertTrue(${1:Something});
+
+snippet asfex
+	$this->assertFileExists(${1:path/to/file});
+
+snippet asfnex
+	$this->assertFileNotExists(${1:path/to/file});
+
+snippet ascon
+	$this->assertContains(${1:Search Value}, ${2:Array or Iterator});
+
+snippet ashk
+	$this->assertArrayHasKey(${1:key}, ${2:array});
+
+snippet asnhk
+	this->assertArrayNotHasKey(${1:value}, ${2:array});
+
+snippet ascha
+	$this->assertClassHasAttribute('${1:Attribute Name}', '${2:ClassName}');
+
+snippet asi
+	$this->assertInstanceOf(${1:expected}, ${2:actual});
+
+snippet tc
+	public function test${1:name_of_the_test}()
+	{
+		${0:code}
+	}
+
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index d35608dd..2e451e41 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -223,14 +223,22 @@ snippet define
 	}
 
 snippet service
-	service{ "${1:service}":
-		enable		=> ${2:true},
-		ensure		=> ${0:running},
-		hasstatus	=> true,
+	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:path}":
-		${2}	=> ${0}
+	file { '${1:filename}' :
+		ensure  => ${2:present},
+		owner   => '${3:root}',
+		group   => '${4:root}',
+		mode    => '${5:0644}',
+		source  => 'puppet:///modules/${6:module}/${7:source}',
+		content => template('/etc/puppet/templates/${8:template}'),
+		alias   => '${9:alias}',
+		require => [ Package['${10:package}'], File['${11:file}'], ],
 	}
 
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 278c3615..551b313f 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -174,7 +174,7 @@ snippet ana
 	accepts_nested_attributes_for :${0:association}
 # ivc == instance variable cache
 snippet ivc
-	@${1:variable_name} ||= ${0:chached_value}
+	@${1:variable_name} ||= ${0:cached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable
diff --git a/sources_non_forked/vim-snippets/snippets/slim.snippets b/sources_non_forked/vim-snippets/snippets/slim.snippets
new file mode 100644
index 00000000..8eeb4a53
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/slim.snippets
@@ -0,0 +1,64 @@
+# 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;
+
+# Forms
+# =====
+snippet fieldset
+	fieldset
+		legend ${1}
+
+# Assets
+# ======
+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"
diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim
index 6373d424..026c399a 100644
--- a/vimrcs/extended.vim
+++ b/vimrcs/extended.vim
@@ -14,11 +14,11 @@ colorscheme peaksea
 
 " Set font according to system
 if has("mac") || has("macunix")
-    set gfn=Menlo:h15
+    set gfn=Source\ Code\ Pro:h15,Menlo:h15
 elseif has("win16") || has("win32")
-    set gfn=Bitstream\ Vera\ Sans\ Mono:h11
+    set gfn=Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
 elseif has("linux")
-    set gfn=Monospace\ 11
+    set gfn=Source\ Code\ Pro:h12,Monospace\ 11
 endif
 
 " Open MacVim in fullscreen mode
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index b9cd642f..98af813a 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -105,3 +105,8 @@ au FileType mako vmap Si S"i${ _(<esc>2f"a) }<esc>
 " => vim-airline config (force color)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let g:airline_theme="luna"
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Vimroom
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+nnoremap <silent> <leader>vv :VimroomToggle<cr>

From 6bce69df95036d799bbebeb62df0f1e11cd06639 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 28 Dec 2013 21:17:09 +0000
Subject: [PATCH 09/61] Added vim-zenroom: Remove all clutter and focus only on
 the essential. Similar to iA Writer or Write Room

---
 README.md                                     |   4 +
 .../vim-zenroom/LICENSE.markdown              |  12 +
 .../vim-zenroom/README.markdown               |  20 +
 sources_non_forked/vim-zenroom/doc/tags       |  12 +
 .../vim-zenroom/doc/vimroom.txt               |  86 +++++
 .../vim-zenroom/plugin/vimroom.vim            | 355 ++++++++++++++++++
 update_plugins.py                             |   1 +
 vimrcs/plugins_config.vim                     |   2 +-
 8 files changed, 491 insertions(+), 1 deletion(-)
 create mode 100644 sources_non_forked/vim-zenroom/LICENSE.markdown
 create mode 100644 sources_non_forked/vim-zenroom/README.markdown
 create mode 100644 sources_non_forked/vim-zenroom/doc/tags
 create mode 100644 sources_non_forked/vim-zenroom/doc/vimroom.txt
 create mode 100644 sources_non_forked/vim-zenroom/plugin/vimroom.vim

diff --git a/README.md b/README.md
index 775bc586..8435ef0d 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,8 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination.
 * [vim-airline](https://github.com/bling/vim-airline): Lean & mean status/tabline for vim that's light as air (replacing powerline)
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
+* [vim-zenroom](https://github.com/amix/vim-zenroom): 
+Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)
 
 
 ## What color schemes are included?
@@ -311,3 +313,5 @@ Vimscript mappings:
 * [Vim 7.3: Persistent undo and encryption!](http://amix.dk/blog/post/19548#Vim-7-3-Persistent-undo-and-encryption)
 * [Vim tips: Visual Search](http://amix.dk/blog/post/19334#Vim-tips-Visual-Search)
 * [Folding in Vim](http://amix.dk/blog/post/19132#Folding-in-Vim)
+* [
+Zen room for Vim: Focsuing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)
diff --git a/sources_non_forked/vim-zenroom/LICENSE.markdown b/sources_non_forked/vim-zenroom/LICENSE.markdown
new file mode 100644
index 00000000..36603def
--- /dev/null
+++ b/sources_non_forked/vim-zenroom/LICENSE.markdown
@@ -0,0 +1,12 @@
+Copyright (c) 2010 Mike West, http://mikewest.org/
+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 software  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/sources_non_forked/vim-zenroom/README.markdown b/sources_non_forked/vim-zenroom/README.markdown
new file mode 100644
index 00000000..238f1c9d
--- /dev/null
+++ b/sources_non_forked/vim-zenroom/README.markdown
@@ -0,0 +1,20 @@
+This is my fork of Vimroom which includes following:
+
+* A special mode for editing Markdown and reStructuredText. It's highly inspired by  [iA Writer](http://writer.pro/)
+* Optimizations for [my vimrc](https://github.com/amix/vimrc)
+
+Pelase read more here [
+zenroom for Vim: Focsuing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential).
+
+
+## Editing code
+
+![Screenshot 1](http://amix.dk/uploads/zenroom_code.jpg)
+
+![Screenshot 2](http://amix.dk/uploads/zenroom_code_1.jpg)
+
+## Updating documentation
+
+![Screenshot 3](http://amix.dk/uploads/zenroom_documentation.jpg)
+
+![Screenshot 4](http://amix.dk/uploads/zenroom_documentation_1.jpg)
diff --git a/sources_non_forked/vim-zenroom/doc/tags b/sources_non_forked/vim-zenroom/doc/tags
new file mode 100644
index 00000000..1773f538
--- /dev/null
+++ b/sources_non_forked/vim-zenroom/doc/tags
@@ -0,0 +1,12 @@
+g:vimroom_background	vimroom.txt	/*g:vimroom_background*
+g:vimroom_min_sidebar_width	vimroom.txt	/*g:vimroom_min_sidebar_width*
+g:vimroom_navigational_keys	vimroom.txt	/*g:vimroom_navigational_keys*
+g:vimroom_scrolloff	vimroom.txt	/*g:vimroom_scrolloff*
+g:vimroom_sidebar_height	vimroom.txt	/*g:vimroom_sidebar_height*
+g:vimroom_width	vimroom.txt	/*g:vimroom_width*
+vimroom	vimroom.txt	/*vimroom*
+vimroom-about	vimroom.txt	/*vimroom-about*
+vimroom-configuration	vimroom.txt	/*vimroom-configuration*
+vimroom-installation	vimroom.txt	/*vimroom-installation*
+vimroom-toc	vimroom.txt	/*vimroom-toc*
+vimroom.txt	vimroom.txt	/*vimroom.txt*
diff --git a/sources_non_forked/vim-zenroom/doc/vimroom.txt b/sources_non_forked/vim-zenroom/doc/vimroom.txt
new file mode 100644
index 00000000..0522ea75
--- /dev/null
+++ b/sources_non_forked/vim-zenroom/doc/vimroom.txt
@@ -0,0 +1,86 @@
+*vimroom.txt*
+
+==============================================================================
+TABLE OF CONTENTS                                          *vimroom* *vimroom-toc*
+
+  1. About                                                       |vimroom-about|
+  2. Installation                                         |vimroom-installation|
+  3. Configuration                                       |vimroom-configuration|
+
+==============================================================================
+ABOUT                                                            *vimroom-about*
+
+I do most of my writing in Vim, because I’m a big nerd. It does most of what
+I want a writing environment to do, but I miss some of the “distraction free"
+features of the quite exceptional WriteRoom. Fullscreening Vim means that text
+ends up flat up against the left side of my monitor, but I’d much prefer it to
+be centered. I’d also like a little of the visual clutter to fade away.  Some
+of this is possible with MacVim, but I’d rather do as much as possible in
+a platform-independent way. So, command-line Vim it is.
+
+For more visit:
+  http://projects.mikewest.org/vimroom/
+  https://github.com/mikewest/vimroom
+
+==============================================================================
+INSTALLATION                                              *vimroom-installation*
+
+I think the best way to install Vim plugins is via Tim Pope’s Pathogen. Using
+that plugin, you can simply clone the VimRoom repository into your bundles
+directory, and you’re done.
+
+Without Pathogen, installation is almost as trivial: simply copy
+./plugins/vimroom.vim from the repository into your plugins directory. That’s
+it!
+
+==============================================================================
+CONFIGURATION                                            *vimroom-configuration*
+
+By default, VimRoom binds <Leader>V to <Plug>VimroomToggle, and sets up an 80
+column workspace with at least 5 columns of space on either side (it doesn’t
+help at all to have single-column sidebars, you see), and 3 lines of space
+above and below. It assumes a black background when hiding visual
+distractions. As of v0.4, VimRoom also sets up a :VimroomToggle command that
+has the same effect.
+
+Changing any of these assumptions is a simple matter of setting variables in
+your .vimrc.
+
+                                                        *g:vimroom_background*
+is the background color to be used for hiding elements.  Set this to your
+terminal’s background color (“white”, “black”, etc.)
+
+                                                 *g:vimroom_min_sidebar_width*
+is the minimum sidebar width. This will automatically expand to take up all
+the free space left after setting the main workspace window to g:vimroom_width
+pcolumns.
+
+                                                 *g:vimroom_navigational_keys*
+determines whether Vimroom will map keys like <Up>, <Down>, j, and k to
+navigate over “display” lines, rather than “logical” lines. This defaults to
+p1 (on), if you’d prefer the mapping not take place, set it to 0 (off).
+
+                                                         *g:vimroom_scrolloff*
+specifies how many lines of text ought appear before and after the cursor.
+pThis defaults to 999, which centers the cursor on the screen.
+
+                                                    *g:vimroom_sidebar_height*
+sets the height of the upper and lower “sidebars.” If you don’t want vertical
+padding, set this to 0.
+
+                                                             *g:vimroom_width*
+is the width of your workspace.
+
+
+You can bind the <Plug>VimroomToggle function to any key combination you like
+via the usual mechanisms. For example::
+>
+  nnoremap <silent> <Leader>mz <Plug>VimroomToggle
+<>
+
+Would bind the function to <Leader>mz. Trivial, right?
+
+And that’s it!
+
+==============================================================================
+vim:tw=78:ts=2:sw=2:expandtab:ft=help:norl:
diff --git a/sources_non_forked/vim-zenroom/plugin/vimroom.vim b/sources_non_forked/vim-zenroom/plugin/vimroom.vim
new file mode 100644
index 00000000..9993ed34
--- /dev/null
+++ b/sources_non_forked/vim-zenroom/plugin/vimroom.vim
@@ -0,0 +1,355 @@
+"==============================================================================
+"File:        vimroom.vim
+"Description: Vaguely emulates a writeroom-like environment in Vim by
+"             splitting the current window in such a way as to center a column
+"             of user-specified width, wrap the text, and break lines.
+"Maintainer:  Mike West <mike@mikewest.org>
+"Version:     0.7
+"Last Change: 2010-10-31
+"License:     BSD <../LICENSE.markdown>
+"==============================================================================
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Plugin Configuration
+"
+
+" The typical start to any vim plugin: If the plugin has already been loaded,
+" exit as quickly as possible.
+if exists( "g:loaded_vimroom_plugin" )
+    finish
+endif
+let g:loaded_vimroom_plugin = 1
+
+" The desired column width.  Defaults to 100:
+if !exists( "g:vimroom_width" )
+    let g:vimroom_width = 100
+endif
+
+" The minimum sidebar size.  Defaults to 5:
+if !exists( "g:vimroom_min_sidebar_width" )
+    let g:vimroom_min_sidebar_width = 5
+endif
+
+" The sidebar height.  Defaults to 3:
+if !exists( "g:vimroom_sidebar_height" )
+    let g:vimroom_sidebar_height = 2
+endif
+
+" The GUI background color.  Defaults to "black"
+if !exists( "g:vimroom_guibackground" )
+    let g:vimroom_guibackground = "#202020"
+endif
+
+" The cterm background color.  Defaults to "bg"
+if !exists( "g:vimroom_ctermbackground" )
+    let g:vimroom_ctermbackground = "bg"
+endif
+
+" The "scrolloff" value: how many lines should be kept visible above and below
+" the cursor at all times?  Defaults to 999 (which centers your cursor in the 
+" active window).
+if !exists( "g:vimroom_scrolloff" )
+    let g:vimroom_scrolloff = 0
+endif
+
+" Should Vimroom map navigational keys (`<Up>`, `<Down>`, `j`, `k`) to navigate
+" "display" lines instead of "logical" lines (which makes it much simpler to deal
+" with wrapped lines). Defaults to `1` (on). Set to `0` if you'd prefer not to
+" run the mappings.
+if !exists( "g:vimroom_navigation_keys" )
+    let g:vimroom_navigation_keys = 1
+endif
+
+" Should Vimroom clear line numbers from the Vimroomed buffer?  Defaults to `1`
+" (on). Set to `0` if you'd prefer Vimroom to leave line numbers untouched.
+" (Note that setting this to `0` will not turn line numbers on if they aren't
+" on already).
+if !exists( "g:vimroom_clear_line_numbers" )
+    let g:vimroom_clear_line_numbers = 1
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Plugin Code
+"
+
+" Given the desired column width, and minimum sidebar width, determine
+" the minimum window width necessary for splitting to make sense
+let s:minwidth = g:vimroom_width + ( g:vimroom_min_sidebar_width * 2 )
+
+" Save the current color scheme for reset later
+let s:scheme = ""
+if exists( "g:colors_name" )
+    let s:scheme = g:colors_name
+endif
+if exists( "&t_mr" )
+    let s:save_t_mr = &t_mr
+end
+
+" Save the current scrolloff value for reset later
+let s:save_scrolloff = ""
+if exists( "&scrolloff" )
+    let s:save_scrolloff = &scrolloff
+end
+
+" Save the current `laststatus` value for reset later
+let s:save_laststatus = ""
+if exists( "&laststatus" )
+    let s:save_laststatus = &laststatus
+endif
+
+" Save the current `background` value for reset later
+let s:save_background = ""
+if exists( "&background" )
+    let s:save_background = &background
+endif
+
+" Save the current `textwidth'` value for reset later
+let s:save_textwidth' = ""
+if exists( "&textwidth'" )
+    let s:save_textwidth' = &textwidth'
+endif
+
+" Save the current `showtabline` value for reset later
+let s:save_showtabline = ""
+if exists( "&showtabline" )
+    let s:save_showtabline = &showtabline
+endif
+
+" Save the current `textwidth` value for reset later
+let s:save_textwidth = ""
+if exists( "&textwidth" )
+    let s:save_textwidth = &textwidth
+endif
+
+" Save the current `number` and `relativenumber` values for reset later
+let s:save_number = 0
+let s:save_relativenumber = 0
+if exists( "&number" )
+    let s:save_number = &number
+endif
+if exists ( "&relativenumber" )
+    let s:save_relativenumber = &relativenumber
+endif
+
+" We're currently in nonvimroomized state
+let s:active  = 0
+
+function! s:is_the_screen_wide_enough()
+    return winwidth( winnr() ) >= s:minwidth
+endfunction
+
+function! s:sidebar_size()
+    return ( winwidth( winnr() ) - g:vimroom_width - 2 ) / 2
+endfunction
+
+function! s:markdown_room()
+    set background=light
+    set linespace=8
+    set textwidth=80
+    hi Normal guibg=gray95
+    hi NonText guifg=gray95
+    hi FoldColumn guibg=gray95
+    hi CursorLine guibg=gray90
+    hi Title gui=bold guifg=gray25
+    hi MarkdownHeadingDelimiter gui=bold guifg=gray25
+    hi htmlSpecialChar guifg=black
+    hi markdownError guifg=black
+    hi markdownBold gui=bold guifg=gray25
+    hi markdownItalic guifg=gray25 gui=underline
+    hi markdownUrl guifg=#2fb3a6
+    hi markdownAutomaticLink guifg=#2fb3a6
+    hi markdownLinkText guifg=#317849
+    hi markdownUrlTitle guifg=#317849
+    hi markdownBlockquote guifg=#317849 gui=bold
+    hi markdownId guifg=#2fb3a6
+    hi markdownIdDeclaration guifg=#317849 gui=bold
+    hi markdownListMarker guifg=#317849
+    hi Cursor guibg=#15abdd
+
+    if has('gui_running')
+        let l:highlightbgcolor = "guibg=#f2f2f2" 
+        let l:highlightfgbgcolor = "guifg=#f2f2f2" . " " . l:highlightbgcolor
+    else
+        let l:highlightbgcolor = "ctermbg=" . g:vimroom_ctermbackground
+        let l:highlightfgbgcolor = "ctermfg=" . g:vimroom_ctermbackground . " " . l:highlightbgcolor
+    endif
+
+    exec( "hi Normal " . l:highlightbgcolor )
+    exec( "hi VertSplit " . l:highlightfgbgcolor )
+    exec( "hi NonText " . l:highlightfgbgcolor )
+    exec( "hi StatusLine " . l:highlightfgbgcolor )
+    exec( "hi StatusLineNC " . l:highlightfgbgcolor )
+endfunction
+
+function! <SID>VimroomToggle()
+    if s:active == 1
+        let s:active = 0
+        " Close all other split windows
+        if g:vimroom_sidebar_height
+            wincmd j
+            close
+            wincmd k
+            close
+        endif
+        if g:vimroom_min_sidebar_width
+            wincmd l
+            close
+            wincmd h
+            close
+        endif
+        " Reset color scheme (or clear new colors, if no scheme is set)
+        if s:scheme != ""
+            exec( "colorscheme " . s:scheme ) 
+        else
+            hi clear
+        endif
+        if s:save_t_mr != ""
+            exec( "set t_mr=" .s:save_t_mr )
+        endif
+        " Reset `scrolloff` and `laststatus`
+        if s:save_scrolloff != ""
+            exec( "set scrolloff=" . s:save_scrolloff )
+        endif
+        if s:save_laststatus != ""
+            exec( "set laststatus=" . s:save_laststatus )
+        endif
+        if s:save_showtabline != ""
+            exec( "set showtabline=" . s:save_showtabline )
+        endif
+
+        exec( "set linespace=0" )
+
+        if s:save_background != ""
+            exec( "set background=" . s:save_background )
+        endif
+        if s:save_textwidth != ""
+            exec( "set textwidth=" . s:save_textwidth )
+        endif
+        if s:save_number != 0
+            set number
+        endif
+        if s:save_relativenumber != 0
+            set relativenumber
+        endif
+        " Remove wrapping and linebreaks
+        set nowrap
+        set nolinebreak
+
+        " Enable AirLine
+        exec("silent AirlineToggle")
+        exec("silent AirlineRefresh")
+    else
+        if s:is_the_screen_wide_enough()
+            let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+
+            if is_mark_or_rst
+                call s:markdown_room()
+            endif
+            
+            " Disable AirLine
+            exec("silent AirlineToggle")
+
+            let s:active = 1
+            let s:sidebar = s:sidebar_size()
+
+            " Turn off status bar
+            if s:save_laststatus != ""
+                setlocal laststatus=0
+            endif
+            " Turn off tabline
+            if s:save_showtabline != ""
+                setlocal showtabline=0
+            endif
+            if g:vimroom_min_sidebar_width
+                " Create the left sidebar
+                exec( "silent leftabove " . s:sidebar . "vsplit new" )
+                setlocal noma
+                setlocal nocursorline
+                setlocal nonumber
+                silent! setlocal norelativenumber
+                wincmd l
+                " Create the right sidebar
+                exec( "silent rightbelow " . s:sidebar . "vsplit new" )
+                setlocal noma
+                setlocal nocursorline
+                setlocal nonumber
+                silent! setlocal norelativenumber
+                wincmd h
+                exec( "silent vertical resize " . g:vimroom_width )
+            endif
+            if g:vimroom_sidebar_height
+                " Create the top sidebar
+                exec( "silent leftabove " . g:vimroom_sidebar_height . "split new" )
+                setlocal noma
+                setlocal nocursorline
+                setlocal nonumber
+                silent! setlocal norelativenumber
+                wincmd j
+                " Create the bottom sidebar
+                exec( "silent rightbelow " . g:vimroom_sidebar_height . "split new" )
+                setlocal noma
+                setlocal nocursorline
+                setlocal nonumber
+                silent! setlocal norelativenumber
+                wincmd k
+            endif
+            " Setup wrapping, line breaking, and push the cursor down
+            set wrap
+            set linebreak
+            if g:vimroom_clear_line_numbers
+                set nonumber
+                silent! set norelativenumber
+            endif
+            if s:save_textwidth != ""
+                exec( "set textwidth=".g:vimroom_width )
+            endif
+            if s:save_scrolloff != ""
+                exec( "set scrolloff=".g:vimroom_scrolloff )
+            endif
+
+            " Setup navigation over "display lines", not "logical lines" if
+            " mappings for the navigation keys don't already exist.
+            if g:vimroom_navigation_keys
+                try
+                    noremap     <unique> <silent> <Up> g<Up>
+                    noremap     <unique> <silent> <Down> g<Down>
+                    noremap     <unique> <silent> k gk
+                    noremap     <unique> <silent> j gj
+                    inoremap    <unique> <silent> <Up> <C-o>g<Up>
+                    inoremap    <unique> <silent> <Down> <C-o>g<Down>
+                catch /E227:/
+                    echo "Navigational key mappings already exist."
+                endtry
+            endif
+
+            " Hide distracting visual elements
+            if !is_mark_or_rst
+                if has('gui_running')
+                    let l:highlightbgcolor = "guibg=" . g:vimroom_guibackground
+                    let l:highlightfgbgcolor = "guifg=" . g:vimroom_guibackground . " " . l:highlightbgcolor
+                else
+                    let l:highlightbgcolor = "ctermbg=" . g:vimroom_ctermbackground
+                    let l:highlightfgbgcolor = "ctermfg=" . g:vimroom_ctermbackground . " " . l:highlightbgcolor
+                endif
+                exec( "hi Normal " . l:highlightbgcolor )
+                exec( "hi VertSplit " . l:highlightfgbgcolor )
+                exec( "hi NonText " . l:highlightfgbgcolor )
+                exec( "hi StatusLine " . l:highlightfgbgcolor )
+                exec( "hi StatusLineNC " . l:highlightfgbgcolor )
+            endif
+            set t_mr=""
+            set fillchars+=vert:\ 
+        endif
+    endif
+endfunction
+
+" Create a mapping for the `VimroomToggle` function
+noremap <silent> <Plug>VimroomToggle    :call <SID>VimroomToggle()<CR>
+
+" Create a `VimroomToggle` command:
+command -nargs=0 VimroomToggle call <SID>VimroomToggle()
+
+" If no mapping exists, map it to `<Leader>V`.
+if !hasmapto( '<Plug>VimroomToggle' )
+    nmap <silent> <Leader>V <Plug>VimroomToggle
+endif
diff --git a/update_plugins.py b/update_plugins.py
index 9931b378..13a0ecb0 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -33,6 +33,7 @@ vim-expand-region https://github.com/terryma/vim-expand-region
 vim-multiple-cursors https://github.com/terryma/vim-multiple-cursors
 vim-fugitive https://github.com/tpope/vim-fugitive
 vim-airline https://github.com/bling/vim-airline
+vim-zenroom https://github.com/amix/vim-zenroom
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 98af813a..cd4a8d0c 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -109,4 +109,4 @@ let g:airline_theme="luna"
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Vimroom
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-nnoremap <silent> <leader>vv :VimroomToggle<cr>
+nnoremap <silent> <leader>z :VimroomToggle<cr>

From 07bb3859a034112db6e838667861fec32c73d09f Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 28 Dec 2013 21:20:33 +0000
Subject: [PATCH 10/61] Updated vim-zenroom

---
 sources_non_forked/vim-zenroom/plugin/vimroom.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources_non_forked/vim-zenroom/plugin/vimroom.vim b/sources_non_forked/vim-zenroom/plugin/vimroom.vim
index 9993ed34..6f55d9f6 100644
--- a/sources_non_forked/vim-zenroom/plugin/vimroom.vim
+++ b/sources_non_forked/vim-zenroom/plugin/vimroom.vim
@@ -104,7 +104,7 @@ if exists( "&background" )
 endif
 
 " Save the current `textwidth'` value for reset later
-let s:save_textwidth' = ""
+let s:save_textwidth = ""
 if exists( "&textwidth'" )
     let s:save_textwidth' = &textwidth'
 endif

From 206b1566045fd005a297311e3bb42292edcf2d89 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 28 Dec 2013 21:29:23 +0000
Subject: [PATCH 11/61] Promote SOurce Code Pro

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 010ce827..54e9d7ef 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ The awesome version includes a lot of great plugins, configurations and color sc
 	git clone git://github.com/amix/vimrc.git ~/.vim_runtime
 	sh ~/.vim_runtime/install_awesome_vimrc.sh
 
+I also recommend using [Source Code Pro font from Adobe](http://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1960) (it's free and awesome font for writing and programming).
 
 ## How to install on Windows?
 

From aff839450f5971d4f761dfa3e1c8a3b1fb0b013f Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 28 Dec 2013 21:30:06 +0000
Subject: [PATCH 12/61] .

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54e9d7ef..24a00151 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The awesome version includes a lot of great plugins, configurations and color sc
 	git clone git://github.com/amix/vimrc.git ~/.vim_runtime
 	sh ~/.vim_runtime/install_awesome_vimrc.sh
 
-I also recommend using [Source Code Pro font from Adobe](http://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1960) (it's free and awesome font for writing and programming).
+I also recommend using [Source Code Pro font from Adobe](http://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1960) (it's free and awesome font for writing and programming). The Awesome vimrc is already setup to try to use it
 
 ## How to install on Windows?
 

From 3985889bc649061d4adc83fd653407dce2826275 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 09:38:25 +0000
Subject: [PATCH 13/61] Fixed a typo. Added the shotcut for vim-zenroom.

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 24a00151..b75a080d 100644
--- a/README.md
+++ b/README.md
@@ -304,6 +304,9 @@ Vimscript mappings:
     map <leader>n :cn<cr>
     map <leader>p :cp<cr>
 
+### vim-zenroom
+vim-zenroom (my fork of [vimroom](https://github.com/mikewest/vimroom)) lets you only focus on one thing at a time. It removes all the distractions and centers the content. You can open it by typing:
+`<leader>z`
 
 ## Useful blog tips regarding my Vim setup
 
@@ -315,4 +318,4 @@ Vimscript mappings:
 * [Vim tips: Visual Search](http://amix.dk/blog/post/19334#Vim-tips-Visual-Search)
 * [Folding in Vim](http://amix.dk/blog/post/19132#Folding-in-Vim)
 * [
-Zen room for Vim: Focsuing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)
+Zen room for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)

From c3fdf943a181f76144ff7d8aa086c92f897e38a8 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 09:42:02 +0000
Subject: [PATCH 14/61] Move into right section (documentation of zenroom)

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b75a080d..b1725623 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,10 @@ Managing the [NERD Tree](https://github.com/scrooloose/nerdtree) plugin:
     map <leader>nb :NERDTreeFromBookmark 
     map <leader>nf :NERDTreeFind<cr>
 
+[vim-zenroom](https://github.com/mikewest/vimroom) (my fork of [vimroom](https://github.com/mikewest/vimroom)) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It only has one mapping.
+
+    map <leader>z :VimroomToggle<cr>
+
 ### Normal mode mappings
 
 Fast saving of a buffer:
@@ -304,10 +308,6 @@ Vimscript mappings:
     map <leader>n :cn<cr>
     map <leader>p :cp<cr>
 
-### vim-zenroom
-vim-zenroom (my fork of [vimroom](https://github.com/mikewest/vimroom)) lets you only focus on one thing at a time. It removes all the distractions and centers the content. You can open it by typing:
-`<leader>z`
-
 ## Useful blog tips regarding my Vim setup
 
 * [Vim: Annotate strings with gettext (the macro way)](http://amix.dk/blog/post/19678#Vim-Annotate-strings-with-gettext-the-macro-way)

From 7654d5264cf7796b475dad506983d1709c6f5147 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 10:37:14 +0000
Subject: [PATCH 15/61] Added goyo.vim and vim-zenroom2

---
 README.md                                     |   8 +-
 sources_non_forked/bufexplorer/doc/tags       |  24 --
 sources_non_forked/goyo.vim                   |   1 +
 sources_non_forked/taglist.vim/doc/tags       |  62 ---
 .../vim-airline/doc/airline.txt               |   2 +-
 sources_non_forked/vim-expand-region/doc/tags |  10 -
 .../vim-multiple-cursors/doc/tags             |  21 --
 .../vim-zenroom/LICENSE.markdown              |  12 -
 .../vim-zenroom/README.markdown               |  20 -
 sources_non_forked/vim-zenroom/doc/tags       |  12 -
 .../vim-zenroom/doc/vimroom.txt               |  86 -----
 .../vim-zenroom/plugin/vimroom.vim            | 355 ------------------
 .../vim-zenroom2/README.markdown              |  20 +
 .../vim-zenroom2/plugin/zenroom2.vim          |  95 +++++
 update_plugins.py                             |   2 +-
 vimrcs/plugins_config.vim                     |   3 +-
 16 files changed, 124 insertions(+), 609 deletions(-)
 delete mode 100644 sources_non_forked/bufexplorer/doc/tags
 create mode 160000 sources_non_forked/goyo.vim
 delete mode 100644 sources_non_forked/taglist.vim/doc/tags
 delete mode 100644 sources_non_forked/vim-expand-region/doc/tags
 delete mode 100644 sources_non_forked/vim-multiple-cursors/doc/tags
 delete mode 100644 sources_non_forked/vim-zenroom/LICENSE.markdown
 delete mode 100644 sources_non_forked/vim-zenroom/README.markdown
 delete mode 100644 sources_non_forked/vim-zenroom/doc/tags
 delete mode 100644 sources_non_forked/vim-zenroom/doc/vimroom.txt
 delete mode 100644 sources_non_forked/vim-zenroom/plugin/vimroom.vim
 create mode 100644 sources_non_forked/vim-zenroom2/README.markdown
 create mode 100644 sources_non_forked/vim-zenroom2/plugin/zenroom2.vim

diff --git a/README.md b/README.md
index b1725623..a8a8e143 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,8 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination.
 * [vim-airline](https://github.com/bling/vim-airline): Lean & mean status/tabline for vim that's light as air (replacing powerline)
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
-* [vim-zenroom](https://github.com/amix/vim-zenroom): 
-Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential)
+* [goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2): 
+Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744)
 
 
 ## What color schemes are included?
@@ -139,9 +139,9 @@ Managing the [NERD Tree](https://github.com/scrooloose/nerdtree) plugin:
     map <leader>nb :NERDTreeFromBookmark 
     map <leader>nf :NERDTreeFind<cr>
 
-[vim-zenroom](https://github.com/mikewest/vimroom) (my fork of [vimroom](https://github.com/mikewest/vimroom)) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It only has one mapping.
+[goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2) lets you only focus on one thing at a time. It removes all the distractions and centers the content. It has a special look when editing Markdown, reStructuredText and textfiles. It only has one mapping.
 
-    map <leader>z :VimroomToggle<cr>
+    map <leader>z :Goyo<cr>
 
 ### Normal mode mappings
 
diff --git a/sources_non_forked/bufexplorer/doc/tags b/sources_non_forked/bufexplorer/doc/tags
deleted file mode 100644
index 5432bc98..00000000
--- a/sources_non_forked/bufexplorer/doc/tags
+++ /dev/null
@@ -1,24 +0,0 @@
-bufexplorer	bufexplorer.txt	/*bufexplorer*
-bufexplorer-changelog	bufexplorer.txt	/*bufexplorer-changelog*
-bufexplorer-credits	bufexplorer.txt	/*bufexplorer-credits*
-bufexplorer-customization	bufexplorer.txt	/*bufexplorer-customization*
-bufexplorer-installation	bufexplorer.txt	/*bufexplorer-installation*
-bufexplorer-todo	bufexplorer.txt	/*bufexplorer-todo*
-bufexplorer-usage	bufexplorer.txt	/*bufexplorer-usage*
-bufexplorer-windowlayout	bufexplorer.txt	/*bufexplorer-windowlayout*
-bufexplorer.txt	bufexplorer.txt	/*bufexplorer.txt*
-buffer-explorer	bufexplorer.txt	/*buffer-explorer*
-g:bufExplorerChgWin	bufexplorer.txt	/*g:bufExplorerChgWin*
-g:bufExplorerDefaultHelp	bufexplorer.txt	/*g:bufExplorerDefaultHelp*
-g:bufExplorerDetailedHelp	bufexplorer.txt	/*g:bufExplorerDetailedHelp*
-g:bufExplorerFindActive	bufexplorer.txt	/*g:bufExplorerFindActive*
-g:bufExplorerFuncRef	bufexplorer.txt	/*g:bufExplorerFuncRef*
-g:bufExplorerReverseSort	bufexplorer.txt	/*g:bufExplorerReverseSort*
-g:bufExplorerShowDirectories	bufexplorer.txt	/*g:bufExplorerShowDirectories*
-g:bufExplorerShowRelativePath	bufexplorer.txt	/*g:bufExplorerShowRelativePath*
-g:bufExplorerShowTabBuffer	bufexplorer.txt	/*g:bufExplorerShowTabBuffer*
-g:bufExplorerShowUnlisted	bufexplorer.txt	/*g:bufExplorerShowUnlisted*
-g:bufExplorerSortBy	bufexplorer.txt	/*g:bufExplorerSortBy*
-g:bufExplorerSplitBelow	bufexplorer.txt	/*g:bufExplorerSplitBelow*
-g:bufExplorerSplitOutPathName	bufexplorer.txt	/*g:bufExplorerSplitOutPathName*
-g:bufExplorerSplitRight	bufexplorer.txt	/*g:bufExplorerSplitRight*
diff --git a/sources_non_forked/goyo.vim b/sources_non_forked/goyo.vim
new file mode 160000
index 00000000..6011742c
--- /dev/null
+++ b/sources_non_forked/goyo.vim
@@ -0,0 +1 @@
+Subproject commit 6011742c2993315b3489e20d89d730917b8e2548
diff --git a/sources_non_forked/taglist.vim/doc/tags b/sources_non_forked/taglist.vim/doc/tags
deleted file mode 100644
index 83e80ba1..00000000
--- a/sources_non_forked/taglist.vim/doc/tags
+++ /dev/null
@@ -1,62 +0,0 @@
-'Tlist_Auto_Highlight_Tag'	taglist.txt	/*'Tlist_Auto_Highlight_Tag'*
-'Tlist_Auto_Open'	taglist.txt	/*'Tlist_Auto_Open'*
-'Tlist_Auto_Update'	taglist.txt	/*'Tlist_Auto_Update'*
-'Tlist_Close_On_Select'	taglist.txt	/*'Tlist_Close_On_Select'*
-'Tlist_Compact_Format'	taglist.txt	/*'Tlist_Compact_Format'*
-'Tlist_Ctags_Cmd'	taglist.txt	/*'Tlist_Ctags_Cmd'*
-'Tlist_Display_Prototype'	taglist.txt	/*'Tlist_Display_Prototype'*
-'Tlist_Display_Tag_Scope'	taglist.txt	/*'Tlist_Display_Tag_Scope'*
-'Tlist_Enable_Fold_Column'	taglist.txt	/*'Tlist_Enable_Fold_Column'*
-'Tlist_Exit_OnlyWindow'	taglist.txt	/*'Tlist_Exit_OnlyWindow'*
-'Tlist_File_Fold_Auto_Close'	taglist.txt	/*'Tlist_File_Fold_Auto_Close'*
-'Tlist_GainFocus_On_ToggleOpen'	taglist.txt	/*'Tlist_GainFocus_On_ToggleOpen'*
-'Tlist_Highlight_Tag_On_BufEnter'	taglist.txt	/*'Tlist_Highlight_Tag_On_BufEnter'*
-'Tlist_Inc_Winwidth'	taglist.txt	/*'Tlist_Inc_Winwidth'*
-'Tlist_Max_Submenu_Items'	taglist.txt	/*'Tlist_Max_Submenu_Items'*
-'Tlist_Max_Tag_Length'	taglist.txt	/*'Tlist_Max_Tag_Length'*
-'Tlist_Process_File_Always'	taglist.txt	/*'Tlist_Process_File_Always'*
-'Tlist_Show_Menu'	taglist.txt	/*'Tlist_Show_Menu'*
-'Tlist_Show_One_File'	taglist.txt	/*'Tlist_Show_One_File'*
-'Tlist_Sort_Type'	taglist.txt	/*'Tlist_Sort_Type'*
-'Tlist_Use_Horiz_Window'	taglist.txt	/*'Tlist_Use_Horiz_Window'*
-'Tlist_Use_Right_Window'	taglist.txt	/*'Tlist_Use_Right_Window'*
-'Tlist_Use_SingleClick'	taglist.txt	/*'Tlist_Use_SingleClick'*
-'Tlist_WinHeight'	taglist.txt	/*'Tlist_WinHeight'*
-'Tlist_WinWidth'	taglist.txt	/*'Tlist_WinWidth'*
-:TlistAddFiles	taglist.txt	/*:TlistAddFiles*
-:TlistAddFilesRecursive	taglist.txt	/*:TlistAddFilesRecursive*
-:TlistClose	taglist.txt	/*:TlistClose*
-:TlistDebug	taglist.txt	/*:TlistDebug*
-:TlistHighlightTag	taglist.txt	/*:TlistHighlightTag*
-:TlistLock	taglist.txt	/*:TlistLock*
-:TlistMessages	taglist.txt	/*:TlistMessages*
-:TlistOpen	taglist.txt	/*:TlistOpen*
-:TlistSessionLoad	taglist.txt	/*:TlistSessionLoad*
-:TlistSessionSave	taglist.txt	/*:TlistSessionSave*
-:TlistShowPrototype	taglist.txt	/*:TlistShowPrototype*
-:TlistShowTag	taglist.txt	/*:TlistShowTag*
-:TlistToggle	taglist.txt	/*:TlistToggle*
-:TlistUndebug	taglist.txt	/*:TlistUndebug*
-:TlistUnlock	taglist.txt	/*:TlistUnlock*
-:TlistUpdate	taglist.txt	/*:TlistUpdate*
-Tlist_Get_Tag_Prototype_By_Line()	taglist.txt	/*Tlist_Get_Tag_Prototype_By_Line()*
-Tlist_Get_Tagname_By_Line()	taglist.txt	/*Tlist_Get_Tagname_By_Line()*
-Tlist_Set_App()	taglist.txt	/*Tlist_Set_App()*
-Tlist_Update_File_Tags()	taglist.txt	/*Tlist_Update_File_Tags()*
-taglist-commands	taglist.txt	/*taglist-commands*
-taglist-debug	taglist.txt	/*taglist-debug*
-taglist-extend	taglist.txt	/*taglist-extend*
-taglist-faq	taglist.txt	/*taglist-faq*
-taglist-functions	taglist.txt	/*taglist-functions*
-taglist-install	taglist.txt	/*taglist-install*
-taglist-internet	taglist.txt	/*taglist-internet*
-taglist-intro	taglist.txt	/*taglist-intro*
-taglist-keys	taglist.txt	/*taglist-keys*
-taglist-license	taglist.txt	/*taglist-license*
-taglist-menu	taglist.txt	/*taglist-menu*
-taglist-options	taglist.txt	/*taglist-options*
-taglist-requirements	taglist.txt	/*taglist-requirements*
-taglist-session	taglist.txt	/*taglist-session*
-taglist-todo	taglist.txt	/*taglist-todo*
-taglist-using	taglist.txt	/*taglist-using*
-taglist.txt	taglist.txt	/*taglist.txt*
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index bfe7cb3f..8b8da8bd 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -283,7 +283,7 @@ syntastic <https://github.com/scrooloose/syntastic>
   let g:airline#extensions#syntastic#enabled = 1
 <
 -------------------------------------                       *airline-tagbar*
-tagbar <https://github.com/majutsushi/>
+tagbar <https://github.com/majutsushi/tagbar>
 
 * enable/disable tagbar integration >
   let g:airline#extensions#tagbar#enabled = 1
diff --git a/sources_non_forked/vim-expand-region/doc/tags b/sources_non_forked/vim-expand-region/doc/tags
deleted file mode 100644
index 402a0c43..00000000
--- a/sources_non_forked/vim-expand-region/doc/tags
+++ /dev/null
@@ -1,10 +0,0 @@
-expand-region-about	expand_region.txt	/*expand-region-about*
-expand-region-contents	expand_region.txt	/*expand-region-contents*
-expand-region-global-options	expand_region.txt	/*expand-region-global-options*
-expand-region-intro	expand_region.txt	/*expand-region-intro*
-expand-region-mappings	expand_region.txt	/*expand-region-mappings*
-expand-region-usage	expand_region.txt	/*expand-region-usage*
-expand_region_text_objects	expand_region.txt	/*expand_region_text_objects*
-expand_region_use_select_mode	expand_region.txt	/*expand_region_use_select_mode*
-vim-expand-region.txt	expand_region.txt	/*vim-expand-region.txt*
-vim-expand-regions	expand_region.txt	/*vim-expand-regions*
diff --git a/sources_non_forked/vim-multiple-cursors/doc/tags b/sources_non_forked/vim-multiple-cursors/doc/tags
deleted file mode 100644
index 5efd6085..00000000
--- a/sources_non_forked/vim-multiple-cursors/doc/tags
+++ /dev/null
@@ -1,21 +0,0 @@
-MultipleCursorsFind	multiple_cursors.txt	/*MultipleCursorsFind*
-g:multi_cursor_exit_from_insert_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_insert_mode*
-g:multi_cursor_exit_from_visual_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_visual_mode*
-g:multi_cursor_next_key	multiple_cursors.txt	/*g:multi_cursor_next_key*
-g:multi_cursor_prev_key	multiple_cursors.txt	/*g:multi_cursor_prev_key*
-g:multi_cursor_quit_key	multiple_cursors.txt	/*g:multi_cursor_quit_key*
-g:multi_cursor_skip_key	multiple_cursors.txt	/*g:multi_cursor_skip_key*
-g:multi_cursor_start_key	multiple_cursors.txt	/*g:multi_cursor_start_key*
-g:multi_cursor_use_default_mapping	multiple_cursors.txt	/*g:multi_cursor_use_default_mapping*
-multiple-cursors-contents	multiple_cursors.txt	/*multiple-cursors-contents*
-multiple-cursors-contributing	multiple_cursors.txt	/*multiple-cursors-contributing*
-multiple-cursors-credit	multiple_cursors.txt	/*multiple-cursors-credit*
-multiple-cursors-global-options	multiple_cursors.txt	/*multiple-cursors-global-options*
-multiple-cursors-intro	multiple_cursors.txt	/*multiple-cursors-intro*
-multiple-cursors-issues	multiple_cursors.txt	/*multiple-cursors-issues*
-multiple-cursors-license	multiple_cursors.txt	/*multiple-cursors-license*
-multiple-cursors-mappings	multiple_cursors.txt	/*multiple-cursors-mappings*
-multiple-cursors-references	multiple_cursors.txt	/*multiple-cursors-references*
-multiple-cursors-usage	multiple_cursors.txt	/*multiple-cursors-usage*
-vim-multiple-cursors	multiple_cursors.txt	/*vim-multiple-cursors*
-vim-multiple-cursors.txt	multiple_cursors.txt	/*vim-multiple-cursors.txt*
diff --git a/sources_non_forked/vim-zenroom/LICENSE.markdown b/sources_non_forked/vim-zenroom/LICENSE.markdown
deleted file mode 100644
index 36603def..00000000
--- a/sources_non_forked/vim-zenroom/LICENSE.markdown
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2010 Mike West, http://mikewest.org/
-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 software  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/sources_non_forked/vim-zenroom/README.markdown b/sources_non_forked/vim-zenroom/README.markdown
deleted file mode 100644
index 238f1c9d..00000000
--- a/sources_non_forked/vim-zenroom/README.markdown
+++ /dev/null
@@ -1,20 +0,0 @@
-This is my fork of Vimroom which includes following:
-
-* A special mode for editing Markdown and reStructuredText. It's highly inspired by  [iA Writer](http://writer.pro/)
-* Optimizations for [my vimrc](https://github.com/amix/vimrc)
-
-Pelase read more here [
-zenroom for Vim: Focsuing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential).
-
-
-## Editing code
-
-![Screenshot 1](http://amix.dk/uploads/zenroom_code.jpg)
-
-![Screenshot 2](http://amix.dk/uploads/zenroom_code_1.jpg)
-
-## Updating documentation
-
-![Screenshot 3](http://amix.dk/uploads/zenroom_documentation.jpg)
-
-![Screenshot 4](http://amix.dk/uploads/zenroom_documentation_1.jpg)
diff --git a/sources_non_forked/vim-zenroom/doc/tags b/sources_non_forked/vim-zenroom/doc/tags
deleted file mode 100644
index 1773f538..00000000
--- a/sources_non_forked/vim-zenroom/doc/tags
+++ /dev/null
@@ -1,12 +0,0 @@
-g:vimroom_background	vimroom.txt	/*g:vimroom_background*
-g:vimroom_min_sidebar_width	vimroom.txt	/*g:vimroom_min_sidebar_width*
-g:vimroom_navigational_keys	vimroom.txt	/*g:vimroom_navigational_keys*
-g:vimroom_scrolloff	vimroom.txt	/*g:vimroom_scrolloff*
-g:vimroom_sidebar_height	vimroom.txt	/*g:vimroom_sidebar_height*
-g:vimroom_width	vimroom.txt	/*g:vimroom_width*
-vimroom	vimroom.txt	/*vimroom*
-vimroom-about	vimroom.txt	/*vimroom-about*
-vimroom-configuration	vimroom.txt	/*vimroom-configuration*
-vimroom-installation	vimroom.txt	/*vimroom-installation*
-vimroom-toc	vimroom.txt	/*vimroom-toc*
-vimroom.txt	vimroom.txt	/*vimroom.txt*
diff --git a/sources_non_forked/vim-zenroom/doc/vimroom.txt b/sources_non_forked/vim-zenroom/doc/vimroom.txt
deleted file mode 100644
index 0522ea75..00000000
--- a/sources_non_forked/vim-zenroom/doc/vimroom.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-*vimroom.txt*
-
-==============================================================================
-TABLE OF CONTENTS                                          *vimroom* *vimroom-toc*
-
-  1. About                                                       |vimroom-about|
-  2. Installation                                         |vimroom-installation|
-  3. Configuration                                       |vimroom-configuration|
-
-==============================================================================
-ABOUT                                                            *vimroom-about*
-
-I do most of my writing in Vim, because I’m a big nerd. It does most of what
-I want a writing environment to do, but I miss some of the “distraction free"
-features of the quite exceptional WriteRoom. Fullscreening Vim means that text
-ends up flat up against the left side of my monitor, but I’d much prefer it to
-be centered. I’d also like a little of the visual clutter to fade away.  Some
-of this is possible with MacVim, but I’d rather do as much as possible in
-a platform-independent way. So, command-line Vim it is.
-
-For more visit:
-  http://projects.mikewest.org/vimroom/
-  https://github.com/mikewest/vimroom
-
-==============================================================================
-INSTALLATION                                              *vimroom-installation*
-
-I think the best way to install Vim plugins is via Tim Pope’s Pathogen. Using
-that plugin, you can simply clone the VimRoom repository into your bundles
-directory, and you’re done.
-
-Without Pathogen, installation is almost as trivial: simply copy
-./plugins/vimroom.vim from the repository into your plugins directory. That’s
-it!
-
-==============================================================================
-CONFIGURATION                                            *vimroom-configuration*
-
-By default, VimRoom binds <Leader>V to <Plug>VimroomToggle, and sets up an 80
-column workspace with at least 5 columns of space on either side (it doesn’t
-help at all to have single-column sidebars, you see), and 3 lines of space
-above and below. It assumes a black background when hiding visual
-distractions. As of v0.4, VimRoom also sets up a :VimroomToggle command that
-has the same effect.
-
-Changing any of these assumptions is a simple matter of setting variables in
-your .vimrc.
-
-                                                        *g:vimroom_background*
-is the background color to be used for hiding elements.  Set this to your
-terminal’s background color (“white”, “black”, etc.)
-
-                                                 *g:vimroom_min_sidebar_width*
-is the minimum sidebar width. This will automatically expand to take up all
-the free space left after setting the main workspace window to g:vimroom_width
-pcolumns.
-
-                                                 *g:vimroom_navigational_keys*
-determines whether Vimroom will map keys like <Up>, <Down>, j, and k to
-navigate over “display” lines, rather than “logical” lines. This defaults to
-p1 (on), if you’d prefer the mapping not take place, set it to 0 (off).
-
-                                                         *g:vimroom_scrolloff*
-specifies how many lines of text ought appear before and after the cursor.
-pThis defaults to 999, which centers the cursor on the screen.
-
-                                                    *g:vimroom_sidebar_height*
-sets the height of the upper and lower “sidebars.” If you don’t want vertical
-padding, set this to 0.
-
-                                                             *g:vimroom_width*
-is the width of your workspace.
-
-
-You can bind the <Plug>VimroomToggle function to any key combination you like
-via the usual mechanisms. For example::
->
-  nnoremap <silent> <Leader>mz <Plug>VimroomToggle
-<>
-
-Would bind the function to <Leader>mz. Trivial, right?
-
-And that’s it!
-
-==============================================================================
-vim:tw=78:ts=2:sw=2:expandtab:ft=help:norl:
diff --git a/sources_non_forked/vim-zenroom/plugin/vimroom.vim b/sources_non_forked/vim-zenroom/plugin/vimroom.vim
deleted file mode 100644
index 6f55d9f6..00000000
--- a/sources_non_forked/vim-zenroom/plugin/vimroom.vim
+++ /dev/null
@@ -1,355 +0,0 @@
-"==============================================================================
-"File:        vimroom.vim
-"Description: Vaguely emulates a writeroom-like environment in Vim by
-"             splitting the current window in such a way as to center a column
-"             of user-specified width, wrap the text, and break lines.
-"Maintainer:  Mike West <mike@mikewest.org>
-"Version:     0.7
-"Last Change: 2010-10-31
-"License:     BSD <../LICENSE.markdown>
-"==============================================================================
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Plugin Configuration
-"
-
-" The typical start to any vim plugin: If the plugin has already been loaded,
-" exit as quickly as possible.
-if exists( "g:loaded_vimroom_plugin" )
-    finish
-endif
-let g:loaded_vimroom_plugin = 1
-
-" The desired column width.  Defaults to 100:
-if !exists( "g:vimroom_width" )
-    let g:vimroom_width = 100
-endif
-
-" The minimum sidebar size.  Defaults to 5:
-if !exists( "g:vimroom_min_sidebar_width" )
-    let g:vimroom_min_sidebar_width = 5
-endif
-
-" The sidebar height.  Defaults to 3:
-if !exists( "g:vimroom_sidebar_height" )
-    let g:vimroom_sidebar_height = 2
-endif
-
-" The GUI background color.  Defaults to "black"
-if !exists( "g:vimroom_guibackground" )
-    let g:vimroom_guibackground = "#202020"
-endif
-
-" The cterm background color.  Defaults to "bg"
-if !exists( "g:vimroom_ctermbackground" )
-    let g:vimroom_ctermbackground = "bg"
-endif
-
-" The "scrolloff" value: how many lines should be kept visible above and below
-" the cursor at all times?  Defaults to 999 (which centers your cursor in the 
-" active window).
-if !exists( "g:vimroom_scrolloff" )
-    let g:vimroom_scrolloff = 0
-endif
-
-" Should Vimroom map navigational keys (`<Up>`, `<Down>`, `j`, `k`) to navigate
-" "display" lines instead of "logical" lines (which makes it much simpler to deal
-" with wrapped lines). Defaults to `1` (on). Set to `0` if you'd prefer not to
-" run the mappings.
-if !exists( "g:vimroom_navigation_keys" )
-    let g:vimroom_navigation_keys = 1
-endif
-
-" Should Vimroom clear line numbers from the Vimroomed buffer?  Defaults to `1`
-" (on). Set to `0` if you'd prefer Vimroom to leave line numbers untouched.
-" (Note that setting this to `0` will not turn line numbers on if they aren't
-" on already).
-if !exists( "g:vimroom_clear_line_numbers" )
-    let g:vimroom_clear_line_numbers = 1
-endif
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Plugin Code
-"
-
-" Given the desired column width, and minimum sidebar width, determine
-" the minimum window width necessary for splitting to make sense
-let s:minwidth = g:vimroom_width + ( g:vimroom_min_sidebar_width * 2 )
-
-" Save the current color scheme for reset later
-let s:scheme = ""
-if exists( "g:colors_name" )
-    let s:scheme = g:colors_name
-endif
-if exists( "&t_mr" )
-    let s:save_t_mr = &t_mr
-end
-
-" Save the current scrolloff value for reset later
-let s:save_scrolloff = ""
-if exists( "&scrolloff" )
-    let s:save_scrolloff = &scrolloff
-end
-
-" Save the current `laststatus` value for reset later
-let s:save_laststatus = ""
-if exists( "&laststatus" )
-    let s:save_laststatus = &laststatus
-endif
-
-" Save the current `background` value for reset later
-let s:save_background = ""
-if exists( "&background" )
-    let s:save_background = &background
-endif
-
-" Save the current `textwidth'` value for reset later
-let s:save_textwidth = ""
-if exists( "&textwidth'" )
-    let s:save_textwidth' = &textwidth'
-endif
-
-" Save the current `showtabline` value for reset later
-let s:save_showtabline = ""
-if exists( "&showtabline" )
-    let s:save_showtabline = &showtabline
-endif
-
-" Save the current `textwidth` value for reset later
-let s:save_textwidth = ""
-if exists( "&textwidth" )
-    let s:save_textwidth = &textwidth
-endif
-
-" Save the current `number` and `relativenumber` values for reset later
-let s:save_number = 0
-let s:save_relativenumber = 0
-if exists( "&number" )
-    let s:save_number = &number
-endif
-if exists ( "&relativenumber" )
-    let s:save_relativenumber = &relativenumber
-endif
-
-" We're currently in nonvimroomized state
-let s:active  = 0
-
-function! s:is_the_screen_wide_enough()
-    return winwidth( winnr() ) >= s:minwidth
-endfunction
-
-function! s:sidebar_size()
-    return ( winwidth( winnr() ) - g:vimroom_width - 2 ) / 2
-endfunction
-
-function! s:markdown_room()
-    set background=light
-    set linespace=8
-    set textwidth=80
-    hi Normal guibg=gray95
-    hi NonText guifg=gray95
-    hi FoldColumn guibg=gray95
-    hi CursorLine guibg=gray90
-    hi Title gui=bold guifg=gray25
-    hi MarkdownHeadingDelimiter gui=bold guifg=gray25
-    hi htmlSpecialChar guifg=black
-    hi markdownError guifg=black
-    hi markdownBold gui=bold guifg=gray25
-    hi markdownItalic guifg=gray25 gui=underline
-    hi markdownUrl guifg=#2fb3a6
-    hi markdownAutomaticLink guifg=#2fb3a6
-    hi markdownLinkText guifg=#317849
-    hi markdownUrlTitle guifg=#317849
-    hi markdownBlockquote guifg=#317849 gui=bold
-    hi markdownId guifg=#2fb3a6
-    hi markdownIdDeclaration guifg=#317849 gui=bold
-    hi markdownListMarker guifg=#317849
-    hi Cursor guibg=#15abdd
-
-    if has('gui_running')
-        let l:highlightbgcolor = "guibg=#f2f2f2" 
-        let l:highlightfgbgcolor = "guifg=#f2f2f2" . " " . l:highlightbgcolor
-    else
-        let l:highlightbgcolor = "ctermbg=" . g:vimroom_ctermbackground
-        let l:highlightfgbgcolor = "ctermfg=" . g:vimroom_ctermbackground . " " . l:highlightbgcolor
-    endif
-
-    exec( "hi Normal " . l:highlightbgcolor )
-    exec( "hi VertSplit " . l:highlightfgbgcolor )
-    exec( "hi NonText " . l:highlightfgbgcolor )
-    exec( "hi StatusLine " . l:highlightfgbgcolor )
-    exec( "hi StatusLineNC " . l:highlightfgbgcolor )
-endfunction
-
-function! <SID>VimroomToggle()
-    if s:active == 1
-        let s:active = 0
-        " Close all other split windows
-        if g:vimroom_sidebar_height
-            wincmd j
-            close
-            wincmd k
-            close
-        endif
-        if g:vimroom_min_sidebar_width
-            wincmd l
-            close
-            wincmd h
-            close
-        endif
-        " Reset color scheme (or clear new colors, if no scheme is set)
-        if s:scheme != ""
-            exec( "colorscheme " . s:scheme ) 
-        else
-            hi clear
-        endif
-        if s:save_t_mr != ""
-            exec( "set t_mr=" .s:save_t_mr )
-        endif
-        " Reset `scrolloff` and `laststatus`
-        if s:save_scrolloff != ""
-            exec( "set scrolloff=" . s:save_scrolloff )
-        endif
-        if s:save_laststatus != ""
-            exec( "set laststatus=" . s:save_laststatus )
-        endif
-        if s:save_showtabline != ""
-            exec( "set showtabline=" . s:save_showtabline )
-        endif
-
-        exec( "set linespace=0" )
-
-        if s:save_background != ""
-            exec( "set background=" . s:save_background )
-        endif
-        if s:save_textwidth != ""
-            exec( "set textwidth=" . s:save_textwidth )
-        endif
-        if s:save_number != 0
-            set number
-        endif
-        if s:save_relativenumber != 0
-            set relativenumber
-        endif
-        " Remove wrapping and linebreaks
-        set nowrap
-        set nolinebreak
-
-        " Enable AirLine
-        exec("silent AirlineToggle")
-        exec("silent AirlineRefresh")
-    else
-        if s:is_the_screen_wide_enough()
-            let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
-
-            if is_mark_or_rst
-                call s:markdown_room()
-            endif
-            
-            " Disable AirLine
-            exec("silent AirlineToggle")
-
-            let s:active = 1
-            let s:sidebar = s:sidebar_size()
-
-            " Turn off status bar
-            if s:save_laststatus != ""
-                setlocal laststatus=0
-            endif
-            " Turn off tabline
-            if s:save_showtabline != ""
-                setlocal showtabline=0
-            endif
-            if g:vimroom_min_sidebar_width
-                " Create the left sidebar
-                exec( "silent leftabove " . s:sidebar . "vsplit new" )
-                setlocal noma
-                setlocal nocursorline
-                setlocal nonumber
-                silent! setlocal norelativenumber
-                wincmd l
-                " Create the right sidebar
-                exec( "silent rightbelow " . s:sidebar . "vsplit new" )
-                setlocal noma
-                setlocal nocursorline
-                setlocal nonumber
-                silent! setlocal norelativenumber
-                wincmd h
-                exec( "silent vertical resize " . g:vimroom_width )
-            endif
-            if g:vimroom_sidebar_height
-                " Create the top sidebar
-                exec( "silent leftabove " . g:vimroom_sidebar_height . "split new" )
-                setlocal noma
-                setlocal nocursorline
-                setlocal nonumber
-                silent! setlocal norelativenumber
-                wincmd j
-                " Create the bottom sidebar
-                exec( "silent rightbelow " . g:vimroom_sidebar_height . "split new" )
-                setlocal noma
-                setlocal nocursorline
-                setlocal nonumber
-                silent! setlocal norelativenumber
-                wincmd k
-            endif
-            " Setup wrapping, line breaking, and push the cursor down
-            set wrap
-            set linebreak
-            if g:vimroom_clear_line_numbers
-                set nonumber
-                silent! set norelativenumber
-            endif
-            if s:save_textwidth != ""
-                exec( "set textwidth=".g:vimroom_width )
-            endif
-            if s:save_scrolloff != ""
-                exec( "set scrolloff=".g:vimroom_scrolloff )
-            endif
-
-            " Setup navigation over "display lines", not "logical lines" if
-            " mappings for the navigation keys don't already exist.
-            if g:vimroom_navigation_keys
-                try
-                    noremap     <unique> <silent> <Up> g<Up>
-                    noremap     <unique> <silent> <Down> g<Down>
-                    noremap     <unique> <silent> k gk
-                    noremap     <unique> <silent> j gj
-                    inoremap    <unique> <silent> <Up> <C-o>g<Up>
-                    inoremap    <unique> <silent> <Down> <C-o>g<Down>
-                catch /E227:/
-                    echo "Navigational key mappings already exist."
-                endtry
-            endif
-
-            " Hide distracting visual elements
-            if !is_mark_or_rst
-                if has('gui_running')
-                    let l:highlightbgcolor = "guibg=" . g:vimroom_guibackground
-                    let l:highlightfgbgcolor = "guifg=" . g:vimroom_guibackground . " " . l:highlightbgcolor
-                else
-                    let l:highlightbgcolor = "ctermbg=" . g:vimroom_ctermbackground
-                    let l:highlightfgbgcolor = "ctermfg=" . g:vimroom_ctermbackground . " " . l:highlightbgcolor
-                endif
-                exec( "hi Normal " . l:highlightbgcolor )
-                exec( "hi VertSplit " . l:highlightfgbgcolor )
-                exec( "hi NonText " . l:highlightfgbgcolor )
-                exec( "hi StatusLine " . l:highlightfgbgcolor )
-                exec( "hi StatusLineNC " . l:highlightfgbgcolor )
-            endif
-            set t_mr=""
-            set fillchars+=vert:\ 
-        endif
-    endif
-endfunction
-
-" Create a mapping for the `VimroomToggle` function
-noremap <silent> <Plug>VimroomToggle    :call <SID>VimroomToggle()<CR>
-
-" Create a `VimroomToggle` command:
-command -nargs=0 VimroomToggle call <SID>VimroomToggle()
-
-" If no mapping exists, map it to `<Leader>V`.
-if !hasmapto( '<Plug>VimroomToggle' )
-    nmap <silent> <Leader>V <Plug>VimroomToggle
-endif
diff --git a/sources_non_forked/vim-zenroom2/README.markdown b/sources_non_forked/vim-zenroom2/README.markdown
new file mode 100644
index 00000000..f7c0121d
--- /dev/null
+++ b/sources_non_forked/vim-zenroom2/README.markdown
@@ -0,0 +1,20 @@
+This is a Vim extension that emulates iA Writer environment when editing Markdown, reStructuredText or text files.
+
+It requires [goyo.vim](https://github.com/junegunn/goyo.vim) and it works by setting global Goyo callbacks that triggers special setup for Markdown, reStructuredText and text files.
+
+This is an improvement of my initial version called [vim-zenroom](https://github.com/amix/vim-zenroom). Please read more here [
+zenroom for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential).
+
+
+## Inspirations/Similar
+* [lite-dfm](https://github.com/bilalq/lite-dfm)
+* [vimroom](https://github.com/mikewest/vimroom)
+* [vim-zenroom](https://github.com/amix/vim-zenroom)
+* [Writing Markdown With Style in Vim](http://astrails.com/blog/2013/8/12/writing-markdown-with-style-in-vim)
+
+
+## How it looks like in action
+
+![Screenshot 3](http://amix.dk/uploads/zenroom_documentation.jpg)
+
+![Screenshot 4](http://amix.dk/uploads/zenroom_documentation_1.jpg)
diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
new file mode 100644
index 00000000..2ccfc52e
--- /dev/null
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -0,0 +1,95 @@
+"==============================================================================
+"File:        zenroom2.vim
+"Description: Emulates iA Writer environment when editing Markdown, reStructuredText
+"             or text files.
+"Maintainer:  Amir Salihefendic <amix@doist.io>
+"Version:     0.1
+"Last Change: 2013-12-29
+"License:     BSD
+"==============================================================================
+
+if exists( "g:loaded_zenroom2_plugin" )
+    finish
+endif
+let g:loaded_zenroom2_plugin = 1
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Plugin Configuration
+"
+" Save the current `background` value for reset later
+let s:save_background = ""
+if exists( "&background" )
+    let s:save_background = &background
+endif
+
+" Save the current `textwidth'` value for reset later
+let s:save_textwidth = ""
+if exists( "&textwidth'" )
+    let s:save_textwidth' = &textwidth'
+endif
+
+function! s:markdown_room()
+    set background=light
+    set linespace=8
+    set textwidth=80
+
+    hi Normal guibg=gray95
+    hi NonText guifg=gray95
+    hi FoldColumn guibg=gray95
+    hi CursorLine guibg=gray90
+    hi Title gui=bold guifg=gray25
+    hi MarkdownHeadingDelimiter gui=bold guifg=gray25
+    hi htmlSpecialChar guifg=black
+    hi markdownError guifg=black
+    hi markdownBold gui=bold guifg=gray25
+    hi markdownItalic guifg=gray25 gui=underline
+    hi markdownUrl guifg=#2fb3a6
+    hi markdownAutomaticLink guifg=#2fb3a6
+    hi markdownLinkText guifg=#317849
+    hi markdownUrlTitle guifg=#317849
+    hi markdownBlockquote guifg=#317849 gui=bold
+    hi markdownId guifg=#2fb3a6
+    hi markdownIdDeclaration guifg=#317849 gui=bold
+    hi markdownListMarker guifg=#317849
+    hi Cursor guibg=#15abdd
+
+    if has('gui_running')
+        let l:highlightbgcolor = "guibg=#f2f2f2" 
+        let l:highlightfgbgcolor = "guifg=#f2f2f2" . " " . l:highlightbgcolor
+    else
+        let l:highlightbgcolor = "ctermbg=bg" 
+        let l:highlightfgbgcolor = "ctermfg=bg" . " " . l:highlightbgcolor
+    endif
+
+    exec( "hi Normal " . l:highlightbgcolor )
+    exec( "hi VertSplit " . l:highlightfgbgcolor )
+    exec( "hi NonText " . l:highlightfgbgcolor )
+    exec( "hi StatusLine " . l:highlightfgbgcolor )
+    exec( "hi StatusLineNC " . l:highlightfgbgcolor )
+endfunction
+
+function! s:goyo_before()
+    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+
+    if is_mark_or_rst
+        call s:markdown_room()
+    endif
+endfunction
+
+function! s:goyo_after()
+    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+    if is_mark_or_rst
+        set linespace=0
+
+        if s:save_textwidth != ""
+            exec( "set textwidth=" . s:save_textwidth )
+        endif
+
+        if s:save_background != ""
+            exec( "set background=" . s:save_background )
+        endif
+    endif
+endfunction
+
+let g:goyo_callbacks = [ function('s:goyo_before'), function('s:goyo_after') ]
diff --git a/update_plugins.py b/update_plugins.py
index 13a0ecb0..f6dcef11 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -33,7 +33,7 @@ vim-expand-region https://github.com/terryma/vim-expand-region
 vim-multiple-cursors https://github.com/terryma/vim-multiple-cursors
 vim-fugitive https://github.com/tpope/vim-fugitive
 vim-airline https://github.com/bling/vim-airline
-vim-zenroom https://github.com/amix/vim-zenroom
+vim-zenroom2 https://github.com/amix/vim-zenroom2
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index cd4a8d0c..6d726e88 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -109,4 +109,5 @@ let g:airline_theme="luna"
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Vimroom
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-nnoremap <silent> <leader>z :VimroomToggle<cr>
+let g:goyo_width=100
+nnoremap <silent> <leader>z :Goyo<cr>

From ba783e5fd90711a7e589495fb042a9184d648524 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 10:38:40 +0000
Subject: [PATCH 16/61] Added tags

---
 sources_non_forked/bufexplorer/doc/tags       | 24 +++++++
 sources_non_forked/taglist.vim/doc/tags       | 62 +++++++++++++++++++
 sources_non_forked/vim-expand-region/doc/tags | 10 +++
 .../vim-multiple-cursors/doc/tags             | 21 +++++++
 4 files changed, 117 insertions(+)
 create mode 100644 sources_non_forked/bufexplorer/doc/tags
 create mode 100644 sources_non_forked/taglist.vim/doc/tags
 create mode 100644 sources_non_forked/vim-expand-region/doc/tags
 create mode 100644 sources_non_forked/vim-multiple-cursors/doc/tags

diff --git a/sources_non_forked/bufexplorer/doc/tags b/sources_non_forked/bufexplorer/doc/tags
new file mode 100644
index 00000000..5432bc98
--- /dev/null
+++ b/sources_non_forked/bufexplorer/doc/tags
@@ -0,0 +1,24 @@
+bufexplorer	bufexplorer.txt	/*bufexplorer*
+bufexplorer-changelog	bufexplorer.txt	/*bufexplorer-changelog*
+bufexplorer-credits	bufexplorer.txt	/*bufexplorer-credits*
+bufexplorer-customization	bufexplorer.txt	/*bufexplorer-customization*
+bufexplorer-installation	bufexplorer.txt	/*bufexplorer-installation*
+bufexplorer-todo	bufexplorer.txt	/*bufexplorer-todo*
+bufexplorer-usage	bufexplorer.txt	/*bufexplorer-usage*
+bufexplorer-windowlayout	bufexplorer.txt	/*bufexplorer-windowlayout*
+bufexplorer.txt	bufexplorer.txt	/*bufexplorer.txt*
+buffer-explorer	bufexplorer.txt	/*buffer-explorer*
+g:bufExplorerChgWin	bufexplorer.txt	/*g:bufExplorerChgWin*
+g:bufExplorerDefaultHelp	bufexplorer.txt	/*g:bufExplorerDefaultHelp*
+g:bufExplorerDetailedHelp	bufexplorer.txt	/*g:bufExplorerDetailedHelp*
+g:bufExplorerFindActive	bufexplorer.txt	/*g:bufExplorerFindActive*
+g:bufExplorerFuncRef	bufexplorer.txt	/*g:bufExplorerFuncRef*
+g:bufExplorerReverseSort	bufexplorer.txt	/*g:bufExplorerReverseSort*
+g:bufExplorerShowDirectories	bufexplorer.txt	/*g:bufExplorerShowDirectories*
+g:bufExplorerShowRelativePath	bufexplorer.txt	/*g:bufExplorerShowRelativePath*
+g:bufExplorerShowTabBuffer	bufexplorer.txt	/*g:bufExplorerShowTabBuffer*
+g:bufExplorerShowUnlisted	bufexplorer.txt	/*g:bufExplorerShowUnlisted*
+g:bufExplorerSortBy	bufexplorer.txt	/*g:bufExplorerSortBy*
+g:bufExplorerSplitBelow	bufexplorer.txt	/*g:bufExplorerSplitBelow*
+g:bufExplorerSplitOutPathName	bufexplorer.txt	/*g:bufExplorerSplitOutPathName*
+g:bufExplorerSplitRight	bufexplorer.txt	/*g:bufExplorerSplitRight*
diff --git a/sources_non_forked/taglist.vim/doc/tags b/sources_non_forked/taglist.vim/doc/tags
new file mode 100644
index 00000000..83e80ba1
--- /dev/null
+++ b/sources_non_forked/taglist.vim/doc/tags
@@ -0,0 +1,62 @@
+'Tlist_Auto_Highlight_Tag'	taglist.txt	/*'Tlist_Auto_Highlight_Tag'*
+'Tlist_Auto_Open'	taglist.txt	/*'Tlist_Auto_Open'*
+'Tlist_Auto_Update'	taglist.txt	/*'Tlist_Auto_Update'*
+'Tlist_Close_On_Select'	taglist.txt	/*'Tlist_Close_On_Select'*
+'Tlist_Compact_Format'	taglist.txt	/*'Tlist_Compact_Format'*
+'Tlist_Ctags_Cmd'	taglist.txt	/*'Tlist_Ctags_Cmd'*
+'Tlist_Display_Prototype'	taglist.txt	/*'Tlist_Display_Prototype'*
+'Tlist_Display_Tag_Scope'	taglist.txt	/*'Tlist_Display_Tag_Scope'*
+'Tlist_Enable_Fold_Column'	taglist.txt	/*'Tlist_Enable_Fold_Column'*
+'Tlist_Exit_OnlyWindow'	taglist.txt	/*'Tlist_Exit_OnlyWindow'*
+'Tlist_File_Fold_Auto_Close'	taglist.txt	/*'Tlist_File_Fold_Auto_Close'*
+'Tlist_GainFocus_On_ToggleOpen'	taglist.txt	/*'Tlist_GainFocus_On_ToggleOpen'*
+'Tlist_Highlight_Tag_On_BufEnter'	taglist.txt	/*'Tlist_Highlight_Tag_On_BufEnter'*
+'Tlist_Inc_Winwidth'	taglist.txt	/*'Tlist_Inc_Winwidth'*
+'Tlist_Max_Submenu_Items'	taglist.txt	/*'Tlist_Max_Submenu_Items'*
+'Tlist_Max_Tag_Length'	taglist.txt	/*'Tlist_Max_Tag_Length'*
+'Tlist_Process_File_Always'	taglist.txt	/*'Tlist_Process_File_Always'*
+'Tlist_Show_Menu'	taglist.txt	/*'Tlist_Show_Menu'*
+'Tlist_Show_One_File'	taglist.txt	/*'Tlist_Show_One_File'*
+'Tlist_Sort_Type'	taglist.txt	/*'Tlist_Sort_Type'*
+'Tlist_Use_Horiz_Window'	taglist.txt	/*'Tlist_Use_Horiz_Window'*
+'Tlist_Use_Right_Window'	taglist.txt	/*'Tlist_Use_Right_Window'*
+'Tlist_Use_SingleClick'	taglist.txt	/*'Tlist_Use_SingleClick'*
+'Tlist_WinHeight'	taglist.txt	/*'Tlist_WinHeight'*
+'Tlist_WinWidth'	taglist.txt	/*'Tlist_WinWidth'*
+:TlistAddFiles	taglist.txt	/*:TlistAddFiles*
+:TlistAddFilesRecursive	taglist.txt	/*:TlistAddFilesRecursive*
+:TlistClose	taglist.txt	/*:TlistClose*
+:TlistDebug	taglist.txt	/*:TlistDebug*
+:TlistHighlightTag	taglist.txt	/*:TlistHighlightTag*
+:TlistLock	taglist.txt	/*:TlistLock*
+:TlistMessages	taglist.txt	/*:TlistMessages*
+:TlistOpen	taglist.txt	/*:TlistOpen*
+:TlistSessionLoad	taglist.txt	/*:TlistSessionLoad*
+:TlistSessionSave	taglist.txt	/*:TlistSessionSave*
+:TlistShowPrototype	taglist.txt	/*:TlistShowPrototype*
+:TlistShowTag	taglist.txt	/*:TlistShowTag*
+:TlistToggle	taglist.txt	/*:TlistToggle*
+:TlistUndebug	taglist.txt	/*:TlistUndebug*
+:TlistUnlock	taglist.txt	/*:TlistUnlock*
+:TlistUpdate	taglist.txt	/*:TlistUpdate*
+Tlist_Get_Tag_Prototype_By_Line()	taglist.txt	/*Tlist_Get_Tag_Prototype_By_Line()*
+Tlist_Get_Tagname_By_Line()	taglist.txt	/*Tlist_Get_Tagname_By_Line()*
+Tlist_Set_App()	taglist.txt	/*Tlist_Set_App()*
+Tlist_Update_File_Tags()	taglist.txt	/*Tlist_Update_File_Tags()*
+taglist-commands	taglist.txt	/*taglist-commands*
+taglist-debug	taglist.txt	/*taglist-debug*
+taglist-extend	taglist.txt	/*taglist-extend*
+taglist-faq	taglist.txt	/*taglist-faq*
+taglist-functions	taglist.txt	/*taglist-functions*
+taglist-install	taglist.txt	/*taglist-install*
+taglist-internet	taglist.txt	/*taglist-internet*
+taglist-intro	taglist.txt	/*taglist-intro*
+taglist-keys	taglist.txt	/*taglist-keys*
+taglist-license	taglist.txt	/*taglist-license*
+taglist-menu	taglist.txt	/*taglist-menu*
+taglist-options	taglist.txt	/*taglist-options*
+taglist-requirements	taglist.txt	/*taglist-requirements*
+taglist-session	taglist.txt	/*taglist-session*
+taglist-todo	taglist.txt	/*taglist-todo*
+taglist-using	taglist.txt	/*taglist-using*
+taglist.txt	taglist.txt	/*taglist.txt*
diff --git a/sources_non_forked/vim-expand-region/doc/tags b/sources_non_forked/vim-expand-region/doc/tags
new file mode 100644
index 00000000..402a0c43
--- /dev/null
+++ b/sources_non_forked/vim-expand-region/doc/tags
@@ -0,0 +1,10 @@
+expand-region-about	expand_region.txt	/*expand-region-about*
+expand-region-contents	expand_region.txt	/*expand-region-contents*
+expand-region-global-options	expand_region.txt	/*expand-region-global-options*
+expand-region-intro	expand_region.txt	/*expand-region-intro*
+expand-region-mappings	expand_region.txt	/*expand-region-mappings*
+expand-region-usage	expand_region.txt	/*expand-region-usage*
+expand_region_text_objects	expand_region.txt	/*expand_region_text_objects*
+expand_region_use_select_mode	expand_region.txt	/*expand_region_use_select_mode*
+vim-expand-region.txt	expand_region.txt	/*vim-expand-region.txt*
+vim-expand-regions	expand_region.txt	/*vim-expand-regions*
diff --git a/sources_non_forked/vim-multiple-cursors/doc/tags b/sources_non_forked/vim-multiple-cursors/doc/tags
new file mode 100644
index 00000000..5efd6085
--- /dev/null
+++ b/sources_non_forked/vim-multiple-cursors/doc/tags
@@ -0,0 +1,21 @@
+MultipleCursorsFind	multiple_cursors.txt	/*MultipleCursorsFind*
+g:multi_cursor_exit_from_insert_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_insert_mode*
+g:multi_cursor_exit_from_visual_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_visual_mode*
+g:multi_cursor_next_key	multiple_cursors.txt	/*g:multi_cursor_next_key*
+g:multi_cursor_prev_key	multiple_cursors.txt	/*g:multi_cursor_prev_key*
+g:multi_cursor_quit_key	multiple_cursors.txt	/*g:multi_cursor_quit_key*
+g:multi_cursor_skip_key	multiple_cursors.txt	/*g:multi_cursor_skip_key*
+g:multi_cursor_start_key	multiple_cursors.txt	/*g:multi_cursor_start_key*
+g:multi_cursor_use_default_mapping	multiple_cursors.txt	/*g:multi_cursor_use_default_mapping*
+multiple-cursors-contents	multiple_cursors.txt	/*multiple-cursors-contents*
+multiple-cursors-contributing	multiple_cursors.txt	/*multiple-cursors-contributing*
+multiple-cursors-credit	multiple_cursors.txt	/*multiple-cursors-credit*
+multiple-cursors-global-options	multiple_cursors.txt	/*multiple-cursors-global-options*
+multiple-cursors-intro	multiple_cursors.txt	/*multiple-cursors-intro*
+multiple-cursors-issues	multiple_cursors.txt	/*multiple-cursors-issues*
+multiple-cursors-license	multiple_cursors.txt	/*multiple-cursors-license*
+multiple-cursors-mappings	multiple_cursors.txt	/*multiple-cursors-mappings*
+multiple-cursors-references	multiple_cursors.txt	/*multiple-cursors-references*
+multiple-cursors-usage	multiple_cursors.txt	/*multiple-cursors-usage*
+vim-multiple-cursors	multiple_cursors.txt	/*vim-multiple-cursors*
+vim-multiple-cursors.txt	multiple_cursors.txt	/*vim-multiple-cursors.txt*

From 5d177a21f689787ffd5de9134743877afed58119 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 11:31:16 +0000
Subject: [PATCH 17/61] Fixed some issues with terminal setup

---
 sources_forked/peaksea/colors/peaksea.vim |  2 +-
 vimrcs/extended.vim                       | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources_forked/peaksea/colors/peaksea.vim b/sources_forked/peaksea/colors/peaksea.vim
index f3eafe43..b679c23c 100644
--- a/sources_forked/peaksea/colors/peaksea.vim
+++ b/sources_forked/peaksea/colors/peaksea.vim
@@ -36,7 +36,7 @@ if exists("syntax_on")
   syntax reset
 endif
 
-let g:colors_name = expand("<sfile>:t:r")
+let g:colors_name = "peaksea"
 
 " I don't want to abuse folding, but here folding is used to avoid confusion. 
 if &background=='light' 
diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim
index 2787478f..255a31cf 100644
--- a/vimrcs/extended.vim
+++ b/vimrcs/extended.vim
@@ -8,10 +8,6 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => GUI related
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-set background=dark
-
-colorscheme peaksea
-
 " Set font according to system
 if has("mac") || has("macunix")
     set gfn=Source\ Code\ Pro:h15,Menlo:h15
@@ -35,6 +31,15 @@ set guioptions-=R
 set guioptions-=l
 set guioptions-=L
 
+" Colorscheme
+if has("gui_running")
+    set background=dark
+    colorscheme peaksea
+else
+    colorscheme desert
+    let g:colors_name="desert"
+endif
+
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Fast editing and reloading of vimrc configs

From a340836c8ac740a9afb9c1ad90a2a5cd0fd4211a Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 11:33:00 +0000
Subject: [PATCH 18/61] .

---
 sources_non_forked/bufexplorer/doc/tags       | 24 -------
 sources_non_forked/taglist.vim/doc/tags       | 62 -------------------
 sources_non_forked/vim-expand-region/doc/tags | 10 ---
 .../vim-multiple-cursors/doc/tags             | 21 -------
 .../vim-zenroom2/plugin/zenroom2.vim          | 39 +++++++-----
 5 files changed, 24 insertions(+), 132 deletions(-)
 delete mode 100644 sources_non_forked/bufexplorer/doc/tags
 delete mode 100644 sources_non_forked/taglist.vim/doc/tags
 delete mode 100644 sources_non_forked/vim-expand-region/doc/tags
 delete mode 100644 sources_non_forked/vim-multiple-cursors/doc/tags

diff --git a/sources_non_forked/bufexplorer/doc/tags b/sources_non_forked/bufexplorer/doc/tags
deleted file mode 100644
index 5432bc98..00000000
--- a/sources_non_forked/bufexplorer/doc/tags
+++ /dev/null
@@ -1,24 +0,0 @@
-bufexplorer	bufexplorer.txt	/*bufexplorer*
-bufexplorer-changelog	bufexplorer.txt	/*bufexplorer-changelog*
-bufexplorer-credits	bufexplorer.txt	/*bufexplorer-credits*
-bufexplorer-customization	bufexplorer.txt	/*bufexplorer-customization*
-bufexplorer-installation	bufexplorer.txt	/*bufexplorer-installation*
-bufexplorer-todo	bufexplorer.txt	/*bufexplorer-todo*
-bufexplorer-usage	bufexplorer.txt	/*bufexplorer-usage*
-bufexplorer-windowlayout	bufexplorer.txt	/*bufexplorer-windowlayout*
-bufexplorer.txt	bufexplorer.txt	/*bufexplorer.txt*
-buffer-explorer	bufexplorer.txt	/*buffer-explorer*
-g:bufExplorerChgWin	bufexplorer.txt	/*g:bufExplorerChgWin*
-g:bufExplorerDefaultHelp	bufexplorer.txt	/*g:bufExplorerDefaultHelp*
-g:bufExplorerDetailedHelp	bufexplorer.txt	/*g:bufExplorerDetailedHelp*
-g:bufExplorerFindActive	bufexplorer.txt	/*g:bufExplorerFindActive*
-g:bufExplorerFuncRef	bufexplorer.txt	/*g:bufExplorerFuncRef*
-g:bufExplorerReverseSort	bufexplorer.txt	/*g:bufExplorerReverseSort*
-g:bufExplorerShowDirectories	bufexplorer.txt	/*g:bufExplorerShowDirectories*
-g:bufExplorerShowRelativePath	bufexplorer.txt	/*g:bufExplorerShowRelativePath*
-g:bufExplorerShowTabBuffer	bufexplorer.txt	/*g:bufExplorerShowTabBuffer*
-g:bufExplorerShowUnlisted	bufexplorer.txt	/*g:bufExplorerShowUnlisted*
-g:bufExplorerSortBy	bufexplorer.txt	/*g:bufExplorerSortBy*
-g:bufExplorerSplitBelow	bufexplorer.txt	/*g:bufExplorerSplitBelow*
-g:bufExplorerSplitOutPathName	bufexplorer.txt	/*g:bufExplorerSplitOutPathName*
-g:bufExplorerSplitRight	bufexplorer.txt	/*g:bufExplorerSplitRight*
diff --git a/sources_non_forked/taglist.vim/doc/tags b/sources_non_forked/taglist.vim/doc/tags
deleted file mode 100644
index 83e80ba1..00000000
--- a/sources_non_forked/taglist.vim/doc/tags
+++ /dev/null
@@ -1,62 +0,0 @@
-'Tlist_Auto_Highlight_Tag'	taglist.txt	/*'Tlist_Auto_Highlight_Tag'*
-'Tlist_Auto_Open'	taglist.txt	/*'Tlist_Auto_Open'*
-'Tlist_Auto_Update'	taglist.txt	/*'Tlist_Auto_Update'*
-'Tlist_Close_On_Select'	taglist.txt	/*'Tlist_Close_On_Select'*
-'Tlist_Compact_Format'	taglist.txt	/*'Tlist_Compact_Format'*
-'Tlist_Ctags_Cmd'	taglist.txt	/*'Tlist_Ctags_Cmd'*
-'Tlist_Display_Prototype'	taglist.txt	/*'Tlist_Display_Prototype'*
-'Tlist_Display_Tag_Scope'	taglist.txt	/*'Tlist_Display_Tag_Scope'*
-'Tlist_Enable_Fold_Column'	taglist.txt	/*'Tlist_Enable_Fold_Column'*
-'Tlist_Exit_OnlyWindow'	taglist.txt	/*'Tlist_Exit_OnlyWindow'*
-'Tlist_File_Fold_Auto_Close'	taglist.txt	/*'Tlist_File_Fold_Auto_Close'*
-'Tlist_GainFocus_On_ToggleOpen'	taglist.txt	/*'Tlist_GainFocus_On_ToggleOpen'*
-'Tlist_Highlight_Tag_On_BufEnter'	taglist.txt	/*'Tlist_Highlight_Tag_On_BufEnter'*
-'Tlist_Inc_Winwidth'	taglist.txt	/*'Tlist_Inc_Winwidth'*
-'Tlist_Max_Submenu_Items'	taglist.txt	/*'Tlist_Max_Submenu_Items'*
-'Tlist_Max_Tag_Length'	taglist.txt	/*'Tlist_Max_Tag_Length'*
-'Tlist_Process_File_Always'	taglist.txt	/*'Tlist_Process_File_Always'*
-'Tlist_Show_Menu'	taglist.txt	/*'Tlist_Show_Menu'*
-'Tlist_Show_One_File'	taglist.txt	/*'Tlist_Show_One_File'*
-'Tlist_Sort_Type'	taglist.txt	/*'Tlist_Sort_Type'*
-'Tlist_Use_Horiz_Window'	taglist.txt	/*'Tlist_Use_Horiz_Window'*
-'Tlist_Use_Right_Window'	taglist.txt	/*'Tlist_Use_Right_Window'*
-'Tlist_Use_SingleClick'	taglist.txt	/*'Tlist_Use_SingleClick'*
-'Tlist_WinHeight'	taglist.txt	/*'Tlist_WinHeight'*
-'Tlist_WinWidth'	taglist.txt	/*'Tlist_WinWidth'*
-:TlistAddFiles	taglist.txt	/*:TlistAddFiles*
-:TlistAddFilesRecursive	taglist.txt	/*:TlistAddFilesRecursive*
-:TlistClose	taglist.txt	/*:TlistClose*
-:TlistDebug	taglist.txt	/*:TlistDebug*
-:TlistHighlightTag	taglist.txt	/*:TlistHighlightTag*
-:TlistLock	taglist.txt	/*:TlistLock*
-:TlistMessages	taglist.txt	/*:TlistMessages*
-:TlistOpen	taglist.txt	/*:TlistOpen*
-:TlistSessionLoad	taglist.txt	/*:TlistSessionLoad*
-:TlistSessionSave	taglist.txt	/*:TlistSessionSave*
-:TlistShowPrototype	taglist.txt	/*:TlistShowPrototype*
-:TlistShowTag	taglist.txt	/*:TlistShowTag*
-:TlistToggle	taglist.txt	/*:TlistToggle*
-:TlistUndebug	taglist.txt	/*:TlistUndebug*
-:TlistUnlock	taglist.txt	/*:TlistUnlock*
-:TlistUpdate	taglist.txt	/*:TlistUpdate*
-Tlist_Get_Tag_Prototype_By_Line()	taglist.txt	/*Tlist_Get_Tag_Prototype_By_Line()*
-Tlist_Get_Tagname_By_Line()	taglist.txt	/*Tlist_Get_Tagname_By_Line()*
-Tlist_Set_App()	taglist.txt	/*Tlist_Set_App()*
-Tlist_Update_File_Tags()	taglist.txt	/*Tlist_Update_File_Tags()*
-taglist-commands	taglist.txt	/*taglist-commands*
-taglist-debug	taglist.txt	/*taglist-debug*
-taglist-extend	taglist.txt	/*taglist-extend*
-taglist-faq	taglist.txt	/*taglist-faq*
-taglist-functions	taglist.txt	/*taglist-functions*
-taglist-install	taglist.txt	/*taglist-install*
-taglist-internet	taglist.txt	/*taglist-internet*
-taglist-intro	taglist.txt	/*taglist-intro*
-taglist-keys	taglist.txt	/*taglist-keys*
-taglist-license	taglist.txt	/*taglist-license*
-taglist-menu	taglist.txt	/*taglist-menu*
-taglist-options	taglist.txt	/*taglist-options*
-taglist-requirements	taglist.txt	/*taglist-requirements*
-taglist-session	taglist.txt	/*taglist-session*
-taglist-todo	taglist.txt	/*taglist-todo*
-taglist-using	taglist.txt	/*taglist-using*
-taglist.txt	taglist.txt	/*taglist.txt*
diff --git a/sources_non_forked/vim-expand-region/doc/tags b/sources_non_forked/vim-expand-region/doc/tags
deleted file mode 100644
index 402a0c43..00000000
--- a/sources_non_forked/vim-expand-region/doc/tags
+++ /dev/null
@@ -1,10 +0,0 @@
-expand-region-about	expand_region.txt	/*expand-region-about*
-expand-region-contents	expand_region.txt	/*expand-region-contents*
-expand-region-global-options	expand_region.txt	/*expand-region-global-options*
-expand-region-intro	expand_region.txt	/*expand-region-intro*
-expand-region-mappings	expand_region.txt	/*expand-region-mappings*
-expand-region-usage	expand_region.txt	/*expand-region-usage*
-expand_region_text_objects	expand_region.txt	/*expand_region_text_objects*
-expand_region_use_select_mode	expand_region.txt	/*expand_region_use_select_mode*
-vim-expand-region.txt	expand_region.txt	/*vim-expand-region.txt*
-vim-expand-regions	expand_region.txt	/*vim-expand-regions*
diff --git a/sources_non_forked/vim-multiple-cursors/doc/tags b/sources_non_forked/vim-multiple-cursors/doc/tags
deleted file mode 100644
index 5efd6085..00000000
--- a/sources_non_forked/vim-multiple-cursors/doc/tags
+++ /dev/null
@@ -1,21 +0,0 @@
-MultipleCursorsFind	multiple_cursors.txt	/*MultipleCursorsFind*
-g:multi_cursor_exit_from_insert_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_insert_mode*
-g:multi_cursor_exit_from_visual_mode	multiple_cursors.txt	/*g:multi_cursor_exit_from_visual_mode*
-g:multi_cursor_next_key	multiple_cursors.txt	/*g:multi_cursor_next_key*
-g:multi_cursor_prev_key	multiple_cursors.txt	/*g:multi_cursor_prev_key*
-g:multi_cursor_quit_key	multiple_cursors.txt	/*g:multi_cursor_quit_key*
-g:multi_cursor_skip_key	multiple_cursors.txt	/*g:multi_cursor_skip_key*
-g:multi_cursor_start_key	multiple_cursors.txt	/*g:multi_cursor_start_key*
-g:multi_cursor_use_default_mapping	multiple_cursors.txt	/*g:multi_cursor_use_default_mapping*
-multiple-cursors-contents	multiple_cursors.txt	/*multiple-cursors-contents*
-multiple-cursors-contributing	multiple_cursors.txt	/*multiple-cursors-contributing*
-multiple-cursors-credit	multiple_cursors.txt	/*multiple-cursors-credit*
-multiple-cursors-global-options	multiple_cursors.txt	/*multiple-cursors-global-options*
-multiple-cursors-intro	multiple_cursors.txt	/*multiple-cursors-intro*
-multiple-cursors-issues	multiple_cursors.txt	/*multiple-cursors-issues*
-multiple-cursors-license	multiple_cursors.txt	/*multiple-cursors-license*
-multiple-cursors-mappings	multiple_cursors.txt	/*multiple-cursors-mappings*
-multiple-cursors-references	multiple_cursors.txt	/*multiple-cursors-references*
-multiple-cursors-usage	multiple_cursors.txt	/*multiple-cursors-usage*
-vim-multiple-cursors	multiple_cursors.txt	/*vim-multiple-cursors*
-vim-multiple-cursors.txt	multiple_cursors.txt	/*vim-multiple-cursors.txt*
diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index 2ccfc52e..3a1153ac 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -3,7 +3,7 @@
 "Description: Emulates iA Writer environment when editing Markdown, reStructuredText
 "             or text files.
 "Maintainer:  Amir Salihefendic <amix@doist.io>
-"Version:     0.1
+"Version:     0.2
 "Last Change: 2013-12-29
 "License:     BSD
 "==============================================================================
@@ -19,24 +19,27 @@ let g:loaded_zenroom2_plugin = 1
 "
 " Save the current `background` value for reset later
 let s:save_background = ""
-if exists( "&background" )
-    let s:save_background = &background
-endif
 
 " Save the current `textwidth'` value for reset later
 let s:save_textwidth = ""
-if exists( "&textwidth'" )
-    let s:save_textwidth' = &textwidth'
-endif
 
 function! s:markdown_room()
+    if exists( "&background" )
+        let s:save_background = &background
+    endif
+
+    if exists( "&textwidth'" )
+        let s:save_textwidth' = &textwidth'
+    endif
+
     set background=light
+
     set linespace=8
     set textwidth=80
 
     hi Normal guibg=gray95
     hi NonText guifg=gray95
-    hi FoldColumn guibg=gray95
+    hi FoldColumn guibg=gray95 ctermbg=bg
     hi CursorLine guibg=gray90
     hi Title gui=bold guifg=gray25
     hi MarkdownHeadingDelimiter gui=bold guifg=gray25
@@ -69,17 +72,22 @@ function! s:markdown_room()
     exec( "hi StatusLineNC " . l:highlightfgbgcolor )
 endfunction
 
-function! s:goyo_before()
-    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+function! g:zenroom_goyo_before()
+    if !has("gui_running")
+        return
+    endif
 
-    if is_mark_or_rst
+    if &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
         call s:markdown_room()
     endif
 endfunction
 
-function! s:goyo_after()
-    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
-    if is_mark_or_rst
+function! g:zenroom_goyo_after()
+    if !has("gui_running")
+        return
+    endif
+
+    if &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
         set linespace=0
 
         if s:save_textwidth != ""
@@ -92,4 +100,5 @@ function! s:goyo_after()
     endif
 endfunction
 
-let g:goyo_callbacks = [ function('s:goyo_before'), function('s:goyo_after') ]
+let g:goyo_callbacks = [ function('g:zenroom_goyo_before'), function('g:zenroom_goyo_after') ]
+

From 5016954e3847aae5029b87d5e848659151871e35 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 11:36:43 +0000
Subject: [PATCH 19/61] Readded goyo.vim

---
 sources_non_forked/vim-zenroom2/README.markdown | 4 +++-
 update_plugins.py                               | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sources_non_forked/vim-zenroom2/README.markdown b/sources_non_forked/vim-zenroom2/README.markdown
index f7c0121d..9cc13c8f 100644
--- a/sources_non_forked/vim-zenroom2/README.markdown
+++ b/sources_non_forked/vim-zenroom2/README.markdown
@@ -5,12 +5,14 @@ It requires [goyo.vim](https://github.com/junegunn/goyo.vim) and it works by set
 This is an improvement of my initial version called [vim-zenroom](https://github.com/amix/vim-zenroom). Please read more here [
 zenroom for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#zenroom-for-Vim-Focsuing-only-on-the-essential).
 
+Please note that this might not work perfectly with your colorscheme. Patches are welcome to fix this :-)
+
 
 ## Inspirations/Similar
+* [Writing Markdown With Style in Vim](http://astrails.com/blog/2013/8/12/writing-markdown-with-style-in-vim)
 * [lite-dfm](https://github.com/bilalq/lite-dfm)
 * [vimroom](https://github.com/mikewest/vimroom)
 * [vim-zenroom](https://github.com/amix/vim-zenroom)
-* [Writing Markdown With Style in Vim](http://astrails.com/blog/2013/8/12/writing-markdown-with-style-in-vim)
 
 
 ## How it looks like in action
diff --git a/update_plugins.py b/update_plugins.py
index f6dcef11..946f0b74 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -33,6 +33,7 @@ vim-expand-region https://github.com/terryma/vim-expand-region
 vim-multiple-cursors https://github.com/terryma/vim-multiple-cursors
 vim-fugitive https://github.com/tpope/vim-fugitive
 vim-airline https://github.com/bling/vim-airline
+goyo.vim https://github.com/junegunn/goyo.vim
 vim-zenroom2 https://github.com/amix/vim-zenroom2
 """.strip()
 

From ab44fd0780d84648732c20e0bd714c5f0a3f5061 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 11:37:12 +0000
Subject: [PATCH 20/61] .

---
 sources_non_forked/goyo.vim | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 sources_non_forked/goyo.vim

diff --git a/sources_non_forked/goyo.vim b/sources_non_forked/goyo.vim
deleted file mode 160000
index 6011742c..00000000
--- a/sources_non_forked/goyo.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6011742c2993315b3489e20d89d730917b8e2548

From 9e06b48f98118d2d7f30da1b888553d5229f706a Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 11:38:57 +0000
Subject: [PATCH 21/61] Readded goyo grr

---
 sources_non_forked/goyo.vim/plugin/goyo.vim | 288 ++++++++++++++++++++
 1 file changed, 288 insertions(+)
 create mode 100644 sources_non_forked/goyo.vim/plugin/goyo.vim

diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
new file mode 100644
index 00000000..56066f59
--- /dev/null
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -0,0 +1,288 @@
+" Copyright (c) 2013 Junegunn Choi
+"
+" MIT License
+"
+" Permission is hereby granted, free of charge, to any person obtaining
+" a copy of this software and associated documentation files (the
+" "Software"), to deal in the Software without restriction, including
+" without limitation the rights to use, copy, modify, merge, publish,
+" distribute, sublicense, and/or sell copies of the Software, and to
+" permit persons to whom the Software is furnished to do so, subject to
+" the following conditions:
+"
+" The above copyright notice and this permission notice shall be
+" included in all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! s:get_color(group, attr)
+  return synIDattr(synIDtrans(hlID(a:group)), a:attr)
+endfunction
+
+function! s:set_color(group, attr, color)
+  let gui = has('gui_running')
+  execute printf("hi %s %s%s=%s", a:group, gui ? 'gui' : 'cterm', a:attr, a:color)
+endfunction
+
+function! s:blank()
+  let main = bufwinnr(t:goyo_master)
+  if main != -1
+    execute main . 'wincmd w'
+  else
+    call s:goyo_off()
+  endif
+endfunction
+
+function! s:init_pad(command)
+  execute a:command
+
+  setlocal buftype=nofile bufhidden=wipe nomodifiable nobuflisted noswapfile
+        \ nonu nocursorline winfixwidth winfixheight statusline=\ 
+  if exists('&rnu')
+    setlocal nornu
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+  let bufnr = winbufnr(0)
+
+  execute winnr('#') . 'wincmd w'
+  return bufnr
+endfunction
+
+function! s:setup_pad(bufnr, vert, size)
+  let win = bufwinnr(a:bufnr)
+  execute win . 'wincmd w'
+  execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
+  augroup goyop
+    autocmd WinEnter <buffer> call s:blank()
+  augroup END
+
+  " To hide scrollbars of pad windows in GVim
+  let diff = winheight(0) - line('$') - (has('gui_running') ? 2 : 0)
+  if diff > 0
+    setlocal modifiable
+    call append(0, map(range(1, diff), '""'))
+    normal! gg
+    setlocal nomodifiable
+  endif
+  execute winnr('#') . 'wincmd w'
+endfunction
+
+function! s:hmargin()
+  let nwidth = max([len(string(line('$'))) + 1, &numberwidth])
+  let width  = t:goyo_width + (&number ? nwidth : 0)
+  return (&columns - width)
+endfunction
+
+function! s:resize_pads()
+  let hmargin = s:hmargin()
+  let tmargin = get(g:, 'goyo_margin_top', 4)
+  let bmargin = get(g:, 'goyo_margin_bottom', 4)
+
+  augroup goyop
+    autocmd!
+  augroup END
+  call s:setup_pad(t:goyo_pads.t, 0, tmargin - 1)
+  call s:setup_pad(t:goyo_pads.b, 0, bmargin - 2)
+  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1)
+  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1)
+endfunction
+
+function! s:tranquilize()
+  let bg = s:get_color('Normal', 'bg')
+  for grp in ['NonText', 'FoldColumn', 'ColorColumn', 'VertSplit',
+            \ 'StatusLine', 'StatusLineNC', 'SignColumn']
+    " -1 on Vim / '' on GVim
+    if bg == -1 || empty(bg)
+      call s:set_color(grp, '', 'NONE')
+      call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
+      call s:set_color(grp, 'bg', 'NONE')
+    else
+      call s:set_color(grp, 'fg', bg)
+      call s:set_color(grp, 'bg', bg)
+    endif
+  endfor
+endfunction
+
+function! s:goyo_on(width)
+  " New tab
+  tab split
+
+  let t:goyo_master = winbufnr(0)
+  let t:goyo_width  = a:width
+  let t:goyo_pads = {}
+  let t:goyo_revert =
+    \ { 'laststatus':     &laststatus,
+    \   'showtabline':    &showtabline,
+    \   'fillchars':      &fillchars,
+    \   'winwidth':       &winwidth,
+    \   'winheight':      &winheight,
+    \   'statusline':     &statusline,
+    \   'ruler':          &ruler,
+    \   'sidescroll':     &sidescroll,
+    \   'sidescrolloff':  &sidescrolloff
+    \ }
+  if has('gui_running')
+    let t:goyo_revert.guioptions = &guioptions
+  endif
+
+  " vim-gitgutter
+  let t:goyo_disabled_gitgutter = get(g:, 'gitgutter_enabled', 0)
+  if t:goyo_disabled_gitgutter
+    GitGutterDisable
+  endif
+
+  " vim-airline
+  let t:goyo_disabled_airline = exists("#airline")
+  if t:goyo_disabled_airline
+    AirlineToggle
+  endif
+
+  " vim-powerline
+  let t:goyo_disabled_powerline = exists("#PowerlineMain")
+  if t:goyo_disabled_powerline
+    augroup PowerlineMain
+      autocmd!
+    augroup END
+    augroup! PowerlineMain
+  endif
+
+  if !get(g:, 'goyo_linenr', 0)
+    setlocal nonu
+    if exists('&rnu')
+      setlocal nornu
+    endif
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+
+  " Global options
+  set winwidth=1
+  set winheight=1
+  set laststatus=0
+  set showtabline=0
+  set noruler
+  set fillchars+=vert:\ 
+  set fillchars+=stl:.
+  set fillchars+=stlnc:\ 
+  set sidescroll=1
+  set sidescrolloff=0
+
+  " Hide left-hand scrollbars
+  if has('gui_running')
+    set guioptions-=l
+    set guioptions-=L
+  endif
+
+  let t:goyo_pads.l = s:init_pad('vertical new')
+  let t:goyo_pads.r = s:init_pad('vertical rightbelow new')
+  let t:goyo_pads.t = s:init_pad('topleft new')
+  let t:goyo_pads.b = s:init_pad('botright new')
+
+  call s:resize_pads()
+  call s:tranquilize()
+
+  let &statusline = repeat(' ', winwidth(0))
+
+  if exists('g:goyo_callbacks[0]')
+    call g:goyo_callbacks[0]()
+  endif
+
+  augroup goyo
+    autocmd!
+    autocmd BufWinLeave <buffer> call s:goyo_off()
+    autocmd TabLeave    *        call s:goyo_off()
+    autocmd VimResized  *        call s:resize_pads()
+    autocmd ColorScheme *        call s:tranquilize()
+  augroup END
+endfunction
+
+function! s:goyo_off()
+  if !exists('#goyo')
+    return
+  endif
+
+  " Oops, not this tab
+  if !exists('t:goyo_revert')
+    return
+  endif
+
+  " Clear auto commands
+  augroup goyo
+    autocmd!
+  augroup END
+  augroup! goyo
+  augroup goyop
+    autocmd!
+  augroup END
+  augroup! goyop
+
+  let goyo_revert             = t:goyo_revert
+  let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
+  let goyo_disabled_airline   = t:goyo_disabled_airline
+  let goyo_disabled_powerline = t:goyo_disabled_powerline
+
+  if tabpagenr() == 1
+    tabnew
+    normal! gt
+    bd
+  endif
+  tabclose
+
+  for [k, v] in items(goyo_revert)
+    execute printf("let &%s = %s", k, string(v))
+  endfor
+  execute 'colo '. g:colors_name
+
+  if goyo_disabled_gitgutter
+    GitGutterEnable
+  endif
+
+  if goyo_disabled_airline && !exists("#airline")
+    AirlineToggle
+    AirlineRefresh
+  endif
+
+  if goyo_disabled_powerline && !exists("#PowerlineMain")
+    doautocmd PowerlineStartup VimEnter
+    silent! PowerlineReloadColorscheme
+  endif
+
+  if exists('#Powerline')
+    doautocmd Powerline ColorScheme
+  endif
+
+  if exists('g:goyo_callbacks[1]')
+    call g:goyo_callbacks[1]()
+  endif
+endfunction
+
+function! s:goyo(...)
+  let width = a:0 > 0 ? a:1 : get(g:, 'goyo_width', 80)
+
+  if exists('#goyo') == 0
+    call s:goyo_on(width)
+  elseif a:0 > 0
+    let t:goyo_width = width
+    call s:resize_pads()
+  else
+    call s:goyo_off()
+  end
+endfunction
+
+command! -nargs=? Goyo call s:goyo(<args>)
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+

From 16b4c050e745914e85472b960e6f135be87e9924 Mon Sep 17 00:00:00 2001
From: Amir Salihefendic <amix@amix.dk>
Date: Sun, 29 Dec 2013 13:20:35 +0000
Subject: [PATCH 22/61] Update README.md

Added an extra screenshot.
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index a8a8e143..7af4a0c2 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,9 @@ Opening recently opened files [mru.vim](https://github.com/vim-scripts/mru.vim):
 This vimrc even works on Windows!
 ![Screenshot 4](http://files1.wedoist.com/4e85163d97b81422240c822c82022f2f/as/screenshot_4.png)
 
+Distraction free mode (using goyo.vim and vim-zenroom2):
+![Screenshot 5](https://d2dq6e731uoz0t.cloudfront.net/a5182977c3d6c2a6cd3f9e97398ca8ca/as/zen_mode.jpg)
+
 
 ## What plugins are included?
 

From b4846b63731fab1eaf6cafdf93596a0193f17468 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 13:25:09 +0000
Subject: [PATCH 23/61] Updated headings

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7af4a0c2..99d52832 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Distraction free mode (using goyo.vim and vim-zenroom2):
 ![Screenshot 5](https://d2dq6e731uoz0t.cloudfront.net/a5182977c3d6c2a6cd3f9e97398ca8ca/as/zen_mode.jpg)
 
 
-## What plugins are included?
+## Included Plugins
 
 I recommend reading the docs of these plugins to understand them better. Each of them provide a much better Vim experience!
 
@@ -82,7 +82,7 @@ I recommend reading the docs of these plugins to understand them better. Each of
 Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744)
 
 
-## What color schemes are included?
+## Included color schemes
 
 * [peaksea](https://github.com/vim-scripts/peaksea): My favorite!
 * [vim-colors-solarized](https://github.com/altercation/vim-colors-solarized)
@@ -91,7 +91,7 @@ Remove all clutter and focus only on the essential. Similar to iA Writer or Writ
 * [vim-pyte](https://github.com/therubymug/vim-pyte)
 
 
-## What modes are included?
+## Included modes
 
 * [vim-coffee-script](https://github.com/kchmck/vim-coffee-script)
 * [vim-less](https://github.com/groenewege/vim-less)

From 86bf52e98ffb7beabfb74914a6bf7f7ac3c2b318 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 14:13:35 +0000
Subject: [PATCH 24/61] Updated gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8d66da36..6524f395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ temp_dirs/yankring_history_v2.txt
 sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 my_configs.vim
+tags

From 2a0e2ddc138c12fea19a86179298b4a6c7317496 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 29 Dec 2013 14:15:49 +0000
Subject: [PATCH 25/61] Updated zenroom

---
 .../vim-zenroom2/plugin/zenroom2.vim          | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index 3a1153ac..37204f8c 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -3,7 +3,7 @@
 "Description: Emulates iA Writer environment when editing Markdown, reStructuredText
 "             or text files.
 "Maintainer:  Amir Salihefendic <amix@doist.io>
-"Version:     0.2
+"Version:     0.1
 "Last Change: 2013-12-29
 "License:     BSD
 "==============================================================================
@@ -19,27 +19,24 @@ let g:loaded_zenroom2_plugin = 1
 "
 " Save the current `background` value for reset later
 let s:save_background = ""
+if exists( "&background" )
+    let s:save_background = &background
+endif
 
 " Save the current `textwidth'` value for reset later
 let s:save_textwidth = ""
+if exists( "&textwidth'" )
+    let s:save_textwidth' = &textwidth'
+endif
 
 function! s:markdown_room()
-    if exists( "&background" )
-        let s:save_background = &background
-    endif
-
-    if exists( "&textwidth'" )
-        let s:save_textwidth' = &textwidth'
-    endif
-
     set background=light
-
     set linespace=8
     set textwidth=80
 
     hi Normal guibg=gray95
     hi NonText guifg=gray95
-    hi FoldColumn guibg=gray95 ctermbg=bg
+    hi FoldColumn guibg=gray95
     hi CursorLine guibg=gray90
     hi Title gui=bold guifg=gray25
     hi MarkdownHeadingDelimiter gui=bold guifg=gray25
@@ -76,8 +73,9 @@ function! g:zenroom_goyo_before()
     if !has("gui_running")
         return
     endif
+    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
 
-    if &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+    if is_mark_or_rst
         call s:markdown_room()
     endif
 endfunction
@@ -86,8 +84,8 @@ function! g:zenroom_goyo_after()
     if !has("gui_running")
         return
     endif
-
-    if &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+    let is_mark_or_rst = &filetype == "markdown" || &filetype == "rst" || &filetype == "text"
+    if is_mark_or_rst
         set linespace=0
 
         if s:save_textwidth != ""
@@ -101,4 +99,3 @@ function! g:zenroom_goyo_after()
 endfunction
 
 let g:goyo_callbacks = [ function('g:zenroom_goyo_before'), function('g:zenroom_goyo_after') ]
-

From b03dc8e510b953f20400342ac79c492d25279b67 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Tue, 7 Jan 2014 00:25:41 +0000
Subject: [PATCH 26/61] Updated plugins

---
 sources_non_forked/goyo.vim/plugin/goyo.vim   | 36 ++++++++++++++-----
 .../autoload/airline/extensions/tabline.vim   | 11 ++++--
 .../vim-fugitive/plugin/fugitive.vim          | 11 +++---
 .../vim-markdown/syntax/markdown.vim          |  2 +-
 sources_non_forked/vim-snipmate/README.md     | 12 +++++++
 .../vim-snipmate/doc/snipMate.txt             | 22 ++++++++++++
 .../vim-snipmate/plugin/snipMate.vim          |  4 +--
 .../vim-snippets/snippets/coffee.snippets     | 14 ++++++++
 .../vim-zenroom2/README.markdown              |  8 +++++
 .../vim-zenroom2/plugin/zenroom2.vim          | 11 ------
 vimrcs/basic.vim                              |  5 ++-
 vimrcs/plugins_config.vim                     |  2 ++
 12 files changed, 107 insertions(+), 31 deletions(-)

diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 56066f59..a2beb4a3 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -126,6 +126,7 @@ function! s:goyo_on(width)
     \   'showtabline':    &showtabline,
     \   'fillchars':      &fillchars,
     \   'winwidth':       &winwidth,
+    \   'winminheight':   &winminheight,
     \   'winheight':      &winheight,
     \   'statusline':     &statusline,
     \   'ruler':          &ruler,
@@ -139,7 +140,7 @@ function! s:goyo_on(width)
   " vim-gitgutter
   let t:goyo_disabled_gitgutter = get(g:, 'gitgutter_enabled', 0)
   if t:goyo_disabled_gitgutter
-    GitGutterDisable
+    silent! GitGutterDisable
   endif
 
   " vim-airline
@@ -157,6 +158,12 @@ function! s:goyo_on(width)
     augroup! PowerlineMain
   endif
 
+  " lightline.vim
+  let t:goyo_disabled_lightline = exists('#LightLine')
+  if t:goyo_disabled_lightline
+    silent! call lightline#disable()
+  endif
+
   if !get(g:, 'goyo_linenr', 0)
     setlocal nonu
     if exists('&rnu')
@@ -169,6 +176,8 @@ function! s:goyo_on(width)
 
   " Global options
   set winwidth=1
+  let &winheight = max([&winminheight, 1])
+  set winminheight=1
   set winheight=1
   set laststatus=0
   set showtabline=0
@@ -185,8 +194,8 @@ function! s:goyo_on(width)
     set guioptions-=L
   endif
 
-  let t:goyo_pads.l = s:init_pad('vertical new')
-  let t:goyo_pads.r = s:init_pad('vertical rightbelow new')
+  let t:goyo_pads.l = s:init_pad('vertical topleft new')
+  let t:goyo_pads.r = s:init_pad('vertical botright new')
   let t:goyo_pads.t = s:init_pad('topleft new')
   let t:goyo_pads.b = s:init_pad('botright new')
 
@@ -195,10 +204,6 @@ function! s:goyo_on(width)
 
   let &statusline = repeat(' ', winwidth(0))
 
-  if exists('g:goyo_callbacks[0]')
-    call g:goyo_callbacks[0]()
-  endif
-
   augroup goyo
     autocmd!
     autocmd BufWinLeave <buffer> call s:goyo_off()
@@ -206,6 +211,10 @@ function! s:goyo_on(width)
     autocmd VimResized  *        call s:resize_pads()
     autocmd ColorScheme *        call s:tranquilize()
   augroup END
+
+  if exists('g:goyo_callbacks[0]')
+    call g:goyo_callbacks[0]()
+  endif
 endfunction
 
 function! s:goyo_off()
@@ -232,6 +241,7 @@ function! s:goyo_off()
   let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
   let goyo_disabled_airline   = t:goyo_disabled_airline
   let goyo_disabled_powerline = t:goyo_disabled_powerline
+  let goyo_disabled_lightline = t:goyo_disabled_lightline
 
   if tabpagenr() == 1
     tabnew
@@ -240,13 +250,19 @@ function! s:goyo_off()
   endif
   tabclose
 
+  let wmh = remove(goyo_revert, 'winminheight')
+  let wh  = remove(goyo_revert, 'winheight')
+  let &winheight    = max([wmh, 1])
+  let &winminheight = wmh
+  let &winheight    = wh
+
   for [k, v] in items(goyo_revert)
     execute printf("let &%s = %s", k, string(v))
   endfor
   execute 'colo '. g:colors_name
 
   if goyo_disabled_gitgutter
-    GitGutterEnable
+    silent! GitGutterEnable
   endif
 
   if goyo_disabled_airline && !exists("#airline")
@@ -259,6 +275,10 @@ function! s:goyo_off()
     silent! PowerlineReloadColorscheme
   endif
 
+  if goyo_disabled_lightline
+    silent! call lightline#enable()
+  endif
+
   if exists('#Powerline')
     doautocmd Powerline ColorScheme
   endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index cf3d7df2..0bad224f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -183,10 +183,13 @@ endfunction
 let s:current_bufnr = -1
 let s:current_tabnr = -1
 let s:current_tabline = ''
+let s:current_modified = 0
 function! s:get_buffers()
   let cur = bufnr('%')
   if cur == s:current_bufnr
-    return s:current_tabline
+    if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
   endif
 
   let b = airline#builder#new(s:builder_context)
@@ -202,6 +205,7 @@ function! s:get_buffers()
       else
         let group = 'airline_tabsel'
       endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
     else
       if index(tab_bufs, nr) > -1
         let group = 'airline_tab'
@@ -225,7 +229,9 @@ function! s:get_tabs()
   let curbuf = bufnr('%')
   let curtab = tabpagenr()
   if curbuf == s:current_bufnr && curtab == s:current_tabnr
-    return s:current_tabline
+    if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
   endif
 
   let b = airline#builder#new(s:builder_context)
@@ -239,6 +245,7 @@ function! s:get_tabs()
           endif
         endfor
       endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
     else
       let group = 'airline_tab'
     endif
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index d81705e1..dbbc754d 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -1396,6 +1396,7 @@ function! s:diff_restore()
   let restore = 'setlocal nodiff noscrollbind'
         \ . ' scrollopt=' . &l:scrollopt
         \ . (&l:wrap ? ' wrap' : ' nowrap')
+        \ . ' foldlevel=999'
         \ . ' foldmethod=' . &l:foldmethod
         \ . ' foldcolumn=' . &l:foldcolumn
         \ . ' foldlevel=' . &l:foldlevel
@@ -1499,14 +1500,14 @@ function! s:Diff(bang,...)
   try
     let spec = s:repo().translate(file)
     let commit = matchstr(spec,'\C[^:/]//\zs\x\+')
+    let restore = s:diff_restore()
+    let w:fugitive_diff_restore = restore
     if s:buffer().compare_age(commit) < 0
-      execute 'rightbelow '.vert.'split '.s:fnameescape(spec)
+      execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec)
     else
-      execute 'leftabove '.vert.'split '.s:fnameescape(spec)
+      execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
     endif
-    call s:diffthis()
-    wincmd p
-    call s:diffthis()
+    let w:fugitive_diff_restore = restore
     return ''
   catch /^fugitive:/
     return 'echoerr v:errmsg'
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 4ba02b26..ba0d5565 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -70,7 +70,7 @@ syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+"+ end=+
 syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+'+ end=+'+ keepend contained
 syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+(+ end=+)+ keepend contained
 
-syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" keepend nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
+syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
 syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained
 syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
 syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 02718478..5fdf73ac 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -44,6 +44,18 @@ looking at the [vim-snippets][vim-snippets] repository.
         " Optional:
         Bundle "honza/vim-snippets"
 
+## Release Notes ##
+
+### 0.87 - 2014-01-04 ###
+
+* Stop indenting empty lines when expanding snippets
+* Support extends keyword in .snippets files
+* Fix visual placeholder support
+* Add zero tabstop support
+* Support negative 'softtabstop'
+* Add g:snipMate_no_default_aliases option
+* Add <Plug>snipMateTrigger for triggering an expansion inside a snippet
+* Add snipMate#CanBeTriggered() function
 
 [ultisnips]: https://github.com/sirver/ultisnips
 [msanders]: https://github.com/msanders
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index a0f052d3..e39517c6 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -404,6 +404,28 @@ Perhaps some of these features will be added in a later release.
 ==============================================================================
 CHANGELOG                                                 *SnipMate-changelog*
 
+0.87 - 2014-01-04
+-----------------
+
+* Stop indenting empty lines when expanding snippets
+* Support extends keyword in .snippets files
+* Fix visual placeholder support
+* Add zero tabstop support
+* Support negative 'softtabstop'
+* Add g:snipMate_no_default_aliases option
+* Add <Plug>snipMateTrigger for triggering an expansion inside a snippet
+* Add snipMate#CanBeTriggered() function
+
+0.86 - 2013-06-15
+-----------------
+* Use more idiomatic <Plug> maps
+* Remove most select mode mappings
+
+* Fix disappearing variables bug (hpesoj)
+* Fix cursor position bug when a variable is on the same line as the stop
+* Fix undo point creation causing problems with Supertab
+* Fix bug where SnipMate would use a typed trigger as a regular expression
+
 0.85 - 2013-04-03
 -----------------
 
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index a4531b02..34d4ad28 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -1,13 +1,11 @@
 " File:          snipMate.vim
-" Author:        Michael Sanders
-" Version:       0.86
 " Description:   snipMate.vim implements some of TextMate's snippets features in
 "                Vim. A snippet is a piece of often-typed text that you can
 "                insert into your document using a trigger word followed by a "<tab>".
 "
 "                For more help see snipMate.txt; you can do this by using:
 "                :helptags ~/.vim/doc
-"                :h snipMate.txt
+"                :h SnipMate
 
 if exists('loaded_snips') || &cp || version < 700
 	finish
diff --git a/sources_non_forked/vim-snippets/snippets/coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee.snippets
index aca6e81a..7ed1ebf4 100644
--- a/sources_non_forked/vim-snippets/snippets/coffee.snippets
+++ b/sources_non_forked/vim-snippets/snippets/coffee.snippets
@@ -93,3 +93,17 @@ snippet req
 # Export
 snippet exp
 	${0:root} = exports ? this
+
+
+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}
diff --git a/sources_non_forked/vim-zenroom2/README.markdown b/sources_non_forked/vim-zenroom2/README.markdown
index 9cc13c8f..e8607d37 100644
--- a/sources_non_forked/vim-zenroom2/README.markdown
+++ b/sources_non_forked/vim-zenroom2/README.markdown
@@ -7,6 +7,14 @@ zenroom for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#
 
 Please note that this might not work perfectly with your colorscheme. Patches are welcome to fix this :-)
 
+## Installaion and usage
+
+* Install [goyo.vim](https://github.com/junegunn/goyo.vim)
+* In command mode type :Goyo
+
+Additionally you may want to have a shortcut. Add this to your vimrc:
+
+    nnoremap <silent> <leader>z :Goyo<cr>
 
 ## Inspirations/Similar
 * [Writing Markdown With Style in Vim](http://astrails.com/blog/2013/8/12/writing-markdown-with-style-in-vim)
diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index 37204f8c..a9781c74 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -23,16 +23,9 @@ if exists( "&background" )
     let s:save_background = &background
 endif
 
-" Save the current `textwidth'` value for reset later
-let s:save_textwidth = ""
-if exists( "&textwidth'" )
-    let s:save_textwidth' = &textwidth'
-endif
-
 function! s:markdown_room()
     set background=light
     set linespace=8
-    set textwidth=80
 
     hi Normal guibg=gray95
     hi NonText guifg=gray95
@@ -88,10 +81,6 @@ function! g:zenroom_goyo_after()
     if is_mark_or_rst
         set linespace=0
 
-        if s:save_textwidth != ""
-            exec( "set textwidth=" . s:save_textwidth )
-        endif
-
         if s:save_background != ""
             exec( "set background=" . s:save_background )
         endif
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 2e31754d..6cbbc3a2 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -343,9 +343,12 @@ map <leader>s? z=
 " Remove the Windows ^M - when the encodings gets messed up
 noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
 
-" Quickly open a buffer for scripbble
+" Quickly open a buffer for scribble
 map <leader>q :e ~/buffer<cr>
 
+" Quickly open a markdown buffer for scribble
+map <leader>x :e ~/buffer.md<cr>
+
 " Toggle paste mode on and off
 map <leader>pp :setlocal paste!<cr>
 
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 6d726e88..92db3f18 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -110,4 +110,6 @@ let g:airline_theme="luna"
 " => Vimroom
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let g:goyo_width=100
+let g:goyo_margin_top = 2
+let g:goyo_margin_bottom = 2
 nnoremap <silent> <leader>z :Goyo<cr>

From f2d64022f58f6d0dcaba089204503791c0f93697 Mon Sep 17 00:00:00 2001
From: Karl Coelho <karl.coelho1@gmail.com>
Date: Thu, 6 Feb 2014 13:36:37 +0400
Subject: [PATCH 27/61] Fixed the pathogen error

---
 vimrcs/plugins_config.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 92db3f18..a2a7e146 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -8,8 +8,8 @@
 """"""""""""""""""""""""""""""
 " => Load pathogen paths
 """"""""""""""""""""""""""""""
-call pathogen#infect('~/.vim_runtime/sources_forked')
-call pathogen#infect('~/.vim_runtime/sources_non_forked')
+call pathogen#infect('~/.vim_runtime/sources_forked/*')
+call pathogen#infect('~/.vim_runtime/sources_non_forked/*')
 call pathogen#helptags()
 
 """"""""""""""""""""""""""""""

From 8265dca5d5a7cb37a85dd82823dde2f9f69a3abe Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Fri, 7 Feb 2014 10:41:15 +0000
Subject: [PATCH 28/61] Updated plugins. Switched to Ack as standard search
 tool (much better than grep/vimgrep)

---
 sources_non_forked/goyo.vim/plugin/goyo.vim   |   4 +-
 .../pyflakes-pathogen/.gitignore              |   1 +
 .../pyflakes-pathogen/README.rst              |  11 +
 .../ftplugin/python/README.rst                |  80 +++
 .../ftplugin/python/pyflakes.vim              | 325 +++++++++
 .../ftplugin/python/pyflakes/LICENSE          |  21 +
 .../ftplugin/python/pyflakes/NEWS.txt         |  29 +
 .../ftplugin/python/pyflakes/README.rst       |  36 +
 .../ftplugin/python/pyflakes/TODO             |  11 +
 .../python/pyflakes/pyflakes/__init__.py      |   2 +
 .../ftplugin/python/pyflakes/pyflakes/ast.py  | 311 ++++++++
 .../python/pyflakes/pyflakes/checker.py       | 625 ++++++++++++++++
 .../python/pyflakes/pyflakes/messages.py      |  96 +++
 .../pyflakes/pyflakes/scripts/__init__.py     |   0
 .../pyflakes/pyflakes/scripts/pyflakes.py     |  90 +++
 .../python/pyflakes/pyflakes/test/__init__.py |   0
 .../python/pyflakes/pyflakes/test/harness.py  |  27 +
 .../pyflakes/pyflakes/test/test_imports.py    | 673 ++++++++++++++++++
 .../pyflakes/pyflakes/test/test_other.py      | 575 +++++++++++++++
 .../pyflakes/pyflakes/test/test_script.py     | 185 +++++
 .../pyflakes/test/test_undefined_names.py     | 265 +++++++
 .../ftplugin/python/pyflakes/setup.py         |  28 +
 .../ftplugin/python/quickfix.diff             | 124 ++++
 .../tlib/autoload/tlib/World.vim              |  50 +-
 .../tlib/autoload/tlib/agent.vim              |   5 +-
 .../tlib/autoload/tlib/file.vim               |   6 +-
 .../tlib/autoload/tlib/scratch.vim            |  10 +-
 sources_non_forked/tlib/doc/tlib.txt          |   2 +-
 sources_non_forked/tlib/plugin/02tlib.vim     |   4 +-
 sources_non_forked/vim-airline/LICENSE        |   2 +-
 sources_non_forked/vim-airline/README.md      |   8 +-
 .../vim-airline/autoload/airline.vim          |   2 +-
 .../vim-airline/autoload/airline/builder.vim  |   2 +-
 .../vim-airline/autoload/airline/debug.vim    |   2 +-
 .../autoload/airline/deprecation.vim          |   2 +-
 .../autoload/airline/extensions.vim           |  11 +-
 .../autoload/airline/extensions/branch.vim    |  13 +-
 .../airline/extensions/bufferline.vim         |   2 +-
 .../autoload/airline/extensions/commandt.vim  |   2 +-
 .../autoload/airline/extensions/csv.vim       |   2 +-
 .../autoload/airline/extensions/ctrlp.vim     |   2 +-
 .../autoload/airline/extensions/default.vim   |   2 +-
 .../autoload/airline/extensions/eclim.vim     |   2 +-
 .../autoload/airline/extensions/example.vim   |   2 +-
 .../autoload/airline/extensions/hunks.vim     |   2 +-
 .../autoload/airline/extensions/netrw.vim     |  32 +
 .../airline/extensions/promptline.vim         |  33 +
 .../autoload/airline/extensions/quickfix.vim  |   2 +-
 .../autoload/airline/extensions/syntastic.vim |   2 +-
 .../autoload/airline/extensions/tabline.vim   |   2 +-
 .../airline/extensions/tabline/default.vim    |   2 +-
 .../extensions/tabline/unique_tail.vim        |   2 +-
 .../tabline/unique_tail_improved.vim          |   2 +-
 .../autoload/airline/extensions/tagbar.vim    |   2 +-
 .../autoload/airline/extensions/tmuxline.vim  |   2 +-
 .../autoload/airline/extensions/undotree.vim  |   2 +-
 .../autoload/airline/extensions/unite.vim     |   2 +-
 .../airline/extensions/virtualenv.vim         |   2 +-
 .../airline/extensions/whitespace.vim         |   2 +-
 .../autoload/airline/highlighter.vim          |   2 +-
 .../vim-airline/autoload/airline/init.vim     |   2 +-
 .../vim-airline/autoload/airline/parts.vim    |   2 +-
 .../vim-airline/autoload/airline/section.vim  |   2 +-
 .../vim-airline/autoload/airline/themes.vim   |   2 +-
 .../autoload/airline/themes/kalisi.vim        |  57 ++
 .../vim-airline/autoload/airline/util.vim     |   2 +-
 .../vim-airline/doc/airline.txt               |  24 +-
 .../vim-airline/plugin/airline.vim            |   2 +-
 .../vim-fugitive/plugin/fugitive.vim          |   3 +
 .../vim-snipmate/Contributors.md              |   1 +
 sources_non_forked/vim-snipmate/README.md     |  11 +-
 .../vim-snipmate/autoload/snipMate.vim        |  12 +-
 sources_non_forked/vim-snippets/README.md     |  26 +
 .../vim-snippets/snippets/puppet.snippets     |  90 +--
 update_plugins.py                             |   1 +
 vimrcs/basic.vim                              |  16 +-
 76 files changed, 3855 insertions(+), 143 deletions(-)
 create mode 100644 sources_non_forked/pyflakes-pathogen/.gitignore
 create mode 100644 sources_non_forked/pyflakes-pathogen/README.rst
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
 create mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim

diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index a2beb4a3..751162ce 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -259,7 +259,7 @@ function! s:goyo_off()
   for [k, v] in items(goyo_revert)
     execute printf("let &%s = %s", k, string(v))
   endfor
-  execute 'colo '. g:colors_name
+  execute 'colo '. get(g:, 'colors_name', 'default')
 
   if goyo_disabled_gitgutter
     silent! GitGutterEnable
@@ -267,7 +267,7 @@ function! s:goyo_off()
 
   if goyo_disabled_airline && !exists("#airline")
     AirlineToggle
-    AirlineRefresh
+    silent! AirlineRefresh
   endif
 
   if goyo_disabled_powerline && !exists("#PowerlineMain")
diff --git a/sources_non_forked/pyflakes-pathogen/.gitignore b/sources_non_forked/pyflakes-pathogen/.gitignore
new file mode 100644
index 00000000..0d20b648
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/sources_non_forked/pyflakes-pathogen/README.rst b/sources_non_forked/pyflakes-pathogen/README.rst
new file mode 100644
index 00000000..b36ea388
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/README.rst
@@ -0,0 +1,11 @@
+Pyflakes
+==========
+
+This is just a manual dump of the vim pyflakes plugin from:
+http://www.vim.org/scripts/script.php?script_id=2441
+
+The purpose is to try to make this compatible with pathogen plugin. So creating
+the dir structure and hopefully this means we can just keep the norm and git
+clone the repo into the bundle directory and things will load up magically.
+
+
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst b/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
new file mode 100644
index 00000000..124fc3ec
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
@@ -0,0 +1,80 @@
+pyflakes-vim
+============
+
+A Vim plugin for checking Python code on the fly.
+
+PyFlakes catches common Python errors like mistyping a variable name or
+accessing a local before it is bound, and also gives warnings for things like
+unused imports.
+
+pyflakes-vim uses the output from PyFlakes to highlight errors in your code.
+To locate errors quickly, use quickfix_ commands like :cc.
+
+Make sure to check vim.org_ for the latest updates.
+
+.. _pyflakes.vim: http://www.vim.org/scripts/script.php?script_id=2441
+.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
+.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
+
+Quick Installation
+------------------
+
+1. Make sure your ``.vimrc`` has::
+ 
+    filetype on            " enables filetype detection
+    filetype plugin on     " enables filetype specific plugins
+
+2. Download the latest release_.
+
+3. Unzip ``pyflakes.vim`` and the ``pyflakes`` directory into
+   ``~/.vim/ftplugin/python`` (or somewhere similar on your
+   `runtime path`_ that will be sourced for Python files).
+
+.. _release: http://www.vim.org/scripts/script.php?script_id=2441
+.. _runtime path: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath' 
+
+Installation
+------------
+
+If you downloaded this from vim.org_, then just drop the contents of the zip
+file into ``~/.vim/ftplugin/python``.
+
+Otherwise, if you're running "from source," you'll need PyFlakes on your
+PYTHONPATH somewhere.  I recommend getting my PyFlakes_ fork, which retains
+column number information and has therfore has more specific error locations.
+
+.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
+.. _PyFlakes: http://github.com/kevinw/pyflakes
+
+Hacking
+-------
+
+::
+
+  git clone git://github.com/kevinw/pyflakes-vim.git
+  cd pyflakes-vim
+  git clone git://github.com/kevinw/pyflakes.git
+
+Options
+-------
+
+Set this option to you vimrc file to disable quickfix support::
+    
+    let g:pyflakes_use_quickfix = 0
+
+The value is set to 1 by default.
+
+TODO
+----
+ * signs_ support (show warning and error icons to left of the buffer area)
+ * configuration variables
+ * parse or intercept useful output from the warnings module
+
+.. _signs: http://www.vim.org/htmldoc/sign.html
+
+Changelog
+---------
+
+Please see http://www.vim.org/scripts/script.php?script_id=2441 for a history of
+all changes.
+
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
new file mode 100644
index 00000000..a6e84b6a
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
@@ -0,0 +1,325 @@
+" pyflakes.vim - A script to highlight Python code on the fly with warnings
+" from Pyflakes, a Python lint tool.
+"
+" Place this script and the accompanying pyflakes directory in
+" .vim/ftplugin/python.
+"
+" See README for additional installation and information.
+"
+" Thanks to matlib.vim for ideas/code on interactive linting.
+"
+" Maintainer: Kevin Watters <kevin.watters@gmail.com>
+" Version: 0.1
+if !has('python')
+    " exit if python is not available.
+    finish
+endif
+
+if exists("b:did_pyflakes_plugin")
+    finish " only load once
+else
+    let b:did_pyflakes_plugin = 1
+endif
+
+if !exists('g:pyflakes_builtins')
+    let g:pyflakes_builtins = []
+endif
+
+if !exists("b:did_python_init")
+    let b:did_python_init = 0
+
+    if !has('python')
+        echoerr "Error: the pyflakes.vim plugin requires Vim to be compiled with +python"
+        finish
+    endif
+
+if !exists('g:pyflakes_use_quickfix')
+    let g:pyflakes_use_quickfix = 1
+endif
+
+
+    python << EOF
+import vim
+import os.path
+import sys
+
+if sys.version_info[:2] < (2, 5):
+    raise AssertionError('Vim must be compiled with Python 2.5 or higher; you have ' + sys.version)
+
+# get the directory this script is in: the pyflakes python module should be installed there.
+scriptdir = os.path.join(os.path.dirname(vim.eval('expand("<sfile>")')), 'pyflakes')
+sys.path.insert(0, scriptdir)
+
+import ast
+from pyflakes import checker, messages
+from operator import attrgetter
+import re
+
+class loc(object):
+    def __init__(self, lineno, col=None):
+        self.lineno = lineno
+        self.col_offset = col
+
+class SyntaxError(messages.Message):
+    message = 'could not compile: %s'
+    def __init__(self, filename, lineno, col, message):
+        messages.Message.__init__(self, filename, loc(lineno, col))
+        self.message_args = (message,)
+
+class blackhole(object):
+    write = flush = lambda *a, **k: None
+
+def check(buffer):
+    filename = buffer.name
+    contents = buffer[:]
+
+    # shebang usually found at the top of the file, followed by source code encoding marker.
+    # assume everything else that follows is encoded in the encoding.
+    encoding_found = False
+    for n, line in enumerate(contents):
+        if n >= 2:
+            break
+        elif re.match(r'#.*coding[:=]\s*([-\w.]+)', line):
+            contents = ['']*(n+1) + contents[n+1:]
+            break
+
+    contents = '\n'.join(contents) + '\n'
+
+    vimenc = vim.eval('&encoding')
+    if vimenc:
+        contents = contents.decode(vimenc)
+
+    builtins = set(['__file__'])
+    try:
+        builtins.update(set(eval(vim.eval('string(g:pyflakes_builtins)'))))
+    except Exception:
+        pass
+
+    try:
+        # TODO: use warnings filters instead of ignoring stderr
+        old_stderr, sys.stderr = sys.stderr, blackhole()
+        try:
+            tree = ast.parse(contents, filename or '<unknown>')
+        finally:
+            sys.stderr = old_stderr
+    except:
+        try:
+            value = sys.exc_info()[1]
+            lineno, offset, line = value[1][1:]
+        except IndexError:
+            lineno, offset, line = 1, 0, ''
+        if line and line.endswith("\n"):
+            line = line[:-1]
+
+        return [SyntaxError(filename, lineno, offset, str(value))]
+    else:
+        # pyflakes looks to _MAGIC_GLOBALS in checker.py to see which
+        # UndefinedNames to ignore
+        old_globals = getattr(checker,' _MAGIC_GLOBALS', [])
+        checker._MAGIC_GLOBALS = set(old_globals) | builtins
+
+        w = checker.Checker(tree, filename)
+
+        checker._MAGIC_GLOBALS = old_globals
+
+        w.messages.sort(key = attrgetter('lineno'))
+        return w.messages
+
+
+def vim_quote(s):
+    return s.replace("'", "''")
+EOF
+    let b:did_python_init = 1
+endif
+
+if !b:did_python_init
+    finish
+endif
+
+au BufLeave <buffer> call s:ClearPyflakes()
+
+au BufEnter <buffer> call s:RunPyflakes()
+au InsertLeave <buffer> call s:RunPyflakes()
+au InsertEnter <buffer> call s:RunPyflakes()
+au BufWritePost <buffer> call s:RunPyflakes()
+
+au CursorHold <buffer> call s:RunPyflakes()
+au CursorHoldI <buffer> call s:RunPyflakes()
+
+au CursorHold <buffer> call s:GetPyflakesMessage()
+au CursorMoved <buffer> call s:GetPyflakesMessage()
+
+if !exists("*s:PyflakesUpdate")
+    function s:PyflakesUpdate()
+        silent call s:RunPyflakes()
+        call s:GetPyflakesMessage()
+    endfunction
+endif
+
+" Call this function in your .vimrc to update PyFlakes
+if !exists(":PyflakesUpdate")
+  command PyflakesUpdate :call s:PyflakesUpdate()
+endif
+
+" Hook common text manipulation commands to update PyFlakes
+"   TODO: is there a more general "text op" autocommand we could register
+"   for here?
+noremap <buffer><silent> dd dd:PyflakesUpdate<CR>
+noremap <buffer><silent> dw dw:PyflakesUpdate<CR>
+noremap <buffer><silent> u u:PyflakesUpdate<CR>
+noremap <buffer><silent> <C-R> <C-R>:PyflakesUpdate<CR>
+
+" WideMsg() prints [long] message up to (&columns-1) length
+" guaranteed without "Press Enter" prompt.
+if !exists("*s:WideMsg")
+    function s:WideMsg(msg)
+        let x=&ruler | let y=&showcmd
+        set noruler noshowcmd
+        redraw
+        echo strpart(a:msg, 0, &columns-1)
+        let &ruler=x | let &showcmd=y
+    endfun
+endif
+
+if !exists("*s:GetQuickFixStackCount")
+    function s:GetQuickFixStackCount()
+        let l:stack_count = 0
+        try
+            silent colder 9
+        catch /E380:/
+        endtry
+
+        try
+            for i in range(9)
+                silent cnewer
+                let l:stack_count = l:stack_count + 1
+            endfor
+        catch /E381:/
+            return l:stack_count
+        endtry
+    endfunction
+endif
+
+if !exists("*s:ActivatePyflakesQuickFixWindow")
+    function s:ActivatePyflakesQuickFixWindow()
+        try
+            silent colder 9 " go to the bottom of quickfix stack
+        catch /E380:/
+        endtry
+
+        if s:pyflakes_qf > 0
+            try
+                exe "silent cnewer " . s:pyflakes_qf
+            catch /E381:/
+                echoerr "Could not activate Pyflakes Quickfix Window."
+            endtry
+        endif
+    endfunction
+endif
+
+if !exists("*s:RunPyflakes")
+    function s:RunPyflakes()
+        highlight link PyFlakes SpellBad
+
+        if exists("b:cleared")
+            if b:cleared == 0
+                silent call s:ClearPyflakes()
+                let b:cleared = 1
+            endif
+        else
+            let b:cleared = 1
+        endif
+        
+        let b:matched = []
+        let b:matchedlines = {}
+
+        let b:qf_list = []
+        let b:qf_window_count = -1
+        
+        python << EOF
+for w in check(vim.current.buffer):
+    vim.command('let s:matchDict = {}')
+    vim.command("let s:matchDict['lineNum'] = " + str(w.lineno))
+    vim.command("let s:matchDict['message'] = '%s'" % vim_quote(w.message % w.message_args))
+    vim.command("let b:matchedlines[" + str(w.lineno) + "] = s:matchDict")
+    
+    vim.command("let l:qf_item = {}")
+    vim.command("let l:qf_item.bufnr = bufnr('%')")
+    vim.command("let l:qf_item.filename = expand('%')")
+    vim.command("let l:qf_item.lnum = %s" % str(w.lineno))
+    vim.command("let l:qf_item.text = '%s'" % vim_quote(w.message % w.message_args))
+    vim.command("let l:qf_item.type = 'E'")
+
+    if getattr(w, 'col', None) is None or isinstance(w, SyntaxError):
+        # without column information, just highlight the whole line
+        # (minus the newline)
+        vim.command(r"let s:mID = matchadd('PyFlakes', '\%" + str(w.lineno) + r"l\n\@!')")
+    else:
+        # with a column number, highlight the first keyword there
+        vim.command(r"let s:mID = matchadd('PyFlakes', '^\%" + str(w.lineno) + r"l\_.\{-}\zs\k\+\k\@!\%>" + str(w.col) + r"c')")
+
+        vim.command("let l:qf_item.vcol = 1")
+        vim.command("let l:qf_item.col = %s" % str(w.col + 1))
+
+    vim.command("call add(b:matched, s:matchDict)")
+    vim.command("call add(b:qf_list, l:qf_item)")
+EOF
+        if g:pyflakes_use_quickfix == 1
+            if exists("s:pyflakes_qf")
+                " if pyflakes quickfix window is already created, reuse it
+                call s:ActivatePyflakesQuickFixWindow()
+                call setqflist(b:qf_list, 'r')
+            else
+                " one pyflakes quickfix window for all buffer
+                call setqflist(b:qf_list, '')
+                let s:pyflakes_qf = s:GetQuickFixStackCount()
+            endif
+        endif
+
+        let b:cleared = 0
+    endfunction
+end
+
+" keep track of whether or not we are showing a message
+let b:showing_message = 0
+
+if !exists("*s:GetPyflakesMessage")
+    function s:GetPyflakesMessage()
+        let s:cursorPos = getpos(".")
+
+        " Bail if RunPyflakes hasn't been called yet.
+        if !exists('b:matchedlines')
+            return
+        endif
+
+        " if there's a message for the line the cursor is currently on, echo
+        " it to the console
+        if has_key(b:matchedlines, s:cursorPos[1])
+            let s:pyflakesMatch = get(b:matchedlines, s:cursorPos[1])
+            call s:WideMsg(s:pyflakesMatch['message'])
+            let b:showing_message = 1
+            return
+        endif
+
+        " otherwise, if we're showing a message, clear it
+        if b:showing_message == 1
+            echo
+            let b:showing_message = 0
+        endif
+    endfunction
+endif
+
+if !exists('*s:ClearPyflakes')
+    function s:ClearPyflakes()
+        let s:matches = getmatches()
+        for s:matchId in s:matches
+            if s:matchId['group'] == 'PyFlakes'
+                call matchdelete(s:matchId['id'])
+            endif
+        endfor
+        let b:matched = []
+        let b:matchedlines = {}
+        let b:cleared = 1
+    endfunction
+endif
+
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
new file mode 100644
index 00000000..42b8cf3c
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) 2005 Divmod, Inc., http://www.divmod.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/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
new file mode 100644
index 00000000..2a3e3165
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
@@ -0,0 +1,29 @@
+0.4.0 (2009-11-25):
+  - Fix reporting for certain SyntaxErrors which lack line number
+    information.
+  - Check for syntax errors more rigorously.
+  - Support checking names used with the class decorator syntax in versions
+    of Python which have it.
+  - Detect local variables which are bound but never used.
+  - Handle permission errors when trying to read source files.
+  - Handle problems with the encoding of source files.
+  - Support importing dotted names so as not to incorrectly report them as
+    redefined unused names.
+  - Support all forms of the with statement.
+  - Consider static `__all__` definitions and avoid reporting unused names
+    if the names are listed there.
+  - Fix incorrect checking of class names with respect to the names of their
+    bases in the class statement.
+  - Support the `__path__` global in `__init__.py`.
+
+0.3.0 (2009-01-30):
+  - Display more informative SyntaxError messages.
+  - Don't hang flymake with unmatched triple quotes (only report a single
+    line of source for a multiline syntax error).
+  - Recognize __builtins__ as a defined name.
+  - Improve pyflakes support for python versions 2.3-2.5
+  - Support for if-else expressions and with statements.
+  - Warn instead of error on non-existant file paths.
+  - Check for __future__ imports after other statements.
+  - Add reporting for some types of import shadowing.
+  - Improve reporting of unbound locals
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
new file mode 100644
index 00000000..9ac34fc0
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
@@ -0,0 +1,36 @@
+pyflakes
+========
+
+This version of PyFlakes_ has been improved to use Python's newer ``ast``
+module, instead of ``compiler``. So code checking happens faster, and will stay
+up to date with new language changes.
+
+.. _PyFlakes: http://http://www.divmod.org/trac/wiki/DivmodPyflakes
+
+TODO
+----
+
+Importing several modules from the same package results in unnecessary warnings:
+
+::
+
+    import a.b
+    import a.c # Redefinition of unused "a" from line 1
+
+The following construct for defining a function differently depending on some
+condition results in a redefinition warning:
+
+::
+
+    if some_condition:
+        def foo(): do_foo()
+    else:
+        def foo(): do_bar() # redefinition of function 'foo' from line 2
+
+IDE Integration
+---------------
+
+* vim: pyflakes-vim_
+
+.. _pyflakes-vim: http://github.com/kevinw/pyflakes-vim
+
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
new file mode 100644
index 00000000..69f3f12c
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
@@ -0,0 +1,11 @@
+ - Check for methods that override other methods except that they vary by case.
+ - assign/increment + unbound local error not caught
+        def foo():
+          bar = 5
+          def meep():
+            bar += 2
+          meep()
+          print bar
+
+        print foo()
+
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
new file mode 100644
index 00000000..652a8f47
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
@@ -0,0 +1,2 @@
+
+__version__ = '0.4.0'
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
new file mode 100644
index 00000000..d52025f4
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
@@ -0,0 +1,311 @@
+# -*- coding: utf-8 -*-
+"""
+    ast
+    ~~~
+
+    The `ast` module helps Python applications to process trees of the Python
+    abstract syntax grammar.  The abstract syntax itself might change with
+    each Python release; this module helps to find out programmatically what
+    the current grammar looks like and allows modifications of it.
+
+    An abstract syntax tree can be generated by passing `ast.PyCF_ONLY_AST` as
+    a flag to the `compile()` builtin function or by using the `parse()`
+    function from this module.  The result will be a tree of objects whose
+    classes all inherit from `ast.AST`.
+
+    A modified abstract syntax tree can be compiled into a Python code object
+    using the built-in `compile()` function.
+
+    Additionally various helper functions are provided that make working with
+    the trees simpler.  The main intention of the helper functions and this
+    module in general is to provide an easy to use interface for libraries
+    that work tightly with the python syntax (template engines for example).
+
+
+    :copyright: Copyright 2008 by Armin Ronacher.
+    :license: Python License.
+"""
+from _ast import *
+from _ast import __version__
+
+
+def parse(expr, filename='<unknown>', mode='exec'):
+    """
+    Parse an expression into an AST node.
+    Equivalent to compile(expr, filename, mode, PyCF_ONLY_AST).
+    """
+    return compile(expr, filename, mode, PyCF_ONLY_AST)
+
+
+def literal_eval(node_or_string):
+    """
+    Safely evaluate an expression node or a string containing a Python
+    expression.  The string or node provided may only consist of the following
+    Python literal structures: strings, numbers, tuples, lists, dicts, booleans,
+    and None.
+    """
+    _safe_names = {'None': None, 'True': True, 'False': False}
+    if isinstance(node_or_string, basestring):
+        node_or_string = parse(node_or_string, mode='eval')
+    if isinstance(node_or_string, Expression):
+        node_or_string = node_or_string.body
+    def _convert(node):
+        if isinstance(node, Str):
+            return node.s
+        elif isinstance(node, Num):
+            return node.n
+        elif isinstance(node, Tuple):
+            return tuple(map(_convert, node.elts))
+        elif isinstance(node, List):
+            return list(map(_convert, node.elts))
+        elif isinstance(node, Dict):
+            return dict((_convert(k), _convert(v)) for k, v
+                        in zip(node.keys, node.values))
+        elif isinstance(node, Name):
+            if node.id in _safe_names:
+                return _safe_names[node.id]
+        raise ValueError('malformed string')
+    return _convert(node_or_string)
+
+
+def dump(node, annotate_fields=True, include_attributes=False):
+    """
+    Return a formatted dump of the tree in *node*.  This is mainly useful for
+    debugging purposes.  The returned string will show the names and the values
+    for fields.  This makes the code impossible to evaluate, so if evaluation is
+    wanted *annotate_fields* must be set to False.  Attributes such as line
+    numbers and column offsets are not dumped by default.  If this is wanted,
+    *include_attributes* can be set to True.
+    """
+    def _format(node):
+        if isinstance(node, AST):
+            fields = [(a, _format(b)) for a, b in iter_fields(node)]
+            rv = '%s(%s' % (node.__class__.__name__, ', '.join(
+                ('%s=%s' % field for field in fields)
+                if annotate_fields else
+                (b for a, b in fields)
+            ))
+            if include_attributes and node._attributes:
+                rv += fields and ', ' or ' '
+                rv += ', '.join('%s=%s' % (a, _format(getattr(node, a)))
+                                for a in node._attributes)
+            return rv + ')'
+        elif isinstance(node, list):
+            return '[%s]' % ', '.join(_format(x) for x in node)
+        return repr(node)
+    if not isinstance(node, AST):
+        raise TypeError('expected AST, got %r' % node.__class__.__name__)
+    return _format(node)
+
+
+def copy_location(new_node, old_node):
+    """
+    Copy source location (`lineno` and `col_offset` attributes) from
+    *old_node* to *new_node* if possible, and return *new_node*.
+    """
+    for attr in 'lineno', 'col_offset':
+        if attr in old_node._attributes and attr in new_node._attributes \
+           and hasattr(old_node, attr):
+            setattr(new_node, attr, getattr(old_node, attr))
+    return new_node
+
+
+def fix_missing_locations(node):
+    """
+    When you compile a node tree with compile(), the compiler expects lineno and
+    col_offset attributes for every node that supports them.  This is rather
+    tedious to fill in for generated nodes, so this helper adds these attributes
+    recursively where not already set, by setting them to the values of the
+    parent node.  It works recursively starting at *node*.
+    """
+    def _fix(node, lineno, col_offset):
+        if 'lineno' in node._attributes:
+            if not hasattr(node, 'lineno'):
+                node.lineno = lineno
+            else:
+                lineno = node.lineno
+        if 'col_offset' in node._attributes:
+            if not hasattr(node, 'col_offset'):
+                node.col_offset = col_offset
+            else:
+                col_offset = node.col_offset
+        for child in iter_child_nodes(node):
+            _fix(child, lineno, col_offset)
+    _fix(node, 1, 0)
+    return node
+
+def add_col_end(node):
+    def _fix(node, next):
+        children = list(iter_child_nodes(node))
+        for i, child in enumerate(children):
+            next_offset = children[i+1].col_offset if i < len(children) else next.col_offset
+            child.col_end = next_offset
+
+
+def increment_lineno(node, n=1):
+    """
+    Increment the line number of each node in the tree starting at *node* by *n*.
+    This is useful to "move code" to a different location in a file.
+    """
+    if 'lineno' in node._attributes:
+        node.lineno = getattr(node, 'lineno', 0) + n
+    for child in walk(node):
+        if 'lineno' in child._attributes:
+            child.lineno = getattr(child, 'lineno', 0) + n
+    return node
+
+
+def iter_fields(node):
+    """
+    Yield a tuple of ``(fieldname, value)`` for each field in ``node._fields``
+    that is present on *node*.
+    """
+    if node._fields is None:
+        return
+
+    for field in node._fields:
+        try:
+            yield field, getattr(node, field)
+        except AttributeError:
+            pass
+
+
+def iter_child_nodes(node):
+    """
+    Yield all direct child nodes of *node*, that is, all fields that are nodes
+    and all items of fields that are lists of nodes.
+    """
+    for name, field in iter_fields(node):
+        if isinstance(field, AST):
+            yield field
+        elif isinstance(field, list):
+            for item in field:
+                if isinstance(item, AST):
+                    yield item
+
+
+def get_docstring(node, clean=True):
+    """
+    Return the docstring for the given node or None if no docstring can
+    be found.  If the node provided does not have docstrings a TypeError
+    will be raised.
+    """
+    if not isinstance(node, (FunctionDef, ClassDef, Module)):
+        raise TypeError("%r can't have docstrings" % node.__class__.__name__)
+    if node.body and isinstance(node.body[0], Expr) and \
+       isinstance(node.body[0].value, Str):
+        if clean:
+            import inspect
+            return inspect.cleandoc(node.body[0].value.s)
+        return node.body[0].value.s
+
+
+def walk(node):
+    """
+    Recursively yield all child nodes of *node*, in no specified order.  This is
+    useful if you only want to modify nodes in place and don't care about the
+    context.
+    """
+    from collections import deque
+    todo = deque([node])
+    while todo:
+        node = todo.popleft()
+        todo.extend(iter_child_nodes(node))
+        yield node
+
+
+class NodeVisitor(object):
+    """
+    A node visitor base class that walks the abstract syntax tree and calls a
+    visitor function for every node found.  This function may return a value
+    which is forwarded by the `visit` method.
+
+    This class is meant to be subclassed, with the subclass adding visitor
+    methods.
+
+    Per default the visitor functions for the nodes are ``'visit_'`` +
+    class name of the node.  So a `TryFinally` node visit function would
+    be `visit_TryFinally`.  This behavior can be changed by overriding
+    the `visit` method.  If no visitor function exists for a node
+    (return value `None`) the `generic_visit` visitor is used instead.
+
+    Don't use the `NodeVisitor` if you want to apply changes to nodes during
+    traversing.  For this a special visitor exists (`NodeTransformer`) that
+    allows modifications.
+    """
+
+    def visit(self, node):
+        """Visit a node."""
+        method = 'visit_' + node.__class__.__name__
+        visitor = getattr(self, method, self.generic_visit)
+        return visitor(node)
+
+    def generic_visit(self, node):
+        """Called if no explicit visitor function exists for a node."""
+        for field, value in iter_fields(node):
+            if isinstance(value, list):
+                for item in value:
+                    if isinstance(item, AST):
+                        self.visit(item)
+            elif isinstance(value, AST):
+                self.visit(value)
+
+
+class NodeTransformer(NodeVisitor):
+    """
+    A :class:`NodeVisitor` subclass that walks the abstract syntax tree and
+    allows modification of nodes.
+
+    The `NodeTransformer` will walk the AST and use the return value of the
+    visitor methods to replace or remove the old node.  If the return value of
+    the visitor method is ``None``, the node will be removed from its location,
+    otherwise it is replaced with the return value.  The return value may be the
+    original node in which case no replacement takes place.
+
+    Here is an example transformer that rewrites all occurrences of name lookups
+    (``foo``) to ``data['foo']``::
+
+       class RewriteName(NodeTransformer):
+
+           def visit_Name(self, node):
+               return copy_location(Subscript(
+                   value=Name(id='data', ctx=Load()),
+                   slice=Index(value=Str(s=node.id)),
+                   ctx=node.ctx
+               ), node)
+
+    Keep in mind that if the node you're operating on has child nodes you must
+    either transform the child nodes yourself or call the :meth:`generic_visit`
+    method for the node first.
+
+    For nodes that were part of a collection of statements (that applies to all
+    statement nodes), the visitor may also return a list of nodes rather than
+    just a single node.
+
+    Usually you use the transformer like this::
+
+       node = YourTransformer().visit(node)
+    """
+
+    def generic_visit(self, node):
+        for field, old_value in iter_fields(node):
+            old_value = getattr(node, field, None)
+            if isinstance(old_value, list):
+                new_values = []
+                for value in old_value:
+                    if isinstance(value, AST):
+                        value = self.visit(value)
+                        if value is None:
+                            continue
+                        elif not isinstance(value, AST):
+                            new_values.extend(value)
+                            continue
+                    new_values.append(value)
+                old_value[:] = new_values
+            elif isinstance(old_value, AST):
+                new_node = self.visit(old_value)
+                if new_node is None:
+                    delattr(node, field)
+                else:
+                    setattr(node, field, new_node)
+        return node
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
new file mode 100644
index 00000000..7c348b8d
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
@@ -0,0 +1,625 @@
+# -*- test-case-name: pyflakes -*-
+# (c) 2005-2010 Divmod, Inc.
+# See LICENSE file for details
+
+import __builtin__
+import os.path
+import _ast
+
+from pyflakes import messages
+
+
+# utility function to iterate over an AST node's children, adapted
+# from Python 2.6's standard ast module
+try:
+    import ast
+    iter_child_nodes = ast.iter_child_nodes
+except (ImportError, AttributeError):
+    def iter_child_nodes(node, astcls=_ast.AST):
+        """
+        Yield all direct child nodes of *node*, that is, all fields that are nodes
+        and all items of fields that are lists of nodes.
+        """
+        for name in node._fields:
+            field = getattr(node, name, None)
+            if isinstance(field, astcls):
+                yield field
+            elif isinstance(field, list):
+                for item in field:
+                    yield item
+
+
+class Binding(object):
+    """
+    Represents the binding of a value to a name.
+
+    The checker uses this to keep track of which names have been bound and
+    which names have not. See L{Assignment} for a special type of binding that
+    is checked with stricter rules.
+
+    @ivar used: pair of (L{Scope}, line-number) indicating the scope and
+                line number that this binding was last used
+    """
+
+    def __init__(self, name, source):
+        self.name = name
+        self.source = source
+        self.used = False
+
+
+    def __str__(self):
+        return self.name
+
+
+    def __repr__(self):
+        return '<%s object %r from line %r at 0x%x>' % (self.__class__.__name__,
+                                                        self.name,
+                                                        self.source.lineno,
+                                                        id(self))
+
+
+
+class UnBinding(Binding):
+    '''Created by the 'del' operator.'''
+
+
+
+class Importation(Binding):
+    """
+    A binding created by an import statement.
+
+    @ivar fullName: The complete name given to the import statement,
+        possibly including multiple dotted components.
+    @type fullName: C{str}
+    """
+    def __init__(self, name, source):
+        self.fullName = name
+        name = name.split('.')[0]
+        super(Importation, self).__init__(name, source)
+
+
+
+class Argument(Binding):
+    """
+    Represents binding a name as an argument.
+    """
+
+
+
+class Assignment(Binding):
+    """
+    Represents binding a name with an explicit assignment.
+
+    The checker will raise warnings for any Assignment that isn't used. Also,
+    the checker does not consider assignments in tuple/list unpacking to be
+    Assignments, rather it treats them as simple Bindings.
+    """
+
+
+
+class FunctionDefinition(Binding):
+    pass
+
+
+
+class ExportBinding(Binding):
+    """
+    A binding created by an C{__all__} assignment.  If the names in the list
+    can be determined statically, they will be treated as names for export and
+    additional checking applied to them.
+
+    The only C{__all__} assignment that can be recognized is one which takes
+    the value of a literal list containing literal strings.  For example::
+
+        __all__ = ["foo", "bar"]
+
+    Names which are imported and not otherwise used but appear in the value of
+    C{__all__} will not have an unused import warning reported for them.
+    """
+    def names(self):
+        """
+        Return a list of the names referenced by this binding.
+        """
+        names = []
+        if isinstance(self.source, _ast.List):
+            for node in self.source.elts:
+                if isinstance(node, _ast.Str):
+                    names.append(node.s)
+        return names
+
+
+
+class Scope(dict):
+    importStarred = False       # set to True when import * is found
+
+
+    def __repr__(self):
+        return '<%s at 0x%x %s>' % (self.__class__.__name__, id(self), dict.__repr__(self))
+
+
+    def __init__(self):
+        super(Scope, self).__init__()
+
+
+
+class ClassScope(Scope):
+    pass
+
+
+
+class FunctionScope(Scope):
+    """
+    I represent a name scope for a function.
+
+    @ivar globals: Names declared 'global' in this function.
+    """
+    def __init__(self):
+        super(FunctionScope, self).__init__()
+        self.globals = {}
+
+
+
+class ModuleScope(Scope):
+    pass
+
+
+# Globally defined names which are not attributes of the __builtin__ module.
+_MAGIC_GLOBALS = ['__file__', '__builtins__']
+
+
+
+class Checker(object):
+    """
+    I check the cleanliness and sanity of Python code.
+
+    @ivar _deferredFunctions: Tracking list used by L{deferFunction}.  Elements
+        of the list are two-tuples.  The first element is the callable passed
+        to L{deferFunction}.  The second element is a copy of the scope stack
+        at the time L{deferFunction} was called.
+
+    @ivar _deferredAssignments: Similar to C{_deferredFunctions}, but for
+        callables which are deferred assignment checks.
+    """
+
+    nodeDepth = 0
+    traceTree = False
+
+    def __init__(self, tree, filename='(none)'):
+        self._deferredFunctions = []
+        self._deferredAssignments = []
+        self.dead_scopes = []
+        self.messages = []
+        self.filename = filename
+        self.scopeStack = [ModuleScope()]
+        self.futuresAllowed = True
+        self.handleChildren(tree)
+        self._runDeferred(self._deferredFunctions)
+        # Set _deferredFunctions to None so that deferFunction will fail
+        # noisily if called after we've run through the deferred functions.
+        self._deferredFunctions = None
+        self._runDeferred(self._deferredAssignments)
+        # Set _deferredAssignments to None so that deferAssignment will fail
+        # noisly if called after we've run through the deferred assignments.
+        self._deferredAssignments = None
+        del self.scopeStack[1:]
+        self.popScope()
+        self.check_dead_scopes()
+
+
+    def deferFunction(self, callable):
+        '''
+        Schedule a function handler to be called just before completion.
+
+        This is used for handling function bodies, which must be deferred
+        because code later in the file might modify the global scope. When
+        `callable` is called, the scope at the time this is called will be
+        restored, however it will contain any new bindings added to it.
+        '''
+        self._deferredFunctions.append((callable, self.scopeStack[:]))
+
+
+    def deferAssignment(self, callable):
+        """
+        Schedule an assignment handler to be called just after deferred
+        function handlers.
+        """
+        self._deferredAssignments.append((callable, self.scopeStack[:]))
+
+
+    def _runDeferred(self, deferred):
+        """
+        Run the callables in C{deferred} using their associated scope stack.
+        """
+        for handler, scope in deferred:
+            self.scopeStack = scope
+            handler()
+
+
+    def scope(self):
+        return self.scopeStack[-1]
+    scope = property(scope)
+
+    def popScope(self):
+        self.dead_scopes.append(self.scopeStack.pop())
+
+
+    def check_dead_scopes(self):
+        """
+        Look at scopes which have been fully examined and report names in them
+        which were imported but unused.
+        """
+        for scope in self.dead_scopes:
+            export = isinstance(scope.get('__all__'), ExportBinding)
+            if export:
+                all = scope['__all__'].names()
+                if os.path.split(self.filename)[1] != '__init__.py':
+                    # Look for possible mistakes in the export list
+                    undefined = set(all) - set(scope)
+                    for name in undefined:
+                        self.report(
+                            messages.UndefinedExport,
+                            scope['__all__'].source,
+                            name)
+            else:
+                all = []
+
+            # Look for imported names that aren't used.
+            for importation in scope.itervalues():
+                if isinstance(importation, Importation):
+                    if not importation.used and importation.name not in all:
+                        self.report(
+                            messages.UnusedImport,
+                            importation.source,
+                            importation.name)
+
+
+    def pushFunctionScope(self):
+        self.scopeStack.append(FunctionScope())
+
+    def pushClassScope(self):
+        self.scopeStack.append(ClassScope())
+
+    def report(self, messageClass, *args, **kwargs):
+        self.messages.append(messageClass(self.filename, *args, **kwargs))
+
+    def handleChildren(self, tree):
+        for node in iter_child_nodes(tree):
+            self.handleNode(node, tree)
+
+    def isDocstring(self, node):
+        """
+        Determine if the given node is a docstring, as long as it is at the
+        correct place in the node tree.
+        """
+        return isinstance(node, _ast.Str) or \
+               (isinstance(node, _ast.Expr) and
+                isinstance(node.value, _ast.Str))
+
+    def handleNode(self, node, parent):
+        node.parent = parent
+        if self.traceTree:
+            print '  ' * self.nodeDepth + node.__class__.__name__
+        self.nodeDepth += 1
+        if self.futuresAllowed and not \
+               (isinstance(node, _ast.ImportFrom) or self.isDocstring(node)):
+            self.futuresAllowed = False
+        nodeType = node.__class__.__name__.upper()
+        try:
+            handler = getattr(self, nodeType)
+            handler(node)
+        finally:
+            self.nodeDepth -= 1
+        if self.traceTree:
+            print '  ' * self.nodeDepth + 'end ' + node.__class__.__name__
+
+    def ignore(self, node):
+        pass
+
+    # "stmt" type nodes
+    RETURN = DELETE = PRINT = WHILE = IF = WITH = RAISE = TRYEXCEPT = \
+        TRYFINALLY = ASSERT = EXEC = EXPR = handleChildren
+
+    CONTINUE = BREAK = PASS = ignore
+
+    # "expr" type nodes
+    BOOLOP = BINOP = UNARYOP = IFEXP = DICT = SET = YIELD = COMPARE = \
+    CALL = REPR = ATTRIBUTE = SUBSCRIPT = LIST = TUPLE = handleChildren
+
+    NUM = STR = ELLIPSIS = ignore
+
+    # "slice" type nodes
+    SLICE = EXTSLICE = INDEX = handleChildren
+
+    # expression contexts are node instances too, though being constants
+    LOAD = STORE = DEL = AUGLOAD = AUGSTORE = PARAM = ignore
+
+    # same for operators
+    AND = OR = ADD = SUB = MULT = DIV = MOD = POW = LSHIFT = RSHIFT = \
+    BITOR = BITXOR = BITAND = FLOORDIV = INVERT = NOT = UADD = USUB = \
+    EQ = NOTEQ = LT = LTE = GT = GTE = IS = ISNOT = IN = NOTIN = ignore
+
+    # additional node types
+    COMPREHENSION = EXCEPTHANDLER = KEYWORD = handleChildren
+
+    def addBinding(self, loc, value, reportRedef=True):
+        '''Called when a binding is altered.
+
+        - `loc` is the location (an object with lineno and optionally
+          col_offset attributes) of the statement responsible for the change
+        - `value` is the optional new value, a Binding instance, associated
+          with the binding; if None, the binding is deleted if it exists.
+        - if `reportRedef` is True (default), rebinding while unused will be
+          reported.
+        '''
+        if (isinstance(self.scope.get(value.name), FunctionDefinition)
+                    and isinstance(value, FunctionDefinition)):
+            self.report(messages.RedefinedFunction,
+                        loc, value.name, self.scope[value.name].source)
+
+        if not isinstance(self.scope, ClassScope):
+            for scope in self.scopeStack[::-1]:
+                existing = scope.get(value.name)
+                if (isinstance(existing, Importation)
+                        and not existing.used
+                        and (not isinstance(value, Importation) or value.fullName == existing.fullName)
+                        and reportRedef):
+
+                    self.report(messages.RedefinedWhileUnused,
+                                loc, value.name, scope[value.name].source)
+
+        if isinstance(value, UnBinding):
+            try:
+                del self.scope[value.name]
+            except KeyError:
+                self.report(messages.UndefinedName, loc, value.name)
+        else:
+            self.scope[value.name] = value
+
+    def GLOBAL(self, node):
+        """
+        Keep track of globals declarations.
+        """
+        if isinstance(self.scope, FunctionScope):
+            self.scope.globals.update(dict.fromkeys(node.names))
+
+    def LISTCOMP(self, node):
+        # handle generators before element
+        for gen in node.generators:
+            self.handleNode(gen, node)
+        self.handleNode(node.elt, node)
+
+    GENERATOREXP = SETCOMP = LISTCOMP
+
+    # dictionary comprehensions; introduced in Python 2.7
+    def DICTCOMP(self, node):
+        for gen in node.generators:
+            self.handleNode(gen, node)
+        self.handleNode(node.key, node)
+        self.handleNode(node.value, node)
+
+    def FOR(self, node):
+        """
+        Process bindings for loop variables.
+        """
+        vars = []
+        def collectLoopVars(n):
+            if isinstance(n, _ast.Name):
+                vars.append(n.id)
+            elif isinstance(n, _ast.expr_context):
+                return
+            else:
+                for c in iter_child_nodes(n):
+                    collectLoopVars(c)
+
+        collectLoopVars(node.target)
+        for varn in vars:
+            if (isinstance(self.scope.get(varn), Importation)
+                    # unused ones will get an unused import warning
+                    and self.scope[varn].used):
+                self.report(messages.ImportShadowedByLoopVar,
+                            node, varn, self.scope[varn].source)
+
+        self.handleChildren(node)
+
+    def NAME(self, node):
+        """
+        Handle occurrence of Name (which can be a load/store/delete access.)
+        """
+        # Locate the name in locals / function / globals scopes.
+        if isinstance(node.ctx, (_ast.Load, _ast.AugLoad)):
+            # try local scope
+            importStarred = self.scope.importStarred
+            try:
+                self.scope[node.id].used = (self.scope, node)
+            except KeyError:
+                pass
+            else:
+                return
+
+            # try enclosing function scopes
+
+            for scope in self.scopeStack[-2:0:-1]:
+                importStarred = importStarred or scope.importStarred
+                if not isinstance(scope, FunctionScope):
+                    continue
+                try:
+                    scope[node.id].used = (self.scope, node)
+                except KeyError:
+                    pass
+                else:
+                    return
+
+            # try global scope
+
+            importStarred = importStarred or self.scopeStack[0].importStarred
+            try:
+                self.scopeStack[0][node.id].used = (self.scope, node)
+            except KeyError:
+                if ((not hasattr(__builtin__, node.id))
+                        and node.id not in _MAGIC_GLOBALS
+                        and not importStarred):
+                    if (os.path.basename(self.filename) == '__init__.py' and
+                        node.id == '__path__'):
+                        # the special name __path__ is valid only in packages
+                        pass
+                    else:
+                        self.report(messages.UndefinedName, node, node.id)
+        elif isinstance(node.ctx, (_ast.Store, _ast.AugStore)):
+            # if the name hasn't already been defined in the current scope
+            if isinstance(self.scope, FunctionScope) and node.id not in self.scope:
+                # for each function or module scope above us
+                for scope in self.scopeStack[:-1]:
+                    if not isinstance(scope, (FunctionScope, ModuleScope)):
+                        continue
+                    # if the name was defined in that scope, and the name has
+                    # been accessed already in the current scope, and hasn't
+                    # been declared global
+                    if (node.id in scope
+                            and scope[node.id].used
+                            and scope[node.id].used[0] is self.scope
+                            and node.id not in self.scope.globals):
+                        # then it's probably a mistake
+                        self.report(messages.UndefinedLocal,
+                                    scope[node.id].used[1],
+                                    node.id,
+                                    scope[node.id].source)
+                        break
+
+            if isinstance(node.parent,
+                          (_ast.For, _ast.comprehension, _ast.Tuple, _ast.List)):
+                binding = Binding(node.id, node)
+            elif (node.id == '__all__' and
+                  isinstance(self.scope, ModuleScope)):
+                binding = ExportBinding(node.id, node.parent.value)
+            else:
+                binding = Assignment(node.id, node)
+            if node.id in self.scope:
+                binding.used = self.scope[node.id].used
+            self.addBinding(node, binding)
+        elif isinstance(node.ctx, _ast.Del):
+            if isinstance(self.scope, FunctionScope) and \
+                   node.id in self.scope.globals:
+                del self.scope.globals[node.id]
+            else:
+                self.addBinding(node, UnBinding(node.id, node))
+        else:
+            # must be a Param context -- this only happens for names in function
+            # arguments, but these aren't dispatched through here
+            raise RuntimeError(
+                "Got impossible expression context: %r" % (node.ctx,))
+
+
+    def FUNCTIONDEF(self, node):
+        # the decorators attribute is called decorator_list as of Python 2.6
+        if hasattr(node, 'decorators'):
+            for deco in node.decorators:
+                self.handleNode(deco, node)
+        else:
+            for deco in node.decorator_list:
+                self.handleNode(deco, node)
+        self.addBinding(node, FunctionDefinition(node.name, node))
+        self.LAMBDA(node)
+
+    def LAMBDA(self, node):
+        for default in node.args.defaults:
+            self.handleNode(default, node)
+
+        def runFunction():
+            args = []
+
+            def addArgs(arglist):
+                for arg in arglist:
+                    if isinstance(arg, _ast.Tuple):
+                        addArgs(arg.elts)
+                    else:
+                        if arg.id in args:
+                            self.report(messages.DuplicateArgument,
+                                        node, arg.id)
+                        args.append(arg.id)
+
+            self.pushFunctionScope()
+            addArgs(node.args.args)
+            # vararg/kwarg identifiers are not Name nodes
+            if node.args.vararg:
+                args.append(node.args.vararg)
+            if node.args.kwarg:
+                args.append(node.args.kwarg)
+            for name in args:
+                self.addBinding(node, Argument(name, node), reportRedef=False)
+            if isinstance(node.body, list):
+                # case for FunctionDefs
+                for stmt in node.body:
+                    self.handleNode(stmt, node)
+            else:
+                # case for Lambdas
+                self.handleNode(node.body, node)
+            def checkUnusedAssignments():
+                """
+                Check to see if any assignments have not been used.
+                """
+                for name, binding in self.scope.iteritems():
+                    if (not binding.used and not name in self.scope.globals
+                        and isinstance(binding, Assignment)):
+                        self.report(messages.UnusedVariable,
+                                    binding.source, name)
+            self.deferAssignment(checkUnusedAssignments)
+            self.popScope()
+
+        self.deferFunction(runFunction)
+
+
+    def CLASSDEF(self, node):
+        """
+        Check names used in a class definition, including its decorators, base
+        classes, and the body of its definition.  Additionally, add its name to
+        the current scope.
+        """
+        # decorator_list is present as of Python 2.6
+        for deco in getattr(node, 'decorator_list', []):
+            self.handleNode(deco, node)
+        for baseNode in node.bases:
+            self.handleNode(baseNode, node)
+        self.pushClassScope()
+        for stmt in node.body:
+            self.handleNode(stmt, node)
+        self.popScope()
+        self.addBinding(node, Binding(node.name, node))
+
+    def ASSIGN(self, node):
+        self.handleNode(node.value, node)
+        for target in node.targets:
+            self.handleNode(target, node)
+
+    def AUGASSIGN(self, node):
+        # AugAssign is awkward: must set the context explicitly and visit twice,
+        # once with AugLoad context, once with AugStore context
+        node.target.ctx = _ast.AugLoad()
+        self.handleNode(node.target, node)
+        self.handleNode(node.value, node)
+        node.target.ctx = _ast.AugStore()
+        self.handleNode(node.target, node)
+
+    def IMPORT(self, node):
+        for alias in node.names:
+            name = alias.asname or alias.name
+            importation = Importation(name, node)
+            self.addBinding(node, importation)
+
+    def IMPORTFROM(self, node):
+        if node.module == '__future__':
+            if not self.futuresAllowed:
+                self.report(messages.LateFutureImport, node,
+                            [n.name for n in node.names])
+        else:
+            self.futuresAllowed = False
+
+        for alias in node.names:
+            if alias.name == '*':
+                self.scope.importStarred = True
+                self.report(messages.ImportStarUsed, node, node.module)
+                continue
+            name = alias.asname or alias.name
+            importation = Importation(name, node)
+            if node.module == '__future__':
+                importation.used = (self.scope, node)
+            self.addBinding(node, importation)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
new file mode 100644
index 00000000..73bf4cc3
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
@@ -0,0 +1,96 @@
+# (c) 2005 Divmod, Inc.  See LICENSE file for details
+
+class Message(object):
+    message = ''
+    message_args = ()
+    def __init__(self, filename, loc, use_column=True):
+        self.filename = filename
+        self.lineno = loc.lineno
+        self.col = getattr(loc, 'col_offset', None) if use_column else None
+
+    def __str__(self):
+        return '%s:%s: %s' % (self.filename, self.lineno, self.message % self.message_args)
+
+
+class UnusedImport(Message):
+    message = '%r imported but unused'
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc, use_column=False)
+        self.message_args = (name,)
+
+
+class RedefinedWhileUnused(Message):
+    message = 'redefinition of unused %r from line %r'
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class ImportShadowedByLoopVar(Message):
+    message = 'import %r from line %r shadowed by loop variable'
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class ImportStarUsed(Message):
+    message = "'from %s import *' used; unable to detect undefined names"
+    def __init__(self, filename, loc, modname):
+        Message.__init__(self, filename, loc)
+        self.message_args = (modname,)
+
+
+class UndefinedName(Message):
+    message = 'undefined name %r'
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+
+class UndefinedExport(Message):
+    message = 'undefined name %r in __all__'
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+
+class UndefinedLocal(Message):
+    message = "local variable %r (defined in enclosing scope on line %r) referenced before assignment"
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class DuplicateArgument(Message):
+    message = 'duplicate argument %r in function definition'
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+class RedefinedFunction(Message):
+    message = 'redefinition of function %r from line %r'
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class LateFutureImport(Message):
+    message = 'future import(s) %r after other statements'
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
+        self.message_args = (names,)
+
+
+class UnusedVariable(Message):
+    """
+    Indicates that a variable has been explicity assigned to but not actually
+    used.
+    """
+
+    message = 'local variable %r is assigned to but never used'
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
+        self.message_args = (names,)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
new file mode 100644
index 00000000..6b1dae22
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
@@ -0,0 +1,90 @@
+
+"""
+Implementation of the command-line I{pyflakes} tool.
+"""
+
+import sys
+import os
+import _ast
+
+checker = __import__('pyflakes.checker').checker
+
+def check(codeString, filename):
+    """
+    Check the Python source given by C{codeString} for flakes.
+
+    @param codeString: The Python source to check.
+    @type codeString: C{str}
+
+    @param filename: The name of the file the source came from, used to report
+        errors.
+    @type filename: C{str}
+
+    @return: The number of warnings emitted.
+    @rtype: C{int}
+    """
+    # First, compile into an AST and handle syntax errors.
+    try:
+        tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST)
+    except SyntaxError, value:
+        msg = value.args[0]
+
+        (lineno, offset, text) = value.lineno, value.offset, value.text
+
+        # If there's an encoding problem with the file, the text is None.
+        if text is None:
+            # Avoid using msg, since for the only known case, it contains a
+            # bogus message that claims the encoding the file declared was
+            # unknown.
+            print >> sys.stderr, "%s: problem decoding source" % (filename, )
+        else:
+            line = text.splitlines()[-1]
+
+            if offset is not None:
+                offset = offset - (len(text) - len(line))
+
+            print >> sys.stderr, '%s:%d: %s' % (filename, lineno, msg)
+            print >> sys.stderr, line
+
+            if offset is not None:
+                print >> sys.stderr, " " * offset, "^"
+
+        return 1
+    else:
+        # Okay, it's syntactically valid.  Now check it.
+        w = checker.Checker(tree, filename)
+        w.messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
+        for warning in w.messages:
+            print warning
+        return len(w.messages)
+
+
+def checkPath(filename):
+    """
+    Check the given path, printing out any warnings detected.
+
+    @return: the number of warnings printed
+    """
+    try:
+        return check(file(filename, 'U').read() + '\n', filename)
+    except IOError, msg:
+        print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
+        return 1
+
+
+def main():
+    warnings = 0
+    args = sys.argv[1:]
+    if args:
+        for arg in args:
+            if os.path.isdir(arg):
+                for dirpath, dirnames, filenames in os.walk(arg):
+                    for filename in filenames:
+                        if filename.endswith('.py'):
+                            warnings += checkPath(os.path.join(dirpath, filename))
+            else:
+                warnings += checkPath(arg)
+    else:
+        warnings += check(sys.stdin.read(), '<stdin>')
+
+    raise SystemExit(warnings > 0)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
new file mode 100644
index 00000000..7cd22772
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
@@ -0,0 +1,27 @@
+
+import textwrap
+import _ast
+
+from twisted.trial import unittest
+
+from pyflakes import checker
+
+
+class Test(unittest.TestCase):
+
+    def flakes(self, input, *expectedOutputs, **kw):
+        ast = compile(textwrap.dedent(input), "<test>", "exec",
+                      _ast.PyCF_ONLY_AST)
+        w = checker.Checker(ast, **kw)
+        outputs = [type(o) for o in w.messages]
+        expectedOutputs = list(expectedOutputs)
+        outputs.sort()
+        expectedOutputs.sort()
+        self.assert_(outputs == expectedOutputs, '''\
+for input:
+%s
+expected outputs:
+%s
+but got:
+%s''' % (input, repr(expectedOutputs), '\n'.join([str(o) for o in w.messages])))
+        return w
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
new file mode 100644
index 00000000..08e4580a
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
@@ -0,0 +1,673 @@
+
+from sys import version_info
+
+from pyflakes import messages as m
+from pyflakes.test import harness
+
+class Test(harness.Test):
+
+    def test_unusedImport(self):
+        self.flakes('import fu, bar', m.UnusedImport, m.UnusedImport)
+        self.flakes('from baz import fu, bar', m.UnusedImport, m.UnusedImport)
+
+    def test_aliasedImport(self):
+        self.flakes('import fu as FU, bar as FU', m.RedefinedWhileUnused, m.UnusedImport)
+        self.flakes('from moo import fu as FU, bar as FU', m.RedefinedWhileUnused, m.UnusedImport)
+
+    def test_usedImport(self):
+        self.flakes('import fu; print fu')
+        self.flakes('from baz import fu; print fu')
+
+    def test_redefinedWhileUnused(self):
+        self.flakes('import fu; fu = 3', m.RedefinedWhileUnused)
+        self.flakes('import fu; del fu', m.RedefinedWhileUnused)
+        self.flakes('import fu; fu, bar = 3', m.RedefinedWhileUnused)
+        self.flakes('import fu; [fu, bar] = 3', m.RedefinedWhileUnused)
+
+    def test_redefinedByFunction(self):
+        self.flakes('''
+        import fu
+        def fu():
+            pass
+        ''', m.RedefinedWhileUnused)
+
+    def test_redefinedInNestedFunction(self):
+        """
+        Test that shadowing a global name with a nested function definition
+        generates a warning.
+        """
+        self.flakes('''
+        import fu
+        def bar():
+            def baz():
+                def fu():
+                    pass
+        ''', m.RedefinedWhileUnused, m.UnusedImport)
+
+    def test_redefinedByClass(self):
+        self.flakes('''
+        import fu
+        class fu:
+            pass
+        ''', m.RedefinedWhileUnused)
+
+
+    def test_redefinedBySubclass(self):
+        """
+        If an imported name is redefined by a class statement which also uses
+        that name in the bases list, no warning is emitted.
+        """
+        self.flakes('''
+        from fu import bar
+        class bar(bar):
+            pass
+        ''')
+
+
+    def test_redefinedInClass(self):
+        """
+        Test that shadowing a global with a class attribute does not produce a
+        warning.
+        """
+        self.flakes('''
+        import fu
+        class bar:
+            fu = 1
+        print fu
+        ''')
+
+    def test_usedInFunction(self):
+        self.flakes('''
+        import fu
+        def fun():
+            print fu
+        ''')
+
+    def test_shadowedByParameter(self):
+        self.flakes('''
+        import fu
+        def fun(fu):
+            print fu
+        ''', m.UnusedImport)
+
+        self.flakes('''
+        import fu
+        def fun(fu):
+            print fu
+        print fu
+        ''')
+
+    def test_newAssignment(self):
+        self.flakes('fu = None')
+
+    def test_usedInGetattr(self):
+        self.flakes('import fu; fu.bar.baz')
+        self.flakes('import fu; "bar".fu.baz', m.UnusedImport)
+
+    def test_usedInSlice(self):
+        self.flakes('import fu; print fu.bar[1:]')
+
+    def test_usedInIfBody(self):
+        self.flakes('''
+        import fu
+        if True: print fu
+        ''')
+
+    def test_usedInIfConditional(self):
+        self.flakes('''
+        import fu
+        if fu: pass
+        ''')
+
+    def test_usedInElifConditional(self):
+        self.flakes('''
+        import fu
+        if False: pass
+        elif fu: pass
+        ''')
+
+    def test_usedInElse(self):
+        self.flakes('''
+        import fu
+        if False: pass
+        else: print fu
+        ''')
+
+    def test_usedInCall(self):
+        self.flakes('import fu; fu.bar()')
+
+    def test_usedInClass(self):
+        self.flakes('''
+        import fu
+        class bar:
+            bar = fu
+        ''')
+
+    def test_usedInClassBase(self):
+        self.flakes('''
+        import fu
+        class bar(object, fu.baz):
+            pass
+        ''')
+
+    def test_notUsedInNestedScope(self):
+        self.flakes('''
+        import fu
+        def bleh():
+            pass
+        print fu
+        ''')
+
+    def test_usedInFor(self):
+        self.flakes('''
+        import fu
+        for bar in range(9):
+            print fu
+        ''')
+
+    def test_usedInForElse(self):
+        self.flakes('''
+        import fu
+        for bar in range(10):
+            pass
+        else:
+            print fu
+        ''')
+
+    def test_redefinedByFor(self):
+        self.flakes('''
+        import fu
+        for fu in range(2):
+            pass
+        ''', m.RedefinedWhileUnused)
+
+    def test_shadowedByFor(self):
+        """
+        Test that shadowing a global name with a for loop variable generates a
+        warning.
+        """
+        self.flakes('''
+        import fu
+        fu.bar()
+        for fu in ():
+            pass
+        ''', m.ImportShadowedByLoopVar)
+
+    def test_shadowedByForDeep(self):
+        """
+        Test that shadowing a global name with a for loop variable nested in a
+        tuple unpack generates a warning.
+        """
+        self.flakes('''
+        import fu
+        fu.bar()
+        for (x, y, z, (a, b, c, (fu,))) in ():
+            pass
+        ''', m.ImportShadowedByLoopVar)
+
+    def test_usedInReturn(self):
+        self.flakes('''
+        import fu
+        def fun():
+            return fu
+        ''')
+
+    def test_usedInOperators(self):
+        self.flakes('import fu; 3 + fu.bar')
+        self.flakes('import fu; 3 % fu.bar')
+        self.flakes('import fu; 3 - fu.bar')
+        self.flakes('import fu; 3 * fu.bar')
+        self.flakes('import fu; 3 ** fu.bar')
+        self.flakes('import fu; 3 / fu.bar')
+        self.flakes('import fu; 3 // fu.bar')
+        self.flakes('import fu; -fu.bar')
+        self.flakes('import fu; ~fu.bar')
+        self.flakes('import fu; 1 == fu.bar')
+        self.flakes('import fu; 1 | fu.bar')
+        self.flakes('import fu; 1 & fu.bar')
+        self.flakes('import fu; 1 ^ fu.bar')
+        self.flakes('import fu; 1 >> fu.bar')
+        self.flakes('import fu; 1 << fu.bar')
+
+    def test_usedInAssert(self):
+        self.flakes('import fu; assert fu.bar')
+
+    def test_usedInSubscript(self):
+        self.flakes('import fu; fu.bar[1]')
+
+    def test_usedInLogic(self):
+        self.flakes('import fu; fu and False')
+        self.flakes('import fu; fu or False')
+        self.flakes('import fu; not fu.bar')
+
+    def test_usedInList(self):
+        self.flakes('import fu; [fu]')
+
+    def test_usedInTuple(self):
+        self.flakes('import fu; (fu,)')
+
+    def test_usedInTry(self):
+        self.flakes('''
+        import fu
+        try: fu
+        except: pass
+        ''')
+
+    def test_usedInExcept(self):
+        self.flakes('''
+        import fu
+        try: fu
+        except: pass
+        ''')
+
+    def test_redefinedByExcept(self):
+        self.flakes('''
+        import fu
+        try: pass
+        except Exception, fu: pass
+        ''', m.RedefinedWhileUnused)
+
+    def test_usedInRaise(self):
+        self.flakes('''
+        import fu
+        raise fu.bar
+        ''')
+
+    def test_usedInYield(self):
+        self.flakes('''
+        import fu
+        def gen():
+            yield fu
+        ''')
+
+    def test_usedInDict(self):
+        self.flakes('import fu; {fu:None}')
+        self.flakes('import fu; {1:fu}')
+
+    def test_usedInParameterDefault(self):
+        self.flakes('''
+        import fu
+        def f(bar=fu):
+            pass
+        ''')
+
+    def test_usedInAttributeAssign(self):
+        self.flakes('import fu; fu.bar = 1')
+
+    def test_usedInKeywordArg(self):
+        self.flakes('import fu; fu.bar(stuff=fu)')
+
+    def test_usedInAssignment(self):
+        self.flakes('import fu; bar=fu')
+        self.flakes('import fu; n=0; n+=fu')
+
+    def test_usedInListComp(self):
+        self.flakes('import fu; [fu for _ in range(1)]')
+        self.flakes('import fu; [1 for _ in range(1) if fu]')
+
+    def test_redefinedByListComp(self):
+        self.flakes('import fu; [1 for fu in range(1)]', m.RedefinedWhileUnused)
+
+
+    def test_usedInTryFinally(self):
+        self.flakes('''
+        import fu
+        try: pass
+        finally: fu
+        ''')
+
+        self.flakes('''
+        import fu
+        try: fu
+        finally: pass
+        ''')
+
+    def test_usedInWhile(self):
+        self.flakes('''
+        import fu
+        while 0:
+            fu
+        ''')
+
+        self.flakes('''
+        import fu
+        while fu: pass
+        ''')
+
+    def test_usedInGlobal(self):
+        self.flakes('''
+        import fu
+        def f(): global fu
+        ''', m.UnusedImport)
+
+    def test_usedInBackquote(self):
+        self.flakes('import fu; `fu`')
+
+    def test_usedInExec(self):
+        self.flakes('import fu; exec "print 1" in fu.bar')
+
+    def test_usedInLambda(self):
+        self.flakes('import fu; lambda: fu')
+
+    def test_shadowedByLambda(self):
+        self.flakes('import fu; lambda fu: fu', m.UnusedImport)
+
+    def test_usedInSliceObj(self):
+        self.flakes('import fu; "meow"[::fu]')
+
+    def test_unusedInNestedScope(self):
+        self.flakes('''
+        def bar():
+            import fu
+        fu
+        ''', m.UnusedImport, m.UndefinedName)
+
+    def test_methodsDontUseClassScope(self):
+        self.flakes('''
+        class bar:
+            import fu
+            def fun(self):
+                fu
+        ''', m.UnusedImport, m.UndefinedName)
+
+    def test_nestedFunctionsNestScope(self):
+        self.flakes('''
+        def a():
+            def b():
+                fu
+            import fu
+        ''')
+
+    def test_nestedClassAndFunctionScope(self):
+        self.flakes('''
+        def a():
+            import fu
+            class b:
+                def c(self):
+                    print fu
+        ''')
+
+    def test_importStar(self):
+        self.flakes('from fu import *', m.ImportStarUsed)
+
+
+    def test_packageImport(self):
+        """
+        If a dotted name is imported and used, no warning is reported.
+        """
+        self.flakes('''
+        import fu.bar
+        fu.bar
+        ''')
+
+
+    def test_unusedPackageImport(self):
+        """
+        If a dotted name is imported and not used, an unused import warning is
+        reported.
+        """
+        self.flakes('import fu.bar', m.UnusedImport)
+
+
+    def test_duplicateSubmoduleImport(self):
+        """
+        If a submodule of a package is imported twice, an unused import warning
+        and a redefined while unused warning are reported.
+        """
+        self.flakes('''
+        import fu.bar, fu.bar
+        fu.bar
+        ''', m.RedefinedWhileUnused)
+        self.flakes('''
+        import fu.bar
+        import fu.bar
+        fu.bar
+        ''', m.RedefinedWhileUnused)
+
+
+    def test_differentSubmoduleImport(self):
+        """
+        If two different submodules of a package are imported, no duplicate
+        import warning is reported for the package.
+        """
+        self.flakes('''
+        import fu.bar, fu.baz
+        fu.bar, fu.baz
+        ''')
+        self.flakes('''
+        import fu.bar
+        import fu.baz
+        fu.bar, fu.baz
+        ''')
+
+    def test_assignRHSFirst(self):
+        self.flakes('import fu; fu = fu')
+        self.flakes('import fu; fu, bar = fu')
+        self.flakes('import fu; [fu, bar] = fu')
+        self.flakes('import fu; fu += fu')
+
+    def test_tryingMultipleImports(self):
+        self.flakes('''
+        try:
+            import fu
+        except ImportError:
+            import bar as fu
+        ''')
+    test_tryingMultipleImports.todo = ''
+
+    def test_nonGlobalDoesNotRedefine(self):
+        self.flakes('''
+        import fu
+        def a():
+            fu = 3
+            return fu
+        fu
+        ''')
+
+    def test_functionsRunLater(self):
+        self.flakes('''
+        def a():
+            fu
+        import fu
+        ''')
+
+    def test_functionNamesAreBoundNow(self):
+        self.flakes('''
+        import fu
+        def fu():
+            fu
+        fu
+        ''', m.RedefinedWhileUnused)
+
+    def test_ignoreNonImportRedefinitions(self):
+        self.flakes('a = 1; a = 2')
+
+    def test_importingForImportError(self):
+        self.flakes('''
+        try:
+            import fu
+        except ImportError:
+            pass
+        ''')
+    test_importingForImportError.todo = ''
+
+    def test_importedInClass(self):
+        '''Imports in class scope can be used through self'''
+        self.flakes('''
+        class c:
+            import i
+            def __init__(self):
+                self.i
+        ''')
+    test_importedInClass.todo = 'requires evaluating attribute access'
+
+    def test_futureImport(self):
+        '''__future__ is special'''
+        self.flakes('from __future__ import division')
+        self.flakes('''
+        "docstring is allowed before future import"
+        from __future__ import division
+        ''')
+
+    def test_futureImportFirst(self):
+        """
+        __future__ imports must come before anything else.
+        """
+        self.flakes('''
+        x = 5
+        from __future__ import division
+        ''', m.LateFutureImport)
+        self.flakes('''
+        from foo import bar
+        from __future__ import division
+        bar
+        ''', m.LateFutureImport)
+
+
+
+class TestSpecialAll(harness.Test):
+    """
+    Tests for suppression of unused import warnings by C{__all__}.
+    """
+    def test_ignoredInFunction(self):
+        """
+        An C{__all__} definition does not suppress unused import warnings in a
+        function scope.
+        """
+        self.flakes('''
+        def foo():
+            import bar
+            __all__ = ["bar"]
+        ''', m.UnusedImport, m.UnusedVariable)
+
+
+    def test_ignoredInClass(self):
+        """
+        An C{__all__} definition does not suppress unused import warnings in a
+        class scope.
+        """
+        self.flakes('''
+        class foo:
+            import bar
+            __all__ = ["bar"]
+        ''', m.UnusedImport)
+
+
+    def test_warningSuppressed(self):
+        """
+        If a name is imported and unused but is named in C{__all__}, no warning
+        is reported.
+        """
+        self.flakes('''
+        import foo
+        __all__ = ["foo"]
+        ''')
+
+
+    def test_unrecognizable(self):
+        """
+        If C{__all__} is defined in a way that can't be recognized statically,
+        it is ignored.
+        """
+        self.flakes('''
+        import foo
+        __all__ = ["f" + "oo"]
+        ''', m.UnusedImport)
+        self.flakes('''
+        import foo
+        __all__ = [] + ["foo"]
+        ''', m.UnusedImport)
+
+
+    def test_unboundExported(self):
+        """
+        If C{__all__} includes a name which is not bound, a warning is emitted.
+        """
+        self.flakes('''
+        __all__ = ["foo"]
+        ''', m.UndefinedExport)
+
+        # Skip this in __init__.py though, since the rules there are a little
+        # different.
+        for filename in ["foo/__init__.py", "__init__.py"]:
+            self.flakes('''
+            __all__ = ["foo"]
+            ''', filename=filename)
+
+
+    def test_usedInGenExp(self):
+        """
+        Using a global in a generator expression results in no warnings.
+        """
+        self.flakes('import fu; (fu for _ in range(1))')
+        self.flakes('import fu; (1 for _ in range(1) if fu)')
+
+
+    def test_redefinedByGenExp(self):
+        """
+        Re-using a global name as the loop variable for a generator
+        expression results in a redefinition warning.
+        """
+        self.flakes('import fu; (1 for fu in range(1))', m.RedefinedWhileUnused)
+
+
+    def test_usedAsDecorator(self):
+        """
+        Using a global name in a decorator statement results in no warnings,
+        but using an undefined name in a decorator statement results in an
+        undefined name warning.
+        """
+        self.flakes('''
+        from interior import decorate
+        @decorate
+        def f():
+            return "hello"
+        ''')
+
+        self.flakes('''
+        from interior import decorate
+        @decorate('value')
+        def f():
+            return "hello"
+        ''')
+
+        self.flakes('''
+        @decorate
+        def f():
+            return "hello"
+        ''', m.UndefinedName)
+
+
+class Python26Tests(harness.Test):
+    """
+    Tests for checking of syntax which is valid in PYthon 2.6 and newer.
+    """
+    if version_info < (2, 6):
+        skip = "Python 2.6 required for class decorator tests."
+
+
+    def test_usedAsClassDecorator(self):
+        """
+        Using an imported name as a class decorator results in no warnings,
+        but using an undefined name as a class decorator results in an
+        undefined name warning.
+        """
+        self.flakes('''
+        from interior import decorate
+        @decorate
+        class foo:
+            pass
+        ''')
+
+        self.flakes('''
+        from interior import decorate
+        @decorate("foo")
+        class bar:
+            pass
+        ''')
+
+        self.flakes('''
+        @decorate
+        class foo:
+            pass
+        ''', m.UndefinedName)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
new file mode 100644
index 00000000..2b7723ce
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
@@ -0,0 +1,575 @@
+# (c) 2005-2010 Divmod, Inc.
+# See LICENSE file for details
+
+"""
+Tests for various Pyflakes behavior.
+"""
+
+from sys import version_info
+
+from pyflakes import messages as m
+from pyflakes.test import harness
+
+
+class Test(harness.Test):
+
+    def test_duplicateArgs(self):
+        self.flakes('def fu(bar, bar): pass', m.DuplicateArgument)
+
+    def test_localReferencedBeforeAssignment(self):
+        self.flakes('''
+        a = 1
+        def f():
+            a; a=1
+        f()
+        ''', m.UndefinedName)
+    test_localReferencedBeforeAssignment.todo = 'this requires finding all assignments in the function body first'
+
+    def test_redefinedFunction(self):
+        """
+        Test that shadowing a function definition with another one raises a
+        warning.
+        """
+        self.flakes('''
+        def a(): pass
+        def a(): pass
+        ''', m.RedefinedFunction)
+
+    def test_redefinedClassFunction(self):
+        """
+        Test that shadowing a function definition in a class suite with another
+        one raises a warning.
+        """
+        self.flakes('''
+        class A:
+            def a(): pass
+            def a(): pass
+        ''', m.RedefinedFunction)
+
+    def test_functionDecorator(self):
+        """
+        Test that shadowing a function definition with a decorated version of
+        that function does not raise a warning.
+        """
+        self.flakes('''
+        from somewhere import somedecorator
+
+        def a(): pass
+        a = somedecorator(a)
+        ''')
+
+    def test_classFunctionDecorator(self):
+        """
+        Test that shadowing a function definition in a class suite with a
+        decorated version of that function does not raise a warning.
+        """
+        self.flakes('''
+        class A:
+            def a(): pass
+            a = classmethod(a)
+        ''')
+
+    def test_unaryPlus(self):
+        '''Don't die on unary +'''
+        self.flakes('+1')
+
+
+    def test_undefinedBaseClass(self):
+        """
+        If a name in the base list of a class definition is undefined, a
+        warning is emitted.
+        """
+        self.flakes('''
+        class foo(foo):
+            pass
+        ''', m.UndefinedName)
+
+
+    def test_classNameUndefinedInClassBody(self):
+        """
+        If a class name is used in the body of that class's definition and
+        the name is not already defined, a warning is emitted.
+        """
+        self.flakes('''
+        class foo:
+            foo
+        ''', m.UndefinedName)
+
+
+    def test_classNameDefinedPreviously(self):
+        """
+        If a class name is used in the body of that class's definition and
+        the name was previously defined in some other way, no warning is
+        emitted.
+        """
+        self.flakes('''
+        foo = None
+        class foo:
+            foo
+        ''')
+
+
+    def test_comparison(self):
+        """
+        If a defined name is used on either side of any of the six comparison
+        operators, no warning is emitted.
+        """
+        self.flakes('''
+        x = 10
+        y = 20
+        x < y
+        x <= y
+        x == y
+        x != y
+        x >= y
+        x > y
+        ''')
+
+
+    def test_identity(self):
+        """
+        If a deefined name is used on either side of an identity test, no
+        warning is emitted.
+        """
+        self.flakes('''
+        x = 10
+        y = 20
+        x is y
+        x is not y
+        ''')
+
+
+    def test_containment(self):
+        """
+        If a defined name is used on either side of a containment test, no
+        warning is emitted.
+        """
+        self.flakes('''
+        x = 10
+        y = 20
+        x in y
+        x not in y
+        ''')
+
+
+    def test_loopControl(self):
+        """
+        break and continue statements are supported.
+        """
+        self.flakes('''
+        for x in [1, 2]:
+            break
+        ''')
+        self.flakes('''
+        for x in [1, 2]:
+            continue
+        ''')
+
+
+    def test_ellipsis(self):
+        """
+        Ellipsis in a slice is supported.
+        """
+        self.flakes('''
+        [1, 2][...]
+        ''')
+
+
+    def test_extendedSlice(self):
+        """
+        Extended slices are supported.
+        """
+        self.flakes('''
+        x = 3
+        [1, 2][x,:]
+        ''')
+
+
+
+class TestUnusedAssignment(harness.Test):
+    """
+    Tests for warning about unused assignments.
+    """
+
+    def test_unusedVariable(self):
+        """
+        Warn when a variable in a function is assigned a value that's never
+        used.
+        """
+        self.flakes('''
+        def a():
+            b = 1
+        ''', m.UnusedVariable)
+
+
+    def test_assignToGlobal(self):
+        """
+        Assigning to a global and then not using that global is perfectly
+        acceptable. Do not mistake it for an unused local variable.
+        """
+        self.flakes('''
+        b = 0
+        def a():
+            global b
+            b = 1
+        ''')
+
+
+    def test_assignToMember(self):
+        """
+        Assigning to a member of another object and then not using that member
+        variable is perfectly acceptable. Do not mistake it for an unused
+        local variable.
+        """
+        # XXX: Adding this test didn't generate a failure. Maybe not
+        # necessary?
+        self.flakes('''
+        class b:
+            pass
+        def a():
+            b.foo = 1
+        ''')
+
+
+    def test_assignInForLoop(self):
+        """
+        Don't warn when a variable in a for loop is assigned to but not used.
+        """
+        self.flakes('''
+        def f():
+            for i in range(10):
+                pass
+        ''')
+
+
+    def test_assignInListComprehension(self):
+        """
+        Don't warn when a variable in a list comprehension is assigned to but
+        not used.
+        """
+        self.flakes('''
+        def f():
+            [None for i in range(10)]
+        ''')
+
+
+    def test_generatorExpression(self):
+        """
+        Don't warn when a variable in a generator expression is assigned to but not used.
+        """
+        self.flakes('''
+        def f():
+            (None for i in range(10))
+        ''')
+
+
+    def test_assignmentInsideLoop(self):
+        """
+        Don't warn when a variable assignment occurs lexically after its use.
+        """
+        self.flakes('''
+        def f():
+            x = None
+            for i in range(10):
+                if i > 2:
+                    return x
+                x = i * 2
+        ''')
+
+
+    def test_tupleUnpacking(self):
+        """
+        Don't warn when a variable included in tuple unpacking is unused. It's
+        very common for variables in a tuple unpacking assignment to be unused
+        in good Python code, so warning will only create false positives.
+        """
+        self.flakes('''
+        def f():
+            (x, y) = 1, 2
+        ''')
+
+
+    def test_listUnpacking(self):
+        """
+        Don't warn when a variable included in list unpacking is unused.
+        """
+        self.flakes('''
+        def f():
+            [x, y] = [1, 2]
+        ''')
+
+
+    def test_closedOver(self):
+        """
+        Don't warn when the assignment is used in an inner function.
+        """
+        self.flakes('''
+        def barMaker():
+            foo = 5
+            def bar():
+                return foo
+            return bar
+        ''')
+
+
+    def test_doubleClosedOver(self):
+        """
+        Don't warn when the assignment is used in an inner function, even if
+        that inner function itself is in an inner function.
+        """
+        self.flakes('''
+        def barMaker():
+            foo = 5
+            def bar():
+                def baz():
+                    return foo
+            return bar
+        ''')
+
+
+
+class Python25Test(harness.Test):
+    """
+    Tests for checking of syntax only available in Python 2.5 and newer.
+    """
+    if version_info < (2, 5):
+        skip = "Python 2.5 required for if-else and with tests"
+
+    def test_ifexp(self):
+        """
+        Test C{foo if bar else baz} statements.
+        """
+        self.flakes("a = 'moo' if True else 'oink'")
+        self.flakes("a = foo if True else 'oink'", m.UndefinedName)
+        self.flakes("a = 'moo' if True else bar", m.UndefinedName)
+
+
+    def test_withStatementNoNames(self):
+        """
+        No warnings are emitted for using inside or after a nameless C{with}
+        statement a name defined beforehand.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        bar = None
+        with open("foo"):
+            bar
+        bar
+        ''')
+
+    def test_withStatementSingleName(self):
+        """
+        No warnings are emitted for using a name defined by a C{with} statement
+        within the suite or afterwards.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with open('foo') as bar:
+            bar
+        bar
+        ''')
+
+
+    def test_withStatementAttributeName(self):
+        """
+        No warnings are emitted for using an attribute as the target of a
+        C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        import foo
+        with open('foo') as foo.bar:
+            pass
+        ''')
+
+
+    def test_withStatementSubscript(self):
+        """
+        No warnings are emitted for using a subscript as the target of a
+        C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        import foo
+        with open('foo') as foo[0]:
+            pass
+        ''')
+
+
+    def test_withStatementSubscriptUndefined(self):
+        """
+        An undefined name warning is emitted if the subscript used as the
+        target of a C{with} statement is not defined.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        import foo
+        with open('foo') as foo[bar]:
+            pass
+        ''', m.UndefinedName)
+
+
+    def test_withStatementTupleNames(self):
+        """
+        No warnings are emitted for using any of the tuple of names defined by
+        a C{with} statement within the suite or afterwards.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with open('foo') as (bar, baz):
+            bar, baz
+        bar, baz
+        ''')
+
+
+    def test_withStatementListNames(self):
+        """
+        No warnings are emitted for using any of the list of names defined by a
+        C{with} statement within the suite or afterwards.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with open('foo') as [bar, baz]:
+            bar, baz
+        bar, baz
+        ''')
+
+
+    def test_withStatementComplicatedTarget(self):
+        """
+        If the target of a C{with} statement uses any or all of the valid forms
+        for that part of the grammar (See
+        U{http://docs.python.org/reference/compound_stmts.html#the-with-statement}),
+        the names involved are checked both for definedness and any bindings
+        created are respected in the suite of the statement and afterwards.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        c = d = e = g = h = i = None
+        with open('foo') as [(a, b), c[d], e.f, g[h:i]]:
+            a, b, c, d, e, g, h, i
+        a, b, c, d, e, g, h, i
+        ''')
+
+
+    def test_withStatementSingleNameUndefined(self):
+        """
+        An undefined name warning is emitted if the name first defined by a
+        C{with} statement is used before the C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        bar
+        with open('foo') as bar:
+            pass
+        ''', m.UndefinedName)
+
+
+    def test_withStatementTupleNamesUndefined(self):
+        """
+        An undefined name warning is emitted if a name first defined by a the
+        tuple-unpacking form of the C{with} statement is used before the
+        C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        baz
+        with open('foo') as (bar, baz):
+            pass
+        ''', m.UndefinedName)
+
+
+    def test_withStatementSingleNameRedefined(self):
+        """
+        A redefined name warning is emitted if a name bound by an import is
+        rebound by the name defined by a C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        import bar
+        with open('foo') as bar:
+            pass
+        ''', m.RedefinedWhileUnused)
+
+
+    def test_withStatementTupleNamesRedefined(self):
+        """
+        A redefined name warning is emitted if a name bound by an import is
+        rebound by one of the names defined by the tuple-unpacking form of a
+        C{with} statement.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        import bar
+        with open('foo') as (bar, baz):
+            pass
+        ''', m.RedefinedWhileUnused)
+
+
+    def test_withStatementUndefinedInside(self):
+        """
+        An undefined name warning is emitted if a name is used inside the
+        body of a C{with} statement without first being bound.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with open('foo') as bar:
+            baz
+        ''', m.UndefinedName)
+
+
+    def test_withStatementNameDefinedInBody(self):
+        """
+        A name defined in the body of a C{with} statement can be used after
+        the body ends without warning.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with open('foo') as bar:
+            baz = 10
+        baz
+        ''')
+
+
+    def test_withStatementUndefinedInExpression(self):
+        """
+        An undefined name warning is emitted if a name in the I{test}
+        expression of a C{with} statement is undefined.
+        """
+        self.flakes('''
+        from __future__ import with_statement
+        with bar as baz:
+            pass
+        ''', m.UndefinedName)
+
+        self.flakes('''
+        from __future__ import with_statement
+        with bar as bar:
+            pass
+        ''', m.UndefinedName)
+
+
+
+class Python27Test(harness.Test):
+    """
+    Tests for checking of syntax only available in Python 2.7 and newer.
+    """
+    if version_info < (2, 7):
+        skip = "Python 2.7 required for dict/set comprehension tests"
+
+    def test_dictComprehension(self):
+        """
+        Dict comprehensions are properly handled.
+        """
+        self.flakes('''
+        a = {1: x for x in range(10)}
+        ''')
+
+    def test_setComprehensionAndLiteral(self):
+        """
+        Set comprehensions are properly handled.
+        """
+        self.flakes('''
+        a = {1, 2, 3}
+        b = {x for x in range(10)}
+        ''')
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
new file mode 100644
index 00000000..233e59ed
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
@@ -0,0 +1,185 @@
+
+"""
+Tests for L{pyflakes.scripts.pyflakes}.
+"""
+
+import sys
+from StringIO import StringIO
+
+from twisted.python.filepath import FilePath
+from twisted.trial.unittest import TestCase
+
+from pyflakes.scripts.pyflakes import checkPath
+
+def withStderrTo(stderr, f):
+    """
+    Call C{f} with C{sys.stderr} redirected to C{stderr}.
+    """
+    (outer, sys.stderr) = (sys.stderr, stderr)
+    try:
+        return f()
+    finally:
+        sys.stderr = outer
+
+
+
+class CheckTests(TestCase):
+    """
+    Tests for L{check} and L{checkPath} which check a file for flakes.
+    """
+    def test_missingTrailingNewline(self):
+        """
+        Source which doesn't end with a newline shouldn't cause any
+        exception to be raised nor an error indicator to be returned by
+        L{check}.
+        """
+        fName = self.mktemp()
+        FilePath(fName).setContent("def foo():\n\tpass\n\t")
+        self.assertFalse(checkPath(fName))
+
+
+    def test_checkPathNonExisting(self):
+        """
+        L{checkPath} handles non-existing files.
+        """
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath('extremo'))
+        self.assertEquals(err.getvalue(), 'extremo: No such file or directory\n')
+        self.assertEquals(count, 1)
+
+
+    def test_multilineSyntaxError(self):
+        """
+        Source which includes a syntax error which results in the raised
+        L{SyntaxError.text} containing multiple lines of source are reported
+        with only the last line of that source.
+        """
+        source = """\
+def foo():
+    '''
+
+def bar():
+    pass
+
+def baz():
+    '''quux'''
+"""
+
+        # Sanity check - SyntaxError.text should be multiple lines, if it
+        # isn't, something this test was unprepared for has happened.
+        def evaluate(source):
+            exec source
+        exc = self.assertRaises(SyntaxError, evaluate, source)
+        self.assertTrue(exc.text.count('\n') > 1)
+
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent(source)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEqual(count, 1)
+
+        self.assertEqual(
+            err.getvalue(),
+            """\
+%s:8: invalid syntax
+    '''quux'''
+           ^
+""" % (sourcePath.path,))
+
+
+    def test_eofSyntaxError(self):
+        """
+        The error reported for source files which end prematurely causing a
+        syntax error reflects the cause for the syntax error.
+        """
+        source = "def foo("
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent(source)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEqual(count, 1)
+        self.assertEqual(
+            err.getvalue(),
+            """\
+%s:1: unexpected EOF while parsing
+def foo(
+         ^
+""" % (sourcePath.path,))
+
+
+    def test_nonDefaultFollowsDefaultSyntaxError(self):
+        """
+        Source which has a non-default argument following a default argument
+        should include the line number of the syntax error.  However these
+        exceptions do not include an offset.
+        """
+        source = """\
+def foo(bar=baz, bax):
+    pass
+"""
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent(source)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEqual(count, 1)
+        self.assertEqual(
+            err.getvalue(),
+            """\
+%s:1: non-default argument follows default argument
+def foo(bar=baz, bax):
+""" % (sourcePath.path,))
+
+
+    def test_nonKeywordAfterKeywordSyntaxError(self):
+        """
+        Source which has a non-keyword argument after a keyword argument should
+        include the line number of the syntax error.  However these exceptions
+        do not include an offset.
+        """
+        source = """\
+foo(bar=baz, bax)
+"""
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent(source)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEqual(count, 1)
+        self.assertEqual(
+            err.getvalue(),
+            """\
+%s:1: non-keyword arg after keyword arg
+foo(bar=baz, bax)
+""" % (sourcePath.path,))
+
+
+    def test_permissionDenied(self):
+        """
+        If the a source file is not readable, this is reported on standard
+        error.
+        """
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent('')
+        sourcePath.chmod(0)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEquals(count, 1)
+        self.assertEquals(
+            err.getvalue(), "%s: Permission denied\n" % (sourcePath.path,))
+
+
+    def test_misencodedFile(self):
+        """
+        If a source file contains bytes which cannot be decoded, this is
+        reported on stderr.
+        """
+        source = u"""\
+# coding: ascii
+x = "\N{SNOWMAN}"
+""".encode('utf-8')
+        sourcePath = FilePath(self.mktemp())
+        sourcePath.setContent(source)
+        err = StringIO()
+        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
+        self.assertEquals(count, 1)
+        self.assertEquals(
+            err.getvalue(), "%s: problem decoding source\n" % (sourcePath.path,))
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
new file mode 100644
index 00000000..309f0b9f
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
@@ -0,0 +1,265 @@
+
+from _ast import PyCF_ONLY_AST
+
+from twisted.trial.unittest import TestCase
+
+from pyflakes import messages as m, checker
+from pyflakes.test import harness
+
+
+class Test(harness.Test):
+    def test_undefined(self):
+        self.flakes('bar', m.UndefinedName)
+
+    def test_definedInListComp(self):
+        self.flakes('[a for a in range(10) if a]')
+
+
+    def test_functionsNeedGlobalScope(self):
+        self.flakes('''
+        class a:
+            def b():
+                fu
+        fu = 1
+        ''')
+
+    def test_builtins(self):
+        self.flakes('range(10)')
+
+
+    def test_magicGlobalsFile(self):
+        """
+        Use of the C{__file__} magic global should not emit an undefined name
+        warning.
+        """
+        self.flakes('__file__')
+
+
+    def test_magicGlobalsBuiltins(self):
+        """
+        Use of the C{__builtins__} magic global should not emit an undefined
+        name warning.
+        """
+        self.flakes('__builtins__')
+
+
+    def test_magicGlobalsName(self):
+        """
+        Use of the C{__name__} magic global should not emit an undefined name
+        warning.
+        """
+        self.flakes('__name__')
+
+
+    def test_magicGlobalsPath(self):
+        """
+        Use of the C{__path__} magic global should not emit an undefined name
+        warning, if you refer to it from a file called __init__.py.
+        """
+        self.flakes('__path__', m.UndefinedName)
+        self.flakes('__path__', filename='package/__init__.py')
+
+
+    def test_globalImportStar(self):
+        '''Can't find undefined names with import *'''
+        self.flakes('from fu import *; bar', m.ImportStarUsed)
+
+    def test_localImportStar(self):
+        '''A local import * still allows undefined names to be found in upper scopes'''
+        self.flakes('''
+        def a():
+            from fu import *
+        bar
+        ''', m.ImportStarUsed, m.UndefinedName)
+
+    def test_unpackedParameter(self):
+        '''Unpacked function parameters create bindings'''
+        self.flakes('''
+        def a((bar, baz)):
+            bar; baz
+        ''')
+
+    def test_definedByGlobal(self):
+        '''"global" can make an otherwise undefined name in another function defined'''
+        self.flakes('''
+        def a(): global fu; fu = 1
+        def b(): fu
+        ''')
+    test_definedByGlobal.todo = ''
+
+    def test_globalInGlobalScope(self):
+        """
+        A global statement in the global scope is ignored.
+        """
+        self.flakes('''
+        global x
+        def foo():
+            print x
+        ''', m.UndefinedName)
+
+    def test_del(self):
+        '''del deletes bindings'''
+        self.flakes('a = 1; del a; a', m.UndefinedName)
+
+    def test_delGlobal(self):
+        '''del a global binding from a function'''
+        self.flakes('''
+        a = 1
+        def f():
+            global a
+            del a
+        a
+        ''')
+
+    def test_delUndefined(self):
+        '''del an undefined name'''
+        self.flakes('del a', m.UndefinedName)
+
+    def test_globalFromNestedScope(self):
+        '''global names are available from nested scopes'''
+        self.flakes('''
+        a = 1
+        def b():
+            def c():
+                a
+        ''')
+
+    def test_laterRedefinedGlobalFromNestedScope(self):
+        """
+        Test that referencing a local name that shadows a global, before it is
+        defined, generates a warning.
+        """
+        self.flakes('''
+        a = 1
+        def fun():
+            a
+            a = 2
+            return a
+        ''', m.UndefinedLocal)
+
+    def test_laterRedefinedGlobalFromNestedScope2(self):
+        """
+        Test that referencing a local name in a nested scope that shadows a
+        global declared in an enclosing scope, before it is defined, generates
+        a warning.
+        """
+        self.flakes('''
+            a = 1
+            def fun():
+                global a
+                def fun2():
+                    a
+                    a = 2
+                    return a
+        ''', m.UndefinedLocal)
+
+
+    def test_intermediateClassScopeIgnored(self):
+        """
+        If a name defined in an enclosing scope is shadowed by a local variable
+        and the name is used locally before it is bound, an unbound local
+        warning is emitted, even if there is a class scope between the enclosing
+        scope and the local scope.
+        """
+        self.flakes('''
+        def f():
+            x = 1
+            class g:
+                def h(self):
+                    a = x
+                    x = None
+                    print x, a
+            print x
+        ''', m.UndefinedLocal)
+
+
+    def test_doubleNestingReportsClosestName(self):
+        """
+        Test that referencing a local name in a nested scope that shadows a
+        variable declared in two different outer scopes before it is defined
+        in the innermost scope generates an UnboundLocal warning which
+        refers to the nearest shadowed name.
+        """
+        exc = self.flakes('''
+            def a():
+                x = 1
+                def b():
+                    x = 2 # line 5
+                    def c():
+                        x
+                        x = 3
+                        return x
+                    return x
+                return x
+        ''', m.UndefinedLocal).messages[0]
+        self.assertEqual(exc.message_args, ('x', 5))
+
+
+    def test_laterRedefinedGlobalFromNestedScope3(self):
+        """
+        Test that referencing a local name in a nested scope that shadows a
+        global, before it is defined, generates a warning.
+        """
+        self.flakes('''
+            def fun():
+                a = 1
+                def fun2():
+                    a
+                    a = 1
+                    return a
+                return a
+        ''', m.UndefinedLocal)
+
+    def test_nestedClass(self):
+        '''nested classes can access enclosing scope'''
+        self.flakes('''
+        def f(foo):
+            class C:
+                bar = foo
+                def f(self):
+                    return foo
+            return C()
+
+        f(123).f()
+        ''')
+
+    def test_badNestedClass(self):
+        '''free variables in nested classes must bind at class creation'''
+        self.flakes('''
+        def f():
+            class C:
+                bar = foo
+            foo = 456
+            return foo
+        f()
+        ''', m.UndefinedName)
+
+    def test_definedAsStarArgs(self):
+        '''star and double-star arg names are defined'''
+        self.flakes('''
+        def f(a, *b, **c):
+            print a, b, c
+        ''')
+
+    def test_definedInGenExp(self):
+        """
+        Using the loop variable of a generator expression results in no
+        warnings.
+        """
+        self.flakes('(a for a in xrange(10) if a)')
+
+
+
+class NameTests(TestCase):
+    """
+    Tests for some extra cases of name handling.
+    """
+    def test_impossibleContext(self):
+        """
+        A Name node with an unrecognized context results in a RuntimeError being
+        raised.
+        """
+        tree = compile("x = 10", "<test>", "exec", PyCF_ONLY_AST)
+        # Make it into something unrecognizable.
+        tree.body[0].targets[0].ctx = object()
+        self.assertRaises(RuntimeError, checker.Checker, tree)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
new file mode 100644
index 00000000..85073371
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# (c) 2005-2009 Divmod, Inc.  See LICENSE file for details
+
+from distutils.core import setup
+
+setup(
+    name="pyflakes",
+    license="MIT",
+    version="0.4.0",
+    description="passive checker of Python programs",
+    author="Phil Frost",
+    maintainer="Moe Aboulkheir",
+    maintainer_email="moe@divmod.com",
+    url="http://www.divmod.org/trac/wiki/DivmodPyflakes",
+    packages=["pyflakes", "pyflakes.scripts", "pyflakes.test"],
+    scripts=["bin/pyflakes"],
+    long_description="""Pyflakes is program to analyze Python programs and detect various errors. It
+works by parsing the source file, not importing it, so it is safe to use on
+modules with side effects. It's also much faster.""",
+    classifiers=[
+        "Development Status :: 6 - Mature",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Topic :: Software Development",
+        "Topic :: Utilities",
+        ])
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff b/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
new file mode 100644
index 00000000..ce2471f0
--- /dev/null
+++ b/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
@@ -0,0 +1,124 @@
+diff --git a/README.rst b/README.rst
+index 5f8467f..acff657 100644
+--- a/README.rst
++++ b/README.rst
+@@ -8,11 +8,13 @@ accessing a local before it is bound, and also gives warnings for things like
+ unused imports.
+ 
+ pyflakes-vim uses the output from PyFlakes to highlight errors in your code.
++To locate errors quickly, use quickfix_ commands:
+ 
+ Make sure to check vim.org_ for the latest updates.
+ 
+ .. _pyflakes.vim: http://www.vim.org/scripts/script.php?script_id=2441
+ .. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
++.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
+ 
+ Quick Installation
+ ------------------
+@@ -57,12 +59,10 @@ Hacking
+ TODO
+ ----
+  * signs_ support (show warning and error icons to left of the buffer area)
+- * quickfix_ support (allow jumping forward and back through the error list)
+  * configuration variables
+  * parse or intercept useful output from the warnings module
+ 
+ .. _signs: http://www.vim.org/htmldoc/sign.html
+-.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html
+ 
+ Changelog
+ ---------
+diff --git a/pyflakes.vim b/pyflakes.vim
+index 8aa508b..d6699bc 100644
+--- a/pyflakes.vim
++++ b/pyflakes.vim
+@@ -159,6 +159,42 @@ if !exists("*s:WideMsg")
+     endfun
+ endif
+ 
++if !exists("*s:GetQuickFixStackCount")
++    function s:GetQuickFixStackCount()
++        let l:stack_count = 0
++        try
++            silent colder 9
++        catch /E380:/
++        endtry
++
++        try
++            for i in range(9)
++                silent cnewer
++                let l:stack_count = l:stack_count + 1
++            endfor
++        catch /E381:/
++            return l:stack_count
++        endtry
++    endfunction
++endif
++
++if !exists("*s:ActivatePyflakesQuickFixWindow")
++    function s:ActivatePyflakesQuickFixWindow()
++        try
++            silent colder 9 " go to the bottom of quickfix stack
++        catch /E380:/
++        endtry
++
++        if s:pyflakes_qf > 0
++            try
++                exe "silent cnewer " . s:pyflakes_qf
++            catch /E381:/
++                echoerr "Could not activate Pyflakes Quickfix Window."
++            endtry
++        endif
++    endfunction
++endif
++
+ if !exists("*s:RunPyflakes")
+     function s:RunPyflakes()
+         highlight link PyFlakes SpellBad
+@@ -174,12 +210,23 @@ if !exists("*s:RunPyflakes")
+         
+         let b:matched = []
+         let b:matchedlines = {}
++
++        let b:qf_list = []
++        let b:qf_window_count = -1
++        
+         python << EOF
+ for w in check(vim.current.buffer):
+     vim.command('let s:matchDict = {}')
+     vim.command("let s:matchDict['lineNum'] = " + str(w.lineno))
+     vim.command("let s:matchDict['message'] = '%s'" % vim_quote(w.message % w.message_args))
+     vim.command("let b:matchedlines[" + str(w.lineno) + "] = s:matchDict")
++    
++    vim.command("let l:qf_item = {}")
++    vim.command("let l:qf_item.bufnr = bufnr('%')")
++    vim.command("let l:qf_item.filename = expand('%')")
++    vim.command("let l:qf_item.lnum = %s" % str(w.lineno))
++    vim.command("let l:qf_item.text = '%s'" % vim_quote(w.message % w.message_args))
++    vim.command("let l:qf_item.type = 'E'")
+ 
+     if w.col is None or isinstance(w, SyntaxError):
+         # without column information, just highlight the whole line
+@@ -189,8 +236,21 @@ for w in check(vim.current.buffer):
+         # with a column number, highlight the first keyword there
+         vim.command(r"let s:mID = matchadd('PyFlakes', '^\%" + str(w.lineno) + r"l\_.\{-}\zs\k\+\k\@!\%>" + str(w.col) + r"c')")
+ 
++        vim.command("let l:qf_item.vcol = 1")
++        vim.command("let l:qf_item.col = %s" % str(w.col + 1))
++
+     vim.command("call add(b:matched, s:matchDict)")
++    vim.command("call add(b:qf_list, l:qf_item)")
+ EOF
++        if exists("s:pyflakes_qf")
++            " if pyflakes quickfix window is already created, reuse it
++            call s:ActivatePyflakesQuickFixWindow()
++            call setqflist(b:qf_list, 'r')
++        else
++            " one pyflakes quickfix window for all buffer
++            call setqflist(b:qf_list, '')
++            let s:pyflakes_qf = s:GetQuickFixStackCount()
++        endif
+         let b:cleared = 0
+     endfunction
+ end
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index daedb559..1387a350 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-05-01.
-" @Last Change: 2013-09-26.
-" @Revision:    0.1.1297
+" @Last Change: 2013-12-03.
+" @Revision:    0.1.1310
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -161,12 +161,14 @@ else
         let self.width_filename = min([
                     \ get(self, 'width_filename', &co),
                     \ empty(g:tlib#input#filename_max_width) ? &co : eval(g:tlib#input#filename_max_width),
-                    \ max(map(copy(self.base), 'strwidth(fnamemodify(v:val, ":t"))'))
+                    \ max(map(copy(self.base), 'strwidth(matchstr(v:val, "[^\\/]*$"))'))
                     \ ])
-        " TLogVAR self.width_filename
+       "  TLogVAR self.width_filename
+         exec 'syntax match TLibDir /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \zs\(\(\a:\|\.\.\|\.\.\..\{-}\)\?[\/][^&<>*|]\{-}\)\?[^\/]\+$/ contained containedin=TLibMarker contains=TLibFilename'
+         exec 'syntax match TLibMarker /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \S.*$/ contains=TLibDir'
+       "  exec 'syntax match TLibDir /\(|\|\[.\{-}\]\) \zs\(\(\a:\|\.\.\|\.\.\..\{-}\)\?[\/][^&<>*|]\{-}\)\?[^\/]\+$/ contained containedin=TLibMarker contains=TLibFilename'
+       "  exec 'syntax match TLibMarker /\(|\|\[.\{-}\]\) \S.*$/ contains=TLibDir'
         exec 'syntax match TLibFilename /[^\/]\+$/ contained containedin=TLibDir'
-        exec 'syntax match TLibDir /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \zs\(\(\a:\|\.\.\|\.\.\..\{-}\)\?[\/][^&<>*|]\{-}\)\?[^\/]\+$/ contained containedin=TLibMarker contains=TLibFilename'
-        exec 'syntax match TLibMarker /\%>'. (1 + self.width_filename) .'c \(|\|\[[^]]*\]\) \S.*$/ contains=TLibDir'
         hi def link TLibMarker Special
         hi def link TLibDir Directory
         hi def link TLibFilename NonText
@@ -206,24 +208,26 @@ else
         " TLogVAR use_indicators
         if use_indicators
             call insert(marker, '[')
-            let bnr = bufnr(a:file)
-            " TLogVAR a:file, bnr, self.bufnr
-            if bnr != -1
-                if bnr == self.bufnr
-                    call add(marker, '%')
-                else
-                    call add(marker, bnr)
+            if g:tlib_inputlist_filename_indicators
+                let bnr = bufnr(a:file)
+                TLogVAR a:file, bnr, self.bufnr
+                if bnr != -1
+                    if bnr == self.bufnr
+                        call add(marker, '%')
+                    else
+                        call add(marker, bnr)
+                    endif
+                    if getbufvar(bnr, '&modified')
+                        call add(marker, '+')
+                    endif
+                    if getbufvar(bnr, '&bufhidden') == 'hide'
+                        call add(marker, 'h')
+                    endif
+                    " if !buflisted(bnr)
+                    "     call add(marker, 'u')
+                    " endif
+                    " echom "DBG" a:file string(get(self,'filename_indicators'))
                 endif
-                if getbufvar(bnr, '&modified')
-                    call add(marker, '+')
-                endif
-                if getbufvar(bnr, '&bufhidden') == 'hide'
-                    call add(marker, 'h')
-                endif
-                " if !buflisted(bnr)
-                "     call add(marker, 'u')
-                " endif
-                " echom "DBG" a:file string(get(self,'filename_indicators'))
             endif
             if has_key(self, 'filename_indicators') && has_key(self.filename_indicators, a:file)
                 if len(marker) > 1
diff --git a/sources_non_forked/tlib/autoload/tlib/agent.vim b/sources_non_forked/tlib/autoload/tlib/agent.vim
index c0d9566a..61109e7b 100644
--- a/sources_non_forked/tlib/autoload/tlib/agent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/agent.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-24.
-" @Last Change: 2013-09-26.
-" @Revision:    0.1.240
+" @Last Change: 2013-11-05.
+" @Revision:    0.1.242
 
 
 " :filedoc:
@@ -444,6 +444,7 @@ endf
 
 
 function! tlib#agent#EditFileInTab(world, selected) "{{{3
+    " TLogVAR a:selected
     call a:world.CloseScratch()
     call tlib#file#With('tabedit', 'tab sbuffer', a:selected, a:world)
     return tlib#agent#Exit(a:world, a:selected)
diff --git a/sources_non_forked/tlib/autoload/tlib/file.vim b/sources_non_forked/tlib/autoload/tlib/file.vim
index e7ea855a..85009e37 100644
--- a/sources_non_forked/tlib/autoload/tlib/file.vim
+++ b/sources_non_forked/tlib/autoload/tlib/file.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2013-09-25.
-" @Revision:    0.0.141
+" @Revision:    0.0.142
 
 if &cp || exists("loaded_tlib_file_autoload")
     finish
@@ -36,12 +36,12 @@ function! tlib#file#Split(filename) "{{{3
 endf
 
 
-" :display: tlib#file#Join(filename_parts, ?strip_slashes=0)
+" :display: tlib#file#Join(filename_parts, ?strip_slashes=1)
 " EXAMPLES: >
 "   tlib#file#Join(['foo', 'bar', 'filename.txt'])
 "   => 'foo/bar/filename.txt'
 function! tlib#file#Join(filename_parts, ...) "{{{3
-    TVarArg 'strip_slashes'
+    TVarArg ['strip_slashes', 1]
     " TLogVAR a:filename_parts, strip_slashes
     if strip_slashes
         " let rx    = tlib#rx#Escape(g:tlib#dir#sep) .'$'
diff --git a/sources_non_forked/tlib/autoload/tlib/scratch.vim b/sources_non_forked/tlib/autoload/tlib/scratch.vim
index bb6e4be2..e043f050 100644
--- a/sources_non_forked/tlib/autoload/tlib/scratch.vim
+++ b/sources_non_forked/tlib/autoload/tlib/scratch.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-07-18.
-" @Last Change: 2013-10-16.
-" @Revision:    0.0.242
+" @Last Change: 2013-11-11.
+" @Revision:    0.0.251
 
 if &cp || exists("loaded_tlib_scratch_autoload")
     finish
@@ -65,7 +65,7 @@ function! tlib#scratch#UseScratch(...) "{{{3
                 else
                     let cmd = 'buffer!'
                 endif
-                " TLogVAR cmd
+                " TLogVAR cmd, bn
                 silent exec 'noautocmd keepalt keepj' cmd bn
             endif
         else
@@ -77,7 +77,7 @@ function! tlib#scratch#UseScratch(...) "{{{3
             else
                 let cmd = 'edit'
             endif
-            " TLogVAR cmd
+            " TLogVAR cmd, id
             silent exec 'noautocmd keepalt keepj' cmd escape(id, '%#\ ')
             " silent exec 'split '. id
         endif
@@ -100,7 +100,7 @@ function! tlib#scratch#UseScratch(...) "{{{3
         endif
     endif
     let keyargs.scratch = bufnr('%')
-    " TLogVAR 2, winnr(), bufnr('%'), bufname("%")
+    " TLogVAR 2, winnr(), bufnr('%'), bufname("%"), keyargs.scratch
     return keyargs.scratch
 endf
 
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index f12563aa..a295ce19 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -1495,7 +1495,7 @@ tlib#file#Split(filename)
 <
 
                                                     *tlib#file#Join()*
-tlib#file#Join(filename_parts, ?strip_slashes=0)
+tlib#file#Join(filename_parts, ?strip_slashes=1)
     EXAMPLES: >
       tlib#file#Join(['foo', 'bar', 'filename.txt'])
       => 'foo/bar/filename.txt'
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index 2cfe155a..c60dfd3b 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-04-10.
 " @Last Change: 2013-09-25.
-" @Revision:    746
+" @Revision:    748
 " GetLatestVimScripts: 1863 1 tlib.vim
 
 if &cp || exists("loaded_tlib")
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 106
+let loaded_tlib = 107
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/LICENSE b/sources_non_forked/vim-airline/LICENSE
index 46977354..9a5a8b73 100644
--- a/sources_non_forked/vim-airline/LICENSE
+++ b/sources_non_forked/vim-airline/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2013 Bailey Ling
+Copyright (C) 2013-2014 Bailey Ling
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index 3ff5ac3a..22d06872 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -10,7 +10,7 @@ Lean &amp; mean status/tabline for vim that's light as air.
 *  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], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35].
 *  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 colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
+*  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; have a look at the [screenshots][14] in the wiki.
 *  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.
@@ -70,6 +70,9 @@ vim-airline integrates with a variety of plugins out of the box.  These extensio
 #### [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)
+
 ## Extras
 
 vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
@@ -164,7 +167,7 @@ Contributions and pull requests are welcome.  Please take note of the following
 
 # License
 
-MIT License. Copyright (c) 2013 Bailey Ling.
+MIT License. Copyright (c) 2013-2014 Bailey Ling.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
@@ -204,3 +207,4 @@ MIT License. Copyright (c) 2013 Bailey Ling.
 [33]: https://github.com/bling/vim-airline/wiki/Test-Plan
 [34]: http://eclim.org
 [35]: https://github.com/edkolev/tmuxline.vim
+[36]: https://github.com/edkolev/promptline.vim
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index 664c78e6..de66fbac 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/sources_non_forked/vim-airline/autoload/airline/builder.vim
index c1658974..d03af12e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/builder.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/builder.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:prototype = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/debug.vim b/sources_non_forked/vim-airline/autoload/airline/debug.vim
index 04d7e59c..28424a65 100644
--- a/sources_non_forked/vim-airline/autoload/airline/debug.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/debug.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#debug#profile1()
diff --git a/sources_non_forked/vim-airline/autoload/airline/deprecation.vim b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
index dd0567fc..cf7e7872 100644
--- a/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#deprecation#check()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 790bfd1b..f32abd3c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:ext = {}
@@ -20,7 +20,6 @@ endfunction
 let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
 
 let s:filetype_overrides = {
-      \ 'netrw': [ 'netrw', '%f' ],
       \ 'nerdtree': [ 'NERD', '' ],
       \ 'gundo': [ 'Gundo', '' ],
       \ 'diff': [ 'diff', '' ],
@@ -128,6 +127,10 @@ function! airline#extensions#load()
     call airline#extensions#unite#init(s:ext)
   endif
 
+  if exists(':NetrwSettings')
+    call airline#extensions#netrw#init(s:ext)
+  endif
+
   if get(g:, 'loaded_vimfiler', 0)
     let g:vimfiler_force_overwrite_statusline = 0
   endif
@@ -199,6 +202,10 @@ function! airline#extensions#load()
     call airline#extensions#tmuxline#init(s:ext)
   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)
+  endif
+
   " load all other extensions not part of the default distribution
   for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
     " we have to check both resolved and unresolved paths, since it's possible
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 2177f64c..82fd139f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:has_fugitive = exists('*fugitive#head')
@@ -10,10 +10,6 @@ if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
   finish
 endif
 
-let s:empty_message = get(g:, 'airline#extensions#branch#empty_message',
-      \ get(g:, 'airline_branch_empty_message', ''))
-let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
-
 function! airline#extensions#branch#head()
   let head = ''
 
@@ -48,9 +44,12 @@ endfunction
 
 function! airline#extensions#branch#get_head()
   let head = airline#extensions#branch#head()
+  let empty_message = get(g:, 'airline#extensions#branch#empty_message',
+      \ get(g:, 'airline_branch_empty_message', ''))
+  let symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
   return empty(head)
-        \ ? s:empty_message
-        \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.(g:airline_symbols.space), head)
+        \ ? empty_message
+        \ : printf('%s%s', empty(symbol) ? '' : symbol.(g:airline_symbols.space), head)
 endfunction
 
 function! s:check_in_path()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
index 0c6013ce..6dc97fe7 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists('*bufferline#get_status_string')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
index 1353940b..e549f27b 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'command_t_loaded', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
index d3a8cc84..2c296ab3 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_csv', 0) && !exists(':Table')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
index 64e28854..11a89220 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_ctrlp', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
index 5d21996f..d01349df 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
index 68360466..8a80813e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':ProjectCreate')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
index 0c64f2c8..4a1932d8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " we don't actually want this loaded :P
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
index 084dd7b5..6827f5d7 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
new file mode 100644
index 00000000..debb0888
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
@@ -0,0 +1,32 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
new file mode 100644
index 00000000..50b9708f
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
@@ -0,0 +1,33 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
index f000e027..8efc5275 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
index 3ecc1eb1..f7179af8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':SyntasticCheck')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 0bad224f..90aff5d8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
index f1c87e4f..4f1ed40e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
index eb622f5e..e4a790d9 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#extensions#tabline#unique_tail#format(bufnr, buffers)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 12b28ae6..1b4dfa3f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:skip_symbol = '…'
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
index 061a47f2..eb158ac4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':TagbarToggle')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
index 4bc0a5f9..363709bc 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':Tmuxline')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
index d897f041..f577ffd8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':UndotreeToggle')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
index 4db38584..d230b6fb 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_unite', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
index c052282c..f070c472 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'virtualenv_loaded', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index 002fba1d..ba98b71e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
index f5e68465..65a95cc9 100644
--- a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index 558b3f23..a60774d8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/init.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! s:check_defined(variable, default)
diff --git a/sources_non_forked/vim-airline/autoload/airline/parts.vim b/sources_non_forked/vim-airline/autoload/airline/parts.vim
index bec4504f..b0356b1d 100644
--- a/sources_non_forked/vim-airline/autoload/airline/parts.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/parts.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:parts = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/section.vim b/sources_non_forked/vim-airline/autoload/airline/section.vim
index 4562bacd..0baf0779 100644
--- a/sources_non_forked/vim-airline/autoload/airline/section.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/section.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes.vim b/sources_non_forked/vim-airline/autoload/airline/themes.vim
index 110a9dc3..07e03241 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " generates a dictionary which defines the colors for each highlight group
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
new file mode 100644
index 00000000..4ff94f57
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
@@ -0,0 +1,57 @@
+"
+" Colorscheme: Kalisi for airline. Inspired by powerline.
+" 06.02.2014 Arthur Jaron
+" hifreeo@gmail.com
+" 
+
+" Insert mode                                    
+let s:I1 = [ '#ffffff' , '#e80000' , 23  , 231 ] 
+let s:I2 = [ '#c5c5c5' , '#901010' , 74  , 31  ] 
+let s:I3 = [ '#c5c5c5' , '#500000' , 117 , 24  ] 
+
+" Visual mode                                    
+let s:V1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] 
+let s:V2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] 
+let s:V3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] 
+
+" Replace mode
+let s:R1 = [ '#8e00da' , '#ffffff' , 23  , 231 ] 
+let s:R2 = [ '#8e00da' , '#ce99ff' , 74  , 31  ] 
+let s:R3 = [ '#ce99ff' , '#8e00da' , 117 , 24  ] 
+
+let g:airline#themes#kalisi#palette = {}
+
+function! airline#themes#kalisi#refresh()
+
+  " Normal mode
+  let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
+  let s:N2 = [ '#afd700' , '#005f00' , 247 , 236 ]
+  let s:N3 = airline#themes#get_highlight('StatusLine')
+
+  " Tabline Plugin
+  let g:airline#themes#kalisi#palette.tabline = {
+        \ 'airline_tab':  ['#A6DB29', '#005f00',  231, 29, ''],
+        \ 'airline_tabsel':  ['#404042', '#A6DB29',  231, 36, ''],
+        \ 'airline_tabtype':  ['#afd700', '#005f00',  231, 36, ''],
+        \ 'airline_tabfill':  ['#ffffff', '#000000',  231, 23, ''],
+        \ 'airline_tabhid':  ['#c5c5c5', '#404042',  231, 88, ''],
+        \ 'airline_tabmod':  ['#ffffff', '#F1266F',  231, 88, ''],
+        \ }
+
+  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 = [ '#c5c5c5' , '#505052' , 239 , 234 , '' ]
+  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 = {
+        \ 'statusline': [ '#F1266F' , '' , '53' , '' , '' ] ,
+        \ }
+
+endfunction
+
+call airline#themes#kalisi#refresh()
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/util.vim b/sources_non_forked/vim-airline/autoload/airline/util.vim
index b97c0866..a04bd0bf 100644
--- a/sources_non_forked/vim-airline/autoload/airline/util.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/util.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 8b8da8bd..d5407b91 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -433,7 +433,7 @@ eclim <https://eclim.org>
 <
 Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
 
--------------------------------------                    *airline-tmuxline*
+-------------------------------------                     *airline-tmuxline*
 tmuxline <https://github.com/edkolev/tmuxline.vim>
 
 * enable/disable tmuxline integration >
@@ -450,6 +450,26 @@ tmuxline <https://github.com/edkolev/tmuxline.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'
+<
 
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
@@ -699,7 +719,7 @@ Contributions and pull requests are welcome.
 ==============================================================================
 LICENSE                                                    *airline-license*
 
-MIT License.  Copyright © 2013 Bailey Ling.
+MIT License.  Copyright © 2013-2014 Bailey Ling.
 
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/sources_non_forked/vim-airline/plugin/airline.vim
index f1d3d386..e75535fe 100644
--- a/sources_non_forked/vim-airline/plugin/airline.vim
+++ b/sources_non_forked/vim-airline/plugin/airline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index dbbc754d..8ddb28da 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -136,6 +136,9 @@ function! fugitive#extract_git_dir(path) abort
       " checking for them since such checks are extremely slow.
       break
     endif
+    if index(split($GIT_CEILING_DIRECTORIES, ':'), root) >= 0
+      break
+    endif
     let dir = s:sub(root, '[\/]$', '') . '/.git'
     let type = getftype(dir)
     if type ==# 'dir' && fugitive#is_git_dir(dir)
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 117ea62b..6333cf57 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -14,6 +14,7 @@ additional contributions from:
 * [bpugh](https://github.com/bpugh)
 * [bruno-](https://github.com/bruno-)
 * [darkwise](https://github.com/darkwise)
+* [fish-face](https://github.com/fish-face)
 * [henrik](https://github.com/henrik)
 * [holizz](https://github.com/holizz)
 * [honza](https://github.com/honza)
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 5fdf73ac..4ddeecbe 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -22,6 +22,8 @@ dependencies. SnipMate depends on [vim-addon-mw-utils][mw-utils] and
 [tlib][tlib]. Since SnipMate does not ship with any snippets, we suggest
 looking at the [vim-snippets][vim-snippets] repository.
 
+* Using [VAM][vam], add `vim-snippets` to the list of packages to be installed.
+
 * Using [Pathogen][pathogen], run the following commands:
 
         % cd ~/.vim/bundle
@@ -32,8 +34,6 @@ looking at the [vim-snippets][vim-snippets] repository.
         # Optional:
         % git clone https://github.com/honza/vim-snippets.git
 
-* Using [VAM][vam], add `vim-snippets` to the list of packages to be installed.
-
 * Using [Vundle][vundle], add the following to your `vimrc` then run
   `:BundleInstall`
 
@@ -46,6 +46,11 @@ looking at the [vim-snippets][vim-snippets] repository.
 
 ## Release Notes ##
 
+### Master ###
+
+* Fix bug with mirrors in the first column
+* Fix bug with tabs in indents ([#143][143])
+
 ### 0.87 - 2014-01-04 ###
 
 * Stop indenting empty lines when expanding snippets
@@ -68,3 +73,5 @@ looking at the [vim-snippets][vim-snippets] repository.
 [vam]: https://github.com/marcweber/vim-addon-manager
 [pathogen]: https://github.com/tpope/vim-pathogen
 [vundle]: https://github.com/gmarik/vundle
+
+[143]: https://github.com/garbas/vim-snipmate/issues/143
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 19304995..b4dc3949 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -79,7 +79,7 @@ fun! snipMate#expandSnip(snip, col)
 	endif
 
 	" Insert snippet with proper indentation
-	let indent = indent(lnum) + 1
+	let indent = match(line, '\S\|$') + 1
 	call setline(lnum, line . snipLines[0])
 	call append(lnum, map(snipLines[1:], "empty(v:val) ? v:val : '" . strpart(line, 0, indent - 1) . "' . v:val"))
 
@@ -375,10 +375,14 @@ function! s:state_proto.update_vars(change)
 			let i += 1
 		endif
 
+		" Split the line into three parts: the mirror, what's before it, and
+		" what's after it. Then combine them using the new mirror string.
+		" Subtract one to go from column index to byte index
 		let theline = getline(lnum)
-		" subtract -1 to go from column byte index to string byte index
-		" subtract another -1 to exclude the col'th element
-		call setline(lnum, theline[0:(col-2)] . newWord . theline[(col+self.end_col-self.start_col-a:change-1):])
+		let update  = strpart(theline, 0, col - 1)
+		let update .= newWord
+		let update .= strpart(theline, col + self.end_col - self.start_col - a:change - 1)
+		call setline(lnum, update)
 	endfor
 
 	" Reposition the cursor in case a var updates on the same line but before
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 27592c73..da03e661 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -51,6 +51,32 @@ If you have VimL only (vim without python support) your best option is using
 garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
 
+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](vim-addon-manager) (because Marc Weber wrote it for exactly
+this reason, it supports simple dependency management). Eg you're done by this
+line in your .vimrc:
+
+```
+" 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 snipate 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 .vmirc:
+(See this pull request)[https://github.com/honza/vim-snippets/pull/307/files].
+
 Policies / for contributors
 ===========================
 Some snippets are useful for almost all languages, so let's try to have the same
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index 2e451e41..a4fdf19f 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -90,7 +90,7 @@ snippet class
 		${0}
 	}
 snippet node
-	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
+	node '${1:`vim_snippets#Filename('', 'fqdn')`}' {
 		${0}
 	}
 snippet case
@@ -122,99 +122,99 @@ snippet [
 snippet >
 	${1}	=> ${0}
 snippet p:
-	"puppet://puppet/${1:module name}/${0:file name}"
+	'puppet://puppet/${1:module name}/${0:file name}'
 #
 # Functions
 snippet alert
-	alert("${1:message}")
+	alert('${1:message}')
 snippet crit
-	crit("${1:message}")
+	crit('${1:message}')
 snippet debug
-	debug("${1:message}")
+	debug('${1:message}')
 snippet defined
-	defined(${1:Resource}["${2:name}"])
+	defined(${1:Resource}['${2:name}'])
 snippet emerg
-	emerg("${1:message}")
+	emerg('${1:message}')
 snippet extlookup Simple extlookup
-	extlookup("${1:variable}")
+	extlookup('${1:variable}')
 snippet extlookup Extlookup with defaults
-	extlookup("${1:variable}", "${2:default}")
+	extlookup('${1:variable}', '${2:default}')
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup("${1:variable}", "${2:default}", "${3:data source}")
+	extlookup('${1:variable}', '${2:default}', '${3:data source}')
 snippet fail
-	fail("${1:message}")
+	fail('${1:message}')
 snippet info
-	info("${1:message}")
+	info('${1:message}')
 snippet inline_template
-	inline_template("<%= ${1} %>")
+	inline_template('<%= ${1} %>')
 snippet notice
-	notice("${1:message}")
+	notice('${1:message}')
 snippet realize
 	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
+	regsubst(${1:hay stack}, ${2:needle}, '${3:replacement}')
 snippet inc
 	include ${1:classname}
 snippet split
-	split(${1:hay stack}, "${2:patten}")
+	split(${1:hay stack}, '${2:patten}')
 snippet versioncmp
-	versioncmp("${1:version}", "${2:version}")
+	versioncmp('${1:version}', '${2:version}')
 snippet warning
-	warning("${1:message}")
+	warning('${1:message}')
 #
 # Types
 snippet cron
-	cron{ "${1:name}":
-		command	=> "${2}",
-		user	=> "${3:root}",
-		${4}	=> ${0}
+	cron { '${1:name}':
+		command => '${2}',
+		user    => '${3:root}',
+		${4}    => ${0},
 	}
 
 snippet exec
-	exec{ "${1:name}":
-		command	=> "${2:$1}",
-		user	=> "${3:root}",
-		${4}	=> ${0}
+	exec { '${1:name}':
+		command => '${2:$1}',
+		user    => '${3:root}',
+		${4}    => ${0},
 	}
 
 snippet user
-	user{ "${1:user}":
-		comment		=> "${2:$1}",
-		ensure		=> present,
-		managehome	=> true,
-		home		=> "${0:/home/$1}"
+	user { '${1:user}':
+		ensure      => present,
+		comment     => '${2:$1}',
+		managehome  => true,
+		home        => '${0:/home/$1}',
 	}
 
 snippet group
-	group{ "${1:group}":
-		ensure	=> ${0:present}
+	group { '${1:group}':
+		ensure => ${0:present},
 	}
 
 snippet host
-	host{ "${1:hostname}":
-		ip	=> ${0:127.0.0.1}
+	host { '${1:hostname}':
+		ip => ${0:127.0.0.1},
 	}
 
 snippet mailalias
-	mailalias{ "${1:localpart}":
-		recipient	=> "${0:recipient}"
+	mailalias { '${1:localpart}':
+		recipient => '${0:recipient}',
 	}
 
 snippet mount
-	mount{ "${1:destination path}":
+	mount { '${1:destination path}':
 		ensure	=> ${2:mounted},
-		device	=> "${0:device name or path}"
+		device	=> '${0:device name or path}',
 	}
 
 snippet package
-	package{ "${1:package name}":
-		ensure	=> ${0:present}
+	package { '${1:package name}':
+		ensure	=> ${0:present},
 	}
 
 snippet yumrepo
-	yumrepo{ "${1:repo name}":
-		descr	=> "${2:$1}",
-		enabled	=> ${0:1}
+	yumrepo { '${1:repo name}':
+		Descr   => '${2:$1}',
+		enabled => ${0:1},
 	}
 
 snippet define
@@ -227,7 +227,7 @@ snippet service
 		ensure    => running,
 		enable    => true,
 		require   => [ Package['${2:package}'], File['${3:file}'], ],
-		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ]
+		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ],
 	}
 
 snippet file
diff --git a/update_plugins.py b/update_plugins.py
index 946f0b74..ad474860 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -35,6 +35,7 @@ vim-fugitive https://github.com/tpope/vim-fugitive
 vim-airline https://github.com/bling/vim-airline
 goyo.vim https://github.com/junegunn/goyo.vim
 vim-zenroom2 https://github.com/amix/vim-zenroom2
+pyflakes-pathogen https://github.com/mitechie/pyflakes-pathogen
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 6cbbc3a2..68b79b82 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -293,23 +293,21 @@ autocmd BufWrite *.coffee :call DeleteTrailingWS()
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => vimgrep searching and cope displaying
+" => Ack searching and cope displaying
+"    requires ack.vim - it's much better than vimgrep/grep
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" When you press gv you vimgrep after the selected text
+" When you press gv you Ack after the selected text
 vnoremap <silent> gv :call VisualSelection('gv', '')<CR>
 
-" Open vimgrep and put the cursor in the right position
-map <leader>g :vimgrep // **/*.<left><left><left><left><left><left><left>
-
-" Vimgreps in the current file
-map <leader><space> :vimgrep // <C-R>%<C-A><right><right><right><right><right><right><right><right><right>
+" Open Ack and put the cursor in the right position
+map <leader>g :Ack 
 
 " When you press <leader>r you can search and replace the selected text
 vnoremap <silent> <leader>r :call VisualSelection('replace', '')<CR>
 
 " Do :help cope if you are unsure what cope is. It's super useful!
 "
-" When you search with vimgrep, display your results in cope by doing:
+" When you search with Ack, display your results in cope by doing:
 "   <leader>cc
 "
 " To go to the next search result do:
@@ -373,7 +371,7 @@ function! VisualSelection(direction, extra_filter) range
     if a:direction == 'b'
         execute "normal ?" . l:pattern . "^M"
     elseif a:direction == 'gv'
-        call CmdLine("vimgrep " . '/'. l:pattern . '/' . ' **/*.' . a:extra_filter)
+        call CmdLine("Ack \"" . l:pattern . "\" " )
     elseif a:direction == 'replace'
         call CmdLine("%s" . '/'. l:pattern . '/')
     elseif a:direction == 'f'

From 497b5aa4fbe01fc415e53a9190677b02923cf90c Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 8 Feb 2014 10:05:16 +0000
Subject: [PATCH 29/61] Use syntastic instead of pyflakes (supports a ton of
 more languages)

---
 sources_forked/peaksea/colors/peaksea.vim     |   2 +-
 .../pyflakes-pathogen/.gitignore              |   1 -
 .../pyflakes-pathogen/README.rst              |  11 -
 .../ftplugin/python/README.rst                |  80 ---
 .../ftplugin/python/pyflakes.vim              | 325 ---------
 .../ftplugin/python/pyflakes/LICENSE          |  21 -
 .../ftplugin/python/pyflakes/NEWS.txt         |  29 -
 .../ftplugin/python/pyflakes/README.rst       |  36 -
 .../ftplugin/python/pyflakes/TODO             |  11 -
 .../python/pyflakes/pyflakes/__init__.py      |   2 -
 .../ftplugin/python/pyflakes/pyflakes/ast.py  | 311 --------
 .../python/pyflakes/pyflakes/checker.py       | 625 ----------------
 .../python/pyflakes/pyflakes/messages.py      |  96 ---
 .../pyflakes/pyflakes/scripts/__init__.py     |   0
 .../pyflakes/pyflakes/scripts/pyflakes.py     |  90 ---
 .../python/pyflakes/pyflakes/test/__init__.py |   0
 .../python/pyflakes/pyflakes/test/harness.py  |  27 -
 .../pyflakes/pyflakes/test/test_imports.py    | 673 ------------------
 .../pyflakes/pyflakes/test/test_other.py      | 575 ---------------
 .../pyflakes/pyflakes/test/test_script.py     | 185 -----
 .../pyflakes/test/test_undefined_names.py     | 265 -------
 .../ftplugin/python/pyflakes/setup.py         |  28 -
 .../ftplugin/python/quickfix.diff             | 124 ----
 sources_non_forked/syntastic/.gitignore       |   4 +
 sources_non_forked/syntastic/CONTRIBUTING.md  |  49 ++
 sources_non_forked/syntastic/LICENCE          |  13 +
 sources_non_forked/syntastic/README.markdown  | 247 +++++++
 .../syntastic/_assets/screenshot_1.png        | Bin 0 -> 92425 bytes
 .../syntastic/autoload/syntastic/c.vim        | 329 +++++++++
 .../syntastic/autoload/syntastic/log.vim      | 181 +++++
 .../autoload/syntastic/postprocess.vim        |  67 ++
 .../syntastic/autoload/syntastic/util.vim     | 244 +++++++
 .../syntastic/doc/syntastic.txt               | 656 +++++++++++++++++
 .../syntastic/plugin/syntastic.vim            | 521 ++++++++++++++
 .../plugin/syntastic/autoloclist.vim          |  40 ++
 .../syntastic/plugin/syntastic/balloons.vim   |  68 ++
 .../syntastic/plugin/syntastic/checker.vim    | 144 ++++
 .../syntastic/plugin/syntastic/cursor.vim     |  67 ++
 .../plugin/syntastic/highlighting.vim         |  95 +++
 .../syntastic/plugin/syntastic/loclist.vim    | 238 +++++++
 .../syntastic/plugin/syntastic/modemap.vim    |  75 ++
 .../syntastic/plugin/syntastic/notifiers.vim  |  57 ++
 .../syntastic/plugin/syntastic/registry.vim   | 282 ++++++++
 .../syntastic/plugin/syntastic/signs.vim      | 148 ++++
 .../syntax_checkers/actionscript/mxmlc.vim    |  71 ++
 .../syntastic/syntax_checkers/ada/gcc.vim     |  47 ++
 .../applescript/osacompile.vim                |  49 ++
 .../syntax_checkers/asciidoc/asciidoc.vim     |  47 ++
 .../syntastic/syntax_checkers/asm/gcc.vim     |  54 ++
 .../syntax_checkers/bemhtml/bemhtmllint.vim   |  34 +
 .../syntastic/syntax_checkers/c/avrgcc.vim    |  55 ++
 .../syntax_checkers/c/checkpatch.vim          |  55 ++
 .../syntastic/syntax_checkers/c/cppcheck.vim  |  68 ++
 .../syntastic/syntax_checkers/c/gcc.vim       |  59 ++
 .../syntastic/syntax_checkers/c/make.vim      |  61 ++
 .../syntastic/syntax_checkers/c/oclint.vim    |  60 ++
 .../syntastic/syntax_checkers/c/sparse.vim    |  53 ++
 .../syntastic/syntax_checkers/c/splint.vim    |  59 ++
 .../syntax_checkers/chef/foodcritic.vim       |  39 +
 .../syntastic/syntax_checkers/co/coco.vim     |  42 ++
 .../syntastic/syntax_checkers/cobol/cobc.vim  |  46 ++
 .../syntax_checkers/coffee/coffee.vim         |  56 ++
 .../syntax_checkers/coffee/coffeelint.vim     |  44 ++
 .../syntastic/syntax_checkers/coq/coqtop.vim  |  40 ++
 .../syntax_checkers/cpp/cppcheck.vim          |  68 ++
 .../syntastic/syntax_checkers/cpp/cpplint.vim |  64 ++
 .../syntastic/syntax_checkers/cpp/gcc.vim     |  55 ++
 .../syntastic/syntax_checkers/cpp/oclint.vim  |  31 +
 .../syntastic/syntax_checkers/cs/mcs.vim      |  39 +
 .../syntastic/syntax_checkers/css/csslint.vim |  56 ++
 .../syntastic/syntax_checkers/css/phpcs.vim   |  29 +
 .../syntax_checkers/css/prettycss.vim         |  63 ++
 .../syntax_checkers/cucumber/cucumber.vim     |  42 ++
 .../syntastic/syntax_checkers/cuda/nvcc.vim   |  78 ++
 .../syntastic/syntax_checkers/d/dmd.vim       |  53 ++
 .../syntax_checkers/dart/dartanalyzer.vim     |  76 ++
 .../syntax_checkers/docbk/xmllint.vim         |  25 +
 .../syntax_checkers/dustjs/swiffer.vim        |  38 +
 .../syntax_checkers/elixir/elixir.vim         |  51 ++
 .../erlang/erlang_check_file.erl              |  63 ++
 .../syntax_checkers/erlang/escript.vim        |  61 ++
 .../syntastic/syntax_checkers/eruby/ruby.vim  |  73 ++
 .../syntax_checkers/fortran/gfortran.vim      |  51 ++
 .../syntastic/syntax_checkers/glsl/cgc.vim    |  77 ++
 .../syntastic/syntax_checkers/go/go.vim       |  83 +++
 .../syntastic/syntax_checkers/go/gofmt.vim    |  44 ++
 .../syntastic/syntax_checkers/go/golint.vim   |  39 +
 .../syntastic/syntax_checkers/go/gotype.vim   |  48 ++
 .../syntastic/syntax_checkers/go/govet.vim    |  49 ++
 .../syntastic/syntax_checkers/haml/haml.vim   |  51 ++
 .../syntax_checkers/haml/haml_lint.vim        |  37 +
 .../syntax_checkers/handlebars/handlebars.vim |  42 ++
 .../syntax_checkers/haskell/ghc-mod.vim       |  72 ++
 .../syntax_checkers/haskell/hdevtools.vim     |  48 ++
 .../syntax_checkers/haskell/hlint.vim         |  37 +
 .../syntastic/syntax_checkers/haxe/haxe.vim   |  61 ++
 .../syntastic/syntax_checkers/hss/hss.vim     |  38 +
 .../syntastic/syntax_checkers/html/jshint.vim |  55 ++
 .../syntastic/syntax_checkers/html/tidy.vim   | 209 ++++++
 .../syntax_checkers/html/validator.vim        | 102 +++
 .../syntastic/syntax_checkers/html/w3.vim     |  69 ++
 .../syntax_checkers/java/checkstyle.vim       |  88 +++
 .../syntastic/syntax_checkers/java/javac.vim  | 450 ++++++++++++
 .../javascript/closurecompiler.vim            |  76 ++
 .../syntax_checkers/javascript/eslint.vim     |  50 ++
 .../syntax_checkers/javascript/gjslint.vim    |  48 ++
 .../syntax_checkers/javascript/jscs.vim       |  42 ++
 .../syntax_checkers/javascript/jshint.vim     |  60 ++
 .../syntax_checkers/javascript/jsl.vim        |  50 ++
 .../syntax_checkers/javascript/jslint.vim     |  51 ++
 .../syntax_checkers/json/jsonlint.vim         |  43 ++
 .../syntax_checkers/json/jsonval.vim          |  41 ++
 .../syntax_checkers/less/less-lint.coffee     |  41 ++
 .../syntax_checkers/less/less-lint.js         |  57 ++
 .../syntastic/syntax_checkers/less/lessc.vim  |  71 ++
 .../syntastic/syntax_checkers/lex/flex.vim    |  50 ++
 .../syntastic/syntax_checkers/limbo/limbo.vim |  46 ++
 .../syntastic/syntax_checkers/lisp/clisp.vim  |  48 ++
 .../syntastic/syntax_checkers/llvm/llvm.vim   |  39 +
 .../syntastic/syntax_checkers/lua/luac.vim    |  65 ++
 .../syntax_checkers/matlab/mlint.vim          |  41 ++
 .../syntastic/syntax_checkers/nasm/nasm.vim   |  41 ++
 .../syntax_checkers/nroff/mandoc.vim          |  41 ++
 .../syntastic/syntax_checkers/objc/gcc.vim    |  59 ++
 .../syntastic/syntax_checkers/objc/oclint.vim |  31 +
 .../syntastic/syntax_checkers/objcpp/gcc.vim  |  59 ++
 .../syntax_checkers/objcpp/oclint.vim         |  31 +
 .../syntax_checkers/ocaml/camlp4o.vim         | 156 ++++
 .../syntastic/syntax_checkers/perl/perl.vim   | 105 +++
 .../syntax_checkers/perl/perlcritic.vim       |  66 ++
 .../syntax_checkers/perl/podchecker.vim       |  25 +
 .../syntastic/syntax_checkers/php/php.vim     |  51 ++
 .../syntastic/syntax_checkers/php/phpcs.vim   |  45 ++
 .../syntastic/syntax_checkers/php/phpmd.vim   |  78 ++
 .../syntastic/syntax_checkers/po/msgfmt.vim   |  50 ++
 .../syntax_checkers/pod/podchecker.vim        |  51 ++
 .../syntax_checkers/puppet/puppet.vim         |  50 ++
 .../syntax_checkers/puppet/puppetlint.vim     |  53 ++
 .../syntax_checkers/python/compile.py         |  13 +
 .../syntax_checkers/python/flake8.vim         |  69 ++
 .../syntax_checkers/python/frosted.vim        |  60 ++
 .../syntax_checkers/python/pep257.vim         |  51 ++
 .../syntastic/syntax_checkers/python/pep8.vim |  47 ++
 .../syntax_checkers/python/py3kwarn.vim       |  33 +
 .../syntax_checkers/python/pyflakes.vim       |  70 ++
 .../syntax_checkers/python/pylama.vim         |  68 ++
 .../syntax_checkers/python/pylint.vim         |  83 +++
 .../syntax_checkers/python/python.vim         |  46 ++
 .../syntax_checkers/racket/code-ayatollah.vim |  59 ++
 .../syntax_checkers/racket/racket.vim         |  50 ++
 .../syntax_checkers/rst/rst2pseudoxml.vim     |  62 ++
 .../syntax_checkers/rst/rstcheck.vim          |  50 ++
 .../syntastic/syntax_checkers/ruby/jruby.vim  |  56 ++
 .../syntax_checkers/ruby/macruby.vim          |  46 ++
 .../syntastic/syntax_checkers/ruby/mri.vim    |  80 +++
 .../syntax_checkers/ruby/rubocop.vim          |  59 ++
 .../syntax_checkers/ruby/rubylint.vim         |  40 ++
 .../syntastic/syntax_checkers/rust/rustc.vim  |  42 ++
 .../syntastic/syntax_checkers/sass/sass.vim   |  79 ++
 .../syntastic/syntax_checkers/scala/fsc.vim   |  51 ++
 .../syntax_checkers/scala/scalac.vim          |  47 ++
 .../syntastic/syntax_checkers/scss/sass.vim   |  26 +
 .../syntax_checkers/scss/scss_lint.vim        |  37 +
 .../syntax_checkers/sh/checkbashisms.vim      |  42 ++
 .../syntastic/syntax_checkers/sh/sh.vim       |  88 +++
 .../syntax_checkers/sh/shellcheck.vim         |  44 ++
 .../syntastic/syntax_checkers/slim/slimrb.vim |  57 ++
 .../syntax_checkers/tcl/nagelfar.vim          |  43 ++
 .../syntastic/syntax_checkers/tex/chktex.vim  |  62 ++
 .../syntastic/syntax_checkers/tex/lacheck.vim |  40 ++
 .../syntax_checkers/texinfo/makeinfo.vim      |  47 ++
 .../syntax_checkers/text/atdtool.vim          |  57 ++
 .../syntax_checkers/text/language_check.vim   |  37 +
 .../syntax_checkers/twig/twiglint.vim         |  41 ++
 .../syntax_checkers/typescript/tsc.vim        |  40 ++
 .../syntastic/syntax_checkers/vala/valac.vim  |  97 +++
 .../syntax_checkers/verilog/verilator.vim     |  41 ++
 .../syntastic/syntax_checkers/vhdl/ghdl.vim   |  38 +
 .../syntastic/syntax_checkers/vim/vimlint.vim |  94 +++
 .../syntax_checkers/xhtml/jshint.vim          |  25 +
 .../syntastic/syntax_checkers/xhtml/tidy.vim  |  89 +++
 .../syntastic/syntax_checkers/xml/xmllint.vim |  52 ++
 .../syntax_checkers/xslt/xmllint.vim          |  25 +
 .../syntastic/syntax_checkers/yacc/bison.vim  |  55 ++
 .../syntastic/syntax_checkers/yaml/jsyaml.vim |  51 ++
 .../syntastic/syntax_checkers/yaml/yamlxs.vim |  77 ++
 .../syntax_checkers/z80/z80syntaxchecker.vim  |  45 ++
 .../syntastic/syntax_checkers/zpt/zptlint.vim |  51 ++
 .../syntax_checkers/zsh/shellcheck.vim        |  25 +
 .../syntastic/syntax_checkers/zsh/zsh.vim     |  38 +
 sources_non_forked/vim-snippets/README.md     |  31 +-
 update_plugins.py                             |   4 +-
 vimrcs/plugins_config.vim                     |   6 +
 193 files changed, 11942 insertions(+), 3531 deletions(-)
 delete mode 100644 sources_non_forked/pyflakes-pathogen/.gitignore
 delete mode 100644 sources_non_forked/pyflakes-pathogen/README.rst
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
 delete mode 100644 sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
 create mode 100644 sources_non_forked/syntastic/.gitignore
 create mode 100644 sources_non_forked/syntastic/CONTRIBUTING.md
 create mode 100644 sources_non_forked/syntastic/LICENCE
 create mode 100644 sources_non_forked/syntastic/README.markdown
 create mode 100644 sources_non_forked/syntastic/_assets/screenshot_1.png
 create mode 100644 sources_non_forked/syntastic/autoload/syntastic/c.vim
 create mode 100644 sources_non_forked/syntastic/autoload/syntastic/log.vim
 create mode 100644 sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
 create mode 100644 sources_non_forked/syntastic/autoload/syntastic/util.vim
 create mode 100644 sources_non_forked/syntastic/doc/syntastic.txt
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/balloons.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/checker.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/cursor.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/loclist.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/modemap.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/registry.vim
 create mode 100644 sources_non_forked/syntastic/plugin/syntastic/signs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/make.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/splint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/co/coco.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/go/go.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/go/golint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/go/govet.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/html/validator.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/html/w3.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/java/javac.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/less/less-lint.coffee
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/less/less-lint.js
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/php/php.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/compile.py
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/python.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim

diff --git a/sources_forked/peaksea/colors/peaksea.vim b/sources_forked/peaksea/colors/peaksea.vim
index b679c23c..78481e0f 100644
--- a/sources_forked/peaksea/colors/peaksea.vim
+++ b/sources_forked/peaksea/colors/peaksea.vim
@@ -294,7 +294,7 @@ elseif &background=='dark'
   hi DiffChange		guifg=NONE	guibg=#800080	gui=NONE
   hi DiffDelete		guifg=#6080f0	guibg=#202020	gui=NONE
   hi DiffText		guifg=#000000	guibg=#c0e080	gui=NONE
-  hi SignColumn		guifg=#e0e0e0	guibg=#008000	gui=NONE
+  hi SignColumn		guifg=#e0e0e0	guibg=#202020	gui=NONE
   hi IncSearch		guifg=White	guibg=DarkRed	gui=NONE
   hi StatusLineNC	guifg=#000000	guibg=#c0c0c0	gui=NONE
   hi VertSplit		guifg=#000000	guibg=#c0c0c0	gui=NONE
diff --git a/sources_non_forked/pyflakes-pathogen/.gitignore b/sources_non_forked/pyflakes-pathogen/.gitignore
deleted file mode 100644
index 0d20b648..00000000
--- a/sources_non_forked/pyflakes-pathogen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/sources_non_forked/pyflakes-pathogen/README.rst b/sources_non_forked/pyflakes-pathogen/README.rst
deleted file mode 100644
index b36ea388..00000000
--- a/sources_non_forked/pyflakes-pathogen/README.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Pyflakes
-==========
-
-This is just a manual dump of the vim pyflakes plugin from:
-http://www.vim.org/scripts/script.php?script_id=2441
-
-The purpose is to try to make this compatible with pathogen plugin. So creating
-the dir structure and hopefully this means we can just keep the norm and git
-clone the repo into the bundle directory and things will load up magically.
-
-
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst b/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
deleted file mode 100644
index 124fc3ec..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/README.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-pyflakes-vim
-============
-
-A Vim plugin for checking Python code on the fly.
-
-PyFlakes catches common Python errors like mistyping a variable name or
-accessing a local before it is bound, and also gives warnings for things like
-unused imports.
-
-pyflakes-vim uses the output from PyFlakes to highlight errors in your code.
-To locate errors quickly, use quickfix_ commands like :cc.
-
-Make sure to check vim.org_ for the latest updates.
-
-.. _pyflakes.vim: http://www.vim.org/scripts/script.php?script_id=2441
-.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
-.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
-
-Quick Installation
-------------------
-
-1. Make sure your ``.vimrc`` has::
- 
-    filetype on            " enables filetype detection
-    filetype plugin on     " enables filetype specific plugins
-
-2. Download the latest release_.
-
-3. Unzip ``pyflakes.vim`` and the ``pyflakes`` directory into
-   ``~/.vim/ftplugin/python`` (or somewhere similar on your
-   `runtime path`_ that will be sourced for Python files).
-
-.. _release: http://www.vim.org/scripts/script.php?script_id=2441
-.. _runtime path: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath' 
-
-Installation
-------------
-
-If you downloaded this from vim.org_, then just drop the contents of the zip
-file into ``~/.vim/ftplugin/python``.
-
-Otherwise, if you're running "from source," you'll need PyFlakes on your
-PYTHONPATH somewhere.  I recommend getting my PyFlakes_ fork, which retains
-column number information and has therfore has more specific error locations.
-
-.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
-.. _PyFlakes: http://github.com/kevinw/pyflakes
-
-Hacking
--------
-
-::
-
-  git clone git://github.com/kevinw/pyflakes-vim.git
-  cd pyflakes-vim
-  git clone git://github.com/kevinw/pyflakes.git
-
-Options
--------
-
-Set this option to you vimrc file to disable quickfix support::
-    
-    let g:pyflakes_use_quickfix = 0
-
-The value is set to 1 by default.
-
-TODO
-----
- * signs_ support (show warning and error icons to left of the buffer area)
- * configuration variables
- * parse or intercept useful output from the warnings module
-
-.. _signs: http://www.vim.org/htmldoc/sign.html
-
-Changelog
----------
-
-Please see http://www.vim.org/scripts/script.php?script_id=2441 for a history of
-all changes.
-
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
deleted file mode 100644
index a6e84b6a..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes.vim
+++ /dev/null
@@ -1,325 +0,0 @@
-" pyflakes.vim - A script to highlight Python code on the fly with warnings
-" from Pyflakes, a Python lint tool.
-"
-" Place this script and the accompanying pyflakes directory in
-" .vim/ftplugin/python.
-"
-" See README for additional installation and information.
-"
-" Thanks to matlib.vim for ideas/code on interactive linting.
-"
-" Maintainer: Kevin Watters <kevin.watters@gmail.com>
-" Version: 0.1
-if !has('python')
-    " exit if python is not available.
-    finish
-endif
-
-if exists("b:did_pyflakes_plugin")
-    finish " only load once
-else
-    let b:did_pyflakes_plugin = 1
-endif
-
-if !exists('g:pyflakes_builtins')
-    let g:pyflakes_builtins = []
-endif
-
-if !exists("b:did_python_init")
-    let b:did_python_init = 0
-
-    if !has('python')
-        echoerr "Error: the pyflakes.vim plugin requires Vim to be compiled with +python"
-        finish
-    endif
-
-if !exists('g:pyflakes_use_quickfix')
-    let g:pyflakes_use_quickfix = 1
-endif
-
-
-    python << EOF
-import vim
-import os.path
-import sys
-
-if sys.version_info[:2] < (2, 5):
-    raise AssertionError('Vim must be compiled with Python 2.5 or higher; you have ' + sys.version)
-
-# get the directory this script is in: the pyflakes python module should be installed there.
-scriptdir = os.path.join(os.path.dirname(vim.eval('expand("<sfile>")')), 'pyflakes')
-sys.path.insert(0, scriptdir)
-
-import ast
-from pyflakes import checker, messages
-from operator import attrgetter
-import re
-
-class loc(object):
-    def __init__(self, lineno, col=None):
-        self.lineno = lineno
-        self.col_offset = col
-
-class SyntaxError(messages.Message):
-    message = 'could not compile: %s'
-    def __init__(self, filename, lineno, col, message):
-        messages.Message.__init__(self, filename, loc(lineno, col))
-        self.message_args = (message,)
-
-class blackhole(object):
-    write = flush = lambda *a, **k: None
-
-def check(buffer):
-    filename = buffer.name
-    contents = buffer[:]
-
-    # shebang usually found at the top of the file, followed by source code encoding marker.
-    # assume everything else that follows is encoded in the encoding.
-    encoding_found = False
-    for n, line in enumerate(contents):
-        if n >= 2:
-            break
-        elif re.match(r'#.*coding[:=]\s*([-\w.]+)', line):
-            contents = ['']*(n+1) + contents[n+1:]
-            break
-
-    contents = '\n'.join(contents) + '\n'
-
-    vimenc = vim.eval('&encoding')
-    if vimenc:
-        contents = contents.decode(vimenc)
-
-    builtins = set(['__file__'])
-    try:
-        builtins.update(set(eval(vim.eval('string(g:pyflakes_builtins)'))))
-    except Exception:
-        pass
-
-    try:
-        # TODO: use warnings filters instead of ignoring stderr
-        old_stderr, sys.stderr = sys.stderr, blackhole()
-        try:
-            tree = ast.parse(contents, filename or '<unknown>')
-        finally:
-            sys.stderr = old_stderr
-    except:
-        try:
-            value = sys.exc_info()[1]
-            lineno, offset, line = value[1][1:]
-        except IndexError:
-            lineno, offset, line = 1, 0, ''
-        if line and line.endswith("\n"):
-            line = line[:-1]
-
-        return [SyntaxError(filename, lineno, offset, str(value))]
-    else:
-        # pyflakes looks to _MAGIC_GLOBALS in checker.py to see which
-        # UndefinedNames to ignore
-        old_globals = getattr(checker,' _MAGIC_GLOBALS', [])
-        checker._MAGIC_GLOBALS = set(old_globals) | builtins
-
-        w = checker.Checker(tree, filename)
-
-        checker._MAGIC_GLOBALS = old_globals
-
-        w.messages.sort(key = attrgetter('lineno'))
-        return w.messages
-
-
-def vim_quote(s):
-    return s.replace("'", "''")
-EOF
-    let b:did_python_init = 1
-endif
-
-if !b:did_python_init
-    finish
-endif
-
-au BufLeave <buffer> call s:ClearPyflakes()
-
-au BufEnter <buffer> call s:RunPyflakes()
-au InsertLeave <buffer> call s:RunPyflakes()
-au InsertEnter <buffer> call s:RunPyflakes()
-au BufWritePost <buffer> call s:RunPyflakes()
-
-au CursorHold <buffer> call s:RunPyflakes()
-au CursorHoldI <buffer> call s:RunPyflakes()
-
-au CursorHold <buffer> call s:GetPyflakesMessage()
-au CursorMoved <buffer> call s:GetPyflakesMessage()
-
-if !exists("*s:PyflakesUpdate")
-    function s:PyflakesUpdate()
-        silent call s:RunPyflakes()
-        call s:GetPyflakesMessage()
-    endfunction
-endif
-
-" Call this function in your .vimrc to update PyFlakes
-if !exists(":PyflakesUpdate")
-  command PyflakesUpdate :call s:PyflakesUpdate()
-endif
-
-" Hook common text manipulation commands to update PyFlakes
-"   TODO: is there a more general "text op" autocommand we could register
-"   for here?
-noremap <buffer><silent> dd dd:PyflakesUpdate<CR>
-noremap <buffer><silent> dw dw:PyflakesUpdate<CR>
-noremap <buffer><silent> u u:PyflakesUpdate<CR>
-noremap <buffer><silent> <C-R> <C-R>:PyflakesUpdate<CR>
-
-" WideMsg() prints [long] message up to (&columns-1) length
-" guaranteed without "Press Enter" prompt.
-if !exists("*s:WideMsg")
-    function s:WideMsg(msg)
-        let x=&ruler | let y=&showcmd
-        set noruler noshowcmd
-        redraw
-        echo strpart(a:msg, 0, &columns-1)
-        let &ruler=x | let &showcmd=y
-    endfun
-endif
-
-if !exists("*s:GetQuickFixStackCount")
-    function s:GetQuickFixStackCount()
-        let l:stack_count = 0
-        try
-            silent colder 9
-        catch /E380:/
-        endtry
-
-        try
-            for i in range(9)
-                silent cnewer
-                let l:stack_count = l:stack_count + 1
-            endfor
-        catch /E381:/
-            return l:stack_count
-        endtry
-    endfunction
-endif
-
-if !exists("*s:ActivatePyflakesQuickFixWindow")
-    function s:ActivatePyflakesQuickFixWindow()
-        try
-            silent colder 9 " go to the bottom of quickfix stack
-        catch /E380:/
-        endtry
-
-        if s:pyflakes_qf > 0
-            try
-                exe "silent cnewer " . s:pyflakes_qf
-            catch /E381:/
-                echoerr "Could not activate Pyflakes Quickfix Window."
-            endtry
-        endif
-    endfunction
-endif
-
-if !exists("*s:RunPyflakes")
-    function s:RunPyflakes()
-        highlight link PyFlakes SpellBad
-
-        if exists("b:cleared")
-            if b:cleared == 0
-                silent call s:ClearPyflakes()
-                let b:cleared = 1
-            endif
-        else
-            let b:cleared = 1
-        endif
-        
-        let b:matched = []
-        let b:matchedlines = {}
-
-        let b:qf_list = []
-        let b:qf_window_count = -1
-        
-        python << EOF
-for w in check(vim.current.buffer):
-    vim.command('let s:matchDict = {}')
-    vim.command("let s:matchDict['lineNum'] = " + str(w.lineno))
-    vim.command("let s:matchDict['message'] = '%s'" % vim_quote(w.message % w.message_args))
-    vim.command("let b:matchedlines[" + str(w.lineno) + "] = s:matchDict")
-    
-    vim.command("let l:qf_item = {}")
-    vim.command("let l:qf_item.bufnr = bufnr('%')")
-    vim.command("let l:qf_item.filename = expand('%')")
-    vim.command("let l:qf_item.lnum = %s" % str(w.lineno))
-    vim.command("let l:qf_item.text = '%s'" % vim_quote(w.message % w.message_args))
-    vim.command("let l:qf_item.type = 'E'")
-
-    if getattr(w, 'col', None) is None or isinstance(w, SyntaxError):
-        # without column information, just highlight the whole line
-        # (minus the newline)
-        vim.command(r"let s:mID = matchadd('PyFlakes', '\%" + str(w.lineno) + r"l\n\@!')")
-    else:
-        # with a column number, highlight the first keyword there
-        vim.command(r"let s:mID = matchadd('PyFlakes', '^\%" + str(w.lineno) + r"l\_.\{-}\zs\k\+\k\@!\%>" + str(w.col) + r"c')")
-
-        vim.command("let l:qf_item.vcol = 1")
-        vim.command("let l:qf_item.col = %s" % str(w.col + 1))
-
-    vim.command("call add(b:matched, s:matchDict)")
-    vim.command("call add(b:qf_list, l:qf_item)")
-EOF
-        if g:pyflakes_use_quickfix == 1
-            if exists("s:pyflakes_qf")
-                " if pyflakes quickfix window is already created, reuse it
-                call s:ActivatePyflakesQuickFixWindow()
-                call setqflist(b:qf_list, 'r')
-            else
-                " one pyflakes quickfix window for all buffer
-                call setqflist(b:qf_list, '')
-                let s:pyflakes_qf = s:GetQuickFixStackCount()
-            endif
-        endif
-
-        let b:cleared = 0
-    endfunction
-end
-
-" keep track of whether or not we are showing a message
-let b:showing_message = 0
-
-if !exists("*s:GetPyflakesMessage")
-    function s:GetPyflakesMessage()
-        let s:cursorPos = getpos(".")
-
-        " Bail if RunPyflakes hasn't been called yet.
-        if !exists('b:matchedlines')
-            return
-        endif
-
-        " if there's a message for the line the cursor is currently on, echo
-        " it to the console
-        if has_key(b:matchedlines, s:cursorPos[1])
-            let s:pyflakesMatch = get(b:matchedlines, s:cursorPos[1])
-            call s:WideMsg(s:pyflakesMatch['message'])
-            let b:showing_message = 1
-            return
-        endif
-
-        " otherwise, if we're showing a message, clear it
-        if b:showing_message == 1
-            echo
-            let b:showing_message = 0
-        endif
-    endfunction
-endif
-
-if !exists('*s:ClearPyflakes')
-    function s:ClearPyflakes()
-        let s:matches = getmatches()
-        for s:matchId in s:matches
-            if s:matchId['group'] == 'PyFlakes'
-                call matchdelete(s:matchId['id'])
-            endif
-        endfor
-        let b:matched = []
-        let b:matchedlines = {}
-        let b:cleared = 1
-    endfunction
-endif
-
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
deleted file mode 100644
index 42b8cf3c..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2005 Divmod, Inc., http://www.divmod.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/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
deleted file mode 100644
index 2a3e3165..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/NEWS.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-0.4.0 (2009-11-25):
-  - Fix reporting for certain SyntaxErrors which lack line number
-    information.
-  - Check for syntax errors more rigorously.
-  - Support checking names used with the class decorator syntax in versions
-    of Python which have it.
-  - Detect local variables which are bound but never used.
-  - Handle permission errors when trying to read source files.
-  - Handle problems with the encoding of source files.
-  - Support importing dotted names so as not to incorrectly report them as
-    redefined unused names.
-  - Support all forms of the with statement.
-  - Consider static `__all__` definitions and avoid reporting unused names
-    if the names are listed there.
-  - Fix incorrect checking of class names with respect to the names of their
-    bases in the class statement.
-  - Support the `__path__` global in `__init__.py`.
-
-0.3.0 (2009-01-30):
-  - Display more informative SyntaxError messages.
-  - Don't hang flymake with unmatched triple quotes (only report a single
-    line of source for a multiline syntax error).
-  - Recognize __builtins__ as a defined name.
-  - Improve pyflakes support for python versions 2.3-2.5
-  - Support for if-else expressions and with statements.
-  - Warn instead of error on non-existant file paths.
-  - Check for __future__ imports after other statements.
-  - Add reporting for some types of import shadowing.
-  - Improve reporting of unbound locals
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
deleted file mode 100644
index 9ac34fc0..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/README.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-pyflakes
-========
-
-This version of PyFlakes_ has been improved to use Python's newer ``ast``
-module, instead of ``compiler``. So code checking happens faster, and will stay
-up to date with new language changes.
-
-.. _PyFlakes: http://http://www.divmod.org/trac/wiki/DivmodPyflakes
-
-TODO
-----
-
-Importing several modules from the same package results in unnecessary warnings:
-
-::
-
-    import a.b
-    import a.c # Redefinition of unused "a" from line 1
-
-The following construct for defining a function differently depending on some
-condition results in a redefinition warning:
-
-::
-
-    if some_condition:
-        def foo(): do_foo()
-    else:
-        def foo(): do_bar() # redefinition of function 'foo' from line 2
-
-IDE Integration
----------------
-
-* vim: pyflakes-vim_
-
-.. _pyflakes-vim: http://github.com/kevinw/pyflakes-vim
-
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
deleted file mode 100644
index 69f3f12c..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/TODO
+++ /dev/null
@@ -1,11 +0,0 @@
- - Check for methods that override other methods except that they vary by case.
- - assign/increment + unbound local error not caught
-        def foo():
-          bar = 5
-          def meep():
-            bar += 2
-          meep()
-          print bar
-
-        print foo()
-
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
deleted file mode 100644
index 652a8f47..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-__version__ = '0.4.0'
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
deleted file mode 100644
index d52025f4..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/ast.py
+++ /dev/null
@@ -1,311 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    ast
-    ~~~
-
-    The `ast` module helps Python applications to process trees of the Python
-    abstract syntax grammar.  The abstract syntax itself might change with
-    each Python release; this module helps to find out programmatically what
-    the current grammar looks like and allows modifications of it.
-
-    An abstract syntax tree can be generated by passing `ast.PyCF_ONLY_AST` as
-    a flag to the `compile()` builtin function or by using the `parse()`
-    function from this module.  The result will be a tree of objects whose
-    classes all inherit from `ast.AST`.
-
-    A modified abstract syntax tree can be compiled into a Python code object
-    using the built-in `compile()` function.
-
-    Additionally various helper functions are provided that make working with
-    the trees simpler.  The main intention of the helper functions and this
-    module in general is to provide an easy to use interface for libraries
-    that work tightly with the python syntax (template engines for example).
-
-
-    :copyright: Copyright 2008 by Armin Ronacher.
-    :license: Python License.
-"""
-from _ast import *
-from _ast import __version__
-
-
-def parse(expr, filename='<unknown>', mode='exec'):
-    """
-    Parse an expression into an AST node.
-    Equivalent to compile(expr, filename, mode, PyCF_ONLY_AST).
-    """
-    return compile(expr, filename, mode, PyCF_ONLY_AST)
-
-
-def literal_eval(node_or_string):
-    """
-    Safely evaluate an expression node or a string containing a Python
-    expression.  The string or node provided may only consist of the following
-    Python literal structures: strings, numbers, tuples, lists, dicts, booleans,
-    and None.
-    """
-    _safe_names = {'None': None, 'True': True, 'False': False}
-    if isinstance(node_or_string, basestring):
-        node_or_string = parse(node_or_string, mode='eval')
-    if isinstance(node_or_string, Expression):
-        node_or_string = node_or_string.body
-    def _convert(node):
-        if isinstance(node, Str):
-            return node.s
-        elif isinstance(node, Num):
-            return node.n
-        elif isinstance(node, Tuple):
-            return tuple(map(_convert, node.elts))
-        elif isinstance(node, List):
-            return list(map(_convert, node.elts))
-        elif isinstance(node, Dict):
-            return dict((_convert(k), _convert(v)) for k, v
-                        in zip(node.keys, node.values))
-        elif isinstance(node, Name):
-            if node.id in _safe_names:
-                return _safe_names[node.id]
-        raise ValueError('malformed string')
-    return _convert(node_or_string)
-
-
-def dump(node, annotate_fields=True, include_attributes=False):
-    """
-    Return a formatted dump of the tree in *node*.  This is mainly useful for
-    debugging purposes.  The returned string will show the names and the values
-    for fields.  This makes the code impossible to evaluate, so if evaluation is
-    wanted *annotate_fields* must be set to False.  Attributes such as line
-    numbers and column offsets are not dumped by default.  If this is wanted,
-    *include_attributes* can be set to True.
-    """
-    def _format(node):
-        if isinstance(node, AST):
-            fields = [(a, _format(b)) for a, b in iter_fields(node)]
-            rv = '%s(%s' % (node.__class__.__name__, ', '.join(
-                ('%s=%s' % field for field in fields)
-                if annotate_fields else
-                (b for a, b in fields)
-            ))
-            if include_attributes and node._attributes:
-                rv += fields and ', ' or ' '
-                rv += ', '.join('%s=%s' % (a, _format(getattr(node, a)))
-                                for a in node._attributes)
-            return rv + ')'
-        elif isinstance(node, list):
-            return '[%s]' % ', '.join(_format(x) for x in node)
-        return repr(node)
-    if not isinstance(node, AST):
-        raise TypeError('expected AST, got %r' % node.__class__.__name__)
-    return _format(node)
-
-
-def copy_location(new_node, old_node):
-    """
-    Copy source location (`lineno` and `col_offset` attributes) from
-    *old_node* to *new_node* if possible, and return *new_node*.
-    """
-    for attr in 'lineno', 'col_offset':
-        if attr in old_node._attributes and attr in new_node._attributes \
-           and hasattr(old_node, attr):
-            setattr(new_node, attr, getattr(old_node, attr))
-    return new_node
-
-
-def fix_missing_locations(node):
-    """
-    When you compile a node tree with compile(), the compiler expects lineno and
-    col_offset attributes for every node that supports them.  This is rather
-    tedious to fill in for generated nodes, so this helper adds these attributes
-    recursively where not already set, by setting them to the values of the
-    parent node.  It works recursively starting at *node*.
-    """
-    def _fix(node, lineno, col_offset):
-        if 'lineno' in node._attributes:
-            if not hasattr(node, 'lineno'):
-                node.lineno = lineno
-            else:
-                lineno = node.lineno
-        if 'col_offset' in node._attributes:
-            if not hasattr(node, 'col_offset'):
-                node.col_offset = col_offset
-            else:
-                col_offset = node.col_offset
-        for child in iter_child_nodes(node):
-            _fix(child, lineno, col_offset)
-    _fix(node, 1, 0)
-    return node
-
-def add_col_end(node):
-    def _fix(node, next):
-        children = list(iter_child_nodes(node))
-        for i, child in enumerate(children):
-            next_offset = children[i+1].col_offset if i < len(children) else next.col_offset
-            child.col_end = next_offset
-
-
-def increment_lineno(node, n=1):
-    """
-    Increment the line number of each node in the tree starting at *node* by *n*.
-    This is useful to "move code" to a different location in a file.
-    """
-    if 'lineno' in node._attributes:
-        node.lineno = getattr(node, 'lineno', 0) + n
-    for child in walk(node):
-        if 'lineno' in child._attributes:
-            child.lineno = getattr(child, 'lineno', 0) + n
-    return node
-
-
-def iter_fields(node):
-    """
-    Yield a tuple of ``(fieldname, value)`` for each field in ``node._fields``
-    that is present on *node*.
-    """
-    if node._fields is None:
-        return
-
-    for field in node._fields:
-        try:
-            yield field, getattr(node, field)
-        except AttributeError:
-            pass
-
-
-def iter_child_nodes(node):
-    """
-    Yield all direct child nodes of *node*, that is, all fields that are nodes
-    and all items of fields that are lists of nodes.
-    """
-    for name, field in iter_fields(node):
-        if isinstance(field, AST):
-            yield field
-        elif isinstance(field, list):
-            for item in field:
-                if isinstance(item, AST):
-                    yield item
-
-
-def get_docstring(node, clean=True):
-    """
-    Return the docstring for the given node or None if no docstring can
-    be found.  If the node provided does not have docstrings a TypeError
-    will be raised.
-    """
-    if not isinstance(node, (FunctionDef, ClassDef, Module)):
-        raise TypeError("%r can't have docstrings" % node.__class__.__name__)
-    if node.body and isinstance(node.body[0], Expr) and \
-       isinstance(node.body[0].value, Str):
-        if clean:
-            import inspect
-            return inspect.cleandoc(node.body[0].value.s)
-        return node.body[0].value.s
-
-
-def walk(node):
-    """
-    Recursively yield all child nodes of *node*, in no specified order.  This is
-    useful if you only want to modify nodes in place and don't care about the
-    context.
-    """
-    from collections import deque
-    todo = deque([node])
-    while todo:
-        node = todo.popleft()
-        todo.extend(iter_child_nodes(node))
-        yield node
-
-
-class NodeVisitor(object):
-    """
-    A node visitor base class that walks the abstract syntax tree and calls a
-    visitor function for every node found.  This function may return a value
-    which is forwarded by the `visit` method.
-
-    This class is meant to be subclassed, with the subclass adding visitor
-    methods.
-
-    Per default the visitor functions for the nodes are ``'visit_'`` +
-    class name of the node.  So a `TryFinally` node visit function would
-    be `visit_TryFinally`.  This behavior can be changed by overriding
-    the `visit` method.  If no visitor function exists for a node
-    (return value `None`) the `generic_visit` visitor is used instead.
-
-    Don't use the `NodeVisitor` if you want to apply changes to nodes during
-    traversing.  For this a special visitor exists (`NodeTransformer`) that
-    allows modifications.
-    """
-
-    def visit(self, node):
-        """Visit a node."""
-        method = 'visit_' + node.__class__.__name__
-        visitor = getattr(self, method, self.generic_visit)
-        return visitor(node)
-
-    def generic_visit(self, node):
-        """Called if no explicit visitor function exists for a node."""
-        for field, value in iter_fields(node):
-            if isinstance(value, list):
-                for item in value:
-                    if isinstance(item, AST):
-                        self.visit(item)
-            elif isinstance(value, AST):
-                self.visit(value)
-
-
-class NodeTransformer(NodeVisitor):
-    """
-    A :class:`NodeVisitor` subclass that walks the abstract syntax tree and
-    allows modification of nodes.
-
-    The `NodeTransformer` will walk the AST and use the return value of the
-    visitor methods to replace or remove the old node.  If the return value of
-    the visitor method is ``None``, the node will be removed from its location,
-    otherwise it is replaced with the return value.  The return value may be the
-    original node in which case no replacement takes place.
-
-    Here is an example transformer that rewrites all occurrences of name lookups
-    (``foo``) to ``data['foo']``::
-
-       class RewriteName(NodeTransformer):
-
-           def visit_Name(self, node):
-               return copy_location(Subscript(
-                   value=Name(id='data', ctx=Load()),
-                   slice=Index(value=Str(s=node.id)),
-                   ctx=node.ctx
-               ), node)
-
-    Keep in mind that if the node you're operating on has child nodes you must
-    either transform the child nodes yourself or call the :meth:`generic_visit`
-    method for the node first.
-
-    For nodes that were part of a collection of statements (that applies to all
-    statement nodes), the visitor may also return a list of nodes rather than
-    just a single node.
-
-    Usually you use the transformer like this::
-
-       node = YourTransformer().visit(node)
-    """
-
-    def generic_visit(self, node):
-        for field, old_value in iter_fields(node):
-            old_value = getattr(node, field, None)
-            if isinstance(old_value, list):
-                new_values = []
-                for value in old_value:
-                    if isinstance(value, AST):
-                        value = self.visit(value)
-                        if value is None:
-                            continue
-                        elif not isinstance(value, AST):
-                            new_values.extend(value)
-                            continue
-                    new_values.append(value)
-                old_value[:] = new_values
-            elif isinstance(old_value, AST):
-                new_node = self.visit(old_value)
-                if new_node is None:
-                    delattr(node, field)
-                else:
-                    setattr(node, field, new_node)
-        return node
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
deleted file mode 100644
index 7c348b8d..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/checker.py
+++ /dev/null
@@ -1,625 +0,0 @@
-# -*- test-case-name: pyflakes -*-
-# (c) 2005-2010 Divmod, Inc.
-# See LICENSE file for details
-
-import __builtin__
-import os.path
-import _ast
-
-from pyflakes import messages
-
-
-# utility function to iterate over an AST node's children, adapted
-# from Python 2.6's standard ast module
-try:
-    import ast
-    iter_child_nodes = ast.iter_child_nodes
-except (ImportError, AttributeError):
-    def iter_child_nodes(node, astcls=_ast.AST):
-        """
-        Yield all direct child nodes of *node*, that is, all fields that are nodes
-        and all items of fields that are lists of nodes.
-        """
-        for name in node._fields:
-            field = getattr(node, name, None)
-            if isinstance(field, astcls):
-                yield field
-            elif isinstance(field, list):
-                for item in field:
-                    yield item
-
-
-class Binding(object):
-    """
-    Represents the binding of a value to a name.
-
-    The checker uses this to keep track of which names have been bound and
-    which names have not. See L{Assignment} for a special type of binding that
-    is checked with stricter rules.
-
-    @ivar used: pair of (L{Scope}, line-number) indicating the scope and
-                line number that this binding was last used
-    """
-
-    def __init__(self, name, source):
-        self.name = name
-        self.source = source
-        self.used = False
-
-
-    def __str__(self):
-        return self.name
-
-
-    def __repr__(self):
-        return '<%s object %r from line %r at 0x%x>' % (self.__class__.__name__,
-                                                        self.name,
-                                                        self.source.lineno,
-                                                        id(self))
-
-
-
-class UnBinding(Binding):
-    '''Created by the 'del' operator.'''
-
-
-
-class Importation(Binding):
-    """
-    A binding created by an import statement.
-
-    @ivar fullName: The complete name given to the import statement,
-        possibly including multiple dotted components.
-    @type fullName: C{str}
-    """
-    def __init__(self, name, source):
-        self.fullName = name
-        name = name.split('.')[0]
-        super(Importation, self).__init__(name, source)
-
-
-
-class Argument(Binding):
-    """
-    Represents binding a name as an argument.
-    """
-
-
-
-class Assignment(Binding):
-    """
-    Represents binding a name with an explicit assignment.
-
-    The checker will raise warnings for any Assignment that isn't used. Also,
-    the checker does not consider assignments in tuple/list unpacking to be
-    Assignments, rather it treats them as simple Bindings.
-    """
-
-
-
-class FunctionDefinition(Binding):
-    pass
-
-
-
-class ExportBinding(Binding):
-    """
-    A binding created by an C{__all__} assignment.  If the names in the list
-    can be determined statically, they will be treated as names for export and
-    additional checking applied to them.
-
-    The only C{__all__} assignment that can be recognized is one which takes
-    the value of a literal list containing literal strings.  For example::
-
-        __all__ = ["foo", "bar"]
-
-    Names which are imported and not otherwise used but appear in the value of
-    C{__all__} will not have an unused import warning reported for them.
-    """
-    def names(self):
-        """
-        Return a list of the names referenced by this binding.
-        """
-        names = []
-        if isinstance(self.source, _ast.List):
-            for node in self.source.elts:
-                if isinstance(node, _ast.Str):
-                    names.append(node.s)
-        return names
-
-
-
-class Scope(dict):
-    importStarred = False       # set to True when import * is found
-
-
-    def __repr__(self):
-        return '<%s at 0x%x %s>' % (self.__class__.__name__, id(self), dict.__repr__(self))
-
-
-    def __init__(self):
-        super(Scope, self).__init__()
-
-
-
-class ClassScope(Scope):
-    pass
-
-
-
-class FunctionScope(Scope):
-    """
-    I represent a name scope for a function.
-
-    @ivar globals: Names declared 'global' in this function.
-    """
-    def __init__(self):
-        super(FunctionScope, self).__init__()
-        self.globals = {}
-
-
-
-class ModuleScope(Scope):
-    pass
-
-
-# Globally defined names which are not attributes of the __builtin__ module.
-_MAGIC_GLOBALS = ['__file__', '__builtins__']
-
-
-
-class Checker(object):
-    """
-    I check the cleanliness and sanity of Python code.
-
-    @ivar _deferredFunctions: Tracking list used by L{deferFunction}.  Elements
-        of the list are two-tuples.  The first element is the callable passed
-        to L{deferFunction}.  The second element is a copy of the scope stack
-        at the time L{deferFunction} was called.
-
-    @ivar _deferredAssignments: Similar to C{_deferredFunctions}, but for
-        callables which are deferred assignment checks.
-    """
-
-    nodeDepth = 0
-    traceTree = False
-
-    def __init__(self, tree, filename='(none)'):
-        self._deferredFunctions = []
-        self._deferredAssignments = []
-        self.dead_scopes = []
-        self.messages = []
-        self.filename = filename
-        self.scopeStack = [ModuleScope()]
-        self.futuresAllowed = True
-        self.handleChildren(tree)
-        self._runDeferred(self._deferredFunctions)
-        # Set _deferredFunctions to None so that deferFunction will fail
-        # noisily if called after we've run through the deferred functions.
-        self._deferredFunctions = None
-        self._runDeferred(self._deferredAssignments)
-        # Set _deferredAssignments to None so that deferAssignment will fail
-        # noisly if called after we've run through the deferred assignments.
-        self._deferredAssignments = None
-        del self.scopeStack[1:]
-        self.popScope()
-        self.check_dead_scopes()
-
-
-    def deferFunction(self, callable):
-        '''
-        Schedule a function handler to be called just before completion.
-
-        This is used for handling function bodies, which must be deferred
-        because code later in the file might modify the global scope. When
-        `callable` is called, the scope at the time this is called will be
-        restored, however it will contain any new bindings added to it.
-        '''
-        self._deferredFunctions.append((callable, self.scopeStack[:]))
-
-
-    def deferAssignment(self, callable):
-        """
-        Schedule an assignment handler to be called just after deferred
-        function handlers.
-        """
-        self._deferredAssignments.append((callable, self.scopeStack[:]))
-
-
-    def _runDeferred(self, deferred):
-        """
-        Run the callables in C{deferred} using their associated scope stack.
-        """
-        for handler, scope in deferred:
-            self.scopeStack = scope
-            handler()
-
-
-    def scope(self):
-        return self.scopeStack[-1]
-    scope = property(scope)
-
-    def popScope(self):
-        self.dead_scopes.append(self.scopeStack.pop())
-
-
-    def check_dead_scopes(self):
-        """
-        Look at scopes which have been fully examined and report names in them
-        which were imported but unused.
-        """
-        for scope in self.dead_scopes:
-            export = isinstance(scope.get('__all__'), ExportBinding)
-            if export:
-                all = scope['__all__'].names()
-                if os.path.split(self.filename)[1] != '__init__.py':
-                    # Look for possible mistakes in the export list
-                    undefined = set(all) - set(scope)
-                    for name in undefined:
-                        self.report(
-                            messages.UndefinedExport,
-                            scope['__all__'].source,
-                            name)
-            else:
-                all = []
-
-            # Look for imported names that aren't used.
-            for importation in scope.itervalues():
-                if isinstance(importation, Importation):
-                    if not importation.used and importation.name not in all:
-                        self.report(
-                            messages.UnusedImport,
-                            importation.source,
-                            importation.name)
-
-
-    def pushFunctionScope(self):
-        self.scopeStack.append(FunctionScope())
-
-    def pushClassScope(self):
-        self.scopeStack.append(ClassScope())
-
-    def report(self, messageClass, *args, **kwargs):
-        self.messages.append(messageClass(self.filename, *args, **kwargs))
-
-    def handleChildren(self, tree):
-        for node in iter_child_nodes(tree):
-            self.handleNode(node, tree)
-
-    def isDocstring(self, node):
-        """
-        Determine if the given node is a docstring, as long as it is at the
-        correct place in the node tree.
-        """
-        return isinstance(node, _ast.Str) or \
-               (isinstance(node, _ast.Expr) and
-                isinstance(node.value, _ast.Str))
-
-    def handleNode(self, node, parent):
-        node.parent = parent
-        if self.traceTree:
-            print '  ' * self.nodeDepth + node.__class__.__name__
-        self.nodeDepth += 1
-        if self.futuresAllowed and not \
-               (isinstance(node, _ast.ImportFrom) or self.isDocstring(node)):
-            self.futuresAllowed = False
-        nodeType = node.__class__.__name__.upper()
-        try:
-            handler = getattr(self, nodeType)
-            handler(node)
-        finally:
-            self.nodeDepth -= 1
-        if self.traceTree:
-            print '  ' * self.nodeDepth + 'end ' + node.__class__.__name__
-
-    def ignore(self, node):
-        pass
-
-    # "stmt" type nodes
-    RETURN = DELETE = PRINT = WHILE = IF = WITH = RAISE = TRYEXCEPT = \
-        TRYFINALLY = ASSERT = EXEC = EXPR = handleChildren
-
-    CONTINUE = BREAK = PASS = ignore
-
-    # "expr" type nodes
-    BOOLOP = BINOP = UNARYOP = IFEXP = DICT = SET = YIELD = COMPARE = \
-    CALL = REPR = ATTRIBUTE = SUBSCRIPT = LIST = TUPLE = handleChildren
-
-    NUM = STR = ELLIPSIS = ignore
-
-    # "slice" type nodes
-    SLICE = EXTSLICE = INDEX = handleChildren
-
-    # expression contexts are node instances too, though being constants
-    LOAD = STORE = DEL = AUGLOAD = AUGSTORE = PARAM = ignore
-
-    # same for operators
-    AND = OR = ADD = SUB = MULT = DIV = MOD = POW = LSHIFT = RSHIFT = \
-    BITOR = BITXOR = BITAND = FLOORDIV = INVERT = NOT = UADD = USUB = \
-    EQ = NOTEQ = LT = LTE = GT = GTE = IS = ISNOT = IN = NOTIN = ignore
-
-    # additional node types
-    COMPREHENSION = EXCEPTHANDLER = KEYWORD = handleChildren
-
-    def addBinding(self, loc, value, reportRedef=True):
-        '''Called when a binding is altered.
-
-        - `loc` is the location (an object with lineno and optionally
-          col_offset attributes) of the statement responsible for the change
-        - `value` is the optional new value, a Binding instance, associated
-          with the binding; if None, the binding is deleted if it exists.
-        - if `reportRedef` is True (default), rebinding while unused will be
-          reported.
-        '''
-        if (isinstance(self.scope.get(value.name), FunctionDefinition)
-                    and isinstance(value, FunctionDefinition)):
-            self.report(messages.RedefinedFunction,
-                        loc, value.name, self.scope[value.name].source)
-
-        if not isinstance(self.scope, ClassScope):
-            for scope in self.scopeStack[::-1]:
-                existing = scope.get(value.name)
-                if (isinstance(existing, Importation)
-                        and not existing.used
-                        and (not isinstance(value, Importation) or value.fullName == existing.fullName)
-                        and reportRedef):
-
-                    self.report(messages.RedefinedWhileUnused,
-                                loc, value.name, scope[value.name].source)
-
-        if isinstance(value, UnBinding):
-            try:
-                del self.scope[value.name]
-            except KeyError:
-                self.report(messages.UndefinedName, loc, value.name)
-        else:
-            self.scope[value.name] = value
-
-    def GLOBAL(self, node):
-        """
-        Keep track of globals declarations.
-        """
-        if isinstance(self.scope, FunctionScope):
-            self.scope.globals.update(dict.fromkeys(node.names))
-
-    def LISTCOMP(self, node):
-        # handle generators before element
-        for gen in node.generators:
-            self.handleNode(gen, node)
-        self.handleNode(node.elt, node)
-
-    GENERATOREXP = SETCOMP = LISTCOMP
-
-    # dictionary comprehensions; introduced in Python 2.7
-    def DICTCOMP(self, node):
-        for gen in node.generators:
-            self.handleNode(gen, node)
-        self.handleNode(node.key, node)
-        self.handleNode(node.value, node)
-
-    def FOR(self, node):
-        """
-        Process bindings for loop variables.
-        """
-        vars = []
-        def collectLoopVars(n):
-            if isinstance(n, _ast.Name):
-                vars.append(n.id)
-            elif isinstance(n, _ast.expr_context):
-                return
-            else:
-                for c in iter_child_nodes(n):
-                    collectLoopVars(c)
-
-        collectLoopVars(node.target)
-        for varn in vars:
-            if (isinstance(self.scope.get(varn), Importation)
-                    # unused ones will get an unused import warning
-                    and self.scope[varn].used):
-                self.report(messages.ImportShadowedByLoopVar,
-                            node, varn, self.scope[varn].source)
-
-        self.handleChildren(node)
-
-    def NAME(self, node):
-        """
-        Handle occurrence of Name (which can be a load/store/delete access.)
-        """
-        # Locate the name in locals / function / globals scopes.
-        if isinstance(node.ctx, (_ast.Load, _ast.AugLoad)):
-            # try local scope
-            importStarred = self.scope.importStarred
-            try:
-                self.scope[node.id].used = (self.scope, node)
-            except KeyError:
-                pass
-            else:
-                return
-
-            # try enclosing function scopes
-
-            for scope in self.scopeStack[-2:0:-1]:
-                importStarred = importStarred or scope.importStarred
-                if not isinstance(scope, FunctionScope):
-                    continue
-                try:
-                    scope[node.id].used = (self.scope, node)
-                except KeyError:
-                    pass
-                else:
-                    return
-
-            # try global scope
-
-            importStarred = importStarred or self.scopeStack[0].importStarred
-            try:
-                self.scopeStack[0][node.id].used = (self.scope, node)
-            except KeyError:
-                if ((not hasattr(__builtin__, node.id))
-                        and node.id not in _MAGIC_GLOBALS
-                        and not importStarred):
-                    if (os.path.basename(self.filename) == '__init__.py' and
-                        node.id == '__path__'):
-                        # the special name __path__ is valid only in packages
-                        pass
-                    else:
-                        self.report(messages.UndefinedName, node, node.id)
-        elif isinstance(node.ctx, (_ast.Store, _ast.AugStore)):
-            # if the name hasn't already been defined in the current scope
-            if isinstance(self.scope, FunctionScope) and node.id not in self.scope:
-                # for each function or module scope above us
-                for scope in self.scopeStack[:-1]:
-                    if not isinstance(scope, (FunctionScope, ModuleScope)):
-                        continue
-                    # if the name was defined in that scope, and the name has
-                    # been accessed already in the current scope, and hasn't
-                    # been declared global
-                    if (node.id in scope
-                            and scope[node.id].used
-                            and scope[node.id].used[0] is self.scope
-                            and node.id not in self.scope.globals):
-                        # then it's probably a mistake
-                        self.report(messages.UndefinedLocal,
-                                    scope[node.id].used[1],
-                                    node.id,
-                                    scope[node.id].source)
-                        break
-
-            if isinstance(node.parent,
-                          (_ast.For, _ast.comprehension, _ast.Tuple, _ast.List)):
-                binding = Binding(node.id, node)
-            elif (node.id == '__all__' and
-                  isinstance(self.scope, ModuleScope)):
-                binding = ExportBinding(node.id, node.parent.value)
-            else:
-                binding = Assignment(node.id, node)
-            if node.id in self.scope:
-                binding.used = self.scope[node.id].used
-            self.addBinding(node, binding)
-        elif isinstance(node.ctx, _ast.Del):
-            if isinstance(self.scope, FunctionScope) and \
-                   node.id in self.scope.globals:
-                del self.scope.globals[node.id]
-            else:
-                self.addBinding(node, UnBinding(node.id, node))
-        else:
-            # must be a Param context -- this only happens for names in function
-            # arguments, but these aren't dispatched through here
-            raise RuntimeError(
-                "Got impossible expression context: %r" % (node.ctx,))
-
-
-    def FUNCTIONDEF(self, node):
-        # the decorators attribute is called decorator_list as of Python 2.6
-        if hasattr(node, 'decorators'):
-            for deco in node.decorators:
-                self.handleNode(deco, node)
-        else:
-            for deco in node.decorator_list:
-                self.handleNode(deco, node)
-        self.addBinding(node, FunctionDefinition(node.name, node))
-        self.LAMBDA(node)
-
-    def LAMBDA(self, node):
-        for default in node.args.defaults:
-            self.handleNode(default, node)
-
-        def runFunction():
-            args = []
-
-            def addArgs(arglist):
-                for arg in arglist:
-                    if isinstance(arg, _ast.Tuple):
-                        addArgs(arg.elts)
-                    else:
-                        if arg.id in args:
-                            self.report(messages.DuplicateArgument,
-                                        node, arg.id)
-                        args.append(arg.id)
-
-            self.pushFunctionScope()
-            addArgs(node.args.args)
-            # vararg/kwarg identifiers are not Name nodes
-            if node.args.vararg:
-                args.append(node.args.vararg)
-            if node.args.kwarg:
-                args.append(node.args.kwarg)
-            for name in args:
-                self.addBinding(node, Argument(name, node), reportRedef=False)
-            if isinstance(node.body, list):
-                # case for FunctionDefs
-                for stmt in node.body:
-                    self.handleNode(stmt, node)
-            else:
-                # case for Lambdas
-                self.handleNode(node.body, node)
-            def checkUnusedAssignments():
-                """
-                Check to see if any assignments have not been used.
-                """
-                for name, binding in self.scope.iteritems():
-                    if (not binding.used and not name in self.scope.globals
-                        and isinstance(binding, Assignment)):
-                        self.report(messages.UnusedVariable,
-                                    binding.source, name)
-            self.deferAssignment(checkUnusedAssignments)
-            self.popScope()
-
-        self.deferFunction(runFunction)
-
-
-    def CLASSDEF(self, node):
-        """
-        Check names used in a class definition, including its decorators, base
-        classes, and the body of its definition.  Additionally, add its name to
-        the current scope.
-        """
-        # decorator_list is present as of Python 2.6
-        for deco in getattr(node, 'decorator_list', []):
-            self.handleNode(deco, node)
-        for baseNode in node.bases:
-            self.handleNode(baseNode, node)
-        self.pushClassScope()
-        for stmt in node.body:
-            self.handleNode(stmt, node)
-        self.popScope()
-        self.addBinding(node, Binding(node.name, node))
-
-    def ASSIGN(self, node):
-        self.handleNode(node.value, node)
-        for target in node.targets:
-            self.handleNode(target, node)
-
-    def AUGASSIGN(self, node):
-        # AugAssign is awkward: must set the context explicitly and visit twice,
-        # once with AugLoad context, once with AugStore context
-        node.target.ctx = _ast.AugLoad()
-        self.handleNode(node.target, node)
-        self.handleNode(node.value, node)
-        node.target.ctx = _ast.AugStore()
-        self.handleNode(node.target, node)
-
-    def IMPORT(self, node):
-        for alias in node.names:
-            name = alias.asname or alias.name
-            importation = Importation(name, node)
-            self.addBinding(node, importation)
-
-    def IMPORTFROM(self, node):
-        if node.module == '__future__':
-            if not self.futuresAllowed:
-                self.report(messages.LateFutureImport, node,
-                            [n.name for n in node.names])
-        else:
-            self.futuresAllowed = False
-
-        for alias in node.names:
-            if alias.name == '*':
-                self.scope.importStarred = True
-                self.report(messages.ImportStarUsed, node, node.module)
-                continue
-            name = alias.asname or alias.name
-            importation = Importation(name, node)
-            if node.module == '__future__':
-                importation.used = (self.scope, node)
-            self.addBinding(node, importation)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
deleted file mode 100644
index 73bf4cc3..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/messages.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# (c) 2005 Divmod, Inc.  See LICENSE file for details
-
-class Message(object):
-    message = ''
-    message_args = ()
-    def __init__(self, filename, loc, use_column=True):
-        self.filename = filename
-        self.lineno = loc.lineno
-        self.col = getattr(loc, 'col_offset', None) if use_column else None
-
-    def __str__(self):
-        return '%s:%s: %s' % (self.filename, self.lineno, self.message % self.message_args)
-
-
-class UnusedImport(Message):
-    message = '%r imported but unused'
-    def __init__(self, filename, loc, name):
-        Message.__init__(self, filename, loc, use_column=False)
-        self.message_args = (name,)
-
-
-class RedefinedWhileUnused(Message):
-    message = 'redefinition of unused %r from line %r'
-    def __init__(self, filename, loc, name, orig_loc):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name, orig_loc.lineno)
-
-
-class ImportShadowedByLoopVar(Message):
-    message = 'import %r from line %r shadowed by loop variable'
-    def __init__(self, filename, loc, name, orig_loc):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name, orig_loc.lineno)
-
-
-class ImportStarUsed(Message):
-    message = "'from %s import *' used; unable to detect undefined names"
-    def __init__(self, filename, loc, modname):
-        Message.__init__(self, filename, loc)
-        self.message_args = (modname,)
-
-
-class UndefinedName(Message):
-    message = 'undefined name %r'
-    def __init__(self, filename, loc, name):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name,)
-
-
-
-class UndefinedExport(Message):
-    message = 'undefined name %r in __all__'
-    def __init__(self, filename, loc, name):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name,)
-
-
-
-class UndefinedLocal(Message):
-    message = "local variable %r (defined in enclosing scope on line %r) referenced before assignment"
-    def __init__(self, filename, loc, name, orig_loc):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name, orig_loc.lineno)
-
-
-class DuplicateArgument(Message):
-    message = 'duplicate argument %r in function definition'
-    def __init__(self, filename, loc, name):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name,)
-
-
-class RedefinedFunction(Message):
-    message = 'redefinition of function %r from line %r'
-    def __init__(self, filename, loc, name, orig_loc):
-        Message.__init__(self, filename, loc)
-        self.message_args = (name, orig_loc.lineno)
-
-
-class LateFutureImport(Message):
-    message = 'future import(s) %r after other statements'
-    def __init__(self, filename, loc, names):
-        Message.__init__(self, filename, loc)
-        self.message_args = (names,)
-
-
-class UnusedVariable(Message):
-    """
-    Indicates that a variable has been explicity assigned to but not actually
-    used.
-    """
-
-    message = 'local variable %r is assigned to but never used'
-    def __init__(self, filename, loc, names):
-        Message.__init__(self, filename, loc)
-        self.message_args = (names,)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
deleted file mode 100644
index 6b1dae22..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
+++ /dev/null
@@ -1,90 +0,0 @@
-
-"""
-Implementation of the command-line I{pyflakes} tool.
-"""
-
-import sys
-import os
-import _ast
-
-checker = __import__('pyflakes.checker').checker
-
-def check(codeString, filename):
-    """
-    Check the Python source given by C{codeString} for flakes.
-
-    @param codeString: The Python source to check.
-    @type codeString: C{str}
-
-    @param filename: The name of the file the source came from, used to report
-        errors.
-    @type filename: C{str}
-
-    @return: The number of warnings emitted.
-    @rtype: C{int}
-    """
-    # First, compile into an AST and handle syntax errors.
-    try:
-        tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST)
-    except SyntaxError, value:
-        msg = value.args[0]
-
-        (lineno, offset, text) = value.lineno, value.offset, value.text
-
-        # If there's an encoding problem with the file, the text is None.
-        if text is None:
-            # Avoid using msg, since for the only known case, it contains a
-            # bogus message that claims the encoding the file declared was
-            # unknown.
-            print >> sys.stderr, "%s: problem decoding source" % (filename, )
-        else:
-            line = text.splitlines()[-1]
-
-            if offset is not None:
-                offset = offset - (len(text) - len(line))
-
-            print >> sys.stderr, '%s:%d: %s' % (filename, lineno, msg)
-            print >> sys.stderr, line
-
-            if offset is not None:
-                print >> sys.stderr, " " * offset, "^"
-
-        return 1
-    else:
-        # Okay, it's syntactically valid.  Now check it.
-        w = checker.Checker(tree, filename)
-        w.messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
-        for warning in w.messages:
-            print warning
-        return len(w.messages)
-
-
-def checkPath(filename):
-    """
-    Check the given path, printing out any warnings detected.
-
-    @return: the number of warnings printed
-    """
-    try:
-        return check(file(filename, 'U').read() + '\n', filename)
-    except IOError, msg:
-        print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
-        return 1
-
-
-def main():
-    warnings = 0
-    args = sys.argv[1:]
-    if args:
-        for arg in args:
-            if os.path.isdir(arg):
-                for dirpath, dirnames, filenames in os.walk(arg):
-                    for filename in filenames:
-                        if filename.endswith('.py'):
-                            warnings += checkPath(os.path.join(dirpath, filename))
-            else:
-                warnings += checkPath(arg)
-    else:
-        warnings += check(sys.stdin.read(), '<stdin>')
-
-    raise SystemExit(warnings > 0)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
deleted file mode 100644
index 7cd22772..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/harness.py
+++ /dev/null
@@ -1,27 +0,0 @@
-
-import textwrap
-import _ast
-
-from twisted.trial import unittest
-
-from pyflakes import checker
-
-
-class Test(unittest.TestCase):
-
-    def flakes(self, input, *expectedOutputs, **kw):
-        ast = compile(textwrap.dedent(input), "<test>", "exec",
-                      _ast.PyCF_ONLY_AST)
-        w = checker.Checker(ast, **kw)
-        outputs = [type(o) for o in w.messages]
-        expectedOutputs = list(expectedOutputs)
-        outputs.sort()
-        expectedOutputs.sort()
-        self.assert_(outputs == expectedOutputs, '''\
-for input:
-%s
-expected outputs:
-%s
-but got:
-%s''' % (input, repr(expectedOutputs), '\n'.join([str(o) for o in w.messages])))
-        return w
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
deleted file mode 100644
index 08e4580a..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
+++ /dev/null
@@ -1,673 +0,0 @@
-
-from sys import version_info
-
-from pyflakes import messages as m
-from pyflakes.test import harness
-
-class Test(harness.Test):
-
-    def test_unusedImport(self):
-        self.flakes('import fu, bar', m.UnusedImport, m.UnusedImport)
-        self.flakes('from baz import fu, bar', m.UnusedImport, m.UnusedImport)
-
-    def test_aliasedImport(self):
-        self.flakes('import fu as FU, bar as FU', m.RedefinedWhileUnused, m.UnusedImport)
-        self.flakes('from moo import fu as FU, bar as FU', m.RedefinedWhileUnused, m.UnusedImport)
-
-    def test_usedImport(self):
-        self.flakes('import fu; print fu')
-        self.flakes('from baz import fu; print fu')
-
-    def test_redefinedWhileUnused(self):
-        self.flakes('import fu; fu = 3', m.RedefinedWhileUnused)
-        self.flakes('import fu; del fu', m.RedefinedWhileUnused)
-        self.flakes('import fu; fu, bar = 3', m.RedefinedWhileUnused)
-        self.flakes('import fu; [fu, bar] = 3', m.RedefinedWhileUnused)
-
-    def test_redefinedByFunction(self):
-        self.flakes('''
-        import fu
-        def fu():
-            pass
-        ''', m.RedefinedWhileUnused)
-
-    def test_redefinedInNestedFunction(self):
-        """
-        Test that shadowing a global name with a nested function definition
-        generates a warning.
-        """
-        self.flakes('''
-        import fu
-        def bar():
-            def baz():
-                def fu():
-                    pass
-        ''', m.RedefinedWhileUnused, m.UnusedImport)
-
-    def test_redefinedByClass(self):
-        self.flakes('''
-        import fu
-        class fu:
-            pass
-        ''', m.RedefinedWhileUnused)
-
-
-    def test_redefinedBySubclass(self):
-        """
-        If an imported name is redefined by a class statement which also uses
-        that name in the bases list, no warning is emitted.
-        """
-        self.flakes('''
-        from fu import bar
-        class bar(bar):
-            pass
-        ''')
-
-
-    def test_redefinedInClass(self):
-        """
-        Test that shadowing a global with a class attribute does not produce a
-        warning.
-        """
-        self.flakes('''
-        import fu
-        class bar:
-            fu = 1
-        print fu
-        ''')
-
-    def test_usedInFunction(self):
-        self.flakes('''
-        import fu
-        def fun():
-            print fu
-        ''')
-
-    def test_shadowedByParameter(self):
-        self.flakes('''
-        import fu
-        def fun(fu):
-            print fu
-        ''', m.UnusedImport)
-
-        self.flakes('''
-        import fu
-        def fun(fu):
-            print fu
-        print fu
-        ''')
-
-    def test_newAssignment(self):
-        self.flakes('fu = None')
-
-    def test_usedInGetattr(self):
-        self.flakes('import fu; fu.bar.baz')
-        self.flakes('import fu; "bar".fu.baz', m.UnusedImport)
-
-    def test_usedInSlice(self):
-        self.flakes('import fu; print fu.bar[1:]')
-
-    def test_usedInIfBody(self):
-        self.flakes('''
-        import fu
-        if True: print fu
-        ''')
-
-    def test_usedInIfConditional(self):
-        self.flakes('''
-        import fu
-        if fu: pass
-        ''')
-
-    def test_usedInElifConditional(self):
-        self.flakes('''
-        import fu
-        if False: pass
-        elif fu: pass
-        ''')
-
-    def test_usedInElse(self):
-        self.flakes('''
-        import fu
-        if False: pass
-        else: print fu
-        ''')
-
-    def test_usedInCall(self):
-        self.flakes('import fu; fu.bar()')
-
-    def test_usedInClass(self):
-        self.flakes('''
-        import fu
-        class bar:
-            bar = fu
-        ''')
-
-    def test_usedInClassBase(self):
-        self.flakes('''
-        import fu
-        class bar(object, fu.baz):
-            pass
-        ''')
-
-    def test_notUsedInNestedScope(self):
-        self.flakes('''
-        import fu
-        def bleh():
-            pass
-        print fu
-        ''')
-
-    def test_usedInFor(self):
-        self.flakes('''
-        import fu
-        for bar in range(9):
-            print fu
-        ''')
-
-    def test_usedInForElse(self):
-        self.flakes('''
-        import fu
-        for bar in range(10):
-            pass
-        else:
-            print fu
-        ''')
-
-    def test_redefinedByFor(self):
-        self.flakes('''
-        import fu
-        for fu in range(2):
-            pass
-        ''', m.RedefinedWhileUnused)
-
-    def test_shadowedByFor(self):
-        """
-        Test that shadowing a global name with a for loop variable generates a
-        warning.
-        """
-        self.flakes('''
-        import fu
-        fu.bar()
-        for fu in ():
-            pass
-        ''', m.ImportShadowedByLoopVar)
-
-    def test_shadowedByForDeep(self):
-        """
-        Test that shadowing a global name with a for loop variable nested in a
-        tuple unpack generates a warning.
-        """
-        self.flakes('''
-        import fu
-        fu.bar()
-        for (x, y, z, (a, b, c, (fu,))) in ():
-            pass
-        ''', m.ImportShadowedByLoopVar)
-
-    def test_usedInReturn(self):
-        self.flakes('''
-        import fu
-        def fun():
-            return fu
-        ''')
-
-    def test_usedInOperators(self):
-        self.flakes('import fu; 3 + fu.bar')
-        self.flakes('import fu; 3 % fu.bar')
-        self.flakes('import fu; 3 - fu.bar')
-        self.flakes('import fu; 3 * fu.bar')
-        self.flakes('import fu; 3 ** fu.bar')
-        self.flakes('import fu; 3 / fu.bar')
-        self.flakes('import fu; 3 // fu.bar')
-        self.flakes('import fu; -fu.bar')
-        self.flakes('import fu; ~fu.bar')
-        self.flakes('import fu; 1 == fu.bar')
-        self.flakes('import fu; 1 | fu.bar')
-        self.flakes('import fu; 1 & fu.bar')
-        self.flakes('import fu; 1 ^ fu.bar')
-        self.flakes('import fu; 1 >> fu.bar')
-        self.flakes('import fu; 1 << fu.bar')
-
-    def test_usedInAssert(self):
-        self.flakes('import fu; assert fu.bar')
-
-    def test_usedInSubscript(self):
-        self.flakes('import fu; fu.bar[1]')
-
-    def test_usedInLogic(self):
-        self.flakes('import fu; fu and False')
-        self.flakes('import fu; fu or False')
-        self.flakes('import fu; not fu.bar')
-
-    def test_usedInList(self):
-        self.flakes('import fu; [fu]')
-
-    def test_usedInTuple(self):
-        self.flakes('import fu; (fu,)')
-
-    def test_usedInTry(self):
-        self.flakes('''
-        import fu
-        try: fu
-        except: pass
-        ''')
-
-    def test_usedInExcept(self):
-        self.flakes('''
-        import fu
-        try: fu
-        except: pass
-        ''')
-
-    def test_redefinedByExcept(self):
-        self.flakes('''
-        import fu
-        try: pass
-        except Exception, fu: pass
-        ''', m.RedefinedWhileUnused)
-
-    def test_usedInRaise(self):
-        self.flakes('''
-        import fu
-        raise fu.bar
-        ''')
-
-    def test_usedInYield(self):
-        self.flakes('''
-        import fu
-        def gen():
-            yield fu
-        ''')
-
-    def test_usedInDict(self):
-        self.flakes('import fu; {fu:None}')
-        self.flakes('import fu; {1:fu}')
-
-    def test_usedInParameterDefault(self):
-        self.flakes('''
-        import fu
-        def f(bar=fu):
-            pass
-        ''')
-
-    def test_usedInAttributeAssign(self):
-        self.flakes('import fu; fu.bar = 1')
-
-    def test_usedInKeywordArg(self):
-        self.flakes('import fu; fu.bar(stuff=fu)')
-
-    def test_usedInAssignment(self):
-        self.flakes('import fu; bar=fu')
-        self.flakes('import fu; n=0; n+=fu')
-
-    def test_usedInListComp(self):
-        self.flakes('import fu; [fu for _ in range(1)]')
-        self.flakes('import fu; [1 for _ in range(1) if fu]')
-
-    def test_redefinedByListComp(self):
-        self.flakes('import fu; [1 for fu in range(1)]', m.RedefinedWhileUnused)
-
-
-    def test_usedInTryFinally(self):
-        self.flakes('''
-        import fu
-        try: pass
-        finally: fu
-        ''')
-
-        self.flakes('''
-        import fu
-        try: fu
-        finally: pass
-        ''')
-
-    def test_usedInWhile(self):
-        self.flakes('''
-        import fu
-        while 0:
-            fu
-        ''')
-
-        self.flakes('''
-        import fu
-        while fu: pass
-        ''')
-
-    def test_usedInGlobal(self):
-        self.flakes('''
-        import fu
-        def f(): global fu
-        ''', m.UnusedImport)
-
-    def test_usedInBackquote(self):
-        self.flakes('import fu; `fu`')
-
-    def test_usedInExec(self):
-        self.flakes('import fu; exec "print 1" in fu.bar')
-
-    def test_usedInLambda(self):
-        self.flakes('import fu; lambda: fu')
-
-    def test_shadowedByLambda(self):
-        self.flakes('import fu; lambda fu: fu', m.UnusedImport)
-
-    def test_usedInSliceObj(self):
-        self.flakes('import fu; "meow"[::fu]')
-
-    def test_unusedInNestedScope(self):
-        self.flakes('''
-        def bar():
-            import fu
-        fu
-        ''', m.UnusedImport, m.UndefinedName)
-
-    def test_methodsDontUseClassScope(self):
-        self.flakes('''
-        class bar:
-            import fu
-            def fun(self):
-                fu
-        ''', m.UnusedImport, m.UndefinedName)
-
-    def test_nestedFunctionsNestScope(self):
-        self.flakes('''
-        def a():
-            def b():
-                fu
-            import fu
-        ''')
-
-    def test_nestedClassAndFunctionScope(self):
-        self.flakes('''
-        def a():
-            import fu
-            class b:
-                def c(self):
-                    print fu
-        ''')
-
-    def test_importStar(self):
-        self.flakes('from fu import *', m.ImportStarUsed)
-
-
-    def test_packageImport(self):
-        """
-        If a dotted name is imported and used, no warning is reported.
-        """
-        self.flakes('''
-        import fu.bar
-        fu.bar
-        ''')
-
-
-    def test_unusedPackageImport(self):
-        """
-        If a dotted name is imported and not used, an unused import warning is
-        reported.
-        """
-        self.flakes('import fu.bar', m.UnusedImport)
-
-
-    def test_duplicateSubmoduleImport(self):
-        """
-        If a submodule of a package is imported twice, an unused import warning
-        and a redefined while unused warning are reported.
-        """
-        self.flakes('''
-        import fu.bar, fu.bar
-        fu.bar
-        ''', m.RedefinedWhileUnused)
-        self.flakes('''
-        import fu.bar
-        import fu.bar
-        fu.bar
-        ''', m.RedefinedWhileUnused)
-
-
-    def test_differentSubmoduleImport(self):
-        """
-        If two different submodules of a package are imported, no duplicate
-        import warning is reported for the package.
-        """
-        self.flakes('''
-        import fu.bar, fu.baz
-        fu.bar, fu.baz
-        ''')
-        self.flakes('''
-        import fu.bar
-        import fu.baz
-        fu.bar, fu.baz
-        ''')
-
-    def test_assignRHSFirst(self):
-        self.flakes('import fu; fu = fu')
-        self.flakes('import fu; fu, bar = fu')
-        self.flakes('import fu; [fu, bar] = fu')
-        self.flakes('import fu; fu += fu')
-
-    def test_tryingMultipleImports(self):
-        self.flakes('''
-        try:
-            import fu
-        except ImportError:
-            import bar as fu
-        ''')
-    test_tryingMultipleImports.todo = ''
-
-    def test_nonGlobalDoesNotRedefine(self):
-        self.flakes('''
-        import fu
-        def a():
-            fu = 3
-            return fu
-        fu
-        ''')
-
-    def test_functionsRunLater(self):
-        self.flakes('''
-        def a():
-            fu
-        import fu
-        ''')
-
-    def test_functionNamesAreBoundNow(self):
-        self.flakes('''
-        import fu
-        def fu():
-            fu
-        fu
-        ''', m.RedefinedWhileUnused)
-
-    def test_ignoreNonImportRedefinitions(self):
-        self.flakes('a = 1; a = 2')
-
-    def test_importingForImportError(self):
-        self.flakes('''
-        try:
-            import fu
-        except ImportError:
-            pass
-        ''')
-    test_importingForImportError.todo = ''
-
-    def test_importedInClass(self):
-        '''Imports in class scope can be used through self'''
-        self.flakes('''
-        class c:
-            import i
-            def __init__(self):
-                self.i
-        ''')
-    test_importedInClass.todo = 'requires evaluating attribute access'
-
-    def test_futureImport(self):
-        '''__future__ is special'''
-        self.flakes('from __future__ import division')
-        self.flakes('''
-        "docstring is allowed before future import"
-        from __future__ import division
-        ''')
-
-    def test_futureImportFirst(self):
-        """
-        __future__ imports must come before anything else.
-        """
-        self.flakes('''
-        x = 5
-        from __future__ import division
-        ''', m.LateFutureImport)
-        self.flakes('''
-        from foo import bar
-        from __future__ import division
-        bar
-        ''', m.LateFutureImport)
-
-
-
-class TestSpecialAll(harness.Test):
-    """
-    Tests for suppression of unused import warnings by C{__all__}.
-    """
-    def test_ignoredInFunction(self):
-        """
-        An C{__all__} definition does not suppress unused import warnings in a
-        function scope.
-        """
-        self.flakes('''
-        def foo():
-            import bar
-            __all__ = ["bar"]
-        ''', m.UnusedImport, m.UnusedVariable)
-
-
-    def test_ignoredInClass(self):
-        """
-        An C{__all__} definition does not suppress unused import warnings in a
-        class scope.
-        """
-        self.flakes('''
-        class foo:
-            import bar
-            __all__ = ["bar"]
-        ''', m.UnusedImport)
-
-
-    def test_warningSuppressed(self):
-        """
-        If a name is imported and unused but is named in C{__all__}, no warning
-        is reported.
-        """
-        self.flakes('''
-        import foo
-        __all__ = ["foo"]
-        ''')
-
-
-    def test_unrecognizable(self):
-        """
-        If C{__all__} is defined in a way that can't be recognized statically,
-        it is ignored.
-        """
-        self.flakes('''
-        import foo
-        __all__ = ["f" + "oo"]
-        ''', m.UnusedImport)
-        self.flakes('''
-        import foo
-        __all__ = [] + ["foo"]
-        ''', m.UnusedImport)
-
-
-    def test_unboundExported(self):
-        """
-        If C{__all__} includes a name which is not bound, a warning is emitted.
-        """
-        self.flakes('''
-        __all__ = ["foo"]
-        ''', m.UndefinedExport)
-
-        # Skip this in __init__.py though, since the rules there are a little
-        # different.
-        for filename in ["foo/__init__.py", "__init__.py"]:
-            self.flakes('''
-            __all__ = ["foo"]
-            ''', filename=filename)
-
-
-    def test_usedInGenExp(self):
-        """
-        Using a global in a generator expression results in no warnings.
-        """
-        self.flakes('import fu; (fu for _ in range(1))')
-        self.flakes('import fu; (1 for _ in range(1) if fu)')
-
-
-    def test_redefinedByGenExp(self):
-        """
-        Re-using a global name as the loop variable for a generator
-        expression results in a redefinition warning.
-        """
-        self.flakes('import fu; (1 for fu in range(1))', m.RedefinedWhileUnused)
-
-
-    def test_usedAsDecorator(self):
-        """
-        Using a global name in a decorator statement results in no warnings,
-        but using an undefined name in a decorator statement results in an
-        undefined name warning.
-        """
-        self.flakes('''
-        from interior import decorate
-        @decorate
-        def f():
-            return "hello"
-        ''')
-
-        self.flakes('''
-        from interior import decorate
-        @decorate('value')
-        def f():
-            return "hello"
-        ''')
-
-        self.flakes('''
-        @decorate
-        def f():
-            return "hello"
-        ''', m.UndefinedName)
-
-
-class Python26Tests(harness.Test):
-    """
-    Tests for checking of syntax which is valid in PYthon 2.6 and newer.
-    """
-    if version_info < (2, 6):
-        skip = "Python 2.6 required for class decorator tests."
-
-
-    def test_usedAsClassDecorator(self):
-        """
-        Using an imported name as a class decorator results in no warnings,
-        but using an undefined name as a class decorator results in an
-        undefined name warning.
-        """
-        self.flakes('''
-        from interior import decorate
-        @decorate
-        class foo:
-            pass
-        ''')
-
-        self.flakes('''
-        from interior import decorate
-        @decorate("foo")
-        class bar:
-            pass
-        ''')
-
-        self.flakes('''
-        @decorate
-        class foo:
-            pass
-        ''', m.UndefinedName)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
deleted file mode 100644
index 2b7723ce..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_other.py
+++ /dev/null
@@ -1,575 +0,0 @@
-# (c) 2005-2010 Divmod, Inc.
-# See LICENSE file for details
-
-"""
-Tests for various Pyflakes behavior.
-"""
-
-from sys import version_info
-
-from pyflakes import messages as m
-from pyflakes.test import harness
-
-
-class Test(harness.Test):
-
-    def test_duplicateArgs(self):
-        self.flakes('def fu(bar, bar): pass', m.DuplicateArgument)
-
-    def test_localReferencedBeforeAssignment(self):
-        self.flakes('''
-        a = 1
-        def f():
-            a; a=1
-        f()
-        ''', m.UndefinedName)
-    test_localReferencedBeforeAssignment.todo = 'this requires finding all assignments in the function body first'
-
-    def test_redefinedFunction(self):
-        """
-        Test that shadowing a function definition with another one raises a
-        warning.
-        """
-        self.flakes('''
-        def a(): pass
-        def a(): pass
-        ''', m.RedefinedFunction)
-
-    def test_redefinedClassFunction(self):
-        """
-        Test that shadowing a function definition in a class suite with another
-        one raises a warning.
-        """
-        self.flakes('''
-        class A:
-            def a(): pass
-            def a(): pass
-        ''', m.RedefinedFunction)
-
-    def test_functionDecorator(self):
-        """
-        Test that shadowing a function definition with a decorated version of
-        that function does not raise a warning.
-        """
-        self.flakes('''
-        from somewhere import somedecorator
-
-        def a(): pass
-        a = somedecorator(a)
-        ''')
-
-    def test_classFunctionDecorator(self):
-        """
-        Test that shadowing a function definition in a class suite with a
-        decorated version of that function does not raise a warning.
-        """
-        self.flakes('''
-        class A:
-            def a(): pass
-            a = classmethod(a)
-        ''')
-
-    def test_unaryPlus(self):
-        '''Don't die on unary +'''
-        self.flakes('+1')
-
-
-    def test_undefinedBaseClass(self):
-        """
-        If a name in the base list of a class definition is undefined, a
-        warning is emitted.
-        """
-        self.flakes('''
-        class foo(foo):
-            pass
-        ''', m.UndefinedName)
-
-
-    def test_classNameUndefinedInClassBody(self):
-        """
-        If a class name is used in the body of that class's definition and
-        the name is not already defined, a warning is emitted.
-        """
-        self.flakes('''
-        class foo:
-            foo
-        ''', m.UndefinedName)
-
-
-    def test_classNameDefinedPreviously(self):
-        """
-        If a class name is used in the body of that class's definition and
-        the name was previously defined in some other way, no warning is
-        emitted.
-        """
-        self.flakes('''
-        foo = None
-        class foo:
-            foo
-        ''')
-
-
-    def test_comparison(self):
-        """
-        If a defined name is used on either side of any of the six comparison
-        operators, no warning is emitted.
-        """
-        self.flakes('''
-        x = 10
-        y = 20
-        x < y
-        x <= y
-        x == y
-        x != y
-        x >= y
-        x > y
-        ''')
-
-
-    def test_identity(self):
-        """
-        If a deefined name is used on either side of an identity test, no
-        warning is emitted.
-        """
-        self.flakes('''
-        x = 10
-        y = 20
-        x is y
-        x is not y
-        ''')
-
-
-    def test_containment(self):
-        """
-        If a defined name is used on either side of a containment test, no
-        warning is emitted.
-        """
-        self.flakes('''
-        x = 10
-        y = 20
-        x in y
-        x not in y
-        ''')
-
-
-    def test_loopControl(self):
-        """
-        break and continue statements are supported.
-        """
-        self.flakes('''
-        for x in [1, 2]:
-            break
-        ''')
-        self.flakes('''
-        for x in [1, 2]:
-            continue
-        ''')
-
-
-    def test_ellipsis(self):
-        """
-        Ellipsis in a slice is supported.
-        """
-        self.flakes('''
-        [1, 2][...]
-        ''')
-
-
-    def test_extendedSlice(self):
-        """
-        Extended slices are supported.
-        """
-        self.flakes('''
-        x = 3
-        [1, 2][x,:]
-        ''')
-
-
-
-class TestUnusedAssignment(harness.Test):
-    """
-    Tests for warning about unused assignments.
-    """
-
-    def test_unusedVariable(self):
-        """
-        Warn when a variable in a function is assigned a value that's never
-        used.
-        """
-        self.flakes('''
-        def a():
-            b = 1
-        ''', m.UnusedVariable)
-
-
-    def test_assignToGlobal(self):
-        """
-        Assigning to a global and then not using that global is perfectly
-        acceptable. Do not mistake it for an unused local variable.
-        """
-        self.flakes('''
-        b = 0
-        def a():
-            global b
-            b = 1
-        ''')
-
-
-    def test_assignToMember(self):
-        """
-        Assigning to a member of another object and then not using that member
-        variable is perfectly acceptable. Do not mistake it for an unused
-        local variable.
-        """
-        # XXX: Adding this test didn't generate a failure. Maybe not
-        # necessary?
-        self.flakes('''
-        class b:
-            pass
-        def a():
-            b.foo = 1
-        ''')
-
-
-    def test_assignInForLoop(self):
-        """
-        Don't warn when a variable in a for loop is assigned to but not used.
-        """
-        self.flakes('''
-        def f():
-            for i in range(10):
-                pass
-        ''')
-
-
-    def test_assignInListComprehension(self):
-        """
-        Don't warn when a variable in a list comprehension is assigned to but
-        not used.
-        """
-        self.flakes('''
-        def f():
-            [None for i in range(10)]
-        ''')
-
-
-    def test_generatorExpression(self):
-        """
-        Don't warn when a variable in a generator expression is assigned to but not used.
-        """
-        self.flakes('''
-        def f():
-            (None for i in range(10))
-        ''')
-
-
-    def test_assignmentInsideLoop(self):
-        """
-        Don't warn when a variable assignment occurs lexically after its use.
-        """
-        self.flakes('''
-        def f():
-            x = None
-            for i in range(10):
-                if i > 2:
-                    return x
-                x = i * 2
-        ''')
-
-
-    def test_tupleUnpacking(self):
-        """
-        Don't warn when a variable included in tuple unpacking is unused. It's
-        very common for variables in a tuple unpacking assignment to be unused
-        in good Python code, so warning will only create false positives.
-        """
-        self.flakes('''
-        def f():
-            (x, y) = 1, 2
-        ''')
-
-
-    def test_listUnpacking(self):
-        """
-        Don't warn when a variable included in list unpacking is unused.
-        """
-        self.flakes('''
-        def f():
-            [x, y] = [1, 2]
-        ''')
-
-
-    def test_closedOver(self):
-        """
-        Don't warn when the assignment is used in an inner function.
-        """
-        self.flakes('''
-        def barMaker():
-            foo = 5
-            def bar():
-                return foo
-            return bar
-        ''')
-
-
-    def test_doubleClosedOver(self):
-        """
-        Don't warn when the assignment is used in an inner function, even if
-        that inner function itself is in an inner function.
-        """
-        self.flakes('''
-        def barMaker():
-            foo = 5
-            def bar():
-                def baz():
-                    return foo
-            return bar
-        ''')
-
-
-
-class Python25Test(harness.Test):
-    """
-    Tests for checking of syntax only available in Python 2.5 and newer.
-    """
-    if version_info < (2, 5):
-        skip = "Python 2.5 required for if-else and with tests"
-
-    def test_ifexp(self):
-        """
-        Test C{foo if bar else baz} statements.
-        """
-        self.flakes("a = 'moo' if True else 'oink'")
-        self.flakes("a = foo if True else 'oink'", m.UndefinedName)
-        self.flakes("a = 'moo' if True else bar", m.UndefinedName)
-
-
-    def test_withStatementNoNames(self):
-        """
-        No warnings are emitted for using inside or after a nameless C{with}
-        statement a name defined beforehand.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        bar = None
-        with open("foo"):
-            bar
-        bar
-        ''')
-
-    def test_withStatementSingleName(self):
-        """
-        No warnings are emitted for using a name defined by a C{with} statement
-        within the suite or afterwards.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with open('foo') as bar:
-            bar
-        bar
-        ''')
-
-
-    def test_withStatementAttributeName(self):
-        """
-        No warnings are emitted for using an attribute as the target of a
-        C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        import foo
-        with open('foo') as foo.bar:
-            pass
-        ''')
-
-
-    def test_withStatementSubscript(self):
-        """
-        No warnings are emitted for using a subscript as the target of a
-        C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        import foo
-        with open('foo') as foo[0]:
-            pass
-        ''')
-
-
-    def test_withStatementSubscriptUndefined(self):
-        """
-        An undefined name warning is emitted if the subscript used as the
-        target of a C{with} statement is not defined.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        import foo
-        with open('foo') as foo[bar]:
-            pass
-        ''', m.UndefinedName)
-
-
-    def test_withStatementTupleNames(self):
-        """
-        No warnings are emitted for using any of the tuple of names defined by
-        a C{with} statement within the suite or afterwards.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with open('foo') as (bar, baz):
-            bar, baz
-        bar, baz
-        ''')
-
-
-    def test_withStatementListNames(self):
-        """
-        No warnings are emitted for using any of the list of names defined by a
-        C{with} statement within the suite or afterwards.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with open('foo') as [bar, baz]:
-            bar, baz
-        bar, baz
-        ''')
-
-
-    def test_withStatementComplicatedTarget(self):
-        """
-        If the target of a C{with} statement uses any or all of the valid forms
-        for that part of the grammar (See
-        U{http://docs.python.org/reference/compound_stmts.html#the-with-statement}),
-        the names involved are checked both for definedness and any bindings
-        created are respected in the suite of the statement and afterwards.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        c = d = e = g = h = i = None
-        with open('foo') as [(a, b), c[d], e.f, g[h:i]]:
-            a, b, c, d, e, g, h, i
-        a, b, c, d, e, g, h, i
-        ''')
-
-
-    def test_withStatementSingleNameUndefined(self):
-        """
-        An undefined name warning is emitted if the name first defined by a
-        C{with} statement is used before the C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        bar
-        with open('foo') as bar:
-            pass
-        ''', m.UndefinedName)
-
-
-    def test_withStatementTupleNamesUndefined(self):
-        """
-        An undefined name warning is emitted if a name first defined by a the
-        tuple-unpacking form of the C{with} statement is used before the
-        C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        baz
-        with open('foo') as (bar, baz):
-            pass
-        ''', m.UndefinedName)
-
-
-    def test_withStatementSingleNameRedefined(self):
-        """
-        A redefined name warning is emitted if a name bound by an import is
-        rebound by the name defined by a C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        import bar
-        with open('foo') as bar:
-            pass
-        ''', m.RedefinedWhileUnused)
-
-
-    def test_withStatementTupleNamesRedefined(self):
-        """
-        A redefined name warning is emitted if a name bound by an import is
-        rebound by one of the names defined by the tuple-unpacking form of a
-        C{with} statement.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        import bar
-        with open('foo') as (bar, baz):
-            pass
-        ''', m.RedefinedWhileUnused)
-
-
-    def test_withStatementUndefinedInside(self):
-        """
-        An undefined name warning is emitted if a name is used inside the
-        body of a C{with} statement without first being bound.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with open('foo') as bar:
-            baz
-        ''', m.UndefinedName)
-
-
-    def test_withStatementNameDefinedInBody(self):
-        """
-        A name defined in the body of a C{with} statement can be used after
-        the body ends without warning.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with open('foo') as bar:
-            baz = 10
-        baz
-        ''')
-
-
-    def test_withStatementUndefinedInExpression(self):
-        """
-        An undefined name warning is emitted if a name in the I{test}
-        expression of a C{with} statement is undefined.
-        """
-        self.flakes('''
-        from __future__ import with_statement
-        with bar as baz:
-            pass
-        ''', m.UndefinedName)
-
-        self.flakes('''
-        from __future__ import with_statement
-        with bar as bar:
-            pass
-        ''', m.UndefinedName)
-
-
-
-class Python27Test(harness.Test):
-    """
-    Tests for checking of syntax only available in Python 2.7 and newer.
-    """
-    if version_info < (2, 7):
-        skip = "Python 2.7 required for dict/set comprehension tests"
-
-    def test_dictComprehension(self):
-        """
-        Dict comprehensions are properly handled.
-        """
-        self.flakes('''
-        a = {1: x for x in range(10)}
-        ''')
-
-    def test_setComprehensionAndLiteral(self):
-        """
-        Set comprehensions are properly handled.
-        """
-        self.flakes('''
-        a = {1, 2, 3}
-        b = {x for x in range(10)}
-        ''')
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
deleted file mode 100644
index 233e59ed..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_script.py
+++ /dev/null
@@ -1,185 +0,0 @@
-
-"""
-Tests for L{pyflakes.scripts.pyflakes}.
-"""
-
-import sys
-from StringIO import StringIO
-
-from twisted.python.filepath import FilePath
-from twisted.trial.unittest import TestCase
-
-from pyflakes.scripts.pyflakes import checkPath
-
-def withStderrTo(stderr, f):
-    """
-    Call C{f} with C{sys.stderr} redirected to C{stderr}.
-    """
-    (outer, sys.stderr) = (sys.stderr, stderr)
-    try:
-        return f()
-    finally:
-        sys.stderr = outer
-
-
-
-class CheckTests(TestCase):
-    """
-    Tests for L{check} and L{checkPath} which check a file for flakes.
-    """
-    def test_missingTrailingNewline(self):
-        """
-        Source which doesn't end with a newline shouldn't cause any
-        exception to be raised nor an error indicator to be returned by
-        L{check}.
-        """
-        fName = self.mktemp()
-        FilePath(fName).setContent("def foo():\n\tpass\n\t")
-        self.assertFalse(checkPath(fName))
-
-
-    def test_checkPathNonExisting(self):
-        """
-        L{checkPath} handles non-existing files.
-        """
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath('extremo'))
-        self.assertEquals(err.getvalue(), 'extremo: No such file or directory\n')
-        self.assertEquals(count, 1)
-
-
-    def test_multilineSyntaxError(self):
-        """
-        Source which includes a syntax error which results in the raised
-        L{SyntaxError.text} containing multiple lines of source are reported
-        with only the last line of that source.
-        """
-        source = """\
-def foo():
-    '''
-
-def bar():
-    pass
-
-def baz():
-    '''quux'''
-"""
-
-        # Sanity check - SyntaxError.text should be multiple lines, if it
-        # isn't, something this test was unprepared for has happened.
-        def evaluate(source):
-            exec source
-        exc = self.assertRaises(SyntaxError, evaluate, source)
-        self.assertTrue(exc.text.count('\n') > 1)
-
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent(source)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEqual(count, 1)
-
-        self.assertEqual(
-            err.getvalue(),
-            """\
-%s:8: invalid syntax
-    '''quux'''
-           ^
-""" % (sourcePath.path,))
-
-
-    def test_eofSyntaxError(self):
-        """
-        The error reported for source files which end prematurely causing a
-        syntax error reflects the cause for the syntax error.
-        """
-        source = "def foo("
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent(source)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEqual(count, 1)
-        self.assertEqual(
-            err.getvalue(),
-            """\
-%s:1: unexpected EOF while parsing
-def foo(
-         ^
-""" % (sourcePath.path,))
-
-
-    def test_nonDefaultFollowsDefaultSyntaxError(self):
-        """
-        Source which has a non-default argument following a default argument
-        should include the line number of the syntax error.  However these
-        exceptions do not include an offset.
-        """
-        source = """\
-def foo(bar=baz, bax):
-    pass
-"""
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent(source)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEqual(count, 1)
-        self.assertEqual(
-            err.getvalue(),
-            """\
-%s:1: non-default argument follows default argument
-def foo(bar=baz, bax):
-""" % (sourcePath.path,))
-
-
-    def test_nonKeywordAfterKeywordSyntaxError(self):
-        """
-        Source which has a non-keyword argument after a keyword argument should
-        include the line number of the syntax error.  However these exceptions
-        do not include an offset.
-        """
-        source = """\
-foo(bar=baz, bax)
-"""
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent(source)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEqual(count, 1)
-        self.assertEqual(
-            err.getvalue(),
-            """\
-%s:1: non-keyword arg after keyword arg
-foo(bar=baz, bax)
-""" % (sourcePath.path,))
-
-
-    def test_permissionDenied(self):
-        """
-        If the a source file is not readable, this is reported on standard
-        error.
-        """
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent('')
-        sourcePath.chmod(0)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEquals(count, 1)
-        self.assertEquals(
-            err.getvalue(), "%s: Permission denied\n" % (sourcePath.path,))
-
-
-    def test_misencodedFile(self):
-        """
-        If a source file contains bytes which cannot be decoded, this is
-        reported on stderr.
-        """
-        source = u"""\
-# coding: ascii
-x = "\N{SNOWMAN}"
-""".encode('utf-8')
-        sourcePath = FilePath(self.mktemp())
-        sourcePath.setContent(source)
-        err = StringIO()
-        count = withStderrTo(err, lambda: checkPath(sourcePath.path))
-        self.assertEquals(count, 1)
-        self.assertEquals(
-            err.getvalue(), "%s: problem decoding source\n" % (sourcePath.path,))
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
deleted file mode 100644
index 309f0b9f..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
+++ /dev/null
@@ -1,265 +0,0 @@
-
-from _ast import PyCF_ONLY_AST
-
-from twisted.trial.unittest import TestCase
-
-from pyflakes import messages as m, checker
-from pyflakes.test import harness
-
-
-class Test(harness.Test):
-    def test_undefined(self):
-        self.flakes('bar', m.UndefinedName)
-
-    def test_definedInListComp(self):
-        self.flakes('[a for a in range(10) if a]')
-
-
-    def test_functionsNeedGlobalScope(self):
-        self.flakes('''
-        class a:
-            def b():
-                fu
-        fu = 1
-        ''')
-
-    def test_builtins(self):
-        self.flakes('range(10)')
-
-
-    def test_magicGlobalsFile(self):
-        """
-        Use of the C{__file__} magic global should not emit an undefined name
-        warning.
-        """
-        self.flakes('__file__')
-
-
-    def test_magicGlobalsBuiltins(self):
-        """
-        Use of the C{__builtins__} magic global should not emit an undefined
-        name warning.
-        """
-        self.flakes('__builtins__')
-
-
-    def test_magicGlobalsName(self):
-        """
-        Use of the C{__name__} magic global should not emit an undefined name
-        warning.
-        """
-        self.flakes('__name__')
-
-
-    def test_magicGlobalsPath(self):
-        """
-        Use of the C{__path__} magic global should not emit an undefined name
-        warning, if you refer to it from a file called __init__.py.
-        """
-        self.flakes('__path__', m.UndefinedName)
-        self.flakes('__path__', filename='package/__init__.py')
-
-
-    def test_globalImportStar(self):
-        '''Can't find undefined names with import *'''
-        self.flakes('from fu import *; bar', m.ImportStarUsed)
-
-    def test_localImportStar(self):
-        '''A local import * still allows undefined names to be found in upper scopes'''
-        self.flakes('''
-        def a():
-            from fu import *
-        bar
-        ''', m.ImportStarUsed, m.UndefinedName)
-
-    def test_unpackedParameter(self):
-        '''Unpacked function parameters create bindings'''
-        self.flakes('''
-        def a((bar, baz)):
-            bar; baz
-        ''')
-
-    def test_definedByGlobal(self):
-        '''"global" can make an otherwise undefined name in another function defined'''
-        self.flakes('''
-        def a(): global fu; fu = 1
-        def b(): fu
-        ''')
-    test_definedByGlobal.todo = ''
-
-    def test_globalInGlobalScope(self):
-        """
-        A global statement in the global scope is ignored.
-        """
-        self.flakes('''
-        global x
-        def foo():
-            print x
-        ''', m.UndefinedName)
-
-    def test_del(self):
-        '''del deletes bindings'''
-        self.flakes('a = 1; del a; a', m.UndefinedName)
-
-    def test_delGlobal(self):
-        '''del a global binding from a function'''
-        self.flakes('''
-        a = 1
-        def f():
-            global a
-            del a
-        a
-        ''')
-
-    def test_delUndefined(self):
-        '''del an undefined name'''
-        self.flakes('del a', m.UndefinedName)
-
-    def test_globalFromNestedScope(self):
-        '''global names are available from nested scopes'''
-        self.flakes('''
-        a = 1
-        def b():
-            def c():
-                a
-        ''')
-
-    def test_laterRedefinedGlobalFromNestedScope(self):
-        """
-        Test that referencing a local name that shadows a global, before it is
-        defined, generates a warning.
-        """
-        self.flakes('''
-        a = 1
-        def fun():
-            a
-            a = 2
-            return a
-        ''', m.UndefinedLocal)
-
-    def test_laterRedefinedGlobalFromNestedScope2(self):
-        """
-        Test that referencing a local name in a nested scope that shadows a
-        global declared in an enclosing scope, before it is defined, generates
-        a warning.
-        """
-        self.flakes('''
-            a = 1
-            def fun():
-                global a
-                def fun2():
-                    a
-                    a = 2
-                    return a
-        ''', m.UndefinedLocal)
-
-
-    def test_intermediateClassScopeIgnored(self):
-        """
-        If a name defined in an enclosing scope is shadowed by a local variable
-        and the name is used locally before it is bound, an unbound local
-        warning is emitted, even if there is a class scope between the enclosing
-        scope and the local scope.
-        """
-        self.flakes('''
-        def f():
-            x = 1
-            class g:
-                def h(self):
-                    a = x
-                    x = None
-                    print x, a
-            print x
-        ''', m.UndefinedLocal)
-
-
-    def test_doubleNestingReportsClosestName(self):
-        """
-        Test that referencing a local name in a nested scope that shadows a
-        variable declared in two different outer scopes before it is defined
-        in the innermost scope generates an UnboundLocal warning which
-        refers to the nearest shadowed name.
-        """
-        exc = self.flakes('''
-            def a():
-                x = 1
-                def b():
-                    x = 2 # line 5
-                    def c():
-                        x
-                        x = 3
-                        return x
-                    return x
-                return x
-        ''', m.UndefinedLocal).messages[0]
-        self.assertEqual(exc.message_args, ('x', 5))
-
-
-    def test_laterRedefinedGlobalFromNestedScope3(self):
-        """
-        Test that referencing a local name in a nested scope that shadows a
-        global, before it is defined, generates a warning.
-        """
-        self.flakes('''
-            def fun():
-                a = 1
-                def fun2():
-                    a
-                    a = 1
-                    return a
-                return a
-        ''', m.UndefinedLocal)
-
-    def test_nestedClass(self):
-        '''nested classes can access enclosing scope'''
-        self.flakes('''
-        def f(foo):
-            class C:
-                bar = foo
-                def f(self):
-                    return foo
-            return C()
-
-        f(123).f()
-        ''')
-
-    def test_badNestedClass(self):
-        '''free variables in nested classes must bind at class creation'''
-        self.flakes('''
-        def f():
-            class C:
-                bar = foo
-            foo = 456
-            return foo
-        f()
-        ''', m.UndefinedName)
-
-    def test_definedAsStarArgs(self):
-        '''star and double-star arg names are defined'''
-        self.flakes('''
-        def f(a, *b, **c):
-            print a, b, c
-        ''')
-
-    def test_definedInGenExp(self):
-        """
-        Using the loop variable of a generator expression results in no
-        warnings.
-        """
-        self.flakes('(a for a in xrange(10) if a)')
-
-
-
-class NameTests(TestCase):
-    """
-    Tests for some extra cases of name handling.
-    """
-    def test_impossibleContext(self):
-        """
-        A Name node with an unrecognized context results in a RuntimeError being
-        raised.
-        """
-        tree = compile("x = 10", "<test>", "exec", PyCF_ONLY_AST)
-        # Make it into something unrecognizable.
-        tree.body[0].targets[0].ctx = object()
-        self.assertRaises(RuntimeError, checker.Checker, tree)
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py b/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
deleted file mode 100644
index 85073371..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/pyflakes/setup.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# (c) 2005-2009 Divmod, Inc.  See LICENSE file for details
-
-from distutils.core import setup
-
-setup(
-    name="pyflakes",
-    license="MIT",
-    version="0.4.0",
-    description="passive checker of Python programs",
-    author="Phil Frost",
-    maintainer="Moe Aboulkheir",
-    maintainer_email="moe@divmod.com",
-    url="http://www.divmod.org/trac/wiki/DivmodPyflakes",
-    packages=["pyflakes", "pyflakes.scripts", "pyflakes.test"],
-    scripts=["bin/pyflakes"],
-    long_description="""Pyflakes is program to analyze Python programs and detect various errors. It
-works by parsing the source file, not importing it, so it is safe to use on
-modules with side effects. It's also much faster.""",
-    classifiers=[
-        "Development Status :: 6 - Mature",
-        "Environment :: Console",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Topic :: Software Development",
-        "Topic :: Utilities",
-        ])
diff --git a/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff b/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
deleted file mode 100644
index ce2471f0..00000000
--- a/sources_non_forked/pyflakes-pathogen/ftplugin/python/quickfix.diff
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/README.rst b/README.rst
-index 5f8467f..acff657 100644
---- a/README.rst
-+++ b/README.rst
-@@ -8,11 +8,13 @@ accessing a local before it is bound, and also gives warnings for things like
- unused imports.
- 
- pyflakes-vim uses the output from PyFlakes to highlight errors in your code.
-+To locate errors quickly, use quickfix_ commands:
- 
- Make sure to check vim.org_ for the latest updates.
- 
- .. _pyflakes.vim: http://www.vim.org/scripts/script.php?script_id=2441
- .. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
-+.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
- 
- Quick Installation
- ------------------
-@@ -57,12 +59,10 @@ Hacking
- TODO
- ----
-  * signs_ support (show warning and error icons to left of the buffer area)
-- * quickfix_ support (allow jumping forward and back through the error list)
-  * configuration variables
-  * parse or intercept useful output from the warnings module
- 
- .. _signs: http://www.vim.org/htmldoc/sign.html
--.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html
- 
- Changelog
- ---------
-diff --git a/pyflakes.vim b/pyflakes.vim
-index 8aa508b..d6699bc 100644
---- a/pyflakes.vim
-+++ b/pyflakes.vim
-@@ -159,6 +159,42 @@ if !exists("*s:WideMsg")
-     endfun
- endif
- 
-+if !exists("*s:GetQuickFixStackCount")
-+    function s:GetQuickFixStackCount()
-+        let l:stack_count = 0
-+        try
-+            silent colder 9
-+        catch /E380:/
-+        endtry
-+
-+        try
-+            for i in range(9)
-+                silent cnewer
-+                let l:stack_count = l:stack_count + 1
-+            endfor
-+        catch /E381:/
-+            return l:stack_count
-+        endtry
-+    endfunction
-+endif
-+
-+if !exists("*s:ActivatePyflakesQuickFixWindow")
-+    function s:ActivatePyflakesQuickFixWindow()
-+        try
-+            silent colder 9 " go to the bottom of quickfix stack
-+        catch /E380:/
-+        endtry
-+
-+        if s:pyflakes_qf > 0
-+            try
-+                exe "silent cnewer " . s:pyflakes_qf
-+            catch /E381:/
-+                echoerr "Could not activate Pyflakes Quickfix Window."
-+            endtry
-+        endif
-+    endfunction
-+endif
-+
- if !exists("*s:RunPyflakes")
-     function s:RunPyflakes()
-         highlight link PyFlakes SpellBad
-@@ -174,12 +210,23 @@ if !exists("*s:RunPyflakes")
-         
-         let b:matched = []
-         let b:matchedlines = {}
-+
-+        let b:qf_list = []
-+        let b:qf_window_count = -1
-+        
-         python << EOF
- for w in check(vim.current.buffer):
-     vim.command('let s:matchDict = {}')
-     vim.command("let s:matchDict['lineNum'] = " + str(w.lineno))
-     vim.command("let s:matchDict['message'] = '%s'" % vim_quote(w.message % w.message_args))
-     vim.command("let b:matchedlines[" + str(w.lineno) + "] = s:matchDict")
-+    
-+    vim.command("let l:qf_item = {}")
-+    vim.command("let l:qf_item.bufnr = bufnr('%')")
-+    vim.command("let l:qf_item.filename = expand('%')")
-+    vim.command("let l:qf_item.lnum = %s" % str(w.lineno))
-+    vim.command("let l:qf_item.text = '%s'" % vim_quote(w.message % w.message_args))
-+    vim.command("let l:qf_item.type = 'E'")
- 
-     if w.col is None or isinstance(w, SyntaxError):
-         # without column information, just highlight the whole line
-@@ -189,8 +236,21 @@ for w in check(vim.current.buffer):
-         # with a column number, highlight the first keyword there
-         vim.command(r"let s:mID = matchadd('PyFlakes', '^\%" + str(w.lineno) + r"l\_.\{-}\zs\k\+\k\@!\%>" + str(w.col) + r"c')")
- 
-+        vim.command("let l:qf_item.vcol = 1")
-+        vim.command("let l:qf_item.col = %s" % str(w.col + 1))
-+
-     vim.command("call add(b:matched, s:matchDict)")
-+    vim.command("call add(b:qf_list, l:qf_item)")
- EOF
-+        if exists("s:pyflakes_qf")
-+            " if pyflakes quickfix window is already created, reuse it
-+            call s:ActivatePyflakesQuickFixWindow()
-+            call setqflist(b:qf_list, 'r')
-+        else
-+            " one pyflakes quickfix window for all buffer
-+            call setqflist(b:qf_list, '')
-+            let s:pyflakes_qf = s:GetQuickFixStackCount()
-+        endif
-         let b:cleared = 0
-     endfunction
- end
diff --git a/sources_non_forked/syntastic/.gitignore b/sources_non_forked/syntastic/.gitignore
new file mode 100644
index 00000000..cc07c931
--- /dev/null
+++ b/sources_non_forked/syntastic/.gitignore
@@ -0,0 +1,4 @@
+*~
+*.swp
+tags
+.DS_Store
diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/sources_non_forked/syntastic/CONTRIBUTING.md
new file mode 100644
index 00000000..764ffffc
--- /dev/null
+++ b/sources_non_forked/syntastic/CONTRIBUTING.md
@@ -0,0 +1,49 @@
+# Bug reports / Github issues
+
+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.
+* The version of syntastic you are using.
+
+For syntax checker bugs also state the version of the checker executable that you are using.
+
+# Submitting a patch
+
+* Fork the repo on github
+* Make a [topic branch](https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches) 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.
+
+# General style notes
+
+Following 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](http://www.refactoring.com/catalog/introduceExplainingVariable.html) to aid readability.
+
+# Syntax checker style notes
+
+The preferred style for error format strings is one "clause" per line. E.g.
+(from the coffeelint checker):
+
+```viml
+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%.%#'
+```
diff --git a/sources_non_forked/syntastic/LICENCE b/sources_non_forked/syntastic/LICENCE
new file mode 100644
index 00000000..8b1a9d81
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
new file mode 100644
index 00000000..04effa59
--- /dev/null
+++ b/sources_non_forked/syntastic/README.markdown
@@ -0,0 +1,247 @@
+                   ,
+                  / \,,_  .'|
+               ,{{| /}}}}/_.'            _____________________________________________
+              }}}}` '{{'  '.            /                                             \
+            {{{{{    _   ;, \          /            Ladies and Gentlemen,              \
+         ,}}}}}}    /o`\  ` ;)        |                                                |
+        {{{{{{   /           (        |                 this is ...                    |
+        }}}}}}   |            \       |                                                |
+       {{{{{{{{   \            \      |                                                |
+       }}}}}}}}}   '.__      _  |     |    _____             __             __  _      |
+       {{{{{{{{       /`._  (_\ /     |   / ___/__  ______  / /_____ ______/ /_(_)____ |
+        }}}}}}'      |    //___/   --=:   \__ \/ / / / __ \/ __/ __ `/ ___/ __/ / ___/ |
+    jgs `{{{{`       |     '--'       |  ___/ / /_/ / / / / /_/ /_/ (__  ) /_/ / /__   |
+         }}}`                         | /____/\__, /_/ /_/\__/\__,_/____/\__/_/\___/   |
+                                      |      /____/                                    |
+                                      |                                               /
+                                       \_____________________________________________/
+
+
+- - -
+1\. [Introduction](#introduction)  
+2\. [Installation](#installation)  
+3\. [FAQ](#faq)  
+4\. [Other resources](#otherresources)  
+- - -
+
+<a name="introduction"></a>
+
+## 1\. Introduction
+
+Syntastic is a syntax checking plugin for Vim that 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, syntax checking plugins exist for ActionScript,
+Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bourne shell, C, C++, C#, Chef,
+CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir,
+Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
+Handlebars, HSS, HTML, Java, JavaScript, JSON, LESS, Lex, Limbo, LISP,
+LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
+OCaml, Perl, Perl POD, PHP, gettext Portable Object, Puppet, Python, Racket,
+reStructuredText, Ruby, Rust, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig,
+TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope
+page templates, zsh.
+
+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][0]
+
+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
+
+Installing syntastic is easy but first you need to have the pathogen plugin installed.  If you already
+have pathogen working then skip Step 1 and go to Step 2.
+
+<a name="step1"></a>
+
+### 2.1\. Step 1: Install pathogen.vim
+
+First I'll show you how to install tpope's [pathogen.vim][1] 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:
+
+    mkdir -p ~/.vim/autoload ~/.vim/bundle; \
+    curl -so ~/.vim/autoload/pathogen.vim \
+        https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
+
+Next you *need to add this* to your ~/.vimrc:
+
+        execute pathogen#infect()
+
+<a name="step2"></a>
+
+### 2.2\. Step 2: Install syntastic as a pathogen bundle
+
+You now have pathogen installed and can put syntastic into ~/.vim/bundle like this:
+    
+
+    cd ~/.vim/bundle
+    git clone https://github.com/scrooloose/syntastic.git
+
+Quit vim and start it back up to reload it, then type:
+
+    :Helptags
+
+If you get an error when you do this, then you probably didn't install pathogen right.  Go back to
+step 1 and make sure you did the following:
+
+1. Created both the ~/.vim/autoload and ~/.vim/bundle directories.
+2. Added the "call 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="faq"></a>
+
+## 3\. FAQ
+
+__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
+is installed. For example: python requires either `flake8`, `pyflakes`
+or `pylint` to be installed and in `$PATH`. To see which executables are
+supported, just look in `syntax_checkers/<filetype>/*.vim`. Note that aliases
+do not work; the actual executable must be available in your `$PATH`. Symbolic
+links are okay.  You can see syntastic's idea of available checkers by running
+`:SyntasticInfo`.
+
+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
+create an issue - or better yet, create a pull request.
+
+__Q. Recently some of my syntax checker options have stopped working...__
+
+A. The options are still there, they have just been renamed. Recently,
+almost all syntax checkers were refactored to use the new `makeprgBuild()`
+function. This made a lot of the old explicit options redundant - as they are
+now implied. The new implied options usually have slightly different names to
+the old options.
+
+e.g. Previously there was `g:syntastic_phpcs_conf`, now you must use
+`g:syntastic_php_phpcs_args`. This completely overrides the arguments of
+the checker, including any defaults, so you may need to look up the default
+arguments of the checker and add these in.
+
+See `:help syntastic-checker-options` for more information.
+
+__Q. I run a checker and the location list is not updated...__
+
+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
+```
+
+__Q. How can I pass additional arguments to a checker?__
+
+A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
+that do can be configured using global variables. The general form of the
+global args variables are:
+```vim
+syntastic_<filetype>_<subchecker>_args
+```
+
+So, 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.
+
+__Q. Syntastic supports several checkers for my filetype - how do I tell it
+which one(s) to use?__
+
+A. Stick a line like this in your vimrc:
+```vim
+let g:syntastic_<filetype>_checkers=['<checker-name>']
+```
+
+To see the list of checkers for your filetype, look in
+`syntax_checkers/<filetype>/`.
+
+e.g. Python has the following checkers: `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']
+```
+
+Some filetypes, like PHP, have style checkers as well as syntax checkers. These
+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`.
+
+__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 :lprev`.
+
+If you use these commands a lot then you may want to add shortcut mappings to
+your vimrc, or install something like [unimpaired][2], which provides such
+mappings (among other things).
+
+__Q. A syntax checker is giving me unwanted/strange style tips?__
+
+A. Some filetypes (e.g. php) have style checkers as well as syntax
+checkers. You can usually configure the options that are passed to the style
+checkers, or just disable them. Take a look at the [wiki][3] to see what
+options are available.
+
+__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 lclose\|bdelete
+```
+
+
+<a name="otherresources"></a>
+
+## 4\. Other resources
+
+The preferred place for posting suggestions, reporting bugs, and general
+discussions related to syntastic is the [issue tracker at GitHub][4].  There
+are also a [google group][5], and a [syntastic tag at StackOverflow][6].
+
+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 [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
+
+[0]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
+[1]: https://github.com/tpope/vim-pathogen
+[2]: https://github.com/tpope/vim-unimpaired
+[3]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
+[4]: https://github.com/scrooloose/syntastic/issues
+[5]: https://groups.google.com/group/vim-syntastic
+[6]: http://stackoverflow.com/questions/tagged/syntastic
+[7]: https://github.com/davidhalter/jedi-vim
+[8]: https://github.com/klen/python-mode
+[9]: https://github.com/Valloric/YouCompleteMe
diff --git a/sources_non_forked/syntastic/_assets/screenshot_1.png b/sources_non_forked/syntastic/_assets/screenshot_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1b69f4ba26a2092aa4e9d42d2fa3ee08c6ab28a
GIT binary patch
literal 92425
zcmcF~byQSc6fcT^l&GYnN_T@ah?Gb>fOL1m5E6r+(jcI8cXxLq9Rmz7bPe4M4e#pr
zeeb=s-dpSa^%iSjxHIRTbN1cw`|Y!Lkg}o-E*2>k3JMCYoa{SQ6ckij6qE;3kI{iE
zYX*iO;LihRRhhRaCBx)fz(43l@-pvG?*IIxHRnbHS1=u9KRKhIVB`OJJwQoFA^|R9
zxX39;VZd?7@G;q=YL>Q9P+p?Qy_5LpKD#^b=7oQD-*yDk9dFit&)8Vxhcn~J7--Wy
zG*bNdbzmL8--@)#JG2)}C8fc>54lWAD*}G&na1wV=g95*K&mk15_7aA7Dsxi@htX_
z>l;VrX;aU=V;*jzP*PH!?#@ID?bo5Qv$Nx%qrQFo>g!YB*PW<(Az^f1*NE8t;MLg<
zXW|fpFC`IC&re1*i^&4Qv9Ym>i;Fad;I+6v-v)-%IbNMw*4WLzKUipHX8q0;{~<}p
zEu2~={BX{B#PIa=)TI9><DAm~>&5joTw?;PJM8=K$e-dW1V!rB*=V-XnUTO;_|KlT
zdmc0glq;o*R#{E<GaBIkyDF8dv>_WljnCFnnPam4=(rqDC<K4fDI~}aCH!|UZi`Ay
z7SMQi(dV;m5^pcB!?QCfC{Lg5KfC(MATz2?$ZK0u6;@F2o;C5`Q6FEH6%-`!p-`{k
z3BLaF-_@UD7KKdG;tA4Nueu;@TioV(YK?rrFtZz(_4W10xVU#i36W7R-ab|d`UnD(
zRn7Q#V)yEHH|wvRyzIQje$~~Q+-<Zz8B|(%2wQxAmYf>@tGlRP-)U(yz3_^EWzm8B
zmj@2F+0aJj7IfWB|M4rP_zVV%gpFgg(IyXPts0x4*4EZrZwLeeyq7!K7@GIdgH{bl
zBsQ(lvU~IuI_a5@Bpd%`tu-vyEQ#};t+yuLdhz14`A!fAT{39LezC=0s+E<F<0Xpr
zBBI|NxA~0ENGX-=9I@yD!NSDE%+_0UCEwcG!f8H3LT-|NB4+ajogF1pMakc|2c8hK
zee5r9y4?4iJ0E?#f6?mcemsNtRJN({feydX^}r06_o%mE(jvj^esFNcxo&-U*~H9@
z>y!v#ZMa!nd(<&dO4OHV54oW7517|V-;vfkj*4w6I5x$e4c4~fOWbp=<F%Ro;p>a?
z@Zm#?>9TYYP42`YyIMngO2#46uTL|aF0L-dTNiQNJw2miW8I{7p$TU@^(7ig9UUFJ
zVmSLYv(F{x1*`M*OH-Pk>b|%-+mpAjV5q_PZdz?Ak8_SgrMEo-56{$_Z_q4OZ)$4d
zNF2JK_88@99=ukGM`XyYO6x$Y7_DLUOZ$!cEN+7IiYaT~H0YG6U;DMAVl1t$b_PY~
zPLtzzmL+~4FEEw&^Y{PMYKiZCtz*ybViP{|J^;D*_{o!=0!w#y_vw-B$%1nGdmq=`
zS%qHYo-)BV`Ph|9)8*GJL?O_Iw~rmOCo5+B*fm&)um@t<%}3KDNN~_e`R#TO8`H{d
zX1F>!J2^?iy6rj{^nKqxjy#yV#QqTXCTJFH<$QC287hrB-{@+3|HZ$Ho`%DH31$C<
z4{>nDkNEgLAvMvpo6D0da}(u8byjI%cQMuketKr1MAHEcj*T&uOH0Mi$yaCFj!b++
zA(Q=*=Zo?ODIy`E9E7Pq+K8Pu4iTx4WduSdb>}m*QU;F_a?Hr1&}qOin&n7MNyZ!X
zXXyS7T8}X2!aA2sL&*v33u-9Dt4OU_MoWuSLPA25g=l;nnomT8F7E2e*NEI*9){bk
z@76nqlAgE+!7(hH_o_d5otd(A_nvGaxCNYcNzQgA*UMF?g9`Lhoe}J1Ufu6|!hHyI
zVFF%j49+b#!BF$z(K18So-mKl-=w_3Lm|HkVFu-zBm!nE!5JK9w{DixX%Cn+ip`cw
zTO)tOiJu)hh`OIsczJs#hj(sF%9T3bbOAD>#+!4-6KQaxW@av&cJ{dIkg7%4cT*MW
z*j*dxBn=2Vbk8@0_ogvm4QSk{n0WRv=Ch4R8mX#A3O9LP=(_BVrX)AIrWbS$%;$Pf
z&9Pg;8+c2bE`$pTW)lw>g8jxU-od~nJCo7+L~O5FMUvZmQNk(26jhC0dzV5^k6p3n
zQTO20rpQ?R@e&1VU^&jMcL_u=ozCI;#*iZBuTM3!M%8sbm~xPyXjYhDN(MaXhC=am
zVda`EET1a6TEZLSK1fFpynU?gkZDOnLp#>uEi_weJAkARy0qOoz#$X-x|>Aqb7%UX
z7MJXMZ7p$2ON)yIEarNjGQ75yKYGz8cBD0KD3?k}3dX~uJ8~a21%Cb<e`}%~l|rb>
z9F`*Db$xrkIbWy|c`%PBnjrn|%t7?d0Lv@{EpyB_g8?ubN~#l*f{Zeo?)N!fr<|!?
z7Y`b82pb1g)YXYBEw^~=rbj8OhOYNLeLmF%Hh{NBtDWhmY^Q&RZb1P9plEb8=1bg~
z$;3!Vw4JWGU#T2fT3(izZvY>jp04>vh~}sdC48W`WD~ou@MTmJ+lbDmdb2L?^d8H;
z>Gnyn77rqyzK3&XfZgN3A20rR7@k+K&BZS0YB8cV(%i<a6rL;n?h$TAhOE5&D)a@n
zhtV#HR<(r$FuuLLJ?=x!>)r>-++0y?$%5tJYuA>W4eigTn|dqtEc-XvSy@Dldn?B%
z0nT<p_ua+X7dkX_bPaQQPEPMR5$P6`q+!yeJb^}IE3{HrBrjgP$jUV*sAr?5ww}f&
zN1=-j@(*}&a#<Cj0{WGeMRScHpoKiw#KXh8(t#yjViQ#uuF|37ZjNlk6+e1}KH6fd
zoog^wj^ngAf8V=f-#oOE-Kth<r|Y`E&}mKu=?avQp<X9^)%A<AuHN&hdh=)S_3_QY
zzzv4V^71mR&lF|VOiJ3HASCJl1ye#;T79PrOtE{yA;FOmp=~By<xZ1UTwGj-NaR};
zg6}w_7Nwxg(H06otG@&U$V8Iz=)yc~CK$x&8{~{r+^;?fhf3#eIDVR$As2QD)X?)v
z`LSeht-}sP6I27`d$KW}F!f?BE~5#H3MZ%CRB-j+NH4<4P?#IgP0S}xYVH|qf@b<J
zdV9-^5o|=PdL1I22OV%Y8Gsfx;z+h9N)(zKz;6gW8@l$+w`V#R)Wv9de^JXsa9Va0
zK0-rxIsl~L9})VRTL{jmbT@ZTY-wpZ=LJ=m$X84J!oTo4i+_=ZQQ(EXzJ9ES;dNw)
z-FRF=<Ygw+)zy`1^XE5<-uI})pU;gpf3zdLz+m!B$`=nB6g$yXLLnOh*B%aTY#~Ar
zAD@!i<j6>s0^u^W_ua*0O9+Gu&dkgVTdg^^5&4Lu*5`%+;R&9wv^H_BacGE6ZXv8>
zb--hhfbosj^*XtqpWiOT+{`T9nza2@d)$y&44eKip4gqu{ah{;<lUdJqgzM>;|Vhx
zY5?O<zVT({)ZUsY7Lv{^pEm0R>@d{*@PX*14SKtT#GKC#$M!@%YqibWKxR<`XALO&
zQ*!bTE-o&S`40r$_6L_c1LPDGSOqMi={4Ryejs?c=wDD^#1+5m?G2KWU}fO3`s~xr
z!^jv9SaWxLrFq|A|7&V$R3)X68+Kb4VoRpD4<0};@#N;}J($0FTNJ)O`eFvDJcRTI
zd?rU8)21LLdL}gDTcK$U4-f~HeRp@so0^2Nv8L3H&d%1a7MfK+gqdT3-A1qI=>v2d
zU7ZKY60ye_=8?tf%qSa8!lPhSRn^0@qxMdVM=njm!pX;ijEtDRxv8EDDZ~jmkx@}v
zqi*>YdT(q-TUy2}Otw7_DxA(p)l0Ox3wW*LIlW06N*aZqfK)iv*A00{_Ymnki1Eow
zW;-}hNOqTS+3kLVHa|T-Yzx?h|BkT~yA$OHI<<0-xa4I2(o*|KYlqDx37kgDyyk<r
zuy%u&^z^+gcCxY@uhP>8^~-*EeqZdSs9oqk6xwg=?DW5rwCjLEJ1Jl4LFU09?!C~p
zYwT8ybjX3gZC<*^dSlS(YS#$f>S&h?==(jmRsy%LrBaIoe|x%ug*9uV(5(v?bx#->
z9QFxt$_*vl?uQ1RRJF-MZbX+Y%+IUpuO1S<4ZPPGRnOZ>*w0{0+)IwLg-_QQW32Xu
zr^`k6+}sR2tg)Hj;7X1ffAkm&Crf=u%S-SC`}?A!(B{(emZ84+>IQ4vhk6$MOAG~4
z{vNTm)QhhdMzQfu&U>l2hv&UeX!Hs3F!Uu;zn<|gHDztHYOTF$H2`$A|BRIZf_IV+
z*_`d-k>*2G)O@wtCt}0*--PTNe|5`4=o=iPU+?e-20t`7O#5<r0E<9@h&eeqSpe~p
zF1pWDZz3@8kBkVJ@6){Dd=tgm!~pCET()c@pKV}h;L_fCu0gfdOr=}uz^Vh7vfqh~
z;+{{Ng{^jv4KFI{`GX7NGb>VF8`-eHKqHuLrE4;jlb}{a1NPAorWO|XcsNx|NmJs!
zyQB41y>QYty?tXDV}I2@BB%VmwAEs<hV}05E=j}<PzAtQ)gVB%Y{~Jw=khraQGe2B
z&v?SZ*`B{68rG0fao_xMeRO)*X23!4D6IqrNSv9`fqDPB&!~JFBMQL7@wc9?eNnVH
zBpge}lEVBZFQ32q$`Anf`U=kjJ+r|SNds||<;j9y0$~7>J-mokIypICG~ys}N9G?5
zCR`ILiQT^jj1y-ULJb6IG=pRK!P5GAH}6ow@mgJPd-~zF-HYjzLtZ1;z6jDF{|%r-
z*+96ODAb1KJLrz{kwdCde2mDsTjGYIM?{q}zvH@Z_t6IzEf!hwtoDR%)Y7(|0PvV3
zOd5zu?bsutxJz8@c9eo&)BQ2ZU1pr7O0-Af#xgBtvoL`Ny9}qg3y6r|j}Sh6nVz0*
zGt)4%?pP-rn=JHeM`vSWtzpj9&d#pfLm7w-r2JODLq9o_a9hz-TTQXJ&a-lID)uVR
zAytDdRn>GT_u;Lnn{;8!r|`vMd13%8UtGqbvFNrW&FSFdlD#|H*on@2_RJ9Sa%pEr
z9>$jZsnV4~5*?QX)QbDN^jS5b)7PgfR*$C%q!?=&<GYQP;r6XkFff2mg8~B?NM4;k
z*N5Elq5uR?N=xvKt?@#W$5q=G)T86$D01SrH;AnUMR9SI`1p9KyPC<2wY9ZrYkOf4
z5l#{|Jdzb4{Hv?SKoP<6+_bdc<d2Tt@mszHu6R?~SUyY&4qG29U%j}6eM9bTHYnQJ
zvHc-9yBE1SY|J_@^^dQ)h*)&GcH>itg}Os>ESrv|g#LguZM&ABq$Kj;WU&KRvTqSX
zk*khzALtajdyY??*~?CWyKT5iXFkguvsk3po-G+K(_~pA<gq<HJS^ikuGVC6_wYzB
zD7bCLj9zdM438SNwH(PV91*aC+wcjUfmo6-YE*~-Cdom9v$noIgNok^c6M@#<GEyw
z?On3+%of3OjAc7I%o}S$_RCjULv!A$sctre7Zf0!4IBAvPM!(qY3S+c{Ur&nl-GQi
zZfdFB1^^+a#-yYSe?i3nC@QNf1>9b8xvi+~96Nd=5}=f_($e1tT0tOIRR%VlO|VV>
zdR%xRPna|{@XTq1gy363)10{S?XmTMKWrQoC#o5#(^A(Qp`5?mxTex<^g)H4F$vD2
ztcfvtt#=~;KMzh=s>`w^5arY8eNeU%0s0yc0Kd+fdC2Kj&G-$<u+RMs#_UB-n+&f=
z8t8yD&dRtA5J)*<eHi$R(`{SIgD?cJ_A}DwZv$NSeh&;39@@9&SlUG_x;A-uct{=B
z9^S5P-!Tnwz505Q`|Bgr?3#jg;F`^!4|Dp@PFG7d(kfb#QEzTNmKHoM7E4%DQc}7V
zcZ&)N27EKP0KZS^u_=*jcu@ErMA^HT%@m$4Q(MAgIX7)N3K;fNLUU{0jE`d$wf#*V
zC#OEQSIes$!c|WJui!svMJqz>{~5d!m6D>jZOVq)=9dEo;>v`=V1EN{ZF_#n>grzD
zq}8vM_xDdJfN+TJpFZ8D`}oznndCQ)uOUCznG&QG5@Y~;Mfd>(^7HqTRZ?O<7TL4=
z<oMpIUp;0o_SZuV?>$)Sx`gjU1?H=F>sWYrh|?|T#pNYP&Nh(;farmRzKsW4t*b&h
zKJ-8?Byi>1_wP~B(ULkk<Nz2zUWzjFTAUmmMN*mkmxl-dBCr*#M8Uy<qc@zQ&>{9=
ztVH4?oBt9WKK1qWK!Rm7TR!%^5}aWMU<-dgA~feq1i(UZLYjir?7!Dm`b{2fPUO4g
z2SAAa8~+(zQ?fi)@4P$H9P;(+quL!HZvn7l+u52-KzgzMe1(%t68|MSK7N7b8qd^#
znVU;nQ}Xh@1CQg>&l2Y1!eS<WcMlF548>VlT@9M4cp>!#NUI2)TPE^alNM;*VJ=g8
ztT|%d%>@P*NZfsp$`Cd(W`E7<@$JuIyC%)%6RN8YMpJ+cO~#I(mPGcaJFgj14-dNQ
zMRfl!fq{>=r-}y}c&+Qs?=X}p@YO)5=>A&!8u1U~9H~`4R*!SjSk1|1^hCV2y2*Pl
z-+GJ$NvPDl)?;2I^Bqgm0l^9X?smoMXKbuYfTFH4LH5LI5Rd(WAAoXh-V_(OvKVcm
z+$8Y4J40sN8RKP;BwHUE<&H>~`f1fqZ&d~*^A$SbgYLbbb+!@58c*KcSuy)Fjm7?z
z^o9M{19tXOE?ktY<>fE7dra7~P1e#sh>0WIOdjQYHE}6)_RY~y;eM|REnwN}uUMIX
zK=QHs?m%og_3?B`&dsyGYs={O7tlp?TsqUDJA<BAd3^t#rp=<sRe4zQB53PvQqnVw
z8u51zpZ8JyRg0rV-08d7dwR(Jd}q*V@0_|YXnSo|6l|q>yYc1nww2)9)heX~<7Ozq
zL^^Ld)Jz4k``FXDbK0^pcvoklF0zYVUqLn&NrL*2gFg31nH8$XQEWiZsr~qmwwmI@
z$G8&w@v<{DA)%-;3_}crDyz~&mI+%IDMma`XPdcw6i71|u=0h@XCoe<NWH4_wtlF^
zBXx#+eZ6KGHDxEwY+<jZQc&Pvet?d%sTm-yk5@w(iinoN=<DZ2y{uNY_ihcqxZ-{F
zdLkAY%XQ&!=M$bPFM|<^{!0d3%GrA-fg!j9&svegN>&ZM>Bl1ZcsX*r2N6q{@5sz}
z8-*<8X{Zfl;Pd{+KJKs|!0*J)BNLL|t#0P%G&xYZBwwkhlo)^QpL5@@59#vZN*tu7
zm(^_k0!{S}iZS0f4K3Y$pcUjj{1NS*4!8bv$7y)*>iceVZvIqbqBl)&nzi=RxpE4|
z#2QD}VK*I}Q=x^(XQqL{1hoffZWbXj1}}+yG~4PAAnm!X3gj|gI9Bt|QyZ!SwJ(Is
zTkoFnB>!OBW46r-HJsmp);N-|56!fr9+dQESk5h$J}YplM{YGt@p`NeB+rRj5^`d!
zzVK9Y{^@62x6^<=fqRZP+Ts+x8l%(VecZmu5!estoAc_)K=8be+*WKABzu|dzm4x9
z@9Sevs|Y^pF2+iSC63m3%W!dx2Z<1BpGhQ^>})1{cS}xKOA(D-EM<L#X<gE%R|!fG
zHSbHTF;Y~J<c^n}uf`kMHbl;r_|~w>=~RA6Iw2nWKsP9N$?N!wm#7H>m8P*@2&SdR
zx0a@pBdZn6rWh@FA!p6MexUFAq))qM70yubf%+0|Ri`uQg1fC5t3*V(=4C{b|H)(U
zlk3lYR;xGNU%82?Hr}f8eX1w&(Sk&M=SAI1Y)#j-HDeR$%KmBd9O@K*d;N?j;I`K4
zbI|R~T(*9~Ept%gseJ!GivFs^b+S-qG}A5BuYSe_$T|;c>&crGYq@{+ApF#-nkXYJ
z!uebQrt<NZARf*Lo(aLXJbLNpwFa01=EJc}6!M=p*2PC{q&f8#6pVevJc9a$CA4T2
z7fcUNoM&5TMJVRems2>~QfJTSO(9CJ?nwv<a?j?<(O#E4j0#k?-w=gEx0*X1sCZe0
z-~Mn`P;U}pj~IMGxvQXayuR+pC}28_>b4bYcFz>$BX>#t*UNTImPnfn`3cODui#`p
z1A+Ru;|usKLT*j??pPC-Ke2{(@sj0x^eO<dRot(~{>7J(8593a#)2cK&b@YLiwK(p
z^c$+vWM9^5k8>#Fn1?7gGdF&GC@HVVs!6%jBupJ$c|x4Iz9yKfE!XSDC=g(7W=GA+
zJYxD%Eh?)@$Lj0Fb5BNUv0yx8{seYW#`T{l1Ek#<68mi_^DW&c17Du6&?<w3JKl11
zcWZ1vy|MH}sue3KHCa!IbCMoC#-!W5+LtQu91QAv#1r=YZL|@BmJWX|hcGyoz6S;J
z*3-q+YBmnM_9lH^(D3l2dkG<LajvL106nM5m<5Y)priR_EP<LyCovY4Exl)b7JXuR
z19)?#^Y97^p6b%a!S-!KwE9K$3tdyqCzf(P;vrv6FGfE@%^a9mEUG}-cQ>MHp52MR
zc%b_CupkhNOWoB^kC$3@zMQOddpRyzZESEj6H7Xb470#5qhNyS{PEIff<7bvnr4XM
zP#<lThKBH4|1kxREE~A4NplxC5%T~hB$nnpExnSU@b!F4PPvy)lbcH}eC7+ph58zy
zT5~{G<Y{g-?@bn55Y^z!?h}@gRD<`FGfS+e4P}s#F>8NL+w!v3K#fK4u*ZKd|JnAy
zjC}k}8S-5|{mQk^keu|B;EhVhd1ZnNyCFxw6F6Yy;1n38V&F2UEtZe(r`nSJb@6Wl
zgH<+$5_6T}4*3#tIL(K1NpRLny*xM5IW0B~uu%xIWg*;BtO+f~Z8>>Xktij<J!=xE
zr5>E#F!t!8@dg`FwPhV52(#1h5)|+5v2#-wKjFH}pE+TPn#1iZbI1aNSwP>CG8mA$
zzr}dwQ<@||!H+b*EvjLQ;yoo@>XtEXa99-DDYI%A5br;#%$8f6zZ3AuahT0kXnm8b
zs9Q9+AM(#SZ&;<nFT_HnCG)3-*blbR?qMD#YkB>pmXgk5;<9qQRwXgS9;H=ZRNF0B
zXq)v-D4JhBb@|Pr0f!Yb_&E?hs>dn|_B@yo(mv{(U8TuIIF8_k1qrzKrRd4Et5}Y^
z)k5~i8Evoroh*@@SH|%qjNk9cl;5*+UJ4!s`jMja9a42xvHkMxH0w)AayvLBDg)?g
zRS;w@#W<+xT$Wxqlu0O@hQo8qFxT+@FNpa16hft|p-k{AR0msKK?Yjo2LU^suvnl$
zodjB_NSD6ZI^bf?-hI29_D-4fWFyddDceT(kHvyM+~)F;^V($%+}Zw$w41n4c^5_n
zvfR>`Y-uni<H+)gyjhp4qW$l1$&WAg_4g-jrE-!V?b)}*kT2h-hr5+S%{8_^qJ(et
zC?<mX>QB!j{N5aPuaCpz|2Za80ZSyh4Lv?ySvd+1ZTtBn)Q**>4@~&TrpBd^X|Gic
zgkeLN-}mqFmCm|EqPfN6hHgJvZtR1E$T+qxIYoU#ntxZYvaOtt8hJ61FL#!Rv2lK{
zO0XT_*(Iu^r5rHTrI;vnTTZ<@gsZDiK*4KAb2OlVKb|ep<BKxb$4FB&E3W6|=S=}b
zK1>@pR>bI2m*}9MwvE5vIApmvXNQq}%CgK^^$Z>pw>TfZ;I$0QU;xzLS_~b9;M)?i
z7}H{mU=khz1WP%s#uu#Yr8*u&l)If^nDltAEvq!7Dah3RycXkQ30*T1$-`l#%-v91
z^d+M$=hksh=W`r+G@7q8FRDiwglA|QeR<WEhL6pkYAVTK_3jOz$!oLUYO4WwG^p$P
zHC=b-`5K}d#vH*3>11@#l>rg%@6P)^pxAl3xzj%7f8<rM`SMeJEWJu=37F>m%=$yv
zQ~f7Nip&0~=gypr@D$|6ZLG!oo6yCYB)SI0r$gJ1xZS!{h<cMYPUssd?G~k`b_JBY
ztV-t6|ItIgn*I+g=W|j<V(|*@_o8b_t>RPZ#uMIadc(uFPlkR5lvs8trs9g<I!4qf
zz5^WsSV_K>tv4ZBUO6%5<Ia2-w%9#ZgW_m4>thQKT)7=S!}qcsO9%1}aP><GZOgg>
zLnn9kI!SHehp6?3oey1J-ds^mf1iEy_<zBNsV3o$2Jq`FdCw@mF6G(y)LU=i&9T>h
zqI*^<Vy}JU{A1&8uMJ&v&6h$3_S(ak&*w+u4h`&kKEOl6hcC3X9PAgR2k&klCzNn6
zx72twZj&6`*s~LbNUzRH%q?&SD?oIaqFRhw>pSpmYVB3SViCKqsp%uk51L~1`BL7(
z3^mWMs%*)7<egoA#M_#6rCIDBzye={uq!c-W}4DOZ|u>D^2Qp@Z=ZCPZ8Y(?(QCD@
zEwmoI=`7{Ujpr)BFZHVTKTuFlX+6=3u@mVmTEv4Ef^bDWGlX(ixiu@VACe(^BO`5N
z8bN<;LUvSL<#YQx#|5xeRE4RhPixIrnxgug0escijMh)bImK~m&<6lYiAY1j0KnN$
zf<IbA8^k;n<$3gcQ!t_LT}J_K_LI2xIC%+tE93S9<t8Q%e^fa#x2T-$4xnoBQu`cX
z4dz>3UN@Ku@g9&$kN1$kb>{38>S}RWGv3a4(0sWhQ!KyMd`%P*u6Xx#a_V__rp$n>
z-mMb`rlr89AfT~<{8Za*Nv1O57*byvmhZYIe=h?72hyE$s9}SZ5VADL*OA2x1z?Yk
z5naO*0O}du-=u|u<KNg5Bk(In!Eu$l45^|EzvAVez#|~XwVt~V=KK_LNqlrA$tBlO
z%NaFUNP{0jQa<z;jpY%o;kNA?2ki>Pbe&3JSV9>>Q()3g_hAZeTm-*i(B0}8-TmWB
zUP&a9sVIfMgMtY_*~6%vC(L>O;GXZp4mkhS0{lNP5HOjKk0QJ_D>qZ<oiPyDtrp#4
zZ$-Y{7=Khwnqm$wV8{#h%UB!nE&1iBd1ob|*Ok3CjVHjy7*Hl|e|@Zh*k74SIeWo<
zN@}HXPTgy=4%Npivs>)uGKF@pv0PszNE#47+a8)T_Y^GNnf_d*Qv6aHC-9FYK4_u5
z^w7$4<sK=T@t1<%hoN`-Fo9i)NHuxITa(QHu|_~QB+63<ds<Dog$ut$)|pZB9@GV`
z4Z-_F+|tLTT_yl#^cc5?fcU^wWZvjOCYDD+$T=?ZJnX?8!;>@dsa+eK2R;^k`Dg>E
zNwMZ8POf)GRpf{}^=y$ASnG^`Ybl0^_S90z0<Qc1u=R}7((@gpuF1$z*K^dupE&rF
z{$6jQe^6<D$GH9xW!T{Lgw2!#e5ar0s{-1bDL^;2w;KK~wwh#>?=mki%@hUc-tEm^
zBTtF1536E9h<eq$-2LUL#SQqah08@fu8N^Y7w#Moqea!!#i_84O>bM8`2^UK&RaU`
zbG@~YMZ9RhCIk@w#3G1lb~t6eHK`u&>*GYW0wzksS8*#V%;3j&RU+5<Q@QjDyw+(X
zVeVfa;k$aDzkU`dz!~qGGp1~zy4%!c;s>vKdvw}GvZQ1YF&wTt^;^&>Y1A&6<Koij
z@PxL?lRkHS>l#mGuYr=p|Dm|bVS!%Qw!ggt)dK<a<Oaph>Xh=e$;<KVHQdN(Rvp>l
zjj>llNf^S6Jw3OM!oqo&hF=!GqPufiDXa0_gZn5=nnf~DDKZL|_YB2Bgu-Fy6;7;D
z<8tpuvW=k*INvKK4Q^X*St0-~7p6@05%j7-k)w1TPE?)7H`EK2wUVX;SU~}r2lrKu
zb^k|szR$AUD{9U!&bNsENU~d7DLN(|@e%$HfbD_=l~>@O7QB$y4xe`i;q@jZ1)I52
zioXVkzcL{Ks2Wdt#p?e%3`C-6j2xhn#3l_zSSuYv8=@@|_MKd0dLt=X?^fSr2Jo0}
zM9-`E76+`xpZ9WlvQA_ul+TSdKEOY~eg(5x|2^|@;lkA|GR+)0-Wl3lFM#jgq(a!e
zF8iy5Wtt%5Nz;*mr`6XhC!{K!SdqvVy|P<IvHQL}2?dYKlqs6*_2czm<5OGh%2Nq=
zZ{nWEKZN5eis_%s>Q_wrOiNPd4X@yK<-7jc07_E-?@wwvS~CbN&2#glpl&$R1R&Pu
zZG;{p>du)AzA0iT-wWTiWK3I^VnOs&u&&a!*6v#!t}c@&#bLVa7}rY-NQR<EDk_n*
z>c8s~#EKm_On30j;YG%k5>kDO?AlC%Y1UGna7HXeUW0Ek5iZ1SjA(ETo2{LO+e2)7
zeJJ?jy3^-yOXBnUl_Wv%v!L~V=}`{MyVPM|^v+~Wv&>2`A&2m$Fgnp(f|=yy=+W&c
z3VV%hh+%(R%P)QC_YEK4A5m5lI;`x+dX}iPx^BA0YMZyOcQ(<!7)a!;IthT($UY{_
zvJJIB*zk%!Ua#9_^+zGwIc1rLkQB9Q?x+0~<hB2#!|tUDOuqc{_N`8RXcQVGb$U7^
z3X|}q0`))m@saIYzbF4B6}kwe{-pW-VNSsHf88#P#ed~RnEz$e-pY>t10sR%`tkic
z;zydozazf>ufhK_hxYjYHu!lJ=KnGH4jdW|`I>V3L=vsz4Vtdg$A53iq>}zr0reEC
ziB0HgS`?>XxnL;nvQob{O}*&#ag2nBhsRBGUV*B~%w&p~22&qw0CwP4AN`5L%_(wc
zdY;QSwr9Sx*#C1n!~6Q$#rv!9!T2lT)<KWVj`PSr0_uV!mlr&@<I7}KANo9LHkeFJ
zZ!}ru1X+L&M8CRi;5xcxALF^zj|J}SZ}cwGMjQm%C+B^p01ejZbqh~=jCCV?4c0N8
zYPw{OySeGSY5B}7P@m&udmsJ^cC<X0`o`<V=G#8?-|eb=^PXiQ{c!{3r6XjuaJBNp
z%~jN2+x_+xVtN<IoSI{)S)4Fn4Y!(PDB(S+$Hq(wY!=V08S2-C6Oj|Nr5l?A8G5JJ
zf1gvyL|So136eA#S)4gjal-DR8+-FiBbim`K0|jW=O?|H8i<gB!ewif>Ce|yUIg<*
zc&+wkx>ysvM{GXzY7U-S`&o6fX?)GWaM{Oq*#wFt&CZP2Grs9ZkStoVRHIrs318B%
zmw1Nx9|eq#?WOV;pofRwLG@lNF|lfFjQAuMH{y*Kd_s*Wo{`SXo8_@o4mcpXX%DW3
zkAai-leHWXLohWFmbgs%VJ`3ew`{aDaIsRN)AoAruCK3o?M}>FhbQ92oMB}<n0VOB
zbKl%WudSW|;&3Rav-sG`C&s3wMq_cEdxGKMc~fJ2vmYzAxtNRp<<95Ee$2{8yZnVN
zjFS|1&J!MXx;yv$<1aM%sgt&3)VkG3*sjN9wWPe=_TsPE$VuQ(cp1@c{i)f}EgP-O
zpY#l|JarCb$a-MuvE@}^j4no{WuVlm@8809q69rTx0hZ0B0Oe^0|=mk-j0gBD7h`Z
zs!|bQ&_5MXpS$kxwpsGR{W^DW=9*B8@w}Dk<UEs~(tLxz)$wB5(uE>}Y|`-5oBw2@
zOKFU${KZOoW^O%L*8Ui-6m!?~0*8sB#8&#f)ps0un!k?)B#}6iak4jia#OYSdXEfk
ztkQ!d%=&W18vI^s!A4q}U}<wxOn2(h3j%6MQoOZDT4UKhg^hOW19PK@*gEU>TTO5w
z6p=V&5ds>q*8|P^z5{{O?dQ6WdExH2^#O4=WBfN!jVX@QcBbnM6u{9D!WDM7a7rcn
zUeVMbl`XWv?QyhNLO{+IE%F>V-31=o@l@|(R7zy`l8>&(+J1Y}&9IG2z*}e8A7Xv^
zTT-I;N(j6q<b`doyKRVc)8(=-SEUn)(26=y>6~B54i4FLG$3;K<so(s?IK~Pa|0ao
z$rKILYnKfDgYdySJIvf+9U2yzAMN}u#zQ&tzf_N$><gD~^iPE1tCm@x&{4kbVD}5q
zUhKV*#6Gch!}8<OxXj%mEp0kxk>GqKjJ(G0GSyvKQ16VN*de6U6P~4<07N6Q?PA=u
zA|uC}ed3c^8`pTgql&=}if@IxQDw+CZjcMOqEjT7>}i*IAEdu89aB&oddb6)HdtLR
zHk=e#P~e4}>|iQ1{d+`kQOY<j?6h*vYY4p3l?pkYqz<el>xZ8lH+8bW2_s5ko8}5W
zm0PIScEfA=m6kuuei~PZADrcmHJePB#m){-t=%SKL4(A0r)Qc2rjNsbg%OdovDsJo
z_1mLa>@=$3i^xg@dt|b)(N+OT0&jkVYFSm*ohXX_ZB<g;1x-bT^CftOZW|WHqE*M5
z<G1quH<eqjJ@*d0JE=KN+(`>PI(N7dwxR>8=GDKi^1JBz7^OCT>3a7*x8pL+M>qcH
z%%1$sb9r@FHuK?LZsUd5vHs;hd;N>|SAT({r+p0Rw{md8=~I`otMT_9#5UeQ!O4--
zGCvl0zflLt$nl#Vo~161y{gcSY|$<)P8}>?i|#U~Jse$8(FE@W|6Uvty30_5TZ^jz
zWlU^)iIrg3mjcWm{bM}G3!KrHN42~-d$8iSnM!}7N#H>6L{)z9+j$47?T;tRF>H}V
zbBS#oaUp=VKjg2$lmUh4>&<Q$6LYc8T1!<730#mgGgm`mW{heu^lI+OaL|?0B${RS
zn~SM%cVIn>BNzn70W|ELPiW|}XRX7W6g=ELJ`-GeS!vOwzj|Pz&vL!#35plX7P*th
zWJHR$mCxu}$UZ#^ijD22&k;mRo0OD%<19MN7?@Y&i<_n{t`JT~QHfzG_&L%yJL`sw
zZ`UltYX`bwf!*QNamWE=*%m9e5WAK?X$=auZ$!M=o>b0!SVgZM<E4n6>DY3PWx5S{
zMf1jYqN<3C-*J$0z1(QX)sAdJ`%35U_CJC~(H%HxV~b@}XIyE%T}%jfJQUelVClMB
zYpPq<XA5C9T~c?a$c_UuwN9U(X1X20gNHucu9yQ#aCCCETxiLze&wpzl|tX3qC4D6
z`zw<uYx_92s#kwbG&d{fk8|ZFUU`s5M6^~#EXQa$5sZVl$ae;DJ(1E;C&!f}Ejt+Z
z@l*y)-Rvy3iWRCC17}sxcrnjsjWS(zvJ!>kJB3Y`*iS2WUM9nJ{rx&>bTOED8EPzN
z^C;<+QUjb$KgbXKcCs30{2OqXa%4|_%iRn0GcS@G&Xl-sYn-p=Cz2f^Zxvq5=A#Fz
z9v}BJC+TOnHB*xOs!*UsXj(_cnzO0OB9TZMUTXiOIUrBz?{0A+KEY(sQ|-L?tf9(U
z0#yB!+5Yb1=>@EJclECEN{y8zE=?S=UtgW7#$87X>EgKhlK5vudMT9eq`z_=r@WG?
zF-%;lFT!VsR3B(B?21IzL>3=$e#R%%iI8j7lLEa@9WFQSCE>FnQ4%?Ov`Xa@ilZi-
z&C6c2eS<b#vC0lis|b6-8aQ*Q@hfzEy4V=o_0}UxM{cJfJjdEpkp3_H$#9pFzY(09
z%%n?B{Jw;+6<5JJ>tQskFC4=i;HpR;y4KD))*6Yu@DhJiV8j3>C1$6EV=wL0?3Uk)
z3DBbYDk0d`T7>M@wp83Ae<lp$VQWAO<*joK-hx0l=)4e)=ksR_QM5rb9=_KHn@W4X
z9fp%4T8)l#vsT&r*yUl)i+lXXcVEXCum<%jQWW<}$~Ato=n_hPHY38rrIIZsT{c-?
z<ANM%<zA6O#Hc>{zc*6Vir;Z;xjNB~a#nS(z7FAeoUbIUhYoccbWz(;|2bo`0Td(P
zP>Ci{L2e=^Q;VgcJT9kL=bZ(BSOP_ypB3h$qn4YmGI{^((TZH=u~SaW=Y}x3aU>>1
zDGpczy3~eQq#plH?++@=c>UAkWMd1Tt|=_Xk|k;Sh13JI>}k^13a}7eQJWQYaWK}(
z4KFjUf&dR6;(SkVd8_kPX5@!}pmf}VblJ9ahTvPd=7-soHj*F$9^KwtEfOFX<Pt*Y
ztoWqBb`cxhp)3p^I2bL+nD*z=xQ!sEXW;vjAs(LeM5)EySAa@`-K}S9k#siblge3>
zajWI^{UQB>sZrsJ^G9zs%313$F_DNNVi~ThOT4}6q>`Ft%?m0AZ+c2{(I2skDcwiW
zh<<Vxpi;Ge{UmEELB!kbGS`ySe1x*QvlA64D+da%H^;NF^}Wvs@x+9K!^n)42?#UW
zHTU~Q?!#};cA=^S{Db!Z%G~o`Ch*x@x-eLY3D9HYdT>6ldayp-=X}%Tu3PV4BPud`
z1nInbPQG@)L-E&&x*#g0*Luq_>9>8q%MB)7codi~H0b$9{BpLW7VvNnjo>vTIiXuS
zpI=5r`Mq|-B6cN9a3YD0d1tQ1r`MpE(f(Wb-e3d$>kl>MLl=<v6quq=59wE#vy;ZK
zMnfkMleOo)hlTMJMLnQZo=K-cOK;BH=Tifvlp|$eW|l$Q<ndoIweomyxOTC!Xf}NL
zIe}wG<wPNbq;$2)Kv<E5Um<OJlMZ4XRwgc;CZBILgcDkqXFA86rgR&%+wcJe=e_&$
zjW4*(aGVi7?YeIBLnXQpqjIf&-BqO9T4|%f&<64uKDjhGSP#ZmEVYdBoX=kAnn*YI
zt%5YnW_D<H$W!^fW7A(F>ku&p*{7AyyrWm+6GcO7vr@;7FrmRuv-aAf8kEYE$+ne0
z<H(3-mAbwlc;tk<zgIZMKD=)UF}rV%{@}Io04UdVJrEn_KZ*VMc}>~ZTt8LC$UtNA
z`1lwoX$NW(YwQ<?okv7^BgA}0mfAbtcwM+l6y1-6W*s5E;5Q*pZ=YN?R(!bBRyEL6
zeF}Pkns@_6X#COd6@9X*?1_4^NrOCbC%6OXc3C&?&}?)$r^uzFhzQ^y>Xu&;?aE_5
zM*Za0!<@368Mun`Mk_uz<sv?=W=`AaCMuips~t+@Kbf^IEjQ_VdxfMBx7iio|B|Se
z9jhjF0?g7ixqPe?ic`z{)j<i&7F>X)PrmM1&!k0pa=4Pw9*Az?`$?sY$zT-xdBg1F
zqt@$4BIor-wokG*m+|g{w@2+u955TrlAp|-Exo2BsT}iY=BhJQR??${uoqk{UR6wj
zwLP_qbslufukJ5TNi;KkjGp}8$j>0P^6d0OK6on`zunsH`J(w`f$2n^O0lwSq}{zx
z>sDH!c!`r<LrJ=&x~EuE{|D{AO$uvgO07vDbTu2Bm#zHAKNKG?YyARBvsRY-%)b~4
zN2Yu&%`pVE=^Vb38v}n{H+yDSeW>p6CP1W_*|t&4#{)Yd@y^&*D9iww;8y40nhQS*
zUfo;o`vJg~i@R7=d{ya_jZ%Z-6TFk_?c%kyg#KSW6p|&Yo$+Fh7Z)>5=kXPjH3Cx&
z#h)tC?d|RPY%~=R!y>YZioG6+O&!%XPWu3}{kb(}-rkC4`YK?y=4OE$#I02PhpN_c
zflwDQ9#z5z5`l><toQ_Coxv6f=0=}aq(mQ=^a$FEU8B$vs;IssB2Z1O!@eHnk*^;=
zm_U*$Cb#^a!N$~B4@wog2Je##l#gQsZBD=Wxjer!UL)~1MfzI^V|~%ITad?&Q6J}e
zYP2))^Eb~tzbM)!mW!I{*I$XEVW2r|PRC>6(wABSRURHd{kYHVna1{Hp~fL<0Z{tg
z9!{ZcF;hV?Gn3;-1xns$_hDWn1x$o#KBx8|vQ6Rf(FmF?A0S5$(JFMMY}#>dezI(3
z2@&PWV^yn%ufC`gU7@SLU)l%{$YoF9EuBlXUldFLs9=K?hPJZq2V3PAlzXrrw2f@X
z%l0yXO8n0#H-|dCcTR@qSv`&my^&gd|MEtg>4wrl@6L~)q14!7KM(y(X<WOeBWa)O
zJ^q&KeIZJ(LkXbHW%X3jl22O&w7O1@)8=^(LyEy@)PcI8Nss-;dF1ie4A~{RuNN5p
ze7+&lc!0H_(~MK|lT|CH!{wnQi81eVL+a<K<rnU!1qo<dBW9aMJc;uiD_J!_sOMpN
z8oQrqE&m~at6Ua43;Bd@3tl3VoqhtJS6HAxSXF&n;eB~CQ+hJb4jFA#qJMaMd$E`?
zc~fJ=-B4o8Lt1xUL$)<jPn*Yt9aDt(B82f~2>gHLgXe_L#KSMVa-n(gh^UJAD>$e6
zhs~{1sPpEgr5(jM*|mvLwh2d`OI^(i#{3tAR&knz>a0daMnG?i+2!%N*U1pS@W~+e
z*8mN~O83Q0n=(uVl-V3J6w_Kz@bk^tpEQdK5m4Z3!Nhp^8jyz{UvC?0-;e$uMJ~cv
zXr$7*rK7*276&&`4e)-?vEG|WQ@PA*m5AEDlDMPE&1uw`s-Nd=;=jd+ic)(qor|5h
zPtma!u`y#E{}Hr4OBCjQ(&=GhwhlP*Vivu6G+o#WzB2l1>cXRrM16xA%|Gmo1Si(I
z8y&gzu62PT{&xPkVsgE#rtC|9`^}yNg+^vm9!YrDKnX!g)(oM>?R5hmuJK4dLGDXt
z0bc*nHeW6=$s5Owcff3wr9?48vc+n-PdGU_S+r~XT=!<VoYrJTuXlkqt%Pp#R0ZSd
zvPNZs$yb`F^M()Y|6l|rKR)d?x<AF;5Mhf-G&|_S&S}Kf5HvsN5fN4b4k1ZeRu;;j
zqlX7-jo-n95p$qu(ov>}`=<t`@7fsWZy8U&d|G7Nc&qaqC^h!j7QW`VfPrm?gi^hf
zyo{KDcALGMUoLiTVYklySK#&NPuOpqR&W|hqJJe1gnESZ3zNK8v@037bxU%uFFQVk
z?0DLOQ|cKLRJdI;h!=XDZYbx4%(x^mT+A(6?TTiqa&^8;Aot+$V)w*!3ZFv+!B&-a
z^Hg3(-Nb_lydh(mGOGs%YNHWDL`~b@?*7zQF^O3WP=V?Xmo%O?VZOq`y}WnpR|myh
zqI1+}(I9jta|m&ikJXQ96E@cM9ACsH#K>95ibtN4O@ypX(jOQv(6d(>?3=V)-+;Wl
zn}WR%dhcb+G04MDV!nNU^eolg<CB+Bfm)uj2+vn;#A=e?uj5d?_@7DpT#w4FNYx8>
zG~!dxNeEI%#^Z7Wq)$#YuHSet4p@4=YJZTGWBN+~r~e;1@|wEf*R}a>Vd=)v)sFq@
z`nu%Xw_Nl}DJETk&w$2`3dp@rgWG|YiTiz_W5wpxvJcR-bQ$ApynYa}HBrC`e%o|6
z>5*+oYE0RZdxMu>;%DtR*m(|ALYGY6f@94*V*Ac}TG?!zxr;*qH(LXlHdM0L!wOp}
z%Z(ifkgH}j%c0jZ5qCuw)o9Ba<fAtl!Jp5wi>&WS@i}Fy*%$1Zj?Hnprp9+Sn1i!f
z=LKV<sH#HqDT!?E8?`ilsMXM9XQ?oAHFfOG^(w{fJ4NjPi9hr9xjr`i>}0%R*En|P
zo+^4lF5hd>h2hj(wU8SWUfYim(YYgPDYJ!Dp)9#{nWje_*zDZkZ5Lq?pqw8yIOBL!
zGUE7nfc@lTM9g`J7glCIvheoWI#FzIyP>}LKGIJ^3M<~e>G+|VSmIFr#fMO7;~>je
zS8a$!du<i`Q|)KkGcukISLn@rui-7(!?e8bVV`QZ@vhyhrI5```xI`LF>aqgI?SNk
zW|cXgy3egy-X&D~8oQ{mcD9L*yT4yupK<K=EFj0eD<!{?uH{o;=DBk4IDyTJA`S{p
zbZq~qQ%PLf5K)~7m6re6f{z7TMx^*qKQrSI5Mn=C;yY?g413FLj+aP9F7?6T(G#IK
zPEIF}ai6TDFQX3dSabtmWDcSMDfotlPp~;6Qj2uP!U3{_otqeTIhL890n+^R#j~E@
zp5K3Z7=)&_#BFjtZggIIX9qFy8_=*!ka=RG?SIhYW&$rKNQr9<`05fpK$UDqp<T8!
zLcM+^F%G6sfGPi~&}|9MIGlGA6L@5U1+?7#`0)V<$C`DA8nabfnjBAqRz^Q`AN78`
zN%Vtq=PHe-8xx08Qf9xuzUbzOZJ!q-<cM{J5V0pH^|H<HEz)YtI{uvEj)++4nBmqO
zBwArhLd2I-@8P8ig7?~^^bv6EE%kiXhKylTN5t^F0IOwcF_C;Z%;`E@ce=(De^bz0
zG1UlxBnhVw4J_H&ohFjJR@7wz|A-i0Q0rySslNtC3y6Pvs^L0{9*e>7X^l9ryPH2>
zrX7VA2&fIXbNdh*3cS!63o43n<b6L;<q1kyhLwsC*WA`EK;}#?hP*HLp&A~ymjTnw
z_nPq!qxEA-5P)|&P$C)Xjiy439zivW5^k?OfxHe8EBv=)C&ux*4EynwGoJI6j!t~*
zLI~M$YsL`uBFTc^Q;3rE!qaY~+jRxPpKO<1vYq3y`gNz}TpFLY8wHD7bm!Vn7cD&~
zihsHdf)C>Rtef$vI>EP}KV5t-O*sVw%!Gx783*!W24Zh|aOY>o%A{W=Yx8b2mLk%2
zE-!y2{rnx+XrK9M-ob8jDtun3b~Zv_zr$m{9{dy+VB#rFDPo@Ag#s32p|g{9-iNqJ
zA{5q(>bDMJIW0o*L}%2SqfHMAWA5#g4tC=;zb}kNZ)&AC2`o#+^5%zc2VAT0Pb8MW
zq$}+v-{+DBv*$qG<;H~Nk!^<oMe#1Xa^Fw)43!$~;v&2u^OMq(c;~B`=L=b;A8}`S
z@;k@%i4VuF?Z+x4X!a5(&Ch~Ok$VjTg)8CknqmfirP7dr5x@%p_2gqOU#Crvq`d#_
z#1zOIjN>F&bG)zi>9~8oo@wX~Wp|cTa&^<<8m#}RS4Gni#?wYm)wJrg*zd#|?s<i_
zkZ{VCV75L4(=)koW`|=aT9MEH)P>j1h-qKU{aSAU*S6Bmr)KBJv+gus?eCP1SGkh-
zmmIv`&BsR`(7By|kb^maQVTnJZzr7D8-?9~-sJ@6#|8|5!`p8L)QwtD5ME=`0fR;0
z?i|Z_E!2atlN*rYDnDCq^;i@P5F}lgK-DyH)y%_M%P)o>@UW<1Qmj8DU|aEtdwdSp
zK&apFUPvqz-E02?euR=B9^WtBep>e%_fc`qxm|}TI=k*&?vN-oBN;oXlDp!Fb1EEn
zMD08;K)GoMfL{gU`VE?4>)#y;QKxvt2K2TLOeI4ie<rzlFyQE#uTF`1_#A)Orx1!)
z8BsJ`ze+ZJ;xo4=Ddpnj!)u#z=kGdFlyO@*%x*2Q*od*eJ2Eb2^m~}|m#2`}T|*2f
z9u9L&&nUPphX8Y$t+f>B4dEogLAI6r9x><qbaQht_QCx`<W7*Vcciu0WU+(-38rs3
z#qqwzGefkiHE|env5Q{THT&`{f6KKXm=6^RP!b|k)bm_sEU|^gutF%)6&jy>_<Z@P
z%Fj$#Jp>Ktj>~Bd@Hh)|^H}|b*xge2eDtEh<v?!m&N$m=#Z#CqnGtHvv9*p!O0lC7
zaPigGuv;>bsBD*G7nOujHt$*ri9TSzq2;Y{{jU~)r|Ga_Zcc}9Ph@cCKyf`thKh!t
zJ|L_S?|4>Q&3$zeu?GjoY5=WKdt1n(5X)|&!{C9Daj%*~&u<aMP1he|ycoB1epQK~
z5VIvw)6f)+M`V_*lvt)sdovGIZ!Rwz>c@!D_O5%1u@sRK52scy=F#qzHeOH7-^I8<
zh}@drFzqxKkmA@}o-l}f)*T^Z7Yi_By-Z=;(kj_@2Dy6%7c~4;DI`j+!|0TMu{K}&
zj-WQb?NT{?s_DtqO`7fX6sybD6e`-feJk<&cZ+c%)yK;v<U;lf!rmQUYk@vQ0cX*n
z1Llv4cp^MGAN4=b9!>H9gsYzX6Bnd(xhy~<UM8mKbWn|eAlnP|OC9%qr1qyW7gPYo
z{?V>DR`m^^R)RhK<8LJe!QKuL!Ry|4aY<85n>%r>_6^=B&lRAfJj}3GB)8hWC1Qg7
z>`Wtt+6;=WRcots-_8$hhJlf!ZR%lGkx6ks#AX!Rk9z3L0O)P`4CD`n-)CvLgL7?b
z^Ys1CgwFBRS(7H#Xc}s*hg*yh93){Am`5w4@sDm$9|HZnJfV-5y0USA9^j!JsWL;D
z{#Ot-Ju7Ye2JY)1)||3t$9Yn^)+^!Oa7wxn6QGIHv%Od`kk~UKg|<qoPQ=|-kKGTq
z5$`FHda>**09KN)yu%^H3yXOUV!5qklaJTjbp)j|$87cLh4wq(>_u5OEVkmR<K@3h
zQ~RUXX_E`bca=JSzkHHZ7g$?rpG_$f*~GSy;9472p%XF^O3{Zu((*3WI<d_3z)&>h
znD0O-F{q#*?&R1)i#>_jJo<fg>;AsB+qHJgPQHUE{7yf{v-<Dyk}FH$#R}X=3bBav
zubvyJq8i@_-S$(+&MnFjRV?S!YcPiyzg#uUPcF6;L-#(q!_&{sIUz?>I<RcskeJfd
zjl1TVCWJ$LYbMjGo=f#2%7|BE2ngR^5`>#qU>x$a+tdf^Rf%ZxzUMdX??`&;UO&(P
zyY|NY-=k&d>Fa|4boX*wZ5*|p)8-1RSsQYh7#9I?x%S^tRP?%8$&3gp_{dF%*E)vk
zHC~Fz3OC;2jF8gG)>hv=QSlw@k<AaPHTBb=4AvhNdJp`eO~+S4UU%zmJT~M*G6#xg
zH=6;w)pZFu<)(|zjPNT06$V|IlnH$bye^MjeXw-jls0*L?J1>GP(=~kB?*m$l6B*c
zG!Ndb62E!snJ-J7l=ee8*Uzu93IwW#@vLpE5y%ZVLa^`m-aPgFAB?<ZP+d*aE{sEP
z*NwZoySozz?jGFTLU0QKLU2eR1b26LcV}aPAR8yxS-J1$srUWr`*BVcwTqhCd(E1j
z?&<DpuI{#Wcb|1y6K2{yTiMS(|FcOIUmFw^6)Qi183Il5^_JP3NvvD&x3c&mgl>+D
z7?61#m%NzP>FMb;xof>kQJT-r)@s*n6PL6V@1*?B-gdtv|G2nSYPEeC@p$|0-}r&q
zu%eok;&{FRv1{@*Mab)9=M*fR<xTqK=7C4Z^XzzD>fpScAQH2%Jzno}as`3GkBK!U
zw`GMP64{VamzkW#cyD9db<yuJrRe8tY-+9Zn91VMZ|0-7Z+XLZLNs-B(3FJtzFDGW
zEjSD~G~ln59PZoZZSTkrxt~i@+b<NeVr&HkykvVaU7vZto_7hRyh+{av*5eB{ib(s
zHwe;MkjOX_eRu+6_+CEfUEEyNl`PeG=-CAECCq?xEe@`ej+VcZeE-F{RjSPYcxV&I
zg}0$9Nh!=6*WE3_<0%&W%Gz`SQ-406DVP`1`=bV&Dfnzza&xj6XYnw*b>sntvI!EZ
z=&z3jvsJA_?lAV&Gv6Ka+Z|m#rSpq37k&$3nv*W)%4ODD_59rrv6L^>tkccRUCp==
zh;1uoKDl4N@e&ID&EO>L&2m%f<+IfaKJ#Zf?a)XMz}t?SDuyiMsB?o;OFfU)7dksG
zH@QQGT9{5-n3Z1}uu*s-#kLyc**CK<sMuBgQDom9ZQRMxiM-NOsRdUVHRz?ev75Z<
za(R`lsUfhYQDfXPzFFGBBi~;}U|88cJ#n{E+<FCAeBdI6P4SnN4M#<`3?uBX*9tCF
zl0R|NHYs_&M=RBsxtPw7&*Cyu#l})ONMK?AlEuW-K%&i8IO6?`IqNY(o3Xwzd7i}F
zqFhOr@zQQu6|nE#R;TUbEhaoALLHknS!ZQmlOu~Q`|(Q}iik;*Y;&*G<naWend}R@
zS{phkr2hk_-P$+4m%CYycTc|vwkK?KQN-TCaD0qv-HaNhOxoUoj;P4;o-%!6e0jWs
zTji~AJVY{kK~#2q8aDTI-oTZ|cunv-5Bi<5a@iIq-qZ6OFw^3tjeBHt?sPx-G~ny}
zN9Q^yU-Sv~^I6sN=FoDJErC#zb8Pvz=lvt%yS5=8{GjN_*E>2gI~?c3;T}Vyv^3^o
z@kf!5BJ;3l3&>Hut>5<biPyi6khE7Y%cGJI#en6}{Y1y!@sOXbe-(C|>zvFh>Upl|
z3o$<$R!CZn2V59l<!WllT{!<86BO>=Avlb0=iXzAZ9M3lx@?;9m#B8G*S_LL%byM&
z&yy9DOd_JAD_3z>P*P_SssvD#*ebr<CIc&Cy4S@ey5%q%#nA8VNbfR~{{4+%>RQ*7
zyFSrUy<lOkWYUla7pGBK*nCfS->}=g;Z72*q<J%Sif$Rn`@WyDbQzCwTr~_ESzr9g
zwnQdvRt?l%TbIA`4a$^_&=0vS-XP)2%-H!yoNs@bvGY87J8sAGb@7L5_CqdDBoL~2
zAFjMksW^S$JlPGlg{9QqRIw2U*@igJ2)s9?IYPOF%#GqL*LdOZ{a#0u#6+$d&|ooH
z`o;RvRafhdr-m!bp$X@~d2v-QvSA(&Y(KlF+Tv@VS6K-ZXmbYq!DTURA#SJmEI^)H
z?&dLH9F!vNBXZSm`L1zSUcs6R<J|4=uA=Ra+hVRr7lBBZ9vT9yZ!Z7DvF}P(b5Y^(
zs9v*U(x+u<q<4SbSkWi;Ojp9Xm#E60Nk4a&>5wfoRGrJ({$e}*%IA{n!kgl_WLG@l
zts-c?C~|c_*yi@#>{f)V!(B2{u%7t@Vl3MzF7LR?*I&+Fob%_J96hDLq1@i%!$930
zm6y|A`gEO@b-<ivj_nka$BTE603pnj{wu!dpl~y!E8u&^T*rk<E<L;g4gPuR?IENc
zs%L~#xw$X`U6KLS@=>n&$nW;mW6@P)stqLJ2C}_P*MBmS-w{ac>+pJOx59xs<EUr(
zvYUjmwD+!()-8n9=T(@QS#QTTH)=Z{Raq-{a~vCJLA3cfuEcBqm^hrm?BTAgf?JVx
zB1)cZnY7;CbZ?4utjqMY#>@jaKFY{#Pe-l-daeTAT8POrNWSiRL+MI-?a%dmjaxC@
zzx<w@BVeOs`V^uu;fE%f7Ywy?TY=n05Y%8EqzH&A>}zg_x*Of{pl4Z<>g!32CHYNX
zdXv9}O4A>2i{V;U9qWyRLav37tihglf8O)A-P9!#a{9B##gj!rOUoB+ZEO14Z7Y-n
zwR~gZ<%)~=WF;AXH<y~vw;GVXM<`96gYOmp5&4eg7rO1^x3>g<JX!c_i%3>iRM{?!
z5=`05R&djqdq{!`xz<y^Z&lS6A{^|ei5EJ!vC5v*8Y?A%8ea?Yp@L6>5%NC8XEz;6
zzMrn{{WDYBnqdSO3JkC4>-U`$^ajqN5P^d#;RuhW+L_v5iUalcD5{lY0qXR6F`1*I
zI<Mfz50>BpxTY~|mfRzhSE0K~w$fO%lMm|{>>n5Vvd3}jXAjqygMm&6?AqtsbKBMK
zJ{q(2nxZPPzoQORNqW^OhZ5F&YRn%c`*Q_g2USkyfZd|Fh&E~I{(9>+ci77io2*Ft
zh0B?O?Ds4>Xvz|t*wrm)7npwXuGi0_eF*lH(_I6D=Z7AN;Hrp>%QH^EtI(T4LR@#E
z;zaTfXIK@`iG4FTwh(aZR>2s1wTVyfxS#h@{quzJOFOL&=?4?zwIcPTL|?B>y@BH7
z4O03*d26z295~4!EzRo<e_R4*IqJOtZ^`D==-;yBz0;M_-%sVG!&Rr6Iz`Wi9Iv`6
zFAhnjJibixgCg2^K8%{i0znvLptx@OSftMR6OxDxs#8pq@Fr{`xY~OQZ=84&IpX!M
z&5L|#R7O8uob2~1G>)8T{Axi@v+q7#r%?lzkM`{8ptktyEh2*GEFP0JRPaVUfuVQi
zBDFFNOmRGE^ybDYtVj~t8oJr)haN(4urZ-5mNJ1@5?)!;_S1Jb4utymi<na?q>*|D
ztal7fV1J(e3}H6#@^{qe_?`QGPnIn=qQ8Tk_qciI)bDbJd~T#+r<>I%&~qM^Dwa3e
zDOU^ptQxSKLIb8gG0j8^W-@A&#V;RKG4b!*4tgY6Y@~}rR+?ro(WrW}=7*xgL|ymx
zh&T{bz6ee^V2GF>wD%?mPJ~cL-N@z`IJDQe!V|*Us1Y5wh7VE2XHUEc2#f8dR1!`%
zq3FJ}qb)hFOa3s3G=C1T*xI7+A>;_|??Xb-+)0RJrr`QmQj*wxkA-3GHGU>VFk=L1
zX6b4f%cF<8XP#y)Wc}mWg@HygFS#y$2$}n1yolbn0jUiwis1{Vh-QlPz8%vrZbcGf
zU3h`AOzwY;+O|)kddz`mI1)!1m&W*N{btDR;x3hXw^R3Mu7mn3PbVTk_F}s_%qocw
zu6`rLi!qRWo<vQrm-I{8a2EnSaWS!YMdqZ;11WIj`T4#7%5<>T3>WhBgD+X9)*9DZ
z^yLVD27x@N1>gQxCgG)m&-hm^P+Yp4e#eI^k)+2}-o60k!sMcfzTdx6mRlb=2rUUk
zzwr~#qx8LQKH~dFU~$u-)sY;M3j3jNP_ORxekU<AJDO=BO?(cR1lKoIR`ouaPQ5$%
z#JRn^@7d1x^ZV4Gc$!<F9)A4k9Bvi{eYc%w-WgWW5D?fUWb$!WiWQ<UT(i9SR+zy?
z5SW5GDvMQDH#<F?Kcqgo?e3=0>jolTM3YvE@K<QhiuK6Ac0HT*Izh9?V;`?kbvt(^
zy?8lvO#Ye+KS)?u=(7`+SP|QWl_^HBz3qwhqYf;Mc->8~<<uR?%->BI!KWAHQpl%2
zw*(Gr^mX~=;P@n7@k;8_C4lD`{Mc8NHE8^@4q2_knQ8U2%og$>GV~@L3^`;2dRH0n
zgS~y$aS%FNaO6_-U;PcL>PNFEkP46U&lh3!x2oi}g<YiF4?JrmF*7pXEMzYw`*5MR
zaOYKEdMFywC6R{mv1aZ5Nf5pd+TzUa@I*t1Kni6B2xuj!r?W^`g=*X0Kk?(Cx6a$6
z_owc<W1S8~4Z!o_h0vSNjOaex?mdLn?nCg`@AZ~S>{(P_#w?#|_OiSdA&a-7HPN6&
z#B9F^dX%k-mDv7oJRF17M|BJ*W9L!+p8bfXPvLv>D!>?>4S%a_ea%N<PZ2T?lk9l%
zrDt?>iMvTBNDqN{KsMj^yin8%`^D=7&5DbW1C-(68ETCkl2Q%*A)ijVcZ||Yx(&cP
z_$AF6pH5JdzG>p=sj*djV@X)LKrwH}Krr>`oYgo13pQZ4bm-%Du8{dO9`5#IUenIG
zC4}s4uF$*4&-E%NEhCIX=#Nr9+<KFVOX!;5!P9S4B=uZb_posTRp{s}P5N|UhZX2-
zGIc)uYu7;T`9`iRl#NV{C*V`vsRXM@yMPB{JLF1{7!3<fQU^<lESM~%g?akyiSt5s
zv6osM0}@5<b~dd4#P=S5R{B^+fmpWgA*=uQ`rvgSw`g96pXt%@gRa5x2Zrk7n@w4S
z?A)j-ymARG|J=92^wxV1A_?C|LiCfwdr6l1KG(pyx}+j#AlyS674XX$o)ufY8!~IO
z@t{1Wpeey8Q&yX(Cn2X>R|+?&lE1n@Fr$+0+zkC-=p(9@r)w*d+=bi9LM^ru2u)>)
zq&b>gag_khjwRblBj{`6A3VcpO3rY(K6)ZHC)3wyX4Q_|{j3tE$E{s}eTt&QAdg7P
zkCO_yQO|;MO-2%F^>L0XAtU+NH#F64NBx=b%UihRPbuFe-$f%goqZV>l#&h)Wco78
zRjbiu!fMp%Jyww8WTUHAb6>|JxR_WVQ5B`aB%8~*<!MB^S3T#QF76Zfv|s>t|5y-k
z*hnbaOpqJGggx{k7$-fn>-J~;ZPSplaAa;7w*-|d$1)FP=?D2RNw^`8=ITo#4$Tjm
zJS|VoGZK-Vq{kKy2X&Z4eK-*Y02rZT)cHNEvKuK<rF)Lrz|vktL}u_}emi~HlL6YE
zIOicD9;A-$Y%VJ1WQHO`-fZyOhG49Rhk}=Ptm2e+2->{`^^UI-aiWhzf)qE}k^g-A
zvSF<`h#o%l1bkL0Zm%N#6mWoCNw+Q+97g7ziK{Lm1h@56zq0BlF6@Nc8MFGknmbRV
zQQZ5tVEFa;dnk!yCa6^EN3dho#Rk=C=%FgrIzz00|K<A{Pr*3LW9bCQR2pjk*8ID^
zddF{4B>@ZXI>dX<geqtCvGz#-YFORKuHInd(Cn64pZ=l=;Re2`izs48&x<6FlLYYo
z?Xm5F(kZvb_Z_xvt(d;r=jOOX=mYfnk9oZpmFF0?kN{o8gUH{Y>2^uXKbv|O%#E4j
zT_OpuX*H)cp3?10u!(=4p47%hCAv1>g@8EB+315){^z;y>c!gEk>#0nlMQWhmwzEE
z!XxhK;P`HIJw$}>57zsaXUxmXD<^U}K<;^R)agw>k}hywB`rL1phDp5SA^;XYGJ3=
zMZ%W8z{y`;t36^seG#-42)_41y!J2ByBWI*RiTrvE54a&)wi6l#0&qBrP%CygI~GT
zj*@$bg}I%?cGom`0WHe$IHHg(5(Hi2W*c-F$js_9cXhEETQoe2F92d_BMq_orJ;A4
zbmF7>>~U(=rNo=gasnADQ&;a#H;%dh{O<I@G3NGp6nRF++rX#2Jt3k@;(2tm!GwM*
z?L0Drz(B%)T^8U#f<{bLhjICnj}k-diHtFL{z|8R{y4egVAPrl#<5Mo6YXTi*wccJ
z5aRDf8N&!z_wlzR({~D-G!#*uL@$dnOthIBM_1ZZ?~2ofZ{<=RdhK`;ICEJ7xo3{h
zR_idyI_Flti<lao&ex8@x5=1^1PS>Qr&1wGk%ExCTq(%N#fJ+r#KsV!CfARJg*#7^
z-idHK;TrHdqPD2S`g=)ndR)4e2|rTPPg-d0Nqm4S%SY!L2)W)9bOg6}bHC|BybjHi
zO01qX6XA5L?z<Ko%Uf$oppy1hV|x+6jPenGfp%egBKAq;hV&N|`>vC+vzAnTGhYqG
z|3R{g7}HHD^Syg7c*6Ce5dk!`GcbH>w?+epoQbPd8VVIT{+r7%lmZD!^P$gf&&&!m
z&jgR);~1Y01rK)xar9{*oNd68(h1gpALgu9mTm)QINMsjOQJ(UyN%FclI#;=Qt|yk
z^i3;O*=5Z3Y<}{~o$sMVSH?k~TXB<7r5I?aD8D<@Bg5J3<m}!1^#=k^A<;iKXQ;UZ
z>tsGY&lG9c{zcFTMM!B{G4lRiAGx}>&a#2lPbE85TkUaC0kRYd-#>75lLrNON=c+#
zEV<AX7?%aibl!9*G<z+XcjgSZ9k(L%wayQ9c)=DVE4sRDNW>q_LcJO<;kG4~dFskM
z7_9za7Yl=SFU#_i&s&H2sK)9*;Fy<zUB_7-fb#+2L7FM8&^(6%SVhZ*-_oc0qxp7x
zDuczrn>GXb9pf$X$z7kj%=IpK13uJ`c}B>kI^j^_z<TX>p6z3{CZ69U%9qJGRDt<#
z-Xvgxj-n{O!$h?5^e224IdO}6j;pPHbtULxk}&ygB;N%j=3IB=8I|-F5?hFvAY7y{
z0$24Mj(FmAlJIV7MWz8rl)ptK7a?)hVc`PJ8;P9HJmu34)AFO#8o!dF$m1CnLoP&;
z*4ts~9fPX8gb~!mLj^+!T+G0eU67N(j^UXD%lq!!;*NX5<gBv3o@H&{*Q-3pB;wYt
zvl4!>DoBU1{pL)-8)quXIj)s5c-s%1l>`C2!I%@<!n1X=WA^*OSAi2FI6!T4u-v>t
zLwFgZM~SEy!~T~mGpX&)SYTsa{17>EBx>f$%J3W>1&sibx|mS^FI}lb069cXQU`qi
zR1~iC^B0g{{=4?5q@kh!8N+Med{PVW?oPtk&`p%{PD{bWG@}t(NK2^Njzc>KfHz=l
zT*sLGJc8tuG&_b=CSpYYNNSE_93E!7IF>b^N#g#QBiww&1%L2i-tD(OwghZMr;4cZ
z*)mC7N<_d;!b(y>zC@C;p36>Z)lw#(T!XpSwX;ed530)~pVOs1q>`}1OB_glqG_*k
zBPcGGn}J%4h8lggKubL?d78DmeyP-=fz%{)$>-LF{E0bAo0Ggni$7jhCL)4v9AY`I
zAOUm%w__N9MCKS|d9iU^;cK(1AcKAqF<;N}RO^P}?`?0&5^Vc$g*$ezI8vGkOhCc+
z{F1S8UDF1p-A}zK;Vd=f4&*9h4u`Q)m>BQtxfj0oeuRety$A&nNVoF##!u@GkIaEr
zNzoenH#yJ*e9i7gWKxfiwI~b?LpSK1!9BO`3UF^^a(9j%cu>!FqcVmz5uxs{bf`YR
zaGgMKGPv_KhB<;1NPfWXD~t^Hy}X`DV8Si)Eo@7``zF?Xyn+vWa~27zKzA!)+wBh_
zAob=uOC+#9-+IjtIY-1K2Eirp5j<i%M<AZLSgK_)=HX)<+F=bqLfG?7tB}UO3SmQC
z+||q-{jfvN1w(rXelK?1E=i66`+c*v104u=D}rpDZK!2RyTKT|vI_YiBEg5{M^moJ
z^-)Ie94LZc<<XaTa4}OhtKpxKGn`yrOKIXyH*mp^e6T~%E+OQIDVeKHMr?iB(uUMD
z8avfNCAI|JTj~h8hso&`QD$JLsnm<gU7w+lC9at&4{4sCct{;H(T0o$?}goQU|d>X
zV#bIxhOK=aqEGHI@)UcP#U}ERlfw@MlE8Y5c*Dbr1CHQxSWAgODFlnD@1X>67p}8i
z^{E79D9TTg&|0p1kTTGG)~KTK&-HmX>)+xp30<g}DzQU@s1nsmF#t&cB;-vDq7MZV
z?j4)`zQ*Y0je+y<sGVNTZ!$>*Lv?H-(Pkv2i9~hz`wXsr_Jpf<(flnY=DUY0hk6u~
z0!s!r<mT&Quk)syQozpr(p7+sOn$uXIlcZ18!eR}FG^O(D~h4_voWK{q0{}N5MgMf
zx~JR*X2^PbRzyRH2_s)Vf$!u_=xs)j9;b($a^Q`Wx-017s&njUrLtM@XWhlVtbT%c
zdev%lDHw5gK_4e2y|iaFAz-E?Kt5^iX6+XCi;y#gSneaL0DAO_cQ=n%J>$y>|5-Of
ztQl10mdfSvue!soHVwq#i?e&aA0@ZaS~g_C%RXoUfxpkX3I~01cPpO-g(uxWa^lOl
zS9*C2+$RidOiZy8Ic<c647-o#8CeK_X!l0w^U8SG1W$;reQC#PBCw&RJwS~JKLXG4
zzqvlAT8Afv#gs26So)Y?MNzg-^eI}QiVWf5h~Nv`*(Qn^kv1h{t*lc-Vr=!^7^2?t
z4S=8$4^MlAl=8}+-r}leEneA8kFJ&5TaJGYiI}ltqn|M_QL(}#g5~x}j`U-nAEkoz
zo!oqilim@6O6x*pmu>6|U!Xso;xvuufy8kshwLcVo%Z+7BX30wXs)rWcEaWQJiv6{
zzP!=-W4<__a(`cDdisa1Y@<E(ge5p2y#Z!Z|0%~f5QNy)R77Rzy?^^+$lVPQfy?bP
zJP$EsTor>__fY>bC9_t$vQe>RYCv{UO^V-v0U~9#fAl8UG=8dFqj>+vWoYS+CV0)Z
zwFJVRwL!`r;?=)O&W(ULg}(G0S9VXDV|d*(m3xX1cG&F!GP%F39<r}OeU557%yQat
zOPUE?0`#m+0x>2C!<md4Dhn6-o>3w)3uM}kF3{OO)g%QO$vht^bXgH3;rz9tdh!dP
zyzR$P?HdMapa}3~?FmkPolKSxOcz@s)fQiN@u@7kpxs|>5MDTYC`Q-a?P#*u&E(JU
zy$M{ac1US}iR;wxxeKh@ShOEcJ=ghqn8m)<)pmRM+jq*_izD9yc05T)f1G7u_T`UC
z5Td0Vs+4ywv|LIi=r(idY~`!`>I)e*!_Z7o&HY|W@Q+3k_7x!pqJjkptv%<o^puEC
zg)l#84r65B>nEU3GM7?gtIygwyiZKx&R;GsD7yADKu=4N@@b0n+xFXBhc?)3<_fhf
zCV)9WpVbVGqzZvH`;)A@?DiX|>b)kMD`BjpvsbO7K<{lki3n`T;g~{6v$;~Sxk|RI
z-V$gzdX>!tV)PdQLc|2QILf5!?gkRY;;7^Zj>$^yyT0>^$f<5T;i@kRO{G78=&68%
z1<W*2JcS)|J_}im1xG#{!Z)2xuRvxSUDWetXeR{qCLxH7c$jcKLWCFff$fYTJrfZA
zuDGk8&diptn)Mhv&AUPJ*zDWdZ;@u}iQ`AdBxkTfKSNty)+6D_24eq^E2MA(Au>M<
zo;8M7Xym(j*M+2^$x~I_-}gPdsZu`*1x#J8wHPY(kzfAzO4~rC9?{)<<}!%+3?#L!
zX5;rS%W41>w6e0XT)&8NecHMj*aWp?iPZQK_~4RTCJuSxv#be0|KJIqSOT2rWMa|@
zY2w>1Q---3mxfK&rQQ6!k20|(yuUPXb1E!QJG@$;w8jSNXf$uO1yakb6T#z-=wFP7
z3_oRE9p`}Bg&VkOV3M@;<}T(cm36O5VkekQS-p9iy{X?+i3?+4ONQTHEkRC-JD`U8
zNE}IQxR1ddJadey%eDO(2PxhdDNMCo{u726J!zC9-v%B#yg|Ds_pr~Zj_@r?Ty{5H
ztUlxa<pLBtmsz}~^p91m;Dx{LAwRJ*lR~So(Ahj592QjC^#@262+*fx$WA%pxkUD&
zd3U{~e`)y~n`Gk|snZL-kHjrs5AHMqIlU!N%j<~st5S{7q3Ri#%cv2u$y(aCWr>u{
z*2FEv&b}DsmlyFb)%>|x*a~RsE_>`z(VWmVi~Sk5n+X%U$J8eo*|<-iBI^ijB5jl#
zUjrVZKR!hM)O$?&%)7APV(${(JL*Ycg0mXp6~>?Cr8jTZpL&mCdtFBMw&OK=c&cwV
z9`{3ZqNtREFBy56RE_D*d0)eYtnIuK+w#xRXJgGNasSSls|v2`BrCFC(D+lImT0tw
z(3Qq>X~ossA_OVD+@wq(&UTi%Y~3F+uatO`3AyX}4ftK+2gVkCy)38v%(>W%T4K<I
z(RKB4<hQ(656)5q{gd5I;`mR52z9TC=YKs^R%Yh-;Yv22!?qwNZF#CKysvuu%qLuW
zF%(ze1@YEpGQi&>D1%R9uyEF85;}&3q;mcEoGzH1<$m4CQ8rriH4OS2x6<AFqRbHo
z=FyFwrEf~2?AqHC$*ltUNKhUZA2dl4?s-np5e{wos=~Lt({-yE_qb5Wr(qo}yaS%;
z=$LE>K4Ki9M;ghAhD}H}x)wASK_knP|Cx>wyDsg`1A@3sjinyRE+|6Mcr2hLnWr<K
z$-=jy+#ZeC=HIeke`z0m_&|Zwi}mSix_Mj#b~gb1glP5)6OA-ip^7N`M+o;EIMY=+
zmhd&FyCU-AXvdP0%vFdL-#Uc{NIfNgPKhFaZBI;)cQM@3Syxi&Njr%-S}o;8@6Ro4
z5>nd)y4s>kV#?f5DKdHd>W{ZY4e~UY=OngMgqOtJM>fUbcEWPbg3*~4_RHeaD(hj^
zFa2RVtv4A9_RC=36Y_Z<)8_^mfLo#_b+D9sbq%cE0sWa04wdCR<N&S($m~tm)INX`
z<K$(AbZJzO0MM0~U+!Ho@_>|=lO4$KW4*o>R!W{cyd0)X3q@%uQIqFri4}5tW+qGs
zxnKI8A6e1IYpGWgEC2|iKAZOoY_nko3MHVS*vF$~g2SM<WSzo>32jtKp(BkF**lZM
z7`RTz2%$jE3QleEa@V8qx@#AOhkTB+P$zt+%yg@RH+IqNK1PEz%0xg04;lOQt`p4l
zcQ6RTxOg>XtRk^@(aEr$0FOSmb6UItCy5ECx#HG_PZp`nB!*fU`5X&HF2q2I6z-bO
z`9mAMzpUUUnGzScpUIq{5K~c?Duc<9Uji+5k(@btu;a7E^!{!V0~~XIQ4v{<v+n)#
z)S8=VR=^BzAsUc<OAdKYR6Cq{pS0G!;XX89k8ep-**Z-mk)8RoaoM%eN23sPt)g0U
zQE^h{da3kr!o;e(X6%=pzW6j-D}b?l_yLoncA)=(I&%xSi@;pKTWh#TTx`)#*J=Nu
zSXQ4d2q&3rSH_o}{J1kP?JvNdN<ctq!yV18E$X2$+vQ^$*yPWAMpHt`Y#7Jebt<`}
z=2VW7U*96c^2mn3O^4Apmz2~`z|2n}Z)j&?jw?I&F;Xo(Wrd7jVvE$-^~g6IRY@G0
z$Y3sF9{?=@Kh5QSjijRhGVOZ<E}k0rLcdkon8l3!SArVN-z+>rkrC*XndIJH(&7Q&
zVGxZD936|xoXLoitcx*QGnGx`|Gq_VcR<i&)=6OB45^uZW<b0+5anetYIcVmDb?Q=
z*zVmYvEDtR=4M8uJeJto9BFzqF5{*eHbpj0$I5%(36;Y6fx&usk?8lNHX<SwxAMt6
zH+!bc-&f&PY;G~ol0;Vm6mdp(GN+b#>XW->|L<}h9<HMt|8y0_vHtZWUCGoU)~A$}
zxNO9>b;J;HB7sEdsmfExQp#&PzB4Lnc3f#S^O8%Eb)8&u&Sx8+)BgpZsL}{WmAU;=
zOU#jQTqx%R05b%qA5xgW+<*psf`7BAt{%Q>$MVOl(cmDE7$kSHjud{uIG-he<vb~(
zthDZ%{scAy0aqa(SIr$RKuI>L$KZrRGT5oCN<7fFew-xq-X-z(gBfLfW~=v-Na)Dd
zLODc4#Gc2~FyRpmzEGGx$1tt(^~?v)ZqEgVzRq^sp2&KArfm7z&BW}ePKig-{HOiK
zQ*5WMyIm-1{4DYMEl?!7tl<(EG~ocEj<Dmd2(OYZSU;ISfn+Mp?WFc0YXEh3VO-~j
z%wv;%I0|>PQ%HX}wC_pe$Pd!u!Bb(z<!W&L+b1Bk#6`4F-|1b*GE?afTh{*avaAvK
zXQIk`liI06TIh1RS;(KiSe^JIzinB!n^BF21$c5B0*RQ;H(_0G&UybFG!^1gfS$aw
z0ddk$KaKh}F7i};PJElK)>vE<++koxwh5J2@$TFeL4#-;(PTU2Yr5=}D<D^ygg$S@
zfrwTkB-z}wbT8)uxd=V7A8*1b6zctAD%!U0=FSTxXPT@5)d&8yP*VW9v*O5Nt$C9V
z-iljPbV?9f>O$)FvTn>!7hj7CeZs(IhoZGdS;F!sL+E7B7$Ky>PC{wS!HH~LP-`#I
z1M_aMke6EC#S?A>nW4>o7kOv>DLkUOEX^!FbIit9thn{|z$ojvGDk#0RJp%MFNeXJ
z9H0R65-fmRvG^r1X;zt_53P~M-;{zq^U@Izf;b<&3{!M*<9ur!x~RfOv=PZGcdIXe
z9K}1lnuEp66U!S?%j?}+%kb<kzx`<1xHH<Y#xwWNL+y4BM!AN(sn7oLm1pviz(E?5
z53fju%s(c^S{UKwoVF001C)qV`-L;K;(w@Ozei}h8`3Au{Hv2Pssk38+`{7zLi}TL
z>$&eqWq{Gb3fyHO2De7_v0>s`^*DxD>snQ4z>Fnz-r7++|07q)Yo9Af-|VZoLYMQl
zz~o`CQzjFxDMF;wVYg#pH=+NDyM2TzpikjH!lvcc|DHov$?|z7p|s44mh07>+d(X=
zP^m=ybRl^7h)dxg+0UHwxY<QsI7Hu6AbZaD0@jIC`0-7X^-m2Joh7--2!eKz1f0J%
zi$EAJm)+uuCdowGou&$MK3#IcCzIbh)MTdq$G3d2&c1N46SWdpRbQ~7b~ZQ!#F2pO
z6uOdvK<HcfzRuRMYZ5emT$&&ksL~6lcsPXv&42b}Jvp~PGUL%unhI-_hb->-k7Q(*
z^wcLM&3;c+p$49RSJUjFA@$c}f6Nq~9&WvKkEtj1{W(97-X7!2YRsj*K^L<6YX8rx
ze2o)Er2T6~(ZtNFa%g9fTaD!Xd$t7r?dD$g!h3(0=3agAg>R1L?`pA~@eyfdNi*G`
ztm1cG0!f3FS`vn8xeHiYHUCkVpVR;cs<$#oJ|!!|)Y)y7O{5X20moguTqjaP`QN1{
za?9IjaWD`@h~r?{@N8F%<Hk?hXoq3JnagS!bJHP-@CdfxVc)%JAy=FKY3ek}MJd?x
zr^D@Z&~xb@RbZ?x_Xwb6#=|&vr;J9`8Z392ea?&?a_535n{nXb0}e*79wLH~5@SYH
zhW*Q_WNJtu2Y=({!Omj7FOTy`09~;?R2y4x@qy7zruah9h!qvy*CZ>l@=xH0Sh+nn
z5SJj?5<DZD!nb#X3U%Rt^1*2?zFTbh{wC9xhaQK4%gSCwO%agnWMRUg-}=(62@uvt
zyiMV8nNnc7HH5NkUb5@%kb@oEbL3Pn9mII~sWmVsnU{1F-=?wrS%tz9$x4m~H{s~}
zQi|O_0&&N69@8lpKJXPOQj8+!uIO3v08I|>=|}*IY&z5EJkSOJgXX8j9cJYY!;RY5
zL>9Qv0#w=*lF3lp)5AZ8%8k$lf7L^U9@guB$9Hl$urh#OD}k1bzC`(u4%XbVlfdXe
z2Vc2^K2oPD{8bJH5_dl`ad-sk2!e}uYIMXT*8<e3VCA<ActCgs$WAqzmmG?MOV?Uv
zEjrnMAh?Yt#XLpJ3D1d(yx*g%V487ENjz;~Y~L#ecZpW(X_w%LBfE~*$(_!kQ8z+U
zi1j!YVI7|an7*H>OM>Rxx+~$}nLz{bPE7lIm9a57<0346xHrKU82#+Xv}WEh<J=z^
z{Z<Hb^WqK=L}4<cjS~CtBx8XJ0K+|K0p_%s9F@Not?%v&-35m*M+{ttJ0#jMW8A%1
zCy?XJEZcRD8ztN{H3W}pnet<RV8*$f;@oFzX4T(X^iZ3lYG#fc6|>`pt0o|{XQhS}
z%T4{hINZ0|j%k-Vf5#f{&oZeN1r1uvx_We0Lnz)~37AH<LM26mKeA)!=58VW`sN?4
z|9h5T?MIxle1>NoGB40dXo#JSYczfS{KW}BJVl6=%FDnA_uDetoqV=RVxJbg3}RNW
zkcELs<J;<uZCYPhyjX5*qE%w#YMIo78D27`;XVZ~V<W6@zI6O3Q<-yotm>9{PARQY
zsS}59&6k}vl?qCGtY!fc2#(@kl?VP7@N#4G-Eq1Jb0-(_!!Y<(o_Ht-^WfnqF(P}*
zBQ=vUJnAkyY`AW}(-)>hZT=iwjxP0qT@YZ?rpP#SGb-+GmuQe*`cj74)1@U?>qo}?
ze({8tm#}=xi_czl7yhVQatHz>YC8cTcpn8hSZV*7`d@2zlF6KI_O|4y+#n?FB{tJ?
zb$X)b%w*%^B<A23?wDU95JXpo4WAJ$7dv2HSf;s?PoEe!&@O_$@(_tTG$Ap^qi@(s
z+-{z)JAI?3gd%Eb-`rb#<O1H{8XRQd5xQcVELrbAw~x8kNsX1i^eCPA?`p}olFC0=
zL113eA1Emm!n@|Mp}U<=-`S6B!<TbSy<gxXzOeTu_9r-kg2JMWF8Ow5Qu`oPFqr+t
zI+zeMzAPNK@2bJBj9r2OXJ++>ykilWrI$hA8TkiVC4*+we<#r~wJWZ`wyftw`}}#P
z(qkkXuI{b*;wwBxpK&_w@pGc=hfP@joT=F%fmH2Jj6Gh{rMlAfXpVLnoAO>O^BVt3
zDB1ySqCO2exG*~UN#uHLOp-c+tTa4SG*}6wdruw3&KAe_eM_=F4_p2l@;WvRCZV*W
zH1y`=NOdmGN%!7#CUdauZzbh^wMcP`@5n}<6jBBt8k|^3YreKmdb=w&xg@ws_1q;c
zl4?RG`+crzRI<WB&<EDG_vI}7-?k*<f#*(G7aa;LSDvME%b_LyvuS|$k!!}cbGm*w
zN-L3#f+0QQB*vs6-Wies&fL$Oggpgmoly4SaP;Gw7)~u)8ljKI<@(Bd@Z)+vm2(z#
z<wOna>n^xzL1ar|eM4kliC=(Pp0J0Oqn}gq%`>41M2d@+Wq{`IS`|6F#BktJ^vbT3
zd(}39{?XIFE|fauqZ+)Q-TUdjsh&+&7}#&|VTj!k1=f;cUr(+`V;eP(TchXq^9{q$
z(Gn08%-qM_^r;5KGRYV3;a4kOnHbrB^iF@5h<ZeY|G`R(_5N1DFC%07he{&e3zN|&
z-$s|LFfa#gGhgnKjrnJ_IH5wUn1hLirqSn$LRIh%KFlQH&&oL99BTb_h2=ai-9uO_
zNJc=T^<D?=-ijISuVVjTq*-q^d){o;9CJ@764|8#6rI;7e`T`pjTqm^qde1)xK_*3
zPWy(Ae;pN679O-%9DN=b5~G!%9y<<`*pO*0tS1B4s#I5G3DFYVRo3A98=~Cc5~Jsl
zi(x~Z?NR~+54e~{2fFEaP(C6eqoo-X+wfkq&P2bwiX3*ZCIc3;Hbo=>CLQri69tBc
zJ6FZwlgvTfzoz~-u%VgfK7zRB;$s}w+gVIgFAs6s`MYwsg6d(CxVhl@9uRlKb#yC6
zFQ9|O$Xsh>p<pl4x{%kDIqKy9D)%HqRVLe4O~AXz7z%>z@LAvSgx?h?aJz$eM3Q7A
zV_&V1LDwkVf~BCAz?+S?lw8f|WOMuZj$!Ctveehx$uvj;lxbkwE{V2@Iv_qpDr_}(
zR9k5`_h?Vc3{P2o4;Lr*Axk!o{t&7gsR9Aqpl@fGjFDz1!#4$v*9p5BrFf67;YV5}
z&+(DIj+=v)9_I!Pfd&PJ5Ag>86U7E*LB^J|SpvVB9J#6>qK{y|K_7dDq%pz05%Xm{
zRee#`Hc239?8Xty{F0s%)+z_<tnlq#vUHGrl%l&GJ<k?Z+Z|xHW+fba41|lNau+1i
z`^MGJ^i(q-j%jO++zJhBW+%R#bq)GNx7+Y8yitaNo5D^~N3ha*ih`pKI3|@5Q$7a>
z6W}y+r*aK53h)yYaNs~1aNBkH95lM&hvy~sii9ayr#FHi%X_L*^p6A&#;mcv9O48R
z2Zx0rCg`~s6^IAjK(kngkfpgCSMe%~y`3G8StA{3&eau1skb!YIK*pessW`0N*Xv1
z5>WLCzh)(*c#-TVy)m8l&w8CrUuuuH5;0Fb#Qy`sGTDp*J7nI$g#>ls3_NWm8x|@|
zMP>+wR0#j*BAzbC#^MdOQ`*~n>!oV_f1|tjd9DC4pcdPrT{j}?s-94@iPQP<U9+IO
z(yl}PW}`$DmKQOlNpa{*%%PS1p~~b)J#sQ!3~tqj`2nI#7^fQ{7DZ(#%LuYQk2*J<
zv#5ozW9)&Gcrn0_Ir8`a{l@jfU!3SG@%2%9UX=X`(YsP)&V(kyzA{QLNJcL?aCr0-
zVrkcMLq5@=g{kyk>D&7<{?5ftt802-ck&bcHfLd#BiBrownL;UlsosO5$|hyjyd4r
z3=(dh4y8}boAO4qy|ksF{g2!^R}Tb$GsA;=)~IETKJ0I<fVmK52}F#V2;k~oa^ggJ
zKos~T^gAXIWafofRaW137pDF3z7Dofdby7FG>V-~X6Cc53wu?z^6lcjK!pmlh#&lP
z1ebhXg9?SLvP4n!r~2j;57Bi3VQ70<WdegoU{M2cnO#6*G=(xA%{>(ZF1!6K6x7Dm
zm6DP3=0Vr|{`bm+kcs^UDLe~2Csj1~MGsF<l*HBJD~%)!=@2w1%7Y7jas>B&(})dD
z)4b5><fN*Ar_Dk1>RKG?&<HX3*$XlHfZu8pslGN_b`0!C11PZkfjrDVaXb?x_?V~m
z@%2Y9c~#V6-^Vt7D5#Fhda<NA!>gtct6*B8l9o;lmTVTP&iAiPqEl<WIhs73A@5&Y
zY_K@v%?tTZs2hmu=Lskjc<=+j<TgB?1<-((uHUx~Nc_kQI)7M;XSe(;={v}BP?+jM
zl>~M*rs^Zg1PMRE)GX!QM$<CAtFO_TG=Q|jZNpXdy_Mx20vPxl<_98#K_YW{bC6=A
zA=J}^#R(EiAeqCI)%|tZleM<c{L7=mf&Q#_@_&%ba89{|k3iZmqMya9LrK<&$);RS
z7EimL(>KbnIop4yYlECSIe8Jtp^yBIC=UZ_C2&U|O^}oRnS%jUkCqE{Y9ZfAQcOyg
z+Ti4B#vm`L#sCc{<grk6CEWNRGZ52wSy;Yt`e=|Z7!GH+(tRZ&l6m%a*qTr*AMqgQ
zN%}j^`}9DSFT5Cq4E`HxbmQ5Gt`Y!_hCW6Gz?k?Q54hgHMZ-mm#dra3v;)m4is$0_
zh}42{VTdA?bimcEV9w>0Yj>3^{$VglUEi2>wNvugJx%dFSp%nhAni9c?+50TJ`{}@
zx$I7_mh~%Bvi*T^HANQ3_0NS^82k1R>s3<i%ss15cGN%f>{9XVG?^i|Uyari)O=j>
zbM?Qyt#5mto&20)#!UL1^|dl*b=#nqbX`TIwB8R_7E8_&@<jUDOit6TnBWy0gb^<*
zQ_`T4y-wAHt?jz+Pu1$}kN{g#V%G>{WeyX!!b>&4y-^=>h*8>bH?%K>I6>TOYQ^FE
z8w?iw$;pWT+S}_U6QU2dM8)mnQwoD+?V)vAf`Cvt#fvzSPGG_V$?l%wt=et8(@c3f
zRc)Fc{Ii;(GTTD~6Xh*~fN(^mH2En*-p@%vNg|#LNq#@LnKngg%FSENWbb;N_Gg?O
z%6NNBddXsu-;*4i%_f}7JS>zuil-Qn*`MBx&Ju1RnH7!I%k%XbTJ)g-J;k2c(}@nK
z(B`Daw0q(x@GjO&4IVm~AiTdfaOURNmrThE6Tnca6?Y#>cIMr<?upj2z->ENbF>~D
zn!j`A1CE_VFaJhhb^XNF)l*mZ8B|bR8y)(;@4)WjPiEe`SUCB$U*#*6I-ICub?`pD
zUNTfg!;n(VdZ{H<y+xQwP}FI+3-CHMcxnsaS36seiT_698vueb$TdhxtTC0=N<P5}
zJ4nd1oRhoZV5}wo%I}0E9tq+H+6{j^MZ^l&MJ2Rcypam;&KjQ@hc#Jikmh72*#4VD
z=gYTBeMjxC%DS}}tCaTMiThZCS?3NdW{8y#Q$#LTp~34+O9w6^=if1qq9TNfk?985
zfirD}0ilOA=4;R@Ssa95+xC;0a_#X^cmelI7NL6dA)wZLrraL39?2y-kN+vmID`z=
z5*5SyH1tgoncV5LnNhntj%np;bQ|NZ#S6`uHV%IUb||1(B_!IQ3kBZ4L;hw*(bosk
z#{BA>vns?YjxzC;r@K}45fsa(2Wcxa^|`6@+_`#J<Bu|Fssv>zF=m4X8K2kmwcd1(
zCYvNC4l<kcJF|eHin@zbeBg?@>Az}UI{5{Jw@f5`$9#hd6$l%b9y2mkQQ|l$eOChP
zX_j#z6pKs|9o}B1nP#A<!``zV=PR3;Q)EvhTv@9tk=^geGRzU>btat$uk#IV##Fp6
zl@;=}6g}xscz}Hy+}S-cG~;u@LxVkPHMYzoVksyLh&})~gUUtNNr1~=Q{%07wv3;3
zm{!e*bCrh1ji<~ybdzKn8ic}IL;&JTrZBs;+lRxW<tlO$lRAWvrOKWD$sB<OTMTzz
z;-o}F8AC<5EcV5M4#;}ZyQY2hz*{FCnTY5Mx*JXlGYpWRA42>}6~R{yk6f>OC*kUS
zKeD?9$B%dEGL-UJQ7d!QHC}h-9E0nX{JVZ+7~W1vcjBh7s*U)42-n^5ihUQih|E1Q
zSVd9SauNRK_gev5QZ5`8gWt?C;ihbJd~=63yVSPtg5+zq6X<K~emOi93x^UE%Uj&N
zfX(6y3}r|HulEhUeYdq3rrzLm9Cc+eAcohp+V&$mHH-o$L~cp&aE)hkfh<4X_O?!h
z`13gKEBfj|0<>N#N2kJt{zC0TK)<tpx7OqLo}g!vT^ve=b7)wB{GqqN?RkrP9z=O+
zTrQev+P<y^$?~fz9a7;>4};=v`^?@GSK3UhE53O8!vOz@323JGw;Jz1+cZ|$EuX)o
zWHVkS5kxmFlY%rb&4WFCAKRK9?yUU;h49(6DLUbt5-CRC)*Fieg#<~Y5f?M^cAMW(
zgl<ow!s=`&DaFXdJ6>AHzyazIlT3%S$hM$F@N~5^p%(GH^zMdEcH3uwMpkKv_`C5W
zGP^<$CiHyqy{v^6F`?zVYkeIzw;ifH@yb`y5yoF;sLSnFF7d?kV?y4+Kjh^DF9z5Z
z)F$98QGt7^B0zvum%eAaXoT?yp<vfrDHv2aSg8djN04%-zU{>Mf4R;R@#Duw#tN!q
zFqWvACm}=G1SMwA>Ca>+7(P431LuklZA@LgvEC+#XP4(cgEtnY3c!#rSG!hE&1XKY
zP=C3!7@hYm7UMj|NVP!i1`H^>(dFN)xDYvxZ;-H?P^Jj0aAr>`1E8dYZ_l_vHM?&4
z){DMSKe^A9cg2L`{%Q}Ek<=>A((P*U<dsAH9RrYa!vl^#Na|^Xo`-CH>`L-$dimw7
z^zkNeM)|6CzFwuwcVVAEf-Thmars~Ru!*oB@0?>sgMY*(520=37Q7^s07bi-s0xuV
z)E%EalyxY1H?&mBjU~RM#e*~Ry-3enU-eyf)d&6I@lnZWA<Pz^-yQV+#9eiNy!6E1
zG=0inI++n^hyF60T*XhZv$)~j<+jihHatEn<Rol`{V&>}nILO;g-9kb^zuCOvJ;gO
z_$;J$wi;QH7m~PM&JtaCbm{v%v<s!y9r-v&&7Y4irNu6FSR!WuK2s=Nf>ze^zVY=q
z{p8NgNd&aed;<j#7>fV`vF~w>`QMJ6@qC2|VVSn3AZ=Z4`v1~BWm2Pxs;4RP45~Z+
zT+6&)@j}WAB0+PiM2CI}zIR(O^gaaod+sde;9mLQaq$S6yph-25sleOz4RGMJ87D!
z)u&$Pn@aClyU&@gqQAlUFKHBAUOl@anH3RWYQ~qnY0|7UcKA=;{!^yLzA~k%Gj@E>
zDp1UcxbrJ7N)0FH@W^oWq+GKwI@C%Jnp@+Q&XcGe*6yG7*nT?E{EUpLGsx@RCAhiE
z*kjll`$7bxR3~;_#JHxwN$w*;j!-?vghm?m-`fR9OavxAaXdheOr=H)z1o3sh?M#`
z{`>vjFJw$?&<A>QQkc%+8~P;D=wvgz@QBYqO%NtJx$tS4f*0Oq>V1&r3qbbD50DYY
z?Wiw-WE2OZlPAgFMK>NnB!v412a2fH`EPymSrhYw&Uuc3@U7Z>fohJ0`ri~>^E)Ho
zT%*-24aeZ`Y%yPt_QI7Ketc@gyIztya%sshvW&{jUV76i=Jd^lnKsU#S&nu=L-<6n
z$ZhT6@M8f#*`MIGU?}Y&wEiKFJm?{4&NcLWM;Vel)h{fj4OrSk82x2+bX2U`5e+1F
z9|H<>|H}m^RKH8~J~V3e#>r#NMjIqd?9Y)MZ+te1;rqK;T|E0PlzeBX0GSpE?RcR#
zVQs`@zpMVn<9U!2DEdL|zR6NF(aW*U;|n`1cYY;3T{?*WbK@XM3i`0z%#D7c`p<2O
z>Ir&j(qGsV$l@<uH8nNgpREsI%3@JR?0@H4a1?l;=@!fr)bDI}%FL2?2igAl@@i{l
zM#aqM+aO#O-3Ksra*&baPm0zfS^to@B$7bQ_b9dBEvkrI9bhLdPOg}Y&G@VZa()?y
z@=L7CZ34s^pZCD_MW2FWkiwsGc|FpHpsVfj4k&bwCtW0{_{!V=IJWps6&Fy(x6l3t
z;^|K0*$XQl-^P_sYQ-XJg|P=`tRVBP5x`pJ29|u`PO-;9+`V)Br63xFP}l=y!?E1)
znefR~PXuy=+1_z4Y}Dx=_krY}ZIpqZvpp6j<hH=9y+Y*x^fX!B3R4!rI1IXQIQIE}
zQFW~ATD)a@39sxHhZp=R5w6c{B0!|<f7bs0q!Y5N<$o3^|G<U+kjJUZB#&3w8-U$a
z_RoTz8lRyA(7hc;MPjy$H$_XyePGshJ7zQk&ur#d)~IlUD9!M^5Y;5JJeS1sK(?xu
zU7J`yUpc2{_fx(%04xh^O0<$pz7$N+io?t>6df1Cw|2ikr`NVq0W~REy_amU0K6-c
zEQC^-@YE7^ORsUhDx0=Z<h6vp9OM)w`e|m{=g)Gu!YCvfO?;PHv#}_AUwFx;B4Vga
zOfM3K*xCPMxtHd1x8h1XoA9w;<SU<?^-Dn><6j<Xm9K_s`4Y;Rma{Hu+;7B=Dt?vZ
zeBp?7Rz)cd9_2Hp>HqiVKgq6M&aFL<rm?hI#+f_3c9%I(NjYbOixa@`uHP^C=wlJ8
z?s&>#boN*jfLa1k(Wv8+-?Os+feb|jzUbCnfDY4aJ;qA+FtY!Hw;>f`OBeo=-2F3&
z%)cA>51R9T9|q96f1eI~{;zNUKMVtr(7%fUKL6K4{y)RIZ+)Lup11vaenA3=#X@7$
z-}lxZzPS74G7kbtUX$rpnB2o3w3#u$?JCTaUJQ?5S(hNYirn6`*mm<*{VJex@?TJj
zW_2`XVM_!?lSfE&v-HICspA}0Cg?eN>?*q;d5j}a0;4=;1x?dx{u2vY>>+gJWy#3f
zXW4<@y%*3Mz!w~>NEff4{@(uo1qhkx*Wc7oc;V2{=7uv6D|tTuPk!X)uV$U?b&2;@
z)TQ$HT-O4*(nwuqNv%RzWKCyr-^1-02NUjYsjJJ{soYQiS1M&iMsFu5CFEbn48UEb
zDWgx6#3)LjPLH8<0T2Pk;BQ-dldpp45szLGGE~s)7npF+5#(pFdNv7Fx;CHF+~g(*
zZftj4jYOz~8l@C@mGv`{x;@B@g9oE;@9huuadS|;2|DW^=>HXUVAQu(>m!KmT?AOg
zalWwg%<%o-gnRZOyh@Nw*WA_mOt~U#`C5I|a{g->IbWg6)FbC%<jA%l`rl$IYWgXQ
zha?ipSk%86#qdbo(X<dq_>NSzt{82as+}@;^8yiQmWvwCDYD!EOBe4?*dQI@1{qZi
zY;mAIEB*${F|jQpd)|9Q*#QL=l{i4{@XUsLbVK%iE%oAT_t1|FV4?f(!*pjq|66Pd
z6$+#T7Q07Le>n<<F(dcKL#oZ`$w=z)3VyjmKPWq<yY%2bL%&1|dy#EbuEe&t2Rc6G
zRYZIH2W9GnGlCIzd)Q6^)+FEAJxVrg&F}ITmh84Kp~E{t=2|9i=bjoAjqwb4bS$T8
zNYt)=#UCgCXCDB#>hoV^0V<3Sj_;3M$e=9;u`BGg5gAi*OBrw5h6%gPa^8ad$jquM
zvw#>ID02<lx+5J3=g;jg{9XphI)gI#LKd^}m=wYJ(HYC>VkW~eB|SHWGRbqOoUyOQ
z&K_4LCG60z-i0)gA3qp&W|+fc)HR-H73GBQ_18@I`d`Lz9)|~6H}niMff-OGi#Z`R
zLA9(>SS7mo8i>ZTVt`6A4GWYg_N|eZ!_^565%vA?=?ii?8|bCgoIW@(A8m&A^_-`^
zhb-k_W-`83R+0;rvmeiE0r5F=Hz6<^M-;cx<nff0zYU+1PMBC8OI@^y{4%ns>BZiK
zcl4?szJJl(5=+^CR339v`*fUIcBTQTPSixJ2ci2HT>q7NLYN9&58yr|tWeKGIuXLV
zfsQ_d?;_V*;`m)(F46uCZrMyaVl)~?g(OTaCxq79g9uvu9+o@*4{vW76<4!Gi$a0~
z2?TdYg1ZKn;KAM9-625m5Q0MpPUB8v!QI{69fG@S!`tLLe$IX4{<^;ygVEi4@2c9h
z=A3J;T9nwuT5NvB%nN@(Tp>*{?9Az>2wk1ybIZf12H^2ILf(gojnRq7tb~h-v_<aw
zh$}kc1Ev}4<y(#<Ht_c8YKzbD@Qv-I>Y{|Kuxd57mG^=_@E*2K%Z^N4dbsZU0@xrb
zDK%j7LK;|ej&!Dci63bK4ErW_33YvdA;sk|D(Q&i_*&fcjl{tIUAK@jBJX4YH2Xoz
z0n^h_dp!H!c8+hyKjhJ3!Ul^7zvaJ-@}OKfx*ll>g*IY(9fOz7u~TMrtZ=aCI?26|
z%du13-gBn&2FCa0e^k~HN~6$Q!;J#={AoWoN6Xxl)pM9X0FbD_BJtM_jE*<-Z<d0d
zHLC#dY1ciYW`{puC-#QK7Va1Nt9+8E=+l$@E^M;}tlxb9mr;p1^koM6n)TfV>Uu-j
zcuTKJ`d(@ob@<WtPVGuz{_|b`RH?$LR<a^CU>a`ELp@|m(J}4SSX>9nlM2!G`trW|
zfcx7>bNF|lTokByd8j?0Z*XcC`f9%~8*<x#h?hiI3ODl{UIn0-nCwlMu%ds)1=o=j
zf29z&B1r5pq$HK{|MdpTc1Z#j>f3i1F6o?#yNXe;hLN^RZTQcU?JpKb@v0LFTKyfo
zitnQJ7dwW~xXeI(+BGmSe;-;P#ehh8Gzoj*na=mfdl9K5sQMGSR_L9u>1XycXV_N=
zDDBz3-m9Sr{IbM6Z&pf{Uql7}18HU<JdYp=6blR6&SVCx?1L+sSk^T~F7~OSa{hw@
z6AEh{vas@nEpXo9JAiS7;f=$SFg(p=K~7MJ_`)TkUY;H%(L?$6^q@MLbMKWr0)-TT
zv$bw9^5^=HnsY!;Y&5iKEvFb&JM2O;x?}HXQ>uwdid9>;`j^{h&%5d8$>#ZYhs{C7
zKEr?E%>RFENdl!Re%yTlaPuu|EY67YFLAx=e&zYTb64VYxV|;I31NUqX|Xx_E8xHU
zLPwlgbJR0=`m)S;+35`oF@fu2Kna>nBe(^Cn;GtIFFmUbn`U%zY|ghoCEt#Z1$DS_
zp~xZIgqjH~BdNB_to$S1w7dQb0$uTGS<HIvk#hPwdW4G&fmY5<m+A^c+SYw8R1mN@
zYv45o))0=KKtqM^eKDd1e-zQ|1i;f)<AiS9mm?0-=j=tA-%eRqs!)3IjC2!Q>yVBa
zyv4WuXthaAK$PO{)sP|f<O(aTaeXw@RP8j5KzQk8UZNZTbv8l9F}3TzAdP8V$E#Oz
zN}9PdrArx!T-ijJ3CtlGA&7z)&*c7s7?><iPr71(_uN7h@gPqPw@-^@S-32o#+M+A
zbLF60!>z-bL-<yQ6ZK!vSFH3A%?pT_`(^K+Si2?3Uug#bR(P{*tfA<dmb!-Oycrgo
zhF0xd;0EY*t8+&ar4g7_M+ZXjNEbFX^kie)=s~4_zw8Z)=7cJu^m^u5c28_HQtR)X
zul9OAnd&ZG{hdz>C}lB+<uu!Ae}O3x0)@3&O`fg(K3M%E$mu2Au*f^0en3>i*7h^x
zj;O|P@YC1OKOfDUZ&N~3rq@Pb$Qm-8iQqqK_YeYfwcJbd53kJJi2?uZvbRNu%Y?J<
z%btuue(bGACcG%&d$+0#?!R~v0Jrj~Uw03LR~K5PVmaag-dDd5%nbue$xQ!r!oL3b
zkNZ+82xhfh9<5R$(3Yz82L)4iMI7GQGr^=*Ji3Vf?c@v49QXB_9eM6*|D}lY;bfBO
z!e6)n@DF^bHkfS1`(U^8mrlxa@yi@d^9Y6jD(n~|B0LcNpkzbh2Jol`?aU%(&;9i^
zu)y!2&YsR9ZC?O8WD4)w16w8LP!jvc(39^s?j0nvm)p!t-6#4pC<#n^2G5m~U9=ph
zo8a(T&`;afBv?&IfK2rQijW&SGXJtcK7Gc6u%!XO3N_ZAL`{x<7FlewJRf(b3+O2#
zym709rfOpo!b-gtzgZy!pG<!G#dhoJn!N2EhChx3@euupw;EZiv<<xX#Xu+an(t56
zqLmXD1KH@(cpPs~KU=^@Y?nFo=&ce4<(bOh>o4Vc<v51w39vzh@52B`lKB8l9Nqp>
z8exkX=CJJGc}Jo*@ctqWmQX{LxAh<Y!UB<TrCqgaUS(c#bl8kq{tEuYl}Y6;q2~UP
z&Dx=qy4qn%W+nR5F>9*loT=Mm%`TkF>Nl@-LDwHF1K^AXM|FuoZSLsHDi0W@!yUDF
zxqi)?4VzCwV^hS>VOFl`0UF@Vk$BPH{m$EC%AcRnQ~k-dwsfdTy_O8IV&x85EDJ3%
z;tNcpjGNkSB;hoUi)F!ScRQAw&GL--LV0ipg1E~M^rw+!uO4xgoJf+VMIH%?CitLn
zk!%Sq`4_KV)jG>(!zhQ82f^;o=;*lMpdmFJ*%{yre0>oLjYOsoEz<fTAM<rlkn=A2
zk7WwhKI0<@gt?C?TAGFRUCg&_$d}D7CfB37?PQ+BMYG|$k-p)fmi+7fgay0Riek!N
zbDpRV<xWUJD5!;wOqIMRabt?WiNHe7t)K|*QB!`m+EEHB%(|Yy1V*I3r=VGMfbg0<
zI?ASS$wk#ARO#7d*%WS3$*RprMbAVh#)_-T5=+oFXS)hfrXA^=Rr<K}Fphi-MoHRA
zaxY)}iKXYrz=xz16)-aGC3l{C%HIWtv+%fAjk@E61QhejXnw(Vhoy)sehB%-aHu`b
zsH*nFzr<6{=KeBq4md!0`)5q!GQ>RT9-09Pj;{s<l*{wzLdnAB`;FbfdeOaJ@pk#(
zIA0j6TQ;RFpW3Iu`RLC<{vu1H6QqpLRs~aNH!%Y2xX9@rLrqVm30Z#-fH)}F$X;O{
zAP6Kgv`(-(5#gNeCe|@P11*#mRzMpbKNDm36Nb&G8QO4Hk1rpq#(<mc=@L2J+LzN!
zu+8@cQ!(7DsXgWQ+Ow1=_mA{C5P&wfu+WLH#1u3ga%?vJR9&EFf{2G^f1R^!8ES=J
zMTQ`ga*QZ%#waJE|JAHR5R{)`Moc`iz3-!c)X<j@LiY^@9tbDr45h*05v$IcVsjhz
zj%P@xCNFec?me75p@@h!(FcnQ!>`n8_(*Bv@$Bd*T1I~_;+Fa+BsY2*W_56-#36i?
zcK)`Y%jx)l44hfGIao)Rc5KCZM}X@oWt8gXL96-tIM`~U91jq+ppBVro~JzMPBvFu
z*VNAs`ZqSFes#<nBD}U3kMG<^H8dOsgKslQJA%VrnXJ#YSp$tm<@^Ny+>CE>vS+=s
zwF$|)BEOh`3iYa+Dair2NwNFFg=PmSnh6S&JV9$raOQaV?IkY{L^nR>ZtB*chxmwq
zFDSp4Df4|tLNe#<;pF7x68!F1l~;H<2g<=0zJfrOUTUg>)BBxj+rzorfi@b91m&qG
z;4Ek0wCba%sOo`(!>%+YYKJ!?ylkmOi=O;<zpZSK$L2Oa1V*M99??bu$22Y|T}PFh
zM#~9m{dKFr=~@Y2R_s$f=m<p>JcotURo;iqoBOyd%vdjeN8x?ygu(9=bD*I2SJAUR
z<>oOu+mn%&B<xI1oM6UP=GV9;LeN=I`La|!*(5DXD7|sRDVr*BU9X2Jx^|??adI}E
z@`2c-fuBDDq{(J_^cBl?1t;U3U_M;zU=c4~;Gh0%`S3B>*<@bbz}dA)-I=0x3yhUk
z=KV3d<})`<Y;Y<rFdRq3v>}F1ZTw|2GcL-a4vn@`>uM6oSLk2nAky_E_s$N-7Cv%4
zuGid{gb4J>3%^T-hDW%Lw+~PGrdB|Y4z6KmtKFcxLX-QK<|;saV#1o2#Y8zm>4?_%
z+}%Zc;l`e*nuU1|<5l`_cP<N@q%EyaE(hxPK!Z^J4^bWBa?y?RUQ7bnJ}*!gSz~a_
zT6*ln<)nZU;(-mpA)x7DCU1APfE8LSOOAC;(Py!36wS5ola`HBbFJ(3ESImnb>WGR
z&I}_>l*sdlKY(@B%4C}P)wB+;O+8ddqn9UDCR~yOx2#oSsvHkZF=5lbmX>*G{<<0P
z$Ej*wIB*~Mr8ee;*K#}&D@szb)?3Dk{_9WkxyhI4l~eCFkto#g-bkmsOL4}V^A}#Z
zx^1~#u&PXxlHYyz>0zSib_%ZK&k6yW2sogD8(ggyD-)-3r)w;dMy^w*a;`ioAd=kP
zyoc!U!OL(iKacdDm(%ly`;>8hxM37cUS8JmPCZ%LrXgGZxo(h@;F%xNpZ)ONzckGI
zf81^FpO<?lxS+ylvPOptra5eQmG%8{tt*cr6CBcLm)v;L2_uHuKqRX08|SYce?X&B
zrH$O7&RmP}W_(08I3`1Vxwstbj}sSG+c>f+ZNhYMG3BYi`6+MAk$>p1{dr11JufTy
z{&tNkBqI)B7gezG`{ac(%OHM_USGK}8_Xt~GL#<=i7&TT4S%^ZVa5vVFLVex^X2Xf
zw$6}w1j|4D3Ohf%sVo5Z*9Mwq*43$(9Q&#2I7)3#TgyPImf^^j!}3+ktoBNs4;R1F
zFSwF2gMh{LJi3<=xfZk5M=vXZeI%jbZQ`lxH6;T@$b{L1yIEfzA&&z#(aAY0lf&TK
zJLh94a6kA1sLp5c4LXS@0w}jG>~|eO-MMlz7#v184}xxLK*vXy-aC5P*kJv^)TwNy
z?W4>6Ozc&a^>V^ynzs_Qxs(QH=wZXvSeXsdv{!|H90yyjN+^ZrFH6$>76_Wo%x>&x
zlmqGg#9NA=!s4>0)9Z4aX;Fu>0@Ut&uBeBvTTulbCC5W9W7LavFH1S@J-C5O<08}a
zA(;tkoG0Ixd&GkZ4_X|77^;5})I3Wnuw=uhqEb9HX7p#I9bD?Sjx3Z^Vs#OS+#o9h
zHysl`8+l9cZYRxaR3?7?OTzb~ocwVDEmsU9jTh{Pnjd=fYnd!rZ0DuB`8hiteY&pC
z0#SEl^FDK&^(T`Ndw4UjgTg(;mi_ij#u4P6pH)=!+s_oxarHxK%R(Q4oloa1nwQ4?
z6uaq&R(Ee(6Jan{y{k<Rft^?9OSxgw>t#}2HV2@v1~@j=*?i%vnO@=uiP>XdZNew9
z*ZYSqil}y1rAIfL5VHxko{h67y;pbOqZY@xI#`jwKou@^HDcWNb&`JqE}3~@=uezs
zLtyWsg~XU0YL%}`4d<8{(3GFd)gN0dvn@LuE|i*?E$fw~UJPoNJDq97mA9F&^{VoR
zs13zb?e&w4ZeuTN)hAV6(48Sl(`nse0jta}UNC^;ekS;;j^yJD{ilp*!ka@fD#Uw~
z)YZ{3rB0Cmo(SguflbB+#(!S|-4~)_qs7NV7<W@f`|_m2QlB4Y7^23%uH`UUQ~y{v
zDXxOc;{unJ`;gO*X7Xo_6nrKJcB3|ORea>MOjS!Z_}@u6AOH=Cdte=%m0@-hxgtJN
z@Ui0P*-?W_9%>V)mOUYTNY~WV=`<lTFDaG}^l;|mL293zm2pKaV)FttrHUh3^B&6D
z^r2ui*+R|M6Z{ru8<~M1k*<&0or3ZsHF1BOf7^G2VCwLA=#(+{sb5s|dlbkFe74vd
z^XbnmA<XYp?j2d2lTmV{!7)cA^MX)5T1$%*4}To!?KkNr2<>BJ({WS0etiF6c-^8o
z@A~@&PqW6lKha5ppPbZvYwgst`4N7r85CB~EA+|!jno$3@mbRB&MVnGlNde}O3Iee
zyw=KkNE26cQy+J~=!G>XZiw^CI`UhMPk-jN#HCzT3l>y!XnJ<j*4ZtBjz--7ZS19$
zOVmcVmSQ5i1LteQEP1ThxS`VRx!vn8O|2JQM?O`Rj4s!LUz}|sO9N4mk>A#&LsjH_
z+v$CkyU1EO4spcjMt;xDlH404PZ2>hI8AbWgNdtJ)56gM-`m%hC)J~Rh1QN=Tdd{r
z`O)!L|6mlgiIVUB`HSN}+kJb9ZbT)Q*`X8r=RM@e`x5PjL<uAK(@4C?bgCcarmR5N
z=IVEfCmM}M_O@cT6^2jsF?<2sC1-S88<?@$EoB<=XRK=IT^OS=;3qiwBcjd5oA_(&
z7$3h$1pB*fWt<vsZk>-&>N$Bt4l|T;c^+Uo>A558%*>_M1683QPsI5@c=08j%yR4G
z{rB@lqcy6KbtMvA5|SPndVE&bHpH4sl-CGCAM$~f*vFatyyta(_$VPMIc_$X@Z6e9
z^P-xMROhu!BFoZYlX1L~%QeoNH9nk5vGb|+DVK@@VV0aiR7T^~0~@isElN^u9sP<s
zO)keKt;uHm_WG#HQeJvyJ!D_;z8m>i3KS>f=C#biR_q8_;`^*t4W^2iDb{?T37*gu
zVx*OuabY95o1S<~jW|AXp~ATv1wDG476cRWe@Xg1b>u(v4uavfnwrtbdC%v~^F{Lo
z$Mf0?DqI}!@k)wF;l|KsyJN$kz3d@ECUQ`N5LleEB^jI>jve;oMi@@b)BpaB&GcDB
z!29kNYExLWN};(_P*Zg3P%nPI=1<rcZ&fX$bB$bzwfP%fP!Ruv7xwO2L60ClJG^??
zSg)IVejSaAHT(!d9#ZH(F{1NBt6Y70Ip2K*%X#GW#_@Jf313SYn@PA_)`xL^y{{t!
zuDsg;z)^RmcL$rRgq`*0c^c=8+$T7HRtbP0EI`$dgIhKY1G%lc#Eh9aUTTqhM??f1
zHl|etw>C*z6HR7n4EfQ{f8k8@N}UZ$BTOUvC)+ThvB=&Nc_7s6f)Qc%&Z%TvAO}NS
zKQ2f9yc0n1nhEMegCtbw!@_&>ko);QPcPWzJ>=VlLj~LrFTW2t>>hq3=nPj^yVIpw
z@demzX-ZM=9hrGUh>W*0hSc_oU+!E<?<py1`>f9m89PX3*#!8By&~)!)oIf_w1b$t
z{Az}7t=PDeTIxs`D`w`T*A<yR3iAm$Zk$F(($v~By%6mgL`TVJ?wt%6P!o`{Nx%I_
zKU}8{SqmZ3Qc-bs{vm?){EJLJI@?1J$nn0#)y|dJ(aBD!AM?sPoKu*V#4v`$><V-G
z(`B?ZghN6JBacI^TTvhVc1)xYxZqo!DIu8cc1(sU1X|?-({7YZ#CG)K#0>KuJMhng
z`9}sD?!|Csrk`m(+Jnn!0%9{RVqsqKIy~48TfZZHBii1y&i3_rUY%kNifRx?+A-xX
z&KJ;g)xrLZ&;c3}rCeznpd3mSCo4nD!LidoT#4{KOnZk$1{+|Ys9aJLJ3e9gZcLks
z(znoQvNURfF8BE5*WY9aK*#yxxZ#$Uz7mnMdE$HZ5dSXsr0h)G+7by4_7d;7^>xoL
zE2l3!0I%&1;c`oa>fv{%t4TSazv{*oU+*wySXc7K)M-3p0uc5ZD}G~0^f3SwV|Y);
z+7w*ptGId^q|QIUrB=B4R8l#6>SiF%DQY5BPI!I3U7IFA0vDh%-?Ky&(O?m7G#Kzu
zvD%JPjQv*U(#Y!L+hdqOr}mMRZI(h1|E?_vyf4j$!<1PY1d=TNwu>(s(vIdYu<+u=
z?ILbF{}WUs<o8sQt%Hnvt9C17>jnOtbu!z{>B=e-KQc0G7f=$@V#s=(h_s`uDIJrm
zkez>UinQvVF5mnL`Lv!Pbx$pdaT}&J--_3?-z>XJgtRz@6;9yi*LHP6%<kZ@Xf+pk
zT40sx+M^6RFR5<w*(`93kTYJBrB^syrj5FIl>Z<NWIt&*QbIruY1fVs4OM-~<!Dao
z#%0Uya96m<m5t+y(im>n{FDY``@D*h&4;>^ze;23%YGsgxF@iJ;F@9z^*>fOYbFe}
zr`wl)#kITmrK$Z$@``Or(!!G3SiLN`A#<He@!h9<8%C@xd!K;&=62_l;T&>j2Ku$A
z%m+;*PE+iy+C`)3ep8drf@$0bAO7wIV9%i{dWA^eLbZPR)%vKSHbP%)2fwKZ`-=v>
zr@G<V?MZ^vI7xFdhJX$wHAl+PG?E|Wb+w`{&EOgwNX1*Q>w`p-DuM0~pKi3ESa@rw
zX>^Rd2ygKLc7G<g?-Rg6NanuspJ|J)tNnJl^6<&CV|FhN=9#XQXg)Ctgu*3tv-^+&
zld1R9$WxnG8Y+vPVtO;XjCr3<4r^<?urq9L>(~}}%V}V_H%GVxNV4~NF|dVe687tu
zOQ>~>2+m7aUx}|?)KZUZvkbU{P`^|v*<ZN1(G_nbjdGVD_-CyrV&QiYxA<!A4|tQC
z9)(zn+|N=p9y&K4acuJtQ))^BZ$eO8WLeZ}3!<5C3t6Q`QXk(!U27uZsSH&r>)rP!
zGH(C&cJd?D=P9^jrYL`BV+3LX{&<DbpCQozU`)>$tRqpE6jkBxp*B%|$dpub(32R=
z^Gh?-liN|(55ZqhH1oMbxXaK>(c47@Lke*PcNX61DE-W82rJpox_4*^DUa&a<r?nw
zRFSBT6SoxibTU#_?BFwV5khLgjAV`*1u&H{7;YIk*xtI7b8lmRDu9Dd_K-Ud|5v)c
zg7Vcp{4Xlb<h8NWs_A%Ep{(1vl}~=)@>Xi|hK!4LuON(MvGqqx?2briKXuI54e!SX
zX1eafeamRZZQ~fF)_X;DOaWLJ#cc2c=9}KZUsSi`STosQKz!xBF@2Xq^-gy;>^)vK
z%l(`!s6(pl$Mq0D8_<)*2+ZyPe0@pQE<QNZP<Z;eMY@9PL*1x1>UG5$b25i^{Q!)N
z!j0M|vSauFhng-CN-JiF<e*4Q_^%~>+Re>&YvLg59V6u&)@8+B9c+wZsbY~G&79Db
z*@0h#@{;mYk(hJh^*^0PjKtPz+ajADp*;<dx2%lpi;1k_CoZNuH`}jIhcyJWxL{ig
z9Y@qOR6$bAkkK9|$1J5^iF+hFXZ2|`4|>49x>q|{e7?K9P5m{n@q1=I!yIYTjq}=Q
z^M}RxbA{nl$zp}Q$Ae@~?n<k+qb70V;y;rmc1wQh;f|-$oXdMFVzU?>n}x5g&CWg9
zs@gArRKBBRNaC`)=PVaplghCP*jpaS8*U0XMX9Boo;D9wgx_;no|uW01%ryoJ9qGH
zY*gpxi^9qhZd~nQoP<cNHj}aPaV%ZRNVDF>uj)R8a#8-o`xx|vxRQvcG0LdL>o6gC
zmGGB4Mk|)q8K(z#tYTrESdZT0T#a<glkIy_AqmeDa_gk9+GiR)CBboXs_sVDVw?)s
zT8O3QvP3St&L?|q4AE0Z-VblX1k<b~b*Bz0EvsY;CF;v1qkoHd@y!xHz{F26p5}#=
zP8lUMwHypO*y4hg`CQdIw<$I5t0vNXqeJUR+DdF36w_PoRN*Q&xfIIg)aaFm2Xj4k
zmf1PYLDz1i0mMbiSdaN<dKpr(pT4l@ExbXk&x-qCF?A#xK|KFare))H>t4t6zT-*$
z<BPurRwc_URk6VXbl0?aS5#4iglr1(c^e3M=u=W|cM0#4y;g=CZ1Y>0G-tliWq<D+
zT9u&elSSI=n7SBW2*#vE9Fi<<R9A<L^G(Gf*e|Y%FO(PfqvC8b3vhnLW~XIEs#uDv
zq2URSNtge81MfJ$8mOXR-+afUyLB)wA!zVWLbv(2;GQ^$7`|@iLn;~~RGI4#UHr|K
zybGD0!BBtDrRs~d-bf#~RenC+2BeZO#A-=*4|%Y#qc<=WjClBo2xzxU-vZfxdfPIJ
zqxz_9#6apxr0RWusmMgMu~wZ=ICD$lty!R_ddLci$|rjCL#8Sl`KGb!?4t_oW1kQZ
zU8K9T4%oV!>H<IXf@v|{QgepQ!CpZfo@ROyGxBu%__v#{QMilGjHB0M8>_iDMlKc!
zyHXb;BIejwAWRIxR+ejM#Kn8hMI7#PxeHK*33iE+sfSt^&~9SneRvTM7r>%`t&4+R
ziI8rsV7p{O4fTvKCsQfgjdoQHGn6b4Ub7KInN;Wx7kVGOVk&>jncSfwy>>69&W33m
ztzX3{*3;jFhAvT(`O}>G_ZKZ{Jh0#Ibonh<ai(EIa5+CP>?a2LRA7|oAy~GmSjT1k
z)fQk}Ij9Cr!Yds+GVz(m4Ko|65`f9@tC#i5bOaET+za6wDyEC_>su>>u_6vQr_!7s
zT18!Km2)S;l;R3p>)RtJPalDBTXMN^_eE9`D<C-PwcBD$&!^Df?@8emCZSfP>~K6^
zt35@>okOhxf5yaQk0dY?$V{kL?$~&M@9>jYOt_PzVH@cbv4;%-Wy<CA-ewNi2T)t`
zO|J36Qn)ulu14|=yv#k6SOJRuJy)j|%55zefsofR1W+WS#?*mPYKQ-WGpv)gQG7^)
z6~eQXL{d)9^wM&T@`hn>!*P)T%aIhs0bW>q(dCe#L}zAd)Avwu+6TB^n3w%`ukc3N
z8(8ghW?w+}DW@~>muiLk@lO?qqZ|OPYhseaTw;kx!8Nh#dHZbTu`J8lt;l)ztII8e
zO40$fKaIZ_6RFHZgS5eSJpE1WFVz8V?r<Q2pEs;3o9K0C4JRIvMxG(1#csDipJf9C
zQW4l1&Ct3k@L+N)Pup72rF~lF8({JQg#0&IsNdK6-xQ(zea|6$H}ZYw57R2I6y|n%
zzb{%*lVx-Ykq&*w3UGpZ$pZ=Ze1o}Fo?iR>Lur88)SJ<SH`+j(@vbfVh`+UAK-CE7
zm`X1Rh&**jKk<BAebx;#Ilb6ZT;n|Z%P`Ewpale8V)P&bxnPuZaFJ$3;(gC+hoZ}^
z-BfzHO%HGyB{h;+nb!<IcePDhz1`>0v+v!NmSf*gRc(wRH3C4#<0f=&7F%N<{7w<a
zonGo?%?E^S)^ehIJ!uG|DlonPZv^ygdMZSo&qqdmXN+Z-@orUofOhxu=Zw?!=rYv9
z$wnzzvASIF)ShE<+z>&<!-O3edH#xoyKM)}t88R#a_Oo93|4z+ZnSEX$stFkWiU+0
z2~uU>CvQkE9ccRs!#z$Zq-|RO?UxM)BPsq$f!OF1&Sc5j%le6erSL`;%HSTL5PHaT
zBQ?r3J<fzv@&BYX4gR;*R6`j^-5@Y9!Kanlf2}NF_jUY#Ye@3_{X5H5M0SmrXsEng
zpe2vUlhIDJe6S+zWs7>S>lGzCce0tDMk|TlBP#P48rkyPh=Qx!f{IFx@B%jPeZS`;
z=ea;<mk5icx?RteqXJrn@%EOQM&!Zbi_DG=aO0t@ic0)B14Bw_`Gnhi%=X{(U_jc8
zeEmOjM%X*r|1CDzEdRIIRN4KkHfmN~TdSxwb6lPq|KI9KCR&Wuk2r<f#T*rX%S)MT
zpFRS*l7p0o_~@nuPwRimO$Cahs$Ec;n={G=2a|YVNoP17dcjhAKibmj+Rz^Oxpld-
zz9)S!-@1vae{M!!C6_BcUH<QK(!ixVAV3*4<kZ3#`L=Al;OC|RP8=o_PmcpMqw~tv
zz5eT5?^N|?fvNC+3QWF&mo}aG^>=zjK-Pt&+>!CZP7FmM3P-Gw*Tyv&Bkz2J@K@Zx
z5G@%uO;~2-I?euHvQvLd@4$_y)S!!+Nz+kf!Y4KyM<)w}wR$nX%<>sVUo624&#kSk
zdtCswe!w~7v0^SudL5eiYhtB$J>9+<*PpP|NjCnqKJ>VXKs6l9nXEl0<--HfLUJBd
zy+;Y}Nr5dmo$=6~nzDo%psckk+8;?l;n8pcj|7C>fqohMUVXo1ASya$nRP&0J<&yF
zOLFNMDn-l)+=n^rH@(~4Z?10PZzlh=frqhCD+?>qHf=0Rco53#dhc?~*zV+bZt(`A
zudiYk3Q(#h_mJyCi_<7aczIJtW}aFXU89+?Gyr3ZVPE4m<Gnjonda&Bd50-&0j6}9
zSfCR(J%(?>&a1OCB%-$HyhEt6F|=ga0V)qdS=oR?C}5Ava2d!==8E6EYOV&(T6ehU
z#4B-2l5&_*a8BVkXT?*{{*Ax0|2Lw7OvSK%dZK<&zG|W>$R15gcSMlBe?eO|TH3je
z{^^-3>EiqcS6auc)fxWG3DQW|DA#wO1;x(6&c$T@dY}Iphuph>De#{5LNB3YqOS5A
zz@m5+V;I{K0Fj1P@_F_AFDZ`uX!p$cyn0ERSRi3G;nVwe;Y6k{`kMu=@fqIFo1Nup
z;gtdl2@D+E4=s7$IYl97V;H3)yuC|^W7Y0W!TCkgp=&HQ<6^TD$#pofh_f-L0-6Dk
z2^);ixu+(XKd&UxZ^ymA`lp7cj5w(1N|G%;bESgvYH_-lkH?2g-DImb>8d6Fo+1H>
z$Zr_IpCpTvV4R`^0r=zCuK$#3BjSLDF&F?vmV`tEt<{`)Vy(^wkf;fo5`>NS1ZOHA
ze@NX5)(^89Fgu6Vr4no;jen?SenO0}hoJ%V6~a;%j_}ci-GJumtjvEQQ$&PEZjath
z-o@9q<^uuTyu`#(`?VC65mxQ1`EI5GVr4yy>8f`kKprBW8qcE8<bTVAUYqkn()c_<
zK7(#BqJDtxC$Td>%=}g<Rb^CPUP6}>$=S1?X~za)ne=Mof2SwOaqAN9Jgmk7t=v5O
zsXWjzL>&k>Hb$CF`)}SooNw+@As#Gx{n$+N30IwlPOW}P$p1N{u9WwC$-cGRl6ZfT
zOzhWcn*xu-WX^={Q-@^U=%ez(yBkhh%dvzyB-L7?0Hl9vjEf)4la-*DN!jM3_~<{p
z{ehP;)|h7IBS5Z+sDV$|4U>nKnV2zF<cuFMPyD9$3UO|RI6TPd)+g5xIOgqDDor`O
z6_)rqgBlM_5*q%{hzWHQ4oo0xQ!jDRlDwwozL%}wyP|`d!(_|WuP;K{y`P|-Sza%-
zIp#BUh9Re>mPlhZVh37}nU5`8Azl83e-=aiGpVjf4$9(6_9H@_{K2Y-@-+N;afhgH
zu<-h=M&vf4wztwPk{0eelA~4Jl)POootEJPB!iif2OO_wb>_gCwT(xH`^QUMP@)Ql
zf#6XT6&1o@1!reAnbJ4ERGYm1kuY@v`Z>cm5C4lC8qcEZY56`dGL^#plA=a%;m0Ea
zul<O;ZZd?pg@}*dZ^6Ww`dH?y`oMpe5`m6qpU4pO<Ctw8zr^C8j~CV#FM$1ZlH*$l
znV?DOG2uc2;gq}!xpT^CoX}Bug1L?*xzG%amy;UeqI!mR>fVuUL+N3@x-7uuF=Gz1
zcDQ?3W$&DAJvH(UM*_Hb6`c)WM#9=1{7F0@FK^m$2WPrh2kvwMjZWdI@gIp+qnt$j
zDT%-E966~?{MUxJy=dvR2>dks*RzufMVbu($%`+#BX)Y^1W4?qN6s-D|BP8-Npi?Y
zgU3OMwN}7EJdPG%&xGEozlR(^D^DF>SL)2Tl<rkNYq0^6f@?tDwSRB>5%=Hnt~&c^
z<W<_s=egR%3}Ejs87nH|5ij!I%C&SV6+IE7_bK=bkcP-CTGPK1n=!Yl7@syZ3G3=?
z@h45dz^Ar*PFARe0ef=Bf2p-Hu~}R*=-UBxOLg<unbq*WRA2*C?t$#BF6?xsH}}D|
zT%e-Iixh@wLv|h$?}wC2A@=c={+|JaXXklJbNlyLAPp6npAjC(M<n+xzi_7s{Hc{y
z;-eT#o6%0+2c1<Bsa?3Llu>d}%h~^(F*ftP8{>=ny64Z%c>ny4|41(;o~yhx0|2TH
zdzbvRTa-^R?z0LEEHFT8afJEK(si@vN}bnT{0cckID>E2y^aZF7K00fo6+jY{(*qG
zh#7j+N_bonn1Jzu*2jmzc0%P<Eu%L9A(9?e%&1A{?wpy>P{RX(+hCfm5TOc1T1M<G
zWvx6<(RYmpQr`e#k$p$N2S?ppy&<U?n<55?2|N!kxol24z*Muz)dWkPeu~lj&w?$P
zIc@aA@&IPiAX({LXML&bWZhUuU!<+!?gP&#8>nX{0)INNn&X4f=Kzn~J%1o~`urrZ
z6U?QUc6%r77#N&xzm+w<#wVr3w?P`10a^Zihww8y*QhyUfz^+vWh&fD7{X^WvXI9`
zm^S>5gX7>|9HUaVP1|H!#hhSbk|i|oQh3*xevM!19a_Dqo_}$A$Vy?le9uL1mph)U
zpVFtQ%cV7vUSD)pDB6@gC7qU=`3TwqD+>f2r1HYWM+JHH;)`H_S12f5GNj$`p^g|1
zf5i$TTD}g+PHIsPSzihd_UncMYTEkBV_si6l9d>?s>YM$6q$9l62suXwA2<`5Aq(=
z`SsNSwTTXT;e(hOX0CYWsfZih%02wg!u(lZZP87Sr;n+~k!xi^wMf_Q)QF7VdYG6q
zq4&cCla*e_=#wDaQM~;TY?5USW%o_wtmen32>b^sIN3tDt?wcy+rJVl_b=jqnX|*e
zL>+gSfkzH&zkV0}u-=r;baex(PeWibprZWwhTzsoovlLny;Y9fb2=mm>`H2r!%pCV
zN=*8m7qet_MNv;|(DHqT6i-CTr;W+EFmCtM#qeyd2137(JnqTK-3mNHF7LQ+3^sF(
zHm>1f3-AA~_P=(pm@+p0?Rapmq5mq)9T(cEx(l}x+ep5uw2T_@2_bk@;2j$O)NyiK
zWI@zx%Sm><c?BJ=<|{pwQrGK;(nm3GdM({ntyCa_L1!d|N04K4V`(vEI*qP;0y768
z`!A-Dek<ME>~BiS&C1H6Q7ds@j!2lAq)*YR_;5MH4Jr~+nW9Bk7WiO8C+xjKBp@K5
z>>tvmum9-@=J7Z~q!j1lb@%k7-tK&zOt`Isf(jN95g8gVr$O9BRaM`1-RF1{)4Dd?
zH6G~i2^oJIztOXd9Y$*xzq~4p0A#CrNC`d9V@>3^;))n8pgqdn4{rnoS;|UC@HhB;
zN$a?u;eL^g%>hXrULt-=Mwc4q)N<BQ<CFLH7+IghKne3D*iwI-6hvr30m&;hnjBKP
z9n!qWaB3%c^*WT2;~rOwqe)Qp&LA1XtmYrteIT(OCG5eP?y3fKDv?<7@^y_b?zXNr
zv+`JP8^er`Iny2AHm@HRjy@tAHUB*%N*!Sl$7grgs^jl5&e`k-d2F3pIlFXiIIt>l
zrxN(zv~5<`!NI2X$7%<caCSpB39yJM$Wd~|XR6bw4rc2j$p>0G6}8u?e2%^vcdsm^
z0f=5UO=dfVJk9Z-Q^R>R<;h!UWx=}#NlyBs3Z|}`<BJ8?!;M4oG`9~!lS=mkhXT%D
z$4KwK8g+3W1IB`y&z4fMwtm_7KsrkyZ^@WGS1NceYLHTS;-;zYhb+0N>UWV}G-Sz@
zg>U_f09LFcNK&-eJAoQ0s-n{U*mfW0W5W}Xc{$`-W;D>!*Uu|r|A~;pRrdGEBO@Ws
zii}-jirowZR>^?dhC3p+=THvF3{>pYcaPt?LNV>4-Cumtse!lLga&bJuGmi;-+mcN
zD^qv0n4yk3YD!xVRf(*FG5<r~RCVnvZhViNEnP`V2PN8-jZN2Q{T5lzP~torQDkN`
zF4{C7Psg*!oNWS2_ML54ewvvLxx&y1AAi!<U$Lco(0|<{n~R2lHGBeHb2@b0FzPb0
zSqPR4tfqInioG>wPqDxdX9DPAoX-_~eF+cCM~ZkE8M=`eb#L$Fng)Vksm2O{vavOQ
zT)tq_*<O=y{pn^V5SMFh4-*Se_LIAo_$WPnL!dVTuiJ{f?!$tRvrGkJO8N$_ijoSJ
zb7M2(sM0-=9{z9aH$=o+=lbhsu&fFyv4Cvwp85%}w@gBiWH@{Vgg%5L1k|xH(i_N%
z6ahIAH^Ji4*92VI9JDjG2JKm;H_ju94H3cCOBYX^u2()Wm^ky|_05pL0ihw#OpA!@
z6|<zI^uZH(0Ng1NQ9<g5p{-Y=&P!WoK6V37yMZ-*BRs+q4(~jkuF(|AI8<cGb-JL2
zefeunmdB@na_=ZLeZ#r_(oZ|%!(}Z6z3q+Hif;Dp_Qa{4ICc!$q8WV$vp%z}se?XG
zPFKXd5x^(<Sa%2I?k3SD-DpVkEzZ8MRGjtp_mNt3#b3zod{eAm`oo4b(v5wrE9y*x
z=vIzoN3`rrEzaOrD$aZRhc_TtdgB{$R}p8>aYZ*jopv<<qoQZ^kw+3oxGRiY<dXp=
zG_-dkza3su$vH5_2251Er-2H(GLaX#5Qgnuag4l{{<D#mwPC-Sx=M*>plyY6Pr$W{
z;|pi5uP2*zAO{khsavvM_rFk*9vS#a9WCT`_aeKQ{oqc_q3FpJK@=;u*c}~xI%u&d
ziy@0}7+S^In$~vr_6_svd40C;Sx_OCCtuK$^Uk291Gb5BG>T0h9$wJKrv2T3QF0g>
z8oWL<lh$a@6Y~Oqk)5dUk;!Cytf-=X{w*oa1ycSyRI;gD+h@t=R52Wzd1hPOS8^kR
z<P<cG)3$n{fN_&_px_~lF!Q~RcqL1PBhh6AX1qS~i7Sl!lQ$!*P7R}HILfplt)6F-
zzst(OiDl&w=qi4Om1E@hIi|Ri1HyjGZ4`6I-TQYyHan>PAl(PbE>QgZlOX$RDXB5c
zU#d6z*kB83n!(M_p~0^0S#t)+-9_MWcOh+BK~P)zPd)YD=iZ{Z&hImmq8z+i7MO}w
z(i0!<&K;|*Jp+EOzj*PYy>=V5a49Bx!#2N5>2{g>pXSeaDB6EIMHR8O$GUZwxX}nP
zeKV;R<3|0CtDn}XNNFh}_cu0f4reWD+?g7w1=zX2PFUcXM0WJ`F&0fK5)tLV8A#ab
zz60JafC$69rQrU`%dx4}#l_^*Y&N`*7_?kTk}fk~O33GsE4Iy9+WM_6{k?(~1RFeO
zZbQFDQ3wf*?|2kLxr3L_$Io{9_U2M3!%|<x9A@E#Kb}p$SqycgJV!+urcPd6)i<^B
z2@L}D?)!`=78AuF#Jx>5JTN$O7yrxaX~u;bo<w4=Cy|butD9R`bhNpIqnalYNev1~
zfhT>sEkem6QJBE)vEpltRSGGSDC+2akV|Qd=r}MYl1pAch;<g!l45KAmp!#-vIXF;
z#I<HjPq)Wrja6<~*OVv}EbHy<WdJ4Ih`JXa&oyBUgMRGf2s4=fh8FSRm^T)c=|AnU
zayj=Ej*e%$<7HTI{&qO|3$8~S&0|+*S?}8cyK4eb!_^GcgrSTg#ACwSccH$@Y?~3@
zDh5gs@MY*UWX{QT<;+Ydc1m&WHYVFVxl>c7q{hA9#eFBz6uq@QqJ_r1IFpV5@)!E0
z!VFo-w+f>fG*als`;LkAhHO6uaZUbMY+hL<XJUwBn)817QBRSIecQpRloE)!->b5H
zmjuWa_zi&wTd_Ou#9f1$ECGzrbDG|0-!Il5{I7|qh=V9V|C|0d$Ezzsz4PiVCB^7l
z_7GMJyrMh9P*OL*SIY#T>7ll)yiu3%p@q+^m&*nZPLDn2NyGD{)lquphW&iPb<GNd
z6cqtLJs-E_c7dmFM~^J?HI~PE%wfU(Cyfd~C#wb|HKk*MVW-G|EGo&IgQ(#-@)Yq-
z{>KBW+%S@M0ln0S%+}#0c#X%~83u`u4CHq6K3<-L998Cni?Fno$<kyzlxZl3n!h}b
z(KHH+Q}J#3^K^m(&PwU$V=yOX3=M_t6PzR7WG=(mIlVXJT2s5sC-_)Y9MkeUdxDxw
zTWskYRTddJ`7W#Jpx6W(HvN|ce)_`ixzdS8y>M<hWG&Y$0TiqxUUwe|IP#`<GUrmE
zgzA213(X|=D;#7QMt}y{Fhz?igQ_#B((@zmY=;*LY4ucI$M!p36aLMM8_ZYmeIh>-
zAi-(nG<)?&%FT{zsSG_<r(b;J7S!myV>>Mvxx}~*v&8Bb_!$^q!iuw?`-3hQk}+aq
zYBD@6b0UruT>;vRFX(i=C<+;O+eyPoOX^+A%9GG-D(DtmAZluGJYH&{WO*M0^x~_h
z3k?q)plqJ(-`<veQ#?mFLByu-Wse)#txHKn_N|tJAD$9ti)B#RSE2OIPCEnKe+HGQ
z>vmfzH&Lc!_99Fy%`_?JvDQC>^a$)jYO_J|WzHK~c}-{@=L&K`1J~m0f$y_)d&z!n
zvcp~@s;t)BusXQp1O-IF5={FwiXeOXfu-kXv#aqyWC7E3fL1$~;jVjJYkX|rc~j>F
zJeFDFTWcwrZ@qC=9!~^fq~v`ZHeWN+w2}}NX0Ga8@t4scF2$S~{M`$14+$UV5(=^s
zN=g$rZ#SB?MP46!uuh7PtA$K31WSJVRp@&B1(a(rQE6ouPOCH1q^l>b&7YL3cX2=B
zZTkUXb}!?tjFGwmv??ZDh)`6fVs`%Te7I@YKuLIncO`hD;Qrin`P8srN@_MlDXg{x
zr_7&}=O*q@fX(C$jtwB+#^$mjzGE;qqtA^h#w4N=Y%7}e0lt0;3Ih@vC4!s5lDS>F
zJ$_K6^<*??LSL)z-UHzA9-^m~NXyLPTy-U?!(pjT0_YHiIfDs|yv%-M9k%gZEmr0q
z72a6}M5)UtsM8_<R=b(nm(YH^I7>k}8Bv(3=dMk>3c+FZ2nh3?Dt16JhsCAjL8hob
z$+U`o6t@*<H3~Q=GsZC&vtus9aA*BL8u>cMM1Exp*Tq)K*=ALFd2bv8xPrCg;MKA4
z1s$*kR&MsWvk=d3-a;@Z&dJ;`&?|!rCu31&jhzd<rFO<6j3~!BUD&h6tN&^8?KcNS
z&TE7QyF{z++_%1|E7N`Tjt0gKn1vfF=a&)p@XEKF*6x`<eav#kX0)l4C<0(?glZcd
zfS=TD$Z@i&&VAH05sED?Xc@0^A|Nw8ANrN~qDG07L-GYW00%_SV_!M=r8x^8!n2YF
zUYUM8E&)mzqwDXXjv2JV=d_V$#q+lqKAAo&L4tumelh2~tZ_!&BbzJ=|L}keRC5FY
zr6RuIa?2spBNC3zGF7$P^@-K`9cQk;@;OJ?EuTw5IX15)cY151AkV^Z25Fv~)hT82
zNbhH^Zg^S_mYWEec46V0n~Bm}PY5bt4e@Ou!RSHBRI9n70{2tuc?PaKkEs0b><-iM
zC8hgDF)Eji!NpF!7&A~$Ad>npz^mHGQ!)Q|E;gdYV?VQ+$`)bwF{2M?wPSaC*PsJj
z0?7Zx=2okEmegOZjIyQPi#?@+Y|Vw_)1#uzhAS)&v8xXkLreCF?^h-sH#OPq2G8VL
z3Ruh+e0E^6#4oxm+JtJ3F<g(wtW-P;V!gN8B}dX&Z~7(y1twqYHm0xitB~6}4*%(C
zbW9GPw6OYaDkWl_kfCy3-yi8R%69)pq+WcGS+6Dpulsb(a)u<0Ofnk{5A4gKK3YK~
z7K?n9sNow%x93*JhV)gZt6m+4NU8B%<bc~82G*lByA~C{kak50!t22QSZl#b6j~6k
zm*An~eO+?swox1jz)6!GB0e|s^;fzOwVxZy)G8{wlg;F%LlT*z##?0tSsG0SwDl#d
zU)=QYyG2hAXpu%;64)JTr8s~DQrhf}eX5rUG=MWtvUwyLD@df2*iX(=fu4#}$*dNM
z3~jwb#hNGQrGags=No;aJm|QyH3Uck>K$d#7Jx~Z)w9*c^Blt9yaah=(zOk?da9T>
zHn`nhVYyy1u2c-i28^r2f_!t$R*dyWbx(YUdJHu0V-6M{XciJvv_3k!smJ;kZ~8Tb
zb#r^M10i>Pi?5QMQ<{MWNX{YwufG`R49}#WbaH9Mgs3NfVg3ixGHQ5?Xq{-&TQ$Tg
z>yK$#&wXIW$18einaZp;)ySMJ0?&EN$!VK^Yk$GceUFq@e4n}{vq3ad4f*nU3xc&T
z0f0~-teH>~Xum)P<<2SXsbT2-$yyagoS#;e_Y6}%Hc|TwKWqXWWK-WeF<Z6Fi!G=Q
zDbQ#ywbWRD$Qx(r9j0BKs*{LV{RNz>0+>`kntmouoU0=vFLm8bORZTxm`#mM>A43g
zw|eLg6)*#UY8(p>B_~YSRBv-SIT?abFwNp(E*>D@@9d24-Hk*Wy!2psf{e_0oNxlS
zOgWOxDzK}RHZxHOhJ<8}W-HJQ5%gf-8XG^YVLU*JQHeG^_I%{-d1^^M7Ct1=0LgBD
z1*OOL0|GJBdZ6O>(cp5iaxozJHPa}gtk}%!3+$bj0b!L>|44&nVI$^;Sbch~$C|bM
zs~oEqDk37}Egx$ST2Qvx*7`on&{XWP41~etUh6;1)pF*F885b387};`E@U*7jXCi&
z>TvETNqcg9fC3~Mo5+yL$XACv&dK*ZsDdi5ovmlkVdXJnO~VPwjz<xC_@^$@C|_r0
zak_6MOTE>Ih8-=me6o7d>`(Ex-9WuY*{uIwrY<R|e$j^C{50nMl$iH;UFlP|*eH~l
z)lMbpBw)i%!xFa0s|4I$BKj`a)22G4`88s!oo~RK%<pXrjVHL(1paPp0-&uNa@!Vb
zIyq&>hAy%{8|eDie<rmmm+P-_%DC!o*@A+9|DJP(GBkQ`>GFN9Yx=mIf%`~^Pi|A-
z{KSo4@9Cw}icGh%@jEik=T>*6+TK`7ADqt4g2Pd^oi!<-n8!*W(I7Q-3lClIcij54
zRZ*WAqEl-Y2m2<r6_f*j^&mZeOD8EMWtHPo;doXH)HJO`q;%_GNEWHScz`f39JI+x
zD}P%M90t$(>{)X^xj!j=Y#T`j2qNgVqp4%=ZbH|({;2Hv<vHp-Wv#TGi(%a^U!2bQ
ziygp?ZpJSom9qmpXtMcCgd83cF3m7#l28DZrF;9On@b^BIuX+))^kdJfZbNYWWIBa
zEht<_MOl-*CDkl%Ma#l(9c;Z^4eHx~#~{Fv5OJfz5JN4Rs@z+iey)yDrT4DtuYBa<
zx^>>2Mf7i5Rl5DpqPEPt(Pom*2W!n^{y_k-1E!}h*k9+)?0(p5k>ksov8Xi>(b<~g
z*{Za&S2Tcgy*vD1<XYfpt>Lf%Pv8s%aG}3yiZhJ-Ku~kq3n2wctnh%cfOUdyCY$zG
z;slW?+|S*=5fItX2{8IzZUo*qdq3S>7<<n=QiMT!=YvC9S_DK*LrI;_CZAHT7~|{j
z-}2R0mpV=#*euO2<i)6t*`+QE%%E$4fS}DlZx;_wC8zv;;AK$#C$V|Uxuo!gQNQi9
zgpdBSRKwXOzxG1ub>U$F%w;-0EBIj4O-hBBT{I^xH1jzE`nBsEfmh$?whe@r{HJ<S
zqhG=G>+QOpb_L8X1$ep5mZlpFK($&=4D61M1&xTOc@7=&aeFMa^c8Y21Lbv2rm{Wy
z^0&rIu2+xL=ci_RtR@d{9&gW_F=0O+@%I9Z{xg~2T-EklRGIqdL!Rr5eSDu<Gu(zN
z!XiiG0k!9y$U7sL`Wkr?pz#TV*ovw?`>#TtOFP7mT0+M<>?m1jBT)rzLl){?PU;^R
zo0q$Fguk307+otW8g8D9O+2(b(YcaIoc<Z8e|PBXRO|eUy&i&%kN(Y4zHhKU+JV#9
z25@rK5+;i;ktqb{NB(Ek-Q=IDJBI5O?TQpIkdC@HdkIKM47RVqn$)e}n`F&ufse|@
zRHb|Z;o_+v|6B{(<0nVit5uoXsi_fn5=^i(*_yUk*9@=;H`oAD!sLh!us2KQJ&r9N
zl!8Ny_HrY1cT-um&uEDUK#vUx=cP~~;OSZj14MV4UuQz+E2-Um3m7sGj<*~Sq>fMS
z8ci6yZq}7BxI8b|fRV3zJ^%eeZq?7@``P-z_08eVt`)yMC@Ol`KH7>xRz@L#*n@~C
zT<}co6R<q|ZWOJmlqd$Uz%;bN@71x;8QMU#*}9MW6V3;diBMT(<I+`o*?(d9pHbCP
zZ8~p$zxuVP9j4}a1jJhPs?SJ(3;WsPp61QJngF;E-A-~J_V(0txR&GA_Sv<%o;*0K
zbN4w>U#l*z5bN*gRu!+8HSV^Aay@Y?<4>LCK$epml2Sn-swGQdnaZ-+EC8xM$ZPfD
z`j?E-jAtu_RRzMk&e(Usk|JKDKqZ^`NORWU!v^H${<h3&#EwozV`B>6a(&!UcXl!5
zuKGtMU#k-an@8{WTfoQfg^03W@n{-dGz3&5ss#Z70)VVimJ`!y&tm%A1$&bi^+xG8
z0$XztFI}125g#r2!z<Gvg7*&nu}%+e^C~k>UQ1+espG2VzP(v5Kl?mc%&Q;~Z&(pl
zA6yvGh*2t3U$THxGF{1y@oSEn3i0wv9H?^|sh{(gAJs{Hx#x0^1<T&Z3?tAn<(^u~
zeww2?uTER)<l4I8*4Nx7qrtgfZgN2Qp$HYIq%2e1n!`y=Xx%ZWnX#N+C`@!pi#L;r
z9V`&i_Uad3`iowKw1d6HQ_y316B$DtkpRnH{=|3wCvx_~c>-0|{E%c%#%CI|V`}+3
zxAlkAwO<K1-sBh0zkq!lDGBO*Jmz2Ue%-!S8<F`+X^|lI=rYt{ssT>2mX|`>;o}bv
z?zHc}-{Z3x04hsY$i0+7RtYnhDH3&Dj+syHD+j=8@-qf*!|O|@pS)hdsW?1nIV`9>
z;qF~+TOz(%oLZWz!u>U6`lJKCo|$_8X#!VOS$@|&8hj=r|0(6kQ{sOU1zpxG8ytQd
zHV+D&TemlvvM_ebMTe@X`M;0nw#}6cqarZW!WJh~)v^u;F2cXa#OQr$Xh>(zmyFF)
zR#SRQMk=Xh_oQ<DSg%=Gfj!Zys=0e>=P$J1IdquHuV=fvm;^8g)kJI4e>%nnyi$Sc
zlsLv<Nr2^_+iq#Z4V*zebFZxJVxn3rdpZ0bj`UGuAnRM>30Y!r)}aK3F}t(vVrL#3
zGk}Qay3F`CUOhw#>Yif}z_8AJLOT!14P8|kTZu?UneTT}M*S8%K5r!^9xH2_jZ9o6
z{j&HH3q9|&!J}YZ#cVgF3kc193Wo?R_-?>?6@++fcE^|_3H%(RMFvy>qN;J;mjrr`
z&WJiSrDN<Rc1Yiyt%Tfu2`pUaoNwjbGie-5;6D#P(hRY_b_=#|d+w4&W6c#*mnz7p
zK~RN|lxy>^V)uryqZom0I;PfE;g0$7LSa%&*ya_d2v{preFg@Xn5VnIr;SIyVsl)g
z!QgY)L5aBzyS($JN5|&+tCtu1gd^F09Ai{82~CuaH)dzV<K-cQJ*Bv8JObNh^6vKP
zR(Gz=D545CJ0PGAF!QzWqo+ZdE)l+}hL0R%+f&*fTzl9tP*A<{1O~G>n%fccxFqi!
zpa0Ud!Azw8|JeG<s3^m3ZIuoI>29P&=?>}c76$1?x&}s2x<Np?LAp!2ySux)8EU@A
z_nfo7ALsm=HH$S5&%Nu~``UZow~rcl0k!1V(f@iFo+?Z*_1%u&b1;vYEj7<&Y)8}!
zZ@UCclpYcHoIl~<cwVwyz1m;hG5_DBNZ(_z_Gf7z*ed_{ErUVE*P|aMvH_N=+p6wO
z8B6?MO>!NTdh0W;zQCF~IZK(3g-w{}r&Tk*M|vV}#|)ysn86V4A3r%BQ+m1DL}eF&
zFMHe>xb81An=_8|dv&P}nH+H9;em3;KSeRwCqqF$UWy2yDA|}F;55$eBobcd{#TXw
zi}C;4*uLi<2?`!4VV@oMP5yd&8<4O9?lQPYN5Pf(fVMrzrUr&~QDBqG+?DYFb7D%I
zR?E@TFtT+3!IKdfrPqPv93XX3FhNg}7Jg2Nsr6Z{N<n^yVj82SVhfJIJIg`+jFX-E
zDQLGO{HMRl&a*HVVzRU*Z?1wN#ZS!@`}C+`B?@G-$-sUgcF4_ZPJ_NoCKr36u4_;I
zN-KWlRUeM6#}%2$-md+>qvLyRE+ospU`Nd>X|izk)F0TR53YPgrS}R|Pm=B*6Ih-$
zGq>)a`9VO-c8Z++SCpK`<#rSImEkGaLgcCB`DWqss}_OoE2qg1lg_NmKKjn-&5!1W
zI;o-g2bz(-2_$Rf2#Q;uJ)cVLel2p6Q!HS#p+cgIirWfaoP~Gei5Z)Iox%P!BHr}A
z*GUA6`pSM1^ON#_6Y-lBpI!4uU+qGyR>@wS{?ZjNr02xXn#Q{1`&Iw29ALShn)f~e
z!>)S@dinAO_VzRW84#gkou-QaGZ)?0p{Velb8Ehsl{PioW513h2S!-o%U_sL6sKBV
zz#*Z?bOJnWgKnmK|JWR@oPk$~4^RI$GgW$g1x$gG2sN|4-O2`-CWL){g%sXqDLWR-
z@SRp3sxtD?9QzzaXgK@MyP|>rXpNT*z_Bz#SDAo?)FEX@03q^^VsWhY1(=iFS_ms0
zhXAI*oF}9wvH5<RHlcKRe?}5mVJ%y4!BMjSeoVNHii#{aQ5>0Xx#JNAwZ(&OVNzCw
zBb7Q;1t+Tv6hej8xOqk2EykUX7&!HzOMOjAe1&L5MIW!84RC+Ula>>$H1RpGzybh+
zK6$obG_oHokIb~!sm~u)SR6=F!1;?2HcPg7(&t@eH1fKy-u$doNXDy-$RNmlj(mNF
zvA*KCxNF{JZoP9QII}=CYn5yhdIW(`(~KFu_}4yq+6|Vn=(&$OJ|Prie)~{>Y!HN(
z5*6#=jaFX1B3MhYK4S)ReuB*0^)(c%MHnWEWZIY*dWpnence8$_lVisto843&CIN+
z!}v0693HCQpOrI1U;YjD&W;+kllAmi{*45h%ycY2num4X`B9O##XOs>y}LaY>GY;3
z$ue2Oziz07+mgQB8;?;hS-YmGzq=;`*~#t{TA56^{;vNRkg~*S0>pnZ5GtGQ1>FJB
z!an~$MoJ3f^u+09Zy0oXFQ^BMJ4<1<k>%M+3?GdVI3SK&V?}?7yt=xp7p7(vLNl1t
zt-EA?c}Wb?sd|!^9@jU3-5jjO%)wfQFQ93^n$z_K>Mt78ObQm`;_n}ztUnvB2XW#{
z&`~U$zJ8!lfZjJj!Hmip>=l2$#{)bC(3g70863H}o#gz10Bdw%21qaa`v+ZZmB;$2
znAnf2d^W6AH2dC6B-?}3+8ce->%4P{CgPpaPpy{R1%sUV%yEs@LP!(6jftg@oUgz5
z*}(XP><P*GH$`q7Tii;<8+Tp@Jy#~p2e<1Tt<59T>^Th+434qm;GF9DdbT4QG1k2!
zG&=taRz7j?^nq6os>yeaL+<o{9vUsYJ1cAG7acWAF?cA*4l8V{?>OseZY$e<6aj|p
zwHLXm4wq%;_~A%?h`*kbTx3>?Vg`+WQ9YLTW!V2y<lm85akh>EWC~LM$&V+~GgVZr
zW*go;Vx)a*rU%%tv{B`MqtVi@X0mmkU>0Z1T`Bxk!cVKrOHOCp^PDNxALm`By!Wvt
zk#l)usC;nLS`8ASZL3gHs!~3CQDMnYMvEe2d7<^Vd~6|vt8?sVk)3T>qp136I>3|=
zZs!CUGl@2L*-Phh-W^U&;;?AAyN#&{v5IWVz(juF7byOIi580T7A2E2r_<V3=G!YM
z0-ch8lws5@^nApk>;U(*gxJU8R@RpQcqF}jhej>-5<(kPTu#KT6Nuke(#y-;LjNzF
zrK#$HHhyxkOmdzay#6?btEgAF3{v_gqV|TbN3yATonK;S-~h&{=VuV26C<#U7g#fl
ziW(LH*CtimGc*;)p61Jri;r!3gTX{Zl!c$ax~z=9v3DfCmVU9!ZceEz1SavuAT{Yr
z&jI>CM(tY#zR=p8w0~cH9@Q@Wj0+#=5@EdM=R(6)eKllBbTBqh11^rsW7Zz>*r;B?
z{bgy*iB0{(M`nm=7J_j}Ro?HkS(w2q0IF}!My37%mKpj`#_nH|2-2S~hOM0)3{IBr
zLGLzy;Ko~{oL`t89KY**LM_FpO$?p9l%w%6ztmSzn!*C9mE#h5YLZMRKwKmKCcv`Q
z_ZajW$zAxb0^Y<2O>j-F`&-&wuI8E8JlvcrWSpioq{ejJt^`3(3%Gzb3L05#q9nfS
zBO>L+JZ9u<(Kf>i(=P*gRaKK&53rL;#uA;TAHc@*&$3p0zOBOG$2RTMSvCuGwy7*T
z`41MmdONaTmb6lvz7biBRnNFS0?pqXM``7ZEFV6VmUKyJ7>Z>Dywvs5MQDW;1R?RK
zNfF`VF<5pp;7MvdB7Pem(nrzA&Roq(O?Tn&)vu51qxdZW{NA4y!4PZg-fQpolv*Q3
z?k57hEA<i7oV?M|nXgVW1e1YXkR%4qqo85a&VJu}k75)|wA~Iylaj!Z(IMts@6X;E
zOnYv8w6ghs8h*Lz-(HS2uANUFT{XnUkNr@;Ijc+r%^_o`T-|p^Hn(vGG>VXIOgNIE
zpftE)ST5XZq_?$jTvSs1Y0=<ByW2X@-;8(yu6dM9|4WyipCufeEgFR1@pQF%YEJM<
zguM>#tKaHR_&-V9WpMf!W_pD4jR8B?kzt~FPGzG@k*1gD4YxlLyl{v!cPAVjk9oa%
z?A~1;&#d(g{dl5&OScpM6Up=Hek3j2^OeOETBDs2y0A6gJ1Sv8ZmLlh$n(pPAir>A
zzY&H1bBl+mEmAc&h=A?*eC*pz*NyO;*4!niYG1o^CSA%?y-?x_+yY%;Yu_ifLPm2K
z;X3UoH0d8<-QM95HklOwRl7N}2T11iR-1VPTcJi}yXIT>keA%Zj0bZ!js?JjU!j+`
zx72Naf~%a~W_5@Oa=Mnx+}0L=Zpry&*T~asIENqaPKR5&=+hD&|JrA`>ff<HuU<$5
z22r9?+nFSPa_%+2C-^z{ldLJ~+nrqw(3VX}t5e=q+QM_Qi5GZ%rbPooPyEJA@Qqnz
zoOgZy=2f659c*O8NJjUQ@L<{BH$0ygteiQtO4nq+I-+1IlF3)+zx(wozS?Ey{g&6&
zCWz;J{MV=E$3=Ab*SBQ+15wP}ga*s4_r7#dBHuXbBPbM<>|cwpfRtgY1}v*r&#@vN
z+ou=J*QS*Il)PjC3TJ_Iaq)3umoxfMvk~s<ew*7%1HV!ZJLMJ9vB2j8Qu!hA1k+iH
zhT%9K_ss|dq!`nroh5ZfhKcj;Zl#*w^PGk+L!CDk5n{XvcFK~7hL8$+MRA`-kG$WK
zDWl1y?Lc?X7{M5(Xu{W}2?hKT5xZSu<nx^(96>(D^aZiiV1J``LX({Q*#`?nXR~P=
z7buS4+vQjAMsp!7yXDm^ZFLpeFc=HpaL(4|eVg~+SbddI9vfwjZ10*2C?-U9qjBl)
zx4DWs)1AbNkz{pr*>Lt<Sj7eDRG;g5T)`s^a>chTq6c^TP0lo~i?Qzy=n`t$muEDx
z-K4yq^W@ss=8#lzCuFgq{2^;#II`@cfQ75@v%0`%X{F13ADo5SGr}sCi}Pv6V-csx
z4YKp7Hp5Y$IO&Ue>4NAKP=EFg3E^^m@zjIa-YV`t3*1$GmuoP}?p>#=0e_;$v-dpa
zTXZuDHaI9)n>~?0H1vER2f7piS2I$zR?lzy<%4cx(&PK6&6WiYl|qSx@>MCdC?)*1
z$HSmCkHakeB)2;cv=`_jl(I;|$qDV((K0TBrG(0xc!oa?$X9z~i54SXXtJ^Qhs9Ah
z?@Fyhg2<CM>Oy>S%!?@ZVdDZwni)SsvW;AXVn2z*QN8kKNETv7^$!p;e~1ip$`s<}
z9xRhjZ9yx3Tl|7ZQ}E#Kv(l(_S0p$ko0!g{vDGH*@Vs0Z?&}#*DP&4ij2KU81X%S)
z-jWH>%8Yu6S6l6+X0{PmY&OSUwe8HBUb>;LDGs!VuZ{mX>$SD;?}^06mlh%e&1+fd
z{qhjV%uajS#>-g7*q=Fp4lj*g7miB&Or{EnU$q|)Kho1q+MTIt68)GF(SI})8cDV<
zD)nvjdBWOUtXm&}v3{KT3cEXQNfmYvp=0I&B?ecYPLJK*yO%<cXC9(V^P)nvpgiU}
z*qBOWL$H<`1dCAvHFO>XRAR<#rdn>ectRDHP`ONOgjdbCQF}5n$DxUOC%+1oSB090
z1UAgg3Q9j1+2oO;`^lE<4H==2*rlH9F%GQ?5HlSsP8O4>#LoO(io~VY=GZLRS;`Sl
zD7{*FM<X7)LmYM4u%+gxe^Z}ep@-Q59^l?N>Jh-vsX0K`M&nv`Ru^z1Z`xfwV0h-b
zD6ez1M{g(uE~4T-_B@2SZrgM3Jw}_}RM(!(OqCo&EFLCiXxoWlRUpG(&cg6{@$BlT
z4lKN%nr7R~fEHTay4GlJV-?KShYg<5^tKX0TOi6C^Wyy3PTvF@GjTN&;Fb~Eqguc1
zu~g3#^&`Sa9o<N?lJ)Qkrp*}M9nz#<-d**~>6DHoR53J;IqhGujlkn#jg*O{X0AKm
zOjRa1$xeBLfI7TknTZ|G!qHIjlN`@%uq@>b@OvsS8O0IHbI!Vyr-;o?8>EbkvF)&o
zJ3rAMtDh=4sSnRq(rWO2%JYZ0NS~UkpU?ScLvR@yE{x_~m-22mLOP4PHLOd#mI=#{
z2)`J1()(o{YdtcV{CpGS*d;p{%VxNhf@x@e94tIXx0u!B2*XKvC)xM(#es|`80LLz
z7(|m{5G7mP^pXJngrthKqL<HdG?vhy*UPND(p74L1oydgh>)v>2h@6pE#C%iQ93*r
z%+S~oE}A+R)90pLw0)kT?~TW&(sDn+gWp;K&W%AObG<i^N@alKtLpF_W>y2R5D^Qg
z;&?8g*KB5GiFSZ`EmI!mNmn0_=}!qoa<#Gsk4XI2e|PMb-Wmg;l||>F@9jaP%ii_E
z+uJvbQ29Cbucn~p8N=ESCYL|6nqdpd%g}wBLCK~FQq_39zyv(~+?3Ukd{IB(gkOmJ
z&(F7WGC!V1+IHYmh`4YKOTy8Si80jS{7)}{I{^U$I&h9$i%hQkYD($!4C54s6Xwq5
zeI?v7hpQo11ndpJ(^nXltPT>LZC6#Nqu(aUA1tIQD$*Bv_vxMOA|fGtdvZzcN~C7C
zY#`Lq^3TBYG}s}@Y-j;q9eBNY4{tVx)PR=`uG7D@Mbix7YX2T43c)gzlEOVK_li9I
zJ%caQ<hDN6B29Ag)lC)mXy%U_9^_O=E~?CNy4M^>QWa93j2*ll*p9_~%8HlW?_eKE
zT=<_CB+l3{pLf;YrH}|1Xx5-Xw!OPm|DD_Zb-BV%rfe5)vPoasje=LoEN`^X!ekL6
z$9YZw1vNx0hjClw(mhqUb<mQs)}F_|tc9YRjWYCjIOll&np+Yf@%1xC3gsUxNxVCu
z)&-s2Cr|O{qBnT+%x#)SVlIkags|@nm*weuV<TtLDXzp*>ZL&Rz1m_UVGZY2#ZBUL
zqvUye?AMmT288+bD+Fdn=HgfD2Uhi}S%uqSQ08dUB<Zu1;Cj80AP_6pU)@_^(mzG|
zF2_@YwujD)MYl2J?b7YhnM;-W%Ou<0N63JlJ&^#`cQWrtc345JWsROmD?{iX4Qlz;
zRFjg}jZ0neR;y%2Kqr=YJUM;5UEsxx?pjU2k6Xlp%$&WKYcN|Bb$cQy2_59b$?E&<
zB@i!!Y9;G@@%GT7{X(6f!LAdlYz1+TP=hJPFobMih)u22XYEyR(KL2JX@!i)Mxhq<
z4@N+kes6Lv%#k(N>uQ1%;`JguJ+I<GnVqBvp%ZoId#-|a^JKx<{bZP9PV*~eCY_}&
z!EH$^`Y?I>QAY4Hb?_N~(o`RWM`={Qj%YZ422zmA8`ki1X<y);Z?-fwghd_<JNWkM
z)EmsP2H_{woh7kG{4o-9X|fby)aAgYZkVoI&^>TXbkEYp<~=zqiiUEzXYHGX@Vw=4
zC~jQ9-Tbl&mXjN5xQmQYNaIX(ASjoLHEY#t2yKLc{d39FqRo=Z(w5krM+>BW*d3qK
zN?{y~B%(pKz<P*Zsr<s*3Pnij&!iJh64^qj4fyNKcaJit4@~pd1pM^--fs7Sc&LWh
z-IX%lzF~nnVE`ZO!gI|nDW<?S0*-O?7(lr%I;k8ININ9xwkGjjnRM_@9`=zq9xnFp
z`7VS&MMtCaKIZv15My7?)<Am85R13K>3_lPXQSr)*nTk5Ng<LF!4L|*JaMAizI*%q
zB2V&9Y5$D5*^S0OL&p8xj`hd1Itn{ePVD4c7kR^PPIF3;^2I?R<>u3A=pQANIH>a#
zq+dbgdw#Y~+f=Pp*@9%D{_IO!bMfAUr5vxX2V;yX3gOc>t*iy-xT&ti?aIVuoI6<I
zE3h&QuP2vOM?%I!faU4jdVampN=5k}r~?RIT-^AI^}QQf*E3UaYi>;{%%}2~)m`{r
z<)g!H7h9t07d3OR?{dE{_+bTAO(|bZO;2fYhebFI7B=yxT3fjNPJT8vPXAx(cLmYw
zYR{F}T3}0~&6<*>JQ4>TxoEBx8znouefH}42NwGq^+Zo+-n2eiz4h^S;}+1rJyEs+
zuFc5<9t_fUpwBn^)zuqMbHiZ+NAGwR&U5eBBlSM=c#R<^g{c9NLe}_;Rg9!p2t(C`
z^ryvtj`yF7IPH4dG&Ngd1#iRSD{rM6pgsmg;G`3|OI`R7TquS|yqcc=Oistbj#0~x
z^%_eezDvpJb`XhyvDKJGv6!{1t7|Fy>B-;tv-lf^k&opdz=kMVp~JOXYHt8IX$}H*
zhe>HEz4m_vu=hz5*hIvi7k3n@Ij8o2MgGc&k8=PEGt*~OM2pswfzSXnE-;t-bS(JU
zf5g4n$>}QMI$qmS#oLqL)`(9{1di-qzTL!|plPYo<cL`xMdEK<#bxg@sWq-)K_p`y
z7uB};-);|hxo~djOtlbP{6zleFIKYnVpOI5txn5DMBFaZwvpsdF{MX_((0-|6SZFf
z3$(2AXo+kR{97)`dKRXKfW>sNLrIP1h+1y;!quzL<jzfO4mAaL5~ORT?zuiRF|7TJ
z=>WSX43eS#5#~$)URsQTs)*^kVlKPHe>D7xF}UH2ZtgS=OCIb;uKlS0uWEq#c3Vvf
z<JH$JF<c$Swz_Y*zONkZ^c_z-cl2t%im9S7X>MV3XTP#%Vy*MySz@Al74lE30U5QA
zG*GS3NUBQ2(rxQ4gWQhCu^%uzW8SN#U7Vl4XK3K_K@^En!Mo_|no7K^669P|13%O3
z3!Ph4VCPlU&<2^8KIllq)M&Tn%zN+C0?x1Qd{MvNm2K*bOxe@}Ih%5lJD-TdV%e<u
zy8v&022w$!`6^G_<;2{OhtZ{_|Bo_7cF6yg^%9;n|5IS0`lx?N?>Z&qw8exIa>{4y
z=*!Gj9({^(qFR_5R@G>;_UW`$5#%eQ^6E~ReB|`GZv{VOBIe=s_1Q|2PmuELVQm!)
z&45~q6p!XQF_<>wwN|#&ZZOl1J@<bdfT-V+W7kPdNVbeII7Lr-PXI7gJTruA;&V<w
zsN>e5yuSn~x*`W76&)sW*3c27QWdRaF&^C^k|`K8tPw>bB6(w(78hh!Z17^7Qc?do
ziAJ7)NBXFIPYrmh#OmSj4@4e22j0Qxm>W(~+(W)=)|?;68@);O-N-k$8^ijmx)aiZ
zJhsamn;#F1X=Tl49?}54Iv<~|<g_6clhx&u*S2R@vnU6DpW0))d^vh(XKcD9H#u-f
zVGXZ4OML2}agW-|qlbG3-$Ct_Yvm$4#Sj|?S!own?>#@Y;lP5Qci*QKDVsOKr|rh$
zRckX>eOF_%l6oidSUB4u@h?p0soP-WrAih|F(&_s$%?D<|29yyQs@21=wAI_aR&i)
z8RP5A6ZEn~*MUkF8{~6SxoTIO;IW@Y)NA?uCV&pqEafOm6z03o{+HF;hO2NEDHy8^
zAtRbD&I$gx?Ds`<(of1@^A4$SGvw?ExKYkEEok<iDuy9F;`WoRAgsAM1cw&~zlBB)
zF|2EdChcIAty=4M7L%tk7%PT|0~=&v&f%lygGfYE>VpB@0#npmGfE?Lsq88zNQzY^
zwm2DjSv-3c(Fv1k%{Q}}1oQG|yBQcPy(MvK??WZ9_D+w)t_$gQy-Z&Ui*$Qz+X`ko
zo*2Sh(OuHa(wq2O+94j^k7#4!SpAU!UF|<^3-I_GwGct+&&Jx#)7AxoBe$muBl9Rc
zYaRl2>f}C(B7Q~O6K;qPd)vg^ZKghikcI0z{v)$~{$j~_rnO{8bJn-(dz$(z=pRZ5
ziFVC&AA#36vuqWj$<1dc{bYFUTJhp*GbUhzwNSjK57Rd?zn?_};-AG-Bph;Wrn1;G
zb&=Z8c$IP3wL*N*|93loaF)MGErG1w*p95LsoX`=E-2a+a2lF)-%nCMmFy>Jw!RLv
z$^CEB&OD8%<5|5Y*Di~+UZ^TCmU!y9=p<>I$PS=JLbX@$II3CpG8JNqPt^5F3PM6!
z!px1=Ys^sm7w?FPvC%MSG8GhXr!lp*wJG5alC=AW_4cl>0t0+Gauj1}w*uPOS~w9Z
zt!F&$PPc3qUB>;=Ucc5pLyHWv>ByCZ3wLRLzRlJ<v9$%w5j74P)Ig*7y1_9a>%EG+
z;!rqyIk9mra>-}`hTyGgJxXmm<mrT$<Zbaat+FA%;!9NlsB7y>ZT#3@siB0JaMFdi
zii%efsyp2LD>EV_%!>)zIEJd$RBKJ2Q{qle%9l6)Beb_znlbRNJb3tsDh~xG*1T>$
ztNHu!^(4B-#d%gLXGo3IZ(s_`9F-YB4}n$Up*<J<k7sdS+sGuX&-e?2&bJ;6L+4Lu
z9Dp5J1`osvmj#3?<keL%8L$r|LNABLUXxJ407r?7usixZae`y0&+B<f4Y;X>(7;7y
zKU2JZCcl>)^=12tq=dD3th&<gFF9&OhbrC=B!9uvTt0!9Bqg7TSJV3Yjas4RtPX80
z^LBypO%E0(J>QqZ{uGtY9%9YouF4Tz-~oO)^PQ+hp+}`MMUPQ2BAhZQ)WBpnB{2$9
z{IoG>P55d2pnr=Qb|-?k=EGx6k)d}rUXf+=ah_K8bHP+rafw7uVP<xA>gA==;Lsog
zGizQ=O*d~)t#>{kxoQ-LYV(cj(-ptpzw<pjJb*dqj-D{x<3-o-k`ize9{0-Y*F*7M
z+Hit8C1v~HnmQ04$e4Vf5w?k9ZfqknJ2|5R?rOq^p{@06h8mi_&oyl=X|3nqo;6V$
z8zq%WsRIHKK3S>|=+y+b_em@2CI!kTRxQ+>d|X&Sus_R)Kw0Hy6}sYJnY?Og<~yRu
z4!=jmo#r?`ko3O7{BFOp81oBPS|yrIQqt^r)yMz&QCWY+dn7r4!^Kh?|HJZkmLc;i
zns_<MuU}F6BJ(P}?;L9u<zDI4M`lA{9?6_2VmT9)K9BD(NO`v^4Bukh764xx8z*m`
zohg3($|&HL`)#}5(|ojf%Kn-7^P>)layd_0tdhl7509c5^i=i$a+5x6e6k4Iq12_e
zjM6XyXRkZ^`Us!5t_6dtUc_%!fV&qihuzoS;gXN8dEL2%=6?_mayqzoEK3z}aO-oh
zHKu;1SI!sD5ccr&cIM)U6StYGvg&xlBq#s6!RbYiKwWKL&=mR67q;^G{b4eX5)w5L
zcL@m+X8PBazt5JOdW*F-qun9TmNP{t6p*K|l}H}<(<sd}ck3L(LI;=L<TrOr^<L!2
zCnwjQ9v&J*jiaSH%Z`1NpT&Wi{+?Z`K%$s}0*-x~&qu|S!1IFwW|&%8^vpy)Z<LW@
zqvXTtI>Vr5x?BOEU+G_!*%nhEF30n+6FJ^azyfVFf-;N#X#0QGc6o^!N!DcKs3pM2
z80qt<^flOA&{l^BIMpr+$gy-majy5>EjoFsjH&6zp+tuQ$uQ*829uA8Y!+8Hb2j6a
zHRy!nJsS@QNJ!`Ha5OPyIxSw91RuUoQML!YJa6$iZG(SgfHVt~&k(4&emj~S+LUKa
zS?k{4wZ-{dP_O#>cGJFRKW=^Gt+t3-3g?~(Q8_~`xjI|rSu;J#mQ(=m5*1{e30h(y
z&6U@Gb0EE&RzHT`Xlwagzw6O1$0j5n9rr%l0seaXXfK23!*`0s3cq`?AM^EITyp~7
ze@sa&`6C<^zyHC`6d$ZrERL1==g)NbZL(JLVYRb8Xf7#wn;KQ%ky@)C{){z0vx$Nq
z6qB%KHg&v58ck(l%wTmVN$rUWPs)~a0-3rP9VZ-$R(#OE;rJT()Gu<`n2h`VPrM}u
zTip2w0>)ZKnydQ9L<h`*k^llj&-j{q;gt6_SE8+2zHw_;{babo4n=_tJd-LGRwJt*
z^_Lsbz0t~lwmCljN=|MtqWF6i3(3yr`9?KxMVo(W>Kk9E8B#z%p1G5{dTa5Y4~bkp
zB3{>mc8e0~x{Q@yyM&ceWyBLs%BPi*IlnhF;Fsveg|iHW6HTQ|6|hy>F1Q8Zw&q+D
zA#NucCR<AdwSc`D7#ZnVSSqZ8)IKNN%%R{DBtGx_7(yRuG@9XZ^438!!_~}ON7S)B
zT5TcAW{6D%$8K)2$Hpm-H#(!Q{H@)ZujEufx`>W`)!Frf&(*p>l_z;L>ecOuK+k$d
zNOv!{Bvz(!M&ut2CT?3^QA5LbRp>TzdaLyMQ%_donWOg)MY=6OVp_lkq<46D#9Afu
z3k=z^+ItY!ABwn=f#|Z7!orAHyuMFwQn<-JYu9?K&RzWggy~_@2_IT+D4AeZv$I3G
zQWNrPBqfG6WUm#L&ULlxXk3uKmTt`jyFcMsP2-REPbFPdRN8&i2AN%NMd2*gFlvux
z?Dfro_9h47D2IBll(OY|ng#}X?~?yoxseDZPecjJSx)8WlJj+L@;UdnxS)J*+8q|t
zSM8XrU;UgwYY*AMoA&j6`e>7o^xD`Xs%b^!ByFxr8={I!blVO`tC;)~q=Ln$Uw?VE
z<e+Z&#r8&sYeK}W7kyA(ZobOsHBP$k;(=Gq{&dJphOhO+nQ)Tu3QLvy>CR9|I!}~t
zv9^g<^z*VG-17B#*Mqawhf9~8!T9TwrNs4hBNII_vDX4_$41+VJi5dsqpj^KS%5e@
zhm+JBo^Sn91wBI~!?=?_Wm2U>V>F|e*rG?v4MlNwJK{f4xuiPB$cf-3=KrM8p3tA1
zO(|1OrL$Ke_H23PyHcq6^i3Kz!6-E+V`I^YZn5Hz`D^?j!^*N#i0@J2SEa3YKPgG)
zKw`?4u8wR}&}j7ewI}M9Pc*{S<+B>I<&6P;fB{&>CpRQU*c<8^(cR6h@OwO{iv2Cf
z7b<{;UsB+C^$o4De~`&&sg8!z2EQYkDx|j^|MqgF1zUgWZhBfFfptkr^gCu(kULK+
z<aC)LqAX^1+q(<#8N;RAkZgaY2`)aKf3|$hVaDj{T;-Fw0vo_fk>-z``*w-$9lLw$
z)L7C;N98*`p8W8<=wVby7yP}|H>K0;F$H=E^$)(pe)!U28<U=MtNDcnkD);fiwIyJ
zcXseD=1p)I8OD|0r*NWFA`4G9)%zxnOg}e2Xnwf3C<PF7<rYH~`ozQr@*BYG^;eIr
z_BxNPjONNdkMzFMzbXJCDYAciqcf5DS);0pbB1u5jND=O=}O;1?Ga&%SI<PfL*Eg%
z2rp#)m3#98lbzRX_ter-zrHxhnQo<ju54WR*%7DFt3>70Oa?Y(<qSE=dexl!!z7E}
zTu!ur7C9XaCk1P^@d!y<+<#g5C`-y6?f~-egM<@y6dE)&Jntk%p!E#xjpm7~VWWr#
z#eTFUbo6<wdJ=(E&VOPj3_J~Nxzf8m6!~_jv3PenvZpLOkP`PE01BqpCQ(!x&PlbB
zkS}Yk*MvgJJ<hwC#U&-0LT_lO8HPves{VXC;f?sC_HMC+Xe%8Y>->0^a`Fey)B=a_
z-3EU8%S9i>veQxN_U`VR=nPQ%bfJ5t?=#}jRqtY}B_Ki7Vj&>F350}{4h$XH;-6==
zjy+8yzkX6qFn9#Z!E|xlBJk{lWu&7;(~8&9n2wM2&CG@{nj`}qSVi+D+;c-^`V0y_
ztl>wNU|R~Y;oRW8?H|8=b_sL#e3ycT<-%@ZArUjzwI-9119c5pZ4sahr6%D%F38Nx
z9gLt^_<SEp(e|B1KAdpk$M4?^@Ezd91w&tht?rO84Xr~wE0ySsF6LTE$voR-kMETx
zaaizvTsE<Q*UifEgGYQY3jRum{6<xEW7&1?qwoD!nw}oB59Jz*Lp%nhobA(pj#dOB
zmD2QLQo;TrFoi6KH4m@5NE!iw3^D<=m#RShwc^C{8QoJYhe*r31}P?$Z$Cs!XF)qz
z6PE8JJ3KHHOS#XsT3f9b>msU%wu@Yk7^K4YJ1R}Aju)J<brUXbXA?8h(}&92US$7i
z|5_VIHp6dElW9)K<%KF7fZKe<FGZ-R5LIz`-B?C=U+8ITcE?22%Z8rTn-W3h=PT|U
z2hcq$Y#ebVFMg!CGPA3@HFZ_3-qx97qN{Ek_@9Al(Q)E;pG@Z4%p;N}YBqmhHh4kV
zt5~Y7UciB??ir4Wz0<taZuuBSFGFlcKTP`B^$FO_@4GNbGT4}zj5kDHI^bYX%xs3s
z5i~XxEfpixz>W&1J1CR%V6`T!wSIMwhpkz3v<Jv>htDW{x;fT-`a<v4cv8}4B_Jvu
zyy`DdW#9Wf5yruRLJmI871d!S`K=tQsnpQ7>*%Wxm`}RbgOyYyaZi5?Po>)l#r6Jb
z8qeAjK{kV4bN#GT3hltJc&qupHy=?@N@W#nyLLyABFGBFGJIlKL`d8^FPoro{G}*)
zrPKRh3DbDdytXT5{A{T}z3aqF24yVKw6af&I<s#IJ#Y`h5p%iwyAGcI`ggPs3^8*L
z`qzq;HaB-N&;ar&xH=-{Pb-^69K6^fApDe##1yaNit!nw6h(e=uuz@0P?Wjh{CGRU
z`)&Q$wJ@dB;M}l<pEC4~fIE3kO^tt=fcie5D8P3*=&2Ao+MPW8T+Lu6?!Z0<4g&;K
zdn^qN%ZnS$t(~2YW>4nx>+6sCDcJzNBIS#<<~%IQ5f8#wNS%+m+T(zp)Eo4MBuc4=
zL`4yJ-=*i4l=usID~-27_KL_jk4G~G2RY&4@7Irt^D{Fq1GgZe-^+XM9b}rwuYOcz
zQ_uRo@Ik;A2-ysiHFo-l%4vfJ4$U3zY^^e$j-RA?9P;-X9FHG%2o_zAdN&uUM|M%6
zNlCqDcxGlEGgxNh#K}E9pI!<JEGG(ae8t2bF8(e?PC>hZ2IQ5cvEbD(DeCx@3&%vM
z>JBN0@p^_tV79m3Hch!)6OcO+hl<BJ5MNyC@#Gt)uSytx@811N{G~Gj0TLVya`K;2
zlAn${kQz_&67TJI6--1hLW48^SX&Hh0{O}L8m91iVL^uZYO`|VR;0l1$I&I=Yn>Lg
z_ML@hF{>2@=JNtWYk>Y|!%i28f)%p6mF;^Nh(CIRCe$YNBqi0^!0I-JipA(EL=o)e
zopOLUQ2_`gA>r{3cUxLXNo?fi`j(x^z@|75AjAVGk^db2F?hTV>6=myU<d_*?mz=^
zld}aX5=JWb-vyxVZ_;<0RaFHn$K<RQ)=0c2(sEQJFhc)hZ%Oh3V@9G3VPMO0l}(p?
z;A_LGYKb4J0V0iRbXuBnv6dn-#w|U~7E?#Z>sO{`J0z|-K|!J2-8!w0_GvSo%84H;
z!$}gm52g-EbS~)Q-+%Z5%zxBazO%{#)#~-VUm*BkicLWwub`lgK_Tqk<tdCykob=H
z(2Dzo059Hf4(i7u+pihem4`#G^K#nsWU?c-Wj`@$Hq>A<N;)Vf$6M)K@Tq9M_S3X)
zN`IB@j7}r0w0^$%8x<Pt#a#{!?cy!^_RU+8VFGlisNSV9OflR8Zfo2}?Q*v!QcGs0
zbB$uw!(A+(cH+cE^Fx{3=htR)vmQ~Bo%c<)j~X^jfg(pf(I^tXv+vntrAhbu_pv@3
zpChEobEh2XxZ?3B!0jcP#lxdDJ@4QD%b4mLAw=l)tv(MQFLpyb{%CNW9`pH3S`Gfn
z0#IYm&=8!1Lpc+~nAcZugc@srxqNwMpITxt{SETEYBr69C6=qJ{PnGC+Cp7rb$}RQ
ziy(oRzjG9~B+iB(_xulMWzJgQY6K33=;IEr2mf0<edMT?r@x)6Ed>A(vC-A^4r@KE
zynOLkVZJuLKcTzl;Q3iyy<8{Sf~~FYBl;^K)YmwyEuV~#U}KA_sgVLF?|7hw(c*Og
zS4D`J3jpz|>Kll5*|ziLwxsWqBN~8R3-*~AConYvWdk^X!p!j)F1_;M3jV|O!O!}7
z0w3UNc;vwAwp|H(9VI5~0jH1iWZ0#{PJnLs86lsnRa+o|eOdr-BIN%HP_&Nqhsiv7
zmc3CkV%G{ruiNAH`wJgl$4%_Er>ZVv`qS|&=ibX1Yh|yS(CQ+PO|ppHn(r?lYXbmt
zu3`#9bF*M@FtT~)&sKYZIn4}SFHSt&gppp@uV2#u4Dr~UQa<pSQv4|;opX6j%gGd4
z$zlF&V_$WP^ssXx$8u<h=xW}CbhV*U3lX?N6QAtyPFmBBK=EWx+R^^Q4jmo5q!jys
z1B6513=fNVaAZtmEULV1G<%^s>HfGHJ}^M{7tG#?{S07Qj-2fd3X~?CmwC}1zVwvs
z3^ktYB%;{NqO0a*OM(S4htq5v-%2Q6w~aUPjNKhu38Gng36CeO^!&10k|7jc&K?uI
zz36ix;>TUfq|``Hm#DEFxTnvk`8fVJl2mrE&d#1IK}b-r;i#<8!*fyCe&bqcX*8`5
zKwtf(^?@|V)c<1plG{&%rbs^A;O?1yH`fSmnEc)`&IGA1Pr|ufK<_Kc{N99vp2elP
z9=HTm+7sd+t}mlxwU<o(O7EW&zQwlLL}~j)?uwXFX)yn7Xu;%zdxN6DNOfDxf<_<*
z;M@Q>q|wYN+3Uj@KWPdwWnEna$V-y(MN____`!G<LL%E<h1n1l+D1Ll)n+^Y?R$#-
z;V79q`sVS1OF>3GeH)FGOJ7&lj~wYSDrD-dUb;_U56lFX1zS}l-Gt&V7-j_rOMh>$
z;E>$DK3qE@`>)r%R9j7n0acI9O}+7I3vVDzTxfaZU8*C4%BNdg%~}z~`gBmYXzUD(
zj_(e#X#4piBL6Vt?pbnR+w37Yt0`=Y0x(fjRB~=EZ@SkZerTAyZoPfR#5Vx^05NKs
z@U2I8@M&<iOo3AA{(NPg?kaErFCX}x)Vh{l$g3s?)aC&^QdUWLV74@fELmh{7yt64
z-sS*+Cppr0y<=l3ot@Y(PggoQzd?NLZ5qWb|B#D+CJ4SvSZem*$>;@)xavtC2fM%&
z6cl0{9NFoPBx8B%6Dd0Z_p>)ap5sHtgog_CR#$G9f++qWUwGJ_2=aSXYyxc}<GYp{
ze1wICCt(M2p}q(XVfQ0>w#u`+wZ?DT$gwQd4l_*eM^Xo#5<%R~dCpu|1DB1?N&Md2
z^{v;~*$l)7)%eeoNn~ZEVfcP5SLeWj1pw9R78csx?~<UA1E56l%yE|N`aJOM^3$@j
zL~n1b=V|H$r9SLt4!w1cJbySnq9Bm~L031|c4e^seOXLQWo1ox)E<ynmTE4ciCS4P
z3TrK!+vs@|mXvfy(+p<-+a9=%SZQUmHH%k!gV2iwfdU**w5o=y_ow`Q@=B+ezKQ97
zdI6fg&1G^HF^49*t)jPu{Z}1TrSLl8PT%2Kh1twxz6aZdeFQR0wHv0eRhE<)7lEjL
zGlo1jT2Hi<=6qsUm;8mUcyI3dIeEfdXl1;pijr_slTxPY0-Ta%2q#54Lt^ZtDIB@8
zhk?3zUxF`_t~mh?BrBasbFPiY>~e;^+)<kZ8>=r=CZ7EPPfKJ_emNq1KVrj@^LKgn
zy5&8TYkEbrYNI+QZHe3`KW*t(AJ<Lw;x(E6$zIvZf({lay61RHpY`*zLwN8;4tLA1
zg~~SwZ;|T+y=i6ZirY>O+AzqHr}E@&fGp2k^K8Mpt@w)Go0DIyEpS?CcAvd8rTPj^
zUuIb3Cza^q<KrF4lwt(Na}xpwCbMn=>nOe}g-|lNN$>fL^H@@2We8Jz!0WH9idgW~
zWSrG^DY-+jKPf|d!K%11#gnh$RV7}bY4iW+P(P}+^Eaw{Gy}Jhi4Vp+=oja3<&3C4
zl(tO0`<GmI)6)K~&7wJh^+RAoJvq|Qt>W^MbUqF)+l-^t6`7@SC|-YiT-2KM9k~z@
zuSamDZQ-GE0v!_*Q<+cs1FYTeIhEft_L1D9VmFO@%9(9OAdu$HZ#tLum@z7jp6zl}
zAk09EJFwy@5Ov=@*%XatsPkKFF^O80=2nT6?i}B(cgjvb<^0zQ%7qWWwM`Xv2-g&v
z``>&H<%F-lx|kJQk;O+P?^ox})PWZt?IY}`*wYMxE2T4X1l`P{>on{B)sH)X`mxrT
z`4Uh(PND)@3)_v9DfqI>Z4cUjgs94FC`)h5;Y*sx0&`B~zKOR9aO_ClAK&Ub@Nbm+
zn*HGN@bH}2OVBS#r>iy>)RB)fBU<QinL3+^;OK%1NUt6oOLR~C<<*BJ9~$aE*yzvQ
ztbt9wp7T$>fB+gdY2ynS+wFl#TwRBFP)xH0kLtukO=yTDT`2cMh=i6FeqmuDIypbC
z7?w5n;$iWXK(*6m_(g8!`<xnk#J-1ws5Ynd@ZNC|61ZkpJ+EC0o!mWdPv(ET(>Xym
zP^N=T-f6CW>}^4l8d(x>`?k^l?zU7nr~k7_`p~q|`C^8?+=l@z1qF0+a`NLvD1EW7
zzE!oL7#8x|w>b`NzTMs3hwg6_S7;z!*_ceKDtgsaXvwVga!8j)B)7}LUmTCrGuzY7
z<wvqdI!9C#@tvFMH!d5}QGfiSMl)ZJP#h1Zf9pHe(kQ$RON>>r!a~5<id1&Xi8H-@
z@367i6Gl4U7FANhB5?Tu8y{b){!}P9B&2fL3J2jiL*RUVQylDM;eYY|x;HRT4rU@k
zDxq!m8^S$<>Vs%DtFmC<U}yNp?8VhOqxVCboPmM#e2hl*Rc5BhncjS3-jEkNU3IX7
zd%miQ;Xr}9b>Ab|URl+F21a?LwZ%nqHsq_T9KJ=B{O?b^yMY_Z;+c;*tb0~Cr$hTn
zindZ~KDHNBE^2SLG~i0x{C0`^v<a;Krk_~Ii*PPhws%1NT%kD2)JRnW(1PASNY*r4
zsLMfU1ZoQ{HU#2<Z)v#e-ZI4xdXy<k<*VuI?&LG7e$n_RO#%0p5C+s5YrHLRKSX+B
zp5BkY@ayEwKpF~|n`?uO?cS9Y^tSdn{;wg0$8I8)$5X82U+(e5D$6+o8g0_i?U!8q
z;o>|}&@kIpP)p(g4vD{!8T;h?O?mOPwuW4ZK+;I5K~71+ln!(X>*3JOAV=4oJt%ZA
z*_~L9i{AzNC)AUx=wZ$r>>8MVG~;`F-4!8>-@pXnKS*Zbln~koeNo$uz6l#4;dw_v
zq5OF3*o#&}_rEw14JJIrWX>$Jp#<C2hIg{DhohE{%sOY<@|?{Lf&m9%7*q!IYv!t0
zUp7xn!Z1IbAPtEW#z4)Pi^Wk7u}RvN{B*KvWya*g#V#*h8lS>Dofah@<`&7GtL+MZ
z*|^fyqE`N0+OURs*g8HR!fPLhcocruq7s%sC_Ku2de|Mi5mj^zM^(eYIqdS258y%!
zpN~t93X(H=_^uTpr`^Qg%8ffeg&CpyLOS3c^i(LZcip{~P!O$MR4K#8Fm+jP#%Mo7
zP}aX6LA@1$M;sAoDEr`zM<#?rM6pH`A;qRoj*4c3B%1(z8siM?ldQNF^~%Xws_@Un
z#-ow(dsF-)S!$@F7^=ehw^Hdu*3h^_e^s?C=3Hf_b<7O!2(O_$v1s&K!lbuDKH%Dt
z=y>`=7brx8Yhy@c%98AKD3kl^KJB<HyZ)Hrj*A-#=3Ub+{&J4l$Dk=RnNXC<!HttW
zr=-OkqROn+(9eZP)3v^T*r1PI1tyoe6qj?f?P0^8-*&Vbn)^`aRQSJtZ7s=w_v*pp
z+PZeJkdiw+J-s)Rk$hH*?JpPR=6$?zU>zDgSN*RmZTX~M<G(uWy57Odv__AG(j;vs
zSpNHWo@H4>&hOZT9fm-+l|4Zoxgcg=q1b^LY*tl2>(i4Jf2}NG3~eI^J>erI(>PU~
z$npZDEdib^$dL-X80ZC1HeF{HwAcF!?7x?qq_z&I2-h5#*HoXJcyU0=F)92K=U0B{
z1?fO}Ofs)~^2Y&bgU)vr@%mk{<q1~e+JZ-J$ut8ocB5GbdJnKsNzdU;d?%{#s#p5L
z7C$AbzasQwO$Td;sx5!KxMM(Mh(WTG`j?-T&$a_W#h03l11ti+I?|^FX;FH6rK`3@
z`LFUD`rd9D`w|Udn#CsT%QZ?#yHxO)@Jmj%m{kZjm#|dt>ToZO?Wn0`(NyYEy5HDF
z*2_NrrKY$&ET54DeogE$0PKPtet;WtY>G~&y*Nh>D}^2c>o%s8+3TQ3!QdVO{40mj
zgf}Bxt?*C}wfRcEMI(`vX2)C~msmp#a($NuDZaWO<pNqA16#*h$nVKJOFW;^@p+Zr
zC^XN!<y0fj-J(|L*5UoD3Yf9q$V1bl$eFTr$LN(d)bhyFRCl+lbnjqQ@b}{*Cy#*i
zG<Ro|rgXW6q8Q83^Wh&iWMrkY%lWB{+ru*%SalxgxP$D$`DmfIL=fmd6CX<uTV7=)
zX2YClAhdM=f0GoMt_Lst5P~{u2-`42$|#w}QvhSzOukQX4FNtRBNo2HBJO$86B8nG
zu2Oi|k^dPOu=JD`REyXBQrbm0DV*xgle$ybQR(3w3a-AQ{;?QHMOkrX{5lFVn5ug$
zPO-r0o(hVs{5C`q7hbqgy_`h>spfEp9@M{AC{_vY;azbm!5wyIu-o&_j#Mo<MQNvE
zC)^h=Pcj%2YNj`v(Vq{fkqMN(9QW!@^#lw4{;LCjag@Q=&xt@a_!%r69jn@Zdga;7
zUz9d=s(8B(JL$)}l&fjxS5sc|-yV8$<BZd9l4??XJ@T}}ONSQ^JQ0g5*IcIQ8+HoP
zf<fFVDPH@*v2ikD(TF8qynzB(<GZ8gQUaK8k%2BJxFD#ecTB!#uIU3i^#{_|9cADK
zCXh{}S&XjA=nzkBmpI*d*Xq#zGGXE6RB2)O+2l{@hdK$m&Vb^b5`h@SdVDdUWE~jC
zN7|;=&7tWE^7@ztiZcD!sLui4;R*#>@iiHBO$n?#TulYA)`PZ(cuDSNfxAchAT|Po
z`Bt~raY8Tr)SwZq6G=ffoNbd$L`KwYy6*X%h?d(=@u03qcf0qGTtZvcunMV+(mSr{
zi=2v*$>wKbWXKmX3iLR0{Tuf@2=OKt;g`l-rj(M0NVAG4dIYn0rJ;giVE4u|Fw0+d
zocvcDLf-hLAC@#M;;Y=)If9~!{KoAjvG^gYb!UkDcpxJOa4hNK6Mn0v_`l%J2SZI{
zs@nB&w)z?V0Q%CTI$Vx7ozdZT-T(DNUfyK3CVFLMsm<xqEcTM*{lxoaOx?iScQ4(6
z&=_s66L8=4OKC91ZEv4?PsQ!K)KNy@eyrP{TetQT67YX6E;K$deTWT%nqg?$KM&ZR
z9?YcP#=P8n6$WEm?yjz~4&yEY0So!!in@C)Z0WC5<=*Gk1?%4}VEul!smqg7dBO1l
z1V7=?47*BcSZf$`+4}R^i9ybSdu98<Omp)2!ZiG9(sWGJ*>R^xZ;gdV5V96&Yv-AC
z`FzWGm3%d&k_7<`9O%W<ul%L?J8f4XGo4E$24~rag;-3u)5C?-Ka>vsU_sAbiH)T=
zOzj<;IjErh8L{H;Hi8b}^yOs2ommDI>}Xw`j=U%K!CGuPnkNtNI#=6+orQBFFuh9+
zH+^3$)Idk22jR{w@>!vxs5@-i`<#9ORROWt9}%CpJR4Yn+|Sn%e5?9E-cJ|fTG%eT
zi=&NHyE=Jo_2RE(j%%X|pJr!`s(Eys^B_7o$}T34U&=3l9{Rpe8{{WPS8%m9MEhZ{
zzG-q?Yfz9+20}ls{=*oc?Ht_m9EI$^Ru+hy%(RvDDZB5F9bQFk*VtTPN?&W6B(Ql`
z&_ixmGwQ}U`%{Lqo!HTsqk$-dts6khjyiZFl`?+5H-~!IXC&Zsj|J6swwj}gY%Xq0
z6>-Nm9jHv>euatoS~K2=P*_{*Cb*`VJ%MbP^2VAmkC?0~d<uz0+(#$^u4qwRBF7b6
z$XqW09JT`oow`9_mjXDn>$$m~ZH7PI0S$DbkONpeKj%gHj1`La^<JVC$`wb}*xGGq
zJ~Q+6Yimq?X(Vi-%-s`L3ql+UD`&0}gIo%c6J_aGx=0Ir5{Ia^Um&Tb{#|6He(45S
zEx(rb=d%8wmc6UNnxD{=`Zj@!>2;miwEo>bp952Tt;}1jq{(Wc7QKTN@3I8Tq?;w#
zD<vCt$|iAP+nKh^lF3a^i*@VAzdvAg|EzIwD@xgmoV;fT|BS_!;6&wB?BCP2)9=O4
zL-DtbhFj8^QAnO<@e-az#H4@;uGvoPS;N489GIU!OKQdf_`|XZIk1KUv)WLlh;F>^
zc`xtyK-v4I{ODz`=%t1m#=y`bl|l1R{AnmrXg*FvdZ+q>YFwDHMl{a>0&%1n{=2zp
z3fVvt?a+P(7J4QbyKQOlbP#jH3$N2XWdMRFIyv_n*~xc!E8$&8cX3|A@milgMH1P4
zew*>Sb>7$S9a)!WgM&P{MdOzh(8}x_sxF~*)-@Vz8eC4F6oA(q2<+atwoVFUP=0p1
zo>7bFSvO`|!&fq7-1RV5jTeE;92(6)5v51D=5s{Gm*R@^yg;Vko3UB_Ruis03ngm!
zQEG#1;0j)Og!+qr@F&j}jT2?N&BGgK=_e_)HsfFyjgXG-b<q&EWz^B$?pnR-SWO2Y
zMleQ^H4HmKU%<#En&<Au-Y-0ycIa4<+32Em=-Rf>{S4*iYBONN?)*wEX~HU+#JxYL
z^a07!8vtv0g#%Zk?ZEh0AA~JFIA5)^$+{}d!c45^zs(1QucR$y<eI*UK?Q4VlIn$b
z5pskRdCiuE|6E2DK~ehIhc{9E^VF-_Df=DQ5en@-9{uaaMG?g*#lGr85s^6c&qG*u
zNS+n{OlHjx<}A@RPYg1c$(Y@x5Njn@Iw<dD0o@YB+YSBmkcl4~7_=M`RY1y2Os>a@
zLnbOqAF<%wQXAzOwWKRTw6*?ARKel4pA)<7W%$XeSaQ?~gU@1t{)is=(){LOaKZG!
zKE7Ezw%=;Hhj-yWkGA#VQeOt2RA#P&CMnV^&U<zDWmCZoC0Q<{q!ZOwrqy<LvHsWy
z5t^rmI>ZcxsvrvKC$DM#6Ps{aZ2O)%4%F7#|6*+2<~Z26RvK~#lw?GHDft#A__MRh
zW15ZEHk#qqm{YAD3uf$HdzN6<r|wxwy))Az1D-HloY%V|F6|MGMb;lmqrJbt^gCCJ
z>dEUK)gZe(&7#ThQdOU}2eEov6j59L`lRjnTcEls_;{l&Wz3N?2dh*`iv9qz?9s#E
z$Q*9zXVph2HXj`^Es9!s0=t8Lk?QCQ9R*jGcCk?c*<dDMX!p$=H}17QCl_s=!8}LG
zyDDYz4SLyM2mD+L_N)6q`X5_TfI<Y5>q9c1GfztK$&?D#@zFrcHMNU9h7F|UTHLr=
z^tNDUF6p$gFC)2^O}j7XXaJ<YwXj<A20IzyuR+<#fwJ~vM$SWC{>6;uvz6V;#E|I=
zkk44#UhafGHBLpBzBS-#WRyZE;)^r*{3Y%cKi5p(D@*M4lk-kh@eC2hZz9Q3k|b<%
z-0fXmaJ707`PrSDcS=D|kW6K?1ag_ZFfsz<+Y2M(&$vyaATE-UBI&szMN?LBB7C|3
zN7-9P#SuO0qPQi&Ex5ae;4%<21cwB73+^sMfZ!T5!6iU&cNio<a1ZY8&S1m5&hMOa
z?|pCGf8JWNSlvVKp6<PC*RJ~NtJ=i@D1h!FKKrnzs4m=@&DQT3_x4fQKApR&LLxFq
z5=tx;b3$SB*XDR<PENgqf<pUv5>)en5JcHLa%87MJDf1Vk$`E)QIM;AvKr&$Wo$9I
zI;>E;C3Z?q-ZMn6-JEG0#)2V(;?0|@%o4H~D*QWyYZOU0-T(XPNAzBjvo@u)eaWr5
z+wES;{&x0D{vu6+K#Alr$lt?z(MC6hM{eTg*iO@vUR^(q44);93ynx%y}tYmA*B!K
zU6S9|K58ubrdgh6lR#oF!p~bt*Y-iewx`)U0A_6LhM$E}AR-6Ys+~&@kg_L8nY9~G
zZX|L|vl91kZ?G_w<r}w<N)DhqgV(-tXnpjm^YM!U6wn{N?`IxHFR!niKYtybz5R9e
zY}y5^?K<sHd_Y$#e0$8NH>$cQ@OuH<l(aJa>Y@$xy%<P|4xoI!c32A*2_6Y{9otL2
zRDh&9rrG&DOwT^=l?48>@%Q)$Myki28wbfq<@!aNz-j<f3+7SqN4p?92;E0hofU6;
z>kH6V=)WSdF8e1tx{iKQ6TLP1Kl1-{L<(?%okw{REfzNGURn|7Z3GKVuPwZBR~oKQ
z`;?SuAr<oe^PCNcq7;kT@%x@a=fN4p$;-d{O{n_UA<ww5hFPLKIc;Q3BhiQF!?VUd
zWcfq=j#HrTsUXLL;iB8a$&h=?lo3O(A7JI<&$r~(i)&QivNY4xPG2fa$8R{+N8B_t
z^mBTFnGVMCcian;+_w@-n^m08GLFKENt~=!9x3hO!om&=t+?O;%dRiaN9AMAMNX~K
z@J~+G@-_`~5_5J>2zTN;Sk`qPzViz8pX@Acj_+!=JbACb;g0+K;fQC?5X0dH?04N#
z0AB13*B>Jw-yLrDhH}dRp2OIopdC!LwwKy(tBn0Y^PA-sA3tDl_M>}UHRla#OLx^%
zW4{K8^5IN4jeMH3p0lW?-Iv$wJ&SI`Cki<e*|?4O%1g2+0=bfKcU-ao%<%X4wG6Z$
zVS}|Yva)>*XG}gXNVwJ$ZKgTB7L~{+7OnFX6GoU|{9@*>{$5flw-s4bw_Gw{HRd#>
zopEGx4pYH`Q*awky{qWYJR3V_ZK|26Z}%ISUz{dXIeGr%W$MI~TBUjlyvD*D4O!mZ
z-NFE$G*q!)ZYaRYKxaxThX3hAkrHFu2Lt`*&%v;X2fr;{q6nE=wZx@@3Qe?(0$5We
znxfai+Tvkk*qgwhK<%c7&<Ef1f!XK)hZKi+39oBazjR)fqOsGiT2P~C)!H%K$hnle
zB_C9EgFH6?Z(VnhPN)hC8ZTm+DV6ZuDz^%l#=SOIw!S2Mi|x(AQPMKah7@3)Z>|Ym
zUGpZcP$_bAN6^IQJnK?lgaqCjQ?u9*4bD<IU<fB;NgA2G^ogud4B^+9x!G=Fni=Tp
zoFj-b(sC}?l1p{@3I7XP&3bH<h9s4FI^N`zdF}zw+efo4C#5WgrE-96rjLQ8!9KN%
zgeDb&Ibh<<$CEW*!BL_X_hf|rr`8B@@Z*y<8s2~N^1EZPq}2*&p>XP?{&=L<?zQD!
zUy`N1S-jQjh%Qt?()~6uNb}*LW$IL1^nN@hW5jFG-LX9jDEoqLGkGBzL!vi>>}H#R
zQ++)wyeu3bAo9L8eP7T5U~=q5<Vz@B^n9I8*a>r!mzUnmHhGu4@f4)e>iMlp?@<(4
zJEw{>HBcB`eI|UQc`H$uzjN*N!(lC#Ys#jreM!|VKTVCBezwn@KyV0>eWP1|8Bl;U
z=5_Y(kvWjGYeMG{Acw{+iFb4J>T9qe!^@2lD#vnITjkO(u3@hR2SOHShcS8@AT+g;
zvd;i(5rDzp?EFv!FmeT)S8C+e6&|}(y2fZ3Z2*<!ZO^M9*=Q={_0u+pny<WgBRD`=
z>@-t?97X4Hha%%zRNC15<b}uR-UG#P@#>pQ9Eef>hWQ@Zb|HO{tR_{97ZT{Hee74l
z{@jPZPcVPnk90tlv{$ZP9gR<qWk)MvbkzAQu6qS_WlTm>ujU{}dhl7x`?$D7Am3DG
zX63uUN^G02sgq!tVVjiuu@D&u!lU@1>f5*4A9dDEhH2e%vsn#A%A!+wz0P#>O9dJ}
z8XDhvzrOGj4)lMe=YYDpipapQtW;+eSu%_G`E6feG4<|5o-qqMyOwXV`qR&cfU0Gl
z1I@)b@y~cfgEgAJ_T5|226ITPmHOuNM;i^p$qOfWd04*;DN?$DbVCiI8_SQf!otQN
zVfFN%NIaZBN+5J}e;W2tlRjJXSUL63?JO_{$nRjzf)li`ik0$I&bH~6D{s$}htx7{
zZe0ASZ=C_u?+RFHIUT?ubA*_ff^MhFImc^of}cO{?;g+ys6lbhu;Mz);eqQjP;7oa
z$KNV&cx~;w_73Fzc^5)}jBMT;1|?4xEkZ&SWb<#I1xQ3>90BTyrU-;7$pQ)waxV|N
zwLwq)3s-4&9Z4E#W!JB=z_A`s*usIA^X0PaUx(G`5`6VvS}_z;(Qzkw7u_Tu5=!G#
zn%SrYec_*SC8dyg7rC;1adSW#zxGLD;n0C!3K5b^{K2_i&<)5r%AYrk1bUix?t*L?
zj|CD5%KO7h7YgieCAiD37uzi#oj5(0f#wO-)=g^X<<CCjeD|T9wa8WG!q`iEKex<S
zeVh3f8@nS=$&f%|LGW+WG{XjBH#FU644OjXh$!cV9@*<)X8L4pvVSlb-uxS-#Rl@B
z?vUZZ5wSRqVGFD5_4RJcdM8kFGzpGSz3pP@M^zC|3Rx2qLOlmo`MC1!<AswywK3u0
zKO9$1b1jEY0gRz9`f&jQXRcqwYQp&4>T!lpn>Ysa?d=&n5eRJIAZ%<n%y+_Gu(3rU
zuy9qbpKlnazdfJ~M}IWM5tE!Me1C_Enpo?>4uZf0cKZ7I*V;2OM@r)*%(}J*@4kjs
zTdj%-aO;>94u0wc`0)hU0jZ&;y+ACJK0}~p69)ao!r7qTDQYrq90+94dc*4&m0B!G
z@l0tA6vsD{oWL7TU)?R%L*{Ze>&~>DH?L7GUW?Q_bZ<eGH}4my$;TUBDk!c4r6M9;
zzSx~vi1xp}ajmp4_IMFslufnlH^2fE?uwy_;(!N`2Pb{;d$>9587+966l43g`Rz?=
z`SR~DhsQ+A*G>&2P-QCRH7ZIe-1&|((zWO2uuH61{X6<7x}<*W?V>N@=g=$5vpfR-
zP7_8;OClf=b9W^ohoee2u@>J4u{Y^kr2JE>WIxPu+UbCDVy3^oRl#&}Nt9Z#I5ZZ(
z3eY*yz?FZ;CvSlw7#)7`_U{2lMEKoWC2T-pfBwfTx!1HnqwtA-lgUP{NBK(qz=mOt
zDAjjVq)%RC_Jin>Ij0u__vWh44zp`PBzyj)IAL4cT&eue8AHJU%oDYEIsOrV;hybE
zApr7HxdcygO64mA3mOGHP{~NG&sv|F&OMv^Kb^Q1bniy_H`_gx`~q{sT(Pgx%6C$0
zkP+u=_E>-v#AvxP{<x~jeUKjvJV;WtFay5b9{315#D-N#N|}d!Hcco&c?uL!z9S%K
z^{-_|T%)A-e-Mc(@(_4#wbx?rv9>StIg|Bvf{e`0J&<vg<jM}5eO}mDDt*CRPAbOs
zWeT$<R8?R8N+SAvAwh2SSYmzsclG|N3Zd9SY_8WWzWBO49n}M}GE`x!4IqU1<gol$
zt_?0C2+Vu47~eC1AG5PG>_wE9SMg^^#4`Wb@(o`+0sd4^-kzvCsazTtfw1?vHNe1T
z$`F91ouB`ev+_K6g9wJ>{w?<jSp$P9jn{Bn-M_D2uGkf!+1z|#6KUns)h$MBc0Zso
zY>gQh=O$Fwdc6idn34(~q89RCJMn|=UNPrvkG@Zu`1t9~L(Ks0Z@YY!QZ4uWrL^%J
z-zczhrb4(xz{nX}O(N)FQXbQ0Dir6mEgpK>nUTw+Oe*Z~LvyDsShRS2H_oQcHu)d_
zIAP|iAiOOoJm*nxFkFS_<n%)B0jNl&vPN~$ACU^wW40Ra-m-F-Dwbznz5k4dBXLC>
zt}%AG-$8&&nQZKLy&@2Zp-lHK{r<taoyU*rg3>HgPmNksEOL+_{2a&=O@Hn&c)scO
zUu<%;c?p*A+2rYwM!wmB2*d-Wgn-mr+ik$oeht>7#ushaxB*^poBga{`XF7zrujZg
z2*|VBYkWHDxF7L85XawIB3lEw^=mbr2@erewGY5lVbM;+RaVXr8G6|5-JUIs!U2@U
z@I9cC%bb699PdHEerZ6IntL-2Q(C7Xkl6|5gqS3U<6IiQZ|nT3j+y%5eT&2Md=gmy
zMo<!*_{-qv*<lDgEl@qM*1DThcDYybG^YjDzL7R;f)qkp7VrGj3G>)oGeoz04Y%Z#
zVfuu!t?u@tz)HRYln05xc(MD}1v&P{?IV2Q2!4B=BYyAl5ds*q>}t-^uN@E$JG9Ri
zy-;-#ZnBlyv8^;0X2$2EdvaD|_722C>0SZyD?ME{*nnM>l&b;cDiS~ar4pOQ!o%W6
z33MTJ7*Gqx<O<};o`9Tn`KdCQ^$bK`{tp)*4{e;!C$zJ**O{oJ^U3Smg#x!+imu`x
zND^z-#G(@7{IC~lcD96;*1lJ)?`>uj4ThE$;nu-D{3OfETkGS)00cUw#FX^r7egp^
z@Ra_3M34fWO)!lis+1SeyrGvAv?<?=gya|%FR>Lj>aER`pLQWT{};){!ZC|QaR|uD
zl`n}Es$#{2c^;U}jMLlUHtw?qZQmR5IkO?t9T#+5CYO)n=*bc#F@1B8nBhkNoZ-tu
z4`*z`lbE#&N)*sLfK3@xi*h|rEKuw!6|+PJ6;!Aqf&T^bA`ZlH$~M^InEXkI=K+!z
zUQ#~r;^R~OzStVJRE|9sb7%PkzN4+x&{Qv(-q_>rl#HelHxS`31KlBbRT{|#ej?sg
z{=Ql3_oMic)9<FIe_TTP^knHzhZ{Qi?wD-Z0M(T+?2^v2vHcF-lcMh|N>48PU{=1=
zPJMI85c$(<eg3t({Sx82kTXU2*vXHLY8a;lrdy}(mzfN&TtU*BgEZ;SmnPy1d+P58
zp$f&RI+?YvbcKC@ore1IlPe@VjI#HqQP-ZDsjRt;q!T+y1s$!{Gh{)LS@~Qi8IcFp
zd)pfWDf$yFhHk}|7XuO<)HdN~#7>gFasroFQPmbV+?!C!d&fbv!Xj%r<|>4<5krPl
z(11&cp*YozEhDW~LH|9da;uj+HS+Sq!niTapB3a}XC-#PEZ=#R=D6OIBZv^!+Y&wJ
za-hhzX;zPDV_Ntm9T%{D2VsUG>q0&ppXs2v9+N9Q0)_B8?;xVEGT(dE??QyMw2JM}
z1$>N{jSkf`$-H$Qk4?1&?#|%I%!dvkOZM8@tAvW--hANEE6mwz{9z98!b6DGBl8aE
zxv}btEgW;xvG3%Ez^Vlia@DtSC7X<1M_c0X_Jb1>TRa@Q<V9k37H_|w33Dx)%WU|N
zp@UJ}w~7nn`nF-x9`Ciu3VD+=CACYn^lToY>fh;<hTprdQFEl4g@%T9oAGY`j)X51
zm50i8*>k1d_<MVETwXegcqCJT?A}gJ9M#F{6A@d{a&U;8Pl{DZmVHvqH|mI+Z-ai=
z-dU;b*g3wYsI99qhd=x9kY3`FmC8;R1x)^$t^=-MAMD~3V8yJeG&-4@NMqcy`t@qr
zqgiYvzVy>8;e&(Cj!gZg+}L=iFwEpzN)~&oea$3_M}%TbOI7ho*n+)W0a`;B3R=NJ
z@R5zzZ)@@y<(}r^hxISM4Y+ufh(eNhT{n!plX@0bdr^&pe`fCMi|A<u&;%V<Juh_!
zuyvK(3qL&YP9~~sKAPv)y71mTb=dq=4u(-Q*Y36?{c_WPJ`1cR4SDeF`#lL$r{|^W
zV<PA@ZpC|y&rT$2e<(A~Jul3mxE~>|n|EQmFIQthqAN%SD=f%Y!u_T|^M7ibcuw}J
z;P*%Hj~!1Sm}82!ibW(C-oAw)a3;1%CtrQ;HGCh#5q>#3<l&pQ>GZhg1WUW52E*9Z
zPC!!2no=2pwV<QOKWF1Kw`YF2e*~o_!e~zJNOPvni;-9zk4$}NuxKHczA+c&{5`qt
znbxB1m2yIax_uHWQ1mP=B23I!=aWU=8azcMe~gxvU$xnDM;;TlW%TSvrAv=;<`Qpz
z=%kMxm?i8v&dHU{qI`Xa8r=tNSx!uxooF~>NLNC$U%2FY879W7prmLU=5b_|+uUrS
ztj`qq=umOY?*NR@-QiafwUTLJLz1E6Z;Z2(m+l~tDEVY$<ez5GR|vRS=@C7d6bs|p
zsMuLT;VOg5-QA5$eKmX+L(%j#fk%iVS!uy^0lYoEZ*}e#?6_>wN32Sc6?G~)D}GMy
z?9fYmimt!rK#(-BPgcF**G~)o@qYGvZ}x5T<EybzcK7!nZpcJ&*F;9Zn>sh%s{+(N
z+#GBHK`p0pyT3vbeA$tW;dcZG*ovs}fF?2B+(#7hJ}xi6+D6JVra3P(wj5^Oq1O0w
z12<81FgJ0OZwhf(GnwOVc|Lm&FEx6ObNFiBrIpA>`=K!teW>Y!nZG^Z)D+)IPQ!$7
zauwtx2cmEv4>_^RT?7X=>u&@ENMdM9C0ZgFe-38krD%n_bI7y3VT1qNbKbf{Sz^gH
zm#jJGs9ih3GGCJ6iN#NSP*<@#M3975VOKMSc9T^}onGH!EV<9Jb|tl*;iPe$$Q=Fc
zO-R3^Nmk?s6!5<@=YuIO-B&wbUx-fBZ1E{5d`9{C21U<-PQ;y*K2C0>*#*gA@ujSe
z&fB*?Sn6%AfX7wID@PJBBqMvfPe-LpllE{Unr{r5OUw?WYV!hPhtSTko@8boeO_?o
z>FM3-zQPI(AIJyzkbeeSxY%L6c5`O)WmR;QR?6pCsJ4Q3Vb<2;#A{*?!v|TSye310
zGK>t8<kazBri(V9hHa;%b#d5Kq9J30qZ2;^+$cl>`+v#fk&y*22P2V2DM!S{^@OU!
zR>tNaslMnyG5VSg+M6%P@__^CrU7^al#%KC3SxZuIjWj%0*;_ih?po!EcxHBA~IhK
ze+wy5iK-=EoJYEm@|AO&6*NRd*8T)<Z~Nr<Dz6^b1)RAkQ3)boUhu99Q@uKx{e7J#
zH=O-&{jioJm9ZO}i>)5K=L00U?Z4`)%?Ov=CsAV4mtch_ysLzxlV@>JJLpU7Ye0hk
z_wcv<dSbuQAvP{f5qWdVs(&vhFKe=V9w_8}?R5biUArAOE_@nTyXBt;=Bbv4Kb1{%
zMh#9&Ripf0Yw^5hVAGUk0v6xeJk9DpLW<mNm#wKf1UE=@;dX|SADN}`t}K@rx<oN)
z>zruM6b+Wam)GjXPltqcCE($%6J^z4UK;-+ewl##vgsd!zaBM`GpGAq+M7?ngFX&(
zRXIU=l#y|iIW;-cMZF7kpyAb1_-3E6$y;I?VIPM2#Y3L&*FtVqnl@^#zLejR<Toz{
z)({3<nmvx*s^l1*;U`moI$vgqh=<>v$cJnRaTto|{{2zMWtfdV&OVvnCt3fQx9h-2
zap*0D5D!j;o_J(ufVE^rT<D}u#P#(RkVGM>dvIphNn!GmU~fdqe)Pw`nJyZ5M{6QA
z``4+ndma3QT*aY}7PsZ>xF%tLf4k(G)3C+v>IqHST#R+sK}CGo)iAT9Vsy0=+&~J-
z=Qi>&WvF$#s_{R;c0XHQWQ;vabNHQ%DeVw_C#;ezrP!JLs*N{L#(2c%ijjp-?62c$
zc-)|}<!~op3IG%SpG>LO`SKIKj;gWk<x&raS1f(Oq^BMLulZt9pl9Bl(0wXjGhL#g
zLAYILhT)P1%@xJTzVm<SSY&NBI__r){SIDr!3d!~3p?PB4;!@Tr`Dc2znEi}fhX1)
z(_Ft`O5w}_v^wn^JY;k;*}*$-1YyKm_ekr%<%JcVHU$r4g%54Vm;FkAyd5@)**L#&
z(`j&Nx_dkTbo$v@Ml$?vsS~XY#vD<K-Sl~qPQY#V@#l0Op}$Sg&M6=IV@Ybjs~;wC
z$QE>{bEaD8E#NIE8g31Vu`7-W$Dd;2t~D+<iy=0UbEE7v?~c;aB()m%{6IaM_jGhk
zU>DJI7+>|!`on8d6RRXd*4<PQ@-v&;Z%wm$o27X9YI^zLlfWxhnE2!h7yp2ZO52y3
zH=-UFSYL<T-^&-Cx`}beVe|GIh)`r_8>iV3f)SQeAQa0LRnAJ%-B(;$<X&@%a#X`A
zTieGksy}=Rdeh(KmN|SyVa?8r?Yt;rpeWJRiPmM>#P4<R;oeF2b=FYY-tS)@Uyj)L
zMni5BlOS!^%i{WU)CB4KB(=vR2(azD@5R=IQ%USO#p8kSeQ#E3*2g~=aLFMy`S4o(
zE5ACY>VJ#o`+Eol>@55;&1^K->o=E%&)*84DO2E>$Lx~a<o1naObg2Pb3It&#<&!g
zbeSVrU-jGwkNdJQfeB}YMleeyho5f2L-Il%^14jEd^Bl%6^^1WYG_|8iJLxrGq1oO
zM<E;<Z|plVs*q8D-1azvpz}IYF1CCG#&_!MWqjH&g@JhPdde^`^k;i3fVB{bP#<|i
z^<gz9EhEqeyEXMH27>;XufMAu#c&nrjWF~(jMKm;2a5iS+S&`cVt7@*JGQbQb@~@+
zo_Ohn#IQDgiE!tS`iHw88i)S$`pn-@`y^a1o6rsxBoFuEb95Q!LWYvYr>(&kR_6cd
zkEs1>zv=FbfRL;v$TKt4{tbAHr;TLDIO?0*ZLm7zwYijCFJJ*C13iPDA8^wI^U~8)
zKqPlb%VQw$c67J7U`qi>;i5>Pu<g^8*kc3-3y5kQ?QK_9xoOw9xy5et23B`Q4G)x<
zG6yRRUfbsTiy>(pRJ6^BDpfH>m`HLHU~WE#LG)2oJFYW_$G+XJHfp_P`hFTaOt5@v
z@Y-4Tj86yQ+0nokTd5oU*e?$3rK!7iBH>Xr7y0qZdf~72vUv=ZIF9*1V0?`^1lsz{
zPwM>fi92Bj+#~_9edZ|FJ;(mb;XQD4l~S>`f`w`?pvUhNf$C<h@bF#GSA3b68gh{q
zbYftL*Quu-2yU9IYEyppu+yk^996VmX+~QD8%1a72VM&GK`SY3%2u}JbG!<Zv$)Wg
z#?ladD~1Uv_T2}f8Z4`y3QChbEDz)_heL4IzwCXC+!;1TL2#KfpcC4GUvCS-4s*5t
zUNIhh)z}@sECpL0$uF<O_|}q07+0eej~lY4QO}eaQjW)yM_86Mp~Hl7C7+44X3mCI
zj3B21_vqsH$-{CC<s+*|`8W!UR`y9jF+{2eQ9}n`yhlJfloDkoOEtAoBW}NHZ_!PD
z;eF8$m#3Q@P=Eh{lG9b<FiamkTkf#WI<eD%^d;=D)gfl60uqBaD;aaGrFXC8+O^dL
zJN3LDet&bQJkjwuOe*oj7ejH+kB03}&Z&<brub3BL*w-GC%_^Pd-cfOAM@SVw7@6^
zGtfb1yCh@FST=s~qsP;Uvw}GH4O46TeOjgz)6L^+dl&}%+`91H>E|-gjEZ7c%ZE7=
z&b=ZtxUUUi&%4=quRHga;6}fI!lv4zG{|ko(jvOcfMz&IRUxjPNXhm~1oikr<7^cQ
zn<#v!sQsbX$an1MbJ$G4;8Tj2tHjBdKh$IIptk4>PGAm?hCe!gsqp~7!*;9b-FG9D
z4*{I6#SLGrmR_X^zUXFyOU6d5R6YAN#ZzggJ^}C4pTdsra=ERzf762TB3iD_N;TJR
zZg9SC?*k9hAF|O+Au1e@*z3J<CwU-C`IM~fsvT)K4T2$6-HH+-Bb$n>S_g{Ay$fHS
z`~;o|Ej6u429xX;h6*j6c_n5a;xwqHjJ5K!a*5`9o{3LDb4N8)UtERoPCRKWe)pVP
z@M^cRC5vv?UhJMJB@4wM(n@om2y`Pe&8QOoiFb41LKx?OWmir%nUno)8)|JZ_TefS
zR2OgCyrji&GvyZXxJ0!Lt9ZrHK$rW#M^aNoDfy>`<KiUeIr4!eeV$@BY;yfdX(BKX
z3y&2nIffad@xa%B<iocp4a${3$(EmKDn8j;Tu^uZ1I}ZNk`u$QOD6k~C5ZdDYwC>3
zq<fpj4$&&sQYoI*d`3ukjBi}WQi`~H=5Xg*9QGV*w{gI&*{7(#0ym`yB5Uo{s-N^3
zTcm&x2qj=NmqiVzTSB2uol*PH_+UOAi%0o|-Ze@H`v4f0h=UM?CLsB&l>shQwWPb9
zg{iInK}Q&T`gwgd2eI5c>kiboSz3D-))KocY6=NFN5&PRQa6T&ErY!zPr`|Z$U2hf
zA<3|(nzP#z>h6o>zTn`OnPM$S(&2%}nh4XSvq?PPqg*z6JnJ1qmy4+*T0NHX-Y0cV
z*e00>99=w~kvrdC2J-ahYL!kFjXKZ#nkJ?gpyj_|P{}sHtP^(5;K2-TSe7Cizw*9b
zu%2}JgBvO@yK%hQp#$3pXW`-?gj}te4^$sSbDy6_;9<l^cBfWB`cD}@$Yl7nQRh#Z
ztgk(XrN&EO#ciEGRvPMnytra~J1ic)<Zi!Y?Sd5%l<ki9EIVoPTn@^sb8?~CG`%^W
z?a6VzdEn&vKAtAtK7Y}sF^=5TOR2wkKpRg-%SD#PRlFIEYUjet$87S@qHoTiEy4Q8
zl7bcESISLwFoU%2Q@+rQJ}v<hl2h`PzFqQRg=vrGeEnJ0RA5{cHz60g1qPjTJyf6{
z-wgXb1HTV&a(BEPW}kG0{4Xi=1Z;vvMdNc#VS3)xQVtx3b(H#El&AwPq*D-bU#|~x
zGTx+da8JamRQsTAlj}jS*nK#~@3R#1MvW2?lr8yd>Ah_xgn^Aek#0K8W-p>*nc|=I
zvqyCm<1AR(cEB)^_oRHsyl+d5$$zNvJ1)0}@Mqj^PDIw3#Jpc*mihU+c_ZM$Ied5B
zo5~KniXOKo_7_>T)~{{tG11f8_q+gMd}Csg@6Kh1m{i$H_nB22<Yc+}GvLL`(>c_J
zZ}@6D7Lr3@hVwONh2?l3z$fe<A#AMy5z&$Fn&LPoIzHI7U+!uf#pj=gaZl5CpgG(V
z{GfN86n3`iwzFQl(7V;{$b}sfZa&wbXX*z1@)5ga7LcA#wKGHHK@Hz@Y*0J7uTa}2
zOXP18r6b8qOo7b&;450srPiUoNNSY+#V+^kHk#{KM}RNyh*bU(b?ZmIv%C54b`K2N
zy;@V{m-5}et-4A<7W{8C9`;}jL?aFKi98nKLI}c69yM9+2Km!`qiV}P(Kd6I&}6gm
zTKE>}z4XX`w|mVnes(E_KrSDH+nx|}?-GBokj>!EhF2o*ZE0zk&ylIYe?%^khj#(`
zM4~sSI#wI+W~XZX+DiAH-1o2CX3|l&F6#EkVQ@R7Q4Vkpg1Q)By%&KeOrT(P;i~af
z@8Jt$@HR4n^jd2K*oHazK$eAc4h489xt`w+z{OW-Q{%?)b4IY&ZBpsl^Iss#TEAzR
zhYYh<Aec`#@yd#X=jT(CtHwV}>g={xxmu$@&dtK&i5AZ3qTx1EwT7wR*nafJjImD|
zM?6X{)_48x!V+-uzEoF}zIA*e<uaB)2+EU<{t^)p(Vfb97Q~xtK2Y;{(u@X3pr@>E
zpq36FlT%PYiRnk$-d*ka`JpW#^|q|s$OtHeaBdQgoesSm<{>0B0SXN4LpP&!1g){t
zVdzQPEaz%_W9fpHSl9RWq_DsG^L6gOSRhT0Fe7h7-pI&1izja$sV+@86ui%8gD(*H
z+yYEYN!w(=T@zcbL0x@x#{}x<@#LzKD3S3Yz@gp#JW>h%s~6AHNo$0nuNf)vg$o$6
zzGZ9{aHrCXGLyjkJo;a3p>1ZV5)X>V7*zV_S6zcq^73pi5NyCFR~B%2HFj32s!mZH
zt7xL6{+B`THkR}QSYbZd@@2cPE>1ILSvcOT@9c$}_BMt96JqzwF|_*v&^>@Wqck3i
z1?x^TuLCzX_qd=^3J4@^Jdp@P>=4cSIE{XO3pAc0=W+C=jv<?R@dDoT8p&MZK3)`#
zAwZ8N9(AX~Sp<P`qV%6{-bs=2mM{}nEu!_O>)#{!V6OuHs%hVYVY(<cYOt(ih%Y~H
zi4zHhgb#7d`?(xbWM7&Zy_f%5lOi+4ldu16P(&h74ct2kbS(?#fn_<-=)4BLk0?fS
zAE<2*{e3%{0e;BOX={Ik9!5xri<mr5#WwrWQ@Zf#z1&|R5{2d@UyV&UJu1#tMSZ63
z>3uiJ+VZ;9%kk@C1HQ}C4C+&}Ynd@5zL7OC4&DQeRS2C|BZQWJ-H(qO_6_0iR20JA
zMbFP`*TvYG^)FFfmTTB*GDP~8E{OfkgCEC4vM02HE8Ng;WQ`3*%=`c=P%9!vcsUX1
zg@&4>mmC)?HutgyzWCzi*Goy0^%qJJFeoC){ZO>&IdUVmwJ%;*&^}IF_e7b>0n49~
za9n5_rJ7;g0oBa~=CUpy0`D1h%1?;kJ*7PFax6n(Hn{&NU?8rk_^ATZ^w0e{-fx&4
z4&isSHS*zfHBw;a9fP3nJUFTU{^r>)YLY*V@r>{}s@B0?ed2y7Fjre;Lm|bz>gKiZ
zUqheF$xPUz#)b;B*HsvEgu_$yB@iw&y_QrVXmnt)@Fz$kJ~`^(6XU;CF<@{l3&wEN
zlyjpEw~+n~X+|D;y97&L7%<t_pGz~gs{-aB_r!_(f8*+uqR;Gh*Y67=<@UzLH-W5E
z00;FSt8&>|74km!v#>NoGk?jHMD-7(2h;om=~vo7(&~xW2)%<ztoxJZY``Q8k!&Z@
zYjyv2r(1z7Z*Lz^?+9baFR%mhRF%Jh{IkNb`*7e-%m6IkP1-wd?El3E^c->HwkPtw
z=^+Fs!3QQnY7Wf9s9|z7RjB^$;n(}=B3kIJ15bao>8XLz!!e)z!{&>eDQ<38IacDz
z<=~hR3Ldn7u)Oqx2f-tu#<=JziQ?a!`*e7w)29f;p(0~!)A^v&^{&B7oP|q7Z(B8-
z5<*1|ea%+gP{{4U!cTsQJO9^jYF&Zn`Sx*Xg0<zBswIOw{4CYJt72&ZaFVlHqGjM1
zGS7S5D?xp>h(g$VTt?x2wo(Q$#F+tvKmpZMdhy;==(kzOdM~^^=qr0;1VqynHjo8I
z$pEnYjTKd5U_W`B7+yeJUpzZ4dUMn`k>cCm3&lyF9A5k>PYKocs&#&jKN5lu@Yl5e
zyaX3&erSgt;Hy8&vg%KEdYCWJ2e_Vct1Lv7+xtDRH?6~;C8&nMi>!a~oSqM&15ds4
zRZ0AxSI7+7{gGpM2@j$#M)PwlI;t^41AZQAS1*NwpFJ3Uye*Ah8+(qt(Z|`mz6Y7s
z=s2thgMu4_l;Sx^mryqBxI(!39%yA7_L>Sz%=q?=&QRO}IE6ZhYU;3Q?YBM_k2$<A
z9<j0^u6{z4bSYC%%9zfe{hWL|$%Xb|)VYM~Kv7ipr3C6v4IO*{<JJ8Ec~j9f7{bBd
z12_#jHrWP)ELm;^XYavImuWF{2&eM+g{Q+c;IYh83}YX>yzr^v+3>BG#J@+xSUg)(
zv@dZV`=yq3L8QEO*u!jKOTAwKL^fZmnLZ<Z3Uq}vwO@Y!(MRj#E1ItNyO-=|V@h~1
z2~5-RnF=<p3cnQux7@TX-!%COCEI*exqY>bTbB$&nhiW}NBRd8`QC__ovm^wrg?q%
z>t@&{5kH)UvwnN>VrNQJOpMsaM=&eUgyO$L27UD}Uew_d6I1d$il7zs^`QdzlouiK
zs#K0d)yDBc4x>kuvSLqJnRc5y%Fs8rIxTrG#FXMk_1RKdW^u#zG`Az-`il#RVrr$@
zS~uA=c7Y!N$oFynAs)>miRbi}gm<nHr%b3F0(RpoWTZ^^bO<%7kV#)_mPCA^cb%%e
z65*R#ce4dci=79p=<P!=v*zAk(9<Y20)XW=FMJrZ{`wBlS+b#-)c<+4eu^m)**ne+
zzv>N4J_-OSfp9|VBC}?A`u-m*f-^u2&DGW_(}h|=wha9R^A<hO4}xa!NxoW<9U%5V
za{nFYpO~eg5HjYN7bu?4@8momrs0x@kPAAA256seeEkWz|1eu+(u9MRO;T)(r4&TN
zlXDFXU7M!YEx~`-h)v+JFBm4b82gO+;$skdy?o>Q4V7uQ7O*X<Q?~HZ=eXw!--*%V
z(CVBjBy2t(A#PvaVdGCG>lM=8`Z&YL>KON&({}J6KE3XD-b>dY>T7KaQWIsYkjp5C
z<ZeCsp7(TpqjU_h3onhd4SZ9C(Un)Pp==QI^&LkBsl(2gr)W{;?uiDp%c6R&(KQKM
z?c&LIgC4S_(ZY@Xlu1OS>Amevzb>2pVuW0}Mh5ie{oz3=pG@6?JpW09>8i>Eg3)Tg
zYsj*ln85-lHUk592H>X~C-8OJM|9Zdf%d;^qP{w|a*{X2V^(WF@GvamrH2Ba7fBH4
z=*#l#=HByse>q>fWB3^Hz5O>n0eOM%O%Y&~1W8Zyn2)5NRl6TB3{Hx47@=1*iqzIt
zwsttZ-IXqg{JN0Ih311M-B}i|udK$RRju=6c+_vwpl6YjlAM$sR|S|KUq!N}J@Q7l
zTs1)3*{6Hf*7PF0c(3Ow5fSnU2-MS)=pXOfP|?sTDQ<RCNaW36f06&K&Ood(G~A~8
zyl&2*)A~(Do(7v~!w>&4^XrKL69N5dtLfDs)#2%#U3$Px5OlOeK-k>M_pc2$fQfrZ
z{=5|YK8m6K%cOeo@S}kep%697$jDgVNIWqOr25Z6)2g;;>Ky2aQLqa4qDHUqr}e^h
zeC#`;K+~@dyIKGDXa+}l9CxeOynI^P867ycf|Q#4YyGv-qctb6M}^Fz!hNv;Of0ct
zSbDV3_U_77uccq)si8^>hUNLl^H{cnfis=!)@J2>dEuD;#)UL4TO=G=etaEzr9H%%
z2AJn7&l<$9958NHGt?|vJj0~N_GsV>yCxfKI^XCL9?!5<epztszmSINnUFE22Z!W-
zYF@GEC11USrv3S9od|Q(CS76*wn?s@iGMeypOq!}0uk4h7F|}F98qzV8P+Rc@a5F_
z#I%AK&F&qkt989wD|O8#oqL@~uO2&o%$|uoUU+#GmB-Lp#<S}V6y525F3_3w@a+Sl
z2bDpD2+qRuZ}s*!8FkH~xngEJj27StqTO(_?stUMGqdlYpGZD8uHimbXzWxyYNP8A
z^q9oX(Rlg#g*vrwx}od2=;KJo>jh0MIJ!Q~QQwC;6A|j7oquK0!SBs`R2>NV3q;|h
z9iOw0N$h*(48u+vu&e(@1o5kcw1b)29QwMq<YxYd3m|r%ll-J{do|a2bL1rh39O<Q
zhlzQfJyW1bbNRchS`IUrA587l0HS(PWijwxc$%HtVEzk$;7h%GN6(T%J7G&Onb%9|
zQh(SVOYnKxilwI~KW|bdPdTGFA=Pt8RxXR{)hjZ0#Bp|iHb}O3alTyauG+7+YHZTD
zB-+%5tzz7jzmhi37aK@#56dFTbP3wueOVm+v9YjFhwLeN`hN}81P7*S$`(xT6gUi{
zJJ7$C!2SP5X}a4Y*(!goO2t<?_^W`IH3QTQ?6DNP&=CBvVPV#Cx6=LwZ}aQ%NJY!z
z=S~`i%fLQYkRQI}$dB${n6zT=nm>yPUb^ILFLgqN0LwHe^p5nLB0lWK*6iU!LHFZ4
zh@}dAH@rcx$77{q{9DcrkANuBTJE|xF=-E3gnWp+3J!Z+Z?lSVh|B1m9j^E@cvbCq
z>WxqB_!oMJ`ABtVL}Z+dQoVAZ*N(O;M{u#jNyiHHWAdoPq&gm{U_13KHK%x^<Pd1*
za4#};31@?Q99wED%p(t5otBjsJ81wr*%1Ay!Kpg2G$*)AO|4|$R(#;1|CpL*>!iws
znVw`k_Oc@TA>>Gbd_3>G#VX?Q2)l`h(Q21=yM2xbmAe52T!t~}rjq+vGGt2SKHu$6
z&J5Cmu{aiKxmwPc%u}-ArThrPrB~BqMzP`bvX|}nmvPpx)0?>Jw-HF%CUP?*kk)Gw
zvsICp<M>u7sFgKO<y#z9SV89l5#VudjrDiq5@N}WioOb1^HsSILDaqS?KWV?FJ*6;
z2n=X_3&w=)3~^f$#6uY`y&jbYOR}~Y{a&X8=;C)isAA~x*LM06rt0CX*G1tqo`~ct
z3LGX3Q3pNDP%f`tGjx&mG#b<`sG3OJ%a0tJPjpPa)-{GAZ3$n9etSMD_IKgCrG?Jk
z{&^^8CiJ?F$o4~$RTW4!1Q%W>9Z_c|=!3-<R4<h?0L%CB#_3PiBzDsrHqw@mOu!9$
z)WeL&<aiSN{UEm`2z;{ibNFiAhf%MdbpNd$8UicpG!UaQyWaO%_xUOmj3)VVObpe^
zRgj^@`+|ft78M|%U;<iPiAj7cb3u!&KGP_Cdpptl=|Zr}g~D+~BzC%Zt__8AAf8*g
zSY<pf;Bj(Y2>U~tN-Ds>Z*j#1pu>0W?wmYKG$0Ui8u!^i4)`>Yi1g(DPozrUh2WdX
z*4e4IYmPBMD;bY}9rT*puG=MZ_%tRv8}8bz7ehTsQq|6bztD28)9Hy0_)I5s1JGds
zv!T#DVAFvh)dL)#CsQCw)h{tSz$)G{{-MTqnkt5Rm88!48I=OPe6bmwGAU!I65@Kp
z?ex6Hxf%q-IZ1ob+~q%cQl(bFPz^=v6SAKBPr|zp+66o~@Hfq!`NRqA0#}dRMz#h)
z!6&_N{U&4rIf*!U=MBCPw$R0rY`G3ZdO3n={;7Qn7Y(%fYTB6URnlM#sIqWlt4h0h
z2CRDfexaHifQI@q1&xE>b(^2;1~guBE{$HA(|-f%mz$g}afe_cVN-#^0Wc`)1c-Mj
z9x#9O%m@??ed?i8BAun?FVmJz%p)xmIQ~X?eQ&pB(v;)6gx+sIO~O~}TH|?T^i*$Y
z{B^W*otRVax7C=x@rc@5G1ql38SQhG=yH|ph6%XL-Z+GD9&S8!z~)Dd+vLd|FgogY
zTnISXV~Lc-cP$^<j``!<0!6vI8jw#*(DxF;lb>(nI#}rI_V#W&rO6nVB0n5(Yd^cv
zv4g!VH^+7<mYuZJKY`JBSrR@z#|SUY@#ZF6;*gLlCOf@`-{?z#kK!p{PZv1CH**;<
zhC?sO!zyW5EmP>m*buW?fqaykkM|Xb_5SBEb8n{|aeK%{l9dQ&VO-oNKXI8>hJ6<(
zr4u6Fz=ecEo|7N_AK?xUmzTantI*`eg3QY+FE3}7BqDc@rVo8C6hh&G6H2(5*?UA-
zX$Rj_M&o}6#O=wxer?W0iKRMTHOwD1``hq-*iO;#DBPS3E8FWJNXRJ3ceN&_<y(Ua
zHaV4o_}Lvr-BS3T5XpCYO@Hs4X=uH~SlV94!oXku<OdTaca+rthd0k}%;U;c(kNgn
zgX>RMd&1z#-*B-)<Hqup08eJ~_pk(WYNuyB4C+*Wr*XH<86h;NU09*L!6|l4!RqbP
z_pW7NyXMAt^Ls3+L;1*9v4y_r0Mzklo78&Mci$VAGX9Nv@p1dTw(R_z{(`pWBhCLi
zh;~b<_I>z=z`#*WqAi86D+V>>nl#xGEct@DL2~ApAX~nl^f-%tfRge%^wCw$ZhM#e
z<NeACw_hyp!HsbCb;1<2Gksg}<A@iaz>HNac8sYq&=ujA$q;SwH$FR5EcZ_pAlK`w
z0nql0vD0nRH(rDrL2FMznLrP+C?)YrBga>x+`m@mydK#80nXJ`nd|*?d?WtwPUvMy
ztMRIT0OmyDwzW|(mlNXm%ts~Mc3bY7c2Kf)2-1L^t7vVuh@QrHo8Q=q9_bR9FD=aj
z>XZb+`Q?>#jn%Z#zUvDfe-l-T$D82eG(Ferv~QF8&m*Vc>?x?$-?*F(kNll^dA3*J
z039s-g#O?k;Z-+1X=j+00twZr1=&8W#;z;V4}7ff<SErSL)b;E<osMlOv;Lc77Eui
zJ%OB~E8MChxa9bWJ>zlZ8Q=q*S;5^!@Oxf$DruH0&7eEdy19TbXt6%u7B0pa;+B5;
zlDyZYy}9~j2y%G&*uw68l{5bCr`G278QAQiG?qvJR>`)lird|FVRF>gqRin0D`$bV
z^hJ}@%^8EwD%V~`(_mm0Vkb5%GdcuqUH`6~R*m!{u8bO%H}Y<JOC2}ehE!(>T}cK>
zp%nXVbbw78u%PabG}>TDvHZ6(yx#%AH&i~n1iufuQBY-ni=WEJd^~i_P09Mt^)61=
z+(Y^xc13WuK`aeM@P9t}hwr4w|Aid?^Fej^?*riU|2QVB$NOL36Md~cW@4?-hsu|I
z3dqw6TaO1}Z#Jzp_I~D&dAwCMgFiFYAL0Ga9c5(E94xtIWPY2REPBykApLlI5JoF)
zggkyF6yQs)3%u@sKSpgxBQknwWP!~<d{u8G!4cxb0^NW8CX{ZDuQEF4h-s#y__F-v
z3P%3BV1a?I7$p9GO`E|sCcFhr>hY&VW?~k+v_CL;zVv#0#c!J-^CvHo<*LH?oE=a4
ziqyy;Lcof?6ceeO!Z}=fz5NZ!(hS)XA(<4aH12Q14;Cf(pZdE{5I>>ue4*9q3*kj8
zTldfMd9nCk&xc^5J;s@4r^xfR=EtOrQ-Ad)ofuJ81i4}gobt6)7xTTY_lSjaXLk_V
zrx#>8oZdYp#ksLG5pAhC0uIpo@81yLV*S^h&J~CU%#G5CLE&MvN!qzB3!%^#uIIV4
zF*4mzb1yv73A5I<sVL0vn79dWGNKU?tdrUN38_N1*!V{%!Wqg?vqt-XSCK(=jhECU
zihPXC_K2RSwX`dlp;cqq9#<1`xn>cH3l{iKr;1g7qKt#f^yepVi_`9VE3iCQ#`ZF;
zI3P$``{nN7gv834b$Pze>(S($HC<P{YOmDVXw~=%x1lr4rqnVB#S44)wk|!_5(!I)
z$~uKs=T~G`>x6UhnMkFRFR;7!2-}2dPz?quMZ8mQ{T;1Rw8$quE28b(g24z5qc4QY
zLY)}V!Cfv=AC6e1X`l5IIG-V;l4w=GyA#y>iHiDe-q3$nIjS$6?RE=860>8G^e7_|
zBvgFDC62Vr!wZs@uw^n)RHs5CIZ9;Fan{WHO{dHd=xna(bUf4<3G_08iGq?xrp7Ns
z1o^tD1Qs2aaP3@ae@+BR@;W@w0&F|#U1YWk|H{!iZr8^`N7n#mH4y@+Acei-up7nQ
z8;78|y<_8_z!?1--=-%{w$+mx5M?mNM}*W)95+&_M+UJWR+FpwMAMf!d)B78>Syla
zVVK_Y1~K8IefthG=1~GvBg*JDDuDuM^Et65pW1axLZW!ZoLD6DO;8bL@Ho7GvfzBB
zh(|Tmi?6-Q__WX^IP(k>>HF&4qZ8WA`@Z?u6zeeKtB9C23(G5-3afVG1mqV&<umg|
z-`HOFZZ5xce@otX#$T;>Zk31qs@y7P2!J16F)dvkS+Mo9rjU7XSgDT#LId==Ba7C)
zJ=?5Zo5+YY1S8e4^Fc-SPzg6Xx3>ZFpCFt^%E$gZ8gpcM0>hV<?eRg>*qA9dBRbM~
z^9P-kYGyj_bY$9Pv8I!e&5mg{x$5yXVegv8<=-GWY}##{CAw@jz}biTP=8|mJ0}W1
zDiABgE2)1Qvyt*g$UUMg61{X*%GICKAD`G#HN#X<J$s<t@5f703Qfw<ExWA`;U?$6
zW?sE}NW3L2rD|p+E1#qb2qs6jmlS@P(`ew^dpcvJBjk1r?&HTe;!NHhlXOpwYOnoL
z$if8Z5C0M5r(MM8*G?qc5%4v3zCV{?shFF41}a8#+XtId>(*8>9C6{HJzW<<RQOTf
z@oF|Z@cK@XD;G8<|7;M=>sh_shTI;JQxpx%Hmb&6g+gp#{H0`{Z0MZj^FqIFCG@eM
z`*<gR$X$;E+TMNqDTnBkk*fPH;De2XG^PEyoD7G`yn_cF1EG`9ydw6%N86g1#f%s=
zo-l0Bd&l#}pyG}N3`X<M);JdK6!8SNtY15EIad5{vZ7|b)3AJ||0iEP+z%uq8_b3x
zn<rAA1O~R)!`JiMw?$EGC$SMT1<7<3i#xM8riDG904fp1eXqnyb;-!g;D_5Ix$q-0
z?;PYqZM_)N!aRgwk0zHld_-w{m0Q039tLCWw1JGP60gQ7<61=)c}Hk-&?$m5Ya2y&
z%uQ&WDLfbD6MDKPhRojiJ(f(1`I*di8^nCFDq!hVY3R44%%KSWnNiiLnJ7Z=KdL_Y
z1;4qsAc)*}&sxfEEwGi8f=T|Pv?s!tjc5TD9?0v>eP_*kpVV2RG!#Tjk-unhRTK3_
zfM|rH3h$c<(8Xao3X-1-AU1TFCXw#)DqtLcZ-bP4D2Bb_;ChE#hANxsko6srf~uN&
zT&*Y0RfV7&V?~E(`hRzmHC1(b4Hq+|Ib~6@p*G8fmJ(eYx`{0VLb+$Ugir$uj_vCL
z2e6R+$YkTlL%sku9L|Se{Rfp`fZq`w5hGo9w^)*)M#8yiht3f{{KkPXO`Mi2x%?f4
zLmE6;;}!kDMzS~pcZ(xZwP*yQl8-xk{FxSG7Uq9zW*V6=GOQY2W=drW&yA%LY-xBp
z!_%py-ipT~A!y)asiQ`PG7gzdA7Ospw%>Mz(w&bCmk9%d1m$gQ`gw95ZrO?cFXS%8
zaLKcZ9twtxs611o#UHWWW!3JZD^YBLq)l7fqXyaGiCb!OX8i;Ax`@N(6(O%E98&Dr
zJZn=7uzaZGk9UY{smnyj%&x-CZ;u$KC2_(-^CNJKyz0bSQwF?Bzm5HdVLIHa{#&X;
z^>;-wDL?ff6c{b9cA|iB6s;)2N%BiKlAbuktls2)?F(h}d2N)VTOKJRUx$Yr<2%!&
zSIq>C8}<??>8+O0YzS%m_yeQ8r0FEAnTC6s)&v7bhw24?;=bKXLC3<rS()q)jG44~
z%4teS3IG0XwbT%A%Ho0Xg`X6a3tPP7&P`TnKA#JC^O7vr<LKFY_q!^u%jTT-cA`r}
zRB7DA1cv*O05%0@3B$h`K!-tiF2*FsY~rtl^tY@xVTfJr<<c&dHj$#eM)-!)qENBq
z+0PQ&^wQXYz>h4h!c?E;J#&_;u=?IQP#DFP?pktc&8`=mfA+_vie<-Qj6s<4M%@jQ
z-}o4Aj`Y+w;zCNE6~x_JudqeLgV<c8X7)+ur4iHx`Ujt)sk<rH9XURUjlZ0#ljP-4
zfxb^bap}I&a*p$GDkng1hc4lwEInO>Q&WXZ7dHWR3y`?+N;%^e<-bf6mF#7Vep224
zWiP#Ba_V^Ys<)pdqqXHH#JVRJq6GP(z|gV7rp#O<xVO8$Selu5KHZ6A3e~LMehTKr
zn*T2o0{F{Dn#S)C_vJOJ?f<f-K63n*iU=-=(yG&&82j8MZABlmex4yhSS<ZcoiwO!
z6KGiKK2fBlu`Ks*;ALhR2hI8s0ubd0ck@zbV{rRTc7-xACQVe_#Z*dcnk0g0PA_sR
zj(_}@?u;0cqsRDcE3k<ffaptxg~x?4!4rnt--WEk7uLvxO!htYpK<4MhVEd2^dDtg
zip5x9tGfR}ZN(Px%+jIb+us!e6c-ShgU3-Lx}<f@e=I?Dmr%XY&pL(D@gqn3<-?)<
zW;HkR-YL^i(z+fxoxFN#&E(2R8L5-MC1uJq^!O<1j4gpMQiL%5rn7a=e$Sj7?gi4?
z5e0H)s$6mNeueY)lj9Q{kO8(-bK9!bXgV)`opn`7tt+}_XIsZH&;b#T%sO@{X<zaL
z#|yqlkVJh;<ik0O=Uhk34vDmGCL)XE=O^E?^^TeMqQwX<Ddj<X+RB**AOO+`Ua4x>
z3$*A3GYFT^vUNHLOoaeoq(0eA=tMn+3kOw0i2Bt#8RC9l#l6X8`9p!_vcy%3ovWun
zcW#3IN@O$EmxbmGs#f)~dt?5`JdrVpHl3M?TFIYu6scwYbFnkRYRp?uKT5h%{}fzw
zrLG~qy(x4B)xJ?Za|m3($S7}#YVUfoRpq~WiH9OrVE1nTQ|M-F<?7mBw)@|c?ml-?
zsupKS=hrB_F{umgrSuT`G-DeDY1)tFrurOTr;bTj4GfR*#+4ic<Me6iyF$H>^!tyx
z;D2M~T)13di$xS$3XDmz;OC@wKQ%Td<@LAn!flb)oewm~JWs_?lLk2gi{B@S>`&zJ
zZf-U3kd6Rs;Fl^nopji6eg{1g9MCe-<fLh{4<9+O8;F#nBW=*sjh@)Juri!ow~etO
z`-5WVYd$$M*h9$v-wM?H{GP;=l=#t%_|4ms%%FLB#m?WqKf9l;V)5Jlre$D2`To5{
z$bFxJ%cvc(zwn0n-{1`~&Di!Me--(EiaYagsNZ*wkL(Px%Qi)_maXiX5K3hi$v#op
zDaJlRQMQmsWos%Vk_;NmXtF0;vc+WQYu_1W<~-B)`#Zn$$2sRZ|DCz!x@P7xbItWU
z&*$0h=YGBKd-L1p6jM!gZjUn^VWyDB#hfk6o<S9=4dN;Wgf?1(W_S;NpnIu}G`f5D
zQ^-k0MJ{Ge(Q|oY^|7!|K?^?*+53Q;B>^Hrh`E7s-Os^3DWg~vBLdpi##IP1^9*8^
z7?ywa98<B3<rEX1+?<zp6Xw#j7V-MIXsoBlot^<ZPi$DK2%Pp+YJTz4E3>qg-sG)_
z$@|&#^winV)3+@JWo5$)1_VKD_+}7W{>Y`L2NFz~l%rC_?t)YoDuoDgFo50_{Z~Jt
zry&yIP?ybi&i>DRDEj8oxzsGdW2Yf*ODO#C#)J38o8nYZA7<|n3<s<;H`zv3HX%6~
zG_JT&vT$;9vdF6)L@Fcvme;QuwX0>nV(aQ8Ao%Yuac;Y-%Yd4*Rbu+&M?I|OtCRFx
zy%H}J+jHy7OsDb7Lxp)!T1P3=-L*?|y{~08zGD_1A^azNJ6~F_N=U&VAm0?5)=Qro
zE3IklAk1(@HV)UyS~fB9skK91-_(?@w^t=CCr5VJz~t|8-@3(i94sY%-+<=K>W!&k
zUPENhTQfiJ(a#)hJ|h$LJ7bJp8x#1;-7%Pi1asx1hoXP|(m#Lx)>o>r;eAO})h^i!
zcMe`;3&rN@UYC@W6(}e;2C0emji8lfYI?q@>qN#8Ih!VO0vf%@ZM@@#s8V|Njdq_-
zIn;1!89bqlHn}HAHZ;HJ#~-ez8PmZ)7k+K|&<wuE0Ls$@jN;gF0$2=<Vfw|^F`2A`
zF+8961%wOw9~{%xhC%ZC9~hJ?3akk7&2bC9ZF+zGnr|LV1uYNqEJbfEfW*Xuaoy(p
zZ?1@3bzL7Kw3^7{OG|aU$0GPdnOAk<<Hbv2&qk&%c@4{W()MX`g2Fc7mBst_&sr;K
zsIU%;$^9?xaqr`z{q#cSE#<;CZ{2TgRRZ+~A)@6SK0i5;!Xu^~%$*7!qpR|?i8XnB
z-n&#Favvke)eL2|C;*hsi44}XG+~`>yX!UDs+IZYQXg=5?dq^eOF6r5Z1(AP=j-u2
zF=5n5iMK3{?zzR5O`$Ce<MPv^WzLXW*eEc_AL4yB=PX##vWINT($vhJ--_5B4_qAC
z(GJ`4jAi8|9r_JGyp!Mpwomv>{a8Ya_$4C;hvP{`Bg<)02L~Ijn~OtC1`qBUx)#uZ
z>;^^~Gh2@9!&M8mAR!W`LA)nEpsr&%Ed?vDwOlGA1r#<Oc_{M2?ecXocogePtusv@
zT)7B0cpm5GCRcfJeJ*v}K>tlBtJu9tHUzD95Ko^!umI9;IIILLGrKAXu$wIVCkmW&
zQ@z>1rFYo8+Lw8)V8BUaiO>5914AI^rx^`XQ85Jc6gZ^QWS`v?8wiJrw$w5lcgM|M
zIXiGux1(jFEVLFo!z#Ofq3vcy2bNqn@5e5DiGE;*=xo#|N^2orT3=z2P;$Tq^Fat5
zs3WPEwx#a(;ap0<h;M8t&WAKJ2ql9ld4#GP^w;rIj&%uZU1w)Q(MtrbEG!4h6ayql
zxx9}<mr){jxpu$o?dgNeuF;JK23<>H=4Zc*#EYf_n;wL81YJbtOVCSePz8S~8)Lka
zn>sPrBYC03f<9=WKR#x*{ww<-6%`dA**bG~Wr$a_C6sfxs1miK?+y|;=(XNA>IaP!
zV^$xwm2WK<u-mQYJzUc``9Lz-N6pdOTT}}<9}~9q7nTW#L|~GMJfH)7)lD%v-2KBL
zNqUoU?zYVNn)(eq#I8=KMT2vmO-k*)p&KGwV4jU>u55?`{+k7P@~u!p|2tbQFh^!q
zWihn`V79!sr_JlU3NbjF4Ps2p?29s+uf&o)KY-#_S9mmzIBo10HnjJ?mZREWuGpVJ
zLD*+ZvlM3A4;HrkMIsKG6SspBY`V&%f~K85!usEpjKcy)#<5jV%-9z(&l+&<ueeL+
zTxIYB*VNYxf1ZTOv<uR!`Pl&&L|<Q7QjPl+ujiz;k3w&z2}$=gob(D#$~d^g(d->=
z7DAo$7O_j{3Vk8I2RLrm%$~>0Id7$Ltp4ZP53WIG$>D+1lc8f?_B)c9HVsn$h3PJ~
z*3_{m4-V3S`yPGzer&n#dm;a{7x%dEDx3JVq0pj78Lk~(IPA-k-k-Y*FrBW+dBHKT
zoKKhJ+0=t_li58;fhft2^c%{E=my9?8yv+-CxJDc;M)=(WEFU3Z9L~f#c3<F)TXk|
zXi+K5{@qc$C;#!T>as^-_plG!G0sb9h8Nho99Q2}nGDZ5D<<pP6$$Ti=9Q)E83R%h
zU?j@GL+dgv(*bz;P)A63`H12m$ri&&Au+pLXYc{XbvMYI!TW;WHm4~@hcL2_+l=Tv
z{!;m%AjzMxe#e~P_7pnEkU}{5nvHlHp{!M)=FxQgcbvTe9XO*qFI9M)_i!d~)o~;?
z*}G3)GD)C^@bS&RLr0|QrYF$^IMeUcJ9N`|zHt|n_~NiZn`FO?_{oV(Yj0wtXkARa
ze!;ms@ueQLg=56J<D(kZG#n+Md|)M9?9aqk!xe*}$pExYLmt54ebdR~C3}@hJ0pBa
z5$hJ#iHUl{@1YS@tI`hjQS4B>w4YgHb>hI}7uZ0f(5g9Mc(-Hs*lx>n=SNsHpa7+E
z#n)wcCJF=Q1LYd*J_sOH?%ZHikaA8ic^E+0pBU%tY+Td%NvY!!UAewedTC!k=vO(r
zr<7Fwht_By9r}PEUQ}v6T*BG7%T4aqtYyUqXar7(3X~1TxV@4+x;-8$Za_jBtoXJi
zuy7I9h^Jh}(m9lbl1$a?K8I<8h!HG4=QSuheVnDlFfi1AlxM^#6T}T(k*W$<Z6=#L
zwe2czD*|;Rdvi9Le9&*^yC=(6=M%<tCzJ3zDsW2se<XS{b^lU5*n0+Hu9oB&JD`VX
zRr$>HpS7f{T%qz%&Mb)R_wY9awT%uDdj!#o@>%P{fB?-{pyqDwR7bJ|@1eE`_M3CV
zOw?R00iBj{Vqf#bYTKRNz;XMxj);y07)8PcN287b>$G-*>I;bmu6>uD_V-H9I^C3(
z%=V>is8$W(9bW&E5Z|KeGPTD<zwvn0(JW!9;itg!@UGMn<l<q509yth%Z=&K+!nw<
z{|55pqquw)deYrSv@-oF3igeemqAoFRQzSe^YICoIv(Hs+VPGkd8^K9w!kXTDq^!K
z@W$*^A*%d)i0iL&bsKFG*RJ<pYE$<<$94Q_V&i5tjuC;M3ZRb&D;UGs8gI_`&;cd&
z*M5=tgv1`Vb1P+owbbK6^hVGyK7d7BM(tk*BI%~JSS2@eGX<wAjwEH=l4?Fu`jaOK
zGL~D(Vi-o>%&`({VG!mzPE|8-xvUU-wNqqbR5KB<$@q>gF2VyJW<aI=FU;l0A7MA{
ztu)qIb@B>abA4$Lc?cu~ZY-VWUHvYdSn)Z8>&;m>bR-y-F>2mxwF7~$FkU>bXZ>*N
z$Gxm|uIq1qVI$E809=q_nSK#9{hg9RG8wWxHC>g5qs%5!v3*41_OZcfMI|PsL3LzB
zs*uV6;%uBr4n@HR2Uyg^6C6t9rGH_a1!i{%kAkpxp$#lKql9V++;e~QWQAm;F~Umu
z&CG0mRS)F#w=mCf4F}8O3MCa`<9^rECBVqDXc`|4!k}k56dh_At5rW*pcR`xckWx1
zo2KvX-~B&o?fq2@<Yo5&*v^w^g*gV0yK9=Yc27R`zx_VL8~OS7bJ)P-Vw0CluOJu=
z(1^-8=?beKuOn5J$%`*^Xl$NVwU_V6xD;f2o_s+&qB?}WSM_6>t$Cc(I}|r=r4@Ne
z?dTa@Ud>R(kekaA6&cL|qMo*?#`X3WS^A3t0Kd1pn&@6gBP?v;&h1?zIY-P$ZD}h9
zuSIHBXE~xL{g)?#96qN%suA)z=Rvp#V0fS>Lz$8G6SeoXpWYMQXX=Zhkn$8ME2cDA
zuhj`o!wU&KE0Gw6Lx_--J}Gk<jms}Jtf5nKyqa6#0qs|BxX&H~T4O``>ip|1SKanV
zBb1B%sN!w2cGQ87GkrfL%iY^me7GGt_$WkNgiw{u<4liAF26UL!}7;OUp~}c_2#6!
zwr#{a2k+B*Vud_JIVUqLN99nG5r^kJR;W=W<3QhXLYG?6^SA)Btw#DS&tnn}^!^`C
zzTq-QNuIDz{I=+@W~?M>HQSey5;rLHt0oltt%&K)1$eI%84zgFYvc;Ezv;BoYoY#-
zuG$BmkSali&=j$!NcgoRy-2Lv#2lq4O(@kZgO#W_nm{)0YGrdG_bZx*0RL2k2goR^
zkr{DShL0}Iq8*N2lpLVy&cnQ?2Gz3x$wEEYqBT`sR5e>tV{q3p5x$}k12hS(ImL%r
z&~G3nX=&5u4cBT-6|E0^s0Z(<mXyhI6k`clv4hZL=rr)2RWyF&&&Fzk!aj`FxH}=L
zC8f^DJd(rL^8Ks4V#-$_eo#U>u|3*s0uYkR_|5WKwCg`O6$$gyC@U)!@Y20NHVX-;
zus9o}Q5h6k^vs$A<#Z($OT_=G)6d%6SZ9x9gVqm8t7;3X!tJ9Ez7+N{XD@7?G!u*a
zas9|HsU;8MZ!Q;d*LMKQYs`gjMBD_MgkqMssC)Q~sDFz(>jfU(s}&pN#6-qA;-*L-
zP6G(ZppD^Ap|dhP<tYE`5X%$4tgpL+GJwb$hI<v<k#R<iz)@*Hs6R4ru8Ml9F<*t@
z%H^h01Gf>}z(x&^&;RtBIrXL9?3Bk`Z-XYM7<}@_E0FR)&sUEQ+H~Tpk+JKSBFgX4
z%jBB>Pa(8+{k?9*Y->z}CFR(C2P&7EmgCuBOhotVD8`Y7#xmzXGBJaKwA!=Xu27iP
z<#buJ!mKB!Ji^zEll@ocR@@HH0CB4#xbuGd!lm1&+voYpO7tOvKTCRo$zbcVBQB0i
z-Naz?_y&B@1UVKL2;hl=NqYPLJw}n<{BMi`qLISu{y1IHo#0CYF7Av)u(C0xRz2S-
zKm=M1ee@$uA6{oqRC2XO{U~+fFnr)vI{e|%k8#vOu*;X$mNjCv)1ekR=_qUh{{k|^
z@%VCLBoLG{F#WD7Mx-5v#Xg^ZX1B57G!!|LhZOzty9Mh?>Uia<@(jd?JRNbc#TLNJ
zAiK|~k8`mcS_jh!UmzJis9-wuV73K{Ps*w?-I5>N<_IRIucKtiD_QI1mnk(lk81sJ
z&}Jb{7(Cua1evJ!9K;9U`_GyB9hnFdPT4r-8OI6@%Qa9dM;`^pfD_`e*FpNQ=b9Ul
z0glnwE&dcgYkr-T-r4}<`x~7GLt9KQBI(qaN9=u?g#dpVnmY+ene-{t@D@8I1#@wx
zcR_`p47osjXYs3bPD3nyRx`kppZ-qH*hG2c)YQr;U1ZnO))s~n!O$B+iV)Jp@uefh
zn^Wzx^OeNR=1Y4ZOhpQn+48EU)|1g3A`qJTz)@tgcIxyT3jPGgN8=%Qj&)S}c4lzW
z-g9RVA(dIhHIg3D!|-B~Vn5~Lp4ri1Ths`u1@Au>M|~3hHG^h_+oixpCO4okV+W&Q
zbkvK{Q6#dnZ-#aGJ7-|E03I{w<m7ZJbVPhRr$HV4UHxN_#5MCpNokbV<6I7Olx0Y`
zk(_SrdMIg8am-u69i~Zf<`xU~(+UBy;EnA8>QwHPnXV%qJNkQ<ECRnfDgC96P`Krj
zZB5SVHI!TVTLf(C#U|?l%<mdM^K@2V)+Ce&Xz*C8(G220p6K(8R=LGbX&?0%Ztq;6
zoqx%&GkVi5Se$(V@t;~X&BHX&&YS*zPK|e+IPTW{#=PVoFAVLAq8J%Em;LRf8-E;Q
ev|lF3wNmLH{y1}0)pHO+dt5X$Jzu8p67wI@J@=Ua

literal 0
HcmV?d00001

diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
new file mode 100644
index 00000000..1c6bc522
--- /dev/null
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -0,0 +1,329 @@
+if exists("g:loaded_syntastic_c_autoload")
+    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()
+    let known_os = has('unix') || has('mac') || syntastic#util#isRunningWindows()
+    return known_os ? '-o ' . syntastic#util#DevNull() : ''
+endfunction
+
+" 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)
+    " search in the current file's directory upwards
+    let config = findfile(a:file, '.;')
+    if config == '' || !filereadable(config)
+        return ''
+    endif
+
+    " convert filename into absolute path
+    let filepath = fnamemodify(config, ':p:h')
+
+    " try to read config file
+    try
+        let lines = readfile(config)
+    catch /^Vim\%((\a\+)\)\=:E48[45]/
+        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
+
+" GetLocList() for C-like compilers
+function! syntastic#c#GetLocList(filetype, subchecker, options)
+    try
+        let flags = s:GetCflags(a:filetype, a:subchecker, a:options)
+    catch /\m\C^Syntastic: skip checks$/
+        return []
+    endtry
+
+    let makeprg = expand(g:syntastic_{a:filetype}_compiler) . ' ' . flags . ' ' . syntastic#util#shexpand('%')
+
+    let errorformat = s:GetCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+
+    let postprocess = s:GetCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+        \ ['filterForeignErrors'] : []
+
+    " process makeprg
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': postprocess })
+endfunction
+
+" Private functions {{{1
+
+" initialize c/cpp syntax checker handlers
+function! s:Init()
+    let s:handlers = []
+    let s:cflags = {}
+
+    call s:RegHandler('\m\<cairo',       'syntastic#c#CheckPKG', ['cairo', 'cairo'])
+    call s:RegHandler('\m\<freetype',    'syntastic#c#CheckPKG', ['freetype', 'freetype2', 'freetype'])
+    call s:RegHandler('\m\<glade',       'syntastic#c#CheckPKG', ['glade', 'libglade-2.0', 'libglade'])
+    call s:RegHandler('\m\<glib',        'syntastic#c#CheckPKG', ['glib', 'glib-2.0', 'glib'])
+    call s:RegHandler('\m\<gtk',         'syntastic#c#CheckPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:RegHandler('\m\<libsoup',     'syntastic#c#CheckPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:RegHandler('\m\<libxml',      'syntastic#c#CheckPKG', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:RegHandler('\m\<pango',       'syntastic#c#CheckPKG', ['pango', 'pango'])
+    call s:RegHandler('\m\<SDL',         'syntastic#c#CheckPKG', ['sdl', 'sdl'])
+    call s:RegHandler('\m\<opengl',      'syntastic#c#CheckPKG', ['opengl', 'gl'])
+    call s:RegHandler('\m\<webkit',      'syntastic#c#CheckPKG', ['webkit', 'webkit-1.0'])
+
+    call s:RegHandler('\m\<php\.h\>',    'syntastic#c#CheckPhp',    [])
+    call s:RegHandler('\m\<Python\.h\>', 'syntastic#c#CheckPython', [])
+    call s:RegHandler('\m\<ruby',        'syntastic#c#CheckRuby',   [])
+endfunction
+
+" resolve checker-related user variables
+function! s:GetCheckerVar(scope, filetype, subchecker, name, default)
+    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
+
+" resolve user CFLAGS
+function! s:GetCflags(ft, ck, opts)
+    " determine whether to parse header files as well
+    if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
+        if s:GetCheckerVar('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:GetCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:GetIncludeDirs(a:ft)
+
+    " check if the user manually set some cflags
+    let b_cflags = s:GetCheckerVar('b', a:ft, a:ck, 'cflags', '')
+    if b_cflags == ''
+        " check whether to search for include files at all
+        if !s:GetCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
+            if a:ft ==# 'c' || a:ft ==# 'cpp'
+                " refresh the include file search if desired
+                if s:GetCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+                    let flags .= ' ' . s:SearchHeaders()
+                else
+                    " search for header includes if not cached already
+                    if !exists('b:syntastic_' . a:ft . '_includes')
+                        let b:syntastic_{a:ft}_includes = s:SearchHeaders()
+                    endif
+                    let flags .= ' ' . b:syntastic_{a:ft}_includes
+                endif
+            endif
+        endif
+    else
+        " user-defined cflags
+        let flags .= ' ' . b_cflags
+    endif
+
+    " add optional config file parameters
+    let config_file = s:GetCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let flags .= ' ' . syntastic#c#ReadConfig(config_file)
+
+    return flags
+endfunction
+
+" get the gcc include directory argument depending on the default
+" includes and the optional user-defined 'g:syntastic_c_include_dirs'
+function! s:GetIncludeDirs(filetype)
+    let include_dirs = []
+
+    if a:filetype =~# '\v^%(c|cpp|d|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
+
+" search the first 100 lines for include statements that are
+" given in the handlers dictionary
+function! s:SearchHeaders()
+    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') . syntastic#util#Slash() . hfile
+
+            try
+                let lines = readfile(filename, '', 100)
+            catch /^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
+
+" try to find library with 'pkg-config'
+" search possible libraries from first to last given
+" argument until one is found
+function! syntastic#c#CheckPKG(name, ...)
+    if executable('pkg-config')
+        if !has_key(s:cflags, a:name)
+            for pkg in a:000
+                let pkg_flags = 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
+
+" try to find PHP includes with 'php-config'
+function! syntastic#c#CheckPhp()
+    if executable('php-config')
+        if !has_key(s:cflags, 'php')
+            let s:cflags['php'] = system('php-config --includes')
+            let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
+        endif
+        return s:cflags['php']
+    endif
+    return ''
+endfunction
+
+" try to find the ruby headers with 'rbconfig'
+function! syntastic#c#CheckRuby()
+    if executable('ruby')
+        if !has_key(s:cflags, 'ruby')
+            let s:cflags['ruby'] = 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
+
+" try to find the python headers with distutils
+function! syntastic#c#CheckPython()
+    if executable('python')
+        if !has_key(s:cflags, 'python')
+            let s:cflags['python'] = 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
+
+" return a handler dictionary object
+function! s:RegHandler(regex, function, args)
+    let handler = {}
+    let handler["regex"] = a:regex
+    let handler["func"] = function(a:function)
+    let handler["args"] = a:args
+    call add(s:handlers, handler)
+endfunction
+
+" }}}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 et sts=4 sw=4 fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
new file mode 100644
index 00000000..a4f7241a
--- /dev/null
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -0,0 +1,181 @@
+if exists("g:loaded_syntastic_log_autoload")
+    finish
+endif
+let g:loaded_syntastic_log_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists("g:syntastic_debug")
+    let g:syntastic_debug = 0
+endif
+
+let s:global_options = [
+    \ 'syntastic_aggregate_errors',
+    \ 'syntastic_always_populate_loc_list',
+    \ 'syntastic_auto_jump',
+    \ 'syntastic_auto_loc_list',
+    \ 'syntastic_check_on_open',
+    \ 'syntastic_check_on_wq',
+    \ 'syntastic_debug',
+    \ 'syntastic_echo_current_error',
+    \ 'syntastic_enable_balloons',
+    \ 'syntastic_enable_highlighting',
+    \ 'syntastic_enable_signs',
+    \ 'syntastic_error_symbol',
+    \ 'syntastic_filetype_map',
+    \ 'syntastic_full_redraws',
+    \ 'syntastic_id_checkers',
+    \ 'syntastic_ignore_files',
+    \ 'syntastic_loc_list_height',
+    \ 'syntastic_mode_map',
+    \ 'syntastic_quiet_messages',
+    \ 'syntastic_reuse_loc_lists',
+    \ 'syntastic_stl_format',
+    \ 'syntastic_style_error_symbol',
+    \ 'syntastic_style_warning_symbol',
+    \ 'syntastic_warning_symbol' ]
+
+let s:deprecation_notices_issued = []
+
+" Public functions {{{1
+
+function! syntastic#log#info(msg)
+    echomsg "syntastic: info: " . a:msg
+endfunction
+
+function! syntastic#log#warn(msg)
+    echohl WarningMsg
+    echomsg "syntastic: warning: " . a:msg
+    echohl None
+endfunction
+
+function! syntastic#log#error(msg)
+    execute "normal \<Esc>"
+    echohl ErrorMsg
+    echomsg "syntastic: error: " . a:msg
+    echohl None
+endfunction
+
+function! syntastic#log#deprecationWarn(msg)
+    if index(s:deprecation_notices_issued, a:msg) >= 0
+        return
+    endif
+
+    call add(s:deprecation_notices_issued, a:msg)
+    call syntastic#log#warn(a:msg)
+endfunction
+
+function! syntastic#log#debug(level, msg, ...)
+    if !s:isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:logTimestamp()
+    call s:logRedirect(1)
+
+    if a:0 > 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
+
+function! syntastic#log#debugShowOptions(level, names)
+    if !s:isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:logTimestamp()
+    call s:logRedirect(1)
+
+    let vlist = type(a:names) == type("") ? [a:names] : a:names
+    if !empty(vlist)
+        call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
+        echomsg leader . join(vlist, ', ')
+    endif
+    call s:logRedirect(0)
+endfunction
+
+function! syntastic#log#debugShowVariables(level, names)
+    if !s:isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:logTimestamp()
+    call s:logRedirect(1)
+
+    let vlist = type(a:names) == type("") ? [a:names] : a:names
+    for name in vlist
+        echomsg leader . s:formatVariable(name)
+    endfor
+
+    call s:logRedirect(0)
+endfunction
+
+function! syntastic#log#debugDump(level)
+    if !s:isDebugEnabled(a:level)
+        return
+    endif
+
+    call syntastic#log#debugShowVariables(a:level, s:global_options)
+endfunction
+
+" Private functions {{{1
+
+function! s:isDebugEnabled_smart(level)
+    return and(g:syntastic_debug, a:level)
+endfunction
+
+function! s:isDebugEnabled_dumb(level)
+    " poor man's bit test for bit N, assuming a:level == 2**N
+    return (g:syntastic_debug / a:level) % 2
+endfunction
+
+let s:isDebugEnabled = function(exists('*and') ? 's:isDebugEnabled_smart' : 's:isDebugEnabled_dumb')
+
+function! s:logRedirect(on)
+    if exists("g:syntastic_debug_file")
+        if a:on
+            try
+                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file))
+            catch /^Vim\%((\a\+)\)\=:/
+                silent! redir END
+                unlet g:syntastic_debug_file
+            endtry
+        else
+            silent! redir END
+        endif
+    endif
+endfunction
+
+function! s:logTimestamp_smart()
+    return 'syntastic: ' . split(reltimestr(reltime(g:syntastic_start)))[0] . ': '
+endfunction
+
+function! s:logTimestamp_dumb()
+    return 'syntastic: debug: '
+endfunction
+
+let s:logTimestamp = function(has('reltime') ? 's:logTimestamp_smart' : 's:logTimestamp_dumb')
+
+function! s:formatVariable(name)
+    let vals = []
+    if exists('g:' . a:name)
+        call add(vals, 'g:' . a:name . ' = ' . strtrans(string(g:{a:name})))
+    endif
+    if exists('b:' . a:name)
+        call add(vals, 'b:' . a:name . ' = ' . strtrans(string(b:{a:name})))
+    endif
+
+    return join(vals, ', ')
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: set et sts=4 sw=4 fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
new file mode 100644
index 00000000..877bb507
--- /dev/null
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -0,0 +1,67 @@
+if exists("g:loaded_syntastic_postprocess_autoload")
+    finish
+endif
+let g:loaded_syntastic_postprocess_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! s:compareErrorItems(a, b)
+    if a:a['bufnr'] != a:b['bufnr']
+        " group by files
+        return a:a['bufnr'] - a:b['bufnr']
+    elseif a:a['lnum'] != a:b['lnum']
+        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
+        return get(a:a, 'col', 0) - get(a:b, 'col', 0)
+    endif
+endfunction
+
+" natural sort
+function! syntastic#postprocess#sort(errors)
+    return sort(copy(a:errors), 's:compareErrorItems')
+endfunction
+
+" merge consecutive blanks
+function! syntastic#postprocess#compressWhitespace(errors)
+    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')
+    endfor
+
+    return a:errors
+endfunction
+
+" remove spurious CR under Cygwin
+function! syntastic#postprocess#cygwinRemoveCR(errors)
+    if has('win32unix')
+        for e in a:errors
+            let e['text'] = substitute(e['text'], '\r', '', 'g')
+        endfor
+    endif
+
+    return a:errors
+endfunction
+
+" decode XML entities
+function! syntastic#postprocess#decodeXMLEntities(errors)
+    for e in a:errors
+        let e['text'] = syntastic#util#decodeXMLEntities(e['text'])
+    endfor
+
+    return a:errors
+endfunction
+
+" filter out errors referencing other files
+function! syntastic#postprocess#filterForeignErrors(errors)
+    return filter(copy(a:errors), 'get(v:val, "bufnr") == ' . bufnr(''))
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
new file mode 100644
index 00000000..c4daf5c5
--- /dev/null
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -0,0 +1,244 @@
+if exists('g:loaded_syntastic_util_autoload')
+    finish
+endif
+let g:loaded_syntastic_util_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" 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')
+
+" Public functions {{{1
+
+function! syntastic#util#isRunningWindows()
+    return has('win16') || has('win32') || has('win64')
+endfunction
+
+function! syntastic#util#DevNull()
+    if syntastic#util#isRunningWindows()
+        return 'NUL'
+    endif
+    return '/dev/null'
+endfunction
+
+" Get directory separator
+function! syntastic#util#Slash() abort
+    return (!exists("+shellslash") || &shellslash) ? '/' : '\'
+endfunction
+
+"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()
+    for lnum in range(1,5)
+        let line = getline(lnum)
+
+        if line =~ '^#!'
+            let exe = matchstr(line, '\m^#!\s*\zs[^ \t]*')
+            let args = split(matchstr(line, '\m^#!\s*[^ \t]*\zs.*'))
+            return { 'exe': exe, 'args': args }
+        endif
+    endfor
+
+    return { 'exe': '', 'args': [] }
+endfunction
+
+" Parse a version string.  Return an array of version components.
+function! syntastic#util#parseVersion(version)
+    return split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.')
+endfunction
+
+" Run 'command' in a shell and parse output as a version string.
+" Returns an array of version components.
+function! syntastic#util#getVersion(command)
+    return syntastic#util#parseVersion(system(a:command))
+endfunction
+
+" 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)
+    for idx in range(max([len(a:installed), len(a:required)]))
+        let installed_element = get(a:installed, idx, 0)
+        let required_element = get(a:required, idx, 0)
+        if installed_element != required_element
+            return installed_element > required_element
+        endif
+    endfor
+    " Everything matched, so it is at least the required version.
+    return 1
+endfunction
+
+"print as much of a:msg as possible without "Press Enter" prompt appearing
+function! syntastic#util#wideMsg(msg)
+    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(" ", &ts - s:width(v:val) % &ts)'), '') . chunks[-1]
+    let msg = strpart(msg, 0, winwidth(0) - 1)
+
+    set noruler noshowcmd
+    call syntastic#util#redraw(0)
+
+    echo msg
+
+    let &ruler = old_ruler
+    let &showcmd = old_showcmd
+endfunction
+
+" Check whether a buffer is loaded, listed, and not hidden
+function! syntastic#util#bufIsActive(buffer)
+    " 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
+
+" 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#findInParent(what, where)
+    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 != ''
+        let p = split(globpath(here, a:what), '\n')
+
+        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
+
+" Returns unique elements in a list
+function! syntastic#util#unique(list)
+    let seen = {}
+    let uniques = []
+    for e in a:list
+        if !has_key(seen, e)
+            let seen[e] = 1
+            call add(uniques, e)
+        endif
+    endfor
+    return uniques
+endfunction
+
+" A less noisy shellescape()
+function! syntastic#util#shescape(string)
+    return a:string =~ '\m^[A-Za-z0-9_/.-]\+$' ? a:string : shellescape(a:string)
+endfunction
+
+" A less noisy shellescape(expand())
+function! syntastic#util#shexpand(string)
+    return syntastic#util#shescape(expand(a:string))
+endfunction
+
+" decode XML entities
+function! syntastic#util#decodeXMLEntities(string)
+    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
+
+function! syntastic#util#redraw(full)
+    if a:full
+        redraw!
+    else
+        redraw
+    endif
+endfunction
+
+function! syntastic#util#dictFilter(errors, filter)
+    let rules = s:translateFilter(a:filter)
+    " call syntastic#log#debug(g:SyntasticDebugFilters, "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
+
+" Private functions {{{1
+
+function! s:translateFilter(filters)
+    let conditions = []
+    for [k, v] in items(a:filters)
+        if type(v) == type([])
+            call extend(conditions, map(copy(v), 's:translateElement(k, v:val)'))
+        else
+            call add(conditions, s:translateElement(k, v))
+        endif
+    endfor
+    return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
+endfunction
+
+function! s:translateElement(key, term)
+    if a:key ==? 'level'
+        let ret = 'v:val["type"] !=? ' . string(a:term[0])
+    elseif a:key ==? 'type'
+        let ret = a:term ==? 'style' ? 'get(v:val, "subtype", "") !=? "style"' : 'has_key(v:val, "subtype")'
+    elseif a:key ==? 'regex'
+        let ret = 'v:val["text"] !~? ' . string(a:term)
+    elseif a:key ==? 'file'
+        let ret = 'bufname(str2nr(v:val["bufnr"])) !~# ' . string(a:term)
+    else
+        let ret = "1"
+    endif
+    return ret
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: set et sts=4 sw=4 fdm=marker:
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
new file mode 100644
index 00000000..ac806605
--- /dev/null
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -0,0 +1,656 @@
+*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|
+    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|
+    6.Notes........................................|syntastic-notes|
+        6.1.Handling of composite filetypes........|syntastic-composite|
+        6.2.Interaction with python-mode...........|syntastic-pymode|
+        6.3.Interaction with the fish shell........|syntastic-fish|
+        6.4.Using syntastic with the fizsh shell...|syntastic-fizsh|
+    7.About........................................|syntastic-about|
+    8.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 wiki for a list of supported filetypes and checkers:
+
+    https://github.com/scrooloose/syntastic/wiki/Syntax-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/scrooloose/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 checkers available for the current filetype with the
+|:SyntasticInfo| command.
+
+If you want to override the configured list of checkers for a filetype then
+see |syntastic-checker-options| for details. You can also change the arguments
+passed to a specific checker as well.
+
+Use |:SyntasticCheck| to manually check right now. Use |:SyntasticToggleMode|
+to switch between active (checking on writting the buffer) and passive (manual)
+checking.
+
+==============================================================================
+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-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.
+
+------------------------------------------------------------------------------
+2.2. Error signs                                       *syntastic-error-signs*
+
+Syntastic uses the |:sign| commands 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.
+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
+<
+------------------------------------------------------------------------------
+2.3. The error window                         *:Errors* *syntastic-error-window*
+
+You can use the :Errors command to display the errors for the current buffer
+in the |location-list|.
+
+Note that when you use :Errors, the current location list is overwritten with
+Syntastic's own location list.
+
+------------------------------------------------------------------------------
+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
+    SyntasticWarning - Links to 'SpellCap' 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 these labels by unsetting '|syntastic_id_checkers|'.
+
+------------------------------------------------------------------------------
+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'|.
+
+==============================================================================
+3. Commands                                               *syntastic-commands*
+
+:Errors                                                     *:SyntasticErrors*
+
+When errors have been detected, use this command to pop up the |location-list|
+and display the error messages.
+
+: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 rules of |syntastic_aggregate_errors| still apply.
+
+Example: >
+    :SyntasticCheck flake8 pylint
+<
+: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.
+
+: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'*
+Default: 0
+If enabled, syntastic will do syntax checks when buffers are first loaded as
+well as on saving >
+    let g:syntastic_check_on_open = 1
+<
+                                                     *'syntastic_check_on_wq'*
+Default: 1
+Normally syntastic runs syntax checks whenever buffers are written to disk.
+If you want to skip these checks when you issue |:wq|, |:x|, and |:ZZ|, set this
+variable to 0. >
+    let g:syntastic_check_on_wq = 0
+<
+                                                *'syntastic_aggregate_errors'*
+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'*
+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), 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_echo_current_error'*
+Default: 1
+If enabled, syntastic will echo the error associated with the current line to
+the command window. If multiple errors are found, the first will be used. >
+    let g:syntastic_echo_current_error = 1
+<
+                                                    *'syntastic_enable_signs'*
+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'*
+Use this option 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 = '✗'
+    let g:syntastic_warning_symbol = '⚠'
+<
+                                                 *'syntastic_enable_balloons'*
+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'*
+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'*
+Default: 0
+Enable this option to tell syntastic to always stick any detected errors into
+the |location-list|: >
+    let g:syntastic_always_populate_loc_list = 1
+<
+                                                       *'syntastic_auto_jump'*
+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. >
+    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
+<
+                                                   *'syntastic_auto_loc_list'*
+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 not be opened or 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
+<
+                                                 *'syntastic_loc_list_height'*
+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'*
+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'*
+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 = { 'latex': 'tex',
+                                   \ 'gentoo-metadata': 'xml' }
+<
+Composite filetypes 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'*
+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 all filetypes in the "active_filetypes" array. In active mode,
+automatic checks are not done for any filetypes in the
+"passive_filetypes" array.
+
+At runtime, the |:SyntasticToggleMode| command can be used to switch between
+active and passive mode.
+
+If any of "mode", "active_filetypes", or "passive_filetypes" are not specified
+then they will default to their default value as above.
+
+                                                  *'syntastic_quiet_messages'*
+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": "warnings",
+                                     \ "type":  "style",
+                                     \ "regex": '\m\[C03\d\d\]',
+                                     \ "file":  ['\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 consist of a single
+element you can omit adding the brackets (e.g. you can write "style" instead of
+["style"]).
+
+    "level" - takes one of two values, "warnings" or "errors"
+    "type"  - can be either "syntax" or "style"
+    "regex" - is matched against the messages' text as a case insensitive
+              |regular-expression|
+    "file"  - is matched against the filename the error refers to, as a case
+              sensitive |regular-expression|.
+
+There are also checker-specific variants of this option, providing finer
+control. They are named |'syntastic_<filetype>_<checker>_quiet_messages'|.
+
+                                                      *'syntastic_stl_format'*
+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
+    %fe - line number of first error
+    %fw - line number of first warning
+    %F - line number of first warning or error
+
+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]
+<
+                                                    *'syntastic_full_redraws'*
+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_debug'*
+Default: 0
+Set this to the sum of one or more of the following flags to enable
+debugging:
+
+     1 - trace checker calls
+     2 - dump location lists
+     4 - trace notifiers
+     8 - trace autocommands
+    16 - dump options
+
+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'*
+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'
+<
+
+==============================================================================
+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.
+
+Take a look at the wiki to find out what checkers and filetypes are supported
+by syntastic:
+
+    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
+
+Use |:SyntasticInfo| to see which checkers are available for a given filetype.
+
+------------------------------------------------------------------------------
+5.2 Choosing the executable                            *syntastic-config-exec*
+
+                                    *'syntastic_<filetype>_<subchecker>_exec'*
+The executable used by a checker is normally defined automatically, when the
+checkers is registered. You can however override it by setting the variable
+'g:syntastic_<filetype>_<subchecker>_exec': >
+    let g:syntastic_ruby_mri_exec = '~/bin/ruby2'
+<
+------------------------------------------------------------------------------
+5.3 Configuring specific checkers                   *syntastic-config-makeprg*
+
+Most checkers use the 'makeprgBuild()' function and provide many options by
+default - in fact you can customise every part of the command that gets called.
+
+                                *'syntastic_<filetype>_<subchecker>_<option>'*
+Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
+    let makeprg = self.makeprgBuild({
+                \ 'exe': self.getExec(),
+                \ 'args': '-a -b -c',
+                \ 'post_args': '--more --args',
+                \ 'tail': '> /tmp/output' })
+<
+The result is a 'makeprg' of the form: >
+    <exe> <args> <filename> <post_args> <tail>
+<
+                                     *'syntastic_<filetype>_<subchecker>_exe'*
+All arguments 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().
+
+The 'exe' is normally the same as the 'exec' attribute described above, in
+which case it may be omitted. However, you can use it to add environment
+variables or additional parameters, e.g. to tell the mri checker to use KANJI
+encoding you could do something like this: >
+    let g:syntastic_ruby_mri_exe = 'RUBYOPT="-Ke" ruby'
+<
+To override the args and the tail: >
+    let g:syntastic_ruby_mri_args = "--my --args --here"
+    let g:syntastic_ruby_mri_tail = "> /tmp/my-output-file-biatch"
+<
+The general form of the override options is: >
+    syntastic_<filetype>_<subchecker>_<option-name>
+<
+For checkers that do not use the 'makeprgBuild()' function you will have to
+look at the source code of the checker in question. If there are specific
+options that can be set, these are usually documented in the wiki:
+
+    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
+
+                             *'syntastic_<filetype>_<checker>_quiet_messages'*
+In the same vein, 'g:syntastic_<filetype>_<checker-name>_quiet_messages' can
+be used to restrict message filters to messages produced by specific checkers.
+Example: >
+    let g:syntastic_python_pylama_quiet_messages = { "type":  "style",
+                                                   \ "regex": '\m\[C03\d\d\]' }
+<
+See |syntastic_quiet_messages| for the syntax.
+
+==============================================================================
+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 a simple ones using |syntastic_filetype_map|, e.g.: >
+    let g:syntastic_filetype_map = { 'handlebars.html': 'handlebars' }
+<
+------------------------------------------------------------------------------
+6.2 Interaction with 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_write| to 0. E.g.: >
+    let g:pymode_lint_write = 0
+<
+------------------------------------------------------------------------------
+6.3 Interaction with 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 don't need to change your login
+shell to address this problem, but you do have to point Vim's 'shell' to a more
+traditional shell, such as 'zsh', 'bash', 'ksh', or even the original Bourne
+'sh': >
+    set shell=bash
+<
+------------------------------------------------------------------------------
+6.4. Using syntastic with 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: >
+    set shell=zsh
+<
+==============================================================================
+7. 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/scrooloose/syntastic
+
+==============================================================================
+8. 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/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
new file mode 100644
index 00000000..de27f57a
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -0,0 +1,521 @@
+"============================================================================
+"File:        syntastic.vim
+"Description: Vim plugin for on the fly syntax checking.
+"Version:     3.4.0-pre
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To 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")
+    finish
+endif
+let g:loaded_syntastic_plugin = 1
+
+if has('reltime')
+    let g:syntastic_start = reltime()
+endif
+
+runtime! plugin/syntastic/*.vim
+
+let s:running_windows = syntastic#util#isRunningWindows()
+
+for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands']
+    if !has(s:feature)
+        call syntastic#log#error("need Vim compiled with feature " . s:feature)
+        finish
+    endif
+endfor
+
+if !s:running_windows && executable('uname')
+    try
+        let s:uname = system('uname')
+    catch /^Vim\%((\a\+)\)\=:E484/
+        call syntastic#log#error("your shell " . &shell . " doesn't use traditional UNIX syntax for redirections")
+        finish
+    endtry
+endif
+
+if !exists("g:syntastic_always_populate_loc_list")
+    let g:syntastic_always_populate_loc_list = 0
+endif
+
+if !exists("g:syntastic_auto_jump")
+    let g:syntastic_auto_jump = 0
+endif
+
+if !exists("g:syntastic_quiet_messages")
+    let g:syntastic_quiet_messages = {}
+endif
+
+if !exists("g:syntastic_stl_format")
+    let g:syntastic_stl_format = '[Syntax: line:%F (%t)]'
+endif
+
+if !exists("g:syntastic_check_on_open")
+    let g:syntastic_check_on_open = 0
+endif
+
+if !exists("g:syntastic_check_on_wq")
+    let g:syntastic_check_on_wq = 1
+endif
+
+if !exists("g:syntastic_aggregate_errors")
+    let g:syntastic_aggregate_errors = 0
+endif
+
+if !exists("g:syntastic_id_checkers")
+    let g:syntastic_id_checkers = 1
+endif
+
+if !exists("g:syntastic_loc_list_height")
+    let g:syntastic_loc_list_height = 10
+endif
+
+if !exists("g:syntastic_ignore_files")
+    let g:syntastic_ignore_files = []
+endif
+
+if !exists("g:syntastic_filetype_map")
+    let g:syntastic_filetype_map = {}
+endif
+
+if !exists("g:syntastic_full_redraws")
+    let g:syntastic_full_redraws = !(has('gui_running') || has('gui_macvim'))
+endif
+
+" TODO: not documented
+if !exists("g:syntastic_reuse_loc_lists")
+    " a relevant bug has been fixed in one of the pre-releases of Vim 7.4
+    let g:syntastic_reuse_loc_lists = (v:version >= 704)
+endif
+
+if exists("g:syntastic_quiet_warnings")
+    call syntastic#log#deprecationWarn("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
+
+
+" debug constants
+let g:SyntasticDebugTrace         = 1
+let g:SyntasticDebugLoclist       = 2
+let g:SyntasticDebugNotifications = 4
+let g:SyntasticDebugAutocommands  = 8
+let g:SyntasticDebugVariables     = 16
+
+let s:registry = g:SyntasticRegistry.Instance()
+let s:notifiers = g:SyntasticNotifiers.Instance()
+let s:modemap = g:SyntasticModeMap.Instance()
+
+
+" @vimlint(EVL103, 1, a:cursorPos)
+" @vimlint(EVL103, 1, a:cmdLine)
+" @vimlint(EVL103, 1, a:argLead)
+function! s:CompleteCheckerName(argLead, cmdLine, cursorPos)
+    let checker_names = []
+    for ft in s:ResolveFiletypes()
+        for checker in s:registry.availableCheckersFor(ft)
+            call add(checker_names, checker.getName())
+        endfor
+    endfor
+    return join(checker_names, "\n")
+endfunction
+" @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)
+    return join(s:registry.knownFiletypes(), "\n")
+endfunction
+" @vimlint(EVL103, 0, a:cursorPos)
+" @vimlint(EVL103, 0, a:cmdLine)
+" @vimlint(EVL103, 0, a:argLead)
+
+
+command! SyntasticToggleMode call s:ToggleMode()
+command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
+            \ call s:UpdateErrors(0, <f-args>) <bar>
+            \ call syntastic#util#redraw(g:syntastic_full_redraws)
+command! Errors call s:ShowLocList()
+command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
+            \ call s:modemap.echoMode() |
+            \ call s:registry.echoInfoFor(s:ResolveFiletypes(<f-args>))
+command! SyntasticReset
+            \ call s:ClearCache() |
+            \ call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
+
+augroup syntastic
+    autocmd BufReadPost * call s:BufReadPostHook()
+    autocmd BufWritePost * call s:BufWritePostHook()
+
+    autocmd BufWinEnter * call s:BufWinEnterHook()
+
+    " TODO: the next autocmd should be "autocmd BufWinLeave * if &buftype == '' | lclose | endif"
+    " but in recent versions of Vim lclose can no longer be called from BufWinLeave
+    autocmd BufEnter * call s:BufEnterHook()
+augroup END
+
+if v:version > 703 || (v:version == 703 && has('patch544'))
+    " QuitPre was added in Vim 7.3.544
+    augroup syntastic
+        autocmd QuitPre * call s:QuitPreHook()
+    augroup END
+endif
+
+
+function! s:BufReadPostHook()
+    if g:syntastic_check_on_open
+        call syntastic#log#debug(g:SyntasticDebugAutocommands,
+            \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
+        call s:UpdateErrors(1)
+    endif
+endfunction
+
+function! s:BufWritePostHook()
+    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+        \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
+    call s:UpdateErrors(1)
+endfunction
+
+function! s:BufWinEnterHook()
+    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+        \ 'autocmd: BufWinEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
+        \ ', &buftype = ' . string(&buftype))
+    if &buftype == ''
+        call s:notifiers.refresh(g:SyntasticLoclist.current())
+    endif
+endfunction
+
+function! s:BufEnterHook()
+    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+        \ 'autocmd: BufEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
+        \ ', &buftype = ' . string(&buftype))
+    " TODO: at this point there is no b:syntastic_loclist
+    let loclist = filter(getloclist(0), 'v:val["valid"] == 1')
+    let buffers = syntastic#util#unique(map( loclist, 'v:val["bufnr"]' ))
+    if &buftype == 'quickfix' && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
+        call g:SyntasticLoclistHide()
+    endif
+endfunction
+
+function! s:QuitPreHook()
+    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+        \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
+    let b:syntastic_skip_checks = !g:syntastic_check_on_wq
+    call g:SyntasticLoclistHide()
+endfunction
+
+"refresh and redraw all the error info for this buf when saving or reading
+function! s:UpdateErrors(auto_invoked, ...)
+    if s:SkipFile()
+        return
+    endif
+
+    call s:modemap.synch()
+    let run_checks = !a:auto_invoked || s:modemap.allowsAutoChecking(&filetype)
+    if run_checks
+        call s:CacheErrors(a:000)
+    endif
+
+    let loclist = g:SyntasticLoclist.current()
+
+    let w:syntastic_loclist_set = 0
+    let do_jump = g:syntastic_auto_jump
+    if g:syntastic_auto_jump == 2
+        let first = loclist.getFirstIssue()
+        let type = get(first, 'type', '')
+        let do_jump = type ==? 'E'
+    endif
+
+    if g:syntastic_always_populate_loc_list || do_jump
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist (new)')
+        call setloclist(0, loclist.getRaw())
+        let w:syntastic_loclist_set = 1
+        if run_checks && do_jump && !loclist.isEmpty()
+            call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: jump')
+            silent! lrewind
+
+            " 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
+
+    call s:notifiers.refresh(loclist)
+endfunction
+
+"clear the loc list for the buffer
+function! s:ClearCache()
+    call s:notifiers.reset(g:SyntasticLoclist.current())
+    unlet! b:syntastic_loclist
+endfunction
+
+function! s:ResolveFiletypes(...)
+    let type = a:0 ? a:1 : &filetype
+    return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
+endfunction
+
+"detect and cache all syntax errors in this buffer
+function! s:CacheErrors(checkers)
+    call s:ClearCache()
+    let newLoclist = g:SyntasticLoclist.New([])
+
+    if !s:SkipFile()
+        let active_checkers = 0
+        let names = []
+
+        call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, [
+            \ 'shell', 'shellcmdflag', 'shellquote', 'shellxquote', 'shellredir',
+            \ 'shellslash', 'shellpipe', 'shelltemp', 'shellxescape', 'shellxquote' ])
+        call syntastic#log#debugDump(g:SyntasticDebugVariables)
+        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'syntastic_aggregate_errors')
+
+        let filetypes = s:ResolveFiletypes()
+        let aggregate_errors =
+            \ exists('b:syntastic_aggregate_errors') ? b:syntastic_aggregate_errors : g:syntastic_aggregate_errors
+        let decorate_errors = (aggregate_errors || len(filetypes) > 1) &&
+            \ (exists('b:syntastic_id_checkers') ? b:syntastic_id_checkers : g:syntastic_id_checkers)
+
+        for ft in filetypes
+            let clist = empty(a:checkers) ? s:registry.getActiveCheckers(ft) : s:registry.getCheckers(ft, a:checkers)
+
+            for checker in clist
+                let active_checkers += 1
+                call syntastic#log#debug(g:SyntasticDebugTrace, "CacheErrors: Invoking checker: " . checker.getName())
+
+                let loclist = checker.getLocList()
+
+                if !loclist.isEmpty()
+                    if decorate_errors
+                        call loclist.decorate(checker.getName(), checker.getFiletype())
+                    endif
+                    call add(names, [checker.getName(), checker.getFiletype()])
+
+                    let newLoclist = newLoclist.extend(loclist)
+
+                    if !aggregate_errors
+                        break
+                    endif
+                endif
+            endfor
+        endfor
+
+        if !empty(names)
+            if len(syntastic#util#unique(map(copy(names), 'v:val[1]'))) == 1
+                let type = names[0][1]
+                let name = join(map(names, 'v:val[0]'), ', ')
+                call newLoclist.setName( name . ' ('. type . ')' )
+            else
+                " checkers from mixed types
+                call newLoclist.setName(join(map(names, 'v:val[1] . "/" . v:val[0]'), ', '))
+            endif
+        endif
+
+        if !active_checkers
+            if !empty(a:checkers)
+                if len(a:checkers) == 1
+                    call syntastic#log#warn('checker ' . a:checkers[0] . ' is not active for filetype ' . &filetype)
+                else
+                    call syntastic#log#warn('checkers ' . join(a:checkers, ', ') . ' are not active for filetype ' . &filetype)
+                endif
+            else
+                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no active checkers for filetype ' . &filetype)
+            endif
+        endif
+
+        call syntastic#log#debug(g:SyntasticDebugLoclist, "aggregated:", newLoclist)
+
+        if type(g:syntastic_quiet_messages) == type({}) && !empty(g:syntastic_quiet_messages)
+            call newLoclist.quietMessages(g:syntastic_quiet_messages)
+            call syntastic#log#debug(g:SyntasticDebugLoclist, "filtered by g:syntastic_quiet_messages:", newLoclist)
+        endif
+    endif
+
+    let b:syntastic_loclist = newLoclist
+endfunction
+
+function! s:ToggleMode()
+    call s:modemap.toggleMode()
+    call s:ClearCache()
+    call s:UpdateErrors(1)
+    call s:modemap.echoMode()
+endfunction
+
+"display the cached errors for this buf in the location list
+function! s:ShowLocList()
+    call g:SyntasticLoclist.current().show()
+endfunction
+
+"the script changes &shellredir and &shell to stop the screen flicking when
+"shelling out to syntax checkers. Not all OSs support the hacks though
+function! s:OSSupportsShellredirHack()
+    return !s:running_windows && executable('/bin/bash') && (s:uname() !~ "FreeBSD") && (s:uname() !~ "OpenBSD")
+endfunction
+
+function! s:IsRedrawRequiredAfterMake()
+    return !s:running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
+endfunction
+
+function! s:IgnoreFile(filename)
+    let fname = fnamemodify(a:filename, ':p')
+    for pattern in g:syntastic_ignore_files
+        if fname =~# pattern
+            return 1
+        endif
+    endfor
+    return 0
+endfunction
+
+" Skip running in special buffers
+function! s:SkipFile()
+    let force_skip = exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0
+    let fname = expand('%')
+    return force_skip || (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') || s:IgnoreFile(fname)
+endfunction
+
+function! s:uname()
+    if !exists('s:uname')
+        let s:uname = system('uname')
+    endif
+    return s:uname
+endfunction
+
+"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()
+    return g:SyntasticLoclist.current().getStatuslineFlag()
+endfunction
+
+"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
+"   'returns' - a list of valid exit codes for the checker
+function! SyntasticMake(options)
+    call syntastic#log#debug(g:SyntasticDebugTrace, 'SyntasticMake: called with options:', a:options)
+
+    let old_shell = &shell
+    let old_shellredir = &shellredir
+    let old_local_errorformat = &l:errorformat
+    let old_errorformat = &errorformat
+    let old_cwd = getcwd()
+    let old_lc_messages = $LC_MESSAGES
+    let old_lc_all = $LC_ALL
+
+    if s:OSSupportsShellredirHack()
+        "this is a hack to stop the screen needing to be ':redraw'n when
+        "when :lmake is run. Otherwise the screen flickers annoyingly
+        let &shellredir = '&>'
+        let &shell = '/bin/bash'
+    endif
+
+    if has_key(a:options, 'errorformat')
+        let &errorformat = a:options['errorformat']
+    endif
+
+    if has_key(a:options, 'cwd')
+        execute 'lcd ' . fnameescape(a:options['cwd'])
+    endif
+
+    let $LC_MESSAGES = 'C'
+    let $LC_ALL = ''
+    let err_lines = split(system(a:options['makeprg']), "\n", 1)
+    let $LC_ALL = old_lc_all
+    let $LC_MESSAGES = old_lc_messages
+
+    call syntastic#log#debug(g:SyntasticDebugLoclist, "checker output:", err_lines)
+
+    if has_key(a:options, 'preprocess')
+        let err_lines = call(a:options['preprocess'], [err_lines])
+        call syntastic#log#debug(g:SyntasticDebugLoclist, "preprocess:", err_lines)
+    endif
+    lgetexpr err_lines
+
+    let errors = copy(getloclist(0))
+
+    if has_key(a:options, 'cwd')
+        execute 'lcd ' . fnameescape(old_cwd)
+    endif
+
+    silent! lolder
+    let &errorformat = old_errorformat
+    let &l:errorformat = old_local_errorformat
+    let &shellredir = old_shellredir
+    let &shell = old_shell
+
+    if s:IsRedrawRequiredAfterMake()
+        call syntastic#util#redraw(g:syntastic_full_redraws)
+    endif
+
+    call syntastic#log#debug(g:SyntasticDebugLoclist, "raw loclist:", errors)
+
+    if has_key(a:options, 'returns') && index(a:options['returns'], v:shell_error) == -1
+        throw 'Syntastic: checker error'
+    endif
+
+    if has_key(a:options, 'defaults')
+        call SyntasticAddToErrors(errors, a:options['defaults'])
+    endif
+
+    " Add subtype info if present.
+    if has_key(a:options, 'subtype')
+        call SyntasticAddToErrors(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('syntastic#postprocess#' . rule, [errors])
+        endfor
+        call syntastic#log#debug(g:SyntasticDebugLoclist, "postprocess:", errors)
+    endif
+
+    return errors
+endfunction
+
+"take a list of errors and add default values to them from a:options
+function! SyntasticAddToErrors(errors, options)
+    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
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
new file mode 100644
index 00000000..f0038e11
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
@@ -0,0 +1,40 @@
+if exists("g:loaded_syntastic_notifier_autoloclist")
+    finish
+endif
+let g:loaded_syntastic_notifier_autoloclist = 1
+
+if !exists("g:syntastic_auto_loc_list")
+    let g:syntastic_auto_loc_list = 2
+endif
+
+let g:SyntasticAutoloclistNotifier = {}
+
+" Public methods {{{1
+"
+function! g:SyntasticAutoloclistNotifier.New()
+    let newObj = copy(self)
+    return newObj
+endfunction
+
+function! g:SyntasticAutoloclistNotifier.refresh(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: refresh')
+    call g:SyntasticAutoloclistNotifier.AutoToggle(a:loclist)
+endfunction
+
+function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: toggle')
+    if !a:loclist.isEmpty()
+        if g:syntastic_auto_loc_list == 1
+            call a:loclist.show()
+        endif
+    else
+        if g:syntastic_auto_loc_list > 0
+
+            "TODO: this will close the loc list window if one was opened by
+            "something other than syntastic
+            lclose
+        endif
+    endif
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
new file mode 100644
index 00000000..c2630342
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -0,0 +1,68 @@
+if exists("g:loaded_syntastic_notifier_balloons")
+    finish
+endif
+let g:loaded_syntastic_notifier_balloons = 1
+
+if !exists("g:syntastic_enable_balloons")
+    let g:syntastic_enable_balloons = 1
+endif
+
+if !has('balloon_eval')
+    let g:syntastic_enable_balloons = 0
+endif
+
+let g:SyntasticBalloonsNotifier = {}
+
+" Public methods {{{1
+
+function! g:SyntasticBalloonsNotifier.New()
+    let newObj = copy(self)
+    return newObj
+endfunction
+
+function! g:SyntasticBalloonsNotifier.enabled()
+    return
+        \ has('balloon_eval') &&
+        \ (exists('b:syntastic_enable_balloons') ? b:syntastic_enable_balloons : g:syntastic_enable_balloons)
+endfunction
+
+" Update the error balloons
+function! g:SyntasticBalloonsNotifier.refresh(loclist)
+    let b:syntastic_balloons = {}
+    if self.enabled() && !a:loclist.isEmpty()
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: refresh')
+        let buf = bufnr('')
+        let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
+        if !empty(issues)
+            for i in issues
+                if has_key(b:syntastic_balloons, i['lnum'])
+                    let b:syntastic_balloons[i['lnum']] .= "\n" . i['text']
+                else
+                    let b:syntastic_balloons[i['lnum']] = i['text']
+                endif
+            endfor
+            set beval bexpr=SyntasticBalloonsExprNotifier()
+        endif
+    endif
+endfunction
+
+" Reset the error balloons
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticBalloonsNotifier.reset(loclist)
+    if has('balloon_eval')
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: reset')
+        set nobeval
+    endif
+endfunction
+" @vimlint(EVL103, 0, a:loclist)
+
+" Private functions {{{1
+
+function! SyntasticBalloonsExprNotifier()
+    if !exists('b:syntastic_balloons')
+        return ''
+    endif
+    return get(b:syntastic_balloons, v:beval_lnum, '')
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
new file mode 100644
index 00000000..37ae8228
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -0,0 +1,144 @@
+if exists("g:loaded_syntastic_checker")
+    finish
+endif
+let g:loaded_syntastic_checker = 1
+
+let g:SyntasticChecker = {}
+
+" Public methods {{{1
+
+function! g:SyntasticChecker.New(args)
+    let newObj = copy(self)
+
+    let newObj._filetype = a:args['filetype']
+    let newObj._name = a:args['name']
+    let newObj._exec = get(a:args, 'exec', newObj._name)
+
+    if has_key(a:args, 'redirect')
+        let [filetype, name] = split(a:args['redirect'], '/')
+        let prefix = 'SyntaxCheckers_' . filetype . '_' . name . '_'
+    else
+        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
+    endif
+
+    let newObj._locListFunc = function(prefix . 'GetLocList')
+
+    if exists('*' . prefix . 'IsAvailable')
+        let newObj._isAvailableFunc = function(prefix . 'IsAvailable')
+    else
+        let newObj._isAvailableFunc = function('SyntasticCheckerIsAvailableDefault')
+    endif
+
+    if exists('*' . prefix . 'GetHighlightRegex')
+        let newObj._highlightRegexFunc = function(prefix . 'GetHighlightRegex')
+    endif
+
+    return newObj
+endfunction
+
+function! g:SyntasticChecker.getFiletype()
+    return self._filetype
+endfunction
+
+function! g:SyntasticChecker.getName()
+    return self._name
+endfunction
+
+function! g:SyntasticChecker.getExec()
+    if exists('g:syntastic_' . self._filetype . '_' . self._name . '_exec')
+        return expand(g:syntastic_{self._filetype}_{self._name}_exec)
+    endif
+
+    return self._exec
+endfunction
+
+function! g:SyntasticChecker.getExecEscaped()
+    return syntastic#util#shescape(self.getExec())
+endfunction
+
+function! g:SyntasticChecker.getLocListRaw()
+    let name = self._filetype . '/' . self._name
+    try
+        let list = self._locListFunc()
+        call syntastic#log#debug(g:SyntasticDebugTrace, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
+    catch /\m\C^Syntastic: checker error$/
+        let list = []
+        call syntastic#log#error('checker ' . name . ' returned abnormal status ' . v:shell_error)
+    endtry
+    call self._populateHighlightRegexes(list)
+    call syntastic#log#debug(g:SyntasticDebugLoclist, name . ' raw:', list)
+    call self._quietMessages(list)
+    return list
+endfunction
+
+function! g:SyntasticChecker.getLocList()
+    return g:SyntasticLoclist.New(self.getLocListRaw())
+endfunction
+
+function! g:SyntasticChecker.makeprgBuild(opts)
+    let setting = 'g:syntastic_' . self._filetype . '_' . self._name . '_'
+
+    let parts = []
+    call extend(parts, self._getOpt(a:opts, setting, 'exe', self.getExecEscaped()))
+    call extend(parts, self._getOpt(a:opts, setting, 'args', ''))
+    call extend(parts, self._getOpt(a:opts, setting, 'fname', syntastic#util#shexpand('%')))
+    call extend(parts, self._getOpt(a:opts, setting, 'post_args', ''))
+    call extend(parts, self._getOpt(a:opts, setting, 'tail', ''))
+
+    return join(parts)
+endfunction
+
+function! g:SyntasticChecker.isAvailable()
+    return self._isAvailableFunc()
+endfunction
+
+" Private methods {{{1
+
+function! g:SyntasticChecker._quietMessages(errors)
+    let filter = 'g:syntastic_' . self._filetype . '_' . self._name . '_quiet_messages'
+    if exists(filter) && type({filter}) == type({}) && !empty({filter})
+        call syntastic#util#dictFilter(a:errors, {filter})
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'filtered by ' . filter . ':', a:errors)
+    endif
+endfunction
+
+function! g:SyntasticChecker._populateHighlightRegexes(errors)
+    if has_key(self, '_highlightRegexFunc')
+        for e in a:errors
+            if e['valid']
+                let term = self._highlightRegexFunc(e)
+                if len(term) > 0
+                    let e['hl'] = term
+                endif
+            endif
+        endfor
+    endif
+endfunction
+
+function! g:SyntasticChecker._getOpt(opts, setting, name, default)
+    let sname = a:setting . a:name
+    let ret = []
+    call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
+    call extend( ret, self._shescape(exists(sname) ? {sname} : get(a:opts, a:name, a:default)) )
+    call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
+
+    return ret
+endfunction
+
+function! g:SyntasticChecker._shescape(opt)
+    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
+
+" Non-method functions {{{1
+
+function! SyntasticCheckerIsAvailableDefault() dict
+    return executable(self.getExec())
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
new file mode 100644
index 00000000..ad2b2c12
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -0,0 +1,67 @@
+if exists("g:loaded_syntastic_notifier_cursor")
+    finish
+endif
+let g:loaded_syntastic_notifier_cursor = 1
+
+if !exists('g:syntastic_echo_current_error')
+    let g:syntastic_echo_current_error = 1
+endif
+
+let g:SyntasticCursorNotifier = {}
+
+" Public methods {{{1
+
+function! g:SyntasticCursorNotifier.New()
+    let newObj = copy(self)
+    return newObj
+endfunction
+
+function! g:SyntasticCursorNotifier.enabled()
+    return exists('b:syntastic_echo_current_error') ? b:syntastic_echo_current_error : g:syntastic_echo_current_error
+endfunction
+
+function! g:SyntasticCursorNotifier.refresh(loclist)
+    if self.enabled() && !a:loclist.isEmpty()
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: refresh')
+        let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
+        let b:oldLine = -1
+        autocmd! syntastic CursorMoved
+        autocmd syntastic CursorMoved * call g:SyntasticRefreshCursor()
+    endif
+endfunction
+
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticCursorNotifier.reset(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: reset')
+    autocmd! syntastic CursorMoved
+    unlet! b:syntastic_messages
+    let b:oldLine = -1
+endfunction
+" @vimlint(EVL103, 0, a:loclist)
+
+" Private methods {{{1
+
+" The following defensive nonsense is needed because of the nature of autocmd
+function! g:SyntasticRefreshCursor()
+    if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
+        " file not checked
+        return
+    endif
+
+    if !exists('b:oldLine')
+        let b:oldLine = -1
+    endif
+    let l = line('.')
+    if l == b:oldLine
+        return
+    endif
+    let b:oldLine = l
+
+    if has_key(b:syntastic_messages, l)
+        call syntastic#util#wideMsg(b:syntastic_messages[l])
+    else
+        echo
+    endif
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
new file mode 100644
index 00000000..75c0c9f2
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -0,0 +1,95 @@
+if exists("g:loaded_syntastic_notifier_highlighting")
+    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'))
+
+if !exists("g:syntastic_enable_highlighting")
+    let g:syntastic_enable_highlighting = 1
+endif
+
+let g:SyntasticHighlightingNotifier = {}
+
+let s:setup_done = 0
+
+" Public methods {{{1
+
+function! g:SyntasticHighlightingNotifier.New()
+    let newObj = copy(self)
+
+    if !s:setup_done
+        call self._setup()
+        let s:setup_done = 1
+    endif
+
+    return newObj
+endfunction
+
+function! g:SyntasticHighlightingNotifier.enabled()
+    return
+        \ s:has_highlighting &&
+        \ (exists('b:syntastic_enable_highlighting') ? b:syntastic_enable_highlighting : g:syntastic_enable_highlighting)
+endfunction
+
+" Sets error highlights in the cuirrent window
+function! g:SyntasticHighlightingNotifier.refresh(loclist)
+    if self.enabled()
+        call self.reset(a:loclist)
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: refresh')
+        let buf = bufnr('')
+        let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
+        for item in issues
+            let group = item['type'] ==? 'E' ? 'SyntasticError' : 'SyntasticWarning'
+
+            " 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
+
+" Remove all error highlights from the window
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticHighlightingNotifier.reset(loclist)
+    if s:has_highlighting
+        call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: reset')
+        for match in getmatches()
+            if stridx(match['group'], 'Syntastic') == 0
+                call matchdelete(match['id'])
+            endif
+        endfor
+    endif
+endfunction
+" @vimlint(EVL103, 0, a:loclist)
+
+" Private methods {{{1
+
+" One time setup: define our own highlighting
+function! g:SyntasticHighlightingNotifier._setup()
+    if s:has_highlighting
+        if !hlexists('SyntasticError')
+            highlight link SyntasticError SpellBad
+
+        endif
+        if !hlexists('SyntasticWarning')
+            highlight link SyntasticWarning SpellCap
+        endif
+    endif
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
new file mode 100644
index 00000000..052501c4
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -0,0 +1,238 @@
+if exists("g:loaded_syntastic_loclist")
+    finish
+endif
+let g:loaded_syntastic_loclist = 1
+
+let g:SyntasticLoclist = {}
+
+" Public methods {{{1
+
+function! g:SyntasticLoclist.New(rawLoclist)
+    let newObj = copy(self)
+
+    let llist = filter(copy(a:rawLoclist), 'v:val["valid"] == 1')
+
+    for e in llist
+        if get(e, 'type', '') == ''
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    let newObj._rawLoclist = llist
+    let newObj._name = ''
+
+    return newObj
+endfunction
+
+function! g:SyntasticLoclist.current()
+    if !exists("b:syntastic_loclist")
+        let b:syntastic_loclist = g:SyntasticLoclist.New([])
+    endif
+    return b:syntastic_loclist
+endfunction
+
+function! g:SyntasticLoclist.extend(other)
+    let list = self.copyRaw()
+    call extend(list, a:other.copyRaw())
+    return g:SyntasticLoclist.New(list)
+endfunction
+
+function! g:SyntasticLoclist.isEmpty()
+    return empty(self._rawLoclist)
+endfunction
+
+function! g:SyntasticLoclist.copyRaw()
+    return copy(self._rawLoclist)
+endfunction
+
+function! g:SyntasticLoclist.getRaw()
+    return self._rawLoclist
+endfunction
+
+function! g:SyntasticLoclist.getStatuslineFlag()
+    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')
+
+            "sub in the total errors/warnings/both
+            let output = substitute(output, '\m\C%w', num_warnings, 'g')
+            let output = substitute(output, '\m\C%e', num_errors, 'g')
+            let output = substitute(output, '\m\C%t', num_issues, 'g')
+
+            "first error/warning line num
+            let output = substitute(output, '\m\C%F', num_issues ? self._rawLoclist[0]['lnum'] : '', 'g')
+
+            "first error line num
+            let output = substitute(output, '\m\C%fe', num_errors ? errors[0]['lnum'] : '', 'g')
+
+            "first warning line num
+            let output = substitute(output, '\m\C%fw', num_warnings ? warnings[0]['lnum'] : '', 'g')
+
+            let self._stl_flag = output
+        else
+            let self._stl_flag = ''
+        endif
+    endif
+
+    return self._stl_flag
+endfunction
+
+function! g:SyntasticLoclist.getFirstIssue()
+    return get(self._rawLoclist, 0, {})
+endfunction
+
+function! g:SyntasticLoclist.getName()
+    return len(self._name)
+endfunction
+
+function! g:SyntasticLoclist.setName(name)
+    let self._name = a:name
+endfunction
+
+function! g:SyntasticLoclist.decorate(name, filetype)
+    for e in self._rawLoclist
+        let e['text'] .= ' [' . a:filetype . '/' . a:name . ']'
+    endfor
+endfunction
+
+function! g:SyntasticLoclist.quietMessages(filters)
+    call syntastic#util#dictFilter(self._rawLoclist, a:filters)
+endfunction
+
+function! g:SyntasticLoclist.errors()
+    if !exists("self._cachedErrors")
+        let self._cachedErrors = self.filter({'type': "E"})
+    endif
+    return self._cachedErrors
+endfunction
+
+function! g:SyntasticLoclist.warnings()
+    if !exists("self._cachedWarnings")
+        let self._cachedWarnings = self.filter({'type': "W"})
+    endif
+    return self._cachedWarnings
+endfunction
+
+" 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()
+    return !self.isEmpty()
+endfunction
+
+" cache used by EchoCurrentError()
+function! g:SyntasticLoclist.messages(buf)
+    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['text']
+            endif
+        endfor
+    endif
+
+    return get(self._cachedMessages, a:buf, {})
+endfunction
+
+"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 comparisons are done with ==?
+function! g:SyntasticLoclist.filter(filters)
+    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
+
+function! g:SyntasticLoclist.setloclist()
+    if !exists('w:syntastic_loclist_set')
+        let w:syntastic_loclist_set = 0
+    endif
+    let replace = g:syntastic_reuse_loc_lists && w:syntastic_loclist_set
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
+    call setloclist(0, self.getRaw(), replace ? 'r' : ' ')
+    let w:syntastic_loclist_set = 1
+endfunction
+
+"display the cached errors for this buf in the location list
+function! g:SyntasticLoclist.show()
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: show')
+    call self.setloclist()
+
+    if !self.isEmpty()
+        let num = winnr()
+        execute "lopen " . g:syntastic_loc_list_height
+        if num != winnr()
+            wincmd p
+        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)
+                endif
+            endif
+        endfor
+    endif
+endfunction
+
+" Non-method functions {{{1
+
+function! g:SyntasticLoclistHide()
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: hide')
+    silent! lclose
+endfunction
+
+" Private functions {{{1
+
+function! s:translate(key, val)
+    return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
new file mode 100644
index 00000000..9b04235c
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -0,0 +1,75 @@
+if exists("g:loaded_syntastic_modemap")
+    finish
+endif
+let g:loaded_syntastic_modemap = 1
+
+let g:SyntasticModeMap = {}
+
+" Public methods {{{1
+
+function! g:SyntasticModeMap.Instance()
+    if !exists('s:SyntasticModeMapInstance')
+        let s:SyntasticModeMapInstance = copy(self)
+        call s:SyntasticModeMapInstance.synch()
+    endif
+
+    return s:SyntasticModeMapInstance
+endfunction
+
+function! g:SyntasticModeMap.synch()
+    if exists('g:syntastic_mode_map')
+        let self._mode = get(g:syntastic_mode_map, 'mode', 'active')
+        let self._activeFiletypes = get(g:syntastic_mode_map, 'active_filetypes', [])
+        let self._passiveFiletypes = get(g:syntastic_mode_map, 'passive_filetypes', [])
+    else
+        let self._mode = 'active'
+        let self._activeFiletypes = []
+        let self._passiveFiletypes = []
+    endif
+endfunction
+
+function! g:SyntasticModeMap.allowsAutoChecking(filetype)
+    let fts = split(a:filetype, '\m\.')
+
+    if self.isPassive()
+        return self._isOneFiletypeActive(fts)
+    else
+        return self._noFiletypesArePassive(fts)
+    endif
+endfunction
+
+function! g:SyntasticModeMap.isPassive()
+    return self._mode ==# 'passive'
+endfunction
+
+function! g:SyntasticModeMap.toggleMode()
+    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
+
+function! g:SyntasticModeMap.echoMode()
+    echo "Syntastic: " . self._mode . " mode enabled"
+endfunction
+
+" Private methods {{{1
+
+function! g:SyntasticModeMap._isOneFiletypeActive(filetypes)
+    return !empty(filter(copy(a:filetypes), 'index(self._activeFiletypes, v:val) != -1'))
+endfunction
+
+function! g:SyntasticModeMap._noFiletypesArePassive(filetypes)
+    return empty(filter(copy(a:filetypes), 'index(self._passiveFiletypes, v:val) != -1'))
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
new file mode 100644
index 00000000..58f3448a
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -0,0 +1,57 @@
+if exists("g:loaded_syntastic_notifiers")
+    finish
+endif
+let g:loaded_syntastic_notifiers = 1
+
+let g:SyntasticNotifiers = {}
+
+let s:notifier_types = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
+
+" Public methods {{{1
+
+function! g:SyntasticNotifiers.Instance()
+    if !exists('s:SyntasticNotifiersInstance')
+        let s:SyntasticNotifiersInstance = copy(self)
+        call s:SyntasticNotifiersInstance._initNotifiers()
+    endif
+
+    return s:SyntasticNotifiersInstance
+endfunction
+
+function! g:SyntasticNotifiers.refresh(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, '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()
+            call self._notifier[type].refresh(a:loclist)
+        endif
+    endfor
+endfunction
+
+function! g:SyntasticNotifiers.reset(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, '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
+    endfor
+endfunction
+
+" Private methods {{{1
+
+function! g:SyntasticNotifiers._initNotifiers()
+    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
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
new file mode 100644
index 00000000..433325c6
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -0,0 +1,282 @@
+if exists("g:loaded_syntastic_registry")
+    finish
+endif
+let g:loaded_syntastic_registry = 1
+
+let s:defaultCheckers = {
+        \ 'actionscript':['mxmlc'],
+        \ 'ada':         ['gcc'],
+        \ 'applescript': ['osacompile'],
+        \ 'asciidoc':    ['asciidoc'],
+        \ 'asm':         ['gcc'],
+        \ 'bemhtml':     ['bemhtmllint'],
+        \ 'c':           ['gcc'],
+        \ 'chef':        ['foodcritic'],
+        \ 'co':          ['coco'],
+        \ 'cobol':       ['cobc'],
+        \ 'coffee':      ['coffee', 'coffeelint'],
+        \ 'coq':         ['coqtop'],
+        \ 'cpp':         ['gcc'],
+        \ 'cs':          ['mcs'],
+        \ 'css':         ['csslint', 'phpcs'],
+        \ 'cucumber':    ['cucumber'],
+        \ 'cuda':        ['nvcc'],
+        \ 'd':           ['dmd'],
+        \ 'dart':        ['dartanalyzer'],
+        \ 'docbk':       ['xmllint'],
+        \ 'dustjs':      ['swiffer'],
+        \ 'elixir':      ['elixir'],
+        \ 'erlang':      ['escript'],
+        \ 'eruby':       ['ruby'],
+        \ 'fortran':     ['gfortran'],
+        \ 'glsl':        ['cgc'],
+        \ 'go':          ['go'],
+        \ 'haml':        ['haml'],
+        \ 'handlebars':  ['handlebars'],
+        \ 'haskell':     ['ghc_mod', 'hdevtools', 'hlint'],
+        \ 'haxe':        ['haxe'],
+        \ 'hss':         ['hss'],
+        \ 'html':        ['tidy'],
+        \ 'java':        ['javac'],
+        \ 'javascript':  ['jshint', 'jslint'],
+        \ 'json':        ['jsonlint', 'jsonval'],
+        \ 'less':        ['lessc'],
+        \ 'lex':         ['flex'],
+        \ 'limbo':       ['limbo'],
+        \ 'lisp':        ['clisp'],
+        \ 'llvm':        ['llvm'],
+        \ 'lua':         ['luac'],
+        \ 'matlab':      ['mlint'],
+        \ 'nasm':        ['nasm'],
+        \ 'nroff':       ['mandoc'],
+        \ 'objc':        ['gcc'],
+        \ 'objcpp':      ['gcc'],
+        \ 'ocaml':       ['camlp4o'],
+        \ 'perl':        ['perl', 'perlcritic'],
+        \ 'php':         ['php', 'phpcs', 'phpmd'],
+        \ 'po':          ['msgfmt'],
+        \ 'pod':         ['podchecker'],
+        \ 'puppet':      ['puppet', 'puppetlint'],
+        \ 'python':      ['python', 'flake8', 'pylint'],
+        \ 'racket':      ['racket'],
+        \ 'rst':         ['rst2pseudoxml'],
+        \ 'ruby':        ['mri'],
+        \ 'rust':        ['rustc'],
+        \ 'sass':        ['sass'],
+        \ 'scala':       ['fsc', 'scalac'],
+        \ 'scss':        ['sass', 'scss_lint'],
+        \ 'sh':          ['sh', 'shellcheck'],
+        \ 'slim':        ['slimrb'],
+        \ 'tcl':         ['nagelfar'],
+        \ 'tex':         ['lacheck', 'chktex'],
+        \ 'texinfo':     ['makeinfo'],
+        \ 'text':        ['atdtool'],
+        \ 'twig':        ['twiglint'],
+        \ 'typescript':  ['tsc'],
+        \ 'vala':        ['valac'],
+        \ 'verilog':     ['verilator'],
+        \ 'vhdl':        ['ghdl'],
+        \ 'vim':         ['vimlint'],
+        \ 'xhtml':       ['tidy'],
+        \ 'xml':         ['xmllint'],
+        \ 'xslt':        ['xmllint'],
+        \ 'yacc':        ['bison'],
+        \ 'yaml':        ['jsyaml'],
+        \ 'z80':         ['z80syntaxchecker'],
+        \ 'zpt':         ['zptlint'],
+        \ 'zsh':         ['zsh', 'shellcheck']
+    \ }
+
+let s:defaultFiletypeMap = {
+        \ 'gentoo-metadata': 'xml',
+        \ 'lhaskell': 'haskell',
+        \ 'litcoffee': 'coffee'
+    \ }
+
+let g:SyntasticRegistry = {}
+
+" TODO: 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.
+
+" Public methods {{{1
+
+function! g:SyntasticRegistry.Instance()
+    if !exists('s:SyntasticRegistryInstance')
+        let s:SyntasticRegistryInstance = copy(self)
+        let s:SyntasticRegistryInstance._checkerMap = {}
+        let s:SyntasticRegistryInstance._cachedCheckersFor = {}
+    endif
+
+    return s:SyntasticRegistryInstance
+endfunction
+
+function! g:SyntasticRegistry.CreateAndRegisterChecker(args)
+    let checker = g:SyntasticChecker.New(a:args)
+    let registry = g:SyntasticRegistry.Instance()
+    call registry._registerChecker(checker)
+endfunction
+
+function! g:SyntasticRegistry.checkable(ftalias)
+    return !empty(self.getActiveCheckers(a:ftalias))
+endfunction
+
+function! g:SyntasticRegistry.getActiveCheckers(ftalias)
+    let filetype = s:SyntasticRegistryNormaliseFiletype(a:ftalias)
+    let checkers = self.availableCheckersFor(a:ftalias)
+
+    if self._userHasFiletypeSettings(filetype)
+        return self._filterCheckersByUserSettings(checkers, filetype)
+    endif
+
+    if has_key(s:defaultCheckers, filetype)
+        return self._filterCheckersByDefaultSettings(checkers, filetype)
+    endif
+
+    return checkers[0:0]
+endfunction
+
+function! g:SyntasticRegistry.getCheckers(ftalias, list)
+    return self._filterCheckersByName(self.availableCheckersFor(a:ftalias), a:list)
+endfunction
+
+function! g:SyntasticRegistry.availableCheckersFor(ftalias)
+    if !has_key(self._cachedCheckersFor, a:ftalias)
+        let filetype = s:SyntasticRegistryNormaliseFiletype(a:ftalias)
+        let checkers = self._allCheckersFor(filetype)
+        let self._cachedCheckersFor[a:ftalias] = self._filterCheckersByAvailability(checkers)
+    endif
+
+    return self._cachedCheckersFor[a:ftalias]
+endfunction
+
+function! g:SyntasticRegistry.knownFiletypes()
+    let types = keys(s:defaultCheckers)
+    call extend(types, keys(s:defaultFiletypeMap))
+    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
+
+function! g:SyntasticRegistry.echoInfoFor(ftalias_list)
+    echomsg "Syntastic info for filetype: " . join(a:ftalias_list, '.')
+
+    let available = []
+    let active = []
+    for ftalias in a:ftalias_list
+        call extend(available, self.availableCheckersFor(ftalias))
+        call extend(active, self.getActiveCheckers(ftalias))
+    endfor
+
+    echomsg "Available checker(s): " . join(syntastic#util#unique(map(available, "v:val.getName()")))
+    echomsg "Currently enabled checker(s): " . join(syntastic#util#unique(map(active, "v:val.getName()")))
+endfunction
+
+" Private methods {{{1
+
+function! g:SyntasticRegistry._registerChecker(checker) abort
+    let ft = a:checker.getFiletype()
+
+    if !has_key(self._checkerMap, ft)
+        let self._checkerMap[ft] = []
+    endif
+
+    call self._validateUniqueName(a:checker)
+
+    call add(self._checkerMap[ft], a:checker)
+endfunction
+
+function! g:SyntasticRegistry._allCheckersFor(filetype)
+    call self._loadCheckers(a:filetype)
+    if empty(self._checkerMap[a:filetype])
+        return []
+    endif
+
+    return self._checkerMap[a:filetype]
+endfunction
+
+function! g:SyntasticRegistry._filterCheckersByDefaultSettings(checkers, filetype)
+    if has_key(s:defaultCheckers, a:filetype)
+        return self._filterCheckersByName(a:checkers, s:defaultCheckers[a:filetype])
+    endif
+
+    return a:checkers
+endfunction
+
+function! g:SyntasticRegistry._filterCheckersByUserSettings(checkers, filetype)
+    if exists("b:syntastic_checkers")
+        let whitelist = b:syntastic_checkers
+    else
+        let whitelist = g:syntastic_{a:filetype}_checkers
+    endif
+    return self._filterCheckersByName(a:checkers, whitelist)
+endfunction
+
+function! g:SyntasticRegistry._filterCheckersByName(checkers, list)
+    let checkers_by_name = {}
+    for c in a:checkers
+        let checkers_by_name[c.getName()] = c
+    endfor
+
+    let filtered = []
+    for name in a:list
+        if has_key(checkers_by_name, name)
+            call add(filtered, checkers_by_name[name])
+        endif
+    endfor
+
+    return filtered
+endfunction
+
+function! g:SyntasticRegistry._filterCheckersByAvailability(checkers)
+    return filter(copy(a:checkers), "v:val.isAvailable()")
+endfunction
+
+function! g:SyntasticRegistry._loadCheckers(filetype)
+    if self._haveLoadedCheckers(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
+
+function! g:SyntasticRegistry._haveLoadedCheckers(filetype)
+    return has_key(self._checkerMap, a:filetype)
+endfunction
+
+function! g:SyntasticRegistry._userHasFiletypeSettings(filetype)
+    if exists("g:syntastic_" . a:filetype . "_checker") && !exists("g:syntastic_" . a:filetype . "_checkers")
+        let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
+        call syntastic#log#deprecationWarn("variable g:syntastic_" . a:filetype . "_checker is deprecated")
+    endif
+    return exists("b:syntastic_checkers") || exists("g:syntastic_" . a:filetype . "_checkers")
+endfunction
+
+function! g:SyntasticRegistry._validateUniqueName(checker) abort
+    for checker in self._allCheckersFor(a:checker.getFiletype())
+        if checker.getName() ==# a:checker.getName()
+            throw "Syntastic: Duplicate syntax checker name for: " . a:checker.getName()
+        endif
+    endfor
+endfunction
+
+" Private functions {{{1
+
+"resolve filetype aliases, and replace - with _ otherwise we cant name
+"syntax checker functions legally for filetypes like "gentoo-metadata"
+function! s:SyntasticRegistryNormaliseFiletype(ftalias)
+    let ft = get(s:defaultFiletypeMap, a:ftalias, a:ftalias)
+    let ft = get(g:syntastic_filetype_map, ft, ft)
+    let ft = substitute(ft, '\m-', '_', 'g')
+    return ft
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
new file mode 100644
index 00000000..8f0e0430
--- /dev/null
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -0,0 +1,148 @@
+if exists("g:loaded_syntastic_notifier_signs")
+    finish
+endif
+let g:loaded_syntastic_notifier_signs = 1
+
+if !exists("g:syntastic_enable_signs")
+    let g:syntastic_enable_signs = 1
+endif
+
+if !exists("g:syntastic_error_symbol")
+    let g:syntastic_error_symbol = '>>'
+endif
+
+if !exists("g:syntastic_warning_symbol")
+    let g:syntastic_warning_symbol = '>>'
+endif
+
+if !exists("g:syntastic_style_error_symbol")
+    let g:syntastic_style_error_symbol = 'S>'
+endif
+
+if !exists("g:syntastic_style_warning_symbol")
+    let g:syntastic_style_warning_symbol = 'S>'
+endif
+
+
+" 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
+
+" Public methods {{{1
+
+function! g:SyntasticSignsNotifier.New()
+    let newObj = copy(self)
+
+    if !s:setup_done
+        call self._setup()
+        let s:setup_done = 1
+    endif
+
+    return newObj
+endfunction
+
+function! g:SyntasticSignsNotifier.enabled()
+    return
+        \ has('signs') &&
+        \ exists('b:syntastic_enable_signs') ? b:syntastic_enable_signs : g:syntastic_enable_signs
+endfunction
+
+function! g:SyntasticSignsNotifier.refresh(loclist)
+    call syntastic#log#debug(g:SyntasticDebugNotifications, 'signs: refresh')
+    let old_signs = copy(self._bufSignIds())
+    if self.enabled()
+        call self._signErrors(a:loclist)
+    endif
+    call self._removeSigns(old_signs)
+    let s:first_sign_id = s:next_sign_id
+endfunction
+
+" Private methods {{{1
+
+" One time setup: define our own sign types and highlighting
+function! g:SyntasticSignsNotifier._setup()
+    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
+        exe 'sign define SyntasticError text=' . g:syntastic_error_symbol .
+            \ ' texthl=SyntasticErrorSign linehl=SyntasticErrorLine'
+        exe 'sign define SyntasticWarning text=' . g:syntastic_warning_symbol .
+            \ ' texthl=SyntasticWarningSign linehl=SyntasticWarningLine'
+        exe 'sign define SyntasticStyleError text=' . g:syntastic_style_error_symbol .
+            \ ' texthl=SyntasticStyleErrorSign linehl=SyntasticStyleErrorLine'
+        exe 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
+            \ ' texthl=SyntasticStyleWarningSign linehl=SyntasticStyleWarningLine'
+    endif
+endfunction
+
+" Place signs by all syntax errors in the buffer
+function! g:SyntasticSignsNotifier._signErrors(loclist)
+    let loclist = a:loclist
+    if !loclist.isEmpty()
+
+        " errors some first, so that they are not masked by warnings
+        let buf = bufnr('')
+        let issues = copy(loclist.errors())
+        call extend(issues, loclist.warnings())
+        call filter(issues, 'v:val["bufnr"] == buf')
+        let seen = {}
+
+        for i in issues
+            if !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
+
+" Remove the signs with the given ids from this buffer
+function! g:SyntasticSignsNotifier._removeSigns(ids)
+    if has('signs')
+        for i in a:ids
+            execute "sign unplace " . i
+            call remove(self._bufSignIds(), index(self._bufSignIds(), i))
+        endfor
+    endif
+endfunction
+
+" Get all the ids of the SyntaxError signs in the buffer
+function! g:SyntasticSignsNotifier._bufSignIds()
+    if !exists("b:syntastic_sign_ids")
+        let b:syntastic_sign_ids = []
+    endif
+    return b:syntastic_sign_ids
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
new file mode 100644
index 00000000..8cfdc347
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -0,0 +1,71 @@
+"============================================================================
+"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
+
+if !exists('g:syntastic_actionscript_mxmlc_conf')
+    let g:syntastic_actionscript_mxmlc_conf = ''
+endif
+
+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\<' . term . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': (g:syntastic_actionscript_mxmlc_conf != '' ?
+        \   ' -load-config+=' . g:syntastic_actionscript_mxmlc_conf : ''),
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
new file mode 100644
index 00000000..14e79a04
--- /dev/null
+++ b/sources_non_forked/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))
+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 -fsyntax-only',
+        \ 'header_flags': '-x ada',
+        \ 'header_names': '\.ads$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ada',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim b/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
new file mode 100644
index 00000000..522e6a27
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
new file mode 100644
index 00000000..bec2a49d
--- /dev/null
+++ b/sources_non_forked/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 =
+        \ '%Easciidoc: %tRROR: %f: line %l: %m,' .
+        \ '%Easciidoc: %tRROR: %f: %m,' .
+        \ '%Easciidoc: FAILED: %f: line %l: %m,' .
+        \ '%Easciidoc: FAILED: %f: %m,' .
+        \ '%Wasciidoc: %tARNING: %f: line %l: %m,' .
+        \ '%Wasciidoc: %tARNING: %f: %m,' .
+        \ '%Wasciidoc: DEPRECATED: %f: line %l: %m,' .
+        \ '%Wasciidoc: 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
new file mode 100644
index 00000000..f5ecebe6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
@@ -0,0 +1,54 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_asm_gcc_IsAvailable() dict
+    if !exists('g:syntastic_asm_compiler')
+        let g:syntastic_asm_compiler = self.getExec()
+    endif
+    return executable(expand(g:syntastic_asm_compiler))
+endfunction
+
+function! SyntaxCheckers_asm_gcc_GetLocList() dict
+    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 -masm=' . s:GetDialect() })
+endfunction
+
+function! s:GetDialect()
+    return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
+        \ expand('%:e') ==? 'asm' ? 'intel' : 'att'
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'asm',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
new file mode 100644
index 00000000..e6582163
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
@@ -0,0 +1,34 @@
+"============================================================================
+"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
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
new file mode 100644
index 00000000..0efe4722
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        avrgcc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"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
+
+function! SyntaxCheckers_c_avrgcc_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': syntastic#c#ReadConfig(g:syntastic_avrgcc_config_file),
+        \ 'args_after': '-x c -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
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
new file mode 100644
index 00000000..f8601d80
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"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
+
+" Bail if the user doesn't have `checkpatch.pl` or ./scripts/checkpatch.pl installed.
+if executable("checkpatch.pl")
+    let g:syntastic_c_checker_checkpatch_location = 'checkpatch.pl'
+elseif executable("./scripts/checkpatch.pl")
+    let g:syntastic_c_checker_checkpatch_location = './scripts/checkpatch.pl'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_checkpatch_IsAvailable() dict
+    return exists("g:syntastic_c_checker_checkpatch_location")
+endfunction
+
+function! SyntaxCheckers_c_checkpatch_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': g:syntastic_c_checker_checkpatch_location,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
new file mode 100644
index 00000000..ce187553
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
@@ -0,0 +1,68 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_cppcheck_config':
+"
+"   let g:syntastic_cppcheck_config_file = '.config'
+
+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,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
new file mode 100644
index 00000000..9a8848f4
--- /dev/null
+++ b/sources_non_forked/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')
+    let g:syntastic_c_compiler = executable('gcc') ? 'gcc' : 'clang'
+endif
+
+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
+    return executable(expand(g:syntastic_c_compiler))
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/make.vim b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
new file mode 100644
index 00000000..fa27273a
--- /dev/null
+++ b/sources_non_forked/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.getExecEscaped() . ' -sk'
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
new file mode 100644
index 00000000..e3dd0ad4
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -0,0 +1,60 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_oclint_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_oclint_config':
+"
+"   let g:syntastic_oclint_config_file = '.config'
+
+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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_oclint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-text',
+        \ 'post_args_before': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
+
+    let errorformat =
+        \ '%E%f:%l:%c: %m P1 ,' .
+        \ '%E%f:%l:%c: %m P2 ,' .
+        \ '%W%f:%l:%c: %m P3 ,' .
+        \ '%E%f:%l:%c: fatal error: %m,' .
+        \ '%E%f:%l:%c: error: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'postprocess': ['compressWhitespace', 'sort'],
+        \ 'returns': [0, 3, 5] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'oclint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
new file mode 100644
index 00000000..b7c30a0a
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_sparse_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_sparse_config':
+"
+"   let g:syntastic_sparse_config_file = '.config'
+
+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] })
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'sparse'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
new file mode 100644
index 00000000..991a681b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_splint_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_splint_config':
+"
+"   let g:syntastic_splint_config_file = '.config'
+
+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 %.%#,' .
+        \ '%W%f:%l:%v: %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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim b/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
new file mode 100644
index 00000000..e7773331
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
new file mode 100644
index 00000000..3ef5d967
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"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 makeprg = self.makeprgBuild({ 'args_after': '-c -o /tmp' })
+
+    let errorformat =
+        \ '%EFailed at: %f,' .
+        \ '%ZSyntax%trror: %m on line %l,'.
+        \ '%EFailed at: %f,'.
+        \ '%Z%trror: Parse error on line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'co',
+    \ 'name': 'coco'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
new file mode 100644
index 00000000..73f5688d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"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
+    return executable(expand(g:syntastic_cobol_compiler))
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
new file mode 100644
index 00000000..543647e3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"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
+    return executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+        \       self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull()), [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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
new file mode 100644
index 00000000..ccc6349a
--- /dev/null
+++ b/sources_non_forked/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
+    let makeprg = self.makeprgBuild({ 'args_after': '--csv' })
+
+    let errorformat =
+        \ '%f\,%l\,%\d%#\,%trror\,%m,' .
+        \ '%f\,%l\,%trror\,%m,' .
+        \ '%f\,%l\,%\d%#\,%tarn\,%m,' .
+        \ '%f\,%l\,%tarn\,%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'coffee',
+    \ 'name': 'coffeelint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
new file mode 100644
index 00000000..292bbaaa
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
new file mode 100644
index 00000000..4dbc2d4d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -0,0 +1,68 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_cppcheck_config':
+"
+"   let g:syntastic_cppcheck_config_file = '.config'
+
+if exists("g:loaded_syntastic_cpp_cppcheck_checker")
+    finish
+endif
+let g:loaded_syntastic_cpp_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_cpp_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,
+        \ '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': 'cpp',
+    \ 'name': 'cppcheck'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
new file mode 100644
index 00000000..60664343
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
@@ -0,0 +1,64 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" For details about cpplint see:
+"    https://code.google.com/p/google-styleguide/
+"
+" Checker options:
+"
+" - g:syntastic_cpp_cpplint_thres (integer; default: 5)
+"   error threshold: policy violations with a severity above this
+"   value are highlighted as errors, the others are warnings
+"
+" - g:syntastic_cpp_cpplint_args (string; default: '--verbose=3')
+"   command line options to pass to cpplint
+
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
new file mode 100644
index 00000000..ef810517
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"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')
+    let g:syntastic_cpp_compiler = executable('g++') ? 'g++' : 'clang++'
+endif
+
+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
+    return executable(expand(g:syntastic_cpp_compiler))
+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' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
new file mode 100644
index 00000000..b467cd75
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
@@ -0,0 +1,31 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_oclint_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_oclint_config':
+"
+"   let g:syntastic_oclint_config_file = '.config'
+
+if exists("g:loaded_syntastic_cpp_oclint_checker")
+    finish
+endif
+let g:loaded_syntastic_cpp_oclint_checker = 1
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim b/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
new file mode 100644
index 00000000..d7662a1c
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
new file mode 100644
index 00000000..fe84aaa1
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" Specify additional options to csslint with this option. e.g. to disable
+" warnings:
+"
+"   let g:syntastic_csslint_options = '--warnings=none'
+
+if exists('g:loaded_syntastic_css_csslint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_csslint_checker = 1
+
+if !exists('g:syntastic_csslint_options')
+    let g:syntastic_csslint_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_css_csslint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': g:syntastic_csslint_options,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
new file mode 100644
index 00000000..86aefeb6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
@@ -0,0 +1,29 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" See here for details of phpcs
+"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
+"
+
+if exists("g:loaded_syntastic_css_phpcs_checker")
+    finish
+endif
+let g:loaded_syntastic_css_phpcs_checker = 1
+
+runtime! syntax_checkers/php/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'phpcs',
+    \ 'redirect': 'php/phpcs'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
new file mode 100644
index 00000000..536568fa
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -0,0 +1,63 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" For details about PrettyCSS see:
+"
+"   - http://fidian.github.io/PrettyCSS/
+"   - https://github.com/fidian/PrettyCSS
+
+if exists("g:loaded_syntastic_css_prettycss_checker")
+    finish
+endif
+let g:loaded_syntastic_css_prettycss_checker = 1
+
+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' . 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("")},
+        \ 'postprocess': ['sort'] })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim b/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
new file mode 100644
index 00000000..c06a06e5
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
new file mode 100644
index 00000000..f93332b1
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
@@ -0,0 +1,78 @@
+"============================================================================
+"File:        cuda.vim
+"Description: Syntax checking plugin for syntastic.vim
+"
+"Author:      Hannes Schulz <schulz at ais dot uni-bonn dot de>
+"
+"============================================================================
+
+" in order to also check header files add this to your .vimrc:
+" (this creates an empty .syntastic_dummy.cu file in your source directory)
+"
+"   let g:syntastic_cuda_check_header = 1
+
+" By default, nvcc and thus syntastic, defaults to the most basic architecture.
+" This can produce false errors if the developer intends to compile for newer
+" hardware and use newer features, eg. double precision numbers. To pass a
+" specific target arch to nvcc, e.g. add the following to your .vimrc:
+"
+"   let g:syntastic_cuda_arch = "sm_20"
+
+if exists("g:loaded_syntastic_cuda_nvcc_checker")
+    finish
+endif
+let g:loaded_syntastic_cuda_nvcc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
+    if exists('g:syntastic_cuda_arch')
+        let arch_flag = '-arch=' . g:syntastic_cuda_arch
+    else
+        let arch_flag = ''
+    endif
+    let makeprg =
+        \ self.getExecEscaped() . ' ' . arch_flag .
+        \ ' --cuda -O0 -I . -Xcompiler -fsyntax-only ' .
+        \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
+
+    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'
+
+    if expand('%') =~? '\m\%(.h\|.hpp\|.cuh\)$'
+        if exists('g:syntastic_cuda_check_header')
+            let makeprg =
+                \ 'echo > .syntastic_dummy.cu ; ' .
+                \ self.getExecEscaped() . ' ' . arch_flag .
+                \ ' --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include ' .
+                \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
+        else
+            return []
+        endif
+    endif
+
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cuda',
+    \ 'name': 'nvcc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
new file mode 100644
index 00000000..4f70979b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_d_dmd_IsAvailable() dict
+    if !exists('g:syntastic_d_compiler')
+        let g:syntastic_d_compiler = self.getExec()
+    endif
+    return executable(expand(g:syntastic_d_compiler))
+endfunction
+
+function! SyntaxCheckers_d_dmd_GetLocList() dict
+    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
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'd',
+    \ 'name': 'dmd' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
new file mode 100644
index 00000000..edf71df3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"File:        dartanalyzer.vim
+"Description: Dart syntax checker - using dartanalyzer
+"Maintainer:  Maksim Ryzhikov <rv.maksim at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists("g:loaded_syntastic_dart_dartanalyzer_checker")
+    finish
+endif
+let g:loaded_syntastic_dart_dartanalyzer_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dart_dartanalyzer_GetHighlightRegex(error)
+    if a:error['len']
+        let lcol = a:error['col'] - 1
+        let rcol = a:error['col'] + a:error['len']
+        let ret = '\%>' . lcol . 'c\%<' . rcol . 'c'
+    else
+        let ret = ''
+    endif
+
+    return ret
+endfunction
+
+function! SyntaxCheckers_dart_dartanalyzer_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--machine' })
+
+    " Machine readable format looks like:
+    " SEVERITY|TYPE|ERROR_CODE|FILENAME|LINE_NUMBER|COLUMN|LENGTH|MESSAGE
+    " SEVERITY: (WARNING|ERROR)
+    " TYPE: (RESOLVER|STATIC_TYPE|...)
+    " ERROR_CODE: (NO_SUCH_TYPE|...)
+    " FILENAME: String
+    " LINE_NUMBER: int
+    " COLUMN: int
+    " LENGTH: int
+    " MESSAGE: String
+
+    " We use %n to grab the error length, for the syntax highlighter
+    let commonformat = '|%.%#|%.%#|%f|%l|%c|%n|%m'
+
+    let errorformat =
+        \ '%EERROR'   . commonformat . ',' .
+        \ '%WWARNING' . commonformat
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1, 2] })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
new file mode 100644
index 00000000..bfb9da0a
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/xml/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'docbk',
+    \ 'name': 'xmllint',
+    \ 'redirect': 'xml/xmllint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim b/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
new file mode 100644
index 00000000..0bdf2813
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
new file mode 100644
index 00000000..566131d5
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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
+    return executable('elixir') && executable('mix')
+endfunction
+
+function! SyntaxCheckers_elixir_elixir_GetLocList() dict
+
+    let make_options = {}
+    let compile_command = 'elixir'
+    let mix_file = syntastic#util#findInParent('mix.exs', expand('%: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'] = '** %*[^\ ] %f:%l: %m'
+
+    return SyntasticMake(make_options)
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'elixir',
+    \ 'name': 'elixir'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
new file mode 100644
index 00000000..01622d9e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
@@ -0,0 +1,63 @@
+#!/usr/bin/env escript
+-export([main/1]).
+
+main([FileName]) ->
+    LibDirs = filelib:wildcard("{lib,deps}/*/ebin"),
+    compile(FileName, LibDirs);
+
+main([FileName | ["-rebar" | [Path | LibDirs]]]) ->
+    {ok, L} = file:consult(Path),
+    P = dict:from_list(L),
+    Root = filename:dirname(Path),
+
+    Lib1 = case dict:find(lib_dirs, P) of
+             {ok, X} -> lists:map(fun(Sub) -> Root ++ "/" ++ Sub end, X);
+             _ -> []
+           end,
+
+    Lib2 = case dict:find(sub_dirs, P) of
+             {ok, Y} -> lists:foldl(
+                          fun(Sub,Sofar) ->
+                              Sofar ++ [
+                                        Root ++ "/" ++ Sub,
+                                        Root ++ "/" ++ Sub ++ "/include",
+                                        Root ++ "/" ++ Sub ++ "/deps",
+                                        Root ++ "/" ++ Sub ++ "/lib"
+                                       ] end, [], Y);
+             _ -> []
+           end,
+
+    LibDirs1 = LibDirs ++ Lib1 ++ Lib2,
+    %io:format("~p~n", [LibDirs1]),
+    compile(FileName, LibDirs1);
+
+main([FileName | LibDirs]) ->
+    compile(FileName, LibDirs).
+
+compile(FileName, LibDirs) ->
+    Root = get_root(filename:dirname(FileName)),
+    ok = code:add_pathsa(LibDirs),
+    compile:file(FileName, [warn_obsolete_guard,
+                            warn_unused_import,
+                            warn_shadow_vars,
+                            warn_export_vars,
+                            strong_validation,
+                            report,
+                            {i, filename:join(Root, "include")},
+                            {i, filename:join(Root, "deps")},
+                            {i, filename:join(Root, "apps")},
+                            {i, filename:join(Root, "lib")}
+                        ]).
+
+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).
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
new file mode 100644
index 00000000..ed299ec8
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        erlang.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Pawel Salata <rockplayer.pl at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_erlang_erlang_checker')
+    finish
+endif
+let g:loaded_syntastic_erlang_erlang_checker = 1
+
+if !exists('g:syntastic_erlc_include_path')
+    let g:syntastic_erlc_include_path = ''
+endif
+
+let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'erlang_check_file.erl')
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_erlang_escript_GetLocList() dict
+    if expand('%:e') ==# 'hrl'
+        return []
+    endif
+
+    let shebang = syntastic#util#parseShebang()
+    if shebang['exe'] =~# '\m\<escript$' || (shebang['exe'] ==# '/usr/bin/env' && shebang['args'][0] ==# 'escript')
+        let args = '-s'
+        let post_args = ''
+    else
+        let args = s:check_file
+        let post_args = g:syntastic_erlc_include_path
+    endif
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': args,
+        \ 'fname': syntastic#util#shexpand('%:p'),
+        \ 'post_args_after': post_args })
+
+    let errorformat =
+        \ '%W%f:%l: warning: %m,'.
+        \ '%E%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'erlang',
+    \ 'name': 'escript'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
new file mode 100644
index 00000000..94ba42e6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -0,0 +1,73 @@
+"============================================================================
+"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
+
+if !exists("g:syntastic_ruby_exec")
+    let g:syntastic_ruby_exec = "ruby"
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
+    return executable(expand(g:syntastic_ruby_exec))
+endfunction
+
+function! SyntaxCheckers_eruby_ruby_GetLocList() dict
+    let exe = expand(g:syntastic_ruby_exec)
+    if !syntastic#util#isRunningWindows()
+        let exe = 'RUBYOPT= ' . exe
+    endif
+
+    let fname = "'" . escape(expand('%'), "\\'") . "'"
+
+    " TODO: encodings became useful in ruby 1.9 :)
+    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion('ruby --version'), [1, 9])
+        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 =
+        \ exe . ' -rerb -e ' .
+        \ syntastic#util#shescape('puts ERB.new(File.read(' .
+        \     fname . encoding_spec .
+        \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
+        \ ' | ' . exe . ' -c'
+
+    let errorformat =
+        \ '%-GSyntax OK,'.
+        \ '%E-:%l: syntax error\, %m,%Z%p^,'.
+        \ '%W-:%l: warning: %m,'.
+        \ '%Z%p^,'.
+        \ '%-C%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'bufnr': bufnr(""), 'vcol': 1 } })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'eruby',
+    \ 'name': 'ruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
new file mode 100644
index 00000000..ce0d1aa0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict
+    if !exists('g:syntastic_fortran_compiler')
+        let g:syntastic_fortran_compiler = self.getExec()
+    endif
+    return executable(expand(g:syntastic_fortran_compiler))
+endfunction
+
+function! SyntaxCheckers_fortran_gfortran_GetLocList() dict
+    return syntastic#c#GetLocList('fortran', 'gfortran', {
+        \ 'errorformat':
+        \     '%-C %#,'.
+        \     '%-C  %#%.%#,'.
+        \     '%A%f:%l.%c:,'.
+        \     '%Z%trror: %m,'.
+        \     '%Z%tarning: %m,'.
+        \     '%-G%.%#',
+        \ 'main_flags': '-fsyntax-only' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'fortran',
+    \ 'name': 'gfortran' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
new file mode 100644
index 00000000..43b9069a
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"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
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-oglsl -profile ' . s:GetProfile(),
+        \ 'args': (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
+
+    let errorformat =
+        \ "%E%f(%l) : error %m," .
+        \ "%W%f(%l) : warning %m"
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+function! s:GetProfile()
+    let save_view = winsaveview()
+    let old_foldenable = &foldenable
+    let old_lazyredraw = &lazyredraw
+
+    let &lazyredraw = 1
+    let &foldenable = 0
+    call cursor(1, 1)
+
+    let magic = '\m\C^// profile:\s*'
+    let line = search(magic, 'c')
+
+    call winrestview(save_view)
+    let &foldenable = old_foldenable
+    let &lazyredraw = old_lazyredraw
+
+    if line
+        let profile = matchstr(getline(line), magic . '\zs.*')
+    else
+        let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
+        let profile = get(extensions, tolower(expand('%:e')), 'gpu_vert')
+    endif
+
+    return profile
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \'filetype': 'glsl',
+    \'name': 'cgc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
new file mode 100644
index 00000000..ac28bcdd
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
@@ -0,0 +1,83 @@
+"============================================================================
+"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('go') && executable('gofmt')
+endfunction
+
+function! SyntaxCheckers_go_go_GetLocList() dict
+    " Check with gofmt first, since `go build` and `go test` might not report
+    " syntax errors in the current file if another file with syntax error is
+    " compiled first.
+    let makeprg = self.makeprgBuild({
+        \ 'exe': 'gofmt',
+        \ 'args': '-l',
+        \ 'tail': '> ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%f:%l:%c: %m,' .
+        \ '%-G%.%#'
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'e'} })
+    if !empty(errors)
+        return errors
+    endif
+
+    " Test files, i.e. files with a name ending in `_test.go`, are not
+    " compiled by `go build`, therefore `go test` must be called for those.
+    if match(expand('%'), '\m_test\.go$') == -1
+        let makeprg = 'go build ' . syntastic#c#NullOutput()
+    else
+        let makeprg = 'go test -c ' . syntastic#c#NullOutput()
+    endif
+
+    let errorformat =
+        \ '%E%f:%l:%c:%m,' .
+        \ '%E%f:%l:%m,' .
+        \ '%C%\s%\+%m,' .
+        \ '%-G#%.%#'
+
+    " The go compiler needs to either be run with an import path as an
+    " argument or directly from the package directory. Since figuring out
+    " the proper import path is fickle, just cwd to the package.
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h'),
+        \ 'defaults': {'type': 'e'} })
+
+    return errors
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'go'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
new file mode 100644
index 00000000..62b86cbc
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
@@ -0,0 +1,44 @@
+"============================================================================
+"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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
new file mode 100644
index 00000000..c4107016
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"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,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'golint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
new file mode 100644
index 00000000..010766e0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        gotype.vim
+"Description: Perform syntactic and semantic checking of Go code using 'gotype'
+"Maintainer:  luz <ne.tetewi@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_go_gotype_checker")
+    finish
+endif
+let g:loaded_syntastic_go_gotype_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gotype_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' .'
+
+    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").
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h'),
+        \ 'defaults': {'type': 'e'} })
+
+    return errors
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gotype'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
new file mode 100644
index 00000000..080204a1
--- /dev/null
+++ b/sources_non_forked/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_IsAvailable() dict
+    return executable('go')
+endfunction
+
+function! SyntaxCheckers_go_govet_GetLocList() dict
+    let makeprg = 'go 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.
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h'),
+        \ 'defaults': {'type': 'w'} })
+
+    return errors
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'govet'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
new file mode 100644
index 00000000..fa7086f9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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
+
+if !exists('g:syntastic_haml_interpreter')
+    let g:syntastic_haml_interpreter = 'haml'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haml_haml_IsAvailable() dict
+    return executable(expand(g:syntastic_haml_interpreter))
+endfunction
+
+function! SyntaxCheckers_haml_haml_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': expand(g:syntastic_haml_interpreter),
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
new file mode 100644
index 00000000..160d9a5a
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
new file mode 100644
index 00000000..93c298f6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"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,
+        \ 'defaults': {'bufnr': bufnr("")} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'handlebars',
+    \ 'name': 'handlebars'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
new file mode 100644
index 00000000..9a140fea
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -0,0 +1,72 @@
+"============================================================================
+"File:        ghc-mod.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_ghc_mod_checker')
+    finish
+endif
+let g:loaded_syntastic_haskell_ghc_mod_checker = 1
+
+let s:ghc_mod_new = -1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
+    " We need either a Vim version that can handle NULs in system() output,
+    " or a ghc-mod version that has the --boundary option.
+    let exe = self.getExec()
+    let s:ghc_mod_new = executable(exe) ? s:GhcModNew(exe) : -1
+    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new)
+endfunction
+
+function! SyntaxCheckers_haskell_ghc_mod_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': self.getExecEscaped() . ' check' . (s:ghc_mod_new ? ' --boundary=""' : '') })
+
+    let errorformat =
+        \ '%-G%\s%#,' .
+        \ '%f:%l:%c:%trror: %m,' .
+        \ '%f:%l:%c:%tarning: %m,'.
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m,' .
+        \ '%f:%l:%c:%m,' .
+        \ '%E%f:%l:%c:,' .
+        \ '%Z%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'returns': [0] })
+endfunction
+
+function! s:GhcModNew(exe)
+    let exe = syntastic#util#shescape(a:exe)
+    try
+        let ghc_mod_version = filter(split(system(exe), '\n'), 'v:val =~# ''\m^ghc-mod version''')[0]
+        let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(ghc_mod_version), [2, 1, 2])
+    catch /^Vim\%((\a\+)\)\=:E684/
+        call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
+        let ret = -1
+    endtry
+    return ret
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'ghc_mod',
+    \ 'exec': 'ghc-mod' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
new file mode 100644
index 00000000..29abca7e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"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
+    let makeprg = self.makeprgBuild({
+        \ 'exe': self.getExecEscaped() . ' check',
+        \ 'args': get(g:, 'hdevtools_options', '') })
+
+    let errorformat= '\%-Z\ %#,'.
+        \ '%W%f:%l:%c:\ Warning:\ %m,'.
+        \ '%W%f:%l:%c:\ Warning:,'.
+        \ '%E%f:%l:%c:\ %m,'.
+        \ '%E%>%f:%l:%c:,'.
+        \ '%+C\ \ %#%m,'.
+        \ '%W%>%f:%l:%c:,'.
+        \ '%+C\ \ %#%tarning:\ %m,'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'hdevtools'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
new file mode 100644
index 00000000..e859d299
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
@@ -0,0 +1,37 @@
+"============================================================================
+"File:        hlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Nicolas Wu <nicolas.wu at gmail dot com>
+"License:     BSD
+"============================================================================
+
+if exists('g:loaded_syntastic_haskell_hlint_checker')
+    finish
+endif
+let g:loaded_syntastic_haskell_hlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_hlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l:%c: Error: %m,' .
+        \ '%W%f:%l:%c: Warning: %m,' .
+        \ '%C%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'hlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
new file mode 100644
index 00000000..90589420
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        haxe.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  David Bernard <david.bernard.31 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_haxe_haxe_checker")
+    finish
+endif
+let g:loaded_syntastic_haxe_haxe_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haxe_haxe_GetLocList() dict
+    if exists('b:vaxe_hxml')
+        let hxml = b:vaxe_hxml
+    elseif exists('g:vaxe_hxml')
+        let hxml = g:vaxe_hxml
+    else
+        let hxml = syntastic#util#findInParent('*.hxml', expand('%:p:h'))
+    endif
+    let hxml = fnamemodify(hxml, ':p')
+
+    if hxml != ''
+        let makeprg = self.makeprgBuild({
+            \ 'fname': syntastic#util#shescape(fnamemodify(hxml, ':t')) })
+
+        let errorformat = '%E%f:%l: characters %c-%n : %m'
+
+        let loclist = SyntasticMake({
+            \ 'makeprg': makeprg,
+            \ 'errorformat': errorformat,
+            \ 'cwd': fnamemodify(hxml, ':h') })
+
+        for e in loclist
+            let e['hl'] = '\%>' . e['col'] . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['col'] += 1
+            let e['nr'] = 0
+        endfor
+
+        return loclist
+    endif
+
+    return []
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haxe',
+    \ 'name': 'haxe'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim b/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
new file mode 100644
index 00000000..0f2ef527
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
new file mode 100644
index 00000000..f06657f2
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"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
+
+if !exists('g:syntastic_jshint_exec')
+    let g:syntastic_jshint_exec = 'jshint'
+endif
+
+if !exists('g:syntastic_html_jshint_conf')
+    let g:syntastic_html_jshint_conf = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_jshint_IsAvailable() dict
+    let exe = expand(g:syntastic_jshint_exec)
+    return executable(exe) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [2,4])
+endfunction
+
+function! SyntaxCheckers_html_jshint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': expand(g:syntastic_jshint_exec),
+        \ 'args': (g:syntastic_html_jshint_conf != '' ? '--config ' . g:syntastic_html_jshint_conf : ''),
+        \ '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('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'jshint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
new file mode 100644
index 00000000..9c87cf90
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -0,0 +1,209 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" Checker option:
+"
+" - g:syntastic_html_tidy_ignore_errors (list; default: [])
+"   list of errors to ignore
+" - g:syntastic_html_tidy_blocklevel_tags (list; default: [])
+"   list of additional blocklevel tags, to be added to "--new-blocklevel-tags"
+" - g:syntastic_html_tidy_inline_tags (list; default: [])
+"   list of additional inline tags, to be added to "--new-inline-tags"
+" - g:syntastic_html_tidy_empty_tags (list; default: [])
+"   list of additional empty tags, to be added to "--new-empty-tags"
+
+if exists("g:loaded_syntastic_html_tidy_checker")
+    finish
+endif
+let g:loaded_syntastic_html_tidy_checker = 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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" TODO: join this with xhtml.vim for 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
+
+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\""
+                \ ]
+
+let s:blocklevel_tags = [
+                \ "main",
+                \ "section",
+                \ "article",
+                \ "aside",
+                \ "header",
+                \ "footer",
+                \ "nav",
+                \ "figure",
+                \ "figcaption"
+                \ ]
+
+let s:inline_tags = [
+                \ "video",
+                \ "audio",
+                \ "source",
+                \ "embed",
+                \ "mark",
+                \ "progress",
+                \ "meter",
+                \ "time",
+                \ "ruby",
+                \ "rt",
+                \ "rp",
+                \ "canvas",
+                \ "command",
+                \ "details",
+                \ "datalist"
+                \ ]
+
+let s:empty_tags = [
+                \ "wbr",
+                \ "keygen"
+                \ ]
+
+function! s:IgnoreError(text)
+    for i in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
+        if stridx(a:text, i) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction
+
+function! s:NewTags(name)
+    return syntastic#util#shescape(join( s:{a:name} + g:syntastic_html_tidy_{a:name}, ',' ))
+endfunction
+
+function! s:Args()
+    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
+
+function! SyntaxCheckers_html_tidy_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': s:Args(),
+        \ 'tail': '2>&1' })
+
+    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
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
new file mode 100644
index 00000000..eb8ab0f5
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
@@ -0,0 +1,102 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" For detail;s about validator see: http://about.validator.nu/
+"
+" Checker options:
+"
+" - g:syntastic_html_validator_api (string; default: 'http://validator.nu/')
+"   URL of the service to use for checking; leave it to the default to run the
+"   checks against http://validator.nu/, or set it to 'http://localhost:8888/'
+"   if you're running a local service as per http://about.validator.nu/#src
+"
+" - g:syntastic_html_validator_parser (string; default: empty)
+"   parser to use; legal values are: xml, xmldtd, html, html5, html4, html4tr;
+"   set it to 'html5' to check HTML5 files;  see the wiki for reference:
+"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#parser
+"
+" - g:syntastic_html_validator_nsfilter (string; default: empty)
+"   sets the nsfilter for the parser; see the wiki for details:
+"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#nsfilter
+
+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 = 'http://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_Preprocess(errors)
+    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
+
+function! SyntaxCheckers_html_validator_GetLocList() dict
+    let fname = syntastic#util#shexpand('%')
+    let makeprg = self.getExecEscaped() . ' -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': 'SyntaxCheckers_html_validator_Preprocess',
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'validator',
+    \ 'exec': 'curl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
new file mode 100644
index 00000000..747b7583
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
@@ -0,0 +1,69 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" Checker option:
+"
+" - g:syntastic_html_w3_api (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
+
+if exists("g:loaded_syntastic_html_w3_checker")
+    finish
+endif
+let g:loaded_syntastic_html_w3_checker = 1
+
+if !exists('g:syntastic_html_w3_api')
+    let g:syntastic_html_w3_api = 'http://validator.w3.org/check'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_w3_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' -s -F output=json ' .
+        \ '-F uploaded_file=@' . syntastic#util#shexpand('%:p') . '\;type=text/html ' .
+        \ g:syntastic_html_w3_api
+
+    let errorformat =
+        \ '%A %\+{,' .
+        \ '%C %\+"lastLine": %l\,%\?,' .
+        \ '%C %\+"lastColumn": %c\,%\?,' .
+        \ '%C %\+"message": "%m"\,%\?,' .
+        \ '%C %\+"type": "%trror"\,%\?,' .
+        \ '%-G %\+"type": "%tnfo"\,%\?,' .
+        \ '%C %\+"subtype": "%tarning"\,%\?,' .
+        \ '%Z %\+}\,,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr("")},
+        \ 'returns': [0] })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], '\m\\\([\"]\)', '\1', 'g')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'w3',
+    \ 'exec': 'curl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
new file mode 100644
index 00000000..b3882314
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -0,0 +1,88 @@
+"============================================================================
+"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-5.5-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_Preprocess(errors)
+    let out = []
+    let fname = expand('%')
+    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
+
+function! SyntaxCheckers_java_checkstyle_GetLocList() dict
+
+    let fname = syntastic#util#shescape( expand('%:p:h') . '/' . expand('%:t') )
+
+    if has('win32unix')
+        let fname = substitute(system('cygpath -m ' . fname), '\m\%x00', '', 'g')
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-cp ' . g:syntastic_java_checkstyle_classpath .
+        \               ' com.puppycrawl.tools.checkstyle.Main -c ' . g:syntastic_java_checkstyle_conf_file .
+        \               ' -f xml',
+        \ 'fname': fname })
+
+    let errorformat = '%f:%t:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'SyntaxCheckers_java_checkstyle_Preprocess' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'java',
+    \ 'name': 'checkstyle',
+    \ 'exec': 'java'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
new file mode 100644
index 00000000..48a42f8b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -0,0 +1,450 @@
+"============================================================================
+"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
+
+" Global Options
+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_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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! s:CygwinPath(path)
+    return substitute(system("cygpath -m " . a:path), '\n', '', 'g')
+endfunction
+
+if !exists("g:syntastic_java_javac_temp_dir")
+    if has('win32') || has('win64')
+        let g:syntastic_java_javac_temp_dir = $TEMP."\\vim-syntastic-javac"
+    elseif has('win32unix')
+        let g:syntastic_java_javac_temp_dir = s:CygwinPath('/tmp/vim-syntastic-javac')
+    else
+        let g:syntastic_java_javac_temp_dir = '/tmp/vim-syntastic-javac'
+    endif
+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
+
+function! s:RemoveCarriageReturn(line)
+    return substitute(a:line, '\r', '', 'g')
+endfunction
+
+" recursively remove directory and all it's sub-directories
+function! s:RemoveDir(dir)
+    if isdirectory(a:dir)
+        for f in split(globpath(a:dir, '*'), "\n")
+            call s:RemoveDir(f)
+        endfor
+        silent! call system('rmdir ' . a:dir)
+    else
+        silent! call delete(a:dir)
+    endif
+endfunction
+
+function! s:AddToClasspath(classpath, path)
+    if a:path == ''
+        return a:classpath
+    endif
+    if a:classpath != '' && a:path != ''
+        if has('win32') || has('win32unix') || has('win64')
+            return a:classpath . ";" . a:path
+        else
+            return a:classpath . ":" . a:path
+        endif
+    else
+        return a:path
+    endif
+endfunction
+
+function! s:SplitClasspath(classpath)
+    if a:classpath == ''
+        return []
+    endif
+    if has('win32') || has('win32unix') || has('win64')
+        return split(a:classpath, ";")
+    else
+        return split(a:classpath, ":")
+    endif
+endfunction
+
+function! s:LoadConfigFile()
+    if filereadable(g:syntastic_java_javac_config_file)
+        exe 'source '.g:syntastic_java_javac_config_file
+    endif
+endfunction
+
+function! s:SaveClasspath()
+    " build classpath from lines
+    let path = ''
+    let lines = getline(1, line('$'))
+    for l in lines
+        let path = s:AddToClasspath(path, l)
+    endfor
+    " save classpath to config file
+    if g:syntastic_java_javac_config_file_enabled
+        if filereadable(g:syntastic_java_javac_config_file)
+            " load lines from config file
+            let lines = readfile(g:syntastic_java_javac_config_file)
+            " 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)
+                    let i -= 1
+                endif
+                let i += 1
+            endwhile
+        else
+            let lines = []
+        endif
+        " add new g:syntastic_java_javac_classpath option to config
+        call add(lines, 'let g:syntastic_java_javac_classpath = "'.path.'"')
+        " save config file lines
+        call writefile(lines, g:syntastic_java_javac_config_file)
+    endif
+    " set new classpath
+    let g:syntastic_java_javac_classpath = path
+    let &modified = 0
+endfunction
+
+function! s:EditClasspath()
+    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
+            let 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
+
+function! s:SaveConfig()
+    " get lines
+    let lines = getline(1, line('$'))
+    if g:syntastic_java_javac_config_file_enabled
+        " save config file lines
+        call writefile(lines, g:syntastic_java_javac_config_file)
+    endif
+    let &modified = 0
+endfunction
+
+function! s:EditConfig()
+    let command = 'syntastic javac config'
+    let winnr = bufwinnr('^' . command . '$')
+    if winnr < 0
+        let lines = []
+        if filereadable(g:syntastic_java_javac_config_file)
+            let lines = readfile(g:syntastic_java_javac_config_file)
+        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
+
+function! s:GetMavenProperties()
+    let mvn_properties = {}
+    let pom = findfile("pom.xml", ".;")
+    if s:has_maven && filereadable(pom)
+        if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
+            let mvn_cmd = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_is_managed_tag = 1
+            let mvn_settings_output = split(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
+
+command! SyntasticJavacEditClasspath call s:EditClasspath()
+
+if g:syntastic_java_javac_config_file_enabled
+    command! SyntasticJavacEditConfig call s:EditConfig()
+endif
+
+function! s:GetMavenClasspath()
+    let pom = findfile("pom.xml", ".;")
+    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 = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_classpath_output = split(system(mvn_cmd . ' dependency:build-classpath'), "\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 output_dir = 'target/classes'
+            if has_key(mvn_properties, 'project.build.outputDirectory')
+                let output_dir = mvn_properties['project.build.outputDirectory']
+            endif
+            let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
+
+            let test_output_dir = 'target/test-classes'
+            if has_key(mvn_properties, 'project.build.testOutputDirectory')
+                let test_output_dir = mvn_properties['project.build.testOutputDirectory']
+            endif
+            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
+
+function! SyntaxCheckers_java_javac_IsAvailable() dict
+    let s:has_maven = executable(expand(g:syntastic_java_maven_executable))
+    return executable(expand(g:syntastic_java_javac_executable))
+endfunction
+
+function! s:MavenOutputDirectory()
+    let pom = findfile("pom.xml", ".;")
+    if s:has_maven && filereadable(pom)
+        let mvn_properties = s:GetMavenProperties()
+        let output_dir = getcwd()
+        if has_key(mvn_properties, 'project.properties.build.dir')
+            let output_dir = mvn_properties['project.properties.build.dir']
+        endif
+        if stridx(expand( '%:p:h' ), "src.main.java") >= 0
+            let output_dir .= '/target/classes'
+            if has_key(mvn_properties, 'project.build.outputDirectory')
+                let output_dir = mvn_properties['project.build.outputDirectory']
+            endif
+        endif
+        if stridx(expand( '%:p:h' ), "src.test.java") >= 0
+            let output_dir .= '/target/test-classes'
+            if has_key(mvn_properties, 'project.build.testOutputDirectory')
+                let output_dir = mvn_properties['project.build.testOutputDirectory']
+            endif
+        endif
+
+        if has('win32unix')
+            let output_dir=s:CygwinPath(output_dir)
+        endif
+        return output_dir
+    endif
+    return '.'
+endfunction
+
+function! SyntaxCheckers_java_javac_GetLocList() dict
+
+    let javac_opts = g:syntastic_java_javac_options
+
+    let output_dir = ""
+    if g:syntastic_java_javac_delete_output
+        let output_dir = g:syntastic_java_javac_temp_dir
+        let javac_opts .= ' -d ' . output_dir
+    endif
+
+    " load classpath from config file
+    if g:syntastic_java_javac_config_file_enabled
+        call s:LoadConfigFile()
+    endif
+
+    let javac_classpath = ''
+
+    " add classpathes to javac_classpath
+    if has('win32') || has('win32unix') || has('win64')
+        let javac_classpath_split = ';'
+    else
+        let javac_classpath_split = ':'
+    endif
+    for path in split(g:syntastic_java_javac_classpath, javac_classpath_split)
+        if path != ''
+            try
+                let ps = glob(path, 0, 1)
+            catch
+                let ps = split(glob(path, 0), "\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 ' . s:MavenOutputDirectory()
+        endif
+        let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
+    endif
+
+    " load custom classpath
+    if g:syntastic_java_javac_custom_classpath_command != ''
+        let lines = system(g:syntastic_java_javac_custom_classpath_command)
+        if has('win32') || has('win32unix') || has('win64')
+            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 "' . fnameescape(javac_classpath) . '"'
+    endif
+
+    " path seperator
+    if has('win32') || has('win32unix') || has('win64')
+        let sep = "\\"
+    else
+        let sep = '/'
+    endif
+
+    let fname = fnameescape(expand ( '%:p:h' ) . sep . expand ( '%:t' ))
+
+    if has('win32unix')
+        let fname =  s:CygwinPath(fname)
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': javac_opts,
+        \ 'fname': fname,
+        \ 'tail': '2>&1' })
+
+    " 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,'.
+        \ '%A%f:%l:\ %m,'.
+        \ '%+Z%p^,'.
+        \ '%+C%.%#,'.
+        \ '%-G%.%#'
+
+    if g:syntastic_java_javac_delete_output
+        silent! call mkdir(output_dir, 'p')
+    endif
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['cygwinRemoveCR'] })
+
+    if g:syntastic_java_javac_delete_output
+        call s:RemoveDir(output_dir)
+    endif
+    return errors
+
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'java',
+    \ 'name': 'javac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
new file mode 100644
index 00000000..d23fad05
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"File:        closurecompiler.vim
+"Description: Javascript syntax checker - using Google Closure Compiler
+"Maintainer:  Motohiro Takayama <mootoh at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+"
+" To enable this plugin, edit the .vimrc like this:
+"
+"   let g:syntastic_javascript_checker = "closurecompiler"
+"
+" and set the path to the Google Closure Compiler:
+"
+"   let g:syntastic_javascript_closure_compiler_path = '/path/to/google-closure-compiler.jar'
+"
+" It takes additional options for Google Closure Compiler with the variable
+" g:syntastic_javascript_closure_compiler_options.
+"
+
+if exists("g:loaded_syntastic_javascript_closurecompiler_checker")
+    finish
+endif
+let g:loaded_syntastic_javascript_closurecompiler_checker = 1
+
+if !exists("g:syntastic_javascript_closure_compiler_options")
+    let g:syntastic_javascript_closure_compiler_options = ""
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
+    return
+        \ executable("java") &&
+        \ exists("g:syntastic_javascript_closure_compiler_path") &&
+        \ filereadable(g:syntastic_javascript_closure_compiler_path)
+endfunction
+
+function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
+    if exists("g:syntastic_javascript_closure_compiler_file_list")
+        let file_list = join(readfile(g:syntastic_javascript_closure_compiler_file_list))
+    else
+        let file_list = syntastic#util#shexpand('%')
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': 'java -jar ' . g:syntastic_javascript_closure_compiler_path,
+        \ 'args': g:syntastic_javascript_closure_compiler_options,
+        \ 'args_after': '--js' ,
+        \ 'fname': file_list })
+
+    let errorformat =
+        \ '%-GOK,'.
+        \ '%E%f:%l: ERROR - %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: WARNING - %m,'.
+        \ '%Z%p^'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'closurecompiler',
+    \ 'exec': 'java'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
new file mode 100644
index 00000000..c23cbbc7
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"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_conf')
+    let g:syntastic_javascript_eslint_conf = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_eslint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': (g:syntastic_javascript_eslint_conf != '' ? '--config ' . g:syntastic_javascript_eslint_conf : '') })
+
+    let errorformat =
+        \ '%E%f: line %l\, col %c\, Error - %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['sort'] })
+
+    for e in loclist
+        let e['col'] += 1
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'eslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
new file mode 100644
index 00000000..1b171c9c
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"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
+
+if !exists("g:syntastic_javascript_gjslint_conf")
+    let g:syntastic_javascript_gjslint_conf = ""
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_gjslint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': g:syntastic_javascript_gjslint_conf,
+        \ 'args_after': '--nosummary --unix_mode --nodebug_indentation --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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
new file mode 100644
index 00000000..2c1e54f9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" we borrow SyntaxCheckers_java_checkstyle_Preprocess() from java/checkstyle
+runtime! syntax_checkers/java/*.vim
+
+function! SyntaxCheckers_javascript_jscs_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter checkstyle' })
+    let errorformat = '%f:%t:%l:%c:%m'
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'SyntaxCheckers_java_checkstyle_Preprocess',
+        \ 'postprocess': ['sort'],
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jscs'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
new file mode 100644
index 00000000..e57329e5
--- /dev/null
+++ b/sources_non_forked/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_jshint_exec')
+    let g:syntastic_jshint_exec = 'jshint'
+endif
+
+if !exists('g:syntastic_javascript_jshint_conf')
+    let g:syntastic_javascript_jshint_conf = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
+    return executable(expand(g:syntastic_jshint_exec))
+endfunction
+
+function! SyntaxCheckers_javascript_jshint_GetLocList() dict
+    if !exists('s:jshint_new')
+        let s:jshint_new =
+            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(expand(g:syntastic_jshint_exec) . ' --version'), [1, 1])
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': expand(g:syntastic_jshint_exec),
+        \ 'args': (g:syntastic_javascript_jshint_conf != '' ? '--config ' . g:syntastic_javascript_jshint_conf : ''),
+        \ '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('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jshint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
new file mode 100644
index 00000000..0e894bf1
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"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
+
+if !exists("g:syntastic_javascript_jsl_conf")
+    let g:syntastic_javascript_jsl_conf = ""
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jsl_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': (g:syntastic_javascript_jsl_conf != '' ? '-conf ' . g:syntastic_javascript_jsl_conf : ''),
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
new file mode 100644
index 00000000..c233cf34
--- /dev/null
+++ b/sources_non_forked/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.
+"
+"Tested with jslint 0.1.4.
+"============================================================================
+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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
new file mode 100644
index 00000000..2b9ec451
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
new file mode 100644
index 00000000..16e30091
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/less-lint.coffee b/sources_non_forked/syntastic/syntax_checkers/less/less-lint.coffee
new file mode 100644
index 00000000..0b05e4a7
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/syntax_checkers/less/less-lint.js b/sources_non_forked/syntastic/syntax_checkers/less/less-lint.js
new file mode 100644
index 00000000..5abc653c
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
new file mode 100644
index 00000000..853524eb
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -0,0 +1,71 @@
+"============================================================================
+"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.
+"
+"============================================================================
+
+" To send additional options to less use the variable g:syntastic_less_options.
+" The default is
+"   let g:syntastic_less_options = "--no-color"
+"
+" To use less-lint instead of less set the variable
+" g:syntastic_less_use_less_lint.
+
+if exists("g:loaded_syntastic_less_lessc_checker")
+    finish
+endif
+let g:loaded_syntastic_less_lessc_checker = 1
+
+if !exists("g:syntastic_less_options")
+    let g:syntastic_less_options = ""
+endif
+
+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
+
+if g:syntastic_less_use_less_lint
+    let s:check_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
+else
+    let s:check_file = 'lessc'
+endif
+
+function! SyntaxCheckers_less_lessc_IsAvailable() dict
+    return g:syntastic_less_use_less_lint ? executable('node') : executable('lessc')
+endfunction
+
+function! SyntaxCheckers_less_lessc_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': s:check_file,
+        \ 'args': g:syntastic_less_options,
+        \ '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,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
new file mode 100644
index 00000000..c6e48340
--- /dev/null
+++ b/sources_non_forked/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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
new file mode 100644
index 00000000..b501e3c9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        limbo.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Alex Efros <powerman-asdf@ya.ru>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_limbo_limbo_checker")
+    finish
+endif
+let g:loaded_syntastic_limbo_limbo_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_limbo_limbo_GetLocList() dict
+    let include = $INFERNO_HOME != '' ? '-I$INFERNO_HOME ' : ''
+    " don't generate .dis in current dir while checking syntax,
+    " .dis should be generated by `mk`
+    let output = filereadable('mkfile') ? (' ' . syntastic#c#NullOutput()) : ''
+
+    let makeprg = self.makeprgBuild({ 'args_before': include . '-w' . output })
+
+    let errorformat = '%E%f:%l:%m'
+    if expand('%') =~# '\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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
new file mode 100644
index 00000000..2c3876da
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"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 makeprg = self.makeprgBuild({
+        \ 'args_after': '-q -c ' . syntastic#c#NullOutput() })
+
+    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%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lisp',
+    \ 'name': 'clisp'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim b/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
new file mode 100644
index 00000000..c65a1672
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
new file mode 100644
index 00000000..b34778de
--- /dev/null
+++ b/sources_non_forked/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' . 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' . open)
+        "endif
+    endif
+    return result
+endfunction
+
+function! SyntaxCheckers_lua_luac_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
+
+    let errorformat =  'luac: %#%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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim b/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
new file mode 100644
index 00000000..1b15eeac
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
new file mode 100644
index 00000000..65bf9aa9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        nasm.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Håvard Pettersson <haavard.pettersson at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_nasm_nasm_checker")
+    finish
+endif
+let g:loaded_syntastic_nasm_nasm_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_nasm_nasm_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-X gnu -f elf' .
+        \       ' -I ' . syntastic#util#shescape(expand("%:p:h") . "/") .
+        \       ' ' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
new file mode 100644
index 00000000..28085d54
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
new file mode 100644
index 00000000..d5241592
--- /dev/null
+++ b/sources_non_forked/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')
+    let g:syntastic_objc_compiler = executable('gcc') ? 'gcc' : 'clang'
+endif
+
+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
+    return executable(expand(g:syntastic_objc_compiler))
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
new file mode 100644
index 00000000..a415c41f
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
@@ -0,0 +1,31 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_oclint_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_oclint_config':
+"
+"   let g:syntastic_oclint_config_file = '.config'
+
+if exists("g:loaded_syntastic_objc_oclint_checker")
+    finish
+endif
+let g:loaded_syntastic_objc_oclint_checker = 1
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objc',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
new file mode 100644
index 00000000..55ae5014
--- /dev/null
+++ b/sources_non_forked/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')
+    let g:syntastic_objcpp_compiler = executable('gcc') ? 'gcc' : 'clang'
+endif
+
+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
+    return executable(expand(g:syntastic_objcpp_compiler))
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
new file mode 100644
index 00000000..84f71d29
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
@@ -0,0 +1,31 @@
+"============================================================================
+"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.
+"============================================================================
+"
+" The setting 'g:syntastic_oclint_config_file' allows you to define a file
+" that contains additional compiler arguments like include directories or
+" CFLAGS. The file is expected to contain one option per line. If none is
+" given the filename defaults to '.syntastic_oclint_config':
+"
+"   let g:syntastic_oclint_config_file = '.config'
+
+if exists("g:loaded_syntastic_objcpp_oclint_checker")
+    finish
+endif
+let g:loaded_syntastic_objcpp_oclint_checker = 1
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objcpp',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
new file mode 100644
index 00000000..d9f57001
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -0,0 +1,156 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" The more reliable way to check for a single .ml file is to use ocamlc.
+" You can do that setting this in your .vimrc:
+"
+"   let g:syntastic_ocaml_use_ocamlc = 1
+" It's possible to use ocamlc in conjuction with Jane Street's Core. In order
+" to do that, you have to specify this in your .vimrc:
+"
+"   let g:syntastic_ocaml_use_janestreet_core = 1
+"   let g:syntastic_ocaml_janestreet_core_dir = <path>
+"
+" Where path is the path to your core installation (usually a collection of
+" .cmx and .cmxa files).
+"
+"
+" By default the camlp4o preprocessor is used to check the syntax of .ml, and .mli files,
+" ocamllex is used to check .mll files and menhir is used to check .mly files.
+" The output is all redirected to /dev/null, nothing is written to the disk.
+"
+" If your source code needs camlp4r then you can define this in your .vimrc:
+"
+"   let g:syntastic_ocaml_camlp4r = 1
+"
+" If you used some syntax extensions, or you want to also typecheck the source
+" code, then you can define this:
+"
+"   let g:syntastic_ocaml_use_ocamlbuild = 1
+"
+" This will run ocamlbuild <name>.inferred.mli, so it will write to your _build
+" directory (and possibly rebuild your myocamlbuild.ml plugin), only enable this
+" if you are ok with that.
+"
+" If you are using syntax extensions / external libraries and have a properly
+" set up _tags (and myocamlbuild.ml file) then it should just work
+" to enable this flag and get syntax / type checks through syntastic.
+"
+" For best results your current directory should be the project root
+" (same situation if you want useful output from :make).
+
+if exists("g:loaded_syntastic_ocaml_camlp4o_checker")
+    finish
+endif
+let g:loaded_syntastic_ocaml_camlp4o_checker = 1
+
+if exists('g:syntastic_ocaml_camlp4r') && g:syntastic_ocaml_camlp4r != 0
+    let s:ocamlpp="camlp4r"
+else
+    let s:ocamlpp="camlp4o"
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict
+    return executable(s:ocamlpp)
+endfunction
+
+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_ocamlc = 0
+endif
+
+if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable("ocamlbuild")
+    let g:syntastic_ocaml_use_ocamlbuild = 0
+endif
+
+function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict
+    let makeprg = s:GetMakeprg()
+    if makeprg == ""
+        return []
+    endif
+
+    let errorformat =
+        \ '%AFile "%f"\, line %l\, characters %c-%*\d:,'.
+        \ '%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 %n: %m,'.
+        \ '%C%m,'.
+        \ '%-G+%.%#'
+
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction
+
+function! s:GetMakeprg()
+    if g:syntastic_ocaml_use_ocamlc
+        return s:GetOcamlcMakeprg()
+    endif
+
+    if g:syntastic_ocaml_use_ocamlbuild && isdirectory('_build')
+        return s:GetOcamlBuildMakeprg()
+    endif
+
+    return s:GetOtherMakeprg()
+endfunction
+
+function! s:GetOcamlcMakeprg()
+    if g:syntastic_ocaml_use_janestreet_core
+        let build_cmd = "ocamlc -I "
+        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir)
+        let build_cmd .= " -c " . syntastic#util#shexpand('%')
+        return build_cmd
+    else
+        return "ocamlc -c " . syntastic#util#shexpand('%')
+    endif
+endfunction
+
+function! s:GetOcamlBuildMakeprg()
+    return "ocamlbuild -quiet -no-log -tag annot," . s:ocamlpp . " -no-links -no-hygiene -no-sanitize " .
+                \ syntastic#util#shexpand('%:r') . ".cmi"
+endfunction
+
+function! s:GetOtherMakeprg()
+    "TODO: give this function a better name?
+    "
+    "TODO: should use throw/catch instead of returning an empty makeprg
+
+    let extension = expand('%: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#shexpand('%') . " >" . syntastic#util#DevNull()
+    elseif stridx(extension,'mll') >= 0 && executable("ocamllex")
+        let makeprg = "ocamllex -q " . syntastic#c#NullOutput() . " " . syntastic#util#shexpand('%')
+    else
+        let makeprg = "camlp4o " . syntastic#c#NullOutput() . " " . syntastic#util#shexpand('%')
+    endif
+
+    return makeprg
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ocaml',
+    \ 'name': 'camlp4o'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
new file mode 100644
index 00000000..226c8361
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -0,0 +1,105 @@
+"============================================================================
+"File:        perl.vim
+"Description: Syntax checking plugin for syntastic.vim
+"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.
+"
+"============================================================================
+"
+" Checker options:
+"
+" - g:syntastic_perl_interpreter (string; default: 'perl')
+"   The perl interpreter to use.
+"
+" - g:syntastic_perl_lib_path (list; default: [])
+"   List of include directories to be added to the perl command line. Example:
+"
+"       let g:syntastic_perl_lib_path = [ './lib', './lib/auto' ]
+
+if exists('g:loaded_syntastic_perl_perl_checker')
+    finish
+endif
+let g:loaded_syntastic_perl_perl_checker=1
+
+if !exists('g:syntastic_perl_interpreter')
+    let g:syntastic_perl_interpreter = 'perl'
+endif
+
+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
+    " don't call executable() here, to allow things like
+    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
+    silent! call system(expand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_perl_perl_Preprocess(errors)
+    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
+
+function! SyntaxCheckers_perl_perl_GetLocList() dict
+    let exe = expand(g:syntastic_perl_interpreter)
+    if type(g:syntastic_perl_lib_path) == type('')
+        call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
+        let includes = split(g:syntastic_perl_lib_path, ',')
+    else
+        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+    endif
+    let shebang = syntastic#util#parseShebang()
+    let extra = join(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({
+        \ 'exe': exe,
+        \ 'args_before': '-c -X ' . extra })
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'SyntaxCheckers_perl_perl_Preprocess',
+        \ 'defaults': {'type': 'E'} })
+    if !empty(errors)
+        return errors
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': exe,
+        \ 'args_before': '-c -Mwarnings ' . extra })
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'SyntaxCheckers_perl_perl_Preprocess',
+        \ 'defaults': {'type': 'W'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'perl',
+    \ 'name': 'perl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
new file mode 100644
index 00000000..cd010945
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" For details about perlcritic see:
+"
+" - http://perlcritic.tigris.org/
+" - https://metacpan.org/module/Perl::Critic
+"
+" Checker options:
+"
+" - g:syntastic_perl_perlcritic_thres (integer; default: 5)
+"   error threshold: policy violations with a severity above this
+"   value are highlighted as errors, the others are warnings
+"
+" - g:syntastic_perl_perlcritic_args (string; default: empty)
+"   command line options to pass to perlcritic
+
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
new file mode 100644
index 00000000..5ffc7365
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/pod/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'perl',
+    \ 'name': 'podchecker',
+    \ 'redirect': 'pod/podchecker'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
new file mode 100644
index 00000000..3192d7dd
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        php.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_php_php_checker")
+    finish
+endif
+let g:loaded_syntastic_php_php_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_php_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\munexpected '\\zs[^']\\+\\ze'")
+    return term != '' ? '\V' . term : ''
+endfunction
+
+function! SyntaxCheckers_php_php_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-d error_reporting=E_ALL',
+        \ 'args_after': '-l -d display_errors=1 -d log_errors=0 -d xdebug.cli_color=0' })
+
+    let errorformat =
+        \ '%-GNo syntax errors detected in%.%#,'.
+        \ 'Parse error: %#syntax %trror\, %m in %f on line %l,'.
+        \ 'Parse %trror: %m in %f on line %l,'.
+        \ 'Fatal %trror: %m in %f on line %l,'.
+        \ '%-G\s%#,'.
+        \ '%-GErrors parsing %.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'php'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
new file mode 100644
index 00000000..11b183a1
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" See here for details of phpcs
+"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
+
+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 --tab-width=' . &tabstop })
+
+    let errorformat =
+        \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity,'.
+        \ '"%f"\,%l\,%v\,%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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
new file mode 100644
index 00000000..02684177
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
@@ -0,0 +1,78 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" See here for details of phpmd
+"   - phpmd (see http://phpmd.org)
+
+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 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
new file mode 100644
index 00000000..5b714de9
--- /dev/null
+++ b/sources_non_forked/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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
new file mode 100644
index 00000000..34a37e55
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
new file mode 100644
index 00000000..5777993d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"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
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+
+    if syntastic#util#versionIsAtLeast(ver, [2,7,0])
+        let args = 'parser validate --color=false'
+    else
+        let args = '--color=false --parseonly'
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_before': args })
+
+    let errorformat =
+        \ '%-Gerr: Try ''puppet help parser validate'' for usage,' .
+        \ '%-GError: Try ''puppet help parser validate'' for usage,' .
+        \ '%Eerr: Could not parse for environment %*[a-z]: %m at %f:%l,' .
+        \ '%EError: Could not parse for environment %*[a-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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
new file mode 100644
index 00000000..425a90f3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"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
+
+if exists("g:syntastic_puppet_lint_arguments")
+    let g:syntastic_puppet_puppetlint_args = g:syntastic_puppet_lint_arguments
+    call syntastic#log#deprecationWarn("variable g:syntastic_puppet_lint_arguments is deprecated, please use g:syntastic_puppet_puppetlint_args instead")
+endif
+
+function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
+    return
+        \ executable("puppet") &&
+        \ executable("puppet-lint") &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion('puppet-lint --version 2>' .
+        \     syntastic#util#DevNull()), [0,1,10])
+endfunction
+
+function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--log-format "%{KIND} [%{check}] %{message} at %{fullpath}:%{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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/compile.py b/sources_non_forked/syntastic/syntax_checkers/python/compile.py
new file mode 100644
index 00000000..32f1413d
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
new file mode 100644
index 00000000..61d55cc9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -0,0 +1,69 @@
+"============================================================================
+"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 loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
new file mode 100644
index 00000000..2b6119ce
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -0,0 +1,60 @@
+"============================================================================
+"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 loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ '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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
new file mode 100644
index 00000000..31ec1623
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        pep257.vim
+"Description: Docstring style checking plugin for syntastic.vim
+"============================================================================
+"
+" For details about pep257 see: https://github.com/GreenSteam/pep257
+
+if exists("g:loaded_syntastic_python_pep257_checker")
+    finish
+endif
+let g:loaded_syntastic_python_pep257_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" sanity: kill empty lines here rather than munging errorformat
+function! SyntaxCheckers_python_pep257_Preprocess(errors)
+    return filter(copy(a:errors), 'v:val != ""')
+endfunction
+
+function! SyntaxCheckers_python_pep257_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l:%c%\%.%\%.%\d%\+:%\d%\+: %m,' .
+        \ '%E%f:%l:%c: %m,' .
+        \ '%+C    %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'SyntaxCheckers_python_pep257_Preprocess',
+        \ 'postprocess': ['compressWhitespace'] })
+
+    " pep257 outputs byte offsets rather than column numbers
+    for e in loclist
+        let e['col'] = get(e, 'col', 0) + 1
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pep257'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
new file mode 100644
index 00000000..310746b3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        pep8.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.
+"
+"============================================================================
+"
+" For details about pep8 see: https://github.com/jcrocholl/pep8
+
+if exists("g:loaded_syntastic_python_pep8_checker")
+    finish
+endif
+let g:loaded_syntastic_python_pep8_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pep8_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%c: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ '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': 'pep8'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
new file mode 100644
index 00000000..5ceb51ab
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -0,0 +1,33 @@
+"============================================================================
+"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'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'py3kwarn'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
new file mode 100644
index 00000000..e62965f4
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -0,0 +1,70 @@
+"============================================================================
+"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 terms =  split(a:i['text'], '"', 1)
+        if len(terms) > 2
+            return terms[1]
+        endif
+
+        let terms =  split(a:i['text'], "'", 1)
+        if len(terms) > 2
+            return terms[1]
+        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: %m,'.
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
new file mode 100644
index 00000000..93aa4bad
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -0,0 +1,68 @@
+"============================================================================
+"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
+
+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
+    let makeprg = self.makeprgBuild({ 'args_after': '-f pep8' })
+
+    " TODO: "WARNING:pylama:..." messages are probably a logging bug
+    let errorformat =
+        \ '%-GWARNING:pylama:%.%#,' .
+        \ '%A%f:%l:%c: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['sort'] })
+
+    " adjust for weirdness in each checker
+    for e in loclist
+        let e['type'] = e['text'] =~? '\m^[RCW]' ? 'W' : 'E'
+        if e['text'] =~# '\v\[%(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\[%(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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
new file mode 100644
index 00000000..aaa6f9b8
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -0,0 +1,83 @@
+"============================================================================
+"File:        pylint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Author:      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
+
+let s:pylint_new = -1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pylint_IsAvailable() dict
+    let exe = self.getExec()
+    let s:pylint_new = executable(exe) ? s:PylintNew(exe) : -1
+    return s:pylint_new >= 0
+endfunction
+
+function! SyntaxCheckers_python_pylint_GetLocList() dict
+    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 loclist=SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['sort'],
+        \ '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
+
+function! s:PylintNew(exe)
+    let exe = syntastic#util#shescape(a:exe)
+    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".  Oh, joy. :)
+        let pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^pylint\>''')[0]
+        let pylint_version = substitute(pylint_version, '\v^\S+\s+', '', '')
+        let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(pylint_version), [1])
+    catch /^Vim\%((\a\+)\)\=:E684/
+        call syntastic#log#error("checker python/pylint: can't parse version string (abnormal termination?)")
+        let ret = -1
+    endtry
+    return ret
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pylint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
new file mode 100644
index 00000000..eced4d30
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:compiler = expand('<sfile>:p:h') . syntastic#util#Slash() . 'compile.py'
+
+function! SyntaxCheckers_python_python_IsAvailable() dict
+    return executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [2, 6])
+endfunction
+
+function! SyntaxCheckers_python_python_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:compiler] })
+
+    let errorformat = '%E%f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'python'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
new file mode 100644
index 00000000..f8002a72
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"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
+
+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)
+    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',
+        \ 'postprocess': ['sort'] })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
new file mode 100644
index 00000000..71615205
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"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'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
new file mode 100644
index 00000000..e5fb0a1f
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"File:        rst.vim
+"Description: Syntax checking plugin for docutil's 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') ? 'rst2pseudoxml.py' : 'rst2pseudoxml'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+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: (%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 })
+
+    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': 'rst2pseudoxml',
+    \ 'exec': s:rst2pseudoxml })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
new file mode 100644
index 00000000..5c831490
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
new file mode 100644
index 00000000..fc7ea63e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"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
+    if syntastic#util#isRunningWindows()
+        let exe = self.getExecEscaped()
+        let args = '-T1'
+    else
+        let exe = 'RUBYOPT= ' . self.getExecEscaped()
+        let args = ''
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': exe,
+        \ 'args': args,
+        \ 'args_after': '-W1 -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%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'jruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
new file mode 100644
index 00000000..d66595ca
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"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({
+        \ 'exe': 'RUBYOPT= ' . self.getExecEscaped(),
+        \ 'args_after': '-W1 -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%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'macruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
new file mode 100644
index 00000000..bdc74ea0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -0,0 +1,80 @@
+"============================================================================
+"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
+
+if !exists("g:syntastic_ruby_exec")
+    let g:syntastic_ruby_exec = "ruby"
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+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\<'.term.'\>'
+    endif
+
+    return ''
+endfunction
+
+function! SyntaxCheckers_ruby_mri_GetLocList() dict
+    let exe = expand(g:syntastic_ruby_exec)
+    if !syntastic#util#isRunningWindows()
+        let exe = 'RUBYOPT= ' . exe
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': exe,
+        \ 'args_after': '-w -T1 -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%.%#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%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'mri',
+    \ 'exec': 'ruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
new file mode 100644
index 00000000..9177c563
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" In order to use rubocop with the default ruby checker (mri):
+"     let g:syntastic_ruby_checkers = ['mri', 'rubocop']
+
+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
+    return
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [0, 9, 0])
+endfunction
+
+function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs --silent' })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
new file mode 100644
index 00000000..02ed2f2f
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"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
+    let makeprg = self.makeprgBuild({ 'args': 'analyze --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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim b/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim
new file mode 100644
index 00000000..97ef66a0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        rust.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Chad Jablonski <chad.jablonski at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_rust_rustc_checker")
+    finish
+endif
+let g:loaded_syntastic_rust_rustc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_rust_rustc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-trans' })
+
+    let errorformat  =
+        \ '%E%f:%l:%c: %\d%#:%\d%# %.%\{-}error:%.%\{-} %m,'   .
+        \ '%W%f:%l:%c: %\d%#:%\d%# %.%\{-}warning:%.%\{-} %m,' .
+        \ '%C%f:%l %m,' .
+        \ '%-Z%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rust',
+    \ 'name': 'rustc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
new file mode 100644
index 00000000..353c1a93
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -0,0 +1,79 @@
+"============================================================================
+"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 = tempname()
+
+"By default do not check partials as unknown variables are a syntax error
+if !exists("g:syntastic_sass_check_partials")
+    let g:syntastic_sass_check_partials = 0
+endif
+
+"use compass imports if available
+let s:imports = ""
+if executable("compass")
+    let s:imports = "--compass"
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sass_sass_GetLocList() dict
+    if !g:syntastic_sass_check_partials && expand('%:t')[0] == '_'
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check' })
+
+    let errorformat =
+        \ '%ESyntax %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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
new file mode 100644
index 00000000..92912423
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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
+
+if !exists('g:syntastic_scala_options')
+    let g:syntastic_scala_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scala_fsc_GetLocList() dict
+    " fsc has some serious problems with the
+    " working directory changing after being started
+    " that's why we better pass an absolute path
+    let makeprg = self.makeprgBuild({
+        \ 'args': g:syntastic_scala_options,
+        \ 'args_after': '-Ystop-after:parser',
+        \ 'fname': syntastic#util#shexpand('%:p') })
+
+    let errorformat =
+        \ '%E%f:%l: %trror: %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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
new file mode 100644
index 00000000..ea465f08
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"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
+
+if !exists('g:syntastic_scala_options')
+    let g:syntastic_scala_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scala_scalac_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': g:syntastic_scala_options,
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
new file mode 100644
index 00000000..61bd6de7
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
@@ -0,0 +1,26 @@
+
+"============================================================================
+"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
+
+runtime! syntax_checkers/sass/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sass',
+    \ 'redirect': 'sass/sass'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
new file mode 100644
index 00000000..5219c37b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -0,0 +1,37 @@
+"============================================================================
+"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_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': 'scss',
+    \ 'name': 'scss_lint',
+    \ 'exec': 'scss-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim b/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
new file mode 100644
index 00000000..42751cf9
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
new file mode 100644
index 00000000..76182cdc
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -0,0 +1,88 @@
+"============================================================================
+"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! s:GetShell()
+    if !exists('b:shell') || b:shell == ''
+        let b:shell = ''
+        let shebang = getbufline(bufnr('%'), 1)[0]
+        if shebang != ''
+            if stridx(shebang, 'bash') >= 0
+                let b:shell = 'bash'
+            elseif stridx(shebang, 'zsh') >= 0
+                let b:shell = 'zsh'
+            elseif stridx(shebang, 'sh') >= 0
+                let b:shell = 'sh'
+            endif
+        endif
+        " try to use env variable in case no shebang could be found
+        if b:shell == ''
+            let b:shell = fnamemodify(expand('$SHELL'), ':t')
+        endif
+    endif
+    return b:shell
+endfunction
+
+function! s:ForwardToZshChecker()
+    let registry = g:SyntasticRegistry.Instance()
+    if registry.checkable('zsh')
+        return registry.getCheckers('zsh', ['zsh'])[0].getLocListRaw()
+    else
+        return []
+    endif
+
+endfunction
+
+function! s:IsShellValid()
+    return len(s:GetShell()) > 0 && executable(s:GetShell())
+endfunction
+
+
+function! SyntaxCheckers_sh_sh_IsAvailable() dict
+    return s:IsShellValid()
+endfunction
+
+function! SyntaxCheckers_sh_sh_GetLocList() dict
+    if s:GetShell() ==# 'zsh'
+        return s:ForwardToZshChecker()
+    endif
+
+    if !s:IsShellValid()
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': s:GetShell(),
+        \ 'args_after': '-n' })
+
+    let errorformat = '%f: line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'sh' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
new file mode 100644
index 00000000..de69683c
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
@@ -0,0 +1,44 @@
+"============================================================================
+"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
+    let makeprg = self.makeprgBuild({ '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
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'shellcheck' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
new file mode 100644
index 00000000..1c3d2b17
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"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! s:SlimrbVersion()
+    if !exists('s:slimrb_version')
+        let s:slimrb_version = syntastic#util#getVersion('slimrb --version 2>' . syntastic#util#DevNull())
+    endif
+    return s:slimrb_version
+endfunction
+
+function! SyntaxCheckers_slim_slimrb_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
+
+    if syntastic#util#versionIsAtLeast(s:SlimrbVersion(), [1,3,1])
+        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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
new file mode 100644
index 00000000..0797690e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
new file mode 100644
index 00000000..b55eaee8
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" For details about ChkTeX see:
+"
+" http://baruch.ev-en.org/proj/chktex/
+"
+" Checker options:
+"
+" - g:syntastic_tex_chktex_showmsgs (boolean; default: 1)
+"   whether to show informational messages (chktex option "-m");
+"   by default informational messages are shown as warnings
+"
+" - g:syntastic_tex_chktex_args (string; default: empty)
+"   command line options to pass to chktex
+
+if exists('g:loaded_syntastic_tex_chktex_checker')
+    finish
+endif
+let g:loaded_syntastic_tex_chktex_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists('g:syntastic_tex_chktex_showmsgs')
+    let g:syntastic_tex_chktex_showmsgs = 1
+endif
+
+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',
+        \ 'postprocess': ['sort'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'tex',
+    \ 'name': 'chktex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim b/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
new file mode 100644
index 00000000..0896919c
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
new file mode 100644
index 00000000..ccd3b2f2
--- /dev/null
+++ b/sources_non_forked/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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
new file mode 100644
index 00000000..5a8ea0c7
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"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
+
+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' . 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim b/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
new file mode 100644
index 00000000..20111468
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim b/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
new file mode 100644
index 00000000..36e264bf
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
new file mode 100644
index 00000000..7f594e09
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        typescript.vim
+"Description: TypeScript syntax checker
+"Maintainer:  Bill Casarin <bill@casarin.ca>
+"============================================================================
+
+if exists("g:loaded_syntastic_typescript_tsc_checker")
+    finish
+endif
+let g:loaded_syntastic_typescript_tsc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_typescript_tsc_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '--module commonjs',
+        \ 'args_after': '--out ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%E%f %#(%l\,%c): error %m,' .
+        \ '%E%f %#(%l\,%c): %m,' .
+        \ '%Eerror %m,' .
+        \ '%C%\s%\+%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr("")},
+        \ 'postprocess': ['sort'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'tsc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
new file mode 100644
index 00000000..e6c1b88d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
@@ -0,0 +1,97 @@
+"============================================================================
+"File:        vala.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Konstantin Stepanov (me@kstep.me)
+"Notes:       Add special comment line into your vala file starting with
+"             "// modules: " and containing space delimited list of vala
+"             modules, used by the file, so this script can build correct
+"             --pkg arguments.
+"             Add another special comment line into your vala file starting
+"             with "// vapidirs: " followed by a space delimited list of
+"             the vapi directories so this script can build with the correct
+"             --vapidir arguments
+"             Alternatively you can set the g:syntastic_vala_modules array
+"             and/or the g:syntastic_vala_vapidirs array
+"             in your .vimrc or .lvimrc with localvimrc plugin
+"             (http://www.vim.org/scripts/script.php?script_id=441).
+"             Valac compiler is not the fastest thing in the world, so you
+"             may want to disable this plugin with
+"             let g:syntastic_vala_check_disabled = 1 command in your .vimrc or
+"             command line. Unlet this variable to set it to 0 to reenable
+"             this checker.
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To 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)
+    let length = strlen(matchstr(a:pos['text'], '\m\^\+$'))
+    return '\%>' . (a:pos['col'] - 1) . 'c.*\%<' . (a:pos['col'] + length + 1) . 'c'
+endfunction
+
+function! s:GetValaModules()
+    if exists('g:syntastic_vala_modules')
+        if type(g:syntastic_vala_modules) == type('')
+            return split(g:syntastic_vala_modules, '\s\+')
+        elseif type(g:syntastic_vala_modules) == type([])
+            return copy(g:syntastic_vala_modules)
+        else
+            echoerr 'g:syntastic_vala_modules must be either list or string: fallback to in file modules string'
+        endif
+    endif
+
+    let modules_line = search('^// modules: ', 'n')
+    let modules_str = getline(modules_line)
+    return split(strpart(modules_str, 12), '\s\+')
+endfunction
+
+function! s:GetValaVapiDirs()
+    if exists('g:syntastic_vala_vapi_dirs')
+        if type(g:syntastic_vala_vapi_dirs) == type('')
+            return split(g:syntastic_vala_vapi_dirs, '\s\+')
+        elseif type(g:syntastic_vala_vapi_dirs) == type([])
+            return copy(g:syntastic_vala_vapi_dirs)
+        else
+            echoerr 'g:syntastic_vala_vapi_dirs must be either list or string: fallback to in file modules string'
+        endif
+    endif
+
+    let vapi_line = search('^//\s*vapidirs:\s*','n')
+    let vapi_str = getline(vapi_line)
+    return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
+endfunction
+
+function! SyntaxCheckers_vala_valac_GetLocList() dict
+    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
+    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
+    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
+
+    let errorformat =
+        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
+        \ '%C%m,'.
+        \ '%Z%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vala',
+    \ 'name': 'valac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
new file mode 100644
index 00000000..396d72e5
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"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
+    return executable(expand(g:syntastic_verilog_compiler))
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
new file mode 100644
index 00000000..f101d37f
--- /dev/null
+++ b/sources_non_forked/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_after': '-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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
new file mode 100644
index 00000000..08abb515
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -0,0 +1,94 @@
+"============================================================================
+"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)
+    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 '\V' . (col ? '\%' . col . 'c' : '') . term
+    endif
+
+    return ''
+endfunction
+
+function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
+    let ret = 0
+    try
+        call vimlint#vimlint(syntastic#util#DevNull(), { 'output': [], 'quiet': 1 })
+        let ret = 1
+    catch /^Vim\%((\a\+)\)\=:E117/
+        " do nothing
+    endtry
+    return ret
+endfunction
+
+function! SyntaxCheckers_vim_vimlint_GetLocList() dict
+    " 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
+    return vimlint#vimlint(expand('%'), {
+        \ 'output': function('s:vimlintOutput'),
+        \ 'quiet':  1,
+        \ 'EVL102': 3,
+        \ 'EVL103': 3,
+        \ 'EVL104': 3,
+        \ 'EVL105': 3,
+        \ 'EVL106': 3,
+        \ 'EVL201': 3,
+        \ 'EVL204': 3,
+        \ 'EVL205': 3 })
+endfunction
+
+" @vimlint(EVL103, 1, a:filename)
+function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
+    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': 1 })
+endfunction
+" @vimlint(EVL103, 0, a:filename)
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vim',
+    \ 'name': 'vimlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
new file mode 100644
index 00000000..3312ccef
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/html/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xhtml',
+    \ 'name': 'jshint',
+    \ 'redirect': 'html/jshint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
new file mode 100644
index 00000000..6fa14b32
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -0,0 +1,89 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" Checker option:
+"
+" - g:syntastic_xhtml_tidy_ignore_errors (list; default: [])
+"   list of errors to ignore
+
+if exists("g:loaded_syntastic_xhtml_tidy_checker")
+    finish
+endif
+let g:loaded_syntastic_xhtml_tidy_checker = 1
+
+if !exists('g:syntastic_xhtml_tidy_ignore_errors')
+    let g:syntastic_xhtml_tidy_ignore_errors = []
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" 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
+
+function! s:IgnoreError(text)
+    for i in g:syntastic_xhtml_tidy_ignore_errors
+        if stridx(a:text, i) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction
+
+function! SyntaxCheckers_xhtml_tidy_GetLocList() dict
+    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
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xhtml',
+    \ 'name': 'tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
new file mode 100644
index 00000000..3076cabb
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"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_after': '--xinclude --noout --postvalid' })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
new file mode 100644
index 00000000..e224c256
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/xml/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xslt',
+    \ 'name': 'xmllint',
+    \ 'redirect': 'xml/xmllint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim b/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
new file mode 100644
index 00000000..8444879e
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
new file mode 100644
index 00000000..a0c6dba0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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.
+"
+"
+"Installation: $ npm install -g js-yaml
+"
+"============================================================================
+
+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(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [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:,' .
+        \ '%-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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
new file mode 100644
index 00000000..b071ef47
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"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.
+"Installation: cpanm YAML::XS
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_yaml_yamlxs_checker")
+    finish
+endif
+let g:loaded_syntastic_yaml_yamlxs_checker = 1
+
+if !exists('g:syntastic_perl_interpreter')
+    let g:syntastic_perl_interpreter = 'perl'
+endif
+
+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
+    " don't call executable() here, to allow things like
+    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
+    silent! call system(s:Exe() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe': s:Exe(),
+        \ 'args_before': s:Modules() . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
+
+    let errorformat =
+        \ '%EYAML::XS::Load Error: The problem:,' .
+        \ '%-C,' .
+        \ '%C    %m,' .
+        \ '%Cwas found at document: %\d%\+\, line: %l\, column: %c,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'defaults': {'bufnr': bufnr("")} })
+endfunction
+
+function! s:Exe()
+    return expand(g:syntastic_perl_interpreter)
+endfunction
+
+function s:Modules()
+    if type(g:syntastic_perl_lib_path) == type('')
+        call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
+        let includes = split(g:syntastic_perl_lib_path, ',')
+    else
+        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+    endif
+    return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yaml',
+    \ 'name': 'yamlxs' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
new file mode 100644
index 00000000..bbf3e48d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        z80.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.
+"
+"============================================================================
+"
+" To obtain this application there are two solutions:
+" - Install this python package:
+"   https://github.com/rgiot/pycpcdemotools
+" - Copy/paste this script in your search path:
+"   https://raw.github.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
+
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
new file mode 100644
index 00000000..6769b55b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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.
+"
+"============================================================================
+"
+" In order for this plugin to be useful, you will need to set up the
+" zpt filetype in your vimrc
+"
+"    " set up zope page templates as the zpt filetype
+"    au BufNewFile,BufRead *.pt,*.cpt,*.zpt set filetype=zpt syntax=xml
+"
+" Then install the zptlint program, found on pypi:
+" http://pypi.python.org/pypi/zptlint
+
+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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
new file mode 100644
index 00000000..42f6fcf1
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"File:        shellcheck.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_zsh_shellcheck_checker")
+    finish
+endif
+let g:loaded_syntastic_zsh_shellcheck_checker = 1
+
+runtime! syntax_checkers/sh/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'zsh',
+    \ 'name': 'shellcheck',
+    \ 'redirect': 'sh/shellcheck'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
new file mode 100644
index 00000000..48057631
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index da03e661..64733ebc 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -14,32 +14,33 @@ Contents
     snippets/*: snippets using snipmate format
     UltiSnips/*: snippets using UltiSnips format
 
-Snippet engines
-===============
+Snippet engines supporting vim-snippets
+========================================
 
 There are different forks of snippet engines which allow the user to insert
-sippets by typing the name of a snippet hitting the expansion mapping.
+snippets by typing the name of a snippet hitting the expansion mapping.
 
-    garbas/vim-snipmate [4]:
+    github.com/garbas/vim-snipmate:
       VimL, snipmate-snippets, engine sometimes behaves strange, supports
       rewriting snippets on the fly (eg adding a second version with folding
       markers)
 
-    MarcWeber/UltiSnips [6]:
+    github.com/MarcWeber/UltiSnips:
       python, snipmate-snippets and UltiSnips-snippets
 
-    SirVer/ultisnips [7]:
+    github.com/SirVer/ultisnips:
       python, UltiSnips-snippets
 
-    github.com/Shougo/neosnippet [5]:
+    github.com/Shougo/neosnippet:
       viml, has a compatible mode allowing to reuse most snipmate snippets ?
 
-    XPTemplate:
-      totally different syntax, does not read snippets contained in this file,
-      but it is also very powerful
+    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 completness)
 
-    ... there are some more, but they have less features which is why I don't
-    mention them here
+    This tries to be a more comprehensive list (which still is incomplete)
+    http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
 
 UltiSnips engine has additional features such as "nested snippets".
 
@@ -77,6 +78,11 @@ About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim
 I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vmirc:
 (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 mailinglist.
+
 Policies / for contributors
 ===========================
 Some snippets are useful for almost all languages, so let's try to have the same
@@ -237,6 +243,5 @@ terms of the MIT license.
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
-[5]: http://github.com/Shougo/neosnippet
 [6]: http://github.com/MarcWeber/UltiSnips
 [7]: http://github.com/SirVer/ultisnips
diff --git a/update_plugins.py b/update_plugins.py
index ad474860..8314a355 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -35,12 +35,12 @@ vim-fugitive https://github.com/tpope/vim-fugitive
 vim-airline https://github.com/bling/vim-airline
 goyo.vim https://github.com/junegunn/goyo.vim
 vim-zenroom2 https://github.com/amix/vim-zenroom2
-pyflakes-pathogen https://github.com/mitechie/pyflakes-pathogen
+syntastic https://github.com/scrooloose/syntastic
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
 
-SOURCE_DIR = path.join( path.dirname(__file__), 'sources_non_forked' )
+SOURCE_DIR = path.join(path.dirname(__file__), 'sources_non_forked')
 
 
 def download_extract_replace(plugin_name, zip_path, temp_dir, source_dir):
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 92db3f18..1d0b34a0 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -113,3 +113,9 @@ let g:goyo_width=100
 let g:goyo_margin_top = 2
 let g:goyo_margin_bottom = 2
 nnoremap <silent> <leader>z :Goyo<cr>
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Syntastic (syntax checker)
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:syntastic_python_checkers=['pyflakes']

From 31b9fa01a558e0aa473c12be6daaaca8a05d6a5b Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 8 Feb 2014 10:14:01 +0000
Subject: [PATCH 30/61] Updated pathogen

---
 autoload/pathogen.vim | 173 +++++++++++++++++++++++++++++++-----------
 1 file changed, 127 insertions(+), 46 deletions(-)
 mode change 100644 => 100755 autoload/pathogen.vim

diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
old mode 100644
new mode 100755
index 3accbe6d..7b89ccaf
--- a/autoload/pathogen.vim
+++ b/autoload/pathogen.vim
@@ -1,12 +1,12 @@
 " pathogen.vim - path option manipulation
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.0
+" Version:      2.2
 
 " Install in ~/.vim/autoload (or ~\vimfiles\autoload).
 "
 " For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
-" prior to `filetype plugin indent on` is the only other setup necessary.
+" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
 "
 " The API is documented inline below.  For maximum ease of reading,
 " :set foldmethod=marker
@@ -16,18 +16,33 @@ if exists("g:loaded_pathogen") || &cp
 endif
 let g:loaded_pathogen = 1
 
-" Point of entry for basic default usage.  Give a directory name to invoke
-" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
-" to invoke pathogen#runtime_prepend_subdirectories().  Afterwards,
-" pathogen#cycle_filetype() is invoked.
+function! s:warn(msg)
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  For backwards compatibility purposes, a full path that
+" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
+" instead.
 function! pathogen#infect(...) abort " {{{1
-  let source_path = a:0 ? a:1 : 'bundle'
-  if source_path =~# '[\\/]'
-    call pathogen#runtime_prepend_subdirectories(source_path)
-  else
-    call pathogen#runtime_append_all_bundles(source_path)
-  endif
+  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
+    if path =~# '^[^\\/]\+$'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#incubate(path . '/{}')
+    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
+      call pathogen#incubate(path)
+    elseif path =~# '[\\/]\%({}\|\*\)$'
+      call pathogen#surround(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    endif
+  endfor
   call pathogen#cycle_filetype()
+  return ''
 endfunction " }}}1
 
 " Split a path into a list.
@@ -111,8 +126,9 @@ function! pathogen#cycle_filetype() " {{{1
   endif
 endfunction " }}}1
 
-" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
-" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
+" Check if a bundle is disabled.  A bundle is considered disabled if it ends
+" in a tilde or its basename or full name is included in the list
+" g:pathogen_disabled.
 function! pathogen#is_disabled(path) " {{{1
   if a:path =~# '\~$'
     return 1
@@ -120,29 +136,48 @@ function! pathogen#is_disabled(path) " {{{1
     return 0
   endif
   let sep = pathogen#separator()
-  return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
+  let blacklist = g:pathogen_disabled
+  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
 endfunction "}}}1
 
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  let sep    = pathogen#separator()
-  let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
-  let after  = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  If the directory is already included, move it to the
+" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
+" all subdirectories to be added (except those in g:pathogen_disabled).
+function! pathogen#surround(path) abort " {{{1
+  let sep = pathogen#separator()
   let rtp = pathogen#split(&rtp)
-  let path = expand(a:path)
-  call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
+  if a:path =~# '[\\/]{}$'
+    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
+    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
+    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
+    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
+  else
+    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
+    let before = [path]
+    let after = [path . sep . 'after']
+    call filter(rtp, 'index(before + after, v:val) == -1')
+  endif
+  let &rtp = pathogen#join(before, rtp, after)
   return &rtp
 endfunction " }}}1
 
-" For each directory in rtp, check for a subdirectory named dir.  If it
-" exists, add all subdirectories of that subdirectory to the rtp, immediately
-" after the original directory.  If no argument is given, 'bundle' is used.
-" Repeated calls with the same arguments are ignored.
-function! pathogen#runtime_append_all_bundles(...) " {{{1
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) " {{{1
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#separator() . '{}')
+endfunction " }}}1
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  If the argument ends in '/{}', add a separate entry for
+" each subdirectory.  The default argument is 'bundle/{}', which means that
+" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
+" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
+" UNIX).
+function! pathogen#incubate(...) abort " {{{1
   let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle'
+  let name = a:0 ? a:1 : 'bundle/{}'
   if "\n".s:done_bundles =~# "\\M\n".name."\n"
     return ""
   endif
@@ -150,38 +185,71 @@ function! pathogen#runtime_append_all_bundles(...) " {{{1
   let list = []
   for dir in pathogen#split(&rtp)
     if dir =~# '\<after$'
-      let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
+      if name =~# '{}$'
+        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
+      else
+        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
+      endif
     else
-      let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
+      if name =~# '{}$'
+        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
+      else
+        let list += [dir . sep . name, dir]
+      endif
     endif
   endfor
   let &rtp = pathogen#join(pathogen#uniq(list))
   return 1
+endfunction " }}}1
+
+" Deprecated alias for pathogen#incubate().
+function! pathogen#runtime_append_all_bundles(...) abort " {{{1
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
+  endif
+  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
 endfunction
 
 let s:done_bundles = ''
 " }}}1
 
 " Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() " {{{1
+function! pathogen#helptags() abort " {{{1
   let sep = pathogen#separator()
-  for dir in pathogen#split(&rtp)
-    if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-      helptags `=dir.'/doc'`
-    endif
+  for glob in pathogen#split(&rtp)
+    for dir in split(glob(glob), "\n")
+      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
+        silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
+      endif
+    endfor
   endfor
 endfunction " }}}1
 
 command! -bar Helptags :call pathogen#helptags()
 
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort " {{{1
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction " }}}1
+
 " Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) "{{{1
+function! pathogen#runtime_findfile(file,count) abort "{{{1
   let rtp = pathogen#join(1,pathogen#split(&rtp))
-  return fnamemodify(findfile(a:file,rtp,a:count),':p')
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
 endfunction " }}}1
 
 " Backport of fnameescape().
-function! pathogen#fnameescape(string) " {{{1
+function! pathogen#fnameescape(string) abort " {{{1
   if exists('*fnameescape')
     return fnameescape(a:string)
   elseif a:string ==# '-'
@@ -191,17 +259,30 @@ function! pathogen#fnameescape(string) " {{{1
   endif
 endfunction " }}}1
 
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
 function! s:find(count,cmd,file,lcd) " {{{1
   let rtp = pathogen#join(1,pathogen#split(&runtimepath))
   let file = pathogen#runtime_findfile(a:file,a:count)
   if file ==# ''
     return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  elseif a:lcd
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
     let path = file[0:-strlen(a:file)-2]
     execute 'lcd `=path`'
-    return a:cmd.' '.pathogen#fnameescape(a:file)
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
   else
-    return a:cmd.' '.pathogen#fnameescape(file)
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
   endif
 endfunction " }}}1
 
@@ -219,7 +300,7 @@ function! s:Findcomplete(A,L,P) " {{{1
   else
     let request = a:A
   endif
-  let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
   let found = {}
   for path in pathogen#split(&runtimepath)
     let path = expand(path, ':p')
@@ -242,4 +323,4 @@ command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabed
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
 
-" vim:set ft=vim ts=8 sw=2 sts=2:
+" vim:set et sw=2:

From 8c9210dca4561b617fd253cb560c501978cc49c5 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 16 Feb 2014 17:46:49 +0000
Subject: [PATCH 31/61] Updated plugins

---
 .../syntastic/autoload/syntastic/c.vim        |  3 +-
 .../syntastic/autoload/syntastic/log.vim      |  2 +-
 .../syntastic/autoload/syntastic/util.vim     | 15 +++--
 .../syntastic/doc/syntastic.txt               | 14 ++++-
 .../syntastic/plugin/syntastic.vim            | 39 ++++++++-----
 .../syntastic/plugin/syntastic/balloons.vim   |  4 +-
 .../syntastic/plugin/syntastic/checker.vim    | 18 +++---
 .../syntastic/plugin/syntastic/cursor.vim     |  2 +-
 .../plugin/syntastic/highlighting.vim         |  4 +-
 .../syntastic/plugin/syntastic/signs.vim      |  4 +-
 .../syntastic/syntax_checkers/c/cppcheck.vim  |  5 ++
 .../syntastic/syntax_checkers/c/gcc.vim       |  7 +--
 .../syntax_checkers/cpp/cppcheck.vim          | 43 +-------------
 .../syntastic/syntax_checkers/cpp/gcc.vim     | 10 ++--
 .../syntax_checkers/erlang/syntaxerl.vim      | 40 +++++++++++++
 .../syntastic/syntax_checkers/eruby/ruby.vim  | 11 ++--
 .../syntastic/syntax_checkers/go/go.vim       |  8 +++
 .../syntastic/syntax_checkers/haml/haml.vim   |  9 ++-
 .../syntastic/syntax_checkers/java/javac.vim  |  4 +-
 .../syntax_checkers/javascript/jshint.vim     | 12 ++--
 .../syntastic/syntax_checkers/less/lessc.vim  | 12 ++--
 .../syntastic/syntax_checkers/objc/gcc.vim    |  7 +--
 .../syntastic/syntax_checkers/objcpp/gcc.vim  |  7 +--
 .../syntastic/syntax_checkers/perl/perl.vim   |  4 +-
 .../syntastic/syntax_checkers/php/phpmd.vim   |  4 +-
 .../syntax_checkers/puppet/puppetlint.vim     |  6 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    | 10 ++--
 .../syntax_checkers/scss/scss_lint.vim        | 10 +++-
 .../syntastic/syntax_checkers/slim/slimrb.vim | 14 ++---
 .../syntastic/syntax_checkers/vim/vimlint.vim |  2 +-
 .../syntastic/syntax_checkers/yaml/yamlxs.vim | 12 ++--
 .../autoload/airline/themes/hybrid.vim        | 58 +++++++++++++++++++
 32 files changed, 251 insertions(+), 149 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim

diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 1c6bc522..82f4c704 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -67,7 +67,8 @@ function! syntastic#c#GetLocList(filetype, subchecker, options)
         return []
     endtry
 
-    let makeprg = expand(g:syntastic_{a:filetype}_compiler) . ' ' . flags . ' ' . syntastic#util#shexpand('%')
+    let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
+        \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
 
     let errorformat = s:GetCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
 
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index a4f7241a..78e8b8eb 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -96,7 +96,7 @@ function! syntastic#log#debugShowOptions(level, names)
 
     let vlist = type(a:names) == type("") ? [a:names] : a:names
     if !empty(vlist)
-        call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
+        call map(copy(vlist), "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
         echomsg leader . join(vlist, ', ')
     endif
     call s:logRedirect(0)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index c4daf5c5..dabd7a43 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -52,6 +52,13 @@ function! syntastic#util#parseShebang()
     return { 'exe': '', 'args': [] }
 endfunction
 
+" Get the value of a variable.  Allow local variables to override global ones.
+function! syntastic#util#var(name)
+    return
+        \ exists('b:syntastic_' . a:name) ? b:syntastic_{a:name} :
+        \ exists('g:syntastic_' . a:name) ? g:syntastic_{a:name} : ''
+endfunction
+
 " Parse a version string.  Return an array of version components.
 function! syntastic#util#parseVersion(version)
     return split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.')
@@ -214,11 +221,11 @@ endfunction
 
 function! s:translateFilter(filters)
     let conditions = []
-    for [k, v] in items(a:filters)
-        if type(v) == type([])
-            call extend(conditions, map(copy(v), 's:translateElement(k, v:val)'))
+    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, v))
+            call add(conditions, s:translateElement(k, a:filters[k]))
         endif
     endfor
     return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index ac806605..4d04bee5 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -498,6 +498,16 @@ 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'*
+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*
@@ -557,7 +567,9 @@ The result is a 'makeprg' of the form: >
                                      *'syntastic_<filetype>_<subchecker>_exe'*
 All arguments 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().
+parameters not specified in the call to makeprgBuild(). These variables also
+have local versions 'b:syntastic_<filetype>_<checker-name>_<option-name>',
+which take precedence over the global ones in the corresponding buffers.
 
 The 'exe' is normally the same as the 'exec' attribute described above, in
 which case it may be omitted. However, you can use it to add environment
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index de27f57a..877d8d8d 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -105,6 +105,20 @@ if exists("g:syntastic_quiet_warnings")
     endif
 endif
 
+let s:debug_dump_options = [
+        \ 'shell',
+        \ 'shellcmdflag',
+        \ 'shellpipe',
+        \ 'shellquote',
+        \ 'shellredir',
+        \ 'shellslash',
+        \ 'shelltemp',
+        \ 'shellxquote'
+    \ ]
+if v:version > 703 || (v:version == 703 && has('patch446'))
+    call add(s:debug_dump_options, 'shellxescape')
+endif
+
 
 " debug constants
 let g:SyntasticDebugTrace         = 1
@@ -283,24 +297,21 @@ function! s:CacheErrors(checkers)
         let active_checkers = 0
         let names = []
 
-        call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, [
-            \ 'shell', 'shellcmdflag', 'shellquote', 'shellxquote', 'shellredir',
-            \ 'shellslash', 'shellpipe', 'shelltemp', 'shellxescape', 'shellxquote' ])
+        call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
         call syntastic#log#debugDump(g:SyntasticDebugVariables)
         call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'syntastic_aggregate_errors')
+        call syntastic#log#debug(g:SyntasticDebugTrace, 'getcwd() = ' . getcwd())
 
         let filetypes = s:ResolveFiletypes()
-        let aggregate_errors =
-            \ exists('b:syntastic_aggregate_errors') ? b:syntastic_aggregate_errors : g:syntastic_aggregate_errors
-        let decorate_errors = (aggregate_errors || len(filetypes) > 1) &&
-            \ (exists('b:syntastic_id_checkers') ? b:syntastic_id_checkers : g:syntastic_id_checkers)
+        let aggregate_errors = syntastic#util#var('aggregate_errors')
+        let decorate_errors = (aggregate_errors || len(filetypes) > 1) && syntastic#util#var('id_checkers')
 
         for ft in filetypes
             let clist = empty(a:checkers) ? s:registry.getActiveCheckers(ft) : s:registry.getCheckers(ft, a:checkers)
 
             for checker in clist
                 let active_checkers += 1
-                call syntastic#log#debug(g:SyntasticDebugTrace, "CacheErrors: Invoking checker: " . checker.getName())
+                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . checker.getName())
 
                 let loclist = checker.getLocList()
 
@@ -342,11 +353,11 @@ function! s:CacheErrors(checkers)
             endif
         endif
 
-        call syntastic#log#debug(g:SyntasticDebugLoclist, "aggregated:", newLoclist)
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'aggregated:', newLoclist)
 
         if type(g:syntastic_quiet_messages) == type({}) && !empty(g:syntastic_quiet_messages)
             call newLoclist.quietMessages(g:syntastic_quiet_messages)
-            call syntastic#log#debug(g:SyntasticDebugLoclist, "filtered by g:syntastic_quiet_messages:", newLoclist)
+            call syntastic#log#debug(g:SyntasticDebugLoclist, 'filtered by g:syntastic_quiet_messages:', newLoclist)
         endif
     endif
 
@@ -456,11 +467,11 @@ function! SyntasticMake(options)
     let $LC_ALL = old_lc_all
     let $LC_MESSAGES = old_lc_messages
 
-    call syntastic#log#debug(g:SyntasticDebugLoclist, "checker output:", err_lines)
+    call syntastic#log#debug(g:SyntasticDebugLoclist, 'checker output:', err_lines)
 
     if has_key(a:options, 'preprocess')
         let err_lines = call(a:options['preprocess'], [err_lines])
-        call syntastic#log#debug(g:SyntasticDebugLoclist, "preprocess:", err_lines)
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'preprocess:', err_lines)
     endif
     lgetexpr err_lines
 
@@ -480,7 +491,7 @@ function! SyntasticMake(options)
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
-    call syntastic#log#debug(g:SyntasticDebugLoclist, "raw loclist:", errors)
+    call syntastic#log#debug(g:SyntasticDebugLoclist, 'raw loclist:', errors)
 
     if has_key(a:options, 'returns') && index(a:options['returns'], v:shell_error) == -1
         throw 'Syntastic: checker error'
@@ -499,7 +510,7 @@ function! SyntasticMake(options)
         for rule in a:options['postprocess']
             let errors = call('syntastic#postprocess#' . rule, [errors])
         endfor
-        call syntastic#log#debug(g:SyntasticDebugLoclist, "postprocess:", errors)
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'postprocess:', errors)
     endif
 
     return errors
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index c2630342..184a0528 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -21,9 +21,7 @@ function! g:SyntasticBalloonsNotifier.New()
 endfunction
 
 function! g:SyntasticBalloonsNotifier.enabled()
-    return
-        \ has('balloon_eval') &&
-        \ (exists('b:syntastic_enable_balloons') ? b:syntastic_enable_balloons : g:syntastic_enable_balloons)
+    return has('balloon_eval') && syntastic#util#var('enable_balloons')
 endfunction
 
 " Update the error balloons
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 37ae8228..94cbdb03 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -76,14 +76,14 @@ function! g:SyntasticChecker.getLocList()
 endfunction
 
 function! g:SyntasticChecker.makeprgBuild(opts)
-    let setting = 'g:syntastic_' . self._filetype . '_' . self._name . '_'
+    let basename = self._filetype . '_' . self._name . '_'
 
     let parts = []
-    call extend(parts, self._getOpt(a:opts, setting, 'exe', self.getExecEscaped()))
-    call extend(parts, self._getOpt(a:opts, setting, 'args', ''))
-    call extend(parts, self._getOpt(a:opts, setting, 'fname', syntastic#util#shexpand('%')))
-    call extend(parts, self._getOpt(a:opts, setting, 'post_args', ''))
-    call extend(parts, self._getOpt(a:opts, setting, 'tail', ''))
+    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
@@ -115,11 +115,11 @@ function! g:SyntasticChecker._populateHighlightRegexes(errors)
     endif
 endfunction
 
-function! g:SyntasticChecker._getOpt(opts, setting, name, default)
-    let sname = a:setting . a:name
+function! g:SyntasticChecker._getOpt(opts, basename, name, default)
+    let user_val = syntastic#util#var(a:basename . a:name)
     let ret = []
     call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
-    call extend( ret, self._shescape(exists(sname) ? {sname} : get(a:opts, a:name, a:default)) )
+    call extend( ret, self._shescape(user_val != '' ? user_val : get(a:opts, a:name, a:default)) )
     call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
 
     return ret
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index ad2b2c12..5e24ae14 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -17,7 +17,7 @@ function! g:SyntasticCursorNotifier.New()
 endfunction
 
 function! g:SyntasticCursorNotifier.enabled()
-    return exists('b:syntastic_echo_current_error') ? b:syntastic_echo_current_error : g:syntastic_echo_current_error
+    return syntastic#util#var('echo_current_error')
 endfunction
 
 function! g:SyntasticCursorNotifier.refresh(loclist)
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index 75c0c9f2..80d31f19 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -28,9 +28,7 @@ function! g:SyntasticHighlightingNotifier.New()
 endfunction
 
 function! g:SyntasticHighlightingNotifier.enabled()
-    return
-        \ s:has_highlighting &&
-        \ (exists('b:syntastic_enable_highlighting') ? b:syntastic_enable_highlighting : g:syntastic_enable_highlighting)
+    return s:has_highlighting && syntastic#util#var('enable_highlighting')
 endfunction
 
 " Sets error highlights in the cuirrent window
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 8f0e0430..3b1e7522 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -48,9 +48,7 @@ function! g:SyntasticSignsNotifier.New()
 endfunction
 
 function! g:SyntasticSignsNotifier.enabled()
-    return
-        \ has('signs') &&
-        \ exists('b:syntastic_enable_signs') ? b:syntastic_enable_signs : g:syntastic_enable_signs
+    return has('signs') && syntastic#util#var('enable_signs')
 endfunction
 
 function! g:SyntasticSignsNotifier.refresh(loclist)
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
index ce187553..a028e451 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
@@ -28,6 +28,10 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_c_cppcheck_Preprocess(errors)
+    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
+endfunction
+
 function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
@@ -46,6 +50,7 @@ function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'preprocess': 'SyntaxCheckers_c_cppcheck_Preprocess',
         \ 'returns': [0] })
 
     for e in loclist
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
index 9a8848f4..4fd19847 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_c_gcc_checker')
 endif
 let g:loaded_syntastic_c_gcc_checker = 1
 
-if !exists('g:syntastic_c_compiler')
-    let g:syntastic_c_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_c_compiler_options')
     let g:syntastic_c_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ 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
     return executable(expand(g:syntastic_c_compiler))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
index 4dbc2d4d..b4b9d344 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -21,48 +21,11 @@ if exists("g:loaded_syntastic_cpp_cppcheck_checker")
 endif
 let g:loaded_syntastic_cpp_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_cpp_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,
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['type'] =~? '\m^[SPI]'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
+runtime! syntax_checkers/c/*.vim
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
-    \ 'name': 'cppcheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
+    \ 'name': 'cppcheck',
+    \ 'redirect': 'c/cppcheck'})
 
 " vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
index ef810517..c8d77996 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_cpp_gcc_checker')
 endif
 let g:loaded_syntastic_cpp_gcc_checker = 1
 
-if !exists('g:syntastic_cpp_compiler')
-    let g:syntastic_cpp_compiler = executable('g++') ? 'g++' : 'clang++'
-endif
-
 if !exists('g:syntastic_cpp_compiler_options')
     let g:syntastic_cpp_compiler_options = ''
 endif
@@ -27,6 +23,9 @@ 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
     return executable(expand(g:syntastic_cpp_compiler))
 endfunction
 
@@ -47,7 +46,8 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
-    \ 'name': 'gcc' })
+    \ 'name': 'gcc',
+    \ 'exec': 'g++' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
new file mode 100644
index 00000000..903793c3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"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
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 94ba42e6..34dc9bdc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -15,19 +15,18 @@ if exists("g:loaded_syntastic_eruby_ruby_checker")
 endif
 let g:loaded_syntastic_eruby_ruby_checker = 1
 
-if !exists("g:syntastic_ruby_exec")
-    let g:syntastic_ruby_exec = "ruby"
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
+    if !exists("g:syntastic_ruby_exec")
+        let g:syntastic_ruby_exec = self.getExec()
+    endif
     return executable(expand(g:syntastic_ruby_exec))
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    let exe = expand(g:syntastic_ruby_exec)
+    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
     if !syntastic#util#isRunningWindows()
         let exe = 'RUBYOPT= ' . exe
     endif
@@ -35,7 +34,7 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
     let fname = "'" . escape(expand('%'), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
-    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion('ruby --version'), [1, 9])
+    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 9])
         let enc = &fileencoding != '' ? &fileencoding : &encoding
         let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
     else
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
index ac28bcdd..868d7140 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/go.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
@@ -50,11 +50,15 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     " compiled by `go build`, therefore `go test` must be called for those.
     if match(expand('%'), '\m_test\.go$') == -1
         let makeprg = 'go build ' . syntastic#c#NullOutput()
+        let cleanup = 0
     else
         let makeprg = 'go test -c ' . syntastic#c#NullOutput()
+        let cleanup = 1
     endif
 
+    " 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,' .
@@ -70,6 +74,10 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ 'cwd': expand('%:p:h'),
         \ 'defaults': {'type': 'e'} })
 
+    if cleanup
+        call delete(expand('%:p:h') . syntastic#util#Slash() . expand('%:p:h:t') . '.test')
+    endif
+
     return errors
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
index fa7086f9..b01143e9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
@@ -15,20 +15,19 @@ if exists('g:loaded_syntastic_haml_haml_checker')
 endif
 let g:loaded_syntastic_haml_haml_checker = 1
 
-if !exists('g:syntastic_haml_interpreter')
-    let g:syntastic_haml_interpreter = 'haml'
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haml_haml_IsAvailable() dict
+    if !exists('g:syntastic_haml_interpreter')
+        let g:syntastic_haml_interpreter = self.getExec()
+    endif
     return executable(expand(g:syntastic_haml_interpreter))
 endfunction
 
 function! SyntaxCheckers_haml_haml_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe': expand(g:syntastic_haml_interpreter),
+        \ 'exe': syntastic#util#shexpand(g:syntastic_haml_interpreter),
         \ 'args_after': '-c' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 48a42f8b..7bdd0ebd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -226,7 +226,7 @@ function! s:GetMavenProperties()
     let pom = findfile("pom.xml", ".;")
     if s:has_maven && filereadable(pom)
         if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
-            let mvn_cmd = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . pom
             let mvn_is_managed_tag = 1
             let mvn_settings_output = split(system(mvn_cmd . ' help:effective-pom'), "\n")
             let current_path = 'project'
@@ -265,7 +265,7 @@ function! s:GetMavenClasspath()
     let pom = findfile("pom.xml", ".;")
     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 = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . pom
             let mvn_classpath_output = split(system(mvn_cmd . ' dependency:build-classpath'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index e57329e5..e1c84f14 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -14,10 +14,6 @@ if exists('g:loaded_syntastic_javascript_jshint_checker')
 endif
 let g:loaded_syntastic_javascript_jshint_checker = 1
 
-if !exists('g:syntastic_jshint_exec')
-    let g:syntastic_jshint_exec = 'jshint'
-endif
-
 if !exists('g:syntastic_javascript_jshint_conf')
     let g:syntastic_javascript_jshint_conf = ''
 endif
@@ -26,17 +22,21 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
+    if !exists('g:syntastic_jshint_exec')
+        let g:syntastic_jshint_exec = self.getExec()
+    endif
     return executable(expand(g:syntastic_jshint_exec))
 endfunction
 
 function! SyntaxCheckers_javascript_jshint_GetLocList() dict
+    let exe = syntastic#util#shexpand(g:syntastic_jshint_exec)
     if !exists('s:jshint_new')
         let s:jshint_new =
-            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(expand(g:syntastic_jshint_exec) . ' --version'), [1, 1])
+            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 1])
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe': expand(g:syntastic_jshint_exec),
+        \ 'exe': exe,
         \ 'args': (g:syntastic_javascript_jshint_conf != '' ? '--config ' . g:syntastic_javascript_jshint_conf : ''),
         \ 'args_after': (s:jshint_new ? '--verbose ' : '') })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
index 853524eb..9b5efa96 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -33,17 +33,17 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-if g:syntastic_less_use_less_lint
-    let s:check_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
-else
-    let s:check_file = 'lessc'
-endif
+let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
 
 function! SyntaxCheckers_less_lessc_IsAvailable() dict
-    return g:syntastic_less_use_less_lint ? executable('node') : executable('lessc')
+    return g:syntastic_less_use_less_lint ? executable('node') : executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_less_lessc_GetLocList() dict
+    if !exists('s:check_file')
+        let s:check_file = g:syntastic_less_use_less_lint ? s:node_file : self.getExecEscaped()
+    endif
+
     let makeprg = self.makeprgBuild({
         \ 'exe': s:check_file,
         \ 'args': g:syntastic_less_options,
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
index d5241592..09c3daa2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_objc_gcc_checker')
 endif
 let g:loaded_syntastic_objc_gcc_checker = 1
 
-if !exists('g:syntastic_objc_compiler')
-    let g:syntastic_objc_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_objc_compiler_options')
     let g:syntastic_objc_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ 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
     return executable(expand(g:syntastic_objc_compiler))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
index 55ae5014..853d6657 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_objcpp_gcc_checker')
 endif
 let g:loaded_syntastic_objcpp_gcc_checker = 1
 
-if !exists('g:syntastic_objcpp_compiler')
-    let g:syntastic_objcpp_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_objcpp_compiler_options')
     let g:syntastic_objcpp_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ 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
     return executable(expand(g:syntastic_objcpp_compiler))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index 226c8361..eca6501c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -40,7 +40,7 @@ set cpo&vim
 function! SyntaxCheckers_perl_perl_IsAvailable() dict
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call system(expand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call system(syntastic#util#shexpand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
@@ -63,7 +63,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
         call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
-        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+        let includes = copy(syntastic#util#var('perl_lib_path'))
     endif
     let shebang = syntastic#util#parseShebang()
     let extra = join(map(includes, '"-I" . v:val')) .
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
index 02684177..6b6022ab 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
@@ -58,7 +58,9 @@ function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_php_phpmd_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'post_args_before': 'text codesize,design,unusedcode,naming' })
+    let makeprg = self.makeprgBuild({
+        \ 'post_args_before': 'text',
+        \ 'post_args': 'codesize,design,unusedcode,naming' })
 
     let errorformat = '%E%f:%l%\s%#%m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index 425a90f3..2a32a8fa 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -26,9 +26,9 @@ endif
 function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
     return
         \ executable("puppet") &&
-        \ executable("puppet-lint") &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion('puppet-lint --version 2>' .
-        \     syntastic#util#DevNull()), [0,1,10])
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+        \       self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull()), [0,1,10])
 endfunction
 
 function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index bdc74ea0..c0b0166d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -15,10 +15,6 @@ if exists("g:loaded_syntastic_ruby_mri_checker")
 endif
 let g:loaded_syntastic_ruby_mri_checker = 1
 
-if !exists("g:syntastic_ruby_exec")
-    let g:syntastic_ruby_exec = "ruby"
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -32,7 +28,11 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    let exe = expand(g:syntastic_ruby_exec)
+    if !exists('g:syntastic_ruby_exec')
+        let g:syntastic_ruby_exec = self.getExec()
+    endif
+
+    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
     if !syntastic#util#isRunningWindows()
         let exe = 'RUBYOPT= ' . exe
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index 5219c37b..2f971dce 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -17,13 +17,21 @@ let g:loaded_syntastic_scss_scss_lint_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
+    return
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+        \       self.getExecEscaped() . ' --version'), [0, 12])
+endfunction
+
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
     let makeprg = self.makeprgBuild({})
     let errorformat = '%f:%l [%t] %m'
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style'})
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1, 65] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 1c3d2b17..8cc2bfc0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -18,17 +18,15 @@ let g:loaded_syntastic_slim_slimrb_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! s:SlimrbVersion()
-    if !exists('s:slimrb_version')
-        let s:slimrb_version = syntastic#util#getVersion('slimrb --version 2>' . syntastic#util#DevNull())
-    endif
-    return s:slimrb_version
-endfunction
-
 function! SyntaxCheckers_slim_slimrb_GetLocList() dict
+    if !exists('s:slimrb_new')
+        let s:slimrb_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull()), [1, 3, 1])
+    endif
+
     let makeprg = self.makeprgBuild({ 'args_after': '-c' })
 
-    if syntastic#util#versionIsAtLeast(s:SlimrbVersion(), [1,3,1])
+    if s:slimrb_new
         let errorformat =
             \ '%C\ %#%f\, Line %l\, Column %c,'.
             \ '%-G\ %.%#,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 08abb515..552e1291 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -80,7 +80,7 @@ function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
         \ 'vcol': 0,
         \ 'type': a:ev[0],
         \ 'text': '[' . a:eid . '] ' . a:mes,
-        \ 'valid': 1 })
+        \ 'valid': a:pos.lnum > 0 })
 endfunction
 " @vimlint(EVL103, 0, a:filename)
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index b071ef47..20665335 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -16,10 +16,6 @@ if exists("g:loaded_syntastic_yaml_yamlxs_checker")
 endif
 let g:loaded_syntastic_yaml_yamlxs_checker = 1
 
-if !exists('g:syntastic_perl_interpreter')
-    let g:syntastic_perl_interpreter = 'perl'
-endif
-
 if !exists('g:syntastic_perl_lib_path')
     let g:syntastic_perl_lib_path = []
 endif
@@ -28,6 +24,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
+    if !exists('g:syntastic_perl_interpreter')
+        let g:syntastic_perl_interpreter = self.getExec()
+    endif
+
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
     silent! call system(s:Exe() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
@@ -54,7 +54,7 @@ function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
 endfunction
 
 function! s:Exe()
-    return expand(g:syntastic_perl_interpreter)
+    return syntastic#util#shexpand(g:syntastic_perl_interpreter)
 endfunction
 
 function s:Modules()
@@ -62,7 +62,7 @@ function s:Modules()
         call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
-        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+        let includes = copy(syntastic#util#var('perl_lib_path'))
     endif
     return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
 endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim b/sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim
new file mode 100644
index 00000000..b0df8441
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/hybrid.vim
@@ -0,0 +1,58 @@
+" 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 modified_group = airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.normal_modified = {
+                \ 'airline_c': airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+                \ }
+
+    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 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellLocal', 'bg'], 'bold')
+    let s:I3 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellCap', 'bg'], 'bold')
+    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'], ['Folded', 'bg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffDelete', 'bg'], 'bold')
+    let s:V3 = airline#themes#get_highlight2(['Text', 'fg'], ['Error', 'bg'], 'bold')
+    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 = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#hybrid#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#hybrid#refresh()

From e64e0f16181853cd5bff61c38a9cf092b3124286 Mon Sep 17 00:00:00 2001
From: Jeremy Carrier <carrieje@ensimag.fr>
Date: Thu, 27 Feb 2014 20:43:16 +0100
Subject: [PATCH 32/61] Fixed issue #48 regarding snippet expansion brake

The glob pattern of pathogen is {} and not *
The syntax introduced in commit f2d6402 broke the snippet expansion
It is now fixed
---
 vimrcs/plugins_config.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index ef13ff7e..73d96bc7 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -8,8 +8,8 @@
 """"""""""""""""""""""""""""""
 " => Load pathogen paths
 """"""""""""""""""""""""""""""
-call pathogen#infect('~/.vim_runtime/sources_forked/*')
-call pathogen#infect('~/.vim_runtime/sources_non_forked/*')
+call pathogen#infect('~/.vim_runtime/sources_forked/{}')
+call pathogen#infect('~/.vim_runtime/sources_non_forked/{}')
 call pathogen#helptags()
 
 """"""""""""""""""""""""""""""

From 0d8e7370bdf32a1b074280590b68ed7cae68a9ad Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 2 Mar 2014 14:35:00 +0000
Subject: [PATCH 33/61] Added vim-commentary and updarted the plugins.

commentary:
Comment stuff out.  Use `gcc` to comment out a line (takes a count),
`gc` to comment out the target of a motion (for example, `gcap` to
comment out a paragraph), and `gc` in visual mode to comment out the
selection.  That's it.
---
 README.md                                     |   1 +
 sources_non_forked/syntastic/README.markdown  |   2 +-
 .../syntastic/autoload/syntastic/c.vim        | 128 +++---
 .../syntastic/autoload/syntastic/log.vim      | 116 ++---
 .../autoload/syntastic/postprocess.vim        |  32 +-
 .../autoload/syntastic/preprocess.vim         |  79 ++++
 .../syntastic/autoload/syntastic/util.vim     | 105 +++--
 .../syntastic/doc/syntastic.txt               |  24 +-
 .../syntastic/plugin/syntastic.vim            | 408 +++++++++---------
 .../plugin/syntastic/autoloclist.vim          |  24 +-
 .../syntastic/plugin/syntastic/balloons.vim   |  30 +-
 .../syntastic/plugin/syntastic/checker.vim    |  89 ++--
 .../syntastic/plugin/syntastic/cursor.vim     |  30 +-
 .../plugin/syntastic/highlighting.vim         |  30 +-
 .../syntastic/plugin/syntastic/loclist.vim    |  94 ++--
 .../syntastic/plugin/syntastic/modemap.vim    |  38 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |  22 +-
 .../syntastic/plugin/syntastic/registry.vim   | 215 +++++----
 .../syntastic/plugin/syntastic/signs.vim      |  57 +--
 .../syntastic/syntax_checkers/c/cppcheck.vim  |   6 +-
 .../syntax_checkers/haskell/ghc-mod.vim       |   2 +-
 .../syntastic/syntax_checkers/html/jshint.vim |   3 +-
 .../syntax_checkers/html/validator.vim        |  17 +-
 .../syntax_checkers/java/checkstyle.vim       |  31 +-
 .../syntax_checkers/javascript/jscs.vim       |   7 +-
 .../syntax_checkers/javascript/jshint.vim     |   3 +-
 .../syntax_checkers/javascript/jsxhint.vim    |  51 +++
 .../syntastic/syntax_checkers/perl/perl.vim   |  17 +-
 .../syntastic/syntax_checkers/php/phpcs.vim   |   5 +-
 .../syntax_checkers/python/pep257.vim         |   7 +-
 .../syntax_checkers/python/pyflakes.vim       |   1 +
 .../syntax_checkers/python/pylint.vim         |   8 +-
 .../syntastic/syntax_checkers/sh/sh.vim       |   3 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |   2 +-
 .../syntastic/syntax_checkers/yaml/yamlxs.vim |   3 +-
 .../autoload/airline/extensions.vim           |   3 +-
 .../autoload/airline/extensions/branch.vim    |   2 +-
 .../autoload/airline/extensions/tabline.vim   |   1 +
 .../autoload/airline/extensions/tagbar.vim    |   8 +-
 .../autoload/airline/themes/solarized.vim     |  11 +-
 .../vim-bundle-mako/ftplugin/mako.vim         |  11 +
 sources_non_forked/vim-commentary/.gitignore  |   1 +
 .../vim-commentary/README.markdown            |  62 +++
 .../vim-commentary/doc/commentary.txt         |  28 ++
 .../vim-commentary/plugin/commentary.vim      |  75 ++++
 .../vim-markdown/syntax/markdown.vim          |   6 +
 sources_non_forked/vim-repeat/README.markdown |  53 +++
 .../vim-repeat/autoload/repeat.vim            | 119 +++++
 sources_non_forked/vim-snipmate/README.md     |   3 +
 .../vim-snipmate/autoload/snipMate.vim        | 109 +++--
 .../vim-snipmate/doc/snipMate.txt             |   6 +-
 .../vim-snippets/UltiSnips/tex.snippets       |   2 +-
 .../vim-snippets/snippets/elixir.snippets     |   3 +
 .../vim-snippets/snippets/html.snippets       |   6 +-
 .../vim-snippets/snippets/ruby.snippets       |   2 +
 update_plugins.py                             |   2 +
 56 files changed, 1330 insertions(+), 873 deletions(-)
 create mode 100644 sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
 create mode 100644 sources_non_forked/vim-bundle-mako/ftplugin/mako.vim
 create mode 100644 sources_non_forked/vim-commentary/.gitignore
 create mode 100644 sources_non_forked/vim-commentary/README.markdown
 create mode 100644 sources_non_forked/vim-commentary/doc/commentary.txt
 create mode 100644 sources_non_forked/vim-commentary/plugin/commentary.vim
 create mode 100644 sources_non_forked/vim-repeat/README.markdown
 create mode 100644 sources_non_forked/vim-repeat/autoload/repeat.vim

diff --git a/README.md b/README.md
index fdcbd6f8..217176ce 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,7 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
 * [goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2): 
 Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744)
+* [vim-commentary](https://github.com/tpope/vim-commentary): Comment stuff out.  Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion. `gcu` uncomments a set of adjacent commented lines.
 
 
 ## Included color schemes
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 04effa59..fb4b8bb4 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -38,7 +38,7 @@ At the time of this writing, syntax checking plugins exist for ActionScript,
 Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bourne shell, C, C++, C#, Chef,
 CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir,
 Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
-Handlebars, HSS, HTML, Java, JavaScript, JSON, LESS, Lex, Limbo, LISP,
+Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
 LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
 OCaml, Perl, Perl POD, PHP, gettext Portable Object, Puppet, Python, Racket,
 reStructuredText, Ruby, Rust, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig,
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 82f4c704..4bd79472 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_c_autoload")
+if exists("g:loaded_syntastic_c_autoload") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_c_autoload = 1
@@ -10,14 +10,14 @@ set cpo&vim
 
 " convenience function to determine the 'null device' parameter
 " based on the current operating system
-function! syntastic#c#NullOutput()
+function! syntastic#c#NullOutput() " {{{2
     let known_os = has('unix') || has('mac') || syntastic#util#isRunningWindows()
     return known_os ? '-o ' . syntastic#util#DevNull() : ''
-endfunction
+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)
+function! syntastic#c#ReadConfig(file) " {{{2
     " search in the current file's directory upwards
     let config = findfile(a:file, '.;')
     if config == '' || !filereadable(config)
@@ -30,7 +30,7 @@ function! syntastic#c#ReadConfig(file)
     " try to read config file
     try
         let lines = readfile(config)
-    catch /^Vim\%((\a\+)\)\=:E48[45]/
+    catch /\m^Vim\%((\a\+)\)\=:E48[45]/
         return ''
     endtry
 
@@ -57,12 +57,12 @@ function! syntastic#c#ReadConfig(file)
     endfor
 
     return join(map(parameters, 'syntastic#util#shescape(v:val)'))
-endfunction
+endfunction " }}}2
 
 " GetLocList() for C-like compilers
-function! syntastic#c#GetLocList(filetype, subchecker, options)
+function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     try
-        let flags = s:GetCflags(a:filetype, a:subchecker, a:options)
+        let flags = s:getCflags(a:filetype, a:subchecker, a:options)
     catch /\m\C^Syntastic: skip checks$/
         return []
     endtry
@@ -70,9 +70,9 @@ function! syntastic#c#GetLocList(filetype, subchecker, options)
     let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
         \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
 
-    let errorformat = s:GetCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+    let errorformat = s:getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
 
-    let postprocess = s:GetCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+    let postprocess = s:getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
         \ ['filterForeignErrors'] : []
 
     " process makeprg
@@ -80,34 +80,45 @@ function! syntastic#c#GetLocList(filetype, subchecker, options)
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'postprocess': postprocess })
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private functions {{{1
 
 " initialize c/cpp syntax checker handlers
-function! s:Init()
+function! s:init() " {{{2
     let s:handlers = []
     let s:cflags = {}
 
-    call s:RegHandler('\m\<cairo',       'syntastic#c#CheckPKG', ['cairo', 'cairo'])
-    call s:RegHandler('\m\<freetype',    'syntastic#c#CheckPKG', ['freetype', 'freetype2', 'freetype'])
-    call s:RegHandler('\m\<glade',       'syntastic#c#CheckPKG', ['glade', 'libglade-2.0', 'libglade'])
-    call s:RegHandler('\m\<glib',        'syntastic#c#CheckPKG', ['glib', 'glib-2.0', 'glib'])
-    call s:RegHandler('\m\<gtk',         'syntastic#c#CheckPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:RegHandler('\m\<libsoup',     'syntastic#c#CheckPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:RegHandler('\m\<libxml',      'syntastic#c#CheckPKG', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:RegHandler('\m\<pango',       'syntastic#c#CheckPKG', ['pango', 'pango'])
-    call s:RegHandler('\m\<SDL',         'syntastic#c#CheckPKG', ['sdl', 'sdl'])
-    call s:RegHandler('\m\<opengl',      'syntastic#c#CheckPKG', ['opengl', 'gl'])
-    call s:RegHandler('\m\<webkit',      'syntastic#c#CheckPKG', ['webkit', 'webkit-1.0'])
+    call s:regHandler('\m\<cairo',       'syntastic#c#checkPKG', ['cairo', 'cairo'])
+    call s:regHandler('\m\<freetype',    'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
+    call s:regHandler('\m\<glade',       'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
+    call s:regHandler('\m\<glib',        'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
+    call s:regHandler('\m\<gtk',         'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:regHandler('\m\<libsoup',     'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:regHandler('\m\<libxml',      'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:regHandler('\m\<pango',       'syntastic#c#checkPKG', ['pango', 'pango'])
+    call s:regHandler('\m\<SDL',         'syntastic#c#checkPKG', ['sdl', 'sdl'])
+    call s:regHandler('\m\<opengl',      'syntastic#c#checkPKG', ['opengl', 'gl'])
+    call s:regHandler('\m\<webkit',      'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
 
-    call s:RegHandler('\m\<php\.h\>',    'syntastic#c#CheckPhp',    [])
-    call s:RegHandler('\m\<Python\.h\>', 'syntastic#c#CheckPython', [])
-    call s:RegHandler('\m\<ruby',        'syntastic#c#CheckRuby',   [])
-endfunction
+    call s:regHandler('\m\<php\.h\>',    'syntastic#c#checkPHP',    [])
+    call s:regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
+    call s:regHandler('\m\<ruby',        'syntastic#c#checkRuby',   [])
+endfunction " }}}2
+
+" return a handler dictionary object
+function! s:regHandler(regex, function, args) " {{{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
 
 " resolve checker-related user variables
-function! s:GetCheckerVar(scope, filetype, subchecker, name, default)
+function! s:getCheckerVar(scope, filetype, subchecker, name, default) " {{{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}
@@ -116,13 +127,13 @@ function! s:GetCheckerVar(scope, filetype, subchecker, name, default)
     else
         return a:default
     endif
-endfunction
+endfunction " }}}2
 
 " resolve user CFLAGS
-function! s:GetCflags(ft, ck, opts)
+function! s:getCflags(ft, ck, opts) " {{{2
     " determine whether to parse header files as well
     if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
-        if s:GetCheckerVar('g', a:ft, a:ck, 'check_header', 0)
+        if s:getCheckerVar('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
@@ -132,21 +143,21 @@ function! s:GetCflags(ft, ck, opts)
         let flags = get(a:opts, 'main_flags', '')
     endif
 
-    let flags .= ' ' . s:GetCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:GetIncludeDirs(a:ft)
+    let flags .= ' ' . s:getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:getIncludeDirs(a:ft)
 
     " check if the user manually set some cflags
-    let b_cflags = s:GetCheckerVar('b', a:ft, a:ck, 'cflags', '')
+    let b_cflags = s:getCheckerVar('b', a:ft, a:ck, 'cflags', '')
     if b_cflags == ''
         " check whether to search for include files at all
-        if !s:GetCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
+        if !s:getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
             if a:ft ==# 'c' || a:ft ==# 'cpp'
                 " refresh the include file search if desired
-                if s:GetCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-                    let flags .= ' ' . s:SearchHeaders()
+                if s:getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+                    let flags .= ' ' . s:searchHeaders()
                 else
                     " search for header includes if not cached already
                     if !exists('b:syntastic_' . a:ft . '_includes')
-                        let b:syntastic_{a:ft}_includes = s:SearchHeaders()
+                        let b:syntastic_{a:ft}_includes = s:searchHeaders()
                     endif
                     let flags .= ' ' . b:syntastic_{a:ft}_includes
                 endif
@@ -158,15 +169,15 @@ function! s:GetCflags(ft, ck, opts)
     endif
 
     " add optional config file parameters
-    let config_file = s:GetCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let config_file = s:getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
     let flags .= ' ' . syntastic#c#ReadConfig(config_file)
 
     return flags
-endfunction
+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:GetIncludeDirs(filetype)
+function! s:getIncludeDirs(filetype) " {{{2
     let include_dirs = []
 
     if a:filetype =~# '\v^%(c|cpp|d|objc|objcpp)$' &&
@@ -180,11 +191,11 @@ function! s:GetIncludeDirs(filetype)
     endif
 
     return join(map(syntastic#util#unique(include_dirs), 'syntastic#util#shescape("-I" . v:val)'))
-endfunction
+endfunction " }}}2
 
 " search the first 100 lines for include statements that are
 " given in the handlers dictionary
-function! s:SearchHeaders()
+function! s:searchHeaders() " {{{2
     let includes = ''
     let files = []
     let found = []
@@ -214,7 +225,7 @@ function! s:SearchHeaders()
 
             try
                 let lines = readfile(filename, '', 100)
-            catch /^Vim\%((\a\+)\)\=:E484/
+            catch /\m^Vim\%((\a\+)\)\=:E484/
                 continue
             endtry
 
@@ -237,12 +248,12 @@ function! s:SearchHeaders()
     endfor
 
     return includes
-endfunction
+endfunction " }}}2
 
 " try to find library with 'pkg-config'
 " search possible libraries from first to last given
 " argument until one is found
-function! syntastic#c#CheckPKG(name, ...)
+function! syntastic#c#checkPKG(name, ...) " {{{2
     if executable('pkg-config')
         if !has_key(s:cflags, a:name)
             for pkg in a:000
@@ -260,10 +271,10 @@ function! syntastic#c#CheckPKG(name, ...)
         endif
     endif
     return ''
-endfunction
+endfunction " }}}2
 
 " try to find PHP includes with 'php-config'
-function! syntastic#c#CheckPhp()
+function! syntastic#c#checkPHP() " {{{2
     if executable('php-config')
         if !has_key(s:cflags, 'php')
             let s:cflags['php'] = system('php-config --includes')
@@ -272,10 +283,10 @@ function! syntastic#c#CheckPhp()
         return s:cflags['php']
     endif
     return ''
-endfunction
+endfunction " }}}2
 
 " try to find the ruby headers with 'rbconfig'
-function! syntastic#c#CheckRuby()
+function! syntastic#c#checkRuby() " {{{2
     if executable('ruby')
         if !has_key(s:cflags, 'ruby')
             let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
@@ -286,10 +297,10 @@ function! syntastic#c#CheckRuby()
         return s:cflags['ruby']
     endif
     return ''
-endfunction
+endfunction " }}}2
 
 " try to find the python headers with distutils
-function! syntastic#c#CheckPython()
+function! syntastic#c#checkPython() " {{{2
     if executable('python')
         if !has_key(s:cflags, 'python')
             let s:cflags['python'] = system('python -c ''from distutils import ' .
@@ -300,16 +311,7 @@ function! syntastic#c#CheckPython()
         return s:cflags['python']
     endif
     return ''
-endfunction
-
-" return a handler dictionary object
-function! s:RegHandler(regex, function, args)
-    let handler = {}
-    let handler["regex"] = a:regex
-    let handler["func"] = function(a:function)
-    let handler["args"] = a:args
-    call add(s:handlers, handler)
-endfunction
+endfunction " }}}2
 
 " }}}1
 
@@ -322,9 +324,9 @@ let s:default_includes = [
     \ '..' . syntastic#util#Slash() . 'include',
     \ '..' . syntastic#util#Slash() . 'includes' ]
 
-call s:Init()
+call s:init()
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4 fdm=marker:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index 78e8b8eb..05a3d24e 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_log_autoload")
+if exists("g:loaded_syntastic_log_autoload") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_log_autoload = 1
@@ -6,67 +6,37 @@ let g:loaded_syntastic_log_autoload = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-if !exists("g:syntastic_debug")
-    let g:syntastic_debug = 0
-endif
-
-let s:global_options = [
-    \ 'syntastic_aggregate_errors',
-    \ 'syntastic_always_populate_loc_list',
-    \ 'syntastic_auto_jump',
-    \ 'syntastic_auto_loc_list',
-    \ 'syntastic_check_on_open',
-    \ 'syntastic_check_on_wq',
-    \ 'syntastic_debug',
-    \ 'syntastic_echo_current_error',
-    \ 'syntastic_enable_balloons',
-    \ 'syntastic_enable_highlighting',
-    \ 'syntastic_enable_signs',
-    \ 'syntastic_error_symbol',
-    \ 'syntastic_filetype_map',
-    \ 'syntastic_full_redraws',
-    \ 'syntastic_id_checkers',
-    \ 'syntastic_ignore_files',
-    \ 'syntastic_loc_list_height',
-    \ 'syntastic_mode_map',
-    \ 'syntastic_quiet_messages',
-    \ 'syntastic_reuse_loc_lists',
-    \ 'syntastic_stl_format',
-    \ 'syntastic_style_error_symbol',
-    \ 'syntastic_style_warning_symbol',
-    \ 'syntastic_warning_symbol' ]
-
 let s:deprecation_notices_issued = []
 
 " Public functions {{{1
 
-function! syntastic#log#info(msg)
+function! syntastic#log#info(msg) " {{{2
     echomsg "syntastic: info: " . a:msg
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#warn(msg)
+function! syntastic#log#warn(msg) " {{{2
     echohl WarningMsg
     echomsg "syntastic: warning: " . a:msg
     echohl None
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#error(msg)
+function! syntastic#log#error(msg) " {{{2
     execute "normal \<Esc>"
     echohl ErrorMsg
     echomsg "syntastic: error: " . a:msg
     echohl None
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#deprecationWarn(msg)
+function! syntastic#log#deprecationWarn(msg) " {{{2
     if index(s:deprecation_notices_issued, a:msg) >= 0
         return
     endif
 
     call add(s:deprecation_notices_issued, a:msg)
     call syntastic#log#warn(a:msg)
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#debug(level, msg, ...)
+function! syntastic#log#debug(level, msg, ...) " {{{2
     if !s:isDebugEnabled(a:level)
         return
     endif
@@ -84,9 +54,9 @@ function! syntastic#log#debug(level, msg, ...)
     endif
 
     call s:logRedirect(0)
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#debugShowOptions(level, names)
+function! syntastic#log#debugShowOptions(level, names) " {{{2
     if !s:isDebugEnabled(a:level)
         return
     endif
@@ -94,15 +64,15 @@ function! syntastic#log#debugShowOptions(level, names)
     let leader = s:logTimestamp()
     call s:logRedirect(1)
 
-    let vlist = type(a:names) == type("") ? [a:names] : a:names
+    let vlist = copy(type(a:names) == type("") ? [a:names] : a:names)
     if !empty(vlist)
-        call map(copy(vlist), "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
+        call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
         echomsg leader . join(vlist, ', ')
     endif
     call s:logRedirect(0)
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#debugShowVariables(level, names)
+function! syntastic#log#debugShowVariables(level, names) " {{{2
     if !s:isDebugEnabled(a:level)
         return
     endif
@@ -112,39 +82,44 @@ function! syntastic#log#debugShowVariables(level, names)
 
     let vlist = type(a:names) == type("") ? [a:names] : a:names
     for name in vlist
-        echomsg leader . s:formatVariable(name)
+        let msg = s:formatVariable(name)
+        if msg != ''
+            echomsg leader . msg
+        endif
     endfor
 
     call s:logRedirect(0)
-endfunction
+endfunction " }}}2
 
-function! syntastic#log#debugDump(level)
+function! syntastic#log#debugDump(level) " {{{2
     if !s:isDebugEnabled(a:level)
         return
     endif
 
-    call syntastic#log#debugShowVariables(a:level, s:global_options)
-endfunction
+    call syntastic#log#debugShowVariables( a:level, sort(keys(g:syntastic_defaults)) )
+endfunction " }}}2
+
+" }}}1
 
 " Private functions {{{1
 
-function! s:isDebugEnabled_smart(level)
+function! s:isDebugEnabled_smart(level) " {{{2
     return and(g:syntastic_debug, a:level)
-endfunction
+endfunction " }}}2
 
-function! s:isDebugEnabled_dumb(level)
+function! s:isDebugEnabled_dumb(level) " {{{2
     " poor man's bit test for bit N, assuming a:level == 2**N
     return (g:syntastic_debug / a:level) % 2
-endfunction
+endfunction " }}}2
 
 let s:isDebugEnabled = function(exists('*and') ? 's:isDebugEnabled_smart' : 's:isDebugEnabled_dumb')
 
-function! s:logRedirect(on)
+function! s:logRedirect(on) " {{{2
     if exists("g:syntastic_debug_file")
         if a:on
             try
                 execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file))
-            catch /^Vim\%((\a\+)\)\=:/
+            catch /\m^Vim\%((\a\+)\)\=:/
                 silent! redir END
                 unlet g:syntastic_debug_file
             endtry
@@ -152,30 +127,33 @@ function! s:logRedirect(on)
             silent! redir END
         endif
     endif
-endfunction
+endfunction " }}}2
 
-function! s:logTimestamp_smart()
+function! s:logTimestamp_smart() " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:syntastic_start)))[0] . ': '
-endfunction
+endfunction " }}}2
 
-function! s:logTimestamp_dumb()
+function! s:logTimestamp_dumb() " {{{2
     return 'syntastic: debug: '
-endfunction
+endfunction " }}}2
 
 let s:logTimestamp = function(has('reltime') ? 's:logTimestamp_smart' : 's:logTimestamp_dumb')
 
-function! s:formatVariable(name)
+function! s:formatVariable(name) " {{{2
     let vals = []
-    if exists('g:' . a:name)
-        call add(vals, 'g:' . a:name . ' = ' . strtrans(string(g:{a:name})))
+    if exists('g:syntastic_' . a:name)
+        call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
     endif
-    if exists('b:' . a:name)
-        call add(vals, 'b:' . a:name . ' = ' . strtrans(string(b:{a:name})))
+    if exists('b:syntastic_' . a:name)
+        call add(vals, 'b:syntastic_' . a:name . ' = ' . strtrans(string(b:syntastic_{a:name})))
     endif
 
     return join(vals, ', ')
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-" vim: set et sts=4 sw=4 fdm=marker:
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
index 877bb507..1558f0f8 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_postprocess_autoload")
+if exists("g:loaded_syntastic_postprocess_autoload") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_postprocess_autoload = 1
@@ -6,7 +6,9 @@ let g:loaded_syntastic_postprocess_autoload = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! s:compareErrorItems(a, b)
+" Public functions {{{1
+
+function! s:compareErrorItems(a, b) " {{{2
     if a:a['bufnr'] != a:b['bufnr']
         " group by files
         return a:a['bufnr'] - a:b['bufnr']
@@ -18,15 +20,15 @@ function! s:compareErrorItems(a, b)
     else
         return get(a:a, 'col', 0) - get(a:b, 'col', 0)
     endif
-endfunction
+endfunction " }}}2
 
 " natural sort
-function! syntastic#postprocess#sort(errors)
+function! syntastic#postprocess#sort(errors) " {{{2
     return sort(copy(a:errors), 's:compareErrorItems')
-endfunction
+endfunction " }}}2
 
 " merge consecutive blanks
-function! syntastic#postprocess#compressWhitespace(errors)
+function! syntastic#postprocess#compressWhitespace(errors) " {{{2
     for e in a:errors
         let e['text'] = substitute(e['text'], "\001", '', 'g')
         let e['text'] = substitute(e['text'], '\n', ' ', 'g')
@@ -34,10 +36,10 @@ function! syntastic#postprocess#compressWhitespace(errors)
     endfor
 
     return a:errors
-endfunction
+endfunction " }}}2
 
 " remove spurious CR under Cygwin
-function! syntastic#postprocess#cygwinRemoveCR(errors)
+function! syntastic#postprocess#cygwinRemoveCR(errors) " {{{2
     if has('win32unix')
         for e in a:errors
             let e['text'] = substitute(e['text'], '\r', '', 'g')
@@ -45,23 +47,25 @@ function! syntastic#postprocess#cygwinRemoveCR(errors)
     endif
 
     return a:errors
-endfunction
+endfunction " }}}2
 
 " decode XML entities
-function! syntastic#postprocess#decodeXMLEntities(errors)
+function! syntastic#postprocess#decodeXMLEntities(errors) " {{{2
     for e in a:errors
         let e['text'] = syntastic#util#decodeXMLEntities(e['text'])
     endfor
 
     return a:errors
-endfunction
+endfunction " }}}2
 
 " filter out errors referencing other files
-function! syntastic#postprocess#filterForeignErrors(errors)
+function! syntastic#postprocess#filterForeignErrors(errors) " {{{2
     return filter(copy(a:errors), 'get(v:val, "bufnr") == ' . bufnr(''))
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
new file mode 100644
index 00000000..f1af35be
--- /dev/null
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -0,0 +1,79 @@
+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#checkstyle(errors) " {{{2
+    let out = []
+    let fname = expand('%')
+    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) " {{{2
+    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
+endfunction " }}}2
+
+function! syntastic#preprocess#killEmpty(errors) " {{{2
+    return filter(copy(a:errors), 'v:val != ""')
+endfunction " }}}2
+
+function! syntastic#preprocess#perl(errors) " {{{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#validator(errors) " {{{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
+
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index dabd7a43..d1dc2618 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -1,4 +1,4 @@
-if exists('g:loaded_syntastic_util_autoload')
+if exists('g:loaded_syntastic_util_autoload') || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_util_autoload = 1
@@ -6,27 +6,23 @@ let g:loaded_syntastic_util_autoload = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-" 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')
-
 " Public functions {{{1
 
-function! syntastic#util#isRunningWindows()
+function! syntastic#util#isRunningWindows() " {{{2
     return has('win16') || has('win32') || has('win64')
-endfunction
+endfunction " }}}2
 
-function! syntastic#util#DevNull()
+function! syntastic#util#DevNull() " {{{2
     if syntastic#util#isRunningWindows()
         return 'NUL'
     endif
     return '/dev/null'
-endfunction
+endfunction " }}}2
 
 " Get directory separator
-function! syntastic#util#Slash() abort
+function! syntastic#util#Slash() abort " {{{2
     return (!exists("+shellslash") || &shellslash) ? '/' : '\'
-endfunction
+endfunction " }}}2
 
 "search the first 5 lines of the file for a magic number and return a map
 "containing the args and the executable
@@ -38,7 +34,7 @@ endfunction
 "returns
 "
 "{'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
-function! syntastic#util#parseShebang()
+function! syntastic#util#parseShebang() " {{{2
     for lnum in range(1,5)
         let line = getline(lnum)
 
@@ -50,25 +46,26 @@ function! syntastic#util#parseShebang()
     endfor
 
     return { 'exe': '', 'args': [] }
-endfunction
+endfunction " }}}2
 
 " Get the value of a variable.  Allow local variables to override global ones.
-function! syntastic#util#var(name)
+function! syntastic#util#var(name, ...) " {{{2
     return
         \ exists('b:syntastic_' . a:name) ? b:syntastic_{a:name} :
-        \ exists('g:syntastic_' . a:name) ? g:syntastic_{a:name} : ''
-endfunction
+        \ exists('g:syntastic_' . a:name) ? g:syntastic_{a:name} :
+        \ a:0 > 0 ? a:1 : ''
+endfunction " }}}2
 
 " Parse a version string.  Return an array of version components.
-function! syntastic#util#parseVersion(version)
+function! syntastic#util#parseVersion(version) " {{{2
     return split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.')
-endfunction
+endfunction " }}}2
 
 " Run 'command' in a shell and parse output as a version string.
 " Returns an array of version components.
-function! syntastic#util#getVersion(command)
+function! syntastic#util#getVersion(command) " {{{2
     return syntastic#util#parseVersion(system(a:command))
-endfunction
+endfunction " }}}2
 
 " Verify that the 'installed' version is at least the 'required' version.
 "
@@ -76,7 +73,7 @@ endfunction
 " 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)
+function! syntastic#util#versionIsAtLeast(installed, required) " {{{2
     for idx in range(max([len(a:installed), len(a:required)]))
         let installed_element = get(a:installed, idx, 0)
         let required_element = get(a:required, idx, 0)
@@ -86,10 +83,14 @@ function! syntastic#util#versionIsAtLeast(installed, required)
     endfor
     " Everything matched, so it is at least the required version.
     return 1
-endfunction
+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')
 
 "print as much of a:msg as possible without "Press Enter" prompt appearing
-function! syntastic#util#wideMsg(msg)
+function! syntastic#util#wideMsg(msg) " {{{2
     let old_ruler = &ruler
     let old_showcmd = &showcmd
 
@@ -101,7 +102,7 @@ function! syntastic#util#wideMsg(msg)
     "width as the proper amount of characters
     let chunks = split(msg, "\t", 1)
     let msg = join(map(chunks[:-2], 'v:val . repeat(" ", &ts - s:width(v:val) % &ts)'), '') . chunks[-1]
-    let msg = strpart(msg, 0, winwidth(0) - 1)
+    let msg = strpart(msg, 0, &columns - 1)
 
     set noruler noshowcmd
     call syntastic#util#redraw(0)
@@ -110,10 +111,10 @@ function! syntastic#util#wideMsg(msg)
 
     let &ruler = old_ruler
     let &showcmd = old_showcmd
-endfunction
+endfunction " }}}2
 
 " Check whether a buffer is loaded, listed, and not hidden
-function! syntastic#util#bufIsActive(buffer)
+function! syntastic#util#bufIsActive(buffer) " {{{2
     " convert to number, or hell breaks loose
     let buf = str2nr(a:buffer)
 
@@ -129,11 +130,11 @@ function! syntastic#util#bufIsActive(buffer)
     endfor
 
     return 0
-endfunction
+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#findInParent(what, where)
+function! syntastic#util#findInParent(what, where) " {{{2
     let here = fnamemodify(a:where, ':p')
 
     let root = syntastic#util#Slash()
@@ -162,10 +163,10 @@ function! syntastic#util#findInParent(what, where)
     endwhile
 
     return ''
-endfunction
+endfunction " }}}2
 
 " Returns unique elements in a list
-function! syntastic#util#unique(list)
+function! syntastic#util#unique(list) " {{{2
     let seen = {}
     let uniques = []
     for e in a:list
@@ -175,20 +176,20 @@ function! syntastic#util#unique(list)
         endif
     endfor
     return uniques
-endfunction
+endfunction " }}}2
 
 " A less noisy shellescape()
-function! syntastic#util#shescape(string)
+function! syntastic#util#shescape(string) " {{{2
     return a:string =~ '\m^[A-Za-z0-9_/.-]\+$' ? a:string : shellescape(a:string)
-endfunction
+endfunction " }}}2
 
 " A less noisy shellescape(expand())
-function! syntastic#util#shexpand(string)
+function! syntastic#util#shexpand(string) " {{{2
     return syntastic#util#shescape(expand(a:string))
-endfunction
+endfunction " }}}2
 
 " decode XML entities
-function! syntastic#util#decodeXMLEntities(string)
+function! syntastic#util#decodeXMLEntities(string) " {{{2
     let str = a:string
     let str = substitute(str, '\m&lt;', '<', 'g')
     let str = substitute(str, '\m&gt;', '>', 'g')
@@ -196,17 +197,17 @@ function! syntastic#util#decodeXMLEntities(string)
     let str = substitute(str, '\m&apos;', "'", 'g')
     let str = substitute(str, '\m&amp;', '\&', 'g')
     return str
-endfunction
+endfunction " }}}2
 
-function! syntastic#util#redraw(full)
+function! syntastic#util#redraw(full) " {{{2
     if a:full
         redraw!
     else
         redraw
     endif
-endfunction
+endfunction " }}}2
 
-function! syntastic#util#dictFilter(errors, filter)
+function! syntastic#util#dictFilter(errors, filter) " {{{2
     let rules = s:translateFilter(a:filter)
     " call syntastic#log#debug(g:SyntasticDebugFilters, "applying filter:", rules)
     try
@@ -215,11 +216,13 @@ function! syntastic#util#dictFilter(errors, filter)
         let msg = matchstr(v:exception, '\m^Vim\%((\a\+)\)\=:\zs.*')
         call syntastic#log#error('quiet_messages: ' . msg)
     endtry
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private functions {{{1
 
-function! s:translateFilter(filters)
+function! s:translateFilter(filters) " {{{2
     let conditions = []
     for k in keys(a:filters)
         if type(a:filters[k]) == type([])
@@ -228,10 +231,14 @@ function! s:translateFilter(filters)
             call add(conditions, s:translateElement(k, a:filters[k]))
         endif
     endfor
-    return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
-endfunction
 
-function! s:translateElement(key, term)
+    if conditions == []
+        let conditions = ["1"]
+    endif
+    return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
+endfunction " }}}2
+
+function! s:translateElement(key, term) " {{{2
     if a:key ==? 'level'
         let ret = 'v:val["type"] !=? ' . string(a:term[0])
     elseif a:key ==? 'type'
@@ -241,11 +248,15 @@ function! s:translateElement(key, term)
     elseif a:key ==? 'file'
         let ret = 'bufname(str2nr(v:val["bufnr"])) !~# ' . string(a:term)
     else
+        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(a:key)))
         let ret = "1"
     endif
     return ret
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-" vim: set et sts=4 sw=4 fdm=marker:
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index 4d04bee5..86a5ed2b 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -417,17 +417,16 @@ 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": "warnings",
                                      \ "type":  "style",
                                      \ "regex": '\m\[C03\d\d\]',
                                      \ "file":  ['\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 consist of a single
-element you can omit adding the brackets (e.g. you can write "style" instead of
-["style"]).
+element you can omit adding the brackets (e.g. you can 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"
@@ -436,9 +435,26 @@ element you can omit adding the brackets (e.g. you can write "style" instead of
     "file"  - is matched against the filename the error refers to, as a case
               sensitive |regular-expression|.
 
+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'*
 Default: [Syntax: line:%F (%t)]
 Use this option to control what the syntastic statusline text contains. Several
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 877d8d8d..c59e42db 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,9 +19,7 @@ if has('reltime')
     let g:syntastic_start = reltime()
 endif
 
-runtime! plugin/syntastic/*.vim
-
-let s:running_windows = syntastic#util#isRunningWindows()
+" Sanity checks {{{1
 
 for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands']
     if !has(s:feature)
@@ -30,68 +28,52 @@ for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands'
     endif
 endfor
 
+let s:running_windows = syntastic#util#isRunningWindows()
 if !s:running_windows && executable('uname')
     try
         let s:uname = system('uname')
-    catch /^Vim\%((\a\+)\)\=:E484/
+    catch /\m^Vim\%((\a\+)\)\=:E484/
         call syntastic#log#error("your shell " . &shell . " doesn't use traditional UNIX syntax for redirections")
         finish
     endtry
 endif
 
-if !exists("g:syntastic_always_populate_loc_list")
-    let g:syntastic_always_populate_loc_list = 0
-endif
+" }}}1
 
-if !exists("g:syntastic_auto_jump")
-    let g:syntastic_auto_jump = 0
-endif
+" Defaults {{{1
 
-if !exists("g:syntastic_quiet_messages")
-    let g:syntastic_quiet_messages = {}
-endif
+let g:syntastic_defaults = {
+        \ 'aggregate_errors':         0,
+        \ 'always_populate_loc_list': 0,
+        \ 'auto_jump':                0,
+        \ 'auto_loc_list':            2,
+        \ 'bash_hack':                1,
+        \ 'check_on_open':            0,
+        \ 'check_on_wq':              1,
+        \ 'debug':                    0,
+        \ 'echo_current_error':       1,
+        \ 'enable_balloons':          1,
+        \ 'enable_highlighting':      1,
+        \ 'enable_signs':             1,
+        \ 'error_symbol':             '>>',
+        \ 'filetype_map':             {},
+        \ 'full_redraws':             !(has('gui_running') || has('gui_macvim')),
+        \ 'id_checkers':              1,
+        \ 'ignore_files':             [],
+        \ 'loc_list_height':          10,
+        \ 'quiet_messages':           {},
+        \ 'reuse_loc_lists':          (v:version >= 704),
+        \ 'stl_format':               '[Syntax: line:%F (%t)]',
+        \ 'style_error_symbol':       'S>',
+        \ 'style_warning_symbol':     'S>',
+        \ 'warning_symbol':           '>>'
+    \ }
 
-if !exists("g:syntastic_stl_format")
-    let g:syntastic_stl_format = '[Syntax: line:%F (%t)]'
-endif
-
-if !exists("g:syntastic_check_on_open")
-    let g:syntastic_check_on_open = 0
-endif
-
-if !exists("g:syntastic_check_on_wq")
-    let g:syntastic_check_on_wq = 1
-endif
-
-if !exists("g:syntastic_aggregate_errors")
-    let g:syntastic_aggregate_errors = 0
-endif
-
-if !exists("g:syntastic_id_checkers")
-    let g:syntastic_id_checkers = 1
-endif
-
-if !exists("g:syntastic_loc_list_height")
-    let g:syntastic_loc_list_height = 10
-endif
-
-if !exists("g:syntastic_ignore_files")
-    let g:syntastic_ignore_files = []
-endif
-
-if !exists("g:syntastic_filetype_map")
-    let g:syntastic_filetype_map = {}
-endif
-
-if !exists("g:syntastic_full_redraws")
-    let g:syntastic_full_redraws = !(has('gui_running') || has('gui_macvim'))
-endif
-
-" TODO: not documented
-if !exists("g:syntastic_reuse_loc_lists")
-    " a relevant bug has been fixed in one of the pre-releases of Vim 7.4
-    let g:syntastic_reuse_loc_lists = (v:version >= 704)
-endif
+for s:key in keys(g:syntastic_defaults)
+    if !exists('g:syntastic_' . s:key)
+        let g:syntastic_{s:key} = g:syntastic_defaults[s:key]
+    endif
+endfor
 
 if exists("g:syntastic_quiet_warnings")
     call syntastic#log#deprecationWarn("variable g:syntastic_quiet_warnings is deprecated, please use let g:syntastic_quiet_messages = {'level': 'warnings'} instead")
@@ -105,6 +87,10 @@ if exists("g:syntastic_quiet_warnings")
     endif
 endif
 
+" }}}1
+
+" Debug {{{1
+
 let s:debug_dump_options = [
         \ 'shell',
         \ 'shellcmdflag',
@@ -119,7 +105,6 @@ if v:version > 703 || (v:version == 703 && has('patch446'))
     call add(s:debug_dump_options, 'shellxescape')
 endif
 
-
 " debug constants
 let g:SyntasticDebugTrace         = 1
 let g:SyntasticDebugLoclist       = 2
@@ -127,23 +112,26 @@ let g:SyntasticDebugNotifications = 4
 let g:SyntasticDebugAutocommands  = 8
 let g:SyntasticDebugVariables     = 16
 
+" }}}1
+
+runtime! plugin/syntastic/*.vim
+
 let s:registry = g:SyntasticRegistry.Instance()
 let s:notifiers = g:SyntasticNotifiers.Instance()
 let s:modemap = g:SyntasticModeMap.Instance()
 
+" Commands {{{1
 
 " @vimlint(EVL103, 1, a:cursorPos)
 " @vimlint(EVL103, 1, a:cmdLine)
 " @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteCheckerName(argLead, cmdLine, cursorPos)
+function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) " {{{2
     let checker_names = []
-    for ft in s:ResolveFiletypes()
-        for checker in s:registry.availableCheckersFor(ft)
-            call add(checker_names, checker.getName())
-        endfor
+    for ft in s:resolveFiletypes()
+        call extend(checker_names, keys(s:registry.getCheckersMap(ft)))
     endfor
     return join(checker_names, "\n")
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:cursorPos)
 " @vimlint(EVL103, 0, a:cmdLine)
 " @vimlint(EVL103, 0, a:argLead)
@@ -152,14 +140,13 @@ endfunction
 " @vimlint(EVL103, 1, a:cursorPos)
 " @vimlint(EVL103, 1, a:cmdLine)
 " @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteFiletypes(argLead, cmdLine, cursorPos)
-    return join(s:registry.knownFiletypes(), "\n")
-endfunction
+function! s:CompleteFiletypes(argLead, cmdLine, cursorPos) " {{{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! SyntasticToggleMode call s:ToggleMode()
 command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
             \ call s:UpdateErrors(0, <f-args>) <bar>
@@ -167,12 +154,16 @@ command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
 command! Errors call s:ShowLocList()
 command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
             \ call s:modemap.echoMode() |
-            \ call s:registry.echoInfoFor(s:ResolveFiletypes(<f-args>))
+            \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>))
 command! SyntasticReset
             \ call s:ClearCache() |
             \ call s:notifiers.refresh(g:SyntasticLoclist.New([]))
 command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
 
+" }}}1
+
+" Autocommands and hooks {{{1
+
 augroup syntastic
     autocmd BufReadPost * call s:BufReadPostHook()
     autocmd BufWritePost * call s:BufWritePostHook()
@@ -191,31 +182,30 @@ if v:version > 703 || (v:version == 703 && has('patch544'))
     augroup END
 endif
 
-
-function! s:BufReadPostHook()
+function! s:BufReadPostHook() " {{{2
     if g:syntastic_check_on_open
         call syntastic#log#debug(g:SyntasticDebugAutocommands,
             \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
         call s:UpdateErrors(1)
     endif
-endfunction
+endfunction " }}}2
 
-function! s:BufWritePostHook()
+function! s:BufWritePostHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     call s:UpdateErrors(1)
-endfunction
+endfunction " }}}2
 
-function! s:BufWinEnterHook()
+function! s:BufWinEnterHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: BufWinEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
         \ ', &buftype = ' . string(&buftype))
     if &buftype == ''
         call s:notifiers.refresh(g:SyntasticLoclist.current())
     endif
-endfunction
+endfunction " }}}2
 
-function! s:BufEnterHook()
+function! s:BufEnterHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: BufEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
         \ ', &buftype = ' . string(&buftype))
@@ -225,18 +215,22 @@ function! s:BufEnterHook()
     if &buftype == 'quickfix' && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
         call g:SyntasticLoclistHide()
     endif
-endfunction
+endfunction " }}}2
 
-function! s:QuitPreHook()
+function! s:QuitPreHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = !g:syntastic_check_on_wq
     call g:SyntasticLoclistHide()
-endfunction
+endfunction " }}}2
+
+" }}}1
+
+" Main {{{1
 
 "refresh and redraw all the error info for this buf when saving or reading
-function! s:UpdateErrors(auto_invoked, ...)
-    if s:SkipFile()
+function! s:UpdateErrors(auto_invoked, ...) " {{{2
+    if s:skipFile()
         return
     endif
 
@@ -248,15 +242,16 @@ function! s:UpdateErrors(auto_invoked, ...)
 
     let loclist = g:SyntasticLoclist.current()
 
-    let w:syntastic_loclist_set = 0
-    let do_jump = g:syntastic_auto_jump
-    if g:syntastic_auto_jump == 2
+    " populate loclist and jump {{{3
+    let do_jump = syntastic#util#var('auto_jump')
+    if do_jump == 2
         let first = loclist.getFirstIssue()
         let type = get(first, 'type', '')
         let do_jump = type ==? 'E'
     endif
 
-    if g:syntastic_always_populate_loc_list || do_jump
+    let w:syntastic_loclist_set = 0
+    if syntastic#util#var('always_populate_loc_list') || do_jump
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist (new)')
         call setloclist(0, loclist.getRaw())
         let w:syntastic_loclist_set = 1
@@ -273,150 +268,105 @@ function! s:UpdateErrors(auto_invoked, ...)
             endif
         endif
     endif
+    " }}}3
 
     call s:notifiers.refresh(loclist)
-endfunction
+endfunction " }}}2
 
 "clear the loc list for the buffer
-function! s:ClearCache()
+function! s:ClearCache() " {{{2
     call s:notifiers.reset(g:SyntasticLoclist.current())
     unlet! b:syntastic_loclist
-endfunction
-
-function! s:ResolveFiletypes(...)
-    let type = a:0 ? a:1 : &filetype
-    return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
-endfunction
+endfunction " }}}2
 
 "detect and cache all syntax errors in this buffer
-function! s:CacheErrors(checkers)
+function! s:CacheErrors(checker_names) " {{{2
     call s:ClearCache()
     let newLoclist = g:SyntasticLoclist.New([])
 
-    if !s:SkipFile()
-        let active_checkers = 0
-        let names = []
-
+    if !s:skipFile()
+        " debug logging {{{3
         call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
         call syntastic#log#debugDump(g:SyntasticDebugVariables)
-        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'syntastic_aggregate_errors')
+        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'aggregate_errors')
         call syntastic#log#debug(g:SyntasticDebugTrace, 'getcwd() = ' . getcwd())
+        " }}}3
 
-        let filetypes = s:ResolveFiletypes()
+        let filetypes = s:resolveFiletypes()
         let aggregate_errors = syntastic#util#var('aggregate_errors')
         let decorate_errors = (aggregate_errors || len(filetypes) > 1) && syntastic#util#var('id_checkers')
 
-        for ft in filetypes
-            let clist = empty(a:checkers) ? s:registry.getActiveCheckers(ft) : s:registry.getCheckers(ft, a:checkers)
-
-            for checker in clist
-                let active_checkers += 1
-                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . checker.getName())
-
-                let loclist = checker.getLocList()
-
-                if !loclist.isEmpty()
-                    if decorate_errors
-                        call loclist.decorate(checker.getName(), checker.getFiletype())
-                    endif
-                    call add(names, [checker.getName(), checker.getFiletype()])
-
-                    let newLoclist = newLoclist.extend(loclist)
-
-                    if !aggregate_errors
-                        break
-                    endif
-                endif
-            endfor
+        let clist = []
+        for type in filetypes
+            call extend(clist, s:registry.getCheckers(type, a:checker_names))
         endfor
 
+        let names = []
+        for checker in clist
+            let type = checker.getFiletype()
+            let name = checker.getName()
+            call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . type . '/' . name)
+
+            let loclist = checker.getLocList()
+
+            if !loclist.isEmpty()
+                if decorate_errors
+                    call loclist.decorate(type, name)
+                endif
+                call add(names, [type, name])
+
+                let newLoclist = newLoclist.extend(loclist)
+
+                if !aggregate_errors
+                    break
+                endif
+            endif
+        endfor
+
+        " set names {{{3
         if !empty(names)
-            if len(syntastic#util#unique(map(copy(names), 'v:val[1]'))) == 1
-                let type = names[0][1]
-                let name = join(map(names, 'v:val[0]'), ', ')
+            if len(syntastic#util#unique(map( copy(names), 'v:val[0]' ))) == 1
+                let type = names[0][0]
+                let name = join(map(names, 'v:val[1]'), ', ')
                 call newLoclist.setName( name . ' ('. type . ')' )
             else
                 " checkers from mixed types
-                call newLoclist.setName(join(map(names, 'v:val[1] . "/" . v:val[0]'), ', '))
+                call newLoclist.setName(join(map(names, 'v:val[0] . "/" . v:val[1]'), ', '))
             endif
         endif
+        " }}}3
 
-        if !active_checkers
-            if !empty(a:checkers)
-                if len(a:checkers) == 1
-                    call syntastic#log#warn('checker ' . a:checkers[0] . ' is not active for filetype ' . &filetype)
+        " issue warning about no active checkers {{{3
+        if empty(clist)
+            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:checkers, ', ') . ' are not active for filetype ' . &filetype)
+                    call syntastic#log#warn('checkers ' . join(a:checker_names, ', ') . ' are not available')
                 endif
             else
-                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no active checkers for filetype ' . &filetype)
+                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no checkers available for ' . &filetype)
             endif
         endif
+        " }}}3
 
         call syntastic#log#debug(g:SyntasticDebugLoclist, 'aggregated:', newLoclist)
-
-        if type(g:syntastic_quiet_messages) == type({}) && !empty(g:syntastic_quiet_messages)
-            call newLoclist.quietMessages(g:syntastic_quiet_messages)
-            call syntastic#log#debug(g:SyntasticDebugLoclist, 'filtered by g:syntastic_quiet_messages:', newLoclist)
-        endif
     endif
 
     let b:syntastic_loclist = newLoclist
-endfunction
+endfunction " }}}2
 
-function! s:ToggleMode()
+function! s:ToggleMode() " {{{2
     call s:modemap.toggleMode()
     call s:ClearCache()
     call s:UpdateErrors(1)
     call s:modemap.echoMode()
-endfunction
+endfunction " }}}2
 
 "display the cached errors for this buf in the location list
-function! s:ShowLocList()
+function! s:ShowLocList() " {{{2
     call g:SyntasticLoclist.current().show()
-endfunction
-
-"the script changes &shellredir and &shell to stop the screen flicking when
-"shelling out to syntax checkers. Not all OSs support the hacks though
-function! s:OSSupportsShellredirHack()
-    return !s:running_windows && executable('/bin/bash') && (s:uname() !~ "FreeBSD") && (s:uname() !~ "OpenBSD")
-endfunction
-
-function! s:IsRedrawRequiredAfterMake()
-    return !s:running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
-endfunction
-
-function! s:IgnoreFile(filename)
-    let fname = fnamemodify(a:filename, ':p')
-    for pattern in g:syntastic_ignore_files
-        if fname =~# pattern
-            return 1
-        endif
-    endfor
-    return 0
-endfunction
-
-" Skip running in special buffers
-function! s:SkipFile()
-    let force_skip = exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0
-    let fname = expand('%')
-    return force_skip || (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') || s:IgnoreFile(fname)
-endfunction
-
-function! s:uname()
-    if !exists('s:uname')
-        let s:uname = system('uname')
-    endif
-    return s:uname
-endfunction
-
-"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()
-    return g:SyntasticLoclist.current().getStatuslineFlag()
-endfunction
+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
@@ -435,9 +385,10 @@ endfunction
 "   'postprocess' - a list of functions to be applied to the error list
 "   'cwd' - change directory to the given path before running the checker
 "   'returns' - a list of valid exit codes for the checker
-function! SyntasticMake(options)
+function! SyntasticMake(options) " {{{2
     call syntastic#log#debug(g:SyntasticDebugTrace, 'SyntasticMake: called with options:', a:options)
 
+    " save options and locale env variables {{{3
     let old_shell = &shell
     let old_shellredir = &shellredir
     let old_local_errorformat = &l:errorformat
@@ -445,13 +396,9 @@ function! SyntasticMake(options)
     let old_cwd = getcwd()
     let old_lc_messages = $LC_MESSAGES
     let old_lc_all = $LC_ALL
+    " }}}3
 
-    if s:OSSupportsShellredirHack()
-        "this is a hack to stop the screen needing to be ':redraw'n when
-        "when :lmake is run. Otherwise the screen flickers annoyingly
-        let &shellredir = '&>'
-        let &shell = '/bin/bash'
-    endif
+    call s:bashHack()
 
     if has_key(a:options, 'errorformat')
         let &errorformat = a:options['errorformat']
@@ -470,7 +417,7 @@ function! SyntasticMake(options)
     call syntastic#log#debug(g:SyntasticDebugLoclist, 'checker output:', err_lines)
 
     if has_key(a:options, 'preprocess')
-        let err_lines = call(a:options['preprocess'], [err_lines])
+        let err_lines = call('syntastic#preprocess#' . a:options['preprocess'], [err_lines])
         call syntastic#log#debug(g:SyntasticDebugLoclist, 'preprocess:', err_lines)
     endif
     lgetexpr err_lines
@@ -482,12 +429,15 @@ function! SyntasticMake(options)
     endif
 
     silent! lolder
+
+    " restore options {{{3
     let &errorformat = old_errorformat
     let &l:errorformat = old_local_errorformat
     let &shellredir = old_shellredir
     let &shell = old_shell
+    " }}}3
 
-    if s:IsRedrawRequiredAfterMake()
+    if !s:running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
@@ -498,12 +448,12 @@ function! SyntasticMake(options)
     endif
 
     if has_key(a:options, 'defaults')
-        call SyntasticAddToErrors(errors, a:options['defaults'])
+        call s:addToErrors(errors, a:options['defaults'])
     endif
 
     " Add subtype info if present.
     if has_key(a:options, 'subtype')
-        call SyntasticAddToErrors(errors, { 'subtype': a:options['subtype'] })
+        call s:addToErrors(errors, { 'subtype': a:options['subtype'] })
     endif
 
     if has_key(a:options, 'postprocess') && !empty(a:options['postprocess'])
@@ -514,10 +464,44 @@ function! SyntasticMake(options)
     endif
 
     return errors
-endfunction
+endfunction " }}}2
 
-"take a list of errors and add default values to them from a:options
-function! SyntasticAddToErrors(errors, options)
+"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() " {{{2
+    return g:SyntasticLoclist.current().getStatuslineFlag()
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+function! s:resolveFiletypes(...) " {{{2
+    let type = a:0 ? a:1 : &filetype
+    return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
+endfunction " }}}2
+
+function! s:ignoreFile(filename) " {{{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
+
+" Skip running in special buffers
+function! s:skipFile() " {{{2
+    let force_skip = exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0
+    let fname = expand('%')
+    return force_skip || (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname)
+endfunction " }}}2
+
+" Take a list of errors and add default values to them from a:options
+function! s:addToErrors(errors, options) " {{{2
     for err in a:errors
         for key in keys(a:options)
             if !has_key(err, key) || empty(err[key])
@@ -527,6 +511,34 @@ function! SyntasticAddToErrors(errors, options)
     endfor
 
     return a:errors
-endfunction
+endfunction " }}}2
 
-" vim: set et sts=4 sw=4:
+" The script changes &shellredir and &shell to stop the screen flicking when
+" shelling out to syntax checkers. Not all OSs support the hacks though.
+function! s:bashHack() " {{{2
+    if !exists('s:bash')
+        if !s:running_windows && (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD")
+            let s:bash =
+                \ executable('/usr/local/bin/bash') ? '/usr/local/bin/bash' :
+                \ executable('/bin/bash') ? '/bin/bash' : ''
+        else
+            let s:bash = ''
+        endif
+    endif
+
+    if g:syntastic_bash_hack && s:bash != ''
+        let &shell = s:bash
+        let &shellredir = '&>'
+    endif
+endfunction " }}}2
+
+function! s:uname() " {{{2
+    if !exists('s:uname')
+        let s:uname = system('uname')
+    endif
+    return s:uname
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
index f0038e11..5362ad6a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
@@ -1,40 +1,38 @@
-if exists("g:loaded_syntastic_notifier_autoloclist")
+if exists("g:loaded_syntastic_notifier_autoloclist") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifier_autoloclist = 1
 
-if !exists("g:syntastic_auto_loc_list")
-    let g:syntastic_auto_loc_list = 2
-endif
-
 let g:SyntasticAutoloclistNotifier = {}
 
 " Public methods {{{1
 "
-function! g:SyntasticAutoloclistNotifier.New()
+function! g:SyntasticAutoloclistNotifier.New() " {{{2
     let newObj = copy(self)
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticAutoloclistNotifier.refresh(loclist)
+function! g:SyntasticAutoloclistNotifier.refresh(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: refresh')
     call g:SyntasticAutoloclistNotifier.AutoToggle(a:loclist)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist)
+function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: toggle')
     if !a:loclist.isEmpty()
-        if g:syntastic_auto_loc_list == 1
+        if syntastic#util#var('auto_loc_list') == 1
             call a:loclist.show()
         endif
     else
-        if g:syntastic_auto_loc_list > 0
+        if syntastic#util#var('auto_loc_list') > 0
 
             "TODO: this will close the loc list window if one was opened by
             "something other than syntastic
             lclose
         endif
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index 184a0528..c97f7fae 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -1,12 +1,8 @@
-if exists("g:loaded_syntastic_notifier_balloons")
+if exists("g:loaded_syntastic_notifier_balloons") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifier_balloons = 1
 
-if !exists("g:syntastic_enable_balloons")
-    let g:syntastic_enable_balloons = 1
-endif
-
 if !has('balloon_eval')
     let g:syntastic_enable_balloons = 0
 endif
@@ -15,17 +11,17 @@ let g:SyntasticBalloonsNotifier = {}
 
 " Public methods {{{1
 
-function! g:SyntasticBalloonsNotifier.New()
+function! g:SyntasticBalloonsNotifier.New() " {{{2
     let newObj = copy(self)
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticBalloonsNotifier.enabled()
+function! g:SyntasticBalloonsNotifier.enabled() " {{{2
     return has('balloon_eval') && syntastic#util#var('enable_balloons')
-endfunction
+endfunction " }}}2
 
 " Update the error balloons
-function! g:SyntasticBalloonsNotifier.refresh(loclist)
+function! g:SyntasticBalloonsNotifier.refresh(loclist) " {{{2
     let b:syntastic_balloons = {}
     if self.enabled() && !a:loclist.isEmpty()
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: refresh')
@@ -42,25 +38,29 @@ function! g:SyntasticBalloonsNotifier.refresh(loclist)
             set beval bexpr=SyntasticBalloonsExprNotifier()
         endif
     endif
-endfunction
+endfunction " }}}2
 
 " Reset the error balloons
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticBalloonsNotifier.reset(loclist)
+function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
     if has('balloon_eval')
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: reset')
         set nobeval
     endif
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
+" }}}1
+
 " Private functions {{{1
 
-function! SyntasticBalloonsExprNotifier()
+function! SyntasticBalloonsExprNotifier() " {{{2
     if !exists('b:syntastic_balloons')
         return ''
     endif
     return get(b:syntastic_balloons, v:beval_lnum, '')
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 94cbdb03..504342d4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_checker")
+if exists("g:loaded_syntastic_checker") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_checker = 1
@@ -7,7 +7,7 @@ let g:SyntasticChecker = {}
 
 " Public methods {{{1
 
-function! g:SyntasticChecker.New(args)
+function! g:SyntasticChecker.New(args) " {{{2
     let newObj = copy(self)
 
     let newObj._filetype = a:args['filetype']
@@ -34,29 +34,29 @@ function! g:SyntasticChecker.New(args)
     endif
 
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getFiletype()
+function! g:SyntasticChecker.getFiletype() " {{{2
     return self._filetype
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getName()
+function! g:SyntasticChecker.getName() " {{{2
     return self._name
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getExec()
+function! g:SyntasticChecker.getExec() " {{{2
     if exists('g:syntastic_' . self._filetype . '_' . self._name . '_exec')
         return expand(g:syntastic_{self._filetype}_{self._name}_exec)
     endif
 
     return self._exec
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getExecEscaped()
+function! g:SyntasticChecker.getExecEscaped() " {{{2
     return syntastic#util#shescape(self.getExec())
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getLocListRaw()
+function! g:SyntasticChecker.getLocListRaw() " {{{2
     let name = self._filetype . '/' . self._name
     try
         let list = self._locListFunc()
@@ -69,13 +69,13 @@ function! g:SyntasticChecker.getLocListRaw()
     call syntastic#log#debug(g:SyntasticDebugLoclist, name . ' raw:', list)
     call self._quietMessages(list)
     return list
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.getLocList()
+function! g:SyntasticChecker.getLocList() " {{{2
     return g:SyntasticLoclist.New(self.getLocListRaw())
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.makeprgBuild(opts)
+function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
     let basename = self._filetype . '_' . self._name . '_'
 
     let parts = []
@@ -86,23 +86,42 @@ function! g:SyntasticChecker.makeprgBuild(opts)
     call extend(parts, self._getOpt(a:opts, basename, 'tail', ''))
 
     return join(parts)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker.isAvailable()
+function! g:SyntasticChecker.isAvailable() " {{{2
     return self._isAvailableFunc()
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private methods {{{1
 
-function! g:SyntasticChecker._quietMessages(errors)
-    let filter = 'g:syntastic_' . self._filetype . '_' . self._name . '_quiet_messages'
-    if exists(filter) && type({filter}) == type({}) && !empty({filter})
-        call syntastic#util#dictFilter(a:errors, {filter})
-        call syntastic#log#debug(g:SyntasticDebugLoclist, 'filtered by ' . filter . ':', a:errors)
+function! g:SyntasticChecker._quietMessages(errors) " {{{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
-endfunction
 
-function! g:SyntasticChecker._populateHighlightRegexes(errors)
+    " 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:SyntasticDebugLoclist, 'quiet_messages filter:', quiet_filters)
+
+    if !empty(quiet_filters)
+        call syntastic#util#dictFilter(a:errors, quiet_filters)
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'filtered by quiet_messages:', a:errors)
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
     if has_key(self, '_highlightRegexFunc')
         for e in a:errors
             if e['valid']
@@ -113,9 +132,9 @@ function! g:SyntasticChecker._populateHighlightRegexes(errors)
             endif
         endfor
     endif
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker._getOpt(opts, basename, name, default)
+function! g:SyntasticChecker._getOpt(opts, basename, name, default) " {{{2
     let user_val = syntastic#util#var(a:basename . a:name)
     let ret = []
     call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
@@ -123,9 +142,9 @@ function! g:SyntasticChecker._getOpt(opts, basename, name, default)
     call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
 
     return ret
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticChecker._shescape(opt)
+function! g:SyntasticChecker._shescape(opt) " {{{2
     if type(a:opt) == type('') && a:opt != ''
         return [a:opt]
     elseif type(a:opt) == type([])
@@ -133,12 +152,16 @@ function! g:SyntasticChecker._shescape(opt)
     endif
 
     return []
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Non-method functions {{{1
 
-function! SyntasticCheckerIsAvailableDefault() dict
+function! SyntasticCheckerIsAvailableDefault() dict " {{{2
     return executable(self.getExec())
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index 5e24ae14..71492543 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -1,26 +1,22 @@
-if exists("g:loaded_syntastic_notifier_cursor")
+if exists("g:loaded_syntastic_notifier_cursor") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifier_cursor = 1
 
-if !exists('g:syntastic_echo_current_error')
-    let g:syntastic_echo_current_error = 1
-endif
-
 let g:SyntasticCursorNotifier = {}
 
 " Public methods {{{1
 
-function! g:SyntasticCursorNotifier.New()
+function! g:SyntasticCursorNotifier.New() " {{{2
     let newObj = copy(self)
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticCursorNotifier.enabled()
+function! g:SyntasticCursorNotifier.enabled() " {{{2
     return syntastic#util#var('echo_current_error')
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticCursorNotifier.refresh(loclist)
+function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
     if self.enabled() && !a:loclist.isEmpty()
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: refresh')
         let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
@@ -28,21 +24,23 @@ function! g:SyntasticCursorNotifier.refresh(loclist)
         autocmd! syntastic CursorMoved
         autocmd syntastic CursorMoved * call g:SyntasticRefreshCursor()
     endif
-endfunction
+endfunction " }}}2
 
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticCursorNotifier.reset(loclist)
+function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: reset')
     autocmd! syntastic CursorMoved
     unlet! b:syntastic_messages
     let b:oldLine = -1
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
+" }}}1
+
 " Private methods {{{1
 
 " The following defensive nonsense is needed because of the nature of autocmd
-function! g:SyntasticRefreshCursor()
+function! g:SyntasticRefreshCursor() " {{{2
     if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
         " file not checked
         return
@@ -62,6 +60,8 @@ function! g:SyntasticRefreshCursor()
     else
         echo
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index 80d31f19..997b2e32 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_notifier_highlighting")
+if exists("g:loaded_syntastic_notifier_highlighting") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifier_highlighting = 1
@@ -6,17 +6,13 @@ 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'))
 
-if !exists("g:syntastic_enable_highlighting")
-    let g:syntastic_enable_highlighting = 1
-endif
-
 let g:SyntasticHighlightingNotifier = {}
 
 let s:setup_done = 0
 
 " Public methods {{{1
 
-function! g:SyntasticHighlightingNotifier.New()
+function! g:SyntasticHighlightingNotifier.New() " {{{2
     let newObj = copy(self)
 
     if !s:setup_done
@@ -25,14 +21,14 @@ function! g:SyntasticHighlightingNotifier.New()
     endif
 
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticHighlightingNotifier.enabled()
+function! g:SyntasticHighlightingNotifier.enabled() " {{{2
     return s:has_highlighting && syntastic#util#var('enable_highlighting')
-endfunction
+endfunction " }}}2
 
 " Sets error highlights in the cuirrent window
-function! g:SyntasticHighlightingNotifier.refresh(loclist)
+function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
     if self.enabled()
         call self.reset(a:loclist)
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: refresh')
@@ -59,11 +55,11 @@ function! g:SyntasticHighlightingNotifier.refresh(loclist)
             endif
         endfor
     endif
-endfunction
+endfunction " }}}2
 
 " Remove all error highlights from the window
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticHighlightingNotifier.reset(loclist)
+function! g:SyntasticHighlightingNotifier.reset(loclist) " {{{2
     if s:has_highlighting
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: reset')
         for match in getmatches()
@@ -72,13 +68,15 @@ function! g:SyntasticHighlightingNotifier.reset(loclist)
             endif
         endfor
     endif
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
+" }}}1
+
 " Private methods {{{1
 
 " One time setup: define our own highlighting
-function! g:SyntasticHighlightingNotifier._setup()
+function! g:SyntasticHighlightingNotifier._setup() " {{{2
     if s:has_highlighting
         if !hlexists('SyntasticError')
             highlight link SyntasticError SpellBad
@@ -88,6 +86,8 @@ function! g:SyntasticHighlightingNotifier._setup()
             highlight link SyntasticWarning SpellCap
         endif
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index 052501c4..f95173b5 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_loclist")
+if exists("g:loaded_syntastic_loclist") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_loclist = 1
@@ -7,7 +7,7 @@ let g:SyntasticLoclist = {}
 
 " Public methods {{{1
 
-function! g:SyntasticLoclist.New(rawLoclist)
+function! g:SyntasticLoclist.New(rawLoclist) " {{{2
     let newObj = copy(self)
 
     let llist = filter(copy(a:rawLoclist), 'v:val["valid"] == 1')
@@ -22,34 +22,34 @@ function! g:SyntasticLoclist.New(rawLoclist)
     let newObj._name = ''
 
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.current()
+function! g:SyntasticLoclist.current() " {{{2
     if !exists("b:syntastic_loclist")
         let b:syntastic_loclist = g:SyntasticLoclist.New([])
     endif
     return b:syntastic_loclist
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.extend(other)
+function! g:SyntasticLoclist.extend(other) " {{{2
     let list = self.copyRaw()
     call extend(list, a:other.copyRaw())
     return g:SyntasticLoclist.New(list)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.isEmpty()
+function! g:SyntasticLoclist.isEmpty() " {{{2
     return empty(self._rawLoclist)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.copyRaw()
+function! g:SyntasticLoclist.copyRaw() " {{{2
     return copy(self._rawLoclist)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.getRaw()
+function! g:SyntasticLoclist.getRaw() " {{{2
     return self._rawLoclist
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.getStatuslineFlag()
+function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     if !exists("self._stl_format")
         let self._stl_format = ''
     endif
@@ -100,52 +100,48 @@ function! g:SyntasticLoclist.getStatuslineFlag()
     endif
 
     return self._stl_flag
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.getFirstIssue()
+function! g:SyntasticLoclist.getFirstIssue() " {{{2
     return get(self._rawLoclist, 0, {})
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.getName()
+function! g:SyntasticLoclist.getName() " {{{2
     return len(self._name)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.setName(name)
+function! g:SyntasticLoclist.setName(name) " {{{2
     let self._name = a:name
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.decorate(name, filetype)
+function! g:SyntasticLoclist.decorate(filetype, name) " {{{2
     for e in self._rawLoclist
         let e['text'] .= ' [' . a:filetype . '/' . a:name . ']'
     endfor
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.quietMessages(filters)
-    call syntastic#util#dictFilter(self._rawLoclist, a:filters)
-endfunction
-
-function! g:SyntasticLoclist.errors()
+function! g:SyntasticLoclist.errors() " {{{2
     if !exists("self._cachedErrors")
         let self._cachedErrors = self.filter({'type': "E"})
     endif
     return self._cachedErrors
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticLoclist.warnings()
+function! g:SyntasticLoclist.warnings() " {{{2
     if !exists("self._cachedWarnings")
         let self._cachedWarnings = self.filter({'type': "W"})
     endif
     return self._cachedWarnings
-endfunction
+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()
+function! g:SyntasticLoclist.hasErrorsOrWarningsToDisplay() " {{{2
     return !self.isEmpty()
-endfunction
+endfunction " }}}2
 
 " cache used by EchoCurrentError()
-function! g:SyntasticLoclist.messages(buf)
+function! g:SyntasticLoclist.messages(buf) " {{{2
     if !exists("self._cachedMessages")
         let self._cachedMessages = {}
         let errors = self.errors() + self.warnings()
@@ -165,7 +161,7 @@ function! g:SyntasticLoclist.messages(buf)
     endif
 
     return get(self._cachedMessages, a:buf, {})
-endfunction
+endfunction " }}}2
 
 "Filter the list and return new native loclist
 "e.g.
@@ -174,14 +170,14 @@ endfunction
 "would return all errors for buffer 10.
 "
 "Note that all comparisons are done with ==?
-function! g:SyntasticLoclist.filter(filters)
+function! g:SyntasticLoclist.filter(filters) " {{{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
+endfunction " }}}2
 
-function! g:SyntasticLoclist.setloclist()
+function! g:SyntasticLoclist.setloclist() " {{{2
     if !exists('w:syntastic_loclist_set')
         let w:syntastic_loclist_set = 0
     endif
@@ -189,16 +185,16 @@ function! g:SyntasticLoclist.setloclist()
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
     call setloclist(0, self.getRaw(), replace ? 'r' : ' ')
     let w:syntastic_loclist_set = 1
-endfunction
+endfunction " }}}2
 
 "display the cached errors for this buf in the location list
-function! g:SyntasticLoclist.show()
+function! g:SyntasticLoclist.show() " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: show')
     call self.setloclist()
 
     if !self.isEmpty()
         let num = winnr()
-        execute "lopen " . g:syntastic_loc_list_height
+        execute "lopen " . syntastic#util#var('loc_list_height')
         if num != winnr()
             wincmd p
         endif
@@ -220,19 +216,25 @@ function! g:SyntasticLoclist.show()
             endif
         endfor
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Non-method functions {{{1
 
-function! g:SyntasticLoclistHide()
+function! g:SyntasticLoclistHide() " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: hide')
     silent! lclose
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private functions {{{1
 
-function! s:translate(key, val)
+function! s:translate(key, val) " {{{2
     return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index 9b04235c..8f7d3a4e 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_modemap")
+if exists("g:loaded_syntastic_modemap") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_modemap = 1
@@ -7,16 +7,16 @@ let g:SyntasticModeMap = {}
 
 " Public methods {{{1
 
-function! g:SyntasticModeMap.Instance()
+function! g:SyntasticModeMap.Instance() " {{{2
     if !exists('s:SyntasticModeMapInstance')
         let s:SyntasticModeMapInstance = copy(self)
         call s:SyntasticModeMapInstance.synch()
     endif
 
     return s:SyntasticModeMapInstance
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap.synch()
+function! g:SyntasticModeMap.synch() " {{{2
     if exists('g:syntastic_mode_map')
         let self._mode = get(g:syntastic_mode_map, 'mode', 'active')
         let self._activeFiletypes = get(g:syntastic_mode_map, 'active_filetypes', [])
@@ -26,9 +26,9 @@ function! g:SyntasticModeMap.synch()
         let self._activeFiletypes = []
         let self._passiveFiletypes = []
     endif
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap.allowsAutoChecking(filetype)
+function! g:SyntasticModeMap.allowsAutoChecking(filetype) " {{{2
     let fts = split(a:filetype, '\m\.')
 
     if self.isPassive()
@@ -36,13 +36,13 @@ function! g:SyntasticModeMap.allowsAutoChecking(filetype)
     else
         return self._noFiletypesArePassive(fts)
     endif
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap.isPassive()
+function! g:SyntasticModeMap.isPassive() " {{{2
     return self._mode ==# 'passive'
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap.toggleMode()
+function! g:SyntasticModeMap.toggleMode() " {{{2
     call self.synch()
 
     if self._mode ==# 'active'
@@ -56,20 +56,24 @@ function! g:SyntasticModeMap.toggleMode()
         let g:syntastic_mode_map = {}
     endif
     let g:syntastic_mode_map['mode'] = self._mode
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap.echoMode()
+function! g:SyntasticModeMap.echoMode() " {{{2
     echo "Syntastic: " . self._mode . " mode enabled"
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private methods {{{1
 
-function! g:SyntasticModeMap._isOneFiletypeActive(filetypes)
+function! g:SyntasticModeMap._isOneFiletypeActive(filetypes) " {{{2
     return !empty(filter(copy(a:filetypes), 'index(self._activeFiletypes, v:val) != -1'))
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticModeMap._noFiletypesArePassive(filetypes)
+function! g:SyntasticModeMap._noFiletypesArePassive(filetypes) " {{{2
     return empty(filter(copy(a:filetypes), 'index(self._passiveFiletypes, v:val) != -1'))
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 58f3448a..c268c19b 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -1,4 +1,4 @@
-if exists("g:loaded_syntastic_notifiers")
+if exists("g:loaded_syntastic_notifiers") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifiers = 1
@@ -9,16 +9,16 @@ let s:notifier_types = ['signs', 'balloons', 'highlighting', 'cursor', 'autolocl
 
 " Public methods {{{1
 
-function! g:SyntasticNotifiers.Instance()
+function! g:SyntasticNotifiers.Instance() " {{{2
     if !exists('s:SyntasticNotifiersInstance')
         let s:SyntasticNotifiersInstance = copy(self)
         call s:SyntasticNotifiersInstance._initNotifiers()
     endif
 
     return s:SyntasticNotifiersInstance
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticNotifiers.refresh(loclist)
+function! g:SyntasticNotifiers.refresh(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'notifiers: refresh')
     for type in self._enabled_types
         let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
@@ -26,9 +26,9 @@ function! g:SyntasticNotifiers.refresh(loclist)
             call self._notifier[type].refresh(a:loclist)
         endif
     endfor
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticNotifiers.reset(loclist)
+function! g:SyntasticNotifiers.reset(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'notifiers: reset')
     for type in self._enabled_types
         let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
@@ -40,11 +40,13 @@ function! g:SyntasticNotifiers.reset(loclist)
             call self._notifier[type].reset(a:loclist)
         endif
     endfor
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private methods {{{1
 
-function! g:SyntasticNotifiers._initNotifiers()
+function! g:SyntasticNotifiers._initNotifiers() " {{{2
     let self._notifier = {}
     for type in s:notifier_types
         let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
@@ -52,6 +54,8 @@ function! g:SyntasticNotifiers._initNotifiers()
     endfor
 
     let self._enabled_types = copy(s:notifier_types)
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 433325c6..d731fff2 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -1,8 +1,10 @@
-if exists("g:loaded_syntastic_registry")
+if exists("g:loaded_syntastic_registry") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_registry = 1
 
+" Initialisation {{{1
+
 let s:defaultCheckers = {
         \ 'actionscript':['mxmlc'],
         \ 'ada':         ['gcc'],
@@ -95,188 +97,167 @@ let s:defaultFiletypeMap = {
 
 let g:SyntasticRegistry = {}
 
+" }}}1
+
+" Public methods {{{1
+
 " TODO: 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.
 
-" Public methods {{{1
-
-function! g:SyntasticRegistry.Instance()
+function! g:SyntasticRegistry.Instance() " {{{2
     if !exists('s:SyntasticRegistryInstance')
         let s:SyntasticRegistryInstance = copy(self)
+        let s:SyntasticRegistryInstance._checkerRaw = {}
         let s:SyntasticRegistryInstance._checkerMap = {}
-        let s:SyntasticRegistryInstance._cachedCheckersFor = {}
     endif
 
     return s:SyntasticRegistryInstance
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticRegistry.CreateAndRegisterChecker(args)
+function! g:SyntasticRegistry.CreateAndRegisterChecker(args) " {{{2
     let checker = g:SyntasticChecker.New(a:args)
     let registry = g:SyntasticRegistry.Instance()
     call registry._registerChecker(checker)
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticRegistry.checkable(ftalias)
-    return !empty(self.getActiveCheckers(a:ftalias))
-endfunction
+function! g:SyntasticRegistry.isCheckable(ftalias) " {{{2
+    let ft = s:normaliseFiletype(a:ftalias)
+    call self._loadCheckers(ft)
+    return !empty(self._checkerMap[ft])
+endfunction " }}}2
 
-function! g:SyntasticRegistry.getActiveCheckers(ftalias)
-    let filetype = s:SyntasticRegistryNormaliseFiletype(a:ftalias)
-    let checkers = self.availableCheckersFor(a:ftalias)
+function! g:SyntasticRegistry.getCheckersMap(ftalias) " {{{2
+    let ft = s:normaliseFiletype(a:ftalias)
+    call self._loadCheckers(ft)
+    return self._checkerMap[ft]
+endfunction " }}}2
 
-    if self._userHasFiletypeSettings(filetype)
-        return self._filterCheckersByUserSettings(checkers, filetype)
+function! g:SyntasticRegistry.getCheckers(ftalias, list) " {{{2
+    let checkers_map = self.getCheckersMap(a:ftalias)
+    if empty(checkers_map)
+        return []
     endif
 
-    if has_key(s:defaultCheckers, filetype)
-        return self._filterCheckersByDefaultSettings(checkers, filetype)
-    endif
+    let ft = s:normaliseFiletype(a:ftalias)
+    call self._checkDeprecation(ft)
 
-    return checkers[0:0]
-endfunction
+    let ft_list =
+        \ !empty(a:list) ? a:list :
+        \ exists('b:syntastic_checkers') ? b:syntastic_checkers :
+        \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
+        \ get(s:defaultCheckers, ft, [])
 
-function! g:SyntasticRegistry.getCheckers(ftalias, list)
-    return self._filterCheckersByName(self.availableCheckersFor(a:ftalias), a:list)
-endfunction
+    return !empty(ft_list) ?
+        \ self._filterCheckersByName(checkers_map, ft_list) : [checkers_map[keys(checkers_map)[0]]]
+endfunction " }}}2
 
-function! g:SyntasticRegistry.availableCheckersFor(ftalias)
-    if !has_key(self._cachedCheckersFor, a:ftalias)
-        let filetype = s:SyntasticRegistryNormaliseFiletype(a:ftalias)
-        let checkers = self._allCheckersFor(filetype)
-        let self._cachedCheckersFor[a:ftalias] = self._filterCheckersByAvailability(checkers)
-    endif
-
-    return self._cachedCheckersFor[a:ftalias]
-endfunction
-
-function! g:SyntasticRegistry.knownFiletypes()
+function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
     let types = keys(s:defaultCheckers)
+
     call extend(types, keys(s:defaultFiletypeMap))
+
     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
 
-function! g:SyntasticRegistry.echoInfoFor(ftalias_list)
+    return syntastic#util#unique(types)
+endfunction " }}}2
+
+function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
     echomsg "Syntastic info for filetype: " . join(a:ftalias_list, '.')
 
-    let available = []
-    let active = []
-    for ftalias in a:ftalias_list
-        call extend(available, self.availableCheckersFor(ftalias))
-        call extend(active, self.getActiveCheckers(ftalias))
-    endfor
+    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:normaliseFiletype(v:val)' ))
+    if len(ft_list) != 1
+        let available = []
+        let active = []
 
-    echomsg "Available checker(s): " . join(syntastic#util#unique(map(available, "v:val.getName()")))
-    echomsg "Currently enabled checker(s): " . join(syntastic#util#unique(map(active, "v:val.getName()")))
-endfunction
+        for ft in ft_list
+            call extend(available, map( keys(self.getCheckersMap(ft)), 'ft . "/" . v:val' ))
+            call extend(active, map( self.getCheckers(ft, []), 'ft . "/" . v:val.getName()' ))
+        endfor
+    else
+        let ft = ft_list[0]
+        let available = keys(self.getCheckersMap(ft))
+        let active = map(self.getCheckers(ft, []), 'v:val.getName()')
+    endif
+
+    echomsg "Available checker(s): " . join(sort(available))
+    echomsg "Currently enabled checker(s): " . join(active)
+endfunction " }}}2
+
+" }}}1
 
 " Private methods {{{1
 
-function! g:SyntasticRegistry._registerChecker(checker) abort
+function! g:SyntasticRegistry._registerChecker(checker) abort " {{{2
     let ft = a:checker.getFiletype()
 
-    if !has_key(self._checkerMap, ft)
-        let self._checkerMap[ft] = []
+    if !has_key(self._checkerRaw, ft)
+        let self._checkerRaw[ft] = []
+        let self._checkerMap[ft] = {}
     endif
 
     call self._validateUniqueName(a:checker)
 
-    call add(self._checkerMap[ft], a:checker)
-endfunction
+    let name = a:checker.getName()
+    call add(self._checkerRaw[ft], name)
 
-function! g:SyntasticRegistry._allCheckersFor(filetype)
-    call self._loadCheckers(a:filetype)
-    if empty(self._checkerMap[a:filetype])
-        return []
+    if a:checker.isAvailable()
+        let self._checkerMap[ft][name] = a:checker
     endif
+endfunction " }}}2
 
-    return self._checkerMap[a:filetype]
-endfunction
+function! g:SyntasticRegistry._filterCheckersByName(checkers_map, list) " {{{2
+    return filter( map(copy(a:list), 'get(a:checkers_map, v:val, {})'), '!empty(v:val)' )
+endfunction " }}}2
 
-function! g:SyntasticRegistry._filterCheckersByDefaultSettings(checkers, filetype)
-    if has_key(s:defaultCheckers, a:filetype)
-        return self._filterCheckersByName(a:checkers, s:defaultCheckers[a:filetype])
-    endif
-
-    return a:checkers
-endfunction
-
-function! g:SyntasticRegistry._filterCheckersByUserSettings(checkers, filetype)
-    if exists("b:syntastic_checkers")
-        let whitelist = b:syntastic_checkers
-    else
-        let whitelist = g:syntastic_{a:filetype}_checkers
-    endif
-    return self._filterCheckersByName(a:checkers, whitelist)
-endfunction
-
-function! g:SyntasticRegistry._filterCheckersByName(checkers, list)
-    let checkers_by_name = {}
-    for c in a:checkers
-        let checkers_by_name[c.getName()] = c
-    endfor
-
-    let filtered = []
-    for name in a:list
-        if has_key(checkers_by_name, name)
-            call add(filtered, checkers_by_name[name])
-        endif
-    endfor
-
-    return filtered
-endfunction
-
-function! g:SyntasticRegistry._filterCheckersByAvailability(checkers)
-    return filter(copy(a:checkers), "v:val.isAvailable()")
-endfunction
-
-function! g:SyntasticRegistry._loadCheckers(filetype)
-    if self._haveLoadedCheckers(a:filetype)
+function! g:SyntasticRegistry._loadCheckers(filetype) " {{{2
+    if has_key(self._checkerRaw, a:filetype)
         return
     endif
 
     execute "runtime! syntax_checkers/" . a:filetype . "/*.vim"
 
-    if !has_key(self._checkerMap, a:filetype)
-        let self._checkerMap[a:filetype] = []
+    if !has_key(self._checkerRaw, a:filetype)
+        let self._checkerRaw[a:filetype] = []
+        let self._checkerMap[a:filetype] = {}
     endif
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticRegistry._haveLoadedCheckers(filetype)
-    return has_key(self._checkerMap, a:filetype)
-endfunction
+function! g:SyntasticRegistry._validateUniqueName(checker) abort " {{{2
+    let ft = a:checker.getFiletype()
+    let name = a:checker.getName()
+    if index(self._checkerRaw[ft], name) > -1
+        throw 'Syntastic: Duplicate syntax checker name: ' . ft . '/' . name
+    endif
+endfunction " }}}2
 
-function! g:SyntasticRegistry._userHasFiletypeSettings(filetype)
-    if exists("g:syntastic_" . a:filetype . "_checker") && !exists("g:syntastic_" . a:filetype . "_checkers")
+" Check for obsolete variable g:syntastic_<filetype>_checker
+function! g:SyntasticRegistry._checkDeprecation(filetype) " {{{2
+    if exists('g:syntastic_' . a:filetype . '_checker') && !exists('g:syntastic_' . a:filetype . '_checkers')
         let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
-        call syntastic#log#deprecationWarn("variable g:syntastic_" . a:filetype . "_checker is deprecated")
+        call syntastic#log#deprecationWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
     endif
-    return exists("b:syntastic_checkers") || exists("g:syntastic_" . a:filetype . "_checkers")
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticRegistry._validateUniqueName(checker) abort
-    for checker in self._allCheckersFor(a:checker.getFiletype())
-        if checker.getName() ==# a:checker.getName()
-            throw "Syntastic: Duplicate syntax checker name for: " . a:checker.getName()
-        endif
-    endfor
-endfunction
+" }}}1
 
 " Private functions {{{1
 
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:SyntasticRegistryNormaliseFiletype(ftalias)
+function! s:normaliseFiletype(ftalias) " {{{2
     let ft = get(s:defaultFiletypeMap, a:ftalias, a:ftalias)
     let ft = get(g:syntastic_filetype_map, ft, ft)
     let ft = substitute(ft, '\m-', '_', 'g')
     return ft
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 3b1e7522..9c860da2 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -1,28 +1,9 @@
-if exists("g:loaded_syntastic_notifier_signs")
+if exists("g:loaded_syntastic_notifier_signs") || !exists("g:loaded_syntastic_plugin")
     finish
 endif
 let g:loaded_syntastic_notifier_signs = 1
 
-if !exists("g:syntastic_enable_signs")
-    let g:syntastic_enable_signs = 1
-endif
-
-if !exists("g:syntastic_error_symbol")
-    let g:syntastic_error_symbol = '>>'
-endif
-
-if !exists("g:syntastic_warning_symbol")
-    let g:syntastic_warning_symbol = '>>'
-endif
-
-if !exists("g:syntastic_style_error_symbol")
-    let g:syntastic_style_error_symbol = 'S>'
-endif
-
-if !exists("g:syntastic_style_warning_symbol")
-    let g:syntastic_style_warning_symbol = 'S>'
-endif
-
+" 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
@@ -34,9 +15,11 @@ let g:SyntasticSignsNotifier = {}
 
 let s:setup_done = 0
 
+" }}}1
+
 " Public methods {{{1
 
-function! g:SyntasticSignsNotifier.New()
+function! g:SyntasticSignsNotifier.New() " {{{2
     let newObj = copy(self)
 
     if !s:setup_done
@@ -45,13 +28,13 @@ function! g:SyntasticSignsNotifier.New()
     endif
 
     return newObj
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticSignsNotifier.enabled()
+function! g:SyntasticSignsNotifier.enabled() " {{{2
     return has('signs') && syntastic#util#var('enable_signs')
-endfunction
+endfunction " }}}2
 
-function! g:SyntasticSignsNotifier.refresh(loclist)
+function! g:SyntasticSignsNotifier.refresh(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'signs: refresh')
     let old_signs = copy(self._bufSignIds())
     if self.enabled()
@@ -59,12 +42,14 @@ function! g:SyntasticSignsNotifier.refresh(loclist)
     endif
     call self._removeSigns(old_signs)
     let s:first_sign_id = s:next_sign_id
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " Private methods {{{1
 
 " One time setup: define our own sign types and highlighting
-function! g:SyntasticSignsNotifier._setup()
+function! g:SyntasticSignsNotifier._setup() " {{{2
     if has('signs')
         if !hlexists('SyntasticErrorSign')
             highlight link SyntasticErrorSign error
@@ -95,10 +80,10 @@ function! g:SyntasticSignsNotifier._setup()
         exe 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
             \ ' texthl=SyntasticStyleWarningSign linehl=SyntasticStyleWarningLine'
     endif
-endfunction
+endfunction " }}}2
 
 " Place signs by all syntax errors in the buffer
-function! g:SyntasticSignsNotifier._signErrors(loclist)
+function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
     let loclist = a:loclist
     if !loclist.isEmpty()
 
@@ -123,24 +108,26 @@ function! g:SyntasticSignsNotifier._signErrors(loclist)
             endif
         endfor
     endif
-endfunction
+endfunction " }}}2
 
 " Remove the signs with the given ids from this buffer
-function! g:SyntasticSignsNotifier._removeSigns(ids)
+function! g:SyntasticSignsNotifier._removeSigns(ids) " {{{2
     if has('signs')
         for i in a:ids
             execute "sign unplace " . i
             call remove(self._bufSignIds(), index(self._bufSignIds(), i))
         endfor
     endif
-endfunction
+endfunction " }}}2
 
 " Get all the ids of the SyntaxError signs in the buffer
-function! g:SyntasticSignsNotifier._bufSignIds()
+function! g:SyntasticSignsNotifier._bufSignIds() " {{{2
     if !exists("b:syntastic_sign_ids")
         let b:syntastic_sign_ids = []
     endif
     return b:syntastic_sign_ids
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
index a028e451..e4223cb2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
@@ -28,10 +28,6 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_c_cppcheck_Preprocess(errors)
-    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
-endfunction
-
 function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
@@ -50,7 +46,7 @@ function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'preprocess': 'SyntaxCheckers_c_cppcheck_Preprocess',
+        \ 'preprocess': 'cppcheck',
         \ 'returns': [0] })
 
     for e in loclist
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index 9a140fea..7a86ffa6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -54,7 +54,7 @@ function! s:GhcModNew(exe)
     try
         let ghc_mod_version = filter(split(system(exe), '\n'), 'v:val =~# ''\m^ghc-mod version''')[0]
         let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(ghc_mod_version), [2, 1, 2])
-    catch /^Vim\%((\a\+)\)\=:E684/
+    catch /\m^Vim\%((\a\+)\)\=:E684/
         call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
         let ret = -1
     endtry
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index f06657f2..0f3055bc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -42,7 +42,8 @@ function! SyntaxCheckers_html_jshint_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 2] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
index eb8ab0f5..6a8e503d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
@@ -48,21 +48,6 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_html_validator_Preprocess(errors)
-    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
-
 function! SyntaxCheckers_html_validator_GetLocList() dict
     let fname = syntastic#util#shexpand('%')
     let makeprg = self.getExecEscaped() . ' -s --compressed -F out=gnu -F asciiquotes=yes' .
@@ -87,7 +72,7 @@ function! SyntaxCheckers_html_validator_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'preprocess': 'SyntaxCheckers_html_validator_Preprocess',
+        \ 'preprocess': 'validator',
         \ 'returns': [0] })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index b3882314..092d1992 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -27,33 +27,6 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_java_checkstyle_Preprocess(errors)
-    let out = []
-    let fname = expand('%')
-    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
-
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
     let fname = syntastic#util#shescape( expand('%:p:h') . '/' . expand('%:t') )
@@ -73,8 +46,8 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'preprocess': 'SyntaxCheckers_java_checkstyle_Preprocess' })
+        \ 'preprocess': 'checkstyle',
+        \ 'subtype': 'Style' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index 2c1e54f9..c9cb4e95 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -17,9 +17,6 @@ let g:loaded_syntastic_javascript_jscs_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-" we borrow SyntaxCheckers_java_checkstyle_Preprocess() from java/checkstyle
-runtime! syntax_checkers/java/*.vim
-
 function! SyntaxCheckers_javascript_jscs_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter checkstyle' })
     let errorformat = '%f:%t:%l:%c:%m'
@@ -27,9 +24,9 @@ function! SyntaxCheckers_javascript_jscs_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'preprocess': 'SyntaxCheckers_java_checkstyle_Preprocess',
+        \ 'preprocess': 'checkstyle',
         \ 'postprocess': ['sort'],
-        \ 'returns': [0] })
+        \ 'returns': [0, 2] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index e1c84f14..cf0924cc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -47,7 +47,8 @@ function! SyntaxCheckers_javascript_jshint_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 2] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
new file mode 100644
index 00000000..3a77aba0
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"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
+    if !executable('jshint') || !syntastic#util#versionIsAtLeast(syntastic#util#getVersion('jshint --version'), [1, 1])
+        return 0
+    endif
+
+    let jsxhint_version = system(self.getExecEscaped() . ' --version')
+    return
+        \ v:shell_error == 0 &&
+        \ jsxhint_version =~# '\m^JSXHint\>' &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(jsxhint_version), [0, 4, 1])
+endfunction
+
+function! SyntaxCheckers_javascript_jsxhint_GetLocList() dict
+    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
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jsxhint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index eca6501c..f928ae98 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -44,19 +44,6 @@ function! SyntaxCheckers_perl_perl_IsAvailable() dict
     return v:shell_error == 0
 endfunction
 
-function! SyntaxCheckers_perl_perl_Preprocess(errors)
-    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
-
 function! SyntaxCheckers_perl_perl_GetLocList() dict
     let exe = expand(g:syntastic_perl_interpreter)
     if type(g:syntastic_perl_lib_path) == type('')
@@ -78,7 +65,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
     let errors = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'preprocess': 'SyntaxCheckers_perl_perl_Preprocess',
+        \ 'preprocess': 'perl',
         \ 'defaults': {'type': 'E'} })
     if !empty(errors)
         return errors
@@ -91,7 +78,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'preprocess': 'SyntaxCheckers_perl_perl_Preprocess',
+        \ 'preprocess': 'perl',
         \ 'defaults': {'type': 'W'} })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
index 11b183a1..23d539df 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
@@ -23,7 +23,8 @@ set cpo&vim
 
 function! SyntaxCheckers_php_phpcs_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args_after': '--report=csv --tab-width=' . &tabstop })
+        \ 'args': '--tab-width=' . &tabstop,
+        \ 'args_after': '--report=csv' })
 
     let errorformat =
         \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity,'.
@@ -37,7 +38,7 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'php',
-    \ 'name': 'phpcs'})
+    \ 'name': 'phpcs' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 31ec1623..7bd2d91d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -13,11 +13,6 @@ let g:loaded_syntastic_python_pep257_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-" sanity: kill empty lines here rather than munging errorformat
-function! SyntaxCheckers_python_pep257_Preprocess(errors)
-    return filter(copy(a:errors), 'v:val != ""')
-endfunction
-
 function! SyntaxCheckers_python_pep257_GetLocList() dict
     let makeprg = self.makeprgBuild({})
 
@@ -30,7 +25,7 @@ function! SyntaxCheckers_python_pep257_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'preprocess': 'SyntaxCheckers_python_pep257_Preprocess',
+        \ 'preprocess': 'killEmpty',
         \ 'postprocess': ['compressWhitespace'] })
 
     " pep257 outputs byte offsets rather than column numbers
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
index e62965f4..5903b2ef 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -45,6 +45,7 @@ function! SyntaxCheckers_python_pyflakes_GetLocList() dict
     let errorformat =
         \ '%E%f:%l: could not compile,'.
         \ '%-Z%p^,'.
+        \ '%E%f:%l:%c: %m,'.
         \ '%E%f:%l: %m,'.
         \ '%-G%.%#'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index aaa6f9b8..5cc74bb0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -62,11 +62,13 @@ function! s:PylintNew(exe)
     let exe = syntastic#util#shescape(a:exe)
     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".  Oh, joy. :)
-        let pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^pylint\>''')[0]
+        " On Gentoo Linux it's "pylint-python2.7 0.28.0".
+        " On NixOS, that would be ".pylint-wrapped 0.26.0", that would be.
+        " Have you guys considered switching to creative writing yet? ;)
+        let pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^\.\=pylint\>''')[0]
         let pylint_version = substitute(pylint_version, '\v^\S+\s+', '', '')
         let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(pylint_version), [1])
-    catch /^Vim\%((\a\+)\)\=:E684/
+    catch /\m^Vim\%((\a\+)\)\=:E684/
         call syntastic#log#error("checker python/pylint: can't parse version string (abnormal termination?)")
         let ret = -1
     endtry
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index 76182cdc..0cae2429 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -41,12 +41,11 @@ endfunction
 
 function! s:ForwardToZshChecker()
     let registry = g:SyntasticRegistry.Instance()
-    if registry.checkable('zsh')
+    if registry.isCheckable('zsh')
         return registry.getCheckers('zsh', ['zsh'])[0].getLocListRaw()
     else
         return []
     endif
-
 endfunction
 
 function! s:IsShellValid()
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 552e1291..7f380d7b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -40,7 +40,7 @@ function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
     try
         call vimlint#vimlint(syntastic#util#DevNull(), { 'output': [], 'quiet': 1 })
         let ret = 1
-    catch /^Vim\%((\a\+)\)\=:E117/
+    catch /\m^Vim\%((\a\+)\)\=:E117/
         " do nothing
     endtry
     return ret
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index 20665335..e9d33771 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -69,7 +69,8 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'yaml',
-    \ 'name': 'yamlxs' })
+    \ 'name': 'yamlxs',
+    \ 'exec': 'perl' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index f32abd3c..e41e5ea1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -168,7 +168,8 @@ function! airline#extensions#load()
   endif
 
   if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1))
-        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline'))
+        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
+        \     (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
     call airline#extensions#branch#init(s:ext)
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 82fd139f..c0f63db9 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -55,7 +55,7 @@ endfunction
 function! s:check_in_path()
   if !exists('b:airline_branch_path')
     let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
-    let bufferpath = resolve(fnamemodify(expand('%'), ':p:h'))
+    let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
 
     if !filereadable(root) "not a file
       " if .git is a directory, it's the old submodule format
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 90aff5d8..3c9dc1a4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -31,6 +31,7 @@ function! airline#extensions#tabline#init(ext)
 
   autocmd User AirlineToggledOn call s:toggle_on()
   autocmd User AirlineToggledOff call s:toggle_off()
+  autocmd BufDelete * let s:current_bufnr = -1
 
   call s:toggle_on()
   call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
index eb158ac4..56919a85 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -23,9 +23,15 @@ function! airline#extensions#tagbar#inactive_apply(...)
   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)
-    return tagbar#currenttag('%s', '', s:flags)
+    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
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim b/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
index db52bcf8..30ba47e6 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/solarized.vim
@@ -48,8 +48,10 @@ function! airline#themes#solarized#refresh()
   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
@@ -73,11 +75,12 @@ function! airline#themes#solarized#refresh()
   let s:RM = s:NM
   let s:RF = s:NF
 
-  " Inactive
+  " Inactive, according to VertSplit in solarized
+  " (bg dark: base00; bg light: base0)
   if s:background == 'dark'
-    let s:IA = [s:base00, s:base02, '']
+    let s:IA = [s:base02, s:base00, '']
   else
-    let s:IA = [s:base1, s:base2, '']
+    let s:IA = [s:base2, s:base0, '']
   endif
 
   """"""""""""""""""""""""""""""""""""""""""""""""
@@ -98,7 +101,7 @@ function! airline#themes#solarized#refresh()
         \ [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:NM[0].g, '', s:NM[0].t, '', s:NM[2]]}
+        \ '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]],
diff --git a/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim b/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim
new file mode 100644
index 00000000..41be4705
--- /dev/null
+++ b/sources_non_forked/vim-bundle-mako/ftplugin/mako.vim
@@ -0,0 +1,11 @@
+" Vim filetype plugin file
+" Language:     Mako
+" Maintainer:   Randy Stauner <randy@magnificent-tears.com>
+" Last Change:  2014-02-07
+" Version:      0.1
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setlocal comments=:##
+setlocal commentstring=##%s
diff --git a/sources_non_forked/vim-commentary/.gitignore b/sources_non_forked/vim-commentary/.gitignore
new file mode 100644
index 00000000..0a56e3fc
--- /dev/null
+++ b/sources_non_forked/vim-commentary/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/sources_non_forked/vim-commentary/README.markdown b/sources_non_forked/vim-commentary/README.markdown
new file mode 100644
index 00000000..4db3ed99
--- /dev/null
+++ b/sources_non_forked/vim-commentary/README.markdown
@@ -0,0 +1,62 @@
+commentary.vim
+==============
+
+Comment stuff out.  Use `gcc` to comment out a line (takes a count),
+`gc` to comment out the target of a motion (for example, `gcap` to
+comment out a paragraph), and `gc` in visual mode to comment out the
+selection.  That's it.
+
+I wrote this because 5 years after Vim added support for mapping an
+operator, I still couldn't find a commenting plugin that leveraged that
+feature (I overlooked
+[tcomment.vim](https://github.com/tomtom/tcomment_vim)).  Striving for
+minimalism, it weighs in at under 100 lines of code.
+
+Oh, and it uncomments, too.  The above maps actually toggle, and `gcu`
+uncomments a set of adjacent commented lines.  Install
+[repeat.vim](https://github.com/tpope/vim-repeat) to enable
+repeating `gcu` with `.` (the other maps are repeatable without it).
+
+Installation
+------------
+
+If you don't have a preferred installation method, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-commentary.git
+
+Once help tags have been generated, you can view the manual with
+`:help commentary`.
+
+FAQ
+---
+
+> My favorite file type isn't supported!
+
+Relax!  You just have to adjust `'commentstring'`:
+
+    autocmd FileType apache set commentstring=#\ %s
+
+Contributing
+------------
+
+See the contribution guidelines for
+[pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
+
+Self-Promotion
+--------------
+
+Like commentary.vim? Follow the repository on
+[GitHub](https://github.com/tpope/vim-commentary) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=3695).  And if
+you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
+[Twitter](http://twitter.com/tpope) and
+[GitHub](https://github.com/tpope).
+
+License
+-------
+
+Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/sources_non_forked/vim-commentary/doc/commentary.txt
new file mode 100644
index 00000000..63dbe267
--- /dev/null
+++ b/sources_non_forked/vim-commentary/doc/commentary.txt
@@ -0,0 +1,28 @@
+*commentary.txt*  Comment stuff out
+
+Author:  Tim Pope <http://tpo.pe/>
+License: Same terms as Vim itself (see |license|)
+
+Comment stuff out.  Then uncomment it later.  Relies on 'commentstring' to be
+correctly set.
+
+The gc mappings are preferred, while the \\ mappings are provided for
+backwards compatibility.
+
+                                                *gc* *\\*
+gc{motion}              Comment or uncomment lines that {motion} moves over.
+\\{motion}
+
+                                                *gcc* *\\\*
+gcc                     Comment or uncomment [count] lines.
+\\\
+
+                                                *v_gc* *v_\\*
+{Visual}gc              Comment or uncomment the highlighted lines.
+{Visual}\\
+
+                                                *gcu* *\\u*
+gcu                     Uncomment the current and adjacent commented lines.
+\\u
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
new file mode 100644
index 00000000..cc6f14b2
--- /dev/null
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -0,0 +1,75 @@
+" commentary.vim - Comment stuff out
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      1.1
+" GetLatestVimScripts: 3695 1 :AutoInstall: commentary.vim
+
+if exists("g:loaded_commentary") || &cp || v:version < 700
+  finish
+endif
+let g:loaded_commentary = 1
+
+function! s:go(type,...) abort
+  if a:0
+    let [lnum1, lnum2] = [a:type, a:1]
+  else
+    let [lnum1, lnum2] = [line("'["), line("']")]
+  endif
+
+  let [l, r] = split(substitute(substitute(&commentstring,'\S\zs%s',' %s',''),'%s\ze\S','%s ',''),'%s',1)
+  let uncomment = 2
+  for lnum in range(lnum1,lnum2)
+    let line = matchstr(getline(lnum),'\S.*\s\@<!')
+    if line != '' && (stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
+      let uncomment = 0
+    endif
+  endfor
+
+  for lnum in range(lnum1,lnum2)
+    let line = getline(lnum)
+    if strlen(r) > 2 && l.r !~# '\\'
+      let line = substitute(line,
+            \'\M'.r[0:-2].'\zs\d\*\ze'.r[-1:-1].'\|'.l[0].'\zs\d\*\ze'.l[1:-1],
+            \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g')
+    endif
+    if uncomment
+      let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
+    else
+      let line = substitute(line,'^\%('.matchstr(getline(lnum1),'^\s*').'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
+    endif
+    call setline(lnum,line)
+  endfor
+endfunction
+
+function! s:undo()
+  let [l, r] = split(substitute(substitute(&commentstring,'\S\zs%s',' %s',''),'%s\ze\S','%s ',''),'%s',1)
+  let lnums = [line('.')+1, line('.')-2]
+  for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']]
+    while lnums[index] != bound && line ==# '' || !(stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
+      let lnums[index] += dir
+      let line = matchstr(getline(lnums[index]+dir),'\S.*\s\@<!')
+    endwhile
+  endfor
+  call s:go(lnums[0], lnums[1])
+  silent! call repeat#set("\<Plug>CommentaryUndo")
+endfunction
+
+xnoremap <silent> <Plug>Commentary     :<C-U>call <SID>go(line("'<"),line("'>"))<CR>
+nnoremap <silent> <Plug>Commentary     :<C-U>set opfunc=<SID>go<CR>g@
+nnoremap <silent> <Plug>CommentaryLine :<C-U>set opfunc=<SID>go<Bar>exe 'norm! 'v:count1.'g@_'<CR>
+nnoremap <silent> <Plug>CommentaryUndo :<C-U>call <SID>undo()<CR>
+
+if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
+  xmap gc  <Plug>Commentary
+  nmap gc  <Plug>Commentary
+  nmap gcc <Plug>CommentaryLine
+  nmap gcu <Plug>CommentaryUndo
+endif
+
+if maparg('\\','n') ==# '' && maparg('\','n') ==# ''
+  xmap \\  <Plug>Commentary
+  nmap \\  <Plug>Commentary
+  nmap \\\ <Plug>CommentaryLine
+  nmap \\u <Plug>CommentaryUndo
+endif
+
+" vim:set et sw=2:
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index ba0d5565..8fc47278 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -85,6 +85,9 @@ syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepe
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend
 
+syn match markdownFootnote "\[^[^\]]\]\s*$"
+syn match markdownFootnoteDefinition "^\[^[^\]]\]:"
+
 if main_syntax ==# 'markdown'
   for s:type in g:markdown_fenced_languages
     exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```\s*'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
@@ -108,6 +111,9 @@ hi def link markdownListMarker            htmlTagName
 hi def link markdownBlockquote            Comment
 hi def link markdownRule                  PreProc
 
+hi def link markdownFootnote              Typedef
+hi def link markdownFootnoteDefinition    Typedef
+
 hi def link markdownLinkText              htmlLink
 hi def link markdownIdDeclaration         Typedef
 hi def link markdownId                    Type
diff --git a/sources_non_forked/vim-repeat/README.markdown b/sources_non_forked/vim-repeat/README.markdown
new file mode 100644
index 00000000..d9141317
--- /dev/null
+++ b/sources_non_forked/vim-repeat/README.markdown
@@ -0,0 +1,53 @@
+repeat.vim
+==========
+
+If you've ever tried using the `.` command after a plugin map, you were
+likely disappointed to discover it only repeated the last native command
+inside that map, rather than the map as a whole.  That disappointment
+ends today.  Repeat.vim remaps `.` in a way that plugins can tap into
+it.
+
+The following plugins support repeat.vim:
+
+* [surround.vim](https://github.com/tpope/vim-surround)
+* [speeddating.vim](https://github.com/tpope/vim-speeddating)
+* [abolish.vim](https://github.com/tpope/vim-abolish)
+* [unimpaired.vim](https://github.com/tpope/vim-unimpaired)
+* [commentary.vim](https://github.com/tpope/vim-commentary)
+
+Adding support to a plugin is generally as simple as the following
+command at the end of your map functions.
+
+    silent! call repeat#set("\<Plug>MyWonderfulMap", v:count)
+
+Installation
+------------
+
+If you don't have a preferred installation method, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-repeat.git
+
+Contributing
+------------
+
+See the contribution guidelines for
+[pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
+
+Self-Promotion
+--------------
+
+Like repeat.vim? Follow the repository on
+[GitHub](https://github.com/tpope/vim-repeat) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=2136).  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/sources_non_forked/vim-repeat/autoload/repeat.vim b/sources_non_forked/vim-repeat/autoload/repeat.vim
new file mode 100644
index 00000000..18b12800
--- /dev/null
+++ b/sources_non_forked/vim-repeat/autoload/repeat.vim
@@ -0,0 +1,119 @@
+" 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
+    augroup repeat_custom_motion
+        autocmd!
+        autocmd CursorMoved <buffer> let g:repeat_tick = b:changedtick | autocmd! repeat_custom_motion
+    augroup END
+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/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 4ddeecbe..769fe21b 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -48,8 +48,11 @@ looking at the [vim-snippets][vim-snippets] repository.
 
 ### Master ###
 
+* Implement simple caching
+* Remove expansion guards
 * Fix bug with mirrors in the first column
 * Fix bug with tabs in indents ([#143][143])
+* Fix bug with mirrors in placeholders
 
 ### 0.87 - 2014-01-04 ###
 
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index b4dc3949..42a5f82e 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -13,13 +13,6 @@ endtry
 " match $ which doesn't follow a \
 let s:d = '\%([\\]\@<!\$\)'
 
-
-" disable write cache in files
-" some people get errors about writing the cache files. Probably there is no
-" pay off having slow disks anyway. So disabling the cache by default
-let s:c.cache_parsed_snippets_on_disk = get(s:c, 'cache_parsed_snippets_on_disk', 0)
-let s:c.read_snippets_cached = get(s:c, 'read_snippets_cached', {'func' : function('snipMate#ReadSnippetsFile'), 'version': 3, 'use_file_cache': s:c.cache_parsed_snippets_on_disk})
-
 " if filetype is objc, cpp, cs or cu also append snippets from scope 'c'
 " you can add multiple by separating scopes by ',', see s:AddScopeAliases
 let s:c.scope_aliases = get(s:c, 'scope_aliases', {})
@@ -47,6 +40,7 @@ fun! Filename(...)
 endf
 
 let s:state_proto = {}
+let s:cache = {}
 
 fun! s:state_proto.remove()
 	unlet! b:snip_state
@@ -91,7 +85,7 @@ fun! snipMate#expandSnip(snip, col)
 
 	if b:snip_state.stop_count
 		aug snipmate_changes
-			au CursorMovedI,InsertEnter <buffer> call b:snip_state.update_changes()
+			au CursorMoved,CursorMovedI <buffer> call b:snip_state.update_changes()
 		aug END
 		call b:snip_state.set_stop(0)
 
@@ -263,7 +257,7 @@ function! s:state_proto.jump_stop(backwards)
 
 	if self.stop_no == self.stop_count
 		call self.remove()
-		return -1
+		return ''
 	endif
 
 	call self.set_stop(self.stop_no)
@@ -303,6 +297,10 @@ function! s:state_proto.update_stops()
 			if exists('pos[3]')
 				for nPos in pos[3]
 					let changed = nPos[0] == curLine && nPos[1] > self.start_col
+					if changed && nPos[1] < self.start_col + self.cur_stop[2]
+						call remove(pos, index(pos, nPos))
+						continue
+					endif
 					for [lnum, col] in self.old_vars
 						if lnum > nPos[0] | break | endif
 						if nPos[0] == lnum && nPos[1] > col
@@ -387,21 +385,11 @@ function! s:state_proto.update_vars(change)
 
 	" Reposition the cursor in case a var updates on the same line but before
 	" the current tabstop
-	if oldStartSnip != self.start_col
+	if oldStartSnip != self.start_col || mode() == 'i'
 		call cursor(0, col('.') + self.start_col - oldStartSnip)
 	endif
 endfunction
 
-" should be moved to utils or such?
-fun! snipMate#SetByPath(dict, path, value)
-	let d = a:dict
-	for p in a:path[:-2]
-		if !has_key(d,p) | let d[p] = {} | endif
-		let d = d[p]
-	endfor
-	let d[a:path[-1]] = a:value
-endf
-
 " reads a .snippets file
 " returns list of
 " ['triggername', 'name', 'contents']
@@ -410,27 +398,18 @@ fun! snipMate#ReadSnippetsFile(file)
 	let result = []
 	let new_scopes = []
 	if !filereadable(a:file) | return [result, new_scopes] | endif
-	let r_guard = '^guard\s\+\zs.*'
 	let inSnip = 0
-	let guard = 1
 	for line in readfile(a:file) + ["\n"]
-		if inSnip == 2 && line =~ r_guard
-			let guard = matchstr(line, r_guard)
-		elseif inSnip && (line[0] == "\t" || line == '')
+		if inSnip && (line[0] == "\t" || line == '')
 			let content .= strpart(line, 1)."\n"
 			continue
 		elseif inSnip
-			call add(result, [trigger, name == '' ? 'default' : name, content[:-2], guard])
+			call add(result, [trigger, name == '' ? 'default' : name, content[:-2]])
 			let inSnip = 0
-			let guard = "1"
 		endif
 
-		if inSnip == 2
-			let inSnip = 1
-		endif
 		if line[:6] == 'snippet'
-			" 2 signals first line
-			let inSnip = 2
+			let inSnip = 1
 			let trigger = strpart(line, 8)
 			let name = ''
 			let space = stridx(trigger, ' ') + 1
@@ -527,43 +506,61 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 	return result
 endfunction
 
-fun! snipMate#EvalGuard(guard)
-	" left: everything left of expansion 
-	" word: the expanded word
-	" are guaranteed to be in scpe
+" should be moved to utils or such?
+function! snipMate#SetByPath(dict, path, value)
+	let d = a:dict
+	for p in a:path[:-2]
+		if !has_key(d,p) | let d[p] = {} | endif
+		let d = d[p]
+	endfor
+	let d[a:path[-1]] = a:value
+endfunction
 
-	if a:guard == '1' | return 1 | endif
-	let word = s:c.word
-	" eval is evil, but backticks are allowed anyway.
-	let left = getline('.')[:col('.')-3 - len(word)]
-	exec 'return '.a:guard
-endf
+function! s:ReadFile(file)
+	if a:file =~ '\.snippet$'
+		return [['', '', readfile(a:file), '1']]
+	else
+		return snipMate#ReadSnippetsFile(a:file)
+	endif
+endfunction
+
+function! s:CachedSnips(file)
+	let mtime = getftime(a:file)
+	if has_key(s:cache, a:file) && s:cache[a:file].mtime >= mtime
+		return s:cache[a:file].contents
+	endif
+	let s:cache[a:file] = {}
+	let s:cache[a:file].mtime = mtime
+	let s:cache[a:file].contents = snipMate#ReadSnippetsFile(a:file)
+	return s:cache[a:file].contents
+endfunction
 
 " default triggers based on paths
-fun! snipMate#DefaultPool(scopes, trigger, result)
-	let triggerR = substitute(a:trigger,'*','.*','g')
+function! snipMate#DefaultPool(scopes, trigger, result)
 	let extra_scopes = []
 	for [f,opts] in items(snipMate#GetSnippetFiles(1, a:scopes, a:trigger))
-		let opts.name_prefix = matchstr(f, '\v[^/]+\ze/snippets') . ' ' . opts.name_prefix
+		let opts.name_prefix = matchstr(f, '\v/\zs.{-}\ze/snippets') . ' ' . opts.name_prefix
 		if opts.type == 'snippets'
-			let [snippets, extension] = cached_file_contents#CachedFileContents(f, s:c.read_snippets_cached, 0)
-			for [trigger, name, contents, guard] in snippets
-				if trigger !~ escape(triggerR,'~') | continue | endif
-				if snipMate#EvalGuard(guard)
-					call snipMate#SetByPath(a:result, [trigger, opts.name_prefix.' '.name], contents)
+			let [snippets, new_scopes] = s:CachedSnips(f)
+			call extend(extra_scopes, new_scopes)
+			for [trigger, name, contents] in snippets
+				if trigger =~ '\V\^' . escape(a:trigger, '\')
+					call snipMate#SetByPath(a:result,
+								\ [trigger, opts.name_prefix . ' ' . name],
+								\ contents)
 				endif
 			endfor
-			call extend(extra_scopes, extension)
 		elseif opts.type == 'snippet'
-			call snipMate#SetByPath(a:result, [opts.trigger, opts.name_prefix.' '.opts.name], funcref#Function('return readfile('.string(f).')'))
+			call snipMate#SetByPath(a:result, [opts.trigger, opts.name_prefix.' '.opts.name], readfile(f))
 		else
 			throw "unexpected"
 		endif
 	endfor
+
 	if !empty(extra_scopes)
 		call snipMate#DefaultPool(extra_scopes, a:trigger, a:result)
 	endif
-endf
+endfunction
 
 " return a dict of snippets found in runtimepath matching trigger
 " scopes: list of scopes. usually this is the filetype. eg ['c','cpp']
@@ -571,8 +568,6 @@ endf
 "
 fun! snipMate#GetSnippets(scopes, trigger)
 	let result = {}
-	let triggerR = escape(substitute(a:trigger,'*','.*','g'), '~') " escape '~' for use as regexp
-	" let scopes = s:AddScopeAliases(a:scopes)
 
 	for F in values(g:snipMateSources)
 	  call funcref#Call(F, [a:scopes, a:trigger, result])
@@ -666,14 +661,12 @@ fun! snipMate#GetSnippetsForWordBelowCursor(word, suffix, break_on_first_match)
 	endif
 
 	call filter(lookups, 'v:val != ""')
-	" echo lookups
 
 	let matching_snippets = []
 	let snippet = ''
 	" prefer longest word
 	for word in lookups
 		let s:c.word = word
-		" echomsg string(lookups).' current: '.word
 		for [k,snippetD] in items(funcref#Call(s:c['get_snippets'], [snipMate#ScopesByFile(), word]))
 			if a:suffix == ''
 				" hack: require exact match
@@ -716,7 +709,7 @@ endf
 
 fun! snipMate#GetSnippetsForWordBelowCursorForComplete(word)
 	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(a:word, '*', 0), 'v:val[0]')
-	return filter(snippets, "v:val =~# '\\V\\^" . escape(a:word, '\') . "'")
+	return filter(snippets, 'v:val =~# "\\V\\^' . escape(a:word, '"\') . '"')
 endf
 
 fun! snipMate#CanBeTriggered()
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index e39517c6..5ec50928 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -194,7 +194,6 @@ Multiple snippets can be defined in *.snippets files. Each snippet definition
 looks something like: >
 
     snippet trigger optional description
-    guard left_from_cursor='^\s*'
         expanded text
         more expanded text
 
@@ -203,9 +202,6 @@ The description is optional. If it is left out and a second snippet inside the
 same .snippets file uses the same trigger, the second one will overwrite the
 first. Otherwise multisnip is used.
 
-The guard condition line is also optional. It can be used to make a snippet
-available only in some cases. The value should be a VimL expression.
-
 Note: Hard tabs in the expansion text are required. When the snippet is
 expanded in the text and 'expandtab' is set, each tab will be replaced with
 spaces based on 'softtabstop' if nonzero or 'shiftwidth' otherwise.
@@ -254,7 +250,7 @@ the tab stop. This text then can be copied throughout the snippet using "$#",
 given # is the same number as used before. So, to make a C for loop: >
 
     snippet for
-        for (${2:i}; $2 < ${1:count}; $1++) {
+        for (${2:i}=0; $2 < ${1:count}; $2++) {
             ${4}
         }
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index 97ea8a82..db533070 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -74,7 +74,7 @@ ${0}
 endsnippet
 
 snippet sec "Section" b
-\section{${1:section name}} 
+\section{${1:section name}}
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
 
 ${0}
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index 54aa180b..bd84cd96 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -50,6 +50,9 @@ snippet case
 		${0}
 	end
 
+snippet df
+	def ${1:name}, do: ${2}
+
 snippet def
 	def ${1:name} do
 		${0}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index f25e1bc7..d8892b5b 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -749,15 +749,15 @@ snippet summary
 snippet sup
 	<sup>${0}</sup>
 snippet table
-	<table border="${1:0}">
+	<table>
 		${0}
 	</table>
 snippet table.
-	<table class="${1}" border="${2:0}">
+	<table class="${1}">
 		${0}
 	</table>
 snippet table#
-	<table id="${1}" border="${2:0}">
+	<table id="${1}">
 		${0}
 	</table>
 snippet tbody
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 551b313f..1798e08b 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -620,6 +620,8 @@ snippet asrj
 	assert_rjs :${1:replace}, "${0:dom id}"
 snippet ass assert_select(..)
 	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
+snippet ba
+	before_action :${0:method}
 snippet bf
 	before_filter :${0:method}
 snippet bt
diff --git a/update_plugins.py b/update_plugins.py
index 8314a355..3dacaf08 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -36,6 +36,8 @@ vim-airline https://github.com/bling/vim-airline
 goyo.vim https://github.com/junegunn/goyo.vim
 vim-zenroom2 https://github.com/amix/vim-zenroom2
 syntastic https://github.com/scrooloose/syntastic
+vim-repeat https://github.com/tpope/vim-repeat
+vim-commentary https://github.com/tpope/vim-commentary
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'

From 2b82c756316b518b10569b9914c8d284ee049b97 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 2 Mar 2014 14:41:02 +0000
Subject: [PATCH 34/61] Removed duplicated taglist plugin

---
 sources_non_forked/taglist/doc/taglist.txt    | 1501 ------
 sources_non_forked/taglist/doc/tags           |   62 -
 sources_non_forked/taglist/plugin/taglist.vim | 4546 -----------------
 3 files changed, 6109 deletions(-)
 delete mode 100755 sources_non_forked/taglist/doc/taglist.txt
 delete mode 100644 sources_non_forked/taglist/doc/tags
 delete mode 100644 sources_non_forked/taglist/plugin/taglist.vim

diff --git a/sources_non_forked/taglist/doc/taglist.txt b/sources_non_forked/taglist/doc/taglist.txt
deleted file mode 100755
index 6a62b396..00000000
--- a/sources_non_forked/taglist/doc/taglist.txt
+++ /dev/null
@@ -1,1501 +0,0 @@
-*taglist.txt*	Plugin for browsing source code
-
-Author: Yegappan Lakshmanan  (yegappan AT yahoo DOT com)
-For Vim version 6.0 and above
-Last change: 2007 May 24
-
-1. Overview 					|taglist-intro|
-2. Taglist on the internet			|taglist-internet|
-3. Requirements					|taglist-requirements|
-4. Installation 				|taglist-install|
-5. Usage 					|taglist-using|
-6. Options 					|taglist-options|
-7. Commands 					|taglist-commands|
-8. Global functions 				|taglist-functions|
-9. Extending 					|taglist-extend|
-10. FAQ 					|taglist-faq|
-11. License 					|taglist-license|
-12. Todo					|taglist-todo|
-
-==============================================================================
-						*taglist-intro*
-1. Overview~
-
-The "Tag List" plugin is a source code browser plugin for Vim. This plugin
-allows you to efficiently browse through source code files for different
-programming languages. The "Tag List" plugin provides the following features:
-
-    * Displays the tags (functions, classes, structures, variables, etc.) 
-      defined in a file in a vertically or horizontally split Vim window.
-    * In GUI Vim, optionally displays the tags in the Tags drop-down menu and
-      in the popup menu.
-    * Automatically updates the taglist window as you switch between
-      files/buffers. As you open new files, the tags defined in the new files
-      are added to the existing file list and the tags defined in all the
-      files are displayed grouped by the filename.
-    * When a tag name is selected from the taglist window, positions the
-      cursor at the definition of the tag in the source file.
-    * Automatically highlights the current tag name.
-    * Groups the tags by their type and displays them in a foldable tree.
-    * Can display the prototype and scope of a tag.
-    * Can optionally display the tag prototype instead of the tag name in the
-      taglist window.
-    * The tag list can be sorted either by name or by chronological order.
-    * Supports the following language files: Assembly, ASP, Awk, Beta, C,
-      C++, C#, Cobol, Eiffel, Erlang, Fortran, HTML, Java, Javascript, Lisp,
-      Lua, Make, Pascal, Perl, PHP, Python, Rexx, Ruby, Scheme, Shell, Slang,
-      SML, Sql, TCL, Verilog, Vim and Yacc.
-    * Can be easily extended to support new languages. Support for
-      existing languages can be modified easily.
-    * Provides functions to display the current tag name in the Vim status
-      line or the window title bar.
-    * The list of tags and files in the taglist can be saved and
-      restored across Vim sessions.
-    * Provides commands to get the name and prototype of the current tag.
-    * Runs in both console/terminal and GUI versions of Vim.
-    * Works with the winmanager plugin. Using the winmanager plugin, you
-      can use Vim plugins like the file explorer, buffer explorer and the
-      taglist plugin at the same time like an IDE.
-    * Can be used in both Unix and MS-Windows systems.
-
-==============================================================================
-						*taglist-internet*
-2. Taglist on the internet~
-
-The home page of the taglist plugin is at:
->
-	http://vim-taglist.sourceforge.net/
-<
-You can subscribe to the taglist mailing list to post your questions or
-suggestions for improvement or to send bug reports. Visit the following page
-for subscribing to the mailing list:
->
-	http://groups.yahoo.com/group/taglist
-<
-==============================================================================
-						*taglist-requirements*
-3. Requirements~
-
-The taglist plugin requires the following:
-
-    * Vim version 6.0 and above
-    * Exuberant ctags 5.0 and above
-
-The taglist plugin will work on all the platforms where the exuberant ctags
-utility and Vim are supported (this includes MS-Windows and Unix based
-systems).
-
-The taglist plugin relies on the exuberant ctags utility to dynamically
-generate the tag listing.  The exuberant ctags utility must be installed in
-your system to use this plugin.  The exuberant ctags utility is shipped with
-most of the Linux distributions.  You can download the exuberant ctags utility
-from
->
-	http://ctags.sourceforge.net
-<
-The taglist plugin doesn't use or create a tags file and there is no need to
-create a tags file to use this plugin. The taglist plugin will not work with
-the GNU ctags or the Unix ctags utility.
-
-This plugin relies on the Vim "filetype" detection mechanism to determine the
-type of the current file. You have to turn on the Vim filetype detection by
-adding the following line to your .vimrc file:
->
-	filetype on
-<
-The taglist plugin will not work if you run Vim in the restricted mode (using
-the -Z command-line argument).
-
-The taglist plugin uses the Vim system() function to invoke the exuberant
-ctags utility. If Vim is compiled without the system() function then you
-cannot use the taglist plugin. Some of the Linux distributions (Suse) compile
-Vim without the system() function for security reasons.
-
-==============================================================================
-						*taglist-install*
-4. Installation~
-
-1. Download the taglist.zip file and unzip the files to the $HOME/.vim or the
-   $HOME/vimfiles or the $VIM/vimfiles directory. After this step, you should
-   have the following two files (the directory structure should be preserved):
-
-	plugin/taglist.vim - main taglist plugin file
-	doc/taglist.txt    - documentation (help) file
-
-   Refer to the |add-plugin|and |'runtimepath'| Vim help pages for more
-   details about installing Vim plugins.
-2. Change to the $HOME/.vim/doc or $HOME/vimfiles/doc or $VIM/vimfiles/doc
-   directory, start Vim and run the ":helptags ." command to process the
-   taglist help file. Without this step, you cannot jump to the taglist help
-   topics.
-3. If the exuberant ctags utility is not present in one of the directories in
-   the PATH environment variable, then set the 'Tlist_Ctags_Cmd' variable to
-   point to the location of the exuberant ctags utility (not to the directory)
-   in the .vimrc file.
-4. If you are running a terminal/console version of Vim and the terminal
-   doesn't support changing the window width then set the
-   'Tlist_Inc_Winwidth' variable to 0 in the .vimrc file.
-5. Restart Vim.
-6. You can now use the ":TlistToggle" command to open/close the taglist
-   window. You can use the ":help taglist" command to get more information
-   about using the taglist plugin.
-
-To uninstall the taglist plugin, remove the plugin/taglist.vim and
-doc/taglist.txt files from the $HOME/.vim or $HOME/vimfiles directory.
-
-==============================================================================
-						*taglist-using*
-5. Usage~
-
-The taglist plugin can be used in several different ways.
-
-1. You can keep the taglist window open during the entire editing session. On
-   opening the taglist window, the tags defined in all the files in the Vim
-   buffer list will be displayed in the taglist window. As you edit files, the
-   tags defined in them will be added to the taglist window. You can select a
-   tag from the taglist window and jump to it. The current tag will be
-   highlighted in the taglist window. You can close the taglist window when
-   you no longer need the window.
-2. You can configure the taglist plugin to process the tags defined in all the
-   edited files always. In this configuration, even if the taglist window is
-   closed and the taglist menu is not displayed, the taglist plugin will
-   processes the tags defined in newly edited files. You can then open the
-   taglist window only when you need to select a tag and then automatically
-   close the taglist window after selecting the tag.
-3. You can configure the taglist plugin to display only the tags defined in
-   the current file in the taglist window. By default, the taglist plugin
-   displays the tags defined in all the files in the Vim buffer list. As you
-   switch between files, the taglist window will be refreshed to display only
-   the tags defined in the current file.
-4. In GUI Vim, you can use the Tags pull-down and popup menu created by the
-   taglist plugin to display the tags defined in the current file and select a
-   tag to jump to it. You can use the menu without opening the taglist window.
-   By default, the Tags menu is disabled.
-5. You can configure the taglist plugin to display the name of the current tag
-   in the Vim window status line or in the Vim window title bar. For this to
-   work without the taglist window or menu, you need to configure the taglist
-   plugin to process the tags defined in a file always.
-6. You can save the tags defined in multiple files to a taglist session file
-   and load it when needed. You can also configure the taglist plugin to not
-   update the taglist window when editing new files. You can then manually add
-   files to the taglist window.
-
-Opening the taglist window~
-You can open the taglist window using the ":TlistOpen" or the ":TlistToggle"
-commands. The ":TlistOpen" command opens the taglist window and jumps to it.
-The ":TlistToggle" command opens or closes (toggle) the taglist window and the
-cursor remains in the current window. If the 'Tlist_GainFocus_On_ToggleOpen'
-variable is set to 1, then the ":TlistToggle" command opens the taglist window
-and moves the cursor to the taglist window.
-
-You can map a key to invoke these commands. For example, the following command
-creates a normal mode mapping for the <F8> key to toggle the taglist window.
->
-	nnoremap <silent> <F8> :TlistToggle<CR>
-<
-Add the above mapping to your ~/.vimrc or $HOME/_vimrc file.
-
-To automatically open the taglist window on Vim startup, set the
-'Tlist_Auto_Open' variable to 1.
-
-You can also open the taglist window on startup using the following command
-line:
->
-	$ vim +TlistOpen
-<
-Closing the taglist window~
-You can close the taglist window from the taglist window by pressing 'q' or
-using the Vim ":q" command. You can also use any of the Vim window commands to
-close the taglist window. Invoking the ":TlistToggle" command when the taglist
-window is opened, closes the taglist window. You can also use the
-":TlistClose" command to close the taglist window.
-
-To automatically close the taglist window when a tag or file is selected, you
-can set the 'Tlist_Close_On_Select' variable to 1.  To exit Vim when only the
-taglist window is present, set the 'Tlist_Exit_OnlyWindow' variable to 1.
-
-Jumping to a tag or a file~
-You can select a tag in the taglist window either by pressing the <Enter> key
-or by double clicking the tag name using the mouse. To jump to a tag on a
-single mouse click set the 'Tlist_Use_SingleClick' variable to 1.
-
-If the selected file is already opened in a window, then the cursor is moved
-to that window. If the file is not currently opened in a window then the file
-is opened in the window used by the taglist plugin to show the previously
-selected file. If there are no usable windows, then the file is opened in a
-new window.  The file is not opened in special windows like the quickfix
-window, preview window and windows containing buffer with the 'buftype' option
-set.
-
-To jump to the tag in a new window, press the 'o' key. To open the file in the
-previous window (Ctrl-W_p) use the 'P' key. You can press the 'p' key to jump
-to the tag but still keep the cursor in the taglist window (preview).
-
-To open the selected file in a tab, use the 't' key.  If the file is already
-present in a tab then the cursor is moved to that tab otherwise the file is
-opened in a new tab. To jump to a tag in a new tab press Ctrl-t.  The taglist
-window is automatically opened in the newly created tab.
-
-Instead of jumping to a tag, you can open a file by pressing the <Enter> key
-or by double clicking the file name using the mouse.
-
-In the taglist window, you can use the [[ or <Backspace> key to jump to the
-beginning of the previous file. You can use the ]] or <Tab> key to jump to the
-beginning of the next file. When you reach the first or last file, the search
-wraps around and the jumps to the next/previous file.
-
-Highlighting the current tag~
-The taglist plugin automatically highlights the name of the current tag in the
-taglist window. The Vim |CursorHold| autocmd event is used for this. If the
-current tag name is not visible in the taglist window, then the taglist window
-contents are scrolled to make that tag name visible. You can also use the
-":TlistHighlightTag" command to force the highlighting of the current tag.
-
-The tag name is highlighted if no activity is performed for |'updatetime'|
-milliseconds. The default value for this Vim option is 4 seconds. To avoid
-unexpected problems, you should not set the |'updatetime'| option to a very
-low value.
-
-To disable the automatic highlighting of the current tag name in the taglist
-window, set the 'Tlist_Auto_Highlight_Tag' variable to zero.
-
-When entering a Vim buffer/window, the taglist plugin automatically highlights
-the current tag in that buffer/window.  If you like to disable the automatic
-highlighting of the current tag when entering a buffer, set the
-'Tlist_Highlight_Tag_On_BufEnter' variable to zero.
-
-Adding files to the taglist~
-When the taglist window is opened, all the files in the Vim buffer list are
-processed and the supported files are added to the taglist.  When you edit a
-file in Vim, the taglist plugin automatically processes this file and adds it
-to the taglist. If you close the taglist window, the tag information in the
-taglist is retained.
-
-To process files even when the taglist window is not open, set the
-'Tlist_Process_File_Always' variable to 1.
-
-You can manually add multiple files to the taglist without opening them using
-the ":TlistAddFiles" and the ":TlistAddFilesRecursive" commands.
-
-For example, to add all the C files in the /my/project/dir directory to the
-taglist, you can use the following command:
->
-	:TlistAddFiles /my/project/dir/*.c
-<
-Note that when adding several files with a large number of tags or a large
-number of files, it will take several seconds to several minutes for the
-taglist plugin to process all the files. You should not interrupt the taglist
-plugin by pressing <CTRL-C>.
-
-You can recursively add multiple files from a directory tree using the
-":TlistAddFilesRecursive" command:
->
-	:TlistAddFilesRecursive /my/project/dir *.c
-<
-This command takes two arguments. The first argument specifies the directory
-from which to recursively add the files. The second optional argument
-specifies the wildcard matching pattern for selecting the files to add. The
-default pattern is * and all the files are added.
-
-Displaying tags for only one file~
-The taglist window displays the tags for all the files in the Vim buffer list
-and all the manually added files. To display the tags for only the current
-active buffer, set the 'Tlist_Show_One_File' variable to 1.
-
-Removing files from the taglist~
-You can remove a file from the taglist window, by pressing the 'd' key when the
-cursor is on one of the tags listed for the file in the taglist window. The
-removed file will no longer be displayed in the taglist window in the current
-Vim session. To again display the tags for the file, open the file in a Vim
-window and then use the ":TlistUpdate" command or use ":TlistAddFiles" command
-to add the file to the taglist.
-
-When a buffer is removed from the Vim buffer list using the ":bdelete" or the
-":bwipeout" command, the taglist is updated to remove the stored information
-for this buffer.
-
-Updating the tags displayed for a file~
-The taglist plugin keeps track of the modification time of a file. When the
-modification time changes (the file is modified), the taglist plugin
-automatically updates the tags listed for that file. The modification time of
-a file is checked when you enter a window containing that file or when you
-load that file.
-
-You can also update or refresh the tags displayed for a file by pressing the
-"u" key in the taglist window. If an existing file is modified, after the file
-is saved, the taglist plugin automatically updates the tags displayed for the
-file.
-
-You can also use the ":TlistUpdate" command to update the tags for the current
-buffer after you made some changes to it. You should save the modified buffer
-before you update the taglist window. Otherwise the listed tags will not
-include the new tags created in the buffer. 
-
-If you have deleted the tags displayed for a file in the taglist window using
-the 'd' key, you can again display the tags for that file using the
-":TlistUpdate" command.
-
-Controlling the taglist updates~
-To disable the automatic processing of new files or modified files, you can
-set the 'Tlist_Auto_Update' variable to zero. When this variable is set to
-zero, the taglist is updated only when you use the ":TlistUpdate" command or
-the ":TlistAddFiles" or the ":TlistAddFilesRecursive" commands. You can use
-this option to control which files are added to the taglist.
-
-You can use the ":TlistLock" command to lock the taglist contents. After this
-command is executed, new files are not automatically added to the taglist.
-When the taglist is locked, you can use the ":TlistUpdate" command to add the
-current file or the ":TlistAddFiles" or ":TlistAddFilesRecursive" commands to
-add new files to the taglist.  To unlock the taglist, use the ":TlistUnlock"
-command.
-
-Displaying the tag prototype~
-To display the prototype of the tag under the cursor in the taglist window,
-press the space bar. If you place the cursor on a tag name in the taglist
-window, then the tag prototype is displayed at the Vim status line after
-|'updatetime'| milliseconds. The default value for the |'updatetime'| Vim
-option is 4 seconds.
-
-You can get the name and prototype of a tag without opening the taglist window
-and the taglist menu using the ":TlistShowTag" and the ":TlistShowPrototype"
-commands. These commands will work only if the current file is already present
-in the taglist. To use these commands without opening the taglist window, set
-the 'Tlist_Process_File_Always' variable to 1.
-
-You can use the ":TlistShowTag" command to display the name of the tag at or
-before the specified line number in the specified file.  If the file name and
-line number are not supplied, then this command will display the name of the
-current tag. For example,
->
-	:TlistShowTag
-	:TlistShowTag myfile.java 100
-<
-You can use the ":TlistShowPrototype" command to display the prototype of the
-tag at or before the specified line number in the specified file.  If the file
-name and the line number are not supplied, then this command will display the
-prototype of the current tag.  For example,
->
-	:TlistShowPrototype
-	:TlistShowPrototype myfile.c 50
-<
-In the taglist window, when the mouse is moved over a tag name, the tag
-prototype is displayed in a balloon. This works only in GUI versions where
-balloon evaluation is supported.
-
-Taglist window contents~
-The taglist window contains the tags defined in various files in the taglist
-grouped by the filename and by the tag type (variable, function, class, etc.).
-For tags with scope information (like class members, structures inside
-structures, etc.), the scope information is displayed in square brackets "[]"
-after the tag name.
-
-The contents of the taglist buffer/window are managed by the taglist plugin.
-The |'filetype'| for the taglist buffer is set to 'taglist'.  The Vim
-|'modifiable'| option is turned off for the taglist buffer. You should not
-manually edit the taglist buffer, by setting the |'modifiable'| flag. If you
-manually edit the taglist buffer contents, then the taglist plugin will be out
-of sync with the taglist buffer contents and the plugin will no longer work
-correctly. To redisplay the taglist buffer contents again, close the taglist
-window and reopen it.
-
-Opening and closing the tag and file tree~
-In the taglist window, the tag names are displayed as a foldable tree using
-the Vim folding support. You can collapse the tree using the '-' key or using
-the Vim |zc| fold command. You can open the tree using the '+' key or using
-the Vim |zo| fold command. You can open all the folds using the '*' key or
-using the Vim |zR| fold command. You can also use the mouse to open/close the
-folds. You can close all the folds using the '=' key. You should not manually
-create or delete the folds in the taglist window.
-
-To automatically close the fold for the inactive files/buffers and open only
-the fold for the current buffer in the taglist window, set the
-'Tlist_File_Fold_Auto_Close' variable to 1.
-
-Sorting the tags for a file~
-The tags displayed in the taglist window can be sorted either by their name or
-by their chronological order. The default sorting method is by the order in
-which the tags appear in a file. You can change the default sort method by
-setting the 'Tlist_Sort_Type' variable to either "name" or "order". You can
-sort the tags by their name by pressing the "s" key in the taglist window. You
-can again sort the tags by their chronological order using the "s" key. Each
-file in the taglist window can be sorted using different order.
-
-Zooming in and out of the taglist window~
-You can press the 'x' key in the taglist window to maximize the taglist
-window width/height. The window will be maximized to the maximum possible
-width/height without closing the other existing windows. You can again press
-'x' to restore the taglist window to the default width/height.
-
-						*taglist-session*
-Taglist Session~
-A taglist session refers to the group of files and their tags stored in the
-taglist in a Vim session.
-
-You can save and restore a taglist session (and all the displayed tags) using
-the ":TlistSessionSave" and ":TlistSessionLoad" commands.
-
-To save the information about the tags and files in the taglist to a file, use
-the ":TlistSessionSave" command and specify the filename:
->
-	:TlistSessionSave <file name>
-<
-To load a saved taglist session, use the ":TlistSessionLoad" command: >
-
-	:TlistSessionLoad <file name>
-<
-When you load a taglist session file, the tags stored in the file will be
-added to the tags already stored in the taglist.
-
-The taglist session feature can be used to save the tags for large files or a
-group of frequently used files (like a project). By using the taglist session
-file, you can minimize the amount to time it takes to load/refresh the taglist
-for multiple files.
-
-You can create more than one taglist session file for multiple groups of
-files.
-
-Displaying the tag name in the Vim status line or the window title bar~
-You can use the Tlist_Get_Tagname_By_Line() function provided by the taglist
-plugin to display the current tag name in the Vim status line or the window
-title bar. Similarly, you can use the Tlist_Get_Tag_Prototype_By_Line()
-function to display the current tag prototype in the Vim status line or the
-window title bar.
-
-For example, the following command can be used to display the current tag name
-in the status line:
->
-	:set statusline=%<%f%=%([%{Tlist_Get_Tagname_By_Line()}]%)
-<
-The following command can be used to display the current tag name in the
-window title bar:
->
-	:set title titlestring=%<%f\ %([%{Tlist_Get_Tagname_By_Line()}]%)
-<
-Note that the current tag name can be displayed only after the file is
-processed by the taglist plugin. For this, you have to either set the
-'Tlist_Process_File_Always' variable to 1 or open the taglist window or use
-the taglist menu. For more information about configuring the Vim status line,
-refer to the documentation for the Vim |'statusline'| option.
-
-Changing the taglist window highlighting~
-The following Vim highlight groups are defined and used to highlight the
-various entities in the taglist window:
-
-    TagListTagName  - Used for tag names
-    TagListTagScope - Used for tag scope
-    TagListTitle    - Used for tag titles
-    TagListComment  - Used for comments
-    TagListFileName - Used for filenames
-
-By default, these highlight groups are linked to the standard Vim highlight
-groups. If you want to change the colors used for these highlight groups,
-prefix the highlight group name with 'My' and define it in your .vimrc or
-.gvimrc file: MyTagListTagName, MyTagListTagScope, MyTagListTitle,
-MyTagListComment and MyTagListFileName.  For example, to change the colors
-used for tag names, you can use the following command:
->
-    :highlight MyTagListTagName guifg=blue ctermfg=blue
-<
-Controlling the taglist window~
-To use a horizontally split taglist window, instead of a vertically split
-window, set the 'Tlist_Use_Horiz_Window' variable to 1.
-
-To use a vertically split taglist window on the rightmost side of the Vim
-window, set the 'Tlist_Use_Right_Window' variable to 1.
-
-You can specify the width of the vertically split taglist window, by setting
-the 'Tlist_WinWidth' variable.  You can specify the height of the horizontally
-split taglist window, by setting the 'Tlist_WinHeight' variable.
-
-When opening a vertically split taglist window, the Vim window width is
-increased to accommodate the new taglist window. When the taglist window is
-closed, the Vim window is reduced. To disable this, set the
-'Tlist_Inc_Winwidth' variable to zero.
-
-To reduce the number of empty lines in the taglist window, set the
-'Tlist_Compact_Format' variable to 1.
-
-To not display the Vim fold column in the taglist window, set the
-'Tlist_Enable_Fold_Column' variable to zero.
-
-To display the tag prototypes instead of the tag names in the taglist window,
-set the 'Tlist_Display_Prototype' variable to 1.
-
-To not display the scope of the tags next to the tag names, set the
-'Tlist_Display_Tag_Scope' variable to zero.
-
-						*taglist-keys*
-Taglist window key list~
-The following table lists the description of the keys that can be used
-in the taglist window.
-
-  Key           Description~
-
-  <CR>          Jump to the location where the tag under cursor is
-                defined.
-  o             Jump to the location where the tag under cursor is
-                defined in a new window.
-  P             Jump to the tag in the previous (Ctrl-W_p) window.
-  p             Display the tag definition in the file window and
-                keep the cursor in the taglist window itself.
-  t             Jump to the tag in a new tab. If the file is already
-                opened in a tab, move to that tab.
-  Ctrl-t	Jump to the tag in a new tab.
-  <Space>       Display the prototype of the tag under the cursor.
-  		For file names, display the full path to the file,
-		file type and the number of tags. For tag types, display the
-		tag type and the number of tags.
-  u             Update the tags listed in the taglist window
-  s             Change the sort order of the tags (by name or by order)
-  d             Remove the tags for the file under the cursor
-  x             Zoom-in or Zoom-out the taglist window
-  +             Open a fold
-  -             Close a fold
-  *             Open all folds
-  =             Close all folds
-  [[		Jump to the beginning of the previous file
-  <Backspace>	Jump to the beginning of the previous file
-  ]]		Jump to the beginning of the next file
-  <Tab>		Jump to the beginning of the next file
-  q             Close the taglist window
-  <F1>          Display help
-
-The above keys will work in both the normal mode and the insert mode.
-
-						*taglist-menu*
-Taglist menu~
-When using GUI Vim, the taglist plugin can display the tags defined in the
-current file in the drop-down menu and the popup menu. By default, this
-feature is turned off. To turn on this feature, set the 'Tlist_Show_Menu'
-variable to 1.
-
-You can jump to a tag by selecting the tag name from the menu. You can use the
-taglist menu independent of the taglist window i.e. you don't need to open the
-taglist window to get the taglist menu.
-
-When you switch between files/buffers, the taglist menu is automatically
-updated to display the tags defined in the current file/buffer.
-
-The tags are grouped by their type (variables, functions, classes, methods,
-etc.) and displayed as a separate sub-menu for each type. If all the tags
-defined in a file are of the same type (e.g. functions), then the sub-menu is
-not used.
-
-If the number of items in a tag type submenu exceeds the value specified by
-the 'Tlist_Max_Submenu_Items' variable, then the submenu will be split into
-multiple submenus. The default setting for 'Tlist_Max_Submenu_Items' is 25.
-The first and last tag names in the submenu are used to form the submenu name.
-The menu items are prefixed by alpha-numeric characters for easy selection by
-keyboard.
-
-If the popup menu support is enabled (the |'mousemodel'| option contains
-"popup"), then the tags menu is added to the popup menu. You can access
-the popup menu by right clicking on the GUI window.
-
-You can regenerate the tags menu by selecting the 'Tags->Refresh menu' entry.
-You can sort the tags listed in the menu either by name or by order by
-selecting the 'Tags->Sort menu by->Name/Order' menu entry.
-
-You can tear-off the Tags menu and keep it on the side of the Vim window
-for quickly locating the tags.
-
-Using the taglist plugin with the winmanager plugin~
-You can use the taglist plugin with the winmanager plugin. This will allow you
-to use the file explorer, buffer explorer and the taglist plugin at the same
-time in different windows. To use the taglist plugin with the winmanager
-plugin, set 'TagList' in the 'winManagerWindowLayout' variable. For example,
-to use the file explorer plugin and the taglist plugin at the same time, use
-the following setting: >
-
-	let winManagerWindowLayout = 'FileExplorer|TagList'
-<
-Getting help~
-If you have installed the taglist help file (this file), then you can use the
-Vim ":help taglist-<keyword>" command to get help on the various taglist
-topics.
-
-You can press the <F1> key in the taglist window to display the help
-information about using the taglist window. If you again press the <F1> key,
-the help information is removed from the taglist window.
-
-						*taglist-debug*
-Debugging the taglist plugin~
-You can use the ":TlistDebug" command to enable logging of the debug messages
-from the taglist plugin. To display the logged debug messages, you can use the
-":TlistMessages" command. To disable the logging of the debug messages, use
-the ":TlistUndebug" command.
-
-You can specify a file name to the ":TlistDebug" command to log the debug
-messages to a file. Otherwise, the debug messages are stored in a script-local
-variable. In the later case, to minimize memory usage, only the last 3000
-characters from the debug messages are stored.
-
-==============================================================================
-						*taglist-options*
-6. Options~
-
-A number of Vim variables control the behavior of the taglist plugin. These
-variables are initialized to a default value. By changing these variables you
-can change the behavior of the taglist plugin. You need to change these
-settings only if you want to change the behavior of the taglist plugin. You
-should use the |:let| command in your .vimrc file to change the setting of any
-of these variables. 
-
-The configurable taglist variables are listed below. For a detailed
-description of these variables refer to the text below this table.
-
-|'Tlist_Auto_Highlight_Tag'|	Automatically highlight the current tag in the
-				taglist.
-|'Tlist_Auto_Open'|		Open the taglist window when Vim starts.
-|'Tlist_Auto_Update'|		Automatically update the taglist to include
-				newly edited files.
-|'Tlist_Close_On_Select'|	Close the taglist window when a file or tag is
-				selected.
-|'Tlist_Compact_Format'|	Remove extra information and blank lines from
-       				the taglist window.
-|'Tlist_Ctags_Cmd'|		Specifies the path to the ctags utility.
-|'Tlist_Display_Prototype'|	Show prototypes and not tags in the taglist
-				window.
-|'Tlist_Display_Tag_Scope'|	Show tag scope next to the tag name.
-|'Tlist_Enable_Fold_Column'|	Show the fold indicator column in the taglist
-				window.
-|'Tlist_Exit_OnlyWindow'|	Close Vim if the taglist is the only window.
-|'Tlist_File_Fold_Auto_Close'|	Close tag folds for inactive buffers.
-|'Tlist_GainFocus_On_ToggleOpen'|
-				Jump to taglist window on open.
-|'Tlist_Highlight_Tag_On_BufEnter'|
-				On entering a buffer, automatically highlight
-				the current tag.
-|'Tlist_Inc_Winwidth'|		Increase the Vim window width to accommodate
-				the taglist window.
-|'Tlist_Max_Submenu_Items'|	Maximum number of items in a tags sub-menu.
-|'Tlist_Max_Tag_Length'|	Maximum tag length used in a tag menu entry.
-|'Tlist_Process_File_Always'|	Process files even when the taglist window is
-				closed.
-|'Tlist_Show_Menu'|		Display the tags menu.
-|'Tlist_Show_One_File'|		Show tags for the current buffer only.
-|'Tlist_Sort_Type'|		Sort method used for arranging the tags.
-|'Tlist_Use_Horiz_Window'|	Use a horizontally split window for the
-				taglist window.
-|'Tlist_Use_Right_Window'|	Place the taglist window on the right side.
-|'Tlist_Use_SingleClick'|	Single click on a tag jumps to it.
-|'Tlist_WinHeight'|		Horizontally split taglist window height.
-|'Tlist_WinWidth'|		Vertically split taglist window width.
-
-						*'Tlist_Auto_Highlight_Tag'*
-Tlist_Auto_Highlight_Tag~
-The taglist plugin will automatically highlight the current tag in the taglist
-window. If you want to disable this, then you can set the
-'Tlist_Auto_Highlight_Tag' variable to zero. Note that even though the current
-tag highlighting is disabled, the tags for a new file will still be added to
-the taglist window.
->
-	let Tlist_Auto_Highlight_Tag = 0
-<
-With the above variable set to 1, you can use the ":TlistHighlightTag" command
-to highlight the current tag.
-
-						*'Tlist_Auto_Open'*
-Tlist_Auto_Open~
-To automatically open the taglist window, when you start Vim, you can set the
-'Tlist_Auto_Open' variable to 1. By default, this variable is set to zero and
-the taglist window will not be opened automatically on Vim startup.
->
-	let Tlist_Auto_Open = 1
-<
-The taglist window is opened only when a supported type of file is opened on
-Vim startup. For example, if you open text files, then the taglist window will
-not be opened.
-
-						*'Tlist_Auto_Update'*
-Tlist_Auto_Update~
-When a new file is edited, the tags defined in the file are automatically
-processed and added to the taglist. To stop adding new files to the taglist,
-set the 'Tlist_Auto_Update' variable to zero. By default, this variable is set
-to 1.
->
-	let Tlist_Auto_Update = 0
-<
-With the above variable set to 1, you can use the ":TlistUpdate" command to
-add the tags defined in the current file to the taglist.
-
-						*'Tlist_Close_On_Select'*
-Tlist_Close_On_Select~
-If you want to close the taglist window when a file or tag is selected, then
-set the 'Tlist_Close_On_Select' variable to 1. By default, this variable is
-set zero and when you select a tag or file from the taglist window, the window
-is not closed.
->
-	let Tlist_Close_On_Select = 1
-<
-						*'Tlist_Compact_Format'*
-Tlist_Compact_Format~
-By default, empty lines are used to separate different tag types displayed for
-a file and the tags displayed for different files in the taglist window. If
-you want to display as many tags as possible in the taglist window, you can
-set the 'Tlist_Compact_Format' variable to 1 to get a compact display.
->
-	let Tlist_Compact_Format = 1
-<
-						*'Tlist_Ctags_Cmd'*
-Tlist_Ctags_Cmd~
-The 'Tlist_Ctags_Cmd' variable specifies the location (path) of the exuberant
-ctags utility. If exuberant ctags is present in any one of the directories in
-the PATH environment variable, then there is no need to set this variable.
-
-The exuberant ctags tool can be installed under different names.  When the
-taglist plugin starts up, if the 'Tlist_Ctags_Cmd' variable is not set, it
-checks for the names exuberant-ctags, exctags, ctags, ctags.exe and tags in
-the PATH environment variable.  If any one of the named executable is found,
-then the Tlist_Ctags_Cmd variable is set to that name.
-
-If exuberant ctags is not present in one of the directories specified in the
-PATH environment variable, then set this variable to point to the location of
-the ctags utility in your system. Note that this variable should point to the
-fully qualified exuberant ctags location and NOT to the directory in which
-exuberant ctags is installed. If the exuberant ctags tool is not found in
-either PATH or in the specified location, then the taglist plugin will not be
-loaded. Examples:
->
-	let Tlist_Ctags_Cmd = 'd:\tools\ctags.exe'
-	let Tlist_Ctags_Cmd = '/usr/local/bin/ctags'
-<
-						*'Tlist_Display_Prototype'*
-Tlist_Display_Prototype~
-By default, only the tag name will be displayed in the taglist window. If you
-like to see tag prototypes instead of names, set the 'Tlist_Display_Prototype'
-variable to 1. By default, this variable is set to zero and only tag names
-will be displayed.
->
-	let Tlist_Display_Prototype = 1
-<
-						*'Tlist_Display_Tag_Scope'*
-Tlist_Display_Tag_Scope~
-By default, the scope of a tag (like a C++ class) will be displayed in
-square brackets next to the tag name. If you don't want the tag scopes
-to be displayed, then set the 'Tlist_Display_Tag_Scope' to zero. By default,
-this variable is set to 1 and the tag scopes will be displayed.
->
-	let Tlist_Display_Tag_Scope = 0
-<
-						*'Tlist_Enable_Fold_Column'*
-Tlist_Enable_Fold_Column~
-By default, the Vim fold column is enabled and displayed in the taglist
-window. If you wish to disable this (for example, when you are working with a
-narrow Vim window or terminal), you can set the 'Tlist_Enable_Fold_Column'
-variable to zero.
->
-	let Tlist_Enable_Fold_Column = 1
-<
-						*'Tlist_Exit_OnlyWindow'*
-Tlist_Exit_OnlyWindow~
-If you want to exit Vim if only the taglist window is currently opened, then
-set the 'Tlist_Exit_OnlyWindow' variable to 1. By default, this variable is
-set to zero and the Vim instance will not be closed if only the taglist window
-is present.
->
-	let Tlist_Exit_OnlyWindow = 1
-<
-						*'Tlist_File_Fold_Auto_Close'*
-Tlist_File_Fold_Auto_Close~
-By default, the tags tree displayed in the taglist window for all the files is
-opened. You can close/fold the tags tree for the files manually. To
-automatically close the tags tree for inactive files, you can set the
-'Tlist_File_Fold_Auto_Close' variable to 1. When this variable is set to 1,
-the tags tree for the current buffer is automatically opened and for all the
-other buffers is closed.
->
-	let Tlist_File_Fold_Auto_Close = 1
-<
-					    *'Tlist_GainFocus_On_ToggleOpen'*
-Tlist_GainFocus_On_ToggleOpen~
-When the taglist window is opened using the ':TlistToggle' command, this
-option controls whether the cursor is moved to the taglist window or remains
-in the current window. By default, this option is set to 0 and the cursor
-remains in the current window. When this variable is set to 1, the cursor
-moves to the taglist window after opening the taglist window.
->
-	let Tlist_GainFocus_On_ToggleOpen = 1
-<
-					    *'Tlist_Highlight_Tag_On_BufEnter'*
-Tlist_Highlight_Tag_On_BufEnter~
-When you enter a Vim buffer/window, the current tag in that buffer/window is
-automatically highlighted in the taglist window. If the current tag name is
-not visible in the taglist window, then the taglist window contents are
-scrolled to make that tag name visible. If you like to disable the automatic
-highlighting of the current tag when entering a buffer, you can set the
-'Tlist_Highlight_Tag_On_BufEnter' variable to zero. The default setting for
-this variable is 1.
->
-	let Tlist_Highlight_Tag_On_BufEnter = 0
-<
-						*'Tlist_Inc_Winwidth'*
-Tlist_Inc_Winwidth~
-By default, when the width of the window is less than 100 and a new taglist
-window is opened vertically, then the window width is increased by the value
-set in the 'Tlist_WinWidth' variable to accommodate the new window. The value
-of this variable is used only if you are using a vertically split taglist
-window.
-
-If your terminal doesn't support changing the window width from Vim (older
-version of xterm running in a Unix system) or if you see any weird problems in
-the screen due to the change in the window width or if you prefer not to
-adjust the window width then set the 'Tlist_Inc_Winwidth' variable to zero.
-CAUTION: If you are using the MS-Windows version of Vim in a MS-DOS command
-window then you must set this variable to zero, otherwise the system may hang
-due to a Vim limitation (explained in :help win32-problems)
->
-	let Tlist_Inc_Winwidth = 0
-<
-						*'Tlist_Max_Submenu_Items'*
-Tlist_Max_Submenu_Items~
-If a file contains too many tags of a particular type (function, variable,
-class, etc.), greater than that specified by the 'Tlist_Max_Submenu_Items'
-variable, then the menu for that tag type will be split into multiple
-sub-menus. The default setting for the 'Tlist_Max_Submenu_Items' variable is
-25.  This can be changed by setting the 'Tlist_Max_Submenu_Items' variable:
->
-	let Tlist_Max_Submenu_Items = 20
-<
-The name of the submenu is formed using the names of the first and the last
-tag entries in that submenu.
-
-						*'Tlist_Max_Tag_Length'*
-Tlist_Max_Tag_Length~
-Only the first 'Tlist_Max_Tag_Length' characters from the tag names will be
-used to form the tag type submenu name. The default value for this variable is
-10.  Change the 'Tlist_Max_Tag_Length' setting if you want to include more or
-less characters:
->
-	let Tlist_Max_Tag_Length = 10
-<
-						*'Tlist_Process_File_Always'*
-Tlist_Process_File_Always~
-By default, the taglist plugin will generate and process the tags defined in
-the newly opened files only when the taglist window is opened or when the
-taglist menu is enabled. When the taglist window is closed, the taglist plugin
-will stop processing the tags for newly opened files.
-
-You can set the 'Tlist_Process_File_Always' variable to 1 to generate the list
-of tags for new files even when the taglist window is closed and the taglist
-menu is disabled.
->
-	let Tlist_Process_File_Always = 1
-<
-To use the ":TlistShowTag" and the ":TlistShowPrototype" commands without the
-taglist window and the taglist menu, you should set this variable to 1.
-
-						*'Tlist_Show_Menu'*
-Tlist_Show_Menu~
-When using GUI Vim, you can display the tags defined in the current file in a
-menu named "Tags". By default, this feature is turned off. To turn on this
-feature, set the 'Tlist_Show_Menu' variable to 1:
->
-	let Tlist_Show_Menu = 1
-<
-						*'Tlist_Show_One_File'*
-Tlist_Show_One_File~
-By default, the taglist plugin will display the tags defined in all the loaded
-buffers in the taglist window. If you prefer to display the tags defined only
-in the current buffer, then you can set the 'Tlist_Show_One_File' to 1. When
-this variable is set to 1, as you switch between buffers, the taglist window
-will be refreshed to display the tags for the current buffer and the tags for
-the previous buffer will be removed.
->
-	let Tlist_Show_One_File = 1
-<
-						*'Tlist_Sort_Type'*
-Tlist_Sort_Type~
-The 'Tlist_Sort_Type' variable specifies the sort order for the tags in the
-taglist window. The tags can be sorted either alphabetically by their name or
-by the order of their appearance in the file (chronological order). By
-default, the tag names will be listed by the order in which they are defined
-in the file. You can change the sort type (from name to order or from order to
-name) by pressing the "s" key in the taglist window. You can also change the
-default sort order by setting 'Tlist_Sort_Type' to "name" or "order":
->
-	let Tlist_Sort_Type = "name"
-<
-						*'Tlist_Use_Horiz_Window'*
-Tlist_Use_Horiz_Window~
-Be default, the tag names are displayed in a vertically split window. If you
-prefer a horizontally split window, then set the 'Tlist_Use_Horiz_Window'
-variable to 1. If you are running MS-Windows version of Vim in a MS-DOS
-command window, then you should use a horizontally split window instead of a
-vertically split window. Also, if you are using an older version of xterm in a
-Unix system that doesn't support changing the xterm window width, you should
-use a horizontally split window.
->
-	let Tlist_Use_Horiz_Window = 1
-<
-						*'Tlist_Use_Right_Window'*
-Tlist_Use_Right_Window~
-By default, the vertically split taglist window will appear on the left hand
-side. If you prefer to open the window on the right hand side, you can set the
-'Tlist_Use_Right_Window' variable to 1:
->
-	let Tlist_Use_Right_Window = 1
-<
-						*'Tlist_Use_SingleClick'*
-Tlist_Use_SingleClick~
-By default, when you double click on the tag name using the left mouse 
-button, the cursor will be positioned at the definition of the tag. You 
-can set the 'Tlist_Use_SingleClick' variable to 1 to jump to a tag when
-you single click on the tag name using the mouse. By default this variable
-is set to zero.
->
-	let Tlist_Use_SingleClick = 1
-<
-Due to a bug in Vim, if you set 'Tlist_Use_SingleClick' to 1 and try to resize
-the taglist window using the mouse, then Vim will crash. This problem is fixed
-in Vim 6.3 and above. In the meantime, instead of resizing the taglist window
-using the mouse, you can use normal Vim window resizing commands to resize the
-taglist window.
-
-						*'Tlist_WinHeight'*
-Tlist_WinHeight~
-The default height of the horizontally split taglist window is 10. This can be
-changed by modifying the 'Tlist_WinHeight' variable:
->
-	let Tlist_WinHeight = 20
-<
-The |'winfixheight'| option is set for the taglist window, to maintain the
-height of the taglist window, when new Vim windows are opened and existing
-windows are closed.
-
-						*'Tlist_WinWidth'*
-Tlist_WinWidth~
-The default width of the vertically split taglist window is 30. This can be
-changed by modifying the 'Tlist_WinWidth' variable:
->
-	let Tlist_WinWidth = 20
-<
-Note that the value of the |'winwidth'| option setting determines the minimum
-width of the current window. If you set the 'Tlist_WinWidth' variable to a
-value less than that of the |'winwidth'| option setting, then Vim will use the
-value of the |'winwidth'| option.
-
-When new Vim windows are opened and existing windows are closed, the taglist
-plugin will try to maintain the width of the taglist window to the size
-specified by the 'Tlist_WinWidth' variable.
-
-==============================================================================
-						*taglist-commands*
-7. Commands~
-
-The taglist plugin provides the following ex-mode commands:
-
-|:TlistAddFiles|	Add multiple files to the taglist.
-|:TlistAddFilesRecursive|
-			Add files recursively to the taglist.
-|:TlistClose|		Close the taglist window.
-|:TlistDebug|		Start logging of taglist debug messages.
-|:TlistLock|		Stop adding new files to the taglist.
-|:TlistMessages|	Display the logged taglist plugin debug messages.
-|:TlistOpen|		Open and jump to the taglist window.
-|:TlistSessionSave|	Save the information about files and tags in the
-			taglist to a session file.
-|:TlistSessionLoad|	Load the information about files and tags stored
-			in a session file to taglist.
-|:TlistShowPrototype|	Display the prototype of the tag at or before the
-		    	specified line number.
-|:TlistShowTag|		Display the name of the tag defined at or before the
-			specified line number.
-|:TlistHighlightTag|	Highlight the current tag in the taglist window.
-|:TlistToggle|		Open or close (toggle) the taglist window.
-|:TlistUndebug|		Stop logging of taglist debug messages.
-|:TlistUnlock|		Start adding new files to the taglist.
-|:TlistUpdate|		Update the tags for the current buffer.
-
-						*:TlistAddFiles*
-:TlistAddFiles {file(s)} [file(s) ...]
-		Add one or more specified files to the taglist. You can
-		specify multiple filenames using wildcards. To specify a
-		file name with space character, you should escape the space
-		character with a backslash.
-		Examples:
->
-		    :TlistAddFiles *.c *.cpp
-		    :TlistAddFiles file1.html file2.html
-<
-		If you specify a large number of files, then it will take some
-		time for the taglist plugin to process all of them. The
-		specified files will not be edited in a Vim window and will
-		not be added to the Vim buffer list.
-
-						*:TlistAddFilesRecursive*
-:TlistAddFilesRecursive {directory} [ {pattern} ]
-		Add files matching {pattern} recursively from the specified
-		{directory} to the taglist. If {pattern} is not specified,
-		then '*' is assumed. To specify the current directory, use "."
-		for {directory}. To specify a directory name with space
-		character, you should escape the space character with a
-		backslash.
-		Examples:
->
-		    :TlistAddFilesRecursive myproject *.java
-		    :TlistAddFilesRecursive smallproject
-<
-		If large number of files are present in the specified
-		directory tree, then it will take some time for the taglist
-		plugin to process all of them.
-
-						*:TlistClose*
-:TlistClose	Close the taglist window. This command can be used from any
-		one of the Vim windows.
-
-						*:TlistDebug*
-:TlistDebug [filename]
-		Start logging of debug messages from the taglist plugin.
-		If {filename} is specified, then the debug messages are stored
-		in the specified file. Otherwise, the debug messages are
-		stored in a script local variable. If the file {filename} is
-		already present, then it is overwritten.
-
-						*:TlistLock*
-:TlistLock
-		Lock the taglist and don't process new files. After this
-		command is executed, newly edited files will not be added to
-		the taglist.
-
-						*:TlistMessages*
-:TlistMessages
-		Display the logged debug messages from the taglist plugin
-		in a window.  This command works only when logging to a
-		script-local variable.
-
-						*:TlistOpen*
-:TlistOpen	Open and jump to the taglist window. Creates the taglist
-		window, if the window is not opened currently. After executing
-		this command, the cursor is moved to the taglist window.  When
-		the taglist window is opened for the first time, all the files
-		in the buffer list are processed and the tags defined in them
-		are displayed in the taglist window.
-
-						*:TlistSessionSave*
-:TlistSessionSave {filename}
-		Saves the information about files and tags in the taglist to
-		the specified file. This command can be used to save and
-		restore the taglist contents across Vim sessions.
-
-						*:TlistSessionLoad*
-:TlistSessionLoad {filename}
-		Load the information about files and tags stored in the
-		specified session file to the taglist.
-
-						*:TlistShowPrototype*
-:TlistShowPrototype [filename] [linenumber]
-		Display the prototype of the tag at or before the specified
-		line number. If the file name and the line number are not
-		specified, then the current file name and line number are
-		used. A tag spans multiple lines starting from the line where
-		it is defined to the line before the next tag. This command
-		displays the prototype for the tag for any line number in this
-		range. 
-
-						*:TlistShowTag*
-:TlistShowTag [filename] [linenumber]
-		Display the name of the tag defined at or before the specified
-		line number. If the file name and the line number are not
-		specified, then the current file name and line number are
-		used. A tag spans multiple lines starting from the line where
-		it is defined to the line before the next tag. This command
-		displays the tag name for any line number in this range. 
-
-						*:TlistHighlightTag*
-:TlistHighlightTag
-		Highlight the current tag in the taglist window. By default,
-		the taglist plugin periodically updates the taglist window to
-		highlight the current tag. This command can be used to force
-		the taglist plugin to highlight the current tag.
-
-						*:TlistToggle*
-:TlistToggle	Open or close (toggle) the taglist window. Opens the taglist
-		window, if the window is not opened currently. Closes the
-		taglist window, if the taglist window is already opened. When
-		the taglist window is opened for the first time, all the files
-		in the buffer list are processed and the tags are displayed in
-		the taglist window. After executing this command, the cursor
-		is not moved from the current window to the taglist window.
-
-						*:TlistUndebug*
-:TlistUndebug
-		Stop logging of debug messages from the taglist plugin.
-
-						*:TlistUnlock*
-:TlistUnlock
-		Unlock the taglist and start processing newly edited files.
-
-						*:TlistUpdate*
-:TlistUpdate	Update the tags information for the current buffer. This
-		command can be used to re-process the current file/buffer and
-		get the tags information. As the taglist plugin uses the file
-		saved in the disk (instead of the file displayed in a Vim
-		buffer), you should save a modified buffer before you update
-		the taglist. Otherwise the listed tags will not include the
-		new tags created in the buffer. You can use this command even
-		when the taglist window is not opened.
-
-==============================================================================
-						*taglist-functions*
-8. Global functions~
-
-The taglist plugin provides several global functions that can be used from
-other Vim plugins to interact with the taglist plugin. These functions are
-described below.
-
-|Tlist_Update_File_Tags()|		Update the tags for the specified file
-|Tlist_Get_Tag_Prototype_By_Line()|	Return the prototype of the tag at or
-				    	before the specified line number in the
-				    	specified file.
-|Tlist_Get_Tagname_By_Line()|		Return the name of the tag at or
-					before the specified line number in
-					the specified file.
-|Tlist_Set_App()|			Set the name of the application
-					controlling the taglist window.
-
-					    *Tlist_Update_File_Tags()*
-Tlist_Update_File_Tags({filename}, {filetype})
-		Update the tags for the file {filename}. The second argument
-		specifies the Vim filetype for the file. If the taglist plugin
-		has not processed the file previously, then the exuberant
-		ctags tool is invoked to generate the tags for the file.
-
-					    *Tlist_Get_Tag_Prototype_By_Line()*
-Tlist_Get_Tag_Prototype_By_Line([{filename}, {linenumber}])
-		Return the prototype of the tag at or before the specified
-		line number in the specified file. If the filename and line
-		number are not specified, then the current buffer name and the
-		current line number are used.
-
-					    *Tlist_Get_Tagname_By_Line()*
-Tlist_Get_Tagname_By_Line([{filename}, {linenumber}])
-		Return the name of the tag at or before the specified line
-		number in the specified file. If the filename and line number
-		are not specified, then the current buffer name and the
-		current line number are used.
-
-					    *Tlist_Set_App()*
-Tlist_Set_App({appname})
-		Set the name of the plugin that controls the taglist plugin
-		window and buffer. This can be used to integrate the taglist
-		plugin with other Vim plugins.
-		
-		For example, the winmanager plugin and the Cream package use
-		this function and specify the appname as "winmanager" and
-		"cream" respectively.
-		
-		By default, the taglist plugin is a stand-alone plugin and
-		controls the taglist window and buffer. If the taglist window
-		is controlled by an external plugin, then the appname should
-		be set appropriately.
-
-==============================================================================
-						*taglist-extend*
-9. Extending~
-
-The taglist plugin supports all the languages supported by the exuberant ctags
-tool, which includes the following languages: Assembly, ASP, Awk, Beta, C,
-C++, C#, Cobol, Eiffel, Erlang, Fortran, HTML, Java, Javascript, Lisp, Lua,
-Make, Pascal, Perl, PHP, Python, Rexx, Ruby, Scheme, Shell, Slang, SML, Sql,
-TCL, Verilog, Vim and Yacc.
-
-You can extend the taglist plugin to add support for new languages and also
-modify the support for the above listed languages.
-
-You should NOT make modifications to the taglist plugin script file to add
-support for new languages. You will lose these changes when you upgrade to the
-next version of the taglist plugin. Instead you should follow the below
-described instructions to extend the taglist plugin.
-
-You can extend the taglist plugin by setting variables in the .vimrc or _vimrc
-file. The name of these variables depends on the language name and is
-described below.
-
-Modifying support for an existing language~
-To modify the support for an already supported language, you have to set the
-tlist_xxx_settings variable in the ~/.vimrc or $HOME/_vimrc file. Replace xxx
-with the Vim filetype name for the language file.  For example, to modify the
-support for the perl language files, you have to set the tlist_perl_settings
-variable. To modify the support for java files, you have to set the
-tlist_java_settings variable.
-
-To determine the filetype name used by Vim for a file, use the following
-command in the buffer containing the file:
-
-	:set filetype
-
-The above command will display the Vim filetype for the current buffer.
-
-The format of the value set in the tlist_xxx_settings variable is
-
-    <language_name>;flag1:name1;flag2:name2;flag3:name3
-
-The different fields in the value are separated by the ';' character.
-
-The first field 'language_name' is the name used by exuberant ctags to refer
-to this language file. This name can be different from the file type name used
-by Vim. For example, for C++, the language name used by ctags is 'c++' but the
-filetype name used by Vim is 'cpp'. To get the list of language names
-supported by exuberant ctags, use the following command:
-
-	$ ctags --list-maps=all
-
-The remaining fields follow the format "flag:name". The sub-field 'flag' is
-the language specific flag used by exuberant ctags to generate the
-corresponding tags. For example, for the C language, to list only the
-functions, the 'f' flag is used. To get the list of flags supported by
-exuberant ctags for the various languages use the following command:
-
-	$ ctags --list-kinds=all
-
-The sub-field 'name' specifies the title text to use for displaying the tags
-of a particular type. For example, 'name' can be set to 'functions'. This
-field can be set to any text string name.
-
-For example, to list only the classes and functions defined in a C++ language
-file, add the following line to your .vimrc file:
-
-	let tlist_cpp_settings = 'c++;c:class;f:function'
-
-In the above setting, 'cpp' is the Vim filetype name and 'c++' is the name
-used by the exuberant ctags tool. 'c' and 'f' are the flags passed to
-exuberant ctags to list C++ classes and functions and 'class' is the title
-used for the class tags and 'function' is the title used for the function tags
-in the taglist window.
-
-For example, to display only functions defined in a C file and to use "My
-Functions" as the title for the function tags, use
-
-	let tlist_c_settings = 'c;f:My Functions'
-
-When you set the tlist_xxx_settings variable, you will override the default
-setting used by the taglist plugin for the 'xxx' language. You cannot add to
-the default options used by the taglist plugin for a particular file type. To
-add to the options used by the taglist plugin for a language, copy the option
-values from the taglist plugin file to your .vimrc file and modify it.
-
-Adding support for a new language~
-If you want to add support for a new language to the taglist plugin, you need
-to first extend the exuberant ctags tool. For more information about extending
-exuberant ctags, visit the following page:
-
-    http://ctags.sourceforge.net/EXTENDING.html
-
-To add support for a new language, set the tlist_xxx_settings variable in the
-~/.vimrc file appropriately as described above. Replace 'xxx' in the variable
-name with the Vim filetype name for the new language.
-
-For example, to extend the taglist plugin to support the latex language, you
-can use the following line (assuming, you have already extended exuberant
-ctags to support the latex language):
-
-	let tlist_tex_settings='latex;b:bibitem;c:command;l:label'
-
-With the above line, when you edit files of filetype "tex" in Vim, the taglist
-plugin will invoke the exuberant ctags tool passing the "latex" filetype and
-the flags b, c and l to generate the tags. The text heading 'bibitem',
-'command' and 'label' will be used in the taglist window for the tags which
-are generated for the flags b, c and l respectively.
-
-==============================================================================
-						*taglist-faq*
-10. Frequently Asked Questions~
-
-Q. The taglist plugin doesn't work. The taglist window is empty and the tags
-   defined in a file are not displayed. 
-A. Are you using Vim version 6.0 and above? The taglist plugin relies on the
-   features supported by Vim version 6.0 and above. You can use the following
-   command to get the Vim version:
->
-	$ vim --version
-<
-   Are you using exuberant ctags version 5.0 and above? The taglist plugin
-   relies on the features supported by exuberant ctags and will not work with
-   GNU ctags or the Unix ctags utility. You can use the following command to
-   determine whether the ctags installed in your system is exuberant ctags:
->
-	$ ctags --version
-<
-   Is exuberant ctags present in one of the directories in your PATH? If not,
-   you need to set the Tlist_Ctags_Cmd variable to point to the location of
-   exuberant ctags. Use the following Vim command to verify that this is setup
-   correctly:
->
-	:echo system(Tlist_Ctags_Cmd . ' --version')
-<
-   The above command should display the version information for exuberant
-   ctags.
-
-   Did you turn on the Vim filetype detection? The taglist plugin relies on
-   the filetype detected by Vim and passes the filetype to the exuberant ctags
-   utility to parse the tags. Check the output of the following Vim command:
->
-	:filetype
-<
-   The output of the above command should contain "filetype detection:ON".
-   To turn on the filetype detection, add the following line to the .vimrc or
-   _vimrc file:
->
-	filetype on
-<
-   Is your version of Vim compiled with the support for the system() function?
-   The following Vim command should display 1:
->
-	:echo exists('*system')
-<
-   In some Linux distributions (particularly Suse Linux), the default Vim
-   installation is built without the support for the system() function. The
-   taglist plugin uses the system() function to invoke the exuberant ctags
-   utility. You need to rebuild Vim after enabling the support for the
-   system() function. If you use the default build options, the system()
-   function will be supported. 
-
-   Do you have the |'shellslash'| option set? You can try disabling the
-   |'shellslash'| option. When the taglist plugin invokes the exuberant ctags
-   utility with the path to the file, if the incorrect slashes are used, then
-   you will see errors.
-   
-   Check the shell related Vim options values using the following command:
->
-	:set shell? shellcmdflag? shellpipe?
-	:set shellquote? shellredir? shellxquote?
-<
-   If these options are set in your .vimrc or _vimrc file, try removing those
-   lines.
-
-   Are you using a Unix shell in a MS-Windows environment? For example,
-   the Unix shell from the MKS-toolkit. Do you have the SHELL environment
-   set to point to this shell? You can try resetting the SHELL environment
-   variable.
-
-   If you are using a Unix shell on MS-Windows, you should try to use
-   exuberant ctags that is compiled for Unix-like environments so that
-   exuberant ctags will understand path names with forward slash characters.
-
-   Is your filetype supported by the exuberant ctags utility? The file types
-   supported by the exuberant ctags utility are listed in the ctags help. If a
-   file type is not supported, you have to extend exuberant ctags. You can use
-   the following command to list the filetypes supported by exuberant ctags:
->
-	ctags --list-languages
-<
-   Run the following command from the shell prompt and check whether the tags
-   defined in your file are listed in the output from exuberant ctags:
->
-	ctags -f - --format=2 --excmd=pattern --fields=nks <filename>
-<
-   If you see your tags in the output from the above command, then the
-   exuberant ctags utility is properly parsing your file.
-
-   Do you have the .ctags or _ctags or the ctags.cnf file in your home
-   directory for specifying default options or for extending exuberant ctags?
-   If you do have this file, check the options in this file and make sure
-   these options are not interfering with the operation of the taglist plugin.
-
-   If you are using MS-Windows, check the value of the TEMP and TMP
-   environment variables. If these environment variables are set to a path
-   with space characters in the name, then try using the DOS 8.3 short name
-   for the path or set them to a path without the space characters in the
-   name. For example, if the temporary directory name is "C:\Documents and
-   Settings\xyz\Local Settings\Temp", then try setting the TEMP variable to
-   the following:
->
-	set TEMP=C:\DOCUMEN~1\xyz\LOCALS~1\Temp
-<
-   If exuberant ctags is installed in a directory with space characters in the
-   name, then try adding the directory to the PATH environment variable or try
-   setting the 'Tlist_Ctags_Cmd' variable to the shortest path name to ctags
-   or try copying the exuberant ctags to a path without space characters in
-   the name. For example, if exuberant ctags is installed in the directory
-   "C:\Program Files\Ctags", then try setting the 'Tlist_Ctags_Cmd' variable
-   as below:
->
-	let Tlist_Ctags_Cmd='C:\Progra~1\Ctags\ctags.exe'
-<
-   If you are using a cygwin compiled version of exuberant ctags on MS-Windows,
-   make sure that either you have the cygwin compiled sort utility installed
-   and available in your PATH or compile exuberant ctags with internal sort
-   support. Otherwise, when exuberant ctags sorts the tags output by invoking
-   the sort utility, it may end up invoking the MS-Windows version of
-   sort.exe, thereby resulting in failure.
-
-Q. When I try to open the taglist window, I am seeing the following error
-   message. How do I fix this problem?
-
-   Taglist: Failed to generate tags for /my/path/to/file
-   ctags: illegal option -- -^@usage: ctags [-BFadtuwvx] [-f tagsfile] file ...
-
-A. The taglist plugin will work only with the exuberant ctags tool. You
-   cannot use the GNU ctags or the Unix ctags program with the taglist plugin.
-   You will see an error message similar to the one shown above, if you try
-   use a non-exuberant ctags program with Vim. To fix this problem, either add
-   the exuberant ctags tool location to the PATH environment variable or set
-   the 'Tlist_Ctags_Cmd' variable.
-
-Q. A file has more than one tag with the same name. When I select a tag name
-   from the taglist window, the cursor is positioned at the incorrect tag
-   location. 
-A. The taglist plugin uses the search pattern generated by the exuberant ctags
-   utility to position the cursor at the location of a tag definition. If a
-   file has more than one tag with the same name and same prototype, then the
-   search pattern will be the same. In this case, when searching for the tag
-   pattern, the cursor may be positioned at the incorrect location. 
-
-Q. I have made some modifications to my file and introduced new
-   functions/classes/variables. I have not yet saved my file. The taglist
-   plugin is not displaying the new tags when I update the taglist window.
-A. The exuberant ctags utility will process only files that are present in the
-   disk. To list the tags defined in a file, you have to save the file and
-   then update the taglist window. 
-
-Q. I have created a ctags file using the exuberant ctags utility for my source
-   tree. How do I configure the taglist plugin to use this tags file? 
-A. The taglist plugin doesn't use a tags file stored in disk. For every opened
-   file, the taglist plugin invokes the exuberant ctags utility to get the
-   list of tags dynamically. The Vim system() function is used to invoke
-   exuberant ctags and get the ctags output. This function internally uses a
-   temporary file to store the output. This file is deleted after the output
-   from the command is read. So you will never see the file that contains the
-   output of exuberant ctags.
-
-Q. When I set the |'updatetime'| option to a low value (less than 1000) and if
-   I keep pressing a key with the taglist window open, the current buffer
-   contents are changed. Why is this?
-A. The taglist plugin uses the |CursorHold| autocmd to highlight the current
-   tag. The CursorHold autocmd triggers for every |'updatetime'| milliseconds.
-   If the |'updatetime'| option is set to a low value, then the CursorHold
-   autocmd will be triggered frequently. As the taglist plugin changes
-   the focus to the taglist window to highlight the current tag, this could
-   interfere with the key movement resulting in changing the contents of
-   the current buffer. The workaround for this problem is to not set the
-   |'updatetime'| option to a low value.
-
-==============================================================================
-						*taglist-license*
-11. License~
-Permission is hereby granted to use and distribute the taglist plugin, with or
-without modifications, provided that this copyright notice is copied with it.
-Like anything else that's free, taglist.vim is provided *as is* and comes with
-no warranty of any kind, either expressed or implied. In no event will the
-copyright holder be liable for any damamges resulting from the use of this
-software.
-
-==============================================================================
-						*taglist-todo*
-12. Todo~
-
-1. Group tags according to the scope and display them. For example,
-   group all the tags belonging to a C++/Java class 
-2. Support for displaying tags in a modified (not-yet-saved) file. 
-3. Automatically open the taglist window only for selected filetypes.
-   For other filetypes, close the taglist window. 
-4. When using the shell from the MKS toolkit, the taglist plugin 
-   doesn't work.
-5. The taglist plugin doesn't work with files edited remotely using the
-   netrw plugin. The exuberant ctags utility cannot process files over
-   scp/rcp/ftp, etc.
-
-==============================================================================
-
-vim:tw=78:ts=8:noet:ft=help:
diff --git a/sources_non_forked/taglist/doc/tags b/sources_non_forked/taglist/doc/tags
deleted file mode 100644
index 83e80ba1..00000000
--- a/sources_non_forked/taglist/doc/tags
+++ /dev/null
@@ -1,62 +0,0 @@
-'Tlist_Auto_Highlight_Tag'	taglist.txt	/*'Tlist_Auto_Highlight_Tag'*
-'Tlist_Auto_Open'	taglist.txt	/*'Tlist_Auto_Open'*
-'Tlist_Auto_Update'	taglist.txt	/*'Tlist_Auto_Update'*
-'Tlist_Close_On_Select'	taglist.txt	/*'Tlist_Close_On_Select'*
-'Tlist_Compact_Format'	taglist.txt	/*'Tlist_Compact_Format'*
-'Tlist_Ctags_Cmd'	taglist.txt	/*'Tlist_Ctags_Cmd'*
-'Tlist_Display_Prototype'	taglist.txt	/*'Tlist_Display_Prototype'*
-'Tlist_Display_Tag_Scope'	taglist.txt	/*'Tlist_Display_Tag_Scope'*
-'Tlist_Enable_Fold_Column'	taglist.txt	/*'Tlist_Enable_Fold_Column'*
-'Tlist_Exit_OnlyWindow'	taglist.txt	/*'Tlist_Exit_OnlyWindow'*
-'Tlist_File_Fold_Auto_Close'	taglist.txt	/*'Tlist_File_Fold_Auto_Close'*
-'Tlist_GainFocus_On_ToggleOpen'	taglist.txt	/*'Tlist_GainFocus_On_ToggleOpen'*
-'Tlist_Highlight_Tag_On_BufEnter'	taglist.txt	/*'Tlist_Highlight_Tag_On_BufEnter'*
-'Tlist_Inc_Winwidth'	taglist.txt	/*'Tlist_Inc_Winwidth'*
-'Tlist_Max_Submenu_Items'	taglist.txt	/*'Tlist_Max_Submenu_Items'*
-'Tlist_Max_Tag_Length'	taglist.txt	/*'Tlist_Max_Tag_Length'*
-'Tlist_Process_File_Always'	taglist.txt	/*'Tlist_Process_File_Always'*
-'Tlist_Show_Menu'	taglist.txt	/*'Tlist_Show_Menu'*
-'Tlist_Show_One_File'	taglist.txt	/*'Tlist_Show_One_File'*
-'Tlist_Sort_Type'	taglist.txt	/*'Tlist_Sort_Type'*
-'Tlist_Use_Horiz_Window'	taglist.txt	/*'Tlist_Use_Horiz_Window'*
-'Tlist_Use_Right_Window'	taglist.txt	/*'Tlist_Use_Right_Window'*
-'Tlist_Use_SingleClick'	taglist.txt	/*'Tlist_Use_SingleClick'*
-'Tlist_WinHeight'	taglist.txt	/*'Tlist_WinHeight'*
-'Tlist_WinWidth'	taglist.txt	/*'Tlist_WinWidth'*
-:TlistAddFiles	taglist.txt	/*:TlistAddFiles*
-:TlistAddFilesRecursive	taglist.txt	/*:TlistAddFilesRecursive*
-:TlistClose	taglist.txt	/*:TlistClose*
-:TlistDebug	taglist.txt	/*:TlistDebug*
-:TlistHighlightTag	taglist.txt	/*:TlistHighlightTag*
-:TlistLock	taglist.txt	/*:TlistLock*
-:TlistMessages	taglist.txt	/*:TlistMessages*
-:TlistOpen	taglist.txt	/*:TlistOpen*
-:TlistSessionLoad	taglist.txt	/*:TlistSessionLoad*
-:TlistSessionSave	taglist.txt	/*:TlistSessionSave*
-:TlistShowPrototype	taglist.txt	/*:TlistShowPrototype*
-:TlistShowTag	taglist.txt	/*:TlistShowTag*
-:TlistToggle	taglist.txt	/*:TlistToggle*
-:TlistUndebug	taglist.txt	/*:TlistUndebug*
-:TlistUnlock	taglist.txt	/*:TlistUnlock*
-:TlistUpdate	taglist.txt	/*:TlistUpdate*
-Tlist_Get_Tag_Prototype_By_Line()	taglist.txt	/*Tlist_Get_Tag_Prototype_By_Line()*
-Tlist_Get_Tagname_By_Line()	taglist.txt	/*Tlist_Get_Tagname_By_Line()*
-Tlist_Set_App()	taglist.txt	/*Tlist_Set_App()*
-Tlist_Update_File_Tags()	taglist.txt	/*Tlist_Update_File_Tags()*
-taglist-commands	taglist.txt	/*taglist-commands*
-taglist-debug	taglist.txt	/*taglist-debug*
-taglist-extend	taglist.txt	/*taglist-extend*
-taglist-faq	taglist.txt	/*taglist-faq*
-taglist-functions	taglist.txt	/*taglist-functions*
-taglist-install	taglist.txt	/*taglist-install*
-taglist-internet	taglist.txt	/*taglist-internet*
-taglist-intro	taglist.txt	/*taglist-intro*
-taglist-keys	taglist.txt	/*taglist-keys*
-taglist-license	taglist.txt	/*taglist-license*
-taglist-menu	taglist.txt	/*taglist-menu*
-taglist-options	taglist.txt	/*taglist-options*
-taglist-requirements	taglist.txt	/*taglist-requirements*
-taglist-session	taglist.txt	/*taglist-session*
-taglist-todo	taglist.txt	/*taglist-todo*
-taglist-using	taglist.txt	/*taglist-using*
-taglist.txt	taglist.txt	/*taglist.txt*
diff --git a/sources_non_forked/taglist/plugin/taglist.vim b/sources_non_forked/taglist/plugin/taglist.vim
deleted file mode 100644
index 59901f64..00000000
--- a/sources_non_forked/taglist/plugin/taglist.vim
+++ /dev/null
@@ -1,4546 +0,0 @@
-" File: taglist.vim
-" Author: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
-" Version: 4.5
-" Last Modified: September 21, 2007
-" Copyright: Copyright (C) 2002-2007 Yegappan Lakshmanan
-"            Permission is hereby granted to use and distribute this code,
-"            with or without modifications, provided that this copyright
-"            notice is copied with it. Like anything else that's free,
-"            taglist.vim is provided *as is* and comes with no warranty of any
-"            kind, either expressed or implied. In no event will the copyright
-"            holder be liable for any damamges resulting from the use of this
-"            software.
-"
-" The "Tag List" plugin is a source code browser plugin for Vim and provides
-" an overview of the structure of the programming language files and allows
-" you to efficiently browse through source code files for different
-" programming languages.  You can visit the taglist plugin home page for more
-" information:
-"
-"       http://vim-taglist.sourceforge.net
-"
-" You can subscribe to the taglist mailing list to post your questions
-" or suggestions for improvement or to report bugs. Visit the following
-" page for subscribing to the mailing list:
-"
-"       http://groups.yahoo.com/group/taglist/
-"
-" For more information about using this plugin, after installing the
-" taglist plugin, use the ":help taglist" command.
-"
-" Installation
-" ------------
-" 1. Download the taglist.zip file and unzip the files to the $HOME/.vim
-"    or the $HOME/vimfiles or the $VIM/vimfiles directory. This should
-"    unzip the following two files (the directory structure should be
-"    preserved):
-"
-"       plugin/taglist.vim - main taglist plugin file
-"       doc/taglist.txt    - documentation (help) file
-"
-"    Refer to the 'add-plugin', 'add-global-plugin' and 'runtimepath'
-"    Vim help pages for more details about installing Vim plugins.
-" 2. Change to the $HOME/.vim/doc or $HOME/vimfiles/doc or
-"    $VIM/vimfiles/doc directory, start Vim and run the ":helptags ."
-"    command to process the taglist help file.
-" 3. If the exuberant ctags utility is not present in your PATH, then set the
-"    Tlist_Ctags_Cmd variable to point to the location of the exuberant ctags
-"    utility (not to the directory) in the .vimrc file.
-" 4. If you are running a terminal/console version of Vim and the
-"    terminal doesn't support changing the window width then set the
-"    'Tlist_Inc_Winwidth' variable to 0 in the .vimrc file.
-" 5. Restart Vim.
-" 6. You can now use the ":TlistToggle" command to open/close the taglist
-"    window. You can use the ":help taglist" command to get more
-"    information about using the taglist plugin.
-"
-" ****************** Do not modify after this line ************************
-
-" Line continuation used here
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !exists('loaded_taglist')
-    " First time loading the taglist plugin
-    "
-    " To speed up the loading of Vim, the taglist plugin uses autoload
-    " mechanism to load the taglist functions.
-    " Only define the configuration variables, user commands and some
-    " auto-commands and finish sourcing the file
-
-    " The taglist plugin requires the built-in Vim system() function. If this
-    " function is not available, then don't load the plugin.
-    if !exists('*system')
-        echomsg 'Taglist: Vim system() built-in function is not available. ' .
-                    \ 'Plugin is not loaded.'
-        let loaded_taglist = 'no'
-        let &cpo = s:cpo_save
-        finish
-    endif
-
-    " Location of the exuberant ctags tool
-    if !exists('Tlist_Ctags_Cmd')
-        if executable('exuberant-ctags')
-            " On Debian Linux, exuberant ctags is installed
-            " as exuberant-ctags
-            let Tlist_Ctags_Cmd = 'exuberant-ctags'
-        elseif executable('exctags')
-            " On Free-BSD, exuberant ctags is installed as exctags
-            let Tlist_Ctags_Cmd = 'exctags'
-        elseif executable('ctags')
-            let Tlist_Ctags_Cmd = 'ctags'
-        elseif executable('ctags.exe')
-            let Tlist_Ctags_Cmd = 'ctags.exe'
-        elseif executable('tags')
-            let Tlist_Ctags_Cmd = 'tags'
-        else
-            echomsg 'Taglist: Exuberant ctags (http://ctags.sf.net) ' .
-                        \ 'not found in PATH. Plugin is not loaded.'
-            " Skip loading the plugin
-            let loaded_taglist = 'no'
-            let &cpo = s:cpo_save
-            finish
-        endif
-    endif
-
-
-    " Automatically open the taglist window on Vim startup
-    if !exists('Tlist_Auto_Open')
-        let Tlist_Auto_Open = 0
-    endif
-
-    " When the taglist window is toggle opened, move the cursor to the
-    " taglist window
-    if !exists('Tlist_GainFocus_On_ToggleOpen')
-        let Tlist_GainFocus_On_ToggleOpen = 0
-    endif
-
-    " Process files even when the taglist window is not open
-    if !exists('Tlist_Process_File_Always')
-        let Tlist_Process_File_Always = 0
-    endif
-
-    if !exists('Tlist_Show_Menu')
-        let Tlist_Show_Menu = 0
-    endif
-
-    " Tag listing sort type - 'name' or 'order'
-    if !exists('Tlist_Sort_Type')
-        let Tlist_Sort_Type = 'order'
-    endif
-
-    " Tag listing window split (horizontal/vertical) control
-    if !exists('Tlist_Use_Horiz_Window')
-        let Tlist_Use_Horiz_Window = 0
-    endif
-
-    " Open the vertically split taglist window on the left or on the right
-    " side.  This setting is relevant only if Tlist_Use_Horiz_Window is set to
-    " zero (i.e.  only for vertically split windows)
-    if !exists('Tlist_Use_Right_Window')
-        let Tlist_Use_Right_Window = 0
-    endif
-
-    " Increase Vim window width to display vertically split taglist window.
-    " For MS-Windows version of Vim running in a MS-DOS window, this must be
-    " set to 0 otherwise the system may hang due to a Vim limitation.
-    if !exists('Tlist_Inc_Winwidth')
-        if (has('win16') || has('win95')) && !has('gui_running')
-            let Tlist_Inc_Winwidth = 0
-        else
-            let Tlist_Inc_Winwidth = 1
-        endif
-    endif
-
-    " Vertically split taglist window width setting
-    if !exists('Tlist_WinWidth')
-        let Tlist_WinWidth = 30
-    endif
-
-    " Horizontally split taglist window height setting
-    if !exists('Tlist_WinHeight')
-        let Tlist_WinHeight = 10
-    endif
-
-    " Display tag prototypes or tag names in the taglist window
-    if !exists('Tlist_Display_Prototype')
-        let Tlist_Display_Prototype = 0
-    endif
-
-    " Display tag scopes in the taglist window
-    if !exists('Tlist_Display_Tag_Scope')
-        let Tlist_Display_Tag_Scope = 1
-    endif
-
-    " Use single left mouse click to jump to a tag. By default this is disabled.
-    " Only double click using the mouse will be processed.
-    if !exists('Tlist_Use_SingleClick')
-        let Tlist_Use_SingleClick = 0
-    endif
-
-    " Control whether additional help is displayed as part of the taglist or
-    " not.  Also, controls whether empty lines are used to separate the tag
-    " tree.
-    if !exists('Tlist_Compact_Format')
-        let Tlist_Compact_Format = 0
-    endif
-
-    " Exit Vim if only the taglist window is currently open. By default, this is
-    " set to zero.
-    if !exists('Tlist_Exit_OnlyWindow')
-        let Tlist_Exit_OnlyWindow = 0
-    endif
-
-    " Automatically close the folds for the non-active files in the taglist
-    " window
-    if !exists('Tlist_File_Fold_Auto_Close')
-        let Tlist_File_Fold_Auto_Close = 0
-    endif
-
-    " Close the taglist window when a tag is selected
-    if !exists('Tlist_Close_On_Select')
-        let Tlist_Close_On_Select = 0
-    endif
-
-    " Automatically update the taglist window to display tags for newly
-    " edited files
-    if !exists('Tlist_Auto_Update')
-        let Tlist_Auto_Update = 1
-    endif
-
-    " Automatically highlight the current tag
-    if !exists('Tlist_Auto_Highlight_Tag')
-        let Tlist_Auto_Highlight_Tag = 1
-    endif
-    
-    " Automatically highlight the current tag on entering a buffer
-    if !exists('Tlist_Highlight_Tag_On_BufEnter')
-        let Tlist_Highlight_Tag_On_BufEnter = 1
-    endif
-
-    " Enable fold column to display the folding for the tag tree
-    if !exists('Tlist_Enable_Fold_Column')
-        let Tlist_Enable_Fold_Column = 1
-    endif
-
-    " Display the tags for only one file in the taglist window
-    if !exists('Tlist_Show_One_File')
-        let Tlist_Show_One_File = 0
-    endif
-
-    if !exists('Tlist_Max_Submenu_Items')
-        let Tlist_Max_Submenu_Items = 20
-    endif
-
-    if !exists('Tlist_Max_Tag_Length')
-        let Tlist_Max_Tag_Length = 10
-    endif
-
-    " Do not change the name of the taglist title variable. The winmanager
-    " plugin relies on this name to determine the title for the taglist
-    " plugin.
-    let TagList_title = "__Tag_List__"
-
-    " Taglist debug messages
-    let s:tlist_msg = ''
-
-    " Define the taglist autocommand to automatically open the taglist window
-    " on Vim startup
-    if g:Tlist_Auto_Open
-        autocmd VimEnter * nested call s:Tlist_Window_Check_Auto_Open()
-    endif
-
-    " Refresh the taglist
-    if g:Tlist_Process_File_Always
-        autocmd BufEnter * call s:Tlist_Refresh()
-    endif
-
-    if g:Tlist_Show_Menu
-        autocmd GUIEnter * call s:Tlist_Menu_Init()
-    endif
-
-    " When the taglist buffer is created when loading a Vim session file,
-    " the taglist buffer needs to be initialized. The BufFilePost event
-    " is used to handle this case.
-    autocmd BufFilePost __Tag_List__ call s:Tlist_Vim_Session_Load()
-
-    " Define the user commands to manage the taglist window
-    command! -nargs=0 -bar TlistToggle call s:Tlist_Window_Toggle()
-    command! -nargs=0 -bar TlistOpen call s:Tlist_Window_Open()
-    " For backwards compatiblity define the Tlist command
-    command! -nargs=0 -bar Tlist TlistToggle
-    command! -nargs=+ -complete=file TlistAddFiles
-                \  call s:Tlist_Add_Files(<f-args>)
-    command! -nargs=+ -complete=dir TlistAddFilesRecursive
-                \ call s:Tlist_Add_Files_Recursive(<f-args>)
-    command! -nargs=0 -bar TlistClose call s:Tlist_Window_Close()
-    command! -nargs=0 -bar TlistUpdate call s:Tlist_Update_Current_File()
-    command! -nargs=0 -bar TlistHighlightTag call s:Tlist_Window_Highlight_Tag(
-                        \ fnamemodify(bufname('%'), ':p'), line('.'), 2, 1)
-    " For backwards compatiblity define the TlistSync command
-    command! -nargs=0 -bar TlistSync TlistHighlightTag
-    command! -nargs=* -complete=buffer TlistShowPrototype
-                \ echo Tlist_Get_Tag_Prototype_By_Line(<f-args>)
-    command! -nargs=* -complete=buffer TlistShowTag
-                \ echo Tlist_Get_Tagname_By_Line(<f-args>)
-    command! -nargs=* -complete=file TlistSessionLoad
-                \ call s:Tlist_Session_Load(<q-args>)
-    command! -nargs=* -complete=file TlistSessionSave
-                \ call s:Tlist_Session_Save(<q-args>)
-    command! -bar TlistLock let Tlist_Auto_Update=0
-    command! -bar TlistUnlock let Tlist_Auto_Update=1
-
-    " Commands for enabling/disabling debug and to display debug messages
-    command! -nargs=? -complete=file -bar TlistDebug
-                \ call s:Tlist_Debug_Enable(<q-args>)
-    command! -nargs=0 -bar TlistUndebug  call s:Tlist_Debug_Disable()
-    command! -nargs=0 -bar TlistMessages call s:Tlist_Debug_Show()
-
-    " Define autocommands to autoload the taglist plugin when needed.
-
-    " Trick to get the current script ID
-    map <SID>xx <SID>xx
-    let s:tlist_sid = substitute(maparg('<SID>xx'), '<SNR>\(\d\+_\)xx$',
-                                \ '\1', '')
-    unmap <SID>xx
-
-    exe 'autocmd FuncUndefined *' . s:tlist_sid . 'Tlist_* source ' .
-                \ escape(expand('<sfile>'), ' ')
-    exe 'autocmd FuncUndefined *' . s:tlist_sid . 'Tlist_Window_* source ' .
-                \ escape(expand('<sfile>'), ' ')
-    exe 'autocmd FuncUndefined *' . s:tlist_sid . 'Tlist_Menu_* source ' .
-                \ escape(expand('<sfile>'), ' ')
-    exe 'autocmd FuncUndefined Tlist_* source ' .
-                \ escape(expand('<sfile>'), ' ')
-    exe 'autocmd FuncUndefined TagList_* source ' .
-                \ escape(expand('<sfile>'), ' ')
-
-    let loaded_taglist = 'fast_load_done'
-
-    if g:Tlist_Show_Menu && has('gui_running')
-        call s:Tlist_Menu_Init()
-    endif
-
-    " restore 'cpo'
-    let &cpo = s:cpo_save
-    finish
-endif
-
-if !exists('s:tlist_sid')
-    " Two or more versions of taglist plugin are installed. Don't
-    " load this version of the plugin.
-    finish
-endif
-
-unlet! s:tlist_sid
-
-if loaded_taglist != 'fast_load_done'
-    " restore 'cpo'
-    let &cpo = s:cpo_save
-    finish
-endif
-
-" Taglist plugin functionality is available
-let loaded_taglist = 'available'
-
-"------------------- end of user configurable options --------------------
-
-" Default language specific settings for supported file types and tag types
-"
-" Variable name format:
-"
-"       s:tlist_def_{vim_ftype}_settings
-" 
-" vim_ftype - Filetype detected by Vim
-"
-" Value format:
-"
-"       <ctags_ftype>;<flag>:<name>;<flag>:<name>;...
-"
-" ctags_ftype - File type supported by exuberant ctags
-" flag        - Flag supported by exuberant ctags to generate a tag type
-" name        - Name of the tag type used in the taglist window to display the
-"               tags of this type
-"
-
-" assembly language
-let s:tlist_def_asm_settings = 'asm;d:define;l:label;m:macro;t:type'
-
-" aspperl language
-let s:tlist_def_aspperl_settings = 'asp;f:function;s:sub;v:variable'
-
-" aspvbs language
-let s:tlist_def_aspvbs_settings = 'asp;f:function;s:sub;v:variable'
-
-" awk language
-let s:tlist_def_awk_settings = 'awk;f:function'
-
-" beta language
-let s:tlist_def_beta_settings = 'beta;f:fragment;s:slot;v:pattern'
-
-" c language
-let s:tlist_def_c_settings = 'c;d:macro;g:enum;s:struct;u:union;t:typedef;' .
-                           \ 'v:variable;f:function'
-
-" c++ language
-let s:tlist_def_cpp_settings = 'c++;n:namespace;v:variable;d:macro;t:typedef;' .
-                             \ 'c:class;g:enum;s:struct;u:union;f:function'
-
-" c# language
-let s:tlist_def_cs_settings = 'c#;d:macro;t:typedef;n:namespace;c:class;' .
-                             \ 'E:event;g:enum;s:struct;i:interface;' .
-                             \ 'p:properties;m:method'
-
-" cobol language
-let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
-                               \ 'P:program;s:section'
-
-" eiffel language
-let s:tlist_def_eiffel_settings = 'eiffel;c:class;f:feature'
-
-" erlang language
-let s:tlist_def_erlang_settings = 'erlang;d:macro;r:record;m:module;f:function'
-
-" expect (same as tcl) language
-let s:tlist_def_expect_settings = 'tcl;c:class;f:method;p:procedure'
-
-" fortran language
-let s:tlist_def_fortran_settings = 'fortran;p:program;b:block data;' .
-                    \ 'c:common;e:entry;i:interface;k:type;l:label;m:module;' .
-                    \ 'n:namelist;t:derived;v:variable;f:function;s:subroutine'
-
-" HTML language
-let s:tlist_def_html_settings = 'html;a:anchor;f:javascript function'
-
-" java language
-let s:tlist_def_java_settings = 'java;p:package;c:class;i:interface;' .
-                              \ 'f:field;m:method'
-
-" javascript language
-let s:tlist_def_javascript_settings = 'javascript;f:function'
-
-" lisp language
-let s:tlist_def_lisp_settings = 'lisp;f:function'
-
-" lua language
-let s:tlist_def_lua_settings = 'lua;f:function'
-
-" makefiles
-let s:tlist_def_make_settings = 'make;m:macro'
-
-" pascal language
-let s:tlist_def_pascal_settings = 'pascal;f:function;p:procedure'
-
-" perl language
-let s:tlist_def_perl_settings = 'perl;c:constant;l:label;p:package;s:subroutine'
-
-" php language
-let s:tlist_def_php_settings = 'php;c:class;d:constant;v:variable;f:function'
-
-" python language
-let s:tlist_def_python_settings = 'python;c:class;m:member;f:function'
-
-" rexx language
-let s:tlist_def_rexx_settings = 'rexx;s:subroutine'
-
-" ruby language
-let s:tlist_def_ruby_settings = 'ruby;c:class;f:method;F:function;' .
-                              \ 'm:singleton method'
-
-" scheme language
-let s:tlist_def_scheme_settings = 'scheme;s:set;f:function'
-
-" shell language
-let s:tlist_def_sh_settings = 'sh;f:function'
-
-" C shell language
-let s:tlist_def_csh_settings = 'sh;f:function'
-
-" Z shell language
-let s:tlist_def_zsh_settings = 'sh;f:function'
-
-" slang language
-let s:tlist_def_slang_settings = 'slang;n:namespace;f:function'
-
-" sml language
-let s:tlist_def_sml_settings = 'sml;e:exception;c:functor;s:signature;' .
-                             \ 'r:structure;t:type;v:value;f:function'
-
-" sql language
-let s:tlist_def_sql_settings = 'sql;c:cursor;F:field;P:package;r:record;' .
-            \ 's:subtype;t:table;T:trigger;v:variable;f:function;p:procedure'
-
-" tcl language
-let s:tlist_def_tcl_settings = 'tcl;c:class;f:method;m:method;p:procedure'
-
-" vera language
-let s:tlist_def_vera_settings = 'vera;c:class;d:macro;e:enumerator;' .
-                                \ 'f:function;g:enum;m:member;p:program;' .
-                                \ 'P:prototype;t:task;T:typedef;v:variable;' .
-                                \ 'x:externvar'
-
-"verilog language
-let s:tlist_def_verilog_settings = 'verilog;m:module;c:constant;P:parameter;' .
-            \ 'e:event;r:register;t:task;w:write;p:port;v:variable;f:function'
-
-" vim language
-let s:tlist_def_vim_settings = 'vim;a:autocmds;v:variable;f:function'
-
-" yacc language
-let s:tlist_def_yacc_settings = 'yacc;l:label'
-
-"------------------- end of language specific options --------------------
-
-" Vim window size is changed by the taglist plugin or not
-let s:tlist_winsize_chgd = -1
-" Taglist window is maximized or not
-let s:tlist_win_maximized = 0
-" Name of files in the taglist
-let s:tlist_file_names=''
-" Number of files in the taglist
-let s:tlist_file_count = 0
-" Number of filetypes supported by taglist
-let s:tlist_ftype_count = 0
-" Is taglist part of other plugins like winmanager or cream?
-let s:tlist_app_name = "none"
-" Are we displaying brief help text
-let s:tlist_brief_help = 1
-" List of files removed on user request
-let s:tlist_removed_flist = ""
-" Index of current file displayed in the taglist window
-let s:tlist_cur_file_idx = -1
-" Taglist menu is empty or not
-let s:tlist_menu_empty = 1
-
-" An autocommand is used to refresh the taglist window when entering any
-" buffer. We don't want to refresh the taglist window if we are entering the
-" file window from one of the taglist functions. The 'Tlist_Skip_Refresh'
-" variable is used to skip the refresh of the taglist window and is set
-" and cleared appropriately.
-let s:Tlist_Skip_Refresh = 0
-
-" Tlist_Window_Display_Help()
-function! s:Tlist_Window_Display_Help()
-    if s:tlist_app_name == "winmanager"
-        " To handle a bug in the winmanager plugin, add a space at the
-        " last line
-        call setline('$', ' ')
-    endif
-
-    if s:tlist_brief_help
-        " Add the brief help
-        call append(0, '" Press <F1> to display help text')
-    else
-        " Add the extensive help
-        call append(0, '" <enter> : Jump to tag definition')
-        call append(1, '" o : Jump to tag definition in new window')
-        call append(2, '" p : Preview the tag definition')
-        call append(3, '" <space> : Display tag prototype')
-        call append(4, '" u : Update tag list')
-        call append(5, '" s : Select sort field')
-        call append(6, '" d : Remove file from taglist')
-        call append(7, '" x : Zoom-out/Zoom-in taglist window')
-        call append(8, '" + : Open a fold')
-        call append(9, '" - : Close a fold')
-        call append(10, '" * : Open all folds')
-        call append(11, '" = : Close all folds')
-        call append(12, '" [[ : Move to the start of previous file')
-        call append(13, '" ]] : Move to the start of next file')
-        call append(14, '" q : Close the taglist window')
-        call append(15, '" <F1> : Remove help text')
-    endif
-endfunction
-
-" Tlist_Window_Toggle_Help_Text()
-" Toggle taglist plugin help text between the full version and the brief
-" version
-function! s:Tlist_Window_Toggle_Help_Text()
-    if g:Tlist_Compact_Format
-        " In compact display mode, do not display help
-        return
-    endif
-
-    " Include the empty line displayed after the help text
-    let brief_help_size = 1
-    let full_help_size = 16
-
-    setlocal modifiable
-
-    " Set report option to a huge value to prevent informational messages
-    " while deleting the lines
-    let old_report = &report
-    set report=99999
-
-    " Remove the currently highlighted tag. Otherwise, the help text
-    " might be highlighted by mistake
-    match none
-
-    " Toggle between brief and full help text
-    if s:tlist_brief_help
-        let s:tlist_brief_help = 0
-
-        " Remove the previous help
-        exe '1,' . brief_help_size . ' delete _'
-
-        " Adjust the start/end line numbers for the files
-        call s:Tlist_Window_Update_Line_Offsets(0, 1, full_help_size - brief_help_size)
-    else
-        let s:tlist_brief_help = 1
-
-        " Remove the previous help
-        exe '1,' . full_help_size . ' delete _'
-
-        " Adjust the start/end line numbers for the files
-        call s:Tlist_Window_Update_Line_Offsets(0, 0, full_help_size - brief_help_size)
-    endif
-
-    call s:Tlist_Window_Display_Help()
-
-    " Restore the report option
-    let &report = old_report
-
-    setlocal nomodifiable
-endfunction
-
-" Taglist debug support
-let s:tlist_debug = 0
-
-" File for storing the debug messages
-let s:tlist_debug_file = ''
-
-" Tlist_Debug_Enable
-" Enable logging of taglist debug messages.
-function! s:Tlist_Debug_Enable(...)
-    let s:tlist_debug = 1
-
-    " Check whether a valid file name is supplied.
-    if a:1 != ''
-        let s:tlist_debug_file = fnamemodify(a:1, ':p')
-
-        " Empty the log file
-        exe 'redir! > ' . s:tlist_debug_file
-        redir END
-
-        " Check whether the log file is present/created
-        if !filewritable(s:tlist_debug_file)
-            call s:Tlist_Warning_Msg('Taglist: Unable to create log file '
-                        \ . s:tlist_debug_file)
-            let s:tlist_debug_file = ''
-        endif
-    endif
-endfunction
-
-" Tlist_Debug_Disable
-" Disable logging of taglist debug messages.
-function! s:Tlist_Debug_Disable(...)
-    let s:tlist_debug = 0
-    let s:tlist_debug_file = ''
-endfunction
-
-" Tlist_Debug_Show
-" Display the taglist debug messages in a new window
-function! s:Tlist_Debug_Show()
-    if s:tlist_msg == ''
-        call s:Tlist_Warning_Msg('Taglist: No debug messages')
-        return
-    endif
-
-    " Open a new window to display the taglist debug messages
-    new taglist_debug.txt
-    " Delete all the lines (if the buffer already exists)
-    silent! %delete _
-    " Add the messages
-    silent! put =s:tlist_msg
-    " Move the cursor to the first line
-    normal! gg
-endfunction
-
-" Tlist_Log_Msg
-" Log the supplied debug message along with the time
-function! s:Tlist_Log_Msg(msg)
-    if s:tlist_debug
-        if s:tlist_debug_file != ''
-            exe 'redir >> ' . s:tlist_debug_file
-            silent echon strftime('%H:%M:%S') . ': ' . a:msg . "\n"
-            redir END
-        else
-            " Log the message into a variable
-            " Retain only the last 3000 characters
-            let len = strlen(s:tlist_msg)
-            if len > 3000
-                let s:tlist_msg = strpart(s:tlist_msg, len - 3000)
-            endif
-            let s:tlist_msg = s:tlist_msg . strftime('%H:%M:%S') . ': ' . 
-                        \ a:msg . "\n"
-        endif
-    endif
-endfunction
-
-" Tlist_Warning_Msg()
-" Display a message using WarningMsg highlight group
-function! s:Tlist_Warning_Msg(msg)
-    echohl WarningMsg
-    echomsg a:msg
-    echohl None
-endfunction
-
-" Last returned file index for file name lookup.
-" Used to speed up file lookup
-let s:tlist_file_name_idx_cache = -1
-
-" Tlist_Get_File_Index()
-" Return the index of the specified filename
-function! s:Tlist_Get_File_Index(fname)
-    if s:tlist_file_count == 0 || a:fname == ''
-        return -1
-    endif
-
-    " If the new filename is same as the last accessed filename, then
-    " return that index
-    if s:tlist_file_name_idx_cache != -1 &&
-                \ s:tlist_file_name_idx_cache < s:tlist_file_count
-        if s:tlist_{s:tlist_file_name_idx_cache}_filename == a:fname
-            " Same as the last accessed file
-            return s:tlist_file_name_idx_cache
-        endif
-    endif
-
-    " First, check whether the filename is present
-    let s_fname = a:fname . "\n"
-    let i = stridx(s:tlist_file_names, s_fname)
-    if i == -1
-        let s:tlist_file_name_idx_cache = -1
-        return -1
-    endif
-
-    " Second, compute the file name index
-    let nl_txt = substitute(strpart(s:tlist_file_names, 0, i), "[^\n]", '', 'g')
-    let s:tlist_file_name_idx_cache = strlen(nl_txt)
-    return s:tlist_file_name_idx_cache
-endfunction
-
-" Last returned file index for line number lookup.
-" Used to speed up file lookup
-let s:tlist_file_lnum_idx_cache = -1
-
-" Tlist_Window_Get_File_Index_By_Linenum()
-" Return the index of the filename present in the specified line number
-" Line number refers to the line number in the taglist window
-function! s:Tlist_Window_Get_File_Index_By_Linenum(lnum)
-    call s:Tlist_Log_Msg('Tlist_Window_Get_File_Index_By_Linenum (' . a:lnum . ')')
-
-    " First try to see whether the new line number is within the range
-    " of the last returned file
-    if s:tlist_file_lnum_idx_cache != -1 &&
-                \ s:tlist_file_lnum_idx_cache < s:tlist_file_count
-        if a:lnum >= s:tlist_{s:tlist_file_lnum_idx_cache}_start &&
-                    \ a:lnum <= s:tlist_{s:tlist_file_lnum_idx_cache}_end
-            return s:tlist_file_lnum_idx_cache
-        endif
-    endif
-
-    let fidx = -1
-
-    if g:Tlist_Show_One_File
-        " Displaying only one file in the taglist window. Check whether
-        " the line is within the tags displayed for that file
-        if s:tlist_cur_file_idx != -1
-            if a:lnum >= s:tlist_{s:tlist_cur_file_idx}_start
-                        \ && a:lnum <= s:tlist_{s:tlist_cur_file_idx}_end
-                let fidx = s:tlist_cur_file_idx
-            endif
-
-        endif
-    else
-        " Do a binary search in the taglist
-        let left = 0
-        let right = s:tlist_file_count - 1
-
-        while left < right
-            let mid = (left + right) / 2
-
-            if a:lnum >= s:tlist_{mid}_start && a:lnum <= s:tlist_{mid}_end
-                let s:tlist_file_lnum_idx_cache = mid
-                return mid
-            endif
-
-            if a:lnum < s:tlist_{mid}_start
-                let right = mid - 1
-            else
-                let left = mid + 1
-            endif
-        endwhile
-
-        if left >= 0 && left < s:tlist_file_count
-                    \ && a:lnum >= s:tlist_{left}_start
-                    \ && a:lnum <= s:tlist_{left}_end
-            let fidx = left
-        endif
-    endif
-
-    let s:tlist_file_lnum_idx_cache = fidx
-
-    return fidx
-endfunction
-
-" Tlist_Exe_Cmd_No_Acmds
-" Execute the specified Ex command after disabling autocommands
-function! s:Tlist_Exe_Cmd_No_Acmds(cmd)
-    let old_eventignore = &eventignore
-    set eventignore=all
-    exe a:cmd
-    let &eventignore = old_eventignore
-endfunction
-
-" Tlist_Skip_File()
-" Check whether tag listing is supported for the specified file
-function! s:Tlist_Skip_File(filename, ftype)
-    " Skip buffers with no names and buffers with filetype not set
-    if a:filename == '' || a:ftype == ''
-        return 1
-    endif
-
-    " Skip files which are not supported by exuberant ctags
-    " First check whether default settings for this filetype are available.
-    " If it is not available, then check whether user specified settings are
-    " available. If both are not available, then don't list the tags for this
-    " filetype
-    let var = 's:tlist_def_' . a:ftype . '_settings'
-    if !exists(var)
-        let var = 'g:tlist_' . a:ftype . '_settings'
-        if !exists(var)
-            return 1
-        endif
-    endif
-
-    " Skip files which are not readable or files which are not yet stored
-    " to the disk
-    if !filereadable(a:filename)
-        return 1
-    endif
-
-    return 0
-endfunction
-
-" Tlist_User_Removed_File
-" Returns 1 if a file is removed by a user from the taglist
-function! s:Tlist_User_Removed_File(filename)
-    return stridx(s:tlist_removed_flist, a:filename . "\n") != -1
-endfunction
-
-" Tlist_Update_Remove_List
-" Update the list of user removed files from the taglist
-" add == 1, add the file to the removed list
-" add == 0, delete the file from the removed list
-function! s:Tlist_Update_Remove_List(filename, add)
-    if a:add
-        let s:tlist_removed_flist = s:tlist_removed_flist . a:filename . "\n"
-    else
-        let idx = stridx(s:tlist_removed_flist, a:filename . "\n")
-        let text_before = strpart(s:tlist_removed_flist, 0, idx)
-        let rem_text = strpart(s:tlist_removed_flist, idx)
-        let next_idx = stridx(rem_text, "\n")
-        let text_after = strpart(rem_text, next_idx + 1)
-
-        let s:tlist_removed_flist = text_before . text_after
-    endif
-endfunction
-
-" Tlist_FileType_Init
-" Initialize the ctags arguments and tag variable for the specified
-" file type
-function! s:Tlist_FileType_Init(ftype)
-    call s:Tlist_Log_Msg('Tlist_FileType_Init (' . a:ftype . ')')
-    " If the user didn't specify any settings, then use the default
-    " ctags args. Otherwise, use the settings specified by the user
-    let var = 'g:tlist_' . a:ftype . '_settings'
-    if exists(var)
-        " User specified ctags arguments
-        let settings = {var} . ';'
-    else
-        " Default ctags arguments
-        let var = 's:tlist_def_' . a:ftype . '_settings'
-        if !exists(var)
-            " No default settings for this file type. This filetype is
-            " not supported
-            return 0
-        endif
-        let settings = s:tlist_def_{a:ftype}_settings . ';'
-    endif
-
-    let msg = 'Taglist: Invalid ctags option setting - ' . settings
-
-    " Format of the option that specifies the filetype and ctags arugments:
-    "
-    "       <language_name>;flag1:name1;flag2:name2;flag3:name3
-    "
-
-    " Extract the file type to pass to ctags. This may be different from the
-    " file type detected by Vim
-    let pos = stridx(settings, ';')
-    if pos == -1
-        call s:Tlist_Warning_Msg(msg)
-        return 0
-    endif
-    let ctags_ftype = strpart(settings, 0, pos)
-    if ctags_ftype == ''
-        call s:Tlist_Warning_Msg(msg)
-        return 0
-    endif
-    " Make sure a valid filetype is supplied. If the user didn't specify a
-    " valid filetype, then the ctags option settings may be treated as the
-    " filetype
-    if ctags_ftype =~ ':'
-        call s:Tlist_Warning_Msg(msg)
-        return 0
-    endif
-
-    " Remove the file type from settings
-    let settings = strpart(settings, pos + 1)
-    if settings == ''
-        call s:Tlist_Warning_Msg(msg)
-        return 0
-    endif
-
-    " Process all the specified ctags flags. The format is
-    " flag1:name1;flag2:name2;flag3:name3
-    let ctags_flags = ''
-    let cnt = 0
-    while settings != ''
-        " Extract the flag
-        let pos = stridx(settings, ':')
-        if pos == -1
-            call s:Tlist_Warning_Msg(msg)
-            return 0
-        endif
-        let flag = strpart(settings, 0, pos)
-        if flag == ''
-            call s:Tlist_Warning_Msg(msg)
-            return 0
-        endif
-        " Remove the flag from settings
-        let settings = strpart(settings, pos + 1)
-
-        " Extract the tag type name
-        let pos = stridx(settings, ';')
-        if pos == -1
-            call s:Tlist_Warning_Msg(msg)
-            return 0
-        endif
-        let name = strpart(settings, 0, pos)
-        if name == ''
-            call s:Tlist_Warning_Msg(msg)
-            return 0
-        endif
-        let settings = strpart(settings, pos + 1)
-
-        let cnt = cnt + 1
-
-        let s:tlist_{a:ftype}_{cnt}_name = flag
-        let s:tlist_{a:ftype}_{cnt}_fullname = name
-        let ctags_flags = ctags_flags . flag
-    endwhile
-
-    let s:tlist_{a:ftype}_ctags_args = '--language-force=' . ctags_ftype .
-                            \ ' --' . ctags_ftype . '-types=' . ctags_flags
-    let s:tlist_{a:ftype}_count = cnt
-    let s:tlist_{a:ftype}_ctags_flags = ctags_flags
-
-    " Save the filetype name
-    let s:tlist_ftype_{s:tlist_ftype_count}_name = a:ftype
-    let s:tlist_ftype_count = s:tlist_ftype_count + 1
-
-    return 1
-endfunction
-
-" Tlist_Detect_Filetype
-" Determine the filetype for the specified file using the filetypedetect
-" autocmd.
-function! s:Tlist_Detect_Filetype(fname)
-    " Ignore the filetype autocommands
-    let old_eventignore = &eventignore
-    set eventignore=FileType
-
-    " Save the 'filetype', as this will be changed temporarily
-    let old_filetype = &filetype
-
-    " Run the filetypedetect group of autocommands to determine
-    " the filetype
-    exe 'doautocmd filetypedetect BufRead ' . a:fname
-
-    " Save the detected filetype
-    let ftype = &filetype
-
-    " Restore the previous state
-    let &filetype = old_filetype
-    let &eventignore = old_eventignore
-
-    return ftype
-endfunction
-
-" Tlist_Get_Buffer_Filetype
-" Get the filetype for the specified buffer
-function! s:Tlist_Get_Buffer_Filetype(bnum)
-    let buf_ft = getbufvar(a:bnum, '&filetype')
-
-    if bufloaded(a:bnum)
-        " For loaded buffers, the 'filetype' is already determined
-        return buf_ft
-    endif
-
-    " For unloaded buffers, if the 'filetype' option is set, return it
-    if buf_ft != ''
-        return buf_ft
-    endif
-
-    " Skip non-existent buffers
-    if !bufexists(a:bnum)
-        return ''
-    endif
-
-    " For buffers whose filetype is not yet determined, try to determine
-    " the filetype
-    let bname = bufname(a:bnum)
-
-    return s:Tlist_Detect_Filetype(bname)
-endfunction
-
-" Tlist_Discard_TagInfo
-" Discard the stored tag information for a file
-function! s:Tlist_Discard_TagInfo(fidx)
-    call s:Tlist_Log_Msg('Tlist_Discard_TagInfo (' .
-                \ s:tlist_{a:fidx}_filename . ')')
-    let ftype = s:tlist_{a:fidx}_filetype
-
-    " Discard information about the tags defined in the file
-    let i = 1
-    while i <= s:tlist_{a:fidx}_tag_count
-        let fidx_i = 's:tlist_' . a:fidx . '_' . i
-        unlet! {fidx_i}_tag
-        unlet! {fidx_i}_tag_name
-        unlet! {fidx_i}_tag_type
-        unlet! {fidx_i}_ttype_idx
-        unlet! {fidx_i}_tag_proto
-        unlet! {fidx_i}_tag_searchpat
-        unlet! {fidx_i}_tag_linenum
-        let i = i + 1
-    endwhile
-
-    let s:tlist_{a:fidx}_tag_count = 0
-
-    " Discard information about tag type groups
-    let i = 1
-    while i <= s:tlist_{ftype}_count
-        let ttype = s:tlist_{ftype}_{i}_name
-        if s:tlist_{a:fidx}_{ttype} != ''
-            let fidx_ttype = 's:tlist_' . a:fidx . '_' . ttype
-            let {fidx_ttype} = ''
-            let {fidx_ttype}_offset = 0
-            let cnt = {fidx_ttype}_count
-            let {fidx_ttype}_count = 0
-            let j = 1
-            while j <= cnt
-                unlet! {fidx_ttype}_{j}
-                let j = j + 1
-            endwhile
-        endif
-        let i = i + 1
-    endwhile
-
-    " Discard the stored menu command also
-    let s:tlist_{a:fidx}_menu_cmd = ''
-endfunction
-
-" Tlist_Window_Update_Line_Offsets
-" Update the line offsets for tags for files starting from start_idx
-" and displayed in the taglist window by the specified offset
-function! s:Tlist_Window_Update_Line_Offsets(start_idx, increment, offset)
-    let i = a:start_idx
-
-    while i < s:tlist_file_count
-        if s:tlist_{i}_visible
-            " Update the start/end line number only if the file is visible
-            if a:increment
-                let s:tlist_{i}_start = s:tlist_{i}_start + a:offset
-                let s:tlist_{i}_end = s:tlist_{i}_end + a:offset
-            else
-                let s:tlist_{i}_start = s:tlist_{i}_start - a:offset
-                let s:tlist_{i}_end = s:tlist_{i}_end - a:offset
-            endif
-        endif
-        let i = i + 1
-    endwhile
-endfunction
-
-" Tlist_Discard_FileInfo
-" Discard the stored information for a file
-function! s:Tlist_Discard_FileInfo(fidx)
-    call s:Tlist_Log_Msg('Tlist_Discard_FileInfo (' .
-                \ s:tlist_{a:fidx}_filename . ')')
-    call s:Tlist_Discard_TagInfo(a:fidx)
-
-    let ftype = s:tlist_{a:fidx}_filetype
-
-    let i = 1
-    while i <= s:tlist_{ftype}_count
-        let ttype = s:tlist_{ftype}_{i}_name
-        unlet! s:tlist_{a:fidx}_{ttype}
-        unlet! s:tlist_{a:fidx}_{ttype}_offset
-        unlet! s:tlist_{a:fidx}_{ttype}_count
-        let i = i + 1
-    endwhile
-
-    unlet! s:tlist_{a:fidx}_filename
-    unlet! s:tlist_{a:fidx}_sort_type
-    unlet! s:tlist_{a:fidx}_filetype
-    unlet! s:tlist_{a:fidx}_mtime
-    unlet! s:tlist_{a:fidx}_start
-    unlet! s:tlist_{a:fidx}_end
-    unlet! s:tlist_{a:fidx}_valid
-    unlet! s:tlist_{a:fidx}_visible
-    unlet! s:tlist_{a:fidx}_tag_count
-    unlet! s:tlist_{a:fidx}_menu_cmd
-endfunction
-
-" Tlist_Window_Remove_File_From_Display
-" Remove the specified file from display
-function! s:Tlist_Window_Remove_File_From_Display(fidx)
-    call s:Tlist_Log_Msg('Tlist_Window_Remove_File_From_Display (' .
-                \ s:tlist_{a:fidx}_filename . ')')
-    " If the file is not visible then no need to remove it
-    if !s:tlist_{a:fidx}_visible
-        return
-    endif
-
-    " Remove the tags displayed for the specified file from the window
-    let start = s:tlist_{a:fidx}_start
-    " Include the empty line after the last line also
-    if g:Tlist_Compact_Format
-        let end = s:tlist_{a:fidx}_end
-    else
-        let end = s:tlist_{a:fidx}_end + 1
-    endif
-
-    setlocal modifiable
-    exe 'silent! ' . start . ',' . end . 'delete _'
-    setlocal nomodifiable
-
-    " Correct the start and end line offsets for all the files following
-    " this file, as the tags for this file are removed
-    call s:Tlist_Window_Update_Line_Offsets(a:fidx + 1, 0, end - start + 1)
-endfunction
-
-" Tlist_Remove_File
-" Remove the file under the cursor or the specified file index
-" user_request - User requested to remove the file from taglist
-function! s:Tlist_Remove_File(file_idx, user_request)
-    let fidx = a:file_idx
-
-    if fidx == -1
-        let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(line('.'))
-        if fidx == -1
-            return
-        endif
-    endif
-    call s:Tlist_Log_Msg('Tlist_Remove_File (' .
-                \ s:tlist_{fidx}_filename . ', ' . a:user_request . ')')
-
-    let save_winnr = winnr()
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        " Taglist window is open, remove the file from display
-
-        if save_winnr != winnum
-            let old_eventignore = &eventignore
-            set eventignore=all
-            exe winnum . 'wincmd w'
-        endif
-
-        call s:Tlist_Window_Remove_File_From_Display(fidx)
-
-        if save_winnr != winnum
-            exe save_winnr . 'wincmd w'
-            let &eventignore = old_eventignore
-        endif
-    endif
-
-    let fname = s:tlist_{fidx}_filename
-
-    if a:user_request
-        " As the user requested to remove the file from taglist,
-        " add it to the removed list
-        call s:Tlist_Update_Remove_List(fname, 1)
-    endif
-
-    " Remove the file name from the taglist list of filenames
-    let idx = stridx(s:tlist_file_names, fname . "\n")
-    let text_before = strpart(s:tlist_file_names, 0, idx)
-    let rem_text = strpart(s:tlist_file_names, idx)
-    let next_idx = stridx(rem_text, "\n")
-    let text_after = strpart(rem_text, next_idx + 1)
-    let s:tlist_file_names = text_before . text_after
-
-    call s:Tlist_Discard_FileInfo(fidx)
-
-    " Shift all the file variables by one index
-    let i = fidx + 1
-
-    while i < s:tlist_file_count
-        let j = i - 1
-
-        let s:tlist_{j}_filename = s:tlist_{i}_filename
-        let s:tlist_{j}_sort_type = s:tlist_{i}_sort_type
-        let s:tlist_{j}_filetype = s:tlist_{i}_filetype
-        let s:tlist_{j}_mtime = s:tlist_{i}_mtime
-        let s:tlist_{j}_start = s:tlist_{i}_start
-        let s:tlist_{j}_end = s:tlist_{i}_end
-        let s:tlist_{j}_valid = s:tlist_{i}_valid
-        let s:tlist_{j}_visible = s:tlist_{i}_visible
-        let s:tlist_{j}_tag_count = s:tlist_{i}_tag_count
-        let s:tlist_{j}_menu_cmd = s:tlist_{i}_menu_cmd
-
-        let k = 1
-        while k <= s:tlist_{j}_tag_count
-            let s:tlist_{j}_{k}_tag = s:tlist_{i}_{k}_tag
-            let s:tlist_{j}_{k}_tag_name = s:tlist_{i}_{k}_tag_name
-            let s:tlist_{j}_{k}_tag_type = s:Tlist_Get_Tag_Type_By_Tag(i, k)
-            let s:tlist_{j}_{k}_ttype_idx = s:tlist_{i}_{k}_ttype_idx
-            let s:tlist_{j}_{k}_tag_proto = s:Tlist_Get_Tag_Prototype(i, k)
-            let s:tlist_{j}_{k}_tag_searchpat = s:Tlist_Get_Tag_SearchPat(i, k)
-            let s:tlist_{j}_{k}_tag_linenum = s:Tlist_Get_Tag_Linenum(i, k)
-            let k = k + 1
-        endwhile
-
-        let ftype = s:tlist_{i}_filetype
-
-        let k = 1
-        while k <= s:tlist_{ftype}_count
-            let ttype = s:tlist_{ftype}_{k}_name
-            let s:tlist_{j}_{ttype} = s:tlist_{i}_{ttype}
-            let s:tlist_{j}_{ttype}_offset = s:tlist_{i}_{ttype}_offset
-            let s:tlist_{j}_{ttype}_count = s:tlist_{i}_{ttype}_count
-            if s:tlist_{j}_{ttype} != ''
-                let l = 1
-                while l <= s:tlist_{j}_{ttype}_count
-                    let s:tlist_{j}_{ttype}_{l} = s:tlist_{i}_{ttype}_{l}
-                    let l = l + 1
-                endwhile
-            endif
-            let k = k + 1
-        endwhile
-
-        " As the file and tag information is copied to the new index,
-        " discard the previous information
-        call s:Tlist_Discard_FileInfo(i)
-
-        let i = i + 1
-    endwhile
-
-    " Reduce the number of files displayed
-    let s:tlist_file_count = s:tlist_file_count - 1
-
-    if g:Tlist_Show_One_File
-        " If the tags for only one file is displayed and if we just
-        " now removed that file, then invalidate the current file idx
-        if s:tlist_cur_file_idx == fidx
-            let s:tlist_cur_file_idx = -1
-        endif
-    endif
-endfunction
-
-" Tlist_Window_Goto_Window
-" Goto the taglist window
-function! s:Tlist_Window_Goto_Window()
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        if winnr() != winnum
-            call s:Tlist_Exe_Cmd_No_Acmds(winnum . 'wincmd w')
-        endif
-    endif
-endfunction
-
-" Tlist_Window_Create
-" Create a new taglist window. If it is already open, jump to it
-function! s:Tlist_Window_Create()
-    call s:Tlist_Log_Msg('Tlist_Window_Create()')
-    " If the window is open, jump to it
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        " Jump to the existing window
-        if winnr() != winnum
-            exe winnum . 'wincmd w'
-        endif
-        return
-    endif
-
-    " If used with winmanager don't open windows. Winmanager will handle
-    " the window/buffer management
-    if s:tlist_app_name == "winmanager"
-        return
-    endif
-
-    " Create a new window. If user prefers a horizontal window, then open
-    " a horizontally split window. Otherwise open a vertically split
-    " window
-    if g:Tlist_Use_Horiz_Window
-        " Open a horizontally split window
-        let win_dir = 'botright'
-        " Horizontal window height
-        let win_size = g:Tlist_WinHeight
-    else
-        if s:tlist_winsize_chgd == -1
-            " Open a vertically split window. Increase the window size, if
-            " needed, to accomodate the new window
-            if g:Tlist_Inc_Winwidth &&
-                        \ &columns < (80 + g:Tlist_WinWidth)
-                " Save the original window position
-                let s:tlist_pre_winx = getwinposx()
-                let s:tlist_pre_winy = getwinposy()
-
-                " one extra column is needed to include the vertical split
-                let &columns= &columns + g:Tlist_WinWidth + 1
-
-                let s:tlist_winsize_chgd = 1
-            else
-                let s:tlist_winsize_chgd = 0
-            endif
-        endif
-
-        if g:Tlist_Use_Right_Window
-            " Open the window at the rightmost place
-            let win_dir = 'botright vertical'
-        else
-            " Open the window at the leftmost place
-            let win_dir = 'topleft vertical'
-        endif
-        let win_size = g:Tlist_WinWidth
-    endif
-
-    " If the tag listing temporary buffer already exists, then reuse it.
-    " Otherwise create a new buffer
-    let bufnum = bufnr(g:TagList_title)
-    if bufnum == -1
-        " Create a new buffer
-        let wcmd = g:TagList_title
-    else
-        " Edit the existing buffer
-        let wcmd = '+buffer' . bufnum
-    endif
-
-    " Create the taglist window
-    exe 'silent! ' . win_dir . ' ' . win_size . 'split ' . wcmd
-
-    " Save the new window position
-    let s:tlist_winx = getwinposx()
-    let s:tlist_winy = getwinposy()
-
-    " Initialize the taglist window
-    call s:Tlist_Window_Init()
-endfunction
-
-" Tlist_Window_Zoom
-" Zoom (maximize/minimize) the taglist window
-function! s:Tlist_Window_Zoom()
-    if s:tlist_win_maximized
-        " Restore the window back to the previous size
-        if g:Tlist_Use_Horiz_Window
-            exe 'resize ' . g:Tlist_WinHeight
-        else
-            exe 'vert resize ' . g:Tlist_WinWidth
-        endif
-        let s:tlist_win_maximized = 0
-    else
-        " Set the window size to the maximum possible without closing other
-        " windows
-        if g:Tlist_Use_Horiz_Window
-            resize
-        else
-            vert resize
-        endif
-        let s:tlist_win_maximized = 1
-    endif
-endfunction
-
-" Tlist_Ballon_Expr
-" When the mouse cursor is over a tag in the taglist window, display the
-" tag prototype (balloon)
-function! Tlist_Ballon_Expr()
-    " Get the file index
-    let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(v:beval_lnum)
-    if fidx == -1
-        return ''
-    endif
-
-    " Get the tag output line for the current tag
-    let tidx = s:Tlist_Window_Get_Tag_Index(fidx, v:beval_lnum)
-    if tidx == 0
-        return ''
-    endif
-
-    " Get the tag search pattern and display it
-    return s:Tlist_Get_Tag_Prototype(fidx, tidx)
-endfunction
-
-" Tlist_Window_Check_Width
-" Check the width of the taglist window. For horizontally split windows, the
-" 'winfixheight' option is used to fix the height of the window. For
-" vertically split windows, Vim doesn't support the 'winfixwidth' option. So
-" need to handle window width changes from this function.
-function! s:Tlist_Window_Check_Width()
-    let tlist_winnr = bufwinnr(g:TagList_title)
-    if tlist_winnr == -1
-        return
-    endif
-
-    let width = winwidth(tlist_winnr)
-    if width != g:Tlist_WinWidth
-        call s:Tlist_Log_Msg("Tlist_Window_Check_Width: Changing window " .
-                    \ "width from " . width . " to " . g:Tlist_WinWidth)
-        let save_winnr = winnr()
-        if save_winnr != tlist_winnr
-            call s:Tlist_Exe_Cmd_No_Acmds(tlist_winnr . 'wincmd w')
-        endif
-        exe 'vert resize ' . g:Tlist_WinWidth
-        if save_winnr != tlist_winnr
-            call s:Tlist_Exe_Cmd_No_Acmds('wincmd p')
-        endif
-    endif
-endfunction
-
-" Tlist_Window_Exit_Only_Window
-" If the 'Tlist_Exit_OnlyWindow' option is set, then exit Vim if only the
-" taglist window is present.
-function! s:Tlist_Window_Exit_Only_Window()
-    " Before quitting Vim, delete the taglist buffer so that
-    " the '0 mark is correctly set to the previous buffer.
-    if v:version < 700
-	if winbufnr(2) == -1
-	    bdelete
-	    quit
-	endif
-    else
-	if winbufnr(2) == -1
-	    if tabpagenr('$') == 1
-		" Only one tag page is present
-		bdelete
-		quit
-	    else
-		" More than one tab page is present. Close only the current
-		" tab page
-		close
-	    endif
-	endif
-    endif
-endfunction
-
-" Tlist_Window_Init
-" Set the default options for the taglist window
-function! s:Tlist_Window_Init()
-    call s:Tlist_Log_Msg('Tlist_Window_Init()')
-
-    " The 'readonly' option should not be set for the taglist buffer.
-    " If Vim is started as "view/gview" or if the ":view" command is
-    " used, then the 'readonly' option is set for all the buffers.
-    " Unset it for the taglist buffer
-    setlocal noreadonly
-
-    " Set the taglist buffer filetype to taglist
-    setlocal filetype=taglist
-
-    " Define taglist window element highlighting
-    syntax match TagListComment '^" .*'
-    syntax match TagListFileName '^[^" ].*$'
-    syntax match TagListTitle '^  \S.*$'
-    syntax match TagListTagScope  '\s\[.\{-\}\]$'
-
-    " Define the highlighting only if colors are supported
-    if has('gui_running') || &t_Co > 2
-        " Colors to highlight various taglist window elements
-        " If user defined highlighting group exists, then use them.
-        " Otherwise, use default highlight groups.
-        if hlexists('MyTagListTagName')
-            highlight link TagListTagName MyTagListTagName
-        else
-            highlight default link TagListTagName Search
-        endif
-        " Colors to highlight comments and titles
-        if hlexists('MyTagListComment')
-            highlight link TagListComment MyTagListComment
-        else
-            highlight clear TagListComment
-            highlight default link TagListComment Comment
-        endif
-        if hlexists('MyTagListTitle')
-            highlight link TagListTitle MyTagListTitle
-        else
-            highlight clear TagListTitle
-            highlight default link TagListTitle Title
-        endif
-        if hlexists('MyTagListFileName')
-            highlight link TagListFileName MyTagListFileName
-        else
-            highlight clear TagListFileName
-            highlight default TagListFileName guibg=Grey ctermbg=darkgray
-                        \ guifg=white ctermfg=white
-        endif
-        if hlexists('MyTagListTagScope')
-            highlight link TagListTagScope MyTagListTagScope
-        else
-            highlight clear TagListTagScope
-            highlight default link TagListTagScope Identifier
-        endif
-    else
-        highlight default TagListTagName term=reverse cterm=reverse
-    endif
-
-    " Folding related settings
-    setlocal foldenable
-    setlocal foldminlines=0
-    setlocal foldmethod=manual
-    setlocal foldlevel=9999
-    if g:Tlist_Enable_Fold_Column
-        setlocal foldcolumn=3
-    else
-        setlocal foldcolumn=0
-    endif
-    setlocal foldtext=v:folddashes.getline(v:foldstart)
-
-    if s:tlist_app_name != "winmanager"
-        " Mark buffer as scratch
-        silent! setlocal buftype=nofile
-        if s:tlist_app_name == "none"
-            silent! setlocal bufhidden=delete
-        endif
-        silent! setlocal noswapfile
-        " Due to a bug in Vim 6.0, the winbufnr() function fails for unlisted
-        " buffers. So if the taglist buffer is unlisted, multiple taglist
-        " windows will be opened. This bug is fixed in Vim 6.1 and above
-        if v:version >= 601
-            silent! setlocal nobuflisted
-        endif
-    endif
-
-    silent! setlocal nowrap
-
-    " If the 'number' option is set in the source window, it will affect the
-    " taglist window. So forcefully disable 'number' option for the taglist
-    " window
-    silent! setlocal nonumber
-
-    " Use fixed height when horizontally split window is used
-    if g:Tlist_Use_Horiz_Window
-        if v:version >= 602
-            set winfixheight
-        endif
-    endif
-    if !g:Tlist_Use_Horiz_Window && v:version >= 700
-        set winfixwidth
-    endif
-
-    " Setup balloon evaluation to display tag prototype
-    if v:version >= 700 && has('balloon_eval')
-        setlocal balloonexpr=Tlist_Ballon_Expr()
-        set ballooneval
-    endif
-
-    " Setup the cpoptions properly for the maps to work
-    let old_cpoptions = &cpoptions
-    set cpoptions&vim
-
-    " Create buffer local mappings for jumping to the tags and sorting the list
-    nnoremap <buffer> <silent> <CR>
-                \ :call <SID>Tlist_Window_Jump_To_Tag('useopen')<CR>
-    nnoremap <buffer> <silent> o
-                \ :call <SID>Tlist_Window_Jump_To_Tag('newwin')<CR>
-    nnoremap <buffer> <silent> p
-                \ :call <SID>Tlist_Window_Jump_To_Tag('preview')<CR>
-    nnoremap <buffer> <silent> P
-                \ :call <SID>Tlist_Window_Jump_To_Tag('prevwin')<CR>
-    if v:version >= 700
-    nnoremap <buffer> <silent> t
-                \ :call <SID>Tlist_Window_Jump_To_Tag('checktab')<CR>
-    nnoremap <buffer> <silent> <C-t>
-                \ :call <SID>Tlist_Window_Jump_To_Tag('newtab')<CR>
-    endif
-    nnoremap <buffer> <silent> <2-LeftMouse>
-                \ :call <SID>Tlist_Window_Jump_To_Tag('useopen')<CR>
-    nnoremap <buffer> <silent> s
-                \ :call <SID>Tlist_Change_Sort('cmd', 'toggle', '')<CR>
-    nnoremap <buffer> <silent> + :silent! foldopen<CR>
-    nnoremap <buffer> <silent> - :silent! foldclose<CR>
-    nnoremap <buffer> <silent> * :silent! %foldopen!<CR>
-    nnoremap <buffer> <silent> = :silent! %foldclose<CR>
-    nnoremap <buffer> <silent> <kPlus> :silent! foldopen<CR>
-    nnoremap <buffer> <silent> <kMinus> :silent! foldclose<CR>
-    nnoremap <buffer> <silent> <kMultiply> :silent! %foldopen!<CR>
-    nnoremap <buffer> <silent> <Space> :call <SID>Tlist_Window_Show_Info()<CR>
-    nnoremap <buffer> <silent> u :call <SID>Tlist_Window_Update_File()<CR>
-    nnoremap <buffer> <silent> d :call <SID>Tlist_Remove_File(-1, 1)<CR>
-    nnoremap <buffer> <silent> x :call <SID>Tlist_Window_Zoom()<CR>
-    nnoremap <buffer> <silent> [[ :call <SID>Tlist_Window_Move_To_File(-1)<CR>
-    nnoremap <buffer> <silent> <BS> :call <SID>Tlist_Window_Move_To_File(-1)<CR>
-    nnoremap <buffer> <silent> ]] :call <SID>Tlist_Window_Move_To_File(1)<CR>
-    nnoremap <buffer> <silent> <Tab> :call <SID>Tlist_Window_Move_To_File(1)<CR>
-    nnoremap <buffer> <silent> <F1> :call <SID>Tlist_Window_Toggle_Help_Text()<CR>
-    nnoremap <buffer> <silent> q :close<CR>
-
-    " Insert mode mappings
-    inoremap <buffer> <silent> <CR>
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('useopen')<CR>
-    " Windows needs return
-    inoremap <buffer> <silent> <Return>
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('useopen')<CR>
-    inoremap <buffer> <silent> o
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('newwin')<CR>
-    inoremap <buffer> <silent> p
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('preview')<CR>
-    inoremap <buffer> <silent> P
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('prevwin')<CR>
-    if v:version >= 700
-    inoremap <buffer> <silent> t
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('checktab')<CR>
-    inoremap <buffer> <silent> <C-t>
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('newtab')<CR>
-    endif
-    inoremap <buffer> <silent> <2-LeftMouse>
-                \ <C-o>:call <SID>Tlist_Window_Jump_To_Tag('useopen')<CR>
-    inoremap <buffer> <silent> s
-                \ <C-o>:call <SID>Tlist_Change_Sort('cmd', 'toggle', '')<CR>
-    inoremap <buffer> <silent> +             <C-o>:silent! foldopen<CR>
-    inoremap <buffer> <silent> -             <C-o>:silent! foldclose<CR>
-    inoremap <buffer> <silent> *             <C-o>:silent! %foldopen!<CR>
-    inoremap <buffer> <silent> =             <C-o>:silent! %foldclose<CR>
-    inoremap <buffer> <silent> <kPlus>       <C-o>:silent! foldopen<CR>
-    inoremap <buffer> <silent> <kMinus>      <C-o>:silent! foldclose<CR>
-    inoremap <buffer> <silent> <kMultiply>   <C-o>:silent! %foldopen!<CR>
-    inoremap <buffer> <silent> <Space>       <C-o>:call
-                                    \ <SID>Tlist_Window_Show_Info()<CR>
-    inoremap <buffer> <silent> u
-                            \ <C-o>:call <SID>Tlist_Window_Update_File()<CR>
-    inoremap <buffer> <silent> d    <C-o>:call <SID>Tlist_Remove_File(-1, 1)<CR>
-    inoremap <buffer> <silent> x    <C-o>:call <SID>Tlist_Window_Zoom()<CR>
-    inoremap <buffer> <silent> [[   <C-o>:call <SID>Tlist_Window_Move_To_File(-1)<CR>
-    inoremap <buffer> <silent> <BS> <C-o>:call <SID>Tlist_Window_Move_To_File(-1)<CR>
-    inoremap <buffer> <silent> ]]   <C-o>:call <SID>Tlist_Window_Move_To_File(1)<CR>
-    inoremap <buffer> <silent> <Tab> <C-o>:call <SID>Tlist_Window_Move_To_File(1)<CR>
-    inoremap <buffer> <silent> <F1>  <C-o>:call <SID>Tlist_Window_Toggle_Help_Text()<CR>
-    inoremap <buffer> <silent> q    <C-o>:close<CR>
-
-    " Map single left mouse click if the user wants this functionality
-    if g:Tlist_Use_SingleClick == 1
-        " Contributed by Bindu Wavell
-        " attempt to perform single click mapping, it would be much
-        " nicer if we could nnoremap <buffer> ... however vim does
-        " not fire the <buffer> <leftmouse> when you use the mouse
-        " to enter a buffer.
-        let clickmap = ':if bufname("%") =~ "__Tag_List__" <bar> ' .
-                    \ 'call <SID>Tlist_Window_Jump_To_Tag("useopen") ' .
-                    \ '<bar> endif <CR>'
-        if maparg('<leftmouse>', 'n') == ''
-            " no mapping for leftmouse
-            exe ':nnoremap <silent> <leftmouse> <leftmouse>' . clickmap
-        else
-            " we have a mapping
-            let mapcmd = ':nnoremap <silent> <leftmouse> <leftmouse>'
-            let mapcmd = mapcmd . substitute(substitute(
-                        \ maparg('<leftmouse>', 'n'), '|', '<bar>', 'g'),
-                        \ '\c^<leftmouse>', '', '')
-            let mapcmd = mapcmd . clickmap
-            exe mapcmd
-        endif
-    endif
-
-    " Define the taglist autocommands
-    augroup TagListAutoCmds
-        autocmd!
-        " Display the tag prototype for the tag under the cursor.
-        autocmd CursorHold __Tag_List__ call s:Tlist_Window_Show_Info()
-        " Highlight the current tag periodically
-        autocmd CursorHold * silent call s:Tlist_Window_Highlight_Tag(
-                            \ fnamemodify(bufname('%'), ':p'), line('.'), 1, 0)
-
-        " Adjust the Vim window width when taglist window is closed
-        autocmd BufUnload __Tag_List__ call s:Tlist_Post_Close_Cleanup()
-        " Close the fold for this buffer when leaving the buffer
-        if g:Tlist_File_Fold_Auto_Close
-            autocmd BufEnter * silent
-                \ call s:Tlist_Window_Open_File_Fold(expand('<abuf>'))
-        endif
-        " Exit Vim itself if only the taglist window is present (optional)
-        if g:Tlist_Exit_OnlyWindow
-	    autocmd BufEnter __Tag_List__ nested
-			\ call s:Tlist_Window_Exit_Only_Window()
-        endif
-        if s:tlist_app_name != "winmanager" &&
-                    \ !g:Tlist_Process_File_Always &&
-                    \ (!has('gui_running') || !g:Tlist_Show_Menu)
-            " Auto refresh the taglist window
-            autocmd BufEnter * call s:Tlist_Refresh()
-        endif
-
-        if !g:Tlist_Use_Horiz_Window
-            if v:version < 700
-                autocmd WinEnter * call s:Tlist_Window_Check_Width()
-            endif
-        endif
-        if v:version >= 700
-            autocmd TabEnter * silent call s:Tlist_Refresh_Folds()
-        endif
-    augroup end
-
-    " Restore the previous cpoptions settings
-    let &cpoptions = old_cpoptions
-endfunction
-
-" Tlist_Window_Refresh
-" Display the tags for all the files in the taglist window
-function! s:Tlist_Window_Refresh()
-    call s:Tlist_Log_Msg('Tlist_Window_Refresh()')
-    " Set report option to a huge value to prevent informational messages
-    " while deleting the lines
-    let old_report = &report
-    set report=99999
-
-    " Mark the buffer as modifiable
-    setlocal modifiable
-
-    " Delete the contents of the buffer to the black-hole register
-    silent! %delete _
-
-    " As we have cleared the taglist window, mark all the files
-    " as not visible
-    let i = 0
-    while i < s:tlist_file_count
-        let s:tlist_{i}_visible = 0
-        let i = i + 1
-    endwhile
-
-    if g:Tlist_Compact_Format == 0
-        " Display help in non-compact mode
-        call s:Tlist_Window_Display_Help()
-    endif
-
-    " Mark the buffer as not modifiable
-    setlocal nomodifiable
-
-    " Restore the report option
-    let &report = old_report
-
-    " If the tags for only one file should be displayed in the taglist
-    " window, then no need to add the tags here. The bufenter autocommand
-    " will add the tags for that file.
-    if g:Tlist_Show_One_File
-        return
-    endif
-
-    " List all the tags for the previously processed files
-    " Do this only if taglist is configured to display tags for more than
-    " one file. Otherwise, when Tlist_Show_One_File is configured,
-    " tags for the wrong file will be displayed.
-    let i = 0
-    while i < s:tlist_file_count
-        call s:Tlist_Window_Refresh_File(s:tlist_{i}_filename,
-                    \ s:tlist_{i}_filetype)
-        let i = i + 1
-    endwhile
-
-    if g:Tlist_Auto_Update
-        " Add and list the tags for all buffers in the Vim buffer list
-        let i = 1
-        let last_bufnum = bufnr('$')
-        while i <= last_bufnum
-            if buflisted(i)
-                let fname = fnamemodify(bufname(i), ':p')
-                let ftype = s:Tlist_Get_Buffer_Filetype(i)
-                " If the file doesn't support tag listing, skip it
-                if !s:Tlist_Skip_File(fname, ftype)
-                    call s:Tlist_Window_Refresh_File(fname, ftype)
-                endif
-            endif
-            let i = i + 1
-        endwhile
-    endif
-
-    " If Tlist_File_Fold_Auto_Close option is set, then close all the folds
-    if g:Tlist_File_Fold_Auto_Close
-        " Close all the folds
-        silent! %foldclose
-    endif
-
-    " Move the cursor to the top of the taglist window
-    normal! gg
-endfunction
-
-" Tlist_Post_Close_Cleanup()
-" Close the taglist window and adjust the Vim window width
-function! s:Tlist_Post_Close_Cleanup()
-    call s:Tlist_Log_Msg('Tlist_Post_Close_Cleanup()')
-    " Mark all the files as not visible
-    let i = 0
-    while i < s:tlist_file_count
-        let s:tlist_{i}_visible = 0
-        let i = i + 1
-    endwhile
-
-    " Remove the taglist autocommands
-    silent! autocmd! TagListAutoCmds
-
-    " Clear all the highlights
-    match none
-
-    silent! syntax clear TagListTitle
-    silent! syntax clear TagListComment
-    silent! syntax clear TagListTagScope
-
-    " Remove the left mouse click mapping if it was setup initially
-    if g:Tlist_Use_SingleClick
-        if hasmapto('<LeftMouse>')
-            nunmap <LeftMouse>
-        endif
-    endif
-
-    if s:tlist_app_name != "winmanager"
-    if g:Tlist_Use_Horiz_Window || g:Tlist_Inc_Winwidth == 0 ||
-                \ s:tlist_winsize_chgd != 1 ||
-                \ &columns < (80 + g:Tlist_WinWidth)
-        " No need to adjust window width if using horizontally split taglist
-        " window or if columns is less than 101 or if the user chose not to
-        " adjust the window width
-    else
-        " If the user didn't manually move the window, then restore the window
-        " position to the pre-taglist position
-        if s:tlist_pre_winx != -1 && s:tlist_pre_winy != -1 &&
-                    \ getwinposx() == s:tlist_winx &&
-                    \ getwinposy() == s:tlist_winy
-            exe 'winpos ' . s:tlist_pre_winx . ' ' . s:tlist_pre_winy
-        endif
-
-        " Adjust the Vim window width
-        let &columns= &columns - (g:Tlist_WinWidth + 1)
-    endif
-    endif
-
-    let s:tlist_winsize_chgd = -1
-
-    " Reset taglist state variables
-    if s:tlist_app_name == "winmanager"
-        let s:tlist_app_name = "none"
-    endif
-    let s:tlist_window_initialized = 0
-endfunction
-
-" Tlist_Window_Refresh_File()
-" List the tags defined in the specified file in a Vim window
-function! s:Tlist_Window_Refresh_File(filename, ftype)
-    call s:Tlist_Log_Msg('Tlist_Window_Refresh_File (' . a:filename . ')')
-    " First check whether the file already exists
-    let fidx = s:Tlist_Get_File_Index(a:filename)
-    if fidx != -1
-        let file_listed = 1
-    else
-        let file_listed = 0
-    endif
-
-    if !file_listed
-        " Check whether this file is removed based on user request
-        " If it is, then don't display the tags for this file
-        if s:Tlist_User_Removed_File(a:filename)
-            return
-        endif
-    endif
-
-    if file_listed && s:tlist_{fidx}_visible
-        " Check whether the file tags are currently valid
-        if s:tlist_{fidx}_valid
-            " Goto the first line in the file
-            exe s:tlist_{fidx}_start
-
-            " If the line is inside a fold, open the fold
-            if foldclosed('.') != -1
-                exe "silent! " . s:tlist_{fidx}_start . "," .
-                            \ s:tlist_{fidx}_end . "foldopen!"
-            endif
-            return
-        endif
-
-        " Discard and remove the tags for this file from display
-        call s:Tlist_Discard_TagInfo(fidx)
-        call s:Tlist_Window_Remove_File_From_Display(fidx)
-    endif
-
-    " Process and generate a list of tags defined in the file
-    if !file_listed || !s:tlist_{fidx}_valid
-        let ret_fidx = s:Tlist_Process_File(a:filename, a:ftype)
-        if ret_fidx == -1
-            return
-        endif
-        let fidx = ret_fidx
-    endif
-
-    " Set report option to a huge value to prevent informational messages
-    " while adding lines to the taglist window
-    let old_report = &report
-    set report=99999
-
-    if g:Tlist_Show_One_File
-        " Remove the previous file
-        if s:tlist_cur_file_idx != -1
-            call s:Tlist_Window_Remove_File_From_Display(s:tlist_cur_file_idx)
-            let s:tlist_{s:tlist_cur_file_idx}_visible = 0
-            let s:tlist_{s:tlist_cur_file_idx}_start = 0
-            let s:tlist_{s:tlist_cur_file_idx}_end = 0
-        endif
-        let s:tlist_cur_file_idx = fidx
-    endif
-
-    " Mark the buffer as modifiable
-    setlocal modifiable
-
-    " Add new files to the end of the window. For existing files, add them at
-    " the same line where they were previously present. If the file is not
-    " visible, then add it at the end
-    if s:tlist_{fidx}_start == 0 || !s:tlist_{fidx}_visible
-        if g:Tlist_Compact_Format
-            let s:tlist_{fidx}_start = line('$')
-        else
-            let s:tlist_{fidx}_start = line('$') + 1
-        endif
-    endif
-
-    let s:tlist_{fidx}_visible = 1
-
-    " Goto the line where this file should be placed
-    if g:Tlist_Compact_Format
-        exe s:tlist_{fidx}_start
-    else
-        exe s:tlist_{fidx}_start - 1
-    endif
-
-    let txt = fnamemodify(s:tlist_{fidx}_filename, ':t') . ' (' .
-                \ fnamemodify(s:tlist_{fidx}_filename, ':p:h') . ')'
-    if g:Tlist_Compact_Format == 0
-        silent! put =txt
-    else
-        silent! put! =txt
-        " Move to the next line
-        exe line('.') + 1
-    endif
-    let file_start = s:tlist_{fidx}_start
-
-    " Add the tag names grouped by tag type to the buffer with a title
-    let i = 1
-    let ttype_cnt = s:tlist_{a:ftype}_count
-    while i <= ttype_cnt
-        let ttype = s:tlist_{a:ftype}_{i}_name
-        " Add the tag type only if there are tags for that type
-        let fidx_ttype = 's:tlist_' . fidx . '_' . ttype
-        let ttype_txt = {fidx_ttype}
-        if ttype_txt != ''
-            let txt = '  ' . s:tlist_{a:ftype}_{i}_fullname
-            if g:Tlist_Compact_Format == 0
-                let ttype_start_lnum = line('.') + 1
-                silent! put =txt
-            else
-                let ttype_start_lnum = line('.')
-                silent! put! =txt
-            endif
-            silent! put =ttype_txt
-
-            let {fidx_ttype}_offset = ttype_start_lnum - file_start
-
-            " create a fold for this tag type
-            let fold_start = ttype_start_lnum
-            let fold_end = fold_start + {fidx_ttype}_count
-            exe fold_start . ',' . fold_end  . 'fold'
-
-            " Adjust the cursor position
-            if g:Tlist_Compact_Format == 0
-                exe ttype_start_lnum + {fidx_ttype}_count
-            else
-                exe ttype_start_lnum + {fidx_ttype}_count + 1
-            endif
-
-            if g:Tlist_Compact_Format == 0
-                " Separate the tag types by a empty line
-                silent! put =''
-            endif
-        endif
-        let i = i + 1
-    endwhile
-
-    if s:tlist_{fidx}_tag_count == 0
-        if g:Tlist_Compact_Format == 0
-            silent! put =''
-        endif
-    endif
-
-    let s:tlist_{fidx}_end = line('.') - 1
-
-    " Create a fold for the entire file
-    exe s:tlist_{fidx}_start . ',' . s:tlist_{fidx}_end . 'fold'
-    exe 'silent! ' . s:tlist_{fidx}_start . ',' .
-                \ s:tlist_{fidx}_end . 'foldopen!'
-
-    " Goto the starting line for this file,
-    exe s:tlist_{fidx}_start
-
-    if s:tlist_app_name == "winmanager"
-        " To handle a bug in the winmanager plugin, add a space at the
-        " last line
-        call setline('$', ' ')
-    endif
-
-    " Mark the buffer as not modifiable
-    setlocal nomodifiable
-
-    " Restore the report option
-    let &report = old_report
-
-    " Update the start and end line numbers for all the files following this
-    " file
-    let start = s:tlist_{fidx}_start
-    " include the empty line after the last line
-    if g:Tlist_Compact_Format
-        let end = s:tlist_{fidx}_end
-    else
-        let end = s:tlist_{fidx}_end + 1
-    endif
-    call s:Tlist_Window_Update_Line_Offsets(fidx + 1, 1, end - start + 1)
-
-    " Now that we have updated the taglist window, update the tags
-    " menu (if present)
-    if g:Tlist_Show_Menu
-        call s:Tlist_Menu_Update_File(1)
-    endif
-endfunction
-
-" Tlist_Init_File
-" Initialize the variables for a new file
-function! s:Tlist_Init_File(filename, ftype)
-    call s:Tlist_Log_Msg('Tlist_Init_File (' . a:filename . ')')
-    " Add new files at the end of the list
-    let fidx = s:tlist_file_count
-    let s:tlist_file_count = s:tlist_file_count + 1
-    " Add the new file name to the taglist list of file names
-    let s:tlist_file_names = s:tlist_file_names . a:filename . "\n"
-
-    " Initialize the file variables
-    let s:tlist_{fidx}_filename = a:filename
-    let s:tlist_{fidx}_sort_type = g:Tlist_Sort_Type
-    let s:tlist_{fidx}_filetype = a:ftype
-    let s:tlist_{fidx}_mtime = -1
-    let s:tlist_{fidx}_start = 0
-    let s:tlist_{fidx}_end = 0
-    let s:tlist_{fidx}_valid = 0
-    let s:tlist_{fidx}_visible = 0
-    let s:tlist_{fidx}_tag_count = 0
-    let s:tlist_{fidx}_menu_cmd = ''
-
-    " Initialize the tag type variables
-    let i = 1
-    while i <= s:tlist_{a:ftype}_count
-        let ttype = s:tlist_{a:ftype}_{i}_name
-        let s:tlist_{fidx}_{ttype} = ''
-        let s:tlist_{fidx}_{ttype}_offset = 0
-        let s:tlist_{fidx}_{ttype}_count = 0
-        let i = i + 1
-    endwhile
-
-    return fidx
-endfunction
-
-" Tlist_Get_Tag_Type_By_Tag
-" Return the tag type for the specified tag index
-function! s:Tlist_Get_Tag_Type_By_Tag(fidx, tidx)
-    let ttype_var = 's:tlist_' . a:fidx . '_' . a:tidx . '_tag_type'
-
-    " Already parsed and have the tag name
-    if exists(ttype_var)
-        return {ttype_var}
-    endif
-
-    let tag_line = s:tlist_{a:fidx}_{a:tidx}_tag
-    let {ttype_var} = s:Tlist_Extract_Tagtype(tag_line)
-
-    return {ttype_var}
-endfunction
-
-" Tlist_Get_Tag_Prototype
-function! s:Tlist_Get_Tag_Prototype(fidx, tidx)
-    let tproto_var = 's:tlist_' . a:fidx . '_' . a:tidx . '_tag_proto'
-
-    " Already parsed and have the tag prototype
-    if exists(tproto_var)
-        return {tproto_var}
-    endif
-
-    " Parse and extract the tag prototype
-    let tag_line = s:tlist_{a:fidx}_{a:tidx}_tag
-    let start = stridx(tag_line, '/^') + 2
-    let end = stridx(tag_line, '/;"' . "\t")
-    if tag_line[end - 1] == '$'
-        let end = end -1
-    endif
-    let tag_proto = strpart(tag_line, start, end - start)
-    let {tproto_var} = substitute(tag_proto, '\s*', '', '')
-
-    return {tproto_var}
-endfunction
-
-" Tlist_Get_Tag_SearchPat
-function! s:Tlist_Get_Tag_SearchPat(fidx, tidx)
-    let tpat_var = 's:tlist_' . a:fidx . '_' . a:tidx . '_tag_searchpat'
-
-    " Already parsed and have the tag search pattern
-    if exists(tpat_var)
-        return {tpat_var}
-    endif
-
-    " Parse and extract the tag search pattern
-    let tag_line = s:tlist_{a:fidx}_{a:tidx}_tag
-    let start = stridx(tag_line, '/^') + 2
-    let end = stridx(tag_line, '/;"' . "\t")
-    if tag_line[end - 1] == '$'
-        let end = end -1
-    endif
-    let {tpat_var} = '\V\^' . strpart(tag_line, start, end - start) .
-                        \ (tag_line[end] == '$' ? '\$' : '')
-
-    return {tpat_var}
-endfunction
-
-" Tlist_Get_Tag_Linenum
-" Return the tag line number, given the tag index
-function! s:Tlist_Get_Tag_Linenum(fidx, tidx)
-    let tline_var = 's:tlist_' . a:fidx . '_' . a:tidx . '_tag_linenum'
-
-    " Already parsed and have the tag line number
-    if exists(tline_var)
-        return {tline_var}
-    endif
-
-    " Parse and extract the tag line number
-    let tag_line = s:tlist_{a:fidx}_{a:tidx}_tag
-    let start = strridx(tag_line, 'line:') + 5
-    let end = strridx(tag_line, "\t")
-    if end < start
-        let {tline_var} = strpart(tag_line, start) + 0
-    else
-        let {tline_var} = strpart(tag_line, start, end - start) + 0
-    endif
-
-    return {tline_var}
-endfunction
-
-" Tlist_Parse_Tagline
-" Parse a tag line from the ctags output. Separate the tag output based on the
-" tag type and store it in the tag type variable.
-" The format of each line in the ctags output is:
-"
-"     tag_name<TAB>file_name<TAB>ex_cmd;"<TAB>extension_fields
-"
-function! s:Tlist_Parse_Tagline(tag_line)
-    if a:tag_line == ''
-        " Skip empty lines
-        return
-    endif
-
-    " Extract the tag type
-    let ttype = s:Tlist_Extract_Tagtype(a:tag_line)
-
-    " Make sure the tag type is a valid and supported one
-    if ttype == '' || stridx(s:ctags_flags, ttype) == -1
-        " Line is not in proper tags format or Tag type is not supported
-        return
-    endif
-
-    " Update the total tag count
-    let s:tidx = s:tidx + 1
-
-    " The following variables are used to optimize this code.  Vim is slow in
-    " using curly brace names. To reduce the amount of processing needed, the
-    " curly brace variables are pre-processed here
-    let fidx_tidx = 's:tlist_' . s:fidx . '_' . s:tidx
-    let fidx_ttype = 's:tlist_' . s:fidx . '_' . ttype
-
-    " Update the count of this tag type
-    let ttype_idx = {fidx_ttype}_count + 1
-    let {fidx_ttype}_count = ttype_idx
-
-    " Store the ctags output for this tag
-    let {fidx_tidx}_tag = a:tag_line
-
-    " Store the tag index and the tag type index (back pointers)
-    let {fidx_ttype}_{ttype_idx} = s:tidx
-    let {fidx_tidx}_ttype_idx = ttype_idx
-
-    " Extract the tag name
-    let tag_name = strpart(a:tag_line, 0, stridx(a:tag_line, "\t"))
-
-    " Extract the tag scope/prototype
-    if g:Tlist_Display_Prototype
-        let ttxt = '    ' . s:Tlist_Get_Tag_Prototype(s:fidx, s:tidx)
-    else
-        let ttxt = '    ' . tag_name
-
-        " Add the tag scope, if it is available and is configured. Tag
-        " scope is the last field after the 'line:<num>\t' field
-        if g:Tlist_Display_Tag_Scope
-            let tag_scope = s:Tlist_Extract_Tag_Scope(a:tag_line)
-            if tag_scope != ''
-                let ttxt = ttxt . ' [' . tag_scope . ']'
-            endif
-        endif
-    endif
-
-    " Add this tag to the tag type variable
-    let {fidx_ttype} = {fidx_ttype} . ttxt . "\n"
-
-    " Save the tag name
-    let {fidx_tidx}_tag_name = tag_name
-endfunction
-
-" Tlist_Process_File
-" Get the list of tags defined in the specified file and store them
-" in Vim variables. Returns the file index where the tags are stored.
-function! s:Tlist_Process_File(filename, ftype)
-    call s:Tlist_Log_Msg('Tlist_Process_File (' . a:filename . ', ' .
-                \ a:ftype . ')')
-    " Check whether this file is supported
-    if s:Tlist_Skip_File(a:filename, a:ftype)
-        return -1
-    endif
-
-    " If the tag types for this filetype are not yet created, then create
-    " them now
-    let var = 's:tlist_' . a:ftype . '_count'
-    if !exists(var)
-        if s:Tlist_FileType_Init(a:ftype) == 0
-            return -1
-        endif
-    endif
-
-    " If this file is already processed, then use the cached values
-    let fidx = s:Tlist_Get_File_Index(a:filename)
-    if fidx == -1
-        " First time, this file is loaded
-        let fidx = s:Tlist_Init_File(a:filename, a:ftype)
-    else
-        " File was previously processed. Discard the tag information
-        call s:Tlist_Discard_TagInfo(fidx)
-    endif
-
-    let s:tlist_{fidx}_valid = 1
-
-    " Exuberant ctags arguments to generate a tag list
-    let ctags_args = ' -f - --format=2 --excmd=pattern --fields=nks '
-
-    " Form the ctags argument depending on the sort type
-    if s:tlist_{fidx}_sort_type == 'name'
-        let ctags_args = ctags_args . '--sort=yes'
-    else
-        let ctags_args = ctags_args . '--sort=no'
-    endif
-
-    " Add the filetype specific arguments
-    let ctags_args = ctags_args . ' ' . s:tlist_{a:ftype}_ctags_args
-
-    " Ctags command to produce output with regexp for locating the tags
-    let ctags_cmd = g:Tlist_Ctags_Cmd . ctags_args
-    let ctags_cmd = ctags_cmd . ' "' . a:filename . '"'
-
-    if &shellxquote == '"'
-        " Double-quotes within double-quotes will not work in the
-        " command-line.If the 'shellxquote' option is set to double-quotes,
-        " then escape the double-quotes in the ctags command-line.
-        let ctags_cmd = escape(ctags_cmd, '"')
-    endif
-
-    " In Windows 95, if not using cygwin, disable the 'shellslash'
-    " option. Otherwise, this will cause problems when running the
-    " ctags command.
-    if has('win95') && !has('win32unix')
-        let old_shellslash = &shellslash
-        set noshellslash
-    endif
-
-    if has('win32') && !has('win32unix') && !has('win95')
-                \ && (&shell =~ 'cmd.exe')
-        " Windows does not correctly deal with commands that have more than 1
-        " set of double quotes.  It will strip them all resulting in:
-        " 'C:\Program' is not recognized as an internal or external command
-        " operable program or batch file.  To work around this, place the
-        " command inside a batch file and call the batch file.
-        " Do this only on Win2K, WinXP and above.
-        " Contributed by: David Fishburn.
-        let s:taglist_tempfile = fnamemodify(tempname(), ':h') .
-                    \ '\taglist.cmd'
-        exe 'redir! > ' . s:taglist_tempfile
-        silent echo ctags_cmd
-        redir END
-
-        call s:Tlist_Log_Msg('Cmd inside batch file: ' . ctags_cmd)
-        let ctags_cmd = '"' . s:taglist_tempfile . '"'
-    endif
-
-    call s:Tlist_Log_Msg('Cmd: ' . ctags_cmd)
-
-    " Run ctags and get the tag list
-    let cmd_output = system(ctags_cmd)
-
-    " Restore the value of the 'shellslash' option.
-    if has('win95') && !has('win32unix')
-        let &shellslash = old_shellslash
-    endif
-
-    if exists('s:taglist_tempfile')
-        " Delete the temporary cmd file created on MS-Windows
-        call delete(s:taglist_tempfile)
-    endif
-
-    " Handle errors
-    if v:shell_error
-        let msg = "Taglist: Failed to generate tags for " . a:filename
-        call s:Tlist_Warning_Msg(msg)
-        if cmd_output != ''
-            call s:Tlist_Warning_Msg(cmd_output)
-        endif
-        return fidx
-    endif
-
-    " Store the modification time for the file
-    let s:tlist_{fidx}_mtime = getftime(a:filename)
-
-    " No tags for current file
-    if cmd_output == ''
-        call s:Tlist_Log_Msg('No tags defined in ' . a:filename)
-        return fidx
-    endif
-
-    call s:Tlist_Log_Msg('Generated tags information for ' . a:filename)
-
-    if v:version > 601
-        " The following script local variables are used by the
-        " Tlist_Parse_Tagline() function.
-        let s:ctags_flags = s:tlist_{a:ftype}_ctags_flags
-        let s:fidx = fidx
-        let s:tidx = 0
-
-        " Process the ctags output one line at a time.  The substitute()
-        " command is used to parse the tag lines instead of using the
-        " matchstr()/stridx()/strpart() functions for performance reason
-        call substitute(cmd_output, "\\([^\n]\\+\\)\n",
-                    \ '\=s:Tlist_Parse_Tagline(submatch(1))', 'g')
-
-        " Save the number of tags for this file
-        let s:tlist_{fidx}_tag_count = s:tidx
-
-        " The following script local variables are no longer needed
-        unlet! s:ctags_flags
-        unlet! s:tidx
-        unlet! s:fidx
-    else
-        " Due to a bug in Vim earlier than version 6.1,
-        " we cannot use substitute() to parse the ctags output.
-        " Instead the slow str*() functions are used
-        let ctags_flags = s:tlist_{a:ftype}_ctags_flags
-        let tidx = 0
-
-        while cmd_output != ''
-            " Extract one line at a time
-            let idx = stridx(cmd_output, "\n")
-            let one_line = strpart(cmd_output, 0, idx)
-            " Remove the line from the tags output
-            let cmd_output = strpart(cmd_output, idx + 1)
-
-            if one_line == ''
-                " Line is not in proper tags format
-                continue
-            endif
-
-            " Extract the tag type
-            let ttype = s:Tlist_Extract_Tagtype(one_line)
-
-            " Make sure the tag type is a valid and supported one
-            if ttype == '' || stridx(ctags_flags, ttype) == -1
-                " Line is not in proper tags format or Tag type is not
-                " supported
-                continue
-            endif
-
-            " Update the total tag count
-            let tidx = tidx + 1
-
-            " The following variables are used to optimize this code.  Vim is
-            " slow in using curly brace names. To reduce the amount of
-            " processing needed, the curly brace variables are pre-processed
-            " here
-            let fidx_tidx = 's:tlist_' . fidx . '_' . tidx
-            let fidx_ttype = 's:tlist_' . fidx . '_' . ttype
-
-            " Update the count of this tag type
-            let ttype_idx = {fidx_ttype}_count + 1
-            let {fidx_ttype}_count = ttype_idx
-
-            " Store the ctags output for this tag
-            let {fidx_tidx}_tag = one_line
-
-            " Store the tag index and the tag type index (back pointers)
-            let {fidx_ttype}_{ttype_idx} = tidx
-            let {fidx_tidx}_ttype_idx = ttype_idx
-
-            " Extract the tag name
-            let tag_name = strpart(one_line, 0, stridx(one_line, "\t"))
-
-            " Extract the tag scope/prototype
-            if g:Tlist_Display_Prototype
-                let ttxt = '    ' . s:Tlist_Get_Tag_Prototype(fidx, tidx)
-            else
-                let ttxt = '    ' . tag_name
-
-                " Add the tag scope, if it is available and is configured. Tag
-                " scope is the last field after the 'line:<num>\t' field
-                if g:Tlist_Display_Tag_Scope
-                    let tag_scope = s:Tlist_Extract_Tag_Scope(one_line)
-                    if tag_scope != ''
-                        let ttxt = ttxt . ' [' . tag_scope . ']'
-                    endif
-                endif
-            endif
-
-            " Add this tag to the tag type variable
-            let {fidx_ttype} = {fidx_ttype} . ttxt . "\n"
-
-            " Save the tag name
-            let {fidx_tidx}_tag_name = tag_name
-        endwhile
-
-        " Save the number of tags for this file
-        let s:tlist_{fidx}_tag_count = tidx
-    endif
-
-    call s:Tlist_Log_Msg('Processed ' . s:tlist_{fidx}_tag_count . 
-                \ ' tags in ' . a:filename)
-
-    return fidx
-endfunction
-
-" Tlist_Update_File
-" Update the tags for a file (if needed)
-function! Tlist_Update_File(filename, ftype)
-    call s:Tlist_Log_Msg('Tlist_Update_File (' . a:filename . ')')
-    " If the file doesn't support tag listing, skip it
-    if s:Tlist_Skip_File(a:filename, a:ftype)
-        return
-    endif
-
-    " Convert the file name to a full path
-    let fname = fnamemodify(a:filename, ':p')
-
-    " First check whether the file already exists
-    let fidx = s:Tlist_Get_File_Index(fname)
-
-    if fidx != -1 && s:tlist_{fidx}_valid
-        " File exists and the tags are valid
-        " Check whether the file was modified after the last tags update
-        " If it is modified, then update the tags
-        if s:tlist_{fidx}_mtime == getftime(fname)
-            return
-        endif
-    else
-        " If the tags were removed previously based on a user request,
-        " as we are going to update the tags (based on the user request),
-        " remove the filename from the deleted list
-        call s:Tlist_Update_Remove_List(fname, 0)
-    endif
-
-    " If the taglist window is opened, update it
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum == -1
-        " Taglist window is not present. Just update the taglist
-        " and return
-        call s:Tlist_Process_File(fname, a:ftype)
-    else
-        if g:Tlist_Show_One_File && s:tlist_cur_file_idx != -1
-            " If tags for only one file are displayed and we are not
-            " updating the tags for that file, then no need to
-            " refresh the taglist window. Otherwise, the taglist
-            " window should be updated.
-            if s:tlist_{s:tlist_cur_file_idx}_filename != fname
-                call s:Tlist_Process_File(fname, a:ftype)
-                return
-            endif
-        endif
-
-        " Save the current window number
-        let save_winnr = winnr()
-
-        " Goto the taglist window
-        call s:Tlist_Window_Goto_Window()
-
-        " Save the cursor position
-        let save_line = line('.')
-        let save_col = col('.')
-
-        " Update the taglist window
-        call s:Tlist_Window_Refresh_File(fname, a:ftype)
-
-        " Restore the cursor position
-        if v:version >= 601
-            call cursor(save_line, save_col)
-        else
-            exe save_line
-            exe 'normal! ' . save_col . '|'
-        endif
-
-        if winnr() != save_winnr
-            " Go back to the original window
-            call s:Tlist_Exe_Cmd_No_Acmds(save_winnr . 'wincmd w')
-        endif
-    endif
-
-    " Update the taglist menu
-    if g:Tlist_Show_Menu
-        call s:Tlist_Menu_Update_File(1)
-    endif
-endfunction
-
-" Tlist_Window_Close
-" Close the taglist window
-function! s:Tlist_Window_Close()
-    call s:Tlist_Log_Msg('Tlist_Window_Close()')
-    " Make sure the taglist window exists
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum == -1
-        call s:Tlist_Warning_Msg('Error: Taglist window is not open')
-        return
-    endif
-
-    if winnr() == winnum
-        " Already in the taglist window. Close it and return
-        if winbufnr(2) != -1
-            " If a window other than the taglist window is open,
-            " then only close the taglist window.
-            close
-        endif
-    else
-        " Goto the taglist window, close it and then come back to the
-        " original window
-        let curbufnr = bufnr('%')
-        exe winnum . 'wincmd w'
-        close
-        " Need to jump back to the original window only if we are not
-        " already in that window
-        let winnum = bufwinnr(curbufnr)
-        if winnr() != winnum
-            exe winnum . 'wincmd w'
-        endif
-    endif
-endfunction
-
-" Tlist_Window_Mark_File_Window
-" Mark the current window as the file window to use when jumping to a tag.
-" Only if the current window is a non-plugin, non-preview and non-taglist
-" window
-function! s:Tlist_Window_Mark_File_Window()
-    if getbufvar('%', '&buftype') == '' && !&previewwindow
-        let w:tlist_file_window = "yes"
-    endif
-endfunction
-
-" Tlist_Window_Open
-" Open and refresh the taglist window
-function! s:Tlist_Window_Open()
-    call s:Tlist_Log_Msg('Tlist_Window_Open()')
-    " If the window is open, jump to it
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        " Jump to the existing window
-        if winnr() != winnum
-            exe winnum . 'wincmd w'
-        endif
-        return
-    endif
-
-    if s:tlist_app_name == "winmanager"
-        " Taglist plugin is no longer part of the winmanager app
-        let s:tlist_app_name = "none"
-    endif
-
-    " Get the filename and filetype for the specified buffer
-    let curbuf_name = fnamemodify(bufname('%'), ':p')
-    let curbuf_ftype = s:Tlist_Get_Buffer_Filetype('%')
-    let cur_lnum = line('.')
-
-    " Mark the current window as the desired window to open a file when a tag
-    " is selected.
-    call s:Tlist_Window_Mark_File_Window()
-
-    " Open the taglist window
-    call s:Tlist_Window_Create()
-
-    call s:Tlist_Window_Refresh()
-
-    if g:Tlist_Show_One_File
-        " Add only the current buffer and file
-        "
-        " If the file doesn't support tag listing, skip it
-        if !s:Tlist_Skip_File(curbuf_name, curbuf_ftype)
-            call s:Tlist_Window_Refresh_File(curbuf_name, curbuf_ftype)
-        endif
-    endif
-
-    if g:Tlist_File_Fold_Auto_Close
-        " Open the fold for the current file, as all the folds in
-        " the taglist window are closed
-        let fidx = s:Tlist_Get_File_Index(curbuf_name)
-        if fidx != -1
-            exe "silent! " . s:tlist_{fidx}_start . "," .
-                        \ s:tlist_{fidx}_end . "foldopen!"
-        endif
-    endif
-
-    " Highlight the current tag
-    call s:Tlist_Window_Highlight_Tag(curbuf_name, cur_lnum, 1, 1)
-endfunction
-
-" Tlist_Window_Toggle()
-" Open or close a taglist window
-function! s:Tlist_Window_Toggle()
-    call s:Tlist_Log_Msg('Tlist_Window_Toggle()')
-    " If taglist window is open then close it.
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        call s:Tlist_Window_Close()
-        return
-    endif
-
-    call s:Tlist_Window_Open()
-
-    " Go back to the original window, if Tlist_GainFocus_On_ToggleOpen is not
-    " set
-    if !g:Tlist_GainFocus_On_ToggleOpen
-        call s:Tlist_Exe_Cmd_No_Acmds('wincmd p')
-    endif
-
-    " Update the taglist menu
-    if g:Tlist_Show_Menu
-        call s:Tlist_Menu_Update_File(0)
-    endif
-endfunction
-
-" Tlist_Process_Filelist
-" Process multiple files. Each filename is separated by "\n"
-" Returns the number of processed files
-function! s:Tlist_Process_Filelist(file_names)
-    let flist = a:file_names
-
-    " Enable lazy screen updates
-    let old_lazyredraw = &lazyredraw
-    set lazyredraw
-
-    " Keep track of the number of processed files
-    let fcnt = 0
-
-    " Process one file at a time
-    while flist != ''
-        let nl_idx = stridx(flist, "\n")
-        let one_file = strpart(flist, 0, nl_idx)
-
-        " Remove the filename from the list
-        let flist = strpart(flist, nl_idx + 1)
-
-        if one_file == ''
-            continue
-        endif
-
-        " Skip directories
-        if isdirectory(one_file)
-            continue
-        endif
-
-        let ftype = s:Tlist_Detect_Filetype(one_file)
-
-        echon "\r                                                              "
-        echon "\rProcessing tags for " . fnamemodify(one_file, ':p:t')
-
-        let fcnt = fcnt + 1
-
-        call Tlist_Update_File(one_file, ftype)
-    endwhile
-
-    " Clear the displayed informational messages
-    echon "\r                                                            "
-
-    " Restore the previous state
-    let &lazyredraw = old_lazyredraw
-
-    return fcnt
-endfunction
-
-" Tlist_Process_Dir
-" Process the files in a directory matching the specified pattern
-function! s:Tlist_Process_Dir(dir_name, pat)
-    let flist = glob(a:dir_name . '/' . a:pat) . "\n"
-
-    let fcnt = s:Tlist_Process_Filelist(flist)
-
-    let len = strlen(a:dir_name)
-    if a:dir_name[len - 1] == '\' || a:dir_name[len - 1] == '/'
-        let glob_expr = a:dir_name . '*'
-    else
-        let glob_expr = a:dir_name . '/*'
-    endif
-    let all_files = glob(glob_expr) . "\n"
-
-    while all_files != ''
-        let nl_idx = stridx(all_files, "\n")
-        let one_file = strpart(all_files, 0, nl_idx)
-
-        let all_files = strpart(all_files, nl_idx + 1)
-        if one_file == ''
-            continue
-        endif
-
-        " Skip non-directory names
-        if !isdirectory(one_file)
-            continue
-        endif
-
-        echon "\r                                                              "
-        echon "\rProcessing files in directory " . fnamemodify(one_file, ':t')
-        let fcnt = fcnt + s:Tlist_Process_Dir(one_file, a:pat)
-    endwhile
-
-    return fcnt
-endfunction
-
-" Tlist_Add_Files_Recursive
-" Add files recursively from a directory
-function! s:Tlist_Add_Files_Recursive(dir, ...)
-    let dir_name = fnamemodify(a:dir, ':p')
-    if !isdirectory(dir_name)
-        call s:Tlist_Warning_Msg('Error: ' . dir_name . ' is not a directory')
-        return
-    endif
-
-    if a:0 == 1
-        " User specified file pattern
-        let pat = a:1
-    else
-        " Default file pattern
-        let pat = '*'
-    endif
-
-    echon "\r                                                              "
-    echon "\rProcessing files in directory " . fnamemodify(dir_name, ':t')
-    let fcnt = s:Tlist_Process_Dir(dir_name, pat)
-
-    echon "\rAdded " . fcnt . " files to the taglist"
-endfunction
-
-" Tlist_Add_Files
-" Add the specified list of files to the taglist
-function! s:Tlist_Add_Files(...)
-    let flist = ''
-    let i = 1
-
-    " Get all the files matching the file patterns supplied as argument
-    while i <= a:0
-        let flist = flist . glob(a:{i}) . "\n"
-        let i = i + 1
-    endwhile
-
-    if flist == ''
-        call s:Tlist_Warning_Msg('Error: No matching files are found')
-        return
-    endif
-
-    let fcnt = s:Tlist_Process_Filelist(flist)
-    echon "\rAdded " . fcnt . " files to the taglist"
-endfunction
-
-" Tlist_Extract_Tagtype
-" Extract the tag type from the tag text
-function! s:Tlist_Extract_Tagtype(tag_line)
-    " The tag type is after the tag prototype field. The prototype field
-    " ends with the /;"\t string. We add 4 at the end to skip the characters
-    " in this special string..
-    let start = strridx(a:tag_line, '/;"' . "\t") + 4
-    let end = strridx(a:tag_line, 'line:') - 1
-    let ttype = strpart(a:tag_line, start, end - start)
-
-    return ttype
-endfunction
-
-" Tlist_Extract_Tag_Scope
-" Extract the tag scope from the tag text
-function! s:Tlist_Extract_Tag_Scope(tag_line)
-    let start = strridx(a:tag_line, 'line:')
-    let end = strridx(a:tag_line, "\t")
-    if end <= start
-        return ''
-    endif
-
-    let tag_scope = strpart(a:tag_line, end + 1)
-    let tag_scope = strpart(tag_scope, stridx(tag_scope, ':') + 1)
-
-    return tag_scope
-endfunction
-
-" Tlist_Refresh()
-" Refresh the taglist
-function! s:Tlist_Refresh()
-    call s:Tlist_Log_Msg('Tlist_Refresh (Skip_Refresh = ' .
-                \ s:Tlist_Skip_Refresh . ', ' . bufname('%') . ')')
-    " If we are entering the buffer from one of the taglist functions, then
-    " no need to refresh the taglist window again.
-    if s:Tlist_Skip_Refresh
-        " We still need to update the taglist menu
-        if g:Tlist_Show_Menu
-            call s:Tlist_Menu_Update_File(0)
-        endif
-        return
-    endif
-
-    " If part of the winmanager plugin and not configured to process
-    " tags always and not configured to display the tags menu, then return
-    if (s:tlist_app_name == 'winmanager') && !g:Tlist_Process_File_Always
-                \ && !g:Tlist_Show_Menu
-        return
-    endif
-
-    " Skip buffers with 'buftype' set to nofile, nowrite, quickfix or help
-    if &buftype != ''
-        return
-    endif
-
-    let filename = fnamemodify(bufname('%'), ':p')
-    let ftype = s:Tlist_Get_Buffer_Filetype('%')
-
-    " If the file doesn't support tag listing, skip it
-    if s:Tlist_Skip_File(filename, ftype)
-        return
-    endif
-
-    let tlist_win = bufwinnr(g:TagList_title)
-
-    " If the taglist window is not opened and not configured to process
-    " tags always and not displaying the tags menu, then return
-    if tlist_win == -1 && !g:Tlist_Process_File_Always && !g:Tlist_Show_Menu
-        return
-    endif
-
-    let fidx = s:Tlist_Get_File_Index(filename)
-    if fidx == -1
-        " Check whether this file is removed based on user request
-        " If it is, then don't display the tags for this file
-        if s:Tlist_User_Removed_File(filename)
-            return
-        endif
-
-        " If the taglist should not be auto updated, then return
-        if !g:Tlist_Auto_Update
-            return
-        endif
-    endif
-
-    let cur_lnum = line('.')
-
-    if fidx == -1
-        " Update the tags for the file
-        let fidx = s:Tlist_Process_File(filename, ftype)
-    else
-        let mtime = getftime(filename)
-        if s:tlist_{fidx}_mtime != mtime
-            " Invalidate the tags listed for this file
-            let s:tlist_{fidx}_valid = 0
-
-            " Update the taglist and the window
-            call Tlist_Update_File(filename, ftype)
-
-            " Store the new file modification time
-            let s:tlist_{fidx}_mtime = mtime
-        endif
-    endif
-
-    " Update the taglist window
-    if tlist_win != -1
-        " Disable screen updates
-        let old_lazyredraw = &lazyredraw
-        set nolazyredraw
-
-        " Save the current window number
-        let save_winnr = winnr()
-
-        " Goto the taglist window
-        call s:Tlist_Window_Goto_Window()
-
-        if !g:Tlist_Auto_Highlight_Tag || !g:Tlist_Highlight_Tag_On_BufEnter
-            " Save the cursor position
-            let save_line = line('.')
-            let save_col = col('.')
-        endif
-
-        " Update the taglist window
-        call s:Tlist_Window_Refresh_File(filename, ftype)
-
-        " Open the fold for the file
-        exe "silent! " . s:tlist_{fidx}_start . "," .
-                    \ s:tlist_{fidx}_end . "foldopen!"
-
-        if g:Tlist_Highlight_Tag_On_BufEnter && g:Tlist_Auto_Highlight_Tag
-            if g:Tlist_Show_One_File && s:tlist_cur_file_idx != fidx
-                " If displaying tags for only one file in the taglist
-                " window and about to display the tags for a new file,
-                " then center the current tag line for the new file
-                let center_tag_line = 1
-            else
-                let center_tag_line = 0
-            endif
-
-            " Highlight the current tag
-            call s:Tlist_Window_Highlight_Tag(filename, cur_lnum, 1, center_tag_line)
-        else
-            " Restore the cursor position
-            if v:version >= 601
-                call cursor(save_line, save_col)
-            else
-                exe save_line
-                exe 'normal! ' . save_col . '|'
-            endif
-        endif
-
-        " Jump back to the original window
-        if save_winnr != winnr()
-            call s:Tlist_Exe_Cmd_No_Acmds(save_winnr . 'wincmd w')
-        endif
-
-        " Restore screen updates
-        let &lazyredraw = old_lazyredraw
-    endif
-
-    " Update the taglist menu
-    if g:Tlist_Show_Menu
-        call s:Tlist_Menu_Update_File(0)
-    endif
-endfunction
-
-" Tlist_Change_Sort()
-" Change the sort order of the tag listing
-" caller == 'cmd', command used in the taglist window
-" caller == 'menu', taglist menu
-" action == 'toggle', toggle sort from name to order and vice versa
-" action == 'set', set the sort order to sort_type
-function! s:Tlist_Change_Sort(caller, action, sort_type)
-    call s:Tlist_Log_Msg('Tlist_Change_Sort (caller = ' . a:caller .
-            \ ', action = ' . a:action . ', sort_type = ' . a:sort_type . ')')
-    if a:caller == 'cmd'
-        let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(line('.'))
-        if fidx == -1
-            return
-        endif
-
-        " Remove the previous highlighting
-        match none
-    elseif a:caller == 'menu'
-        let fidx = s:Tlist_Get_File_Index(fnamemodify(bufname('%'), ':p'))
-        if fidx == -1
-            return
-        endif
-    endif
-
-    if a:action == 'toggle'
-        let sort_type = s:tlist_{fidx}_sort_type
-
-        " Toggle the sort order from 'name' to 'order' and vice versa
-        if sort_type == 'name'
-            let s:tlist_{fidx}_sort_type = 'order'
-        else
-            let s:tlist_{fidx}_sort_type = 'name'
-        endif
-    else
-        let s:tlist_{fidx}_sort_type = a:sort_type
-    endif
-
-    " Invalidate the tags listed for this file
-    let s:tlist_{fidx}_valid = 0
-
-    if a:caller  == 'cmd'
-        " Save the current line for later restoration
-        let curline = '\V\^' . getline('.') . '\$'
-
-        call s:Tlist_Window_Refresh_File(s:tlist_{fidx}_filename,
-                    \   s:tlist_{fidx}_filetype)
-
-        exe s:tlist_{fidx}_start . ',' . s:tlist_{fidx}_end . 'foldopen!'
-
-        " Go back to the cursor line before the tag list is sorted
-        call search(curline, 'w')
-
-        call s:Tlist_Menu_Update_File(1)
-    else
-        call s:Tlist_Menu_Remove_File()
-
-        call s:Tlist_Refresh()
-    endif
-endfunction
-
-" Tlist_Update_Current_File()
-" Update taglist for the current buffer by regenerating the tag list
-" Contributed by WEN Guopeng.
-function! s:Tlist_Update_Current_File()
-    call s:Tlist_Log_Msg('Tlist_Update_Current_File()')
-    if winnr() == bufwinnr(g:TagList_title)
-        " In the taglist window. Update the current file
-        call s:Tlist_Window_Update_File()
-    else
-        " Not in the taglist window. Update the current buffer
-        let filename = fnamemodify(bufname('%'), ':p')
-        let fidx = s:Tlist_Get_File_Index(filename)
-        if fidx != -1
-            let s:tlist_{fidx}_valid = 0
-        endif
-        let ft = s:Tlist_Get_Buffer_Filetype('%')
-        call Tlist_Update_File(filename, ft)
-    endif
-endfunction
-
-" Tlist_Window_Update_File()
-" Update the tags displayed in the taglist window
-function! s:Tlist_Window_Update_File()
-    call s:Tlist_Log_Msg('Tlist_Window_Update_File()')
-    let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(line('.'))
-    if fidx == -1
-        return
-    endif
-
-    " Remove the previous highlighting
-    match none
-
-    " Save the current line for later restoration
-    let curline = '\V\^' . getline('.') . '\$'
-
-    let s:tlist_{fidx}_valid = 0
-
-    " Update the taglist window
-    call s:Tlist_Window_Refresh_File(s:tlist_{fidx}_filename,
-                \ s:tlist_{fidx}_filetype)
-
-    exe s:tlist_{fidx}_start . ',' . s:tlist_{fidx}_end . 'foldopen!'
-
-    " Go back to the tag line before the list is updated
-    call search(curline, 'w')
-endfunction
-
-" Tlist_Window_Get_Tag_Type_By_Linenum()
-" Return the tag type index for the specified line in the taglist window
-function! s:Tlist_Window_Get_Tag_Type_By_Linenum(fidx, lnum)
-    let ftype = s:tlist_{a:fidx}_filetype
-
-    " Determine to which tag type the current line number belongs to using the
-    " tag type start line number and the number of tags in a tag type
-    let i = 1
-    while i <= s:tlist_{ftype}_count
-        let ttype = s:tlist_{ftype}_{i}_name
-        let start_lnum =
-                    \ s:tlist_{a:fidx}_start + s:tlist_{a:fidx}_{ttype}_offset
-        let end =  start_lnum + s:tlist_{a:fidx}_{ttype}_count
-        if a:lnum >= start_lnum && a:lnum <= end
-            break
-        endif
-        let i = i + 1
-    endwhile
-
-    " Current line doesn't belong to any of the displayed tag types
-    if i > s:tlist_{ftype}_count
-        return ''
-    endif
-
-    return ttype
-endfunction
-
-" Tlist_Window_Get_Tag_Index()
-" Return the tag index for the specified line in the taglist window
-function! s:Tlist_Window_Get_Tag_Index(fidx, lnum)
-    let ttype = s:Tlist_Window_Get_Tag_Type_By_Linenum(a:fidx, a:lnum)
-
-    " Current line doesn't belong to any of the displayed tag types
-    if ttype == ''
-        return 0
-    endif
-
-    " Compute the index into the displayed tags for the tag type
-    let ttype_lnum = s:tlist_{a:fidx}_start + s:tlist_{a:fidx}_{ttype}_offset
-    let tidx = a:lnum - ttype_lnum
-    if tidx == 0
-        return 0
-    endif
-
-    " Get the corresponding tag line and return it
-    return s:tlist_{a:fidx}_{ttype}_{tidx}
-endfunction
-
-" Tlist_Window_Highlight_Line
-" Highlight the current line
-function! s:Tlist_Window_Highlight_Line()
-    " Clear previously selected name
-    match none
-
-    " Highlight the current line
-    if g:Tlist_Display_Prototype == 0
-        let pat = '/\%' . line('.') . 'l\s\+\zs.*/'
-    else
-        let pat = '/\%' . line('.') . 'l.*/'
-    endif
-
-    exe 'match TagListTagName ' . pat
-endfunction
-
-" Tlist_Window_Open_File
-" Open the specified file in either a new window or an existing window
-" and place the cursor at the specified tag pattern
-function! s:Tlist_Window_Open_File(win_ctrl, filename, tagpat)
-    call s:Tlist_Log_Msg('Tlist_Window_Open_File (' . a:filename . ',' .
-                \ a:win_ctrl . ')')
-    let prev_Tlist_Skip_Refresh = s:Tlist_Skip_Refresh
-    let s:Tlist_Skip_Refresh = 1
-
-    if s:tlist_app_name == "winmanager"
-        " Let the winmanager edit the file
-        call WinManagerFileEdit(a:filename, a:win_ctrl == 'newwin')
-    else
-
-    if a:win_ctrl == 'newtab'
-        " Create a new tab
-        exe 'tabnew ' . escape(a:filename, ' ')
-        " Open the taglist window in the new tab
-        call s:Tlist_Window_Open()
-    endif
-
-    if a:win_ctrl == 'checktab'
-        " Check whether the file is present in any of the tabs.
-        " If the file is present in the current tab, then use the
-        " current tab.
-        if bufwinnr(a:filename) != -1
-            let file_present_in_tab = 1
-            let i = tabpagenr()
-        else
-            let i = 1
-            let bnum = bufnr(a:filename)
-            let file_present_in_tab = 0
-            while i <= tabpagenr('$')
-                if index(tabpagebuflist(i), bnum) != -1
-                    let file_present_in_tab = 1
-                    break
-                endif
-                let i += 1
-            endwhile
-        endif
-
-        if file_present_in_tab
-            " Goto the tab containing the file
-            exe 'tabnext ' . i
-        else
-            " Open a new tab
-            exe 'tabnew ' . escape(a:filename, ' ')
-
-            " Open the taglist window
-            call s:Tlist_Window_Open()
-        endif
-    endif
-
-    let winnum = -1
-    if a:win_ctrl == 'prevwin'
-        " Open the file in the previous window, if it is usable
-        let cur_win = winnr()
-        wincmd p
-        if &buftype == '' && !&previewwindow
-            exe "edit " . escape(a:filename, ' ')
-            let winnum = winnr()
-        else
-            " Previous window is not usable
-            exe cur_win . 'wincmd w'
-        endif
-    endif
-
-    " Goto the window containing the file.  If the window is not there, open a
-    " new window
-    if winnum == -1
-        let winnum = bufwinnr(a:filename)
-    endif
-
-    if winnum == -1
-        " Locate the previously used window for opening a file
-        let fwin_num = 0
-        let first_usable_win = 0
-
-        let i = 1
-        let bnum = winbufnr(i)
-        while bnum != -1
-            if getwinvar(i, 'tlist_file_window') == 'yes'
-                let fwin_num = i
-                break
-            endif
-            if first_usable_win == 0 &&
-                        \ getbufvar(bnum, '&buftype') == '' &&
-                        \ !getwinvar(i, '&previewwindow')
-                " First non-taglist, non-plugin and non-preview window
-                let first_usable_win = i
-            endif
-            let i = i + 1
-            let bnum = winbufnr(i)
-        endwhile
-
-        " If a previously used window is not found, then use the first
-        " non-taglist window
-        if fwin_num == 0
-            let fwin_num = first_usable_win
-        endif
-
-        if fwin_num != 0
-            " Jump to the file window
-            exe fwin_num . "wincmd w"
-
-            " If the user asked to jump to the tag in a new window, then split
-            " the existing window into two.
-            if a:win_ctrl == 'newwin'
-                split
-            endif
-            exe "edit " . escape(a:filename, ' ')
-        else
-            " Open a new window
-            if g:Tlist_Use_Horiz_Window
-                exe 'leftabove split ' . escape(a:filename, ' ')
-            else
-                if winbufnr(2) == -1
-                    " Only the taglist window is present
-                    if g:Tlist_Use_Right_Window
-                        exe 'leftabove vertical split ' .
-                                    \ escape(a:filename, ' ')
-                    else
-                        exe 'rightbelow vertical split ' .
-                                    \ escape(a:filename, ' ')
-                    endif
-
-                    " Go to the taglist window to change the window size to
-                    " the user configured value
-                    call s:Tlist_Exe_Cmd_No_Acmds('wincmd p')
-                    if g:Tlist_Use_Horiz_Window
-                        exe 'resize ' . g:Tlist_WinHeight
-                    else
-                        exe 'vertical resize ' . g:Tlist_WinWidth
-                    endif
-                    " Go back to the file window
-                    call s:Tlist_Exe_Cmd_No_Acmds('wincmd p')
-                else
-                    " A plugin or help window is also present
-                    wincmd w
-                    exe 'leftabove split ' . escape(a:filename, ' ')
-                endif
-            endif
-        endif
-        " Mark the window, so that it can be reused.
-        call s:Tlist_Window_Mark_File_Window()
-    else
-        if v:version >= 700
-            " If the file is opened in more than one window, then check
-            " whether the last accessed window has the selected file.
-            " If it does, then use that window.
-            let lastwin_bufnum = winbufnr(winnr('#'))
-            if bufnr(a:filename) == lastwin_bufnum
-                let winnum = winnr('#')
-            endif
-        endif
-        exe winnum . 'wincmd w'
-
-        " If the user asked to jump to the tag in a new window, then split the
-        " existing window into two.
-        if a:win_ctrl == 'newwin'
-            split
-        endif
-    endif
-    endif
-
-    " Jump to the tag
-    if a:tagpat != ''
-        " Add the current cursor position to the jump list, so that user can
-        " jump back using the ' and ` marks.
-        mark '
-        silent call search(a:tagpat, 'w')
-
-        " Bring the line to the middle of the window
-        normal! z.
-
-        " If the line is inside a fold, open the fold
-        if foldclosed('.') != -1
-            .foldopen
-        endif
-    endif
-
-    " If the user selects to preview the tag then jump back to the
-    " taglist window
-    if a:win_ctrl == 'preview'
-        " Go back to the taglist window
-        let winnum = bufwinnr(g:TagList_title)
-        exe winnum . 'wincmd w'
-    else
-        " If the user has selected to close the taglist window, when a
-        " tag is selected, close the taglist  window
-        if g:Tlist_Close_On_Select
-            call s:Tlist_Window_Goto_Window()
-            close
-
-            " Go back to the window displaying the selected file
-            let wnum = bufwinnr(a:filename)
-            if wnum != -1 && wnum != winnr()
-                call s:Tlist_Exe_Cmd_No_Acmds(wnum . 'wincmd w')
-            endif
-        endif
-    endif
-
-    let s:Tlist_Skip_Refresh = prev_Tlist_Skip_Refresh
-endfunction
-
-" Tlist_Window_Jump_To_Tag()
-" Jump to the location of the current tag
-" win_ctrl == useopen - Reuse the existing file window
-" win_ctrl == newwin - Open a new window
-" win_ctrl == preview - Preview the tag
-" win_ctrl == prevwin - Open in previous window
-" win_ctrl == newtab - Open in new tab
-function! s:Tlist_Window_Jump_To_Tag(win_ctrl)
-    call s:Tlist_Log_Msg('Tlist_Window_Jump_To_Tag(' . a:win_ctrl . ')')
-    " Do not process comment lines and empty lines
-    let curline = getline('.')
-    if curline =~ '^\s*$' || curline[0] == '"'
-        return
-    endif
-
-    " If inside a closed fold, then use the first line of the fold
-    " and jump to the file.
-    let lnum = foldclosed('.')
-    if lnum == -1
-        " Jump to the selected tag or file
-        let lnum = line('.')
-    else
-        " Open the closed fold
-        .foldopen!
-    endif
-
-    let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(lnum)
-    if fidx == -1
-        return
-    endif
-
-    " Get the tag output for the current tag
-    let tidx = s:Tlist_Window_Get_Tag_Index(fidx, lnum)
-    if tidx != 0
-        let tagpat = s:Tlist_Get_Tag_SearchPat(fidx, tidx)
-
-        " Highlight the tagline
-        call s:Tlist_Window_Highlight_Line()
-    else
-        " Selected a line which is not a tag name. Just edit the file
-        let tagpat = ''
-    endif
-
-    call s:Tlist_Window_Open_File(a:win_ctrl, s:tlist_{fidx}_filename, tagpat)
-endfunction
-
-" Tlist_Window_Show_Info()
-" Display information about the entry under the cursor
-function! s:Tlist_Window_Show_Info()
-    call s:Tlist_Log_Msg('Tlist_Window_Show_Info()')
-
-    " Clear the previously displayed line
-    echo
-
-    " Do not process comment lines and empty lines
-    let curline = getline('.')
-    if curline =~ '^\s*$' || curline[0] == '"'
-        return
-    endif
-
-    " If inside a fold, then don't display the prototype
-    if foldclosed('.') != -1
-        return
-    endif
-
-    let lnum = line('.')
-
-    " Get the file index
-    let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(lnum)
-    if fidx == -1
-        return
-    endif
-
-    if lnum == s:tlist_{fidx}_start
-        " Cursor is on a file name
-        let fname = s:tlist_{fidx}_filename
-        if strlen(fname) > 50
-            let fname = fnamemodify(fname, ':t')
-        endif
-        echo fname . ', Filetype=' . s:tlist_{fidx}_filetype .
-                    \  ', Tag count=' . s:tlist_{fidx}_tag_count
-        return
-    endif
-
-    " Get the tag output line for the current tag
-    let tidx = s:Tlist_Window_Get_Tag_Index(fidx, lnum)
-    if tidx == 0
-        " Cursor is on a tag type
-        let ttype = s:Tlist_Window_Get_Tag_Type_By_Linenum(fidx, lnum)
-        if ttype == ''
-            return
-        endif
-
-        let ttype_name = ''
-
-        let ftype = s:tlist_{fidx}_filetype
-        let i = 1
-        while i <= s:tlist_{ftype}_count
-            if ttype == s:tlist_{ftype}_{i}_name
-                let ttype_name = s:tlist_{ftype}_{i}_fullname
-                break
-            endif
-            let i = i + 1
-        endwhile
-
-        echo 'Tag type=' . ttype_name .
-                    \ ', Tag count=' . s:tlist_{fidx}_{ttype}_count
-        return
-    endif
-
-    " Get the tag search pattern and display it
-    echo s:Tlist_Get_Tag_Prototype(fidx, tidx)
-endfunction
-
-" Tlist_Find_Nearest_Tag_Idx
-" Find the tag idx nearest to the supplied line number
-" Returns -1, if a tag couldn't be found for the specified line number
-function! s:Tlist_Find_Nearest_Tag_Idx(fidx, linenum)
-    let sort_type = s:tlist_{a:fidx}_sort_type
-
-    let left = 1
-    let right = s:tlist_{a:fidx}_tag_count
-
-    if sort_type == 'order'
-        " Tags sorted by order, use a binary search.
-        " The idea behind this function is taken from the ctags.vim script (by
-        " Alexey Marinichev) available at the Vim online website.
-
-        " If the current line is the less than the first tag, then no need to
-        " search
-        let first_lnum = s:Tlist_Get_Tag_Linenum(a:fidx, 1)
-
-        if a:linenum < first_lnum
-            return -1
-        endif
-
-        while left < right
-            let middle = (right + left + 1) / 2
-            let middle_lnum = s:Tlist_Get_Tag_Linenum(a:fidx, middle)
-
-            if middle_lnum == a:linenum
-                let left = middle
-                break
-            endif
-
-            if middle_lnum > a:linenum
-                let right = middle - 1
-            else
-                let left = middle
-            endif
-        endwhile
-    else
-        " Tags sorted by name, use a linear search. (contributed by Dave
-        " Eggum).
-        " Look for a tag with a line number less than or equal to the supplied
-        " line number. If multiple tags are found, then use the tag with the
-        " line number closest to the supplied line number. IOW, use the tag
-        " with the highest line number.
-        let closest_lnum = 0
-        let final_left = 0
-        while left <= right
-            let lnum = s:Tlist_Get_Tag_Linenum(a:fidx, left)
-
-            if lnum < a:linenum && lnum > closest_lnum
-                let closest_lnum = lnum
-                let final_left = left
-            elseif lnum == a:linenum
-                let closest_lnum = lnum
-                let final_left = left
-                break
-            else
-                let left = left + 1
-            endif
-        endwhile
-        if closest_lnum == 0
-            return -1
-        endif
-        if left >= right
-            let left = final_left
-        endif
-    endif
-
-    return left
-endfunction
-
-" Tlist_Window_Highlight_Tag()
-" Highlight the current tag
-" cntx == 1, Called by the taglist plugin itself
-" cntx == 2, Forced by the user through the TlistHighlightTag command
-" center = 1, move the tag line to the center of the taglist window
-function! s:Tlist_Window_Highlight_Tag(filename, cur_lnum, cntx, center)
-    " Highlight the current tag only if the user configured the
-    " taglist plugin to do so or if the user explictly invoked the
-    " command to highlight the current tag.
-    if !g:Tlist_Auto_Highlight_Tag && a:cntx == 1
-        return
-    endif
-
-    if a:filename == ''
-        return
-    endif
-
-    " Make sure the taglist window is present
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum == -1
-        call s:Tlist_Warning_Msg('Error: Taglist window is not open')
-        return
-    endif
-
-    let fidx = s:Tlist_Get_File_Index(a:filename)
-    if fidx == -1
-        return
-    endif
-
-    " If the file is currently not displayed in the taglist window, then retrn
-    if !s:tlist_{fidx}_visible
-        return
-    endif
-
-    " If there are no tags for this file, then no need to proceed further
-    if s:tlist_{fidx}_tag_count == 0
-        return
-    endif
-
-    " Ignore all autocommands
-    let old_ei = &eventignore
-    set eventignore=all
-
-    " Save the original window number
-    let org_winnr = winnr()
-
-    if org_winnr == winnum
-        let in_taglist_window = 1
-    else
-        let in_taglist_window = 0
-    endif
-
-    " Go to the taglist window
-    if !in_taglist_window
-        exe winnum . 'wincmd w'
-    endif
-
-    " Clear previously selected name
-    match none
-
-    let tidx = s:Tlist_Find_Nearest_Tag_Idx(fidx, a:cur_lnum)
-    if tidx == -1
-        " Make sure the current tag line is visible in the taglist window.
-        " Calling the winline() function makes the line visible.  Don't know
-        " of a better way to achieve this.
-        let lnum = line('.')
-
-        if lnum < s:tlist_{fidx}_start || lnum > s:tlist_{fidx}_end
-            " Move the cursor to the beginning of the file
-            exe s:tlist_{fidx}_start
-        endif
-
-        if foldclosed('.') != -1
-            .foldopen
-        endif
-
-        call winline()
-
-        if !in_taglist_window
-            exe org_winnr . 'wincmd w'
-        endif
-
-        " Restore the autocommands
-        let &eventignore = old_ei
-        return
-    endif
-
-    " Extract the tag type
-    let ttype = s:Tlist_Get_Tag_Type_By_Tag(fidx, tidx)
-
-    " Compute the line number
-    " Start of file + Start of tag type + offset
-    let lnum = s:tlist_{fidx}_start + s:tlist_{fidx}_{ttype}_offset +
-                \ s:tlist_{fidx}_{tidx}_ttype_idx
-
-    " Goto the line containing the tag
-    exe lnum
-
-    " Open the fold
-    if foldclosed('.') != -1
-        .foldopen
-    endif
-
-    if a:center
-        " Move the tag line to the center of the taglist window
-        normal! z.
-    else
-        " Make sure the current tag line is visible in the taglist window.
-        " Calling the winline() function makes the line visible.  Don't know
-        " of a better way to achieve this.
-        call winline()
-    endif
-
-    " Highlight the tag name
-    call s:Tlist_Window_Highlight_Line()
-
-    " Go back to the original window
-    if !in_taglist_window
-        exe org_winnr . 'wincmd w'
-    endif
-
-    " Restore the autocommands
-    let &eventignore = old_ei
-    return
-endfunction
-
-" Tlist_Get_Tag_Prototype_By_Line
-" Get the prototype for the tag on or before the specified line number in the
-" current buffer
-function! Tlist_Get_Tag_Prototype_By_Line(...)
-    if a:0 == 0
-        " Arguments are not supplied. Use the current buffer name
-        " and line number
-        let filename = bufname('%')
-        let linenr = line('.')
-    elseif a:0 == 2
-        " Filename and line number are specified
-        let filename = a:1
-        let linenr = a:2
-        if linenr !~ '\d\+'
-            " Invalid line number
-            return ""
-        endif
-    else
-        " Sufficient arguments are not supplied
-        let msg =  'Usage: Tlist_Get_Tag_Prototype_By_Line <filename> ' .
-                                \ '<line_number>'
-        call s:Tlist_Warning_Msg(msg)
-        return ""
-    endif
-
-    " Expand the file to a fully qualified name
-    let filename = fnamemodify(filename, ':p')
-    if filename == ''
-        return ""
-    endif
-
-    let fidx = s:Tlist_Get_File_Index(filename)
-    if fidx == -1
-        return ""
-    endif
-
-    " If there are no tags for this file, then no need to proceed further
-    if s:tlist_{fidx}_tag_count == 0
-        return ""
-    endif
-
-    " Get the tag text using the line number
-    let tidx = s:Tlist_Find_Nearest_Tag_Idx(fidx, linenr)
-    if tidx == -1
-        return ""
-    endif
-
-    return s:Tlist_Get_Tag_Prototype(fidx, tidx)
-endfunction
-
-" Tlist_Get_Tagname_By_Line
-" Get the tag name on or before the specified line number in the
-" current buffer
-function! Tlist_Get_Tagname_By_Line(...)
-    if a:0 == 0
-        " Arguments are not supplied. Use the current buffer name
-        " and line number
-        let filename = bufname('%')
-        let linenr = line('.')
-    elseif a:0 == 2
-        " Filename and line number are specified
-        let filename = a:1
-        let linenr = a:2
-        if linenr !~ '\d\+'
-            " Invalid line number
-            return ""
-        endif
-    else
-        " Sufficient arguments are not supplied
-        let msg =  'Usage: Tlist_Get_Tagname_By_Line <filename> <line_number>'
-        call s:Tlist_Warning_Msg(msg)
-        return ""
-    endif
-
-    " Make sure the current file has a name
-    let filename = fnamemodify(filename, ':p')
-    if filename == ''
-        return ""
-    endif
-
-    let fidx = s:Tlist_Get_File_Index(filename)
-    if fidx == -1
-        return ""
-    endif
-
-    " If there are no tags for this file, then no need to proceed further
-    if s:tlist_{fidx}_tag_count == 0
-        return ""
-    endif
-
-    " Get the tag name using the line number
-    let tidx = s:Tlist_Find_Nearest_Tag_Idx(fidx, linenr)
-    if tidx == -1
-        return ""
-    endif
-
-    return s:tlist_{fidx}_{tidx}_tag_name
-endfunction
-
-" Tlist_Window_Move_To_File
-" Move the cursor to the beginning of the current file or the next file
-" or the previous file in the taglist window
-" dir == -1, move to start of current or previous function
-" dir == 1, move to start of next function
-function! s:Tlist_Window_Move_To_File(dir)
-    if foldlevel('.') == 0
-        " Cursor is on a non-folded line (it is not in any of the files)
-        " Move it to a folded line
-        if a:dir == -1
-            normal! zk
-        else
-            " While moving down to the start of the next fold,
-            " no need to do go to the start of the next file.
-            normal! zj
-            return
-        endif
-    endif
-
-    let fidx = s:Tlist_Window_Get_File_Index_By_Linenum(line('.'))
-    if fidx == -1
-        return
-    endif
-
-    let cur_lnum = line('.')
-
-    if a:dir == -1
-        if cur_lnum > s:tlist_{fidx}_start
-            " Move to the beginning of the current file
-            exe s:tlist_{fidx}_start
-            return
-        endif
-
-        if fidx != 0
-            " Move to the beginning of the previous file
-            let fidx = fidx - 1
-        else
-            " Cursor is at the first file, wrap around to the last file
-            let fidx = s:tlist_file_count - 1
-        endif
-
-        exe s:tlist_{fidx}_start
-        return
-    else
-        " Move to the beginning of the next file
-        let fidx = fidx + 1
-
-        if fidx >= s:tlist_file_count
-            " Cursor is at the last file, wrap around to the first file
-            let fidx = 0
-        endif
-
-        if s:tlist_{fidx}_start != 0
-            exe s:tlist_{fidx}_start
-        endif
-        return
-    endif
-endfunction
-
-" Tlist_Session_Load
-" Load a taglist session (information about all the displayed files
-" and the tags) from the specified file
-function! s:Tlist_Session_Load(...)
-    if a:0 == 0 || a:1 == ''
-        call s:Tlist_Warning_Msg('Usage: TlistSessionLoad <filename>')
-        return
-    endif
-
-    let sessionfile = a:1
-
-    if !filereadable(sessionfile)
-        let msg = 'Taglist: Error - Unable to open file ' . sessionfile
-        call s:Tlist_Warning_Msg(msg)
-        return
-    endif
-
-    " Mark the current window as the file window
-    call s:Tlist_Window_Mark_File_Window()
-
-    " Source the session file
-    exe 'source ' . sessionfile
-
-    let new_file_count = g:tlist_file_count
-    unlet! g:tlist_file_count
-
-    let i = 0
-    while i < new_file_count
-        let ftype = g:tlist_{i}_filetype
-        unlet! g:tlist_{i}_filetype
-
-        if !exists('s:tlist_' . ftype . '_count')
-            if s:Tlist_FileType_Init(ftype) == 0
-                let i = i + 1
-                continue
-            endif
-        endif
-
-        let fname = g:tlist_{i}_filename
-        unlet! g:tlist_{i}_filename
-
-        let fidx = s:Tlist_Get_File_Index(fname)
-        if fidx != -1
-            let s:tlist_{fidx}_visible = 0
-            let i = i + 1
-            continue
-        else
-            " As we are loading the tags from the session file, if this
-            " file was previously deleted by the user, now we need to
-            " add it back. So remove the file from the deleted list.
-            call s:Tlist_Update_Remove_List(fname, 0)
-        endif
-
-        let fidx = s:Tlist_Init_File(fname, ftype)
-
-        let s:tlist_{fidx}_filename = fname
-
-        let s:tlist_{fidx}_sort_type = g:tlist_{i}_sort_type
-        unlet! g:tlist_{i}_sort_type
-
-        let s:tlist_{fidx}_filetype = ftype
-        let s:tlist_{fidx}_mtime = getftime(fname)
-
-        let s:tlist_{fidx}_start = 0
-        let s:tlist_{fidx}_end = 0
-
-        let s:tlist_{fidx}_valid = 1
-
-        let s:tlist_{fidx}_tag_count = g:tlist_{i}_tag_count
-        unlet! g:tlist_{i}_tag_count
-
-        let j = 1
-        while j <= s:tlist_{fidx}_tag_count
-            let s:tlist_{fidx}_{j}_tag = g:tlist_{i}_{j}_tag
-            let s:tlist_{fidx}_{j}_tag_name = g:tlist_{i}_{j}_tag_name
-            let s:tlist_{fidx}_{j}_ttype_idx = g:tlist_{i}_{j}_ttype_idx
-            unlet! g:tlist_{i}_{j}_tag
-            unlet! g:tlist_{i}_{j}_tag_name
-            unlet! g:tlist_{i}_{j}_ttype_idx
-            let j = j + 1
-        endwhile
-
-        let j = 1
-        while j <= s:tlist_{ftype}_count
-            let ttype = s:tlist_{ftype}_{j}_name
-
-            if exists('g:tlist_' . i . '_' . ttype)
-                let s:tlist_{fidx}_{ttype} = g:tlist_{i}_{ttype}
-                unlet! g:tlist_{i}_{ttype}
-                let s:tlist_{fidx}_{ttype}_offset = 0
-                let s:tlist_{fidx}_{ttype}_count = g:tlist_{i}_{ttype}_count
-                unlet! g:tlist_{i}_{ttype}_count
-
-                let k = 1
-                while k <= s:tlist_{fidx}_{ttype}_count
-                    let s:tlist_{fidx}_{ttype}_{k} = g:tlist_{i}_{ttype}_{k}
-                    unlet! g:tlist_{i}_{ttype}_{k}
-                    let k = k + 1
-                endwhile
-            else
-                let s:tlist_{fidx}_{ttype} = ''
-                let s:tlist_{fidx}_{ttype}_offset = 0
-                let s:tlist_{fidx}_{ttype}_count = 0
-            endif
-
-            let j = j + 1
-        endwhile
-
-        let i = i + 1
-    endwhile
-
-    " If the taglist window is open, then update it
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum != -1
-        let save_winnr = winnr()
-
-        " Goto the taglist window
-        call s:Tlist_Window_Goto_Window()
-
-        " Refresh the taglist window
-        call s:Tlist_Window_Refresh()
-
-        " Go back to the original window
-        if save_winnr != winnr()
-            call s:Tlist_Exe_Cmd_No_Acmds('wincmd p')
-        endif
-    endif
-endfunction
-
-" Tlist_Session_Save
-" Save a taglist session (information about all the displayed files
-" and the tags) into the specified file
-function! s:Tlist_Session_Save(...)
-    if a:0 == 0 || a:1 == ''
-        call s:Tlist_Warning_Msg('Usage: TlistSessionSave <filename>')
-        return
-    endif
-
-    let sessionfile = a:1
-
-    if s:tlist_file_count == 0
-        " There is nothing to save
-        call s:Tlist_Warning_Msg('Warning: Taglist is empty. Nothing to save.')
-        return
-    endif
-
-    if filereadable(sessionfile)
-        let ans = input('Do you want to overwrite ' . sessionfile . ' (Y/N)?')
-        if ans !=? 'y'
-            return
-        endif
-
-        echo "\n"
-    endif
-
-    let old_verbose = &verbose
-    set verbose&vim
-
-    exe 'redir! > ' . sessionfile
-
-    silent! echo '" Taglist session file. This file is auto-generated.'
-    silent! echo '" File information'
-    silent! echo 'let tlist_file_count = ' . s:tlist_file_count
-
-    let i = 0
-
-    while i < s:tlist_file_count
-        " Store information about the file
-        silent! echo 'let tlist_' . i . "_filename = '" .
-                                            \ s:tlist_{i}_filename . "'"
-        silent! echo 'let tlist_' . i . '_sort_type = "' .
-                                                \ s:tlist_{i}_sort_type . '"'
-        silent! echo 'let tlist_' . i . '_filetype = "' .
-                                            \ s:tlist_{i}_filetype . '"'
-        silent! echo 'let tlist_' . i . '_tag_count = ' .
-                                                        \ s:tlist_{i}_tag_count
-        " Store information about all the tags
-        let j = 1
-        while j <= s:tlist_{i}_tag_count
-            let txt = escape(s:tlist_{i}_{j}_tag, '"\\')
-            silent! echo 'let tlist_' . i . '_' . j . '_tag = "' . txt . '"'
-            silent! echo 'let tlist_' . i . '_' . j . '_tag_name = "' .
-                        \ s:tlist_{i}_{j}_tag_name . '"'
-            silent! echo 'let tlist_' . i . '_' . j . '_ttype_idx' . ' = ' .
-                        \ s:tlist_{i}_{j}_ttype_idx
-            let j = j + 1
-        endwhile
-
-        " Store information about all the tags grouped by their type
-        let ftype = s:tlist_{i}_filetype
-        let j = 1
-        while j <= s:tlist_{ftype}_count
-            let ttype = s:tlist_{ftype}_{j}_name
-            if s:tlist_{i}_{ttype}_count != 0
-                let txt = escape(s:tlist_{i}_{ttype}, '"\')
-                let txt = substitute(txt, "\n", "\\\\n", 'g')
-                silent! echo 'let tlist_' . i . '_' . ttype . ' = "' .
-                                                \ txt . '"'
-                silent! echo 'let tlist_' . i . '_' . ttype . '_count = ' .
-                                                     \ s:tlist_{i}_{ttype}_count
-                let k = 1
-                while k <= s:tlist_{i}_{ttype}_count
-                    silent! echo 'let tlist_' . i . '_' . ttype . '_' . k .
-                                \ ' = ' . s:tlist_{i}_{ttype}_{k}
-                    let k = k + 1
-                endwhile
-            endif
-            let j = j + 1
-        endwhile
-
-        silent! echo
-
-        let i = i + 1
-    endwhile
-
-    redir END
-
-    let &verbose = old_verbose
-endfunction
-
-" Tlist_Buffer_Removed
-" A buffer is removed from the Vim buffer list. Remove the tags defined
-" for that file
-function! s:Tlist_Buffer_Removed(filename)
-    call s:Tlist_Log_Msg('Tlist_Buffer_Removed (' . a:filename .  ')')
-
-    " Make sure a valid filename is supplied
-    if a:filename == ''
-        return
-    endif
-
-    " Get tag list index of the specified file
-    let fidx = s:Tlist_Get_File_Index(a:filename)
-    if fidx == -1
-        " File not present in the taglist
-        return
-    endif
-
-    " Remove the file from the list
-    call s:Tlist_Remove_File(fidx, 0)
-endfunction
-
-" When a buffer is deleted, remove the file from the taglist
-autocmd BufDelete * silent call s:Tlist_Buffer_Removed(expand('<afile>:p'))
-
-" Tlist_Window_Open_File_Fold
-" Open the fold for the specified file and close the fold for all the
-" other files
-function! s:Tlist_Window_Open_File_Fold(acmd_bufnr)
-    call s:Tlist_Log_Msg('Tlist_Window_Open_File_Fold (' . a:acmd_bufnr . ')')
-
-    " Make sure the taglist window is present
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum == -1
-        call s:Tlist_Warning_Msg('Taglist: Error - Taglist window is not open')
-        return
-    endif
-
-    " Save the original window number
-    let org_winnr = winnr()
-    if org_winnr == winnum
-        let in_taglist_window = 1
-    else
-        let in_taglist_window = 0
-    endif
-
-    if in_taglist_window
-        " When entering the taglist window, no need to update the folds
-        return
-    endif
-
-    " Go to the taglist window
-    if !in_taglist_window
-        call s:Tlist_Exe_Cmd_No_Acmds(winnum . 'wincmd w')
-    endif
-
-    " Close all the folds
-    silent! %foldclose
-
-    " Get tag list index of the specified file
-    let fname = fnamemodify(bufname(a:acmd_bufnr + 0), ':p')
-    if filereadable(fname)
-        let fidx = s:Tlist_Get_File_Index(fname)
-        if fidx != -1
-            " Open the fold for the file
-            exe "silent! " . s:tlist_{fidx}_start . "," .
-                        \ s:tlist_{fidx}_end . "foldopen"
-        endif
-    endif
-
-    " Go back to the original window
-    if !in_taglist_window
-        call s:Tlist_Exe_Cmd_No_Acmds(org_winnr . 'wincmd w')
-    endif
-endfunction
-
-" Tlist_Window_Check_Auto_Open
-" Open the taglist window automatically on Vim startup.
-" Open the window only when files present in any of the Vim windows support
-" tags.
-function! s:Tlist_Window_Check_Auto_Open()
-    let open_window = 0
-
-    let i = 1
-    let buf_num = winbufnr(i)
-    while buf_num != -1
-        let filename = fnamemodify(bufname(buf_num), ':p')
-        let ft = s:Tlist_Get_Buffer_Filetype(buf_num)
-        if !s:Tlist_Skip_File(filename, ft)
-            let open_window = 1
-            break
-        endif
-        let i = i + 1
-        let buf_num = winbufnr(i)
-    endwhile
-
-    if open_window
-        call s:Tlist_Window_Toggle()
-    endif
-endfunction
-
-" Tlist_Refresh_Folds
-" Remove and create the folds for all the files displayed in the taglist
-" window. Used after entering a tab. If this is not done, then the folds
-" are not properly created for taglist windows displayed in multiple tabs.
-function! s:Tlist_Refresh_Folds()
-    let winnum = bufwinnr(g:TagList_title)
-    if winnum == -1
-        return
-    endif
-
-    let save_wnum = winnr()
-    exe winnum . 'wincmd w'
-
-    " First remove all the existing folds
-    normal! zE
-
-    " Create the folds for each in the tag list
-    let fidx = 0
-    while fidx < s:tlist_file_count
-        let ftype = s:tlist_{fidx}_filetype
-
-        " Create the folds for each tag type in a file
-        let j = 1
-        while j <= s:tlist_{ftype}_count
-            let ttype = s:tlist_{ftype}_{j}_name
-            if s:tlist_{fidx}_{ttype}_count
-                let s = s:tlist_{fidx}_start + s:tlist_{fidx}_{ttype}_offset
-                let e = s + s:tlist_{fidx}_{ttype}_count
-                exe s . ',' . e . 'fold'
-            endif
-            let j = j + 1
-        endwhile
-
-        exe s:tlist_{fidx}_start . ',' . s:tlist_{fidx}_end . 'fold'
-        exe 'silent! ' . s:tlist_{fidx}_start . ',' .
-                    \ s:tlist_{fidx}_end . 'foldopen!'
-        let fidx = fidx + 1
-    endwhile
-
-    exe save_wnum . 'wincmd w'
-endfunction
-
-function! s:Tlist_Menu_Add_Base_Menu()
-    call s:Tlist_Log_Msg('Adding the base menu')
-
-    " Add the menu
-    anoremenu <silent> T&ags.Refresh\ menu :call <SID>Tlist_Menu_Refresh()<CR>
-    anoremenu <silent> T&ags.Sort\ menu\ by.Name
-                    \ :call <SID>Tlist_Change_Sort('menu', 'set', 'name')<CR>
-    anoremenu <silent> T&ags.Sort\ menu\ by.Order
-                    \ :call <SID>Tlist_Change_Sort('menu', 'set', 'order')<CR>
-    anoremenu T&ags.-SEP1-           :
-
-    if &mousemodel =~ 'popup'
-        anoremenu <silent> PopUp.T&ags.Refresh\ menu
-                    \ :call <SID>Tlist_Menu_Refresh()<CR>
-        anoremenu <silent> PopUp.T&ags.Sort\ menu\ by.Name
-                  \ :call <SID>Tlist_Change_Sort('menu', 'set', 'name')<CR>
-        anoremenu <silent> PopUp.T&ags.Sort\ menu\ by.Order
-                  \ :call <SID>Tlist_Change_Sort('menu', 'set', 'order')<CR>
-        anoremenu PopUp.T&ags.-SEP1-           :
-    endif
-endfunction
-
-let s:menu_char_prefix =
-            \ '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-
-" Tlist_Menu_Get_Tag_Type_Cmd
-" Get the menu command for the specified tag type
-" fidx - File type index
-" ftype - File Type
-" add_ttype_name - To add or not to add the tag type name to the menu entries
-" ttype_idx - Tag type index
-function! s:Tlist_Menu_Get_Tag_Type_Cmd(fidx, ftype, add_ttype_name, ttype_idx)
-    " Curly brace variable name optimization
-    let ftype_ttype_idx = a:ftype . '_' . a:ttype_idx
-
-    let ttype = s:tlist_{ftype_ttype_idx}_name
-    if a:add_ttype_name
-        " If the tag type name contains space characters, escape it. This
-        " will be used to create the menu entries.
-        let ttype_fullname = escape(s:tlist_{ftype_ttype_idx}_fullname, ' ')
-    endif
-
-    " Curly brace variable name optimization
-    let fidx_ttype = a:fidx . '_' . ttype
-
-    " Number of tag entries for this tag type
-    let tcnt = s:tlist_{fidx_ttype}_count
-    if tcnt == 0 " No entries for this tag type
-        return ''
-    endif
-
-    let mcmd = ''
-
-    " Create the menu items for the tags.
-    " Depending on the number of tags of this type, split the menu into
-    " multiple sub-menus, if needed.
-    if tcnt > g:Tlist_Max_Submenu_Items
-        let j = 1
-        while j <= tcnt
-            let final_index = j + g:Tlist_Max_Submenu_Items - 1
-            if final_index > tcnt
-                let final_index = tcnt
-            endif
-
-            " Extract the first and last tag name and form the
-            " sub-menu name
-            let tidx = s:tlist_{fidx_ttype}_{j}
-            let first_tag = s:tlist_{a:fidx}_{tidx}_tag_name
-
-            let tidx = s:tlist_{fidx_ttype}_{final_index}
-            let last_tag = s:tlist_{a:fidx}_{tidx}_tag_name
-
-            " Truncate the names, if they are greater than the
-            " max length
-            let first_tag = strpart(first_tag, 0, g:Tlist_Max_Tag_Length)
-            let last_tag = strpart(last_tag, 0, g:Tlist_Max_Tag_Length)
-
-            " Form the menu command prefix
-            let m_prefix = 'anoremenu <silent> T\&ags.'
-            if a:add_ttype_name
-                let m_prefix = m_prefix . ttype_fullname . '.'
-            endif
-            let m_prefix = m_prefix . first_tag . '\.\.\.' . last_tag . '.'
-
-            " Character prefix used to number the menu items (hotkey)
-            let m_prefix_idx = 0
-
-            while j <= final_index
-                let tidx = s:tlist_{fidx_ttype}_{j}
-
-                let tname = s:tlist_{a:fidx}_{tidx}_tag_name
-
-                let mcmd = mcmd . m_prefix . '\&' .
-                            \ s:menu_char_prefix[m_prefix_idx] . '\.' .
-                            \ tname . ' :call <SID>Tlist_Menu_Jump_To_Tag(' .
-                            \ tidx . ')<CR>|'
-
-                let m_prefix_idx = m_prefix_idx + 1
-                let j = j + 1
-            endwhile
-        endwhile
-    else
-        " Character prefix used to number the menu items (hotkey)
-        let m_prefix_idx = 0
-
-        let m_prefix = 'anoremenu <silent> T\&ags.'
-        if a:add_ttype_name
-            let m_prefix = m_prefix . ttype_fullname . '.'
-        endif
-        let j = 1
-        while j <= tcnt
-            let tidx = s:tlist_{fidx_ttype}_{j}
-
-            let tname = s:tlist_{a:fidx}_{tidx}_tag_name
-
-            let mcmd = mcmd . m_prefix . '\&' .
-                        \ s:menu_char_prefix[m_prefix_idx] . '\.' .
-                        \ tname . ' :call <SID>Tlist_Menu_Jump_To_Tag(' . tidx
-                        \ . ')<CR>|'
-
-            let m_prefix_idx = m_prefix_idx + 1
-            let j = j + 1
-        endwhile
-    endif
-
-    return mcmd
-endfunction
-
-" Update the taglist menu with the tags for the specified file
-function! s:Tlist_Menu_File_Refresh(fidx)
-    call s:Tlist_Log_Msg('Refreshing the tag menu for ' . s:tlist_{a:fidx}_filename)
-    " The 'B' flag is needed in the 'cpoptions' option
-    let old_cpoptions = &cpoptions
-    set cpoptions&vim
-
-    exe s:tlist_{a:fidx}_menu_cmd
-
-    " Update the popup menu (if enabled)
-    if &mousemodel =~ 'popup'
-        let cmd = substitute(s:tlist_{a:fidx}_menu_cmd, ' T\\&ags\.',
-                                        \ ' PopUp.T\\\&ags.', "g")
-        exe cmd
-    endif
-
-    " The taglist menu is not empty now
-    let s:tlist_menu_empty = 0
-
-    " Restore the 'cpoptions' settings
-    let &cpoptions = old_cpoptions
-endfunction
-
-" Tlist_Menu_Update_File
-" Add the taglist menu
-function! s:Tlist_Menu_Update_File(clear_menu)
-    if !has('gui_running')
-        " Not running in GUI mode
-        return
-    endif
-
-    call s:Tlist_Log_Msg('Updating the tag menu, clear_menu = ' . a:clear_menu)
-
-    " Remove the tags menu
-    if a:clear_menu
-        call s:Tlist_Menu_Remove_File()
-
-    endif
-
-    " Skip buffers with 'buftype' set to nofile, nowrite, quickfix or help
-    if &buftype != ''
-        return
-    endif
-
-    let filename = fnamemodify(bufname('%'), ':p')
-    let ftype = s:Tlist_Get_Buffer_Filetype('%')
-
-    " If the file doesn't support tag listing, skip it
-    if s:Tlist_Skip_File(filename, ftype)
-        return
-    endif
-
-    let fidx = s:Tlist_Get_File_Index(filename)
-    if fidx == -1 || !s:tlist_{fidx}_valid
-        " Check whether this file is removed based on user request
-        " If it is, then don't display the tags for this file
-        if s:Tlist_User_Removed_File(filename)
-            return
-        endif
-
-        " Process the tags for the file
-        let fidx = s:Tlist_Process_File(filename, ftype)
-        if fidx == -1
-            return
-        endif
-    endif
-
-    let fname = escape(fnamemodify(bufname('%'), ':t'), '.')
-    if fname != ''
-        exe 'anoremenu T&ags.' .  fname . ' <Nop>'
-        anoremenu T&ags.-SEP2-           :
-    endif
-
-    if !s:tlist_{fidx}_tag_count
-        return
-    endif
-
-    if s:tlist_{fidx}_menu_cmd != ''
-        " Update the menu with the cached command
-        call s:Tlist_Menu_File_Refresh(fidx)
-
-        return
-    endif
-
-    " We are going to add entries to the tags menu, so the menu won't be
-    " empty
-    let s:tlist_menu_empty = 0
-
-    let cmd = ''
-
-    " Determine whether the tag type name needs to be added to the menu
-    " If more than one tag type is present in the taglisting for a file,
-    " then the tag type name needs to be present
-    let add_ttype_name = -1
-    let i = 1
-    while i <= s:tlist_{ftype}_count && add_ttype_name < 1
-        let ttype = s:tlist_{ftype}_{i}_name
-        if s:tlist_{fidx}_{ttype}_count
-            let add_ttype_name = add_ttype_name + 1
-        endif
-        let i = i + 1
-    endwhile
-
-    " Process the tags by the tag type and get the menu command
-    let i = 1
-    while i <= s:tlist_{ftype}_count
-        let mcmd = s:Tlist_Menu_Get_Tag_Type_Cmd(fidx, ftype, add_ttype_name, i)
-        if mcmd != ''
-            let cmd = cmd . mcmd
-        endif
-
-        let i = i + 1
-    endwhile
-
-    " Cache the menu command for reuse
-    let s:tlist_{fidx}_menu_cmd = cmd
-
-    " Update the menu
-    call s:Tlist_Menu_File_Refresh(fidx)
-endfunction
-
-" Tlist_Menu_Remove_File
-" Remove the tags displayed in the tags menu
-function! s:Tlist_Menu_Remove_File()
-    if !has('gui_running') || s:tlist_menu_empty
-        return
-    endif
-
-    call s:Tlist_Log_Msg('Removing the tags menu for a file')
-
-    " Cleanup the Tags menu
-    silent! unmenu T&ags
-    if &mousemodel =~ 'popup'
-        silent! unmenu PopUp.T&ags
-    endif
-
-    " Add a dummy menu item to retain teared off menu
-    noremenu T&ags.Dummy l
-
-    silent! unmenu! T&ags
-    if &mousemodel =~ 'popup'
-        silent! unmenu! PopUp.T&ags
-    endif
-
-    call s:Tlist_Menu_Add_Base_Menu()
-
-    " Remove the dummy menu item
-    unmenu T&ags.Dummy
-
-    let s:tlist_menu_empty = 1
-endfunction
-
-" Tlist_Menu_Refresh
-" Refresh the taglist menu
-function! s:Tlist_Menu_Refresh()
-    call s:Tlist_Log_Msg('Refreshing the tags menu')
-    let fidx = s:Tlist_Get_File_Index(fnamemodify(bufname('%'), ':p'))
-    if fidx != -1
-        " Invalidate the cached menu command
-        let s:tlist_{fidx}_menu_cmd = ''
-    endif
-
-    " Update the taglist, menu and window
-    call s:Tlist_Update_Current_File()
-endfunction
-
-" Tlist_Menu_Jump_To_Tag
-" Jump to the selected tag
-function! s:Tlist_Menu_Jump_To_Tag(tidx)
-    let fidx = s:Tlist_Get_File_Index(fnamemodify(bufname('%'), ':p'))
-    if fidx == -1
-        return
-    endif
-
-    let tagpat = s:Tlist_Get_Tag_SearchPat(fidx, a:tidx)
-    if tagpat == ''
-        return
-    endif
-
-    " Add the current cursor position to the jump list, so that user can
-    " jump back using the ' and ` marks.
-    mark '
-
-    silent call search(tagpat, 'w')
-
-    " Bring the line to the middle of the window
-    normal! z.
-
-    " If the line is inside a fold, open the fold
-    if foldclosed('.') != -1
-        .foldopen
-    endif
-endfunction
-
-" Tlist_Menu_Init
-" Initialize the taglist menu
-function! s:Tlist_Menu_Init()
-    call s:Tlist_Menu_Add_Base_Menu()
-
-    " Automatically add the tags defined in the current file to the menu
-    augroup TagListMenuCmds
-        autocmd!
-
-        if !g:Tlist_Process_File_Always
-            autocmd BufEnter * call s:Tlist_Refresh()
-        endif
-        autocmd BufLeave * call s:Tlist_Menu_Remove_File()
-    augroup end
-
-    call s:Tlist_Menu_Update_File(0)
-endfunction
-
-" Tlist_Vim_Session_Load
-" Initialize the taglist window/buffer, which is created when loading
-" a Vim session file.
-function! s:Tlist_Vim_Session_Load()
-    call s:Tlist_Log_Msg('Tlist_Vim_Session_Load')
-
-    " Initialize the taglist window
-    call s:Tlist_Window_Init()
-
-    " Refresh the taglist window
-    call s:Tlist_Window_Refresh()
-endfunction
-
-" Tlist_Set_App
-" Set the name of the external plugin/application to which taglist
-" belongs.
-" Taglist plugin is part of another plugin like cream or winmanager.
-function! Tlist_Set_App(name)
-    if a:name == ""
-        return
-    endif
-
-    let s:tlist_app_name = a:name
-endfunction
-
-" Winmanager integration
-
-" Initialization required for integration with winmanager
-function! TagList_Start()
-    " If current buffer is not taglist buffer, then don't proceed
-    if bufname('%') != '__Tag_List__'
-        return
-    endif
-
-    call Tlist_Set_App('winmanager')
-
-    " Get the current filename from the winmanager plugin
-    let bufnum = WinManagerGetLastEditedFile()
-    if bufnum != -1
-        let filename = fnamemodify(bufname(bufnum), ':p')
-        let ftype = s:Tlist_Get_Buffer_Filetype(bufnum)
-    endif
-
-    " Initialize the taglist window, if it is not already initialized
-    if !exists('s:tlist_window_initialized') || !s:tlist_window_initialized
-        call s:Tlist_Window_Init()
-        call s:Tlist_Window_Refresh()
-        let s:tlist_window_initialized = 1
-    endif
-
-    " Update the taglist window
-    if bufnum != -1
-        if !s:Tlist_Skip_File(filename, ftype) && g:Tlist_Auto_Update
-            call s:Tlist_Window_Refresh_File(filename, ftype)
-        endif
-    endif
-endfunction
-
-function! TagList_IsValid()
-    return 0
-endfunction
-
-function! TagList_WrapUp()
-    return 0
-endfunction
-
-" restore 'cpo'
-let &cpo = s:cpo_save
-unlet s:cpo_save
-

From 8f0740e307e459468227411035d8a2cbd12709ea Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Tue, 11 Mar 2014 21:10:50 +0100
Subject: [PATCH 35/61] Updated plugins. Added vim-golang as a mode

---
 README.md                                     |   1 +
 sources_non_forked/ack.vim/plugin/ack.vim     |   8 +-
 sources_non_forked/syntastic/README.markdown  | 127 ++--
 .../syntastic/plugin/syntastic.vim            |  35 +-
 .../syntastic/plugin/syntastic/loclist.vim    |   4 +-
 .../syntastic/plugin/syntastic/registry.vim   |  12 +-
 .../syntax_checkers/actionscript/mxmlc.vim    |   2 +-
 .../syntax_checkers/css/prettycss.vim         |   2 +-
 .../erlang/erlang_check_file.erl              |  26 +-
 .../syntax_checkers/javascript/jslint.vim     |   2 +-
 .../syntastic/syntax_checkers/lex/flex.vim    |   2 +-
 .../syntastic/syntax_checkers/lua/luac.vim    |   4 +-
 .../syntastic/syntax_checkers/perl/perl.vim   |  31 +-
 .../syntastic/syntax_checkers/php/php.vim     |   2 +-
 .../syntastic/syntax_checkers/po/msgfmt.vim   |   2 +-
 .../syntax_checkers/python/frosted.vim        |   2 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |   2 +-
 .../syntax_checkers/texinfo/makeinfo.vim      |   2 +-
 .../syntax_checkers/text/atdtool.vim          |   2 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |   2 +-
 .../tlib/autoload/tlib/Filter_cnf.vim         |  15 +-
 .../tlib/autoload/tlib/Filter_cnfd.vim        |  20 +-
 .../tlib/autoload/tlib/Filter_cnfx.vim        |  42 --
 .../tlib/autoload/tlib/Filter_glob.vim        |  68 ++
 .../tlib/autoload/tlib/World.vim              | 100 ++-
 .../tlib/autoload/tlib/agent.vim              |  22 +-
 .../tlib/autoload/tlib/cache.vim              |  29 +-
 .../tlib/autoload/tlib/char.vim               |  21 +-
 sources_non_forked/tlib/autoload/tlib/cmd.vim |  19 +-
 .../tlib/autoload/tlib/input.vim              |  71 ++-
 .../tlib/autoload/tlib/persistent.vim         |  11 +-
 .../tlib/autoload/tlib/progressbar.vim        |   3 +-
 .../tlib/autoload/tlib/scratch.vim            |   6 +-
 sources_non_forked/tlib/autoload/tlib/tab.vim |   8 +-
 sources_non_forked/tlib/autoload/tlib/vim.vim |  32 +-
 sources_non_forked/tlib/doc/tlib.txt          | 106 +++-
 sources_non_forked/tlib/plugin/02tlib.vim     |   4 +-
 .../tabline/unique_tail_improved.vim          |   1 +
 .../airline/extensions/whitespace.vim         |  10 +-
 .../vim-commentary/CONTRIBUTING.markdown      |   1 +
 .../vim-commentary/README.markdown            |  23 +-
 .../vim-commentary/doc/commentary.txt         |   5 +-
 .../vim-commentary/plugin/commentary.vim      |  17 +-
 .../vim-fugitive/CONTRIBUTING.markdown        |  14 +-
 .../vim-fugitive/plugin/fugitive.vim          |  24 +-
 .../vim-golang/autoload/go/complete.vim       | 103 +++
 sources_non_forked/vim-golang/compiler/go.vim |  30 +
 .../vim-golang/ftdetect/gofiletype.vim        |  23 +
 sources_non_forked/vim-golang/ftplugin/go.vim |  17 +
 .../vim-golang/ftplugin/go/fmt.vim            |  69 ++
 .../vim-golang/ftplugin/go/import.vim         | 250 ++++++++
 .../vim-golang/ftplugin/go/test.sh            |  78 +++
 sources_non_forked/vim-golang/indent/go.vim   |  65 ++
 sources_non_forked/vim-golang/mirror.txt      |   6 +
 .../vim-golang/plugin/godoc.vim               | 130 ++++
 sources_non_forked/vim-golang/readme.txt      | 101 +++
 sources_non_forked/vim-golang/syntax/go.vim   | 207 ++++++
 .../vim-golang/syntax/godoc.vim               |  20 +
 .../vim-snipmate/autoload/snipMate.vim        |  27 +-
 sources_non_forked/vim-snippets/AUTHORS       |  45 --
 sources_non_forked/vim-snippets/README.md     | 108 ++--
 .../vim-snippets/UltiSnips/README             |  12 +-
 .../vim-snippets/UltiSnips/all.snippets       | 125 ++--
 .../vim-snippets/UltiSnips/bib.snippets       |  52 ++
 .../vim-snippets/UltiSnips/bindzone.snippets  |  32 +-
 .../vim-snippets/UltiSnips/c.snippets         |  62 +-
 .../vim-snippets/UltiSnips/coffee.snippets    |  28 +-
 .../UltiSnips/coffee_jasmine.snippets         |   5 +-
 .../vim-snippets/UltiSnips/cpp.snippets       |   9 +-
 .../vim-snippets/UltiSnips/cs.snippets        | 328 ++++++++++
 .../vim-snippets/UltiSnips/css.snippets       |   2 +
 .../vim-snippets/UltiSnips/d.snippets         | 175 +++---
 .../vim-snippets/UltiSnips/django.snippets    |  28 +-
 .../vim-snippets/UltiSnips/elixir.snippets    |   2 +-
 .../vim-snippets/UltiSnips/erlang.snippets    |   2 +
 .../vim-snippets/UltiSnips/eruby.snippets     |  49 +-
 .../vim-snippets/UltiSnips/go.snippets        |  44 +-
 .../vim-snippets/UltiSnips/haskell.snippets   |  14 +-
 .../vim-snippets/UltiSnips/help.snippets      |   8 +-
 .../vim-snippets/UltiSnips/html.snippets      |  71 ++-
 .../UltiSnips/html_minimal.snippets           |   2 +
 .../UltiSnips/htmldjango.snippets             |   2 +
 .../vim-snippets/UltiSnips/htmljinja.snippets |   3 +
 .../vim-snippets/UltiSnips/java.snippets      | 281 ++++++++-
 .../UltiSnips/javascript.snippets             | 140 ++++-
 .../UltiSnips/javascript_ember.snippets       |  22 +-
 .../UltiSnips/javascript_jasmine.snippets     |   5 +-
 .../UltiSnips/javascript_jsdoc.snippets       |  51 ++
 .../vim-snippets/UltiSnips/jinja2.snippets    |  38 +-
 .../vim-snippets/UltiSnips/json.snippets      |   7 +-
 .../vim-snippets/UltiSnips/ledger.snippets    |   8 +
 .../vim-snippets/UltiSnips/lhaskell.snippets  |   3 +
 .../vim-snippets/UltiSnips/lua.snippets       |  10 +-
 .../vim-snippets/UltiSnips/mako.snippets      |   2 +
 .../vim-snippets/UltiSnips/markdown.snippets  |   4 +-
 .../vim-snippets/UltiSnips/objc.snippets      |  14 +-
 .../vim-snippets/UltiSnips/ocaml.snippets     |  87 +--
 .../vim-snippets/UltiSnips/perl.snippets      |  25 +-
 .../vim-snippets/UltiSnips/php.snippets       | 320 +++++++---
 .../phpunit.snippets => php_phpunit.snippets} |   6 +-
 ...ymfony2.snippets => php_symfony2.snippets} |  42 +-
 .../vim-snippets/UltiSnips/puppet.snippets    | 269 ++++++--
 .../vim-snippets/UltiSnips/python.snippets    | 175 ++++--
 .../vim-snippets/UltiSnips/rails.snippets     | 236 ++++---
 .../vim-snippets/UltiSnips/rst.snippets       | 246 ++++----
 .../vim-snippets/UltiSnips/ruby.snippets      | 134 ++--
 .../vim-snippets/UltiSnips/scss.snippets      |  55 ++
 .../vim-snippets/UltiSnips/sh.snippets        |  22 +-
 .../vim-snippets/UltiSnips/snippets.snippets  |  10 +-
 .../vim-snippets/UltiSnips/tcl.snippets       |  10 +-
 .../vim-snippets/UltiSnips/tex.snippets       |  82 +--
 .../vim-snippets/UltiSnips/texmath.snippets   |   2 +
 .../vim-snippets/UltiSnips/twig.snippets      |   2 +
 .../vim-snippets/UltiSnips/vim.snippets       |  18 +-
 .../vim-snippets/UltiSnips/xhtml.snippets     |   3 +
 .../vim-snippets/UltiSnips/xml.snippets       |   7 +
 .../vim-snippets/UltiSnips/zsh.snippets       |  10 +-
 .../vim-snippets/snippets/coffee.snippets     | 109 ----
 .../vim-snippets/snippets/html.snippets       |   6 +-
 .../snippets/javascript-jquery.snippets       | 589 ------------------
 .../snippets/javascript.d3.snippets           |  30 -
 .../vim-snippets/snippets/javascript.snippets | 200 ------
 .../snippets/javascript_jquery.snippets       |   1 -
 .../vim-snippets/snippets/vim.snippets        |   3 +-
 update_plugins.py                             |   1 +
 125 files changed, 4121 insertions(+), 2440 deletions(-)
 delete mode 100644 sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
 create mode 100644 sources_non_forked/vim-commentary/CONTRIBUTING.markdown
 create mode 100644 sources_non_forked/vim-golang/autoload/go/complete.vim
 create mode 100644 sources_non_forked/vim-golang/compiler/go.vim
 create mode 100644 sources_non_forked/vim-golang/ftdetect/gofiletype.vim
 create mode 100644 sources_non_forked/vim-golang/ftplugin/go.vim
 create mode 100644 sources_non_forked/vim-golang/ftplugin/go/fmt.vim
 create mode 100644 sources_non_forked/vim-golang/ftplugin/go/import.vim
 create mode 100644 sources_non_forked/vim-golang/ftplugin/go/test.sh
 create mode 100644 sources_non_forked/vim-golang/indent/go.vim
 create mode 100644 sources_non_forked/vim-golang/mirror.txt
 create mode 100644 sources_non_forked/vim-golang/plugin/godoc.vim
 create mode 100644 sources_non_forked/vim-golang/readme.txt
 create mode 100644 sources_non_forked/vim-golang/syntax/go.vim
 create mode 100644 sources_non_forked/vim-golang/syntax/godoc.vim
 delete mode 100644 sources_non_forked/vim-snippets/AUTHORS
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/bib.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/cs.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets
 rename sources_non_forked/vim-snippets/UltiSnips/{php/phpunit.snippets => php_phpunit.snippets} (90%)
 rename sources_non_forked/vim-snippets/UltiSnips/{php/symfony2.snippets => php_symfony2.snippets} (94%)
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/scss.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/coffee.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/javascript.d3.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/javascript.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/javascript_jquery.snippets

diff --git a/README.md b/README.md
index 217176ce..0fdb7bcf 100644
--- a/README.md
+++ b/README.md
@@ -99,6 +99,7 @@ Remove all clutter and focus only on the essential. Similar to iA Writer or Writ
 * [vim-bundle-mako](https://github.com/sophacles/vim-bundle-mako)
 * [vim-markdown](https://github.com/tpope/vim-markdown)
 * [nginx.vim](https://github.com/vim-scripts/nginx.vim): Highlights configuration files for nginx
+* [vim-golang](https://github.com/jnwhiteh/vim-golang)
 
 
 ## How to include your own stuff?
diff --git a/sources_non_forked/ack.vim/plugin/ack.vim b/sources_non_forked/ack.vim/plugin/ack.vim
index ccd46861..3c664bd5 100644
--- a/sources_non_forked/ack.vim/plugin/ack.vim
+++ b/sources_non_forked/ack.vim/plugin/ack.vim
@@ -44,7 +44,7 @@ function! s:Ack(cmd, args)
   if a:cmd =~# '-g$'
     let g:ackformat="%f"
   else
-    let g:ackformat="%f:%l:%c:%m"
+    let g:ackformat="%f:%l:%c:%m,%f:%l:%m"
   end
 
   let grepprg_bak=&grepprg
@@ -61,13 +61,15 @@ function! s:Ack(cmd, args)
   if a:cmd =~# '^l'
     exe g:ack_lhandler
     let l:apply_mappings = g:ack_apply_lmappings
+    let l:close_cmd = ':lclose<CR>'
   else
     exe g:ack_qhandler
     let l:apply_mappings = g:ack_apply_qmappings
+    let l:close_cmd = ':cclose<CR>'
   endif
 
   if l:apply_mappings
-    exec "nnoremap <silent> <buffer> q :ccl<CR>"
+    exec "nnoremap <silent> <buffer> q " . l:close_cmd
     exec "nnoremap <silent> <buffer> t <C-W><CR><C-W>T"
     exec "nnoremap <silent> <buffer> T <C-W><CR><C-W>TgT<C-W><C-W>"
     exec "nnoremap <silent> <buffer> o <CR>"
@@ -80,7 +82,7 @@ function! s:Ack(cmd, args)
 
   " If highlighting is on, highlight the search keyword.
   if exists("g:ackhighlight")
-    let @/=a:args
+    let @/ = substitute(l:grepargs,'["'']','','g')
     set hlsearch
   end
 
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index fb4b8bb4..653bd7c6 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -43,7 +43,7 @@ LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
 OCaml, Perl, Perl POD, PHP, gettext Portable Object, Puppet, Python, Racket,
 reStructuredText, Ruby, Rust, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig,
 TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope
-page templates, zsh.
+page templates, and zsh.
 
 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
@@ -62,45 +62,48 @@ enabled.
 
 ## 2\. Installation
 
-Installing syntastic is easy but first you need to have the pathogen plugin installed.  If you already
-have pathogen working then skip Step 1 and go to Step 2.
+Installing syntastic is easy but first you need to have the [pathogen][1]
+plugin installed.  If you already have [pathogen][1] working then skip
+[Step 1](#step1) and go to [Step 2](#step2).
+
 
 <a name="step1"></a>
 
 ### 2.1\. Step 1: Install pathogen.vim
 
-First I'll show you how to install tpope's [pathogen.vim][1] 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:
-
-    mkdir -p ~/.vim/autoload ~/.vim/bundle; \
-    curl -so ~/.vim/autoload/pathogen.vim \
-        https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
-
-Next you *need to add this* to your ~/.vimrc:
-
-        execute pathogen#infect()
+First I'll show you how to install Tim Pope's [pathogen][1] 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 -so ~/.vim/autoload/pathogen.vim \
+    https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
+```
+Next you *need* to add this to your `~/.vimrc`:
+```vim
+execute pathogen#infect()
+```
 
 <a name="step2"></a>
 
 ### 2.2\. Step 2: Install syntastic as a pathogen bundle
 
-You now have pathogen installed and can put syntastic into ~/.vim/bundle like this:
-    
-
-    cd ~/.vim/bundle
-    git clone https://github.com/scrooloose/syntastic.git
-
+You now have pathogen installed and can put syntastic into `~/.vim/bundle` like
+this:
+```sh
+cd ~/.vim/bundle
+git clone https://github.com/scrooloose/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][1] right.  Go back to [Step 1](#step1) and make sure you did the following:
 
-    :Helptags
-
-If you get an error when you do this, then you probably didn't install pathogen right.  Go back to
-step 1 and make sure you did the following:
-
-1. Created both the ~/.vim/autoload and ~/.vim/bundle directories.
-2. Added the "call pathogen#infect()" line to your ~/.vimrc file
-3. Did the git clone of syntastic inside ~/.vim/bundle
+1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
+2. Added the `call 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.
 
 
@@ -111,56 +114,50 @@ step 1 and make sure you did the following:
 __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
-is installed. For example: python requires either `flake8`, `pyflakes`
-or `pylint` to be installed and in `$PATH`. To see which executables are
-supported, just look in `syntax_checkers/<filetype>/*.vim`. Note that aliases
-do not work; the actual executable must be available in your `$PATH`. Symbolic
-links are okay.  You can see syntastic's idea of available checkers by running
-`:SyntasticInfo`.
+is installed. For example: by default, python requires either `flake8` or
+`pylint` to be installed and in your `$PATH`. To see which executables are
+supported, look at the [wiki][3]. 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`.
 
 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
 create an issue - or better yet, create a pull request.
 
-__Q. Recently some of my syntax checker options have stopped working...__
+__Q. The `perl` checker has stopped working...__
 
-A. The options are still there, they have just been renamed. Recently,
-almost all syntax checkers were refactored to use the new `makeprgBuild()`
-function. This made a lot of the old explicit options redundant - as they are
-now implied. The new implied options usually have slightly different names to
-the old options.
-
-e.g. Previously there was `g:syntastic_phpcs_conf`, now you must use
-`g:syntastic_php_phpcs_args`. This completely overrides the arguments of
-the checker, including any defaults, so you may need to look up the default
-arguments of the checker and add these in.
-
-See `:help syntastic-checker-options` for more information.
+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][10]).  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, set `g:syntastic_enable_perl_checker` to 1 in your vimrc:
+```vim
+let g:syntastic_enable_perl_checker = 1
+```
 
 __Q. I run a checker and the location list is not updated...__
 
-A. By default, the location list is changed only when you run the `:Errors`
+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
+let g:syntastic_always_populate_loc_list = 1
 ```
 
 __Q. How can I pass additional arguments to a checker?__
 
 A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
 that do can be configured using global variables. The general form of the
-global args variables are:
-```vim
-syntastic_<filetype>_<subchecker>_args
-```
+global `args` variables is `syntastic_<filetype>_<checker>_args`.
 
 So, 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"
+let g:syntastic_ruby_mri_args = "--my --args --here"
 ```
 
 See `:help syntastic-checker-options` for more information.
@@ -170,24 +167,24 @@ which one(s) to use?__
 
 A. Stick a line like this in your vimrc:
 ```vim
-let g:syntastic_<filetype>_checkers=['<checker-name>']
+let g:syntastic_<filetype>_checkers = ['<checker-name>']
 ```
 
-To see the list of checkers for your filetype, look in
-`syntax_checkers/<filetype>/`.
+To see the list of supported checkers for your filetype look at the
+[wiki][3].
 
-e.g. Python has the following checkers: `flake8`, `pyflakes`, `pylint` and a
-native `python` checker.
+e.g. 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']
+let g:syntastic_python_checkers = ['pylint']
 ```
 
 Some filetypes, like PHP, have style checkers as well as syntax checkers. These
 can be chained together like this:
 ```vim
-let g:syntastic_php_checkers=['php', 'phpcs', 'phpmd']
+let g:syntastic_php_checkers = ['php', 'phpcs', 'phpmd']
 ```
 
 This is telling syntastic to run the `php` checker first, and if no errors are
@@ -210,6 +207,13 @@ checkers. You can usually configure the options that are passed to the style
 checkers, or just disable them. Take a look at the [wiki][3] to see what
 options are available.
 
+Alternatively, you can use `g:syntastic_quiet_messages` to filter out the
+messages you don't want to see. e.g. To turn off all style messages:
+```vim
+let g:syntastic_quiet_messages = { "type": "style" }
+```
+See `:help syntastic_quiet_messages` for details.
+
 __Q. The error window is closed automatically when I :quit the current buffer
 but not when I :bdelete it?__
 
@@ -245,3 +249,4 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [7]: https://github.com/davidhalter/jedi-vim
 [8]: https://github.com/klen/python-mode
 [9]: https://github.com/Valloric/YouCompleteMe
+[10]: http://perldoc.perl.org/perlrun.html#*-c*
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index c59e42db..28f26381 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -1,7 +1,6 @@
 "============================================================================
 "File:        syntastic.vim
 "Description: Vim plugin for on the fly syntax checking.
-"Version:     3.4.0-pre
 "License:     This program is free software. It comes without any warranty,
 "             to the extent permitted by applicable law. You can redistribute
 "             it and/or modify it under the terms of the Do What The Fuck You
@@ -19,6 +18,8 @@ if has('reltime')
     let g:syntastic_start = reltime()
 endif
 
+let g:syntastic_version = '3.4.0'
+
 " Sanity checks {{{1
 
 for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands']
@@ -286,6 +287,7 @@ function! s:CacheErrors(checker_names) " {{{2
 
     if !s:skipFile()
         " debug logging {{{3
+        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'version')
         call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
         call syntastic#log#debugDump(g:SyntasticDebugVariables)
         call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'aggregate_errors')
@@ -303,17 +305,16 @@ function! s:CacheErrors(checker_names) " {{{2
 
         let names = []
         for checker in clist
-            let type = checker.getFiletype()
-            let name = checker.getName()
-            call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . type . '/' . name)
+            let cname = checker.getFiletype() . '/' . checker.getName()
+            call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . cname)
 
             let loclist = checker.getLocList()
 
             if !loclist.isEmpty()
                 if decorate_errors
-                    call loclist.decorate(type, name)
+                    call loclist.decorate(cname)
                 endif
-                call add(names, [type, name])
+                call add(names, cname)
 
                 let newLoclist = newLoclist.extend(loclist)
 
@@ -325,13 +326,13 @@ function! s:CacheErrors(checker_names) " {{{2
 
         " set names {{{3
         if !empty(names)
-            if len(syntastic#util#unique(map( copy(names), 'v:val[0]' ))) == 1
-                let type = names[0][0]
-                let name = join(map(names, 'v:val[1]'), ', ')
+            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(map(names, 'v:val[0] . "/" . v:val[1]'), ', '))
+                call newLoclist.setName(join(names, ', '))
             endif
         endif
         " }}}3
@@ -416,13 +417,16 @@ function! SyntasticMake(options) " {{{2
 
     call syntastic#log#debug(g:SyntasticDebugLoclist, 'checker output:', err_lines)
 
-    if has_key(a:options, 'preprocess')
+    if has_key(a:options, 'Preprocess')
+        let err_lines = call(a:options['Preprocess'], [err_lines])
+        call syntastic#log#debug(g:SyntasticDebugLoclist, '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:SyntasticDebugLoclist, 'preprocess:', err_lines)
     endif
     lgetexpr err_lines
 
-    let errors = copy(getloclist(0))
+    let errors = deepcopy(getloclist(0))
 
     if has_key(a:options, 'cwd')
         execute 'lcd ' . fnameescape(old_cwd)
@@ -456,7 +460,12 @@ function! SyntasticMake(options) " {{{2
         call s:addToErrors(errors, { 'subtype': a:options['subtype'] })
     endif
 
-    if has_key(a:options, 'postprocess') && !empty(a:options['postprocess'])
+    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:SyntasticDebugLoclist, '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
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index f95173b5..3d3a649e 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -114,9 +114,9 @@ function! g:SyntasticLoclist.setName(name) " {{{2
     let self._name = a:name
 endfunction " }}}2
 
-function! g:SyntasticLoclist.decorate(filetype, name) " {{{2
+function! g:SyntasticLoclist.decorate(tag) " {{{2
     for e in self._rawLoclist
-        let e['text'] .= ' [' . a:filetype . '/' . a:name . ']'
+        let e['text'] .= ' [' . a:tag . ']'
     endfor
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index d731fff2..09ca4c90 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -20,7 +20,7 @@ let s:defaultCheckers = {
         \ 'coq':         ['coqtop'],
         \ 'cpp':         ['gcc'],
         \ 'cs':          ['mcs'],
-        \ 'css':         ['csslint', 'phpcs'],
+        \ 'css':         ['csslint'],
         \ 'cucumber':    ['cucumber'],
         \ 'cuda':        ['nvcc'],
         \ 'd':           ['dmd'],
@@ -54,7 +54,7 @@ let s:defaultCheckers = {
         \ 'objc':        ['gcc'],
         \ 'objcpp':      ['gcc'],
         \ 'ocaml':       ['camlp4o'],
-        \ 'perl':        ['perl', 'perlcritic'],
+        \ 'perl':        ['perlcritic'],
         \ 'php':         ['php', 'phpcs', 'phpmd'],
         \ 'po':          ['msgfmt'],
         \ 'pod':         ['podchecker'],
@@ -142,14 +142,14 @@ function! g:SyntasticRegistry.getCheckers(ftalias, list) " {{{2
     let ft = s:normaliseFiletype(a:ftalias)
     call self._checkDeprecation(ft)
 
-    let ft_list =
+    let names =
         \ !empty(a:list) ? a:list :
         \ exists('b:syntastic_checkers') ? b:syntastic_checkers :
         \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
-        \ get(s:defaultCheckers, ft, [])
+        \ get(s:defaultCheckers, ft, 0)
 
-    return !empty(ft_list) ?
-        \ self._filterCheckersByName(checkers_map, ft_list) : [checkers_map[keys(checkers_map)[0]]]
+    return type(names) == type([]) ?
+        \ self._filterCheckersByName(checkers_map, names) : [checkers_map[keys(checkers_map)[0]]]
 endfunction " }}}2
 
 function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
index 8cfdc347..e423aa0d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -41,7 +41,7 @@ function! SyntaxCheckers_actionscript_mxmlc_GetHighlightRegex(item)
 
     endif
 
-    return term != '' ? '\V\<' . term . '\>' : ''
+    return term != '' ? '\V\<' . escape(term, '\') . '\>' : ''
 endfunction
 
 function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
index 536568fa..10d6af3d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -26,7 +26,7 @@ set cpo&vim
 function! SyntaxCheckers_css_prettycss_GetHighlightRegex(item)
     let term = matchstr(a:item["text"], '\m (\zs[^)]\+\ze)$')
     if term != ''
-        let term = '\V' . term
+        let term = '\V' . escape(term, '\')
     endif
     return term
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
index 01622d9e..bd94870b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
@@ -2,10 +2,11 @@
 -export([main/1]).
 
 main([FileName]) ->
-    LibDirs = filelib:wildcard("{lib,deps}/*/ebin"),
+    LibDirs = (["ebin", "include", "src", "test"] ++
+               filelib:wildcard("{apps,deps,lib}/*/{ebin,include}")),
     compile(FileName, LibDirs);
 
-main([FileName | ["-rebar" | [Path | LibDirs]]]) ->
+main([FileName, "-rebar", Path, LibDirs]) ->
     {ok, L} = file:consult(Path),
     P = dict:from_list(L),
     Root = filename:dirname(Path),
@@ -31,23 +32,20 @@ main([FileName | ["-rebar" | [Path | LibDirs]]]) ->
     %io:format("~p~n", [LibDirs1]),
     compile(FileName, LibDirs1);
 
-main([FileName | LibDirs]) ->
+main([FileName, LibDirs]) ->
     compile(FileName, LibDirs).
 
 compile(FileName, LibDirs) ->
     Root = get_root(filename:dirname(FileName)),
     ok = code:add_pathsa(LibDirs),
-    compile:file(FileName, [warn_obsolete_guard,
-                            warn_unused_import,
-                            warn_shadow_vars,
-                            warn_export_vars,
-                            strong_validation,
-                            report,
-                            {i, filename:join(Root, "include")},
-                            {i, filename:join(Root, "deps")},
-                            {i, filename:join(Root, "apps")},
-                            {i, filename:join(Root, "lib")}
-                        ]).
+    compile:file(FileName,
+                 [warn_obsolete_guard,
+                  warn_unused_import,
+                  warn_shadow_vars,
+                  warn_export_vars,
+                  strong_validation,
+                  report] ++
+                 [{i, filename:join(Root, I)} || I <- LibDirs]).
 
 get_root(Dir) ->
     Path = filename:split(filename:absname(Dir)),
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
index c233cf34..89d3a802 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
@@ -22,7 +22,7 @@ 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' . term
+        let term = '\V' . escape(term, '\')
     endif
     return term
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
index c6e48340..b8bc6483 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
@@ -26,7 +26,7 @@ function! SyntaxCheckers_lex_flex_GetHighlightRegex(item)
             \ '\m^\(Definition value for\|undefined definition\) \zs{[^}]\+}\ze')
     endif
 
-    return term != '' ? '\V' . term : ''
+    return term != '' ? '\V' . escape(term, '\') : ''
 endfunction
 
 function! SyntaxCheckers_lex_flex_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
index b34778de..012f1490 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
@@ -28,7 +28,7 @@ function! SyntaxCheckers_lua_luac_GetHighlightRegex(pos)
             let a:pos['col'] = p[2]
             let result = '\%' . p[2] . 'c'
         else
-            let result = '\V' . near
+            let result = '\V' . escape(near, '\')
         endif
 
         " XXX the following piece of code is evil, and is likely to break
@@ -38,7 +38,7 @@ function! SyntaxCheckers_lua_luac_GetHighlightRegex(pos)
         "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' . open)
+        "    call matchadd(group, '\%' . line . 'l\V' . escape(open, '\'))
         "endif
     endif
     return result
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index f928ae98..2ac6ec98 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -11,6 +11,22 @@
 "
 "============================================================================
 "
+" 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
+"
+" References:
+"
+" - http://perldoc.perl.org/perlrun.html#*-c*
+"
 " Checker options:
 "
 " - g:syntastic_perl_interpreter (string; default: 'perl')
@@ -24,11 +40,7 @@
 if exists('g:loaded_syntastic_perl_perl_checker')
     finish
 endif
-let g:loaded_syntastic_perl_perl_checker=1
-
-if !exists('g:syntastic_perl_interpreter')
-    let g:syntastic_perl_interpreter = 'perl'
-endif
+let g:loaded_syntastic_perl_perl_checker = 1
 
 if !exists('g:syntastic_perl_lib_path')
     let g:syntastic_perl_lib_path = []
@@ -38,6 +50,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_perl_perl_IsAvailable() dict
+    if !exists('g:syntastic_perl_interpreter')
+        let g:syntastic_perl_interpreter = self.getExec()
+    endif
+
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
     silent! call system(syntastic#util#shexpand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
@@ -45,6 +61,11 @@ function! SyntaxCheckers_perl_perl_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_perl_perl_GetLocList() dict
+    if !exists('g:syntastic_enable_perl_checker') || !g:syntastic_enable_perl_checker
+        call syntastic#log#error('checker perl/perl: checks disabled for security reasons; set g:syntastic_enable_perl_checker to 1 to override')
+        return []
+    endif
+
     let exe = expand(g:syntastic_perl_interpreter)
     if type(g:syntastic_perl_lib_path) == type('')
         call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
index 3192d7dd..23c1db9e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/php.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
@@ -20,7 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_php_php_GetHighlightRegex(item)
     let term = matchstr(a:item['text'], "\\munexpected '\\zs[^']\\+\\ze'")
-    return term != '' ? '\V' . term : ''
+    return term != '' ? '\V' . escape(term, '\') : ''
 endfunction
 
 function! SyntaxCheckers_php_php_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
index 5b714de9..254aa91a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
@@ -20,7 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_po_msgfmt_GetHighlightRegex(item)
     let term = matchstr(a:item['text'], '\mkeyword "\zs[^"]\+\ze" unknown')
-    return term != '' ? '\V' . term : ''
+    return term != '' ? '\V' . escape(term, '\') : ''
 endfunction
 
 function! SyntaxCheckers_po_msgfmt_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index 2b6119ce..5c47de5c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -39,7 +39,7 @@ function! SyntaxCheckers_python_frosted_GetLocList() dict
         if len(parts) >= 4
             let e["type"] = parts[1][0]
             let e["text"] = parts[3] . ' [' . parts[1] . ']'
-            let e["hl"] = '\V' . parts[2]
+            let e["hl"] = '\V' . escape(parts[2], '\')
         elseif e["text"] =~? '\v^I\d+:'
             let e["valid"] = 0
         else
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index c0b0166d..aa7de267 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -21,7 +21,7 @@ set cpo&vim
 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\<'.term.'\>'
+        return '\V\<' . escape(term, '\') . '\>'
     endif
 
     return ''
diff --git a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
index ccd3b2f2..63cae936 100644
--- a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
@@ -20,7 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_texinfo_makeinfo_GetHighlightRegex(item)
     let term = matchstr(a:item['text'], "\\m`\\zs[^']\\+\\ze'")
-    return term != '' ? '\V' . term : ''
+    return term != '' ? '\V' . escape(term, '\') : ''
 endfunction
 
 function! SyntaxCheckers_texinfo_makeinfo_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
index 5a8ea0c7..b0f32c11 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -22,7 +22,7 @@ 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' . term
+        let term = (col != 0 ? '\%' . col . 'c' : '') . '\V' . escape(term, '\')
     endif
     return term
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 7f380d7b..d0916dce 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -29,7 +29,7 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
             endif
         endif
 
-        return '\V' . (col ? '\%' . col . 'c' : '') . term
+        return '\V' . (col ? '\%' . col . 'c' : '') . escape(term, '\')
     endif
 
     return ''
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
index 0093c8b0..beb04943 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.92
+" @Last Change: 2014-01-23.
+" @Revision:    0.0.108
 
 let s:prototype = tlib#Object#New({'_class': ['Filter_cnf'], 'name': 'cnf'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
@@ -147,7 +147,16 @@ endf
 
 " :nodoc:
 function! s:prototype.ReduceFrontFilter(world) dict "{{{3
-    let a:world.filter[0][0] = a:world.filter[0][0][0:-2]
+    let filter = a:world.filter[0][0]
+    " TLogVAR filter
+    let str = matchstr(filter, '\(\\\(\.\\{-}\|[.?*+$^]\)\|\)$')
+    if empty(str)
+        let filter = filter[0 : -2]
+    else
+        let filter = strpart(filter, 0, len(filter) - len(str))
+    endif
+    " TLogVAR str, filter
+    let a:world.filter[0][0] = filter
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
index 0bac3c42..27f00fe1 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnfd.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.51
+" @Last Change: 2014-01-23.
+" @Revision:    0.0.57
 
 let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_cnfd'], 'name': 'cnfd'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
@@ -29,11 +29,7 @@ let s:Help = s:prototype.Help
 " :nodoc:
 function! s:prototype.Help(world) dict "{{{3
     call call(s:Help, [a:world], self)
-    if self.name == 'cnfx'
-        call a:world.PushHelp(g:tlib#Filter_cnfx#expander, 'Any characters')
-    else
-        call a:world.PushHelp('.', 'Any characters')
-    endif
+    call a:world.PushHelp('.', 'Any characters')
 endf
 
 
@@ -50,16 +46,6 @@ function! s:prototype.PushFrontFilter(world, char) dict "{{{3
 endf
 
 
-" :nodoc:
-function! s:prototype.ReduceFrontFilter(world) dict "{{{3
-    let flt = a:world.filter[0][0]
-    if flt =~ '\\\.\\{-}$'
-        let a:world.filter[0][0] = flt[0:-7]
-    else
-        let a:world.filter[0][0] = flt[0:-2]
-    endif
-endf
-
 " :nodoc:
 function! s:prototype.CleanFilter(filter) dict "{{{3
     return substitute(a:filter, '\\.\\{-}', '.', 'g')
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
deleted file mode 100644
index 1f48c5f4..00000000
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnfx.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
-" @Website:     http://www.vim.org/account/profile.php?user_id=4037
-" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2008-11-25.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.62
-
-let s:prototype = tlib#Filter_cnfd#New({'_class': ['Filter_cnfx'], 'name': 'cnfx'}) "{{{2
-let s:prototype.highlight = g:tlib#input#higroup
-
-
-" A character that should be expanded to '\.\{-}'.
-TLet g:tlib#Filter_cnfx#expander = '+'
-
-
-" The same as |tlib#Filter_cnfd#New()| but a a customizable character 
-" |see tlib#Filter_cnfx#expander| is expanded to '\.\{-}'. 
-" The pattern is a '/\V' very no-'/magic' regexp pattern.
-function! tlib#Filter_cnfx#New(...) "{{{3
-    let object = s:prototype.New(a:0 >= 1 ? a:1 : {})
-    return object
-endf
-
-
-" :nodoc:
-function! s:prototype.SetFrontFilter(world, pattern) dict "{{{3
-    let pattern = substitute(a:pattern, tlib#rx#Escape(g:tlib#Filter_cnfx#expander, 'V'), '\\.\\{-}', 'g')
-    let a:world.filter[0] = reverse(split(pattern, '\s*|\s*')) + a:world.filter[0][1 : -1]
-endf
-
-
-" :nodoc:
-function! s:prototype.PushFrontFilter(world, char) dict "{{{3
-    let a:world.filter[0][0] .= a:char == char2nr(g:tlib#Filter_cnfx#expander) ? '\.\{-}' : nr2char(a:char)
-endf
-
-
-" :nodoc:
-function! s:prototype.CleanFilter(filter) dict "{{{3
-    return substitute(a:filter, '\\.\\{-}', g:tlib#Filter_cnfx#expander, 'g')
-endf
-
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim b/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
new file mode 100644
index 00000000..0ee55618
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
@@ -0,0 +1,68 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @Website:     http://www.vim.org/account/profile.php?user_id=4037
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Created:     2008-11-25.
+" @Last Change: 2014-01-23.
+" @Revision:    0.0.80
+
+let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_glob'], 'name': 'glob'}) "{{{2
+let s:prototype.highlight = g:tlib#input#higroup
+
+
+" A character that should be expanded to '\.\{-}'.
+TLet g:tlib#Filter_glob#seq = '*'
+
+
+" A character that should be expanded to '\.\?'.
+TLet g:tlib#Filter_glob#char = '?'
+
+
+" The same as |tlib#Filter_cnf#New()| but a a customizable character 
+" |see tlib#Filter_glob#seq| is expanded to '\.\{-}' and 
+" |g:tlib#Filter_glob#char| is expanded to '\.'.
+" The pattern is a '/\V' very no-'/magic' regexp pattern.
+function! tlib#Filter_glob#New(...) "{{{3
+    let object = s:prototype.New(a:0 >= 1 ? a:1 : {})
+    return object
+endf
+
+
+let s:Help = s:prototype.Help
+
+" :nodoc:
+function! s:prototype.Help(world) dict "{{{3
+    call call(s:Help, [a:world], self)
+    call a:world.PushHelp(g:tlib#Filter_glob#seq, 'Any characters')
+    call a:world.PushHelp(g:tlib#Filter_glob#char, 'Single characters')
+endf
+
+
+" :nodoc:
+function! s:prototype.SetFrontFilter(world, pattern) dict "{{{3
+    let pattern = substitute(a:pattern, tlib#rx#Escape(g:tlib#Filter_glob#seq, 'V'), '\\.\\{-}', 'g')
+    let pattern = substitute(a:pattern, tlib#rx#Escape(g:tlib#Filter_glob#char, 'V'), '\\.', 'g')
+    let a:world.filter[0] = reverse(split(pattern, '\s*|\s*')) + a:world.filter[0][1 : -1]
+endf
+
+
+" :nodoc:
+function! s:prototype.PushFrontFilter(world, char) dict "{{{3
+    " TLogVAR a:char, nr2char(a:char)
+    if a:char == char2nr(g:tlib#Filter_glob#seq)
+        let char = '\.\{-}'
+    elseif a:char == char2nr(g:tlib#Filter_glob#char)
+        let char = '\.'
+    else
+        let char = nr2char(a:char)
+    endif
+    let a:world.filter[0][0] .= char
+endf
+
+
+" :nodoc:
+function! s:prototype.CleanFilter(filter) dict "{{{3
+    let filter = substitute(a:filter, '\\.\\{-}', g:tlib#Filter_glob#seq, 'g')
+    let filter = substitute(filter, '\\.', g:tlib#Filter_glob#char, 'g')
+    return filter
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index 1387a350..584b6701 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -1,10 +1,7 @@
-" World.vim -- The World prototype for tlib#input#List()
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-05-01.
-" @Last Change: 2013-12-03.
-" @Revision:    0.1.1310
+" @Revision:    1389
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -75,6 +72,7 @@ let s:prototype = tlib#Object#New({
             \ 'resize_vertical': 0,
             \ 'restore_from_cache': [],
             \ 'filtered_items': [],
+            \ 'resume_state': '', 
             \ 'retrieve_eval': '',
             \ 'return_agent': '',
             \ 'rv': '',
@@ -92,6 +90,7 @@ let s:prototype = tlib#Object#New({
             \ 'temp_prompt': [],
             \ 'timeout': 0,
             \ 'timeout_resolution': 2,
+            \ 'tabpagenr': -1,
             \ 'type': '', 
             \ 'win_wnr': -1,
             \ 'win_height': -1,
@@ -119,6 +118,22 @@ function! s:prototype.Set_display_format(value) dict "{{{3
 endf
 
 
+" :nodoc:
+function! s:prototype.DisplayFormat(list) dict "{{{3
+    let display_format = self.display_format
+    if !empty(display_format)
+        if has_key(self, 'InitFormatName')
+            call self.InitFormatName()
+        endif
+        let cache = self.fmt_display
+        " TLogVAR display_format, fmt_entries
+        return map(copy(a:list), 'self.FormatName(cache, display_format, v:val)')
+    else
+        return a:list
+    endif
+endf
+
+
 " :nodoc:
 function! s:prototype.Set_highlight_filename() dict "{{{3
     let self.tlib_UseInputListScratch = 'call world.Highlight_filename()'
@@ -180,6 +195,32 @@ else
     endf
 
 
+    " :nodoc:
+    function! s:prototype.UseFilenameIndicators() dict "{{{3
+        return g:tlib_inputlist_filename_indicators || has_key(self, 'filename_indicators')
+    endf
+
+
+    " :nodoc:
+    function! s:prototype.InitFormatName() dict "{{{3 
+        if self.UseFilenameIndicators()
+            let self._buffers = {}
+            for bufnr in range(1, bufnr('$'))
+                let filename = fnamemodify(bufname(bufnr), ':p')
+                " TLogVAR filename
+                let bufdef = {
+                            \ 'bufnr': bufnr,
+                            \ }
+                " '&buflisted'
+                for opt in ['&modified', '&bufhidden']
+                    let bufdef[opt] = getbufvar(bufnr, opt)
+                endfor
+                let self._buffers[filename] = bufdef
+            endfor
+        endif
+    endf
+
+
     " :nodoc:
     function! s:prototype.FormatFilename(file) dict "{{{3
         " TLogVAR a:file
@@ -196,34 +237,30 @@ else
         if strwidth(fname) > width
             let fname = strpart(fname, 0, width - 3) .'...'
         endif
-        let dnmax = &co - max([width, strwidth(fname)]) - 10 - self.index_width - &fdc
-        if g:tlib_inputlist_filename_indicators
-            let dnmax -= 2
-        endif
-        if strwidth(dname) > dnmax
-            let dname = '...'. strpart(dname, len(dname) - dnmax)
-        endif
-        let marker = []
-        let use_indicators = g:tlib_inputlist_filename_indicators || has_key(self, 'filename_indicators')
+        let dnmax = &co - max([width, strwidth(fname)]) - 8 - self.index_width - &fdc
+        let use_indicators = self.UseFilenameIndicators()
         " TLogVAR use_indicators
+        let marker = []
         if use_indicators
             call insert(marker, '[')
             if g:tlib_inputlist_filename_indicators
-                let bnr = bufnr(a:file)
-                TLogVAR a:file, bnr, self.bufnr
+                let bufdef = get(self._buffers, a:file, {})
+                " let bnr = bufnr(a:file)
+                let bnr = get(bufdef, 'bufnr', -1)
+                " TLogVAR a:file, bnr, self.bufnr
                 if bnr != -1
                     if bnr == self.bufnr
                         call add(marker, '%')
                     else
                         call add(marker, bnr)
                     endif
-                    if getbufvar(bnr, '&modified')
+                    if get(bufdef, '&modified', 0)
                         call add(marker, '+')
                     endif
-                    if getbufvar(bnr, '&bufhidden') == 'hide'
+                    if get(bufdef, '&bufhidden', '') == 'hide'
                         call add(marker, 'h')
                     endif
-                    " if !buflisted(bnr)
+                    " if !get(bufdef, '&buflisted', 1)
                     "     call add(marker, 'u')
                     " endif
                     " echom "DBG" a:file string(get(self,'filename_indicators'))
@@ -242,9 +279,16 @@ else
         else
             call add(marker, '|')
         endif
+        let markers = join(marker, '')
+        if !empty(markers)
+            let dnmax -= len(markers)
+        endif
+        if strwidth(dname) > dnmax
+            let dname = '...'. strpart(dname, len(dname) - dnmax)
+        endif
         return printf("%-*s %s %s",
                     \ self.width_filename + len(fname) - strwidth(fname),
-                    \ fname, join(marker, ''), dname)
+                    \ fname, markers, dname)
     endf
 
 endif
@@ -764,6 +808,7 @@ function! s:prototype.UseInputListScratch() dict "{{{3
     if !exists('b:tlib_list_init')
         call tlib#autocmdgroup#Init()
         autocmd TLib VimResized <buffer> call feedkeys("\<c-j>", 't')
+        " autocmd TLib WinLeave <buffer> let b:tlib_world_event = 'WinLeave' | call feedkeys("\<c-j>", 't')
         let b:tlib_list_init = 1
     endif
     if !exists('w:tlib_list_init')
@@ -923,16 +968,17 @@ function! s:prototype.DisplayHelp() dict "{{{3
     let self.temp_lines = self.InitHelp()
     call self.PushHelp('<Esc>', self.key_mode == 'default' ? 'Abort' : 'Reset keymap')
     call self.PushHelp('Enter, <cr>', 'Pick the current item')
-    call self.PushHelp('<M-Number>',  'Pick an item')
     call self.PushHelp('Mouse', 'L: Pick item, R: Show menu')
+    call self.PushHelp('<M-Number>',  'Select an item')
     call self.PushHelp('<BS>, <C-BS>', 'Reduce filter')
     call self.PushHelp('<S-Esc>, <F10>', 'Enter command')
 
     if self.key_mode == 'default'
-        call self.PushHelp('<C|M-r>',     'Reset the display')
+        call self.PushHelp('<C|M-r>',      'Reset the display')
         call self.PushHelp('Up/Down',      'Next/previous item')
-        call self.PushHelp('<C|M-q>',     'Edit top filter string')
+        call self.PushHelp('<C|M-q>',      'Edit top filter string')
         call self.PushHelp('Page Up/Down', 'Scroll')
+        call self.PushHelp('<S-Space>',    'Enter * Wildcard')
         if self.allow_suspend
             call self.PushHelp('<C|M-z>', 'Suspend/Resume')
             call self.PushHelp('<C-o>', 'Switch to origin')
@@ -1164,7 +1210,7 @@ function! s:prototype.Query() dict "{{{3
     if g:tlib_inputlist_shortmessage
         let query = 'Filter: '. self.DisplayFilter()
     else
-        let query = self.query .' (filter: '. self.DisplayFilter() .'; press "?" for help)'
+        let query = self.query .' (filter: '. self.DisplayFilter() .'; press <F1> for help)'
     endif
     return query
 endf
@@ -1236,6 +1282,9 @@ endf
 " :nodoc:
 function! s:prototype.SwitchWindow(where) dict "{{{3
     " TLogDBG string(tlib#win#List())
+    if self.tabpagenr != tabpagenr()
+        call tlib#tab#Set(self.tabpagenr)
+    endif
     let wnr = get(self, a:where.'_wnr')
     " TLogVAR self, wnr
     return tlib#win#Set(wnr)
@@ -1312,3 +1361,8 @@ function! s:prototype.RestoreOrigin(...) dict "{{{3
     " TLogDBG "RestoreOrigin1 ". string(tlib#win#List())
 endf
 
+
+function! s:prototype.Suspend() dict "{{{3
+    call tlib#agent#Suspend(self, self.rv)
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/agent.vim b/sources_non_forked/tlib/autoload/tlib/agent.vim
index 61109e7b..766c5b33 100644
--- a/sources_non_forked/tlib/autoload/tlib/agent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/agent.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-24.
-" @Last Change: 2013-11-05.
-" @Revision:    0.1.242
+" @Last Change: 2014-02-06.
+" @Revision:    0.1.251
 
 
 " :filedoc:
@@ -55,6 +55,20 @@ function! tlib#agent#PageDown(world, selected) "{{{3
 endf
 
 
+function! tlib#agent#Home(world, selected) "{{{3
+    let a:world.prefidx = 1
+    let a:world.state = 'redisplay'
+    return a:world
+endf
+
+
+function! tlib#agent#End(world, selected) "{{{3
+    let a:world.prefidx = len(a:world.list)
+    let a:world.state = 'redisplay'
+    return a:world
+endf
+
+
 function! tlib#agent#Up(world, selected, ...) "{{{3
     TVarArg ['lines', 1]
     let a:world.idx = ''
@@ -463,7 +477,7 @@ function! tlib#agent#ShowInfo(world, selected)
     for f in a:selected
         if filereadable(f)
             let desc = [getfperm(f), strftime('%c', getftime(f)),  getfsize(f) .' bytes', getftype(f)]
-            call add(lines, fnamemodify(f, ':t') .':')
+            call add(lines, fnamemodify(f, ':p'))
             call add(lines, '  '. join(desc, '; '))
         endif
     endfor
@@ -561,7 +575,7 @@ endf
 
 function! tlib#agent#ExecAgentByName(world, selected) "{{{3
     let s:agent_names_world = a:world
-    let agent_names = {}
+    let agent_names = {'Help': 'tlib#agent#Help'}
     for def in values(a:world.key_map[a:world.key_mode])
         if has_key(def, 'help') && !empty(def.help) && has_key(def, 'agent') && !empty(def.agent)
             let agent_names[def.help] = def.agent
diff --git a/sources_non_forked/tlib/autoload/tlib/cache.vim b/sources_non_forked/tlib/autoload/tlib/cache.vim
index 7380d6dd..0c2c7017 100644
--- a/sources_non_forked/tlib/autoload/tlib/cache.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cache.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2013-09-25.
-" @Revision:    0.1.220
+" @Revision:    0.1.230
 
 
 " The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
@@ -109,13 +109,20 @@ endf
 
 
 function! tlib#cache#Save(cfile, dictionary) "{{{3
+    " TLogVAR a:cfile, a:dictionary
     call tlib#persistent#Save(a:cfile, a:dictionary)
 endf
 
 
-function! tlib#cache#Get(cfile) "{{{3
+function! tlib#cache#Get(cfile, ...) "{{{3
     call tlib#cache#MaybePurge()
-    return tlib#persistent#Get(a:cfile)
+    if !empty(a:cfile) && filereadable(a:cfile)
+        let val = readfile(a:cfile, 'b')
+        return eval(join(val, "\n"))
+    else
+        let default = a:0 >= 1 ? a:1 : {}
+        return default
+    endif
 endf
 
 
@@ -123,10 +130,18 @@ endf
 " or does not exist, create it calling a generator function.
 function! tlib#cache#Value(cfile, generator, ftime, ...) "{{{3
     if !filereadable(a:cfile) || (a:ftime != 0 && getftime(a:cfile) < a:ftime)
-        let args = a:0 >= 1 ? a:1 : []
-        let val = call(a:generator, args)
-        " TLogVAR a:generator, args, val
-        call tlib#cache#Save(a:cfile, {'val': val})
+        if empty(a:generator) && a:0 >= 1
+            " TLogVAR a:1
+            let val = a:1
+        else
+            let args = a:0 >= 1 ? a:1 : []
+            " TLogVAR a:generator, args
+            let val = call(a:generator, args)
+        endif
+        " TLogVAR val
+        let cval = {'val': val}
+        " TLogVAR cval
+        call tlib#cache#Save(a:cfile, cval)
         return val
     else
         let val = tlib#cache#Get(a:cfile)
diff --git a/sources_non_forked/tlib/autoload/tlib/char.vim b/sources_non_forked/tlib/autoload/tlib/char.vim
index 2efb47bb..277716d3 100644
--- a/sources_non_forked/tlib/autoload/tlib/char.vim
+++ b/sources_non_forked/tlib/autoload/tlib/char.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.30
+" @Last Change: 2014-01-20.
+" @Revision:    0.0.37
 
 if &cp || exists("loaded_tlib_char_autoload")
     finish
@@ -19,13 +19,22 @@ let loaded_tlib_char_autoload = 1
 "   echo tlib#char#Get()
 "   echo tlib#char#Get(5)
 function! tlib#char#Get(...) "{{{3
-    TVarArg ['timeout', 0], ['resolution', 0]
+    TVarArg ['timeout', 0], ['resolution', 0], ['getmod', 0]
+    let char = -1
+    let mode = 0
     if timeout == 0 || !has('reltime')
-        return getchar()
+        let char = getchar()
     else
-        return tlib#char#GetWithTimeout(timeout, resolution)
+        let char = tlib#char#GetWithTimeout(timeout, resolution)
+    endif
+    if getmod
+        if char != -1
+            let mode = getcharmod()
+        endif
+        return [char, mode]
+    else
+        return char
     endif
-    return -1
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/sources_non_forked/tlib/autoload/tlib/cmd.vim
index e6ab3e88..01975b60 100644
--- a/sources_non_forked/tlib/autoload/tlib/cmd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cmd.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-08-23.
-" @Last Change: 2013-05-14.
-" @Revision:    0.0.46
+" @Last Change: 2014-02-05.
+" @Revision:    0.0.53
 
 if &cp || exists("loaded_tlib_cmd_autoload")
     finish
@@ -58,10 +58,12 @@ endf
 "   call tlib#cmd#BrowseOutputWithCallback('tlib#cmd#ParseScriptname', 'scriptnames')
 function! tlib#cmd#BrowseOutputWithCallback(callback, command) "{{{3
     let list = tlib#cmd#OutputAsList(a:command)
-    let cmd = tlib#input#List('s', 'Output of: '. a:command, list)
-    if !empty(cmd)
-        let Callback = function(a:callback)
-        call call(Callback, [cmd])
+    let cmds = tlib#input#List('m', 'Output of: '. a:command, list)
+    if !empty(cmds)
+        for cmd in cmds
+            let Callback = function(a:callback)
+            call call(Callback, [cmd])
+        endfor
     endif
 endf
 
@@ -70,8 +72,9 @@ function! tlib#cmd#DefaultBrowseOutput(cmd) "{{{3
 endf
 
 function! tlib#cmd#ParseScriptname(line) "{{{3
-    let parsedValue = substitute(a:line, '^.\{-}\/', '/', '')
-    exe ':e '. parsedValue
+    " let parsedValue = substitute(a:line, '^.\{-}\/', '/', '')
+    let parsedValue = matchstr(a:line, '^\s*\d\+:\s*\zs.*$')
+    exe 'drop '. fnameescape(parsedValue)
 endf
 
 " :def: function! tlib#cmd#UseVertical(?rx='')
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index b756f783..9805b305 100644
--- a/sources_non_forked/tlib/autoload/tlib/input.vim
+++ b/sources_non_forked/tlib/autoload/tlib/input.vim
@@ -1,10 +1,7 @@
-" input.vim
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-06-30.
-" @Last Change: 2013-09-30.
-" @Revision:    0.0.1262
+" @Revision:    1315
 
 
 " :filedoc:
@@ -23,16 +20,15 @@ TLet g:tlib#input#livesearch_threshold = 1000
 
 
 " Determine how |tlib#input#List()| and related functions work.
-" Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
-"   cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
-"            as a wildcard (this is the default method)
-"     - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
-"       |/\{-|) were entered.
+" Can be "glob", "cnf", "cnfd", "seq", or "fuzzy". See:
+"   glob ... Like cnf but "*" and "?" (see |g:tlib#Filter_glob#seq|, 
+"       |g:tlib#Filter_glob#char|) are interpreted as glob-like 
+"       |wildcards| (this is the default method)
 "     - Examples:
-"         - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+"         - "f*o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
 "           "far".
 "     - Otherwise it is a derivate of the cnf method (see below).
-"     - See also |tlib#Filter_cnfx#New()|.
+"     - See also |tlib#Filter_glob#New()|.
 "   cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
 "            expanded to "\.\{-}"
 "     - A period character (".") acts as a wildcard as if ".\{-}" (see 
@@ -60,7 +56,7 @@ TLet g:tlib#input#livesearch_threshold = 1000
 "     - |tlib#Filter_seq#New()|
 "   fuzzy .. Match fuzzy character sequences
 "     - |tlib#Filter_fuzzy#New()|
-TLet g:tlib#input#filter_mode = 'cnfx'
+TLet g:tlib#input#filter_mode = 'glob'
 
 
 " The highlight group to use for showing matches in the input list 
@@ -126,6 +122,8 @@ TLet g:tlib#input#numeric_chars = {
 TLet g:tlib#input#keyagents_InputList_s = {
             \ "\<PageUp>":   'tlib#agent#PageUp',
             \ "\<PageDown>": 'tlib#agent#PageDown',
+            \ "\<Home>":     'tlib#agent#Home',
+            \ "\<End>":      'tlib#agent#End',
             \ "\<Up>":       'tlib#agent#Up',
             \ "\<Down>":     'tlib#agent#Down',
             \ "\<c-Up>":     'tlib#agent#UpN',
@@ -140,7 +138,6 @@ TLet g:tlib#input#keyagents_InputList_s = {
             \ 26:            'tlib#agent#Suspend',
             \ 250:           'tlib#agent#Suspend',
             \ 15:            'tlib#agent#SuspendToParentWindow',  
-            \ 63:            'tlib#agent#Help',
             \ "\<F1>":       'tlib#agent#Help',
             \ "\<F10>":      'tlib#agent#ExecAgentByName',
             \ "\<S-Esc>":    'tlib#agent#ExecAgentByName',
@@ -155,6 +152,7 @@ TLet g:tlib#input#keyagents_InputList_s = {
             \ char2nr(g:tlib#input#or):  'tlib#agent#OR',
             \ char2nr(g:tlib#input#and): 'tlib#agent#AND',
             \ }
+            " \ 63:            'tlib#agent#Help',
 
 
 " :nodefault:
@@ -345,6 +343,16 @@ function! tlib#input#ListW(world, ...) "{{{3
             try
                 call s:RunStateHandlers(world)
 
+                " if exists('b:tlib_world_event')
+                "     let event = b:tlib_world_event
+                "     unlet! b:tlib_world_event
+                "     if event == 'WinLeave'
+                "         " let world.resume_state = world.state
+                "         let world = tlib#agent#Suspend(world, world.rv)
+                "         break
+                "     endif
+                " endif
+
                 " let time02 = str2float(reltimestr(reltime()))  " DBG
                 " TLogVAR time02, time02 - time0
                 if world.state =~ '\<reset\>'
@@ -443,14 +451,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                             " TLogDBG 5
                             " TLogDBG len(world.list)
                             " TLogVAR world.list
-                            let dlist = copy(world.list)
-                            " TLogVAR world.display_format
-                            if !empty(world.display_format)
-                                let display_format = world.display_format
-                                let cache = world.fmt_display
-                                " TLogVAR display_format, fmt_entries
-                                call map(dlist, 'world.FormatName(cache, display_format, v:val)')
-                            endif
+                            let dlist = world.DisplayFormat(world.list)
                             " TLogVAR world.prefidx
                             " TLogDBG 6
                             " let time6 = str2float(reltimestr(reltime()))  " DBG
@@ -545,20 +546,15 @@ function! tlib#input#ListW(world, ...) "{{{3
                             exec exec_cmd
                         endif
                     elseif has('gui_gtk') || has('gui_gtk2')
-                        let c = getchar()
-                        let cmod = getcharmod()
-                        " TLogVAR c, cmod
-                        if c !~ '\D' && c > 0 && cmod != 0
-                            let c = printf("<%s-%s>", cmod, c)
-                        endif
+                        let c = s:GetModdedChar(world)
+                        " TLogVAR c
                     endif
                 else
                     " TLogVAR world.timeout
-                    let c = tlib#char#Get(world.timeout, world.timeout_resolution)
+                    let c = s:GetModdedChar(world)
                     " TLogVAR c, has_key(world.key_map[world.key_mode],c)
-                    let cmod = getcharmod()
                 endif
-                " TLogVAR c, cmod
+                " TLogVAR c
                 " TLogDBG string(sort(keys(world.key_map[world.key_mode])))
 
                 " TLogVAR world.next_agent, world.next_eval
@@ -602,7 +598,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                         " let world.offset  = world.prefidx
                         if empty(world.prefidx)
                             " call feedkeys(c, 't')
-                            let c = tlib#char#Get(world.timeout)
+                            let c = s:GetModdedChar(world)
                             let world.state = 'help'
                             continue
                         endif
@@ -829,6 +825,16 @@ function! tlib#input#ListW(world, ...) "{{{3
 endf
 
 
+function! s:GetModdedChar(world) "{{{3
+    let [char, mode] = tlib#char#Get(a:world.timeout, a:world.timeout_resolution, 1)
+    if char !~ '\D' && char > 0 && mode != 0
+        return printf("<%s-%s>", mode, char)
+    else
+        return char
+    endif
+endf
+
+
 function! s:Init(world, cmd) "{{{3
     " TLogVAR a:cmd
     let a:world.initial_display = 1
@@ -844,6 +850,9 @@ function! s:Init(world, cmd) "{{{3
         else
             call a:world.Retrieve(1)
         endif
+        " if !empty(a:world.resume_state)
+        "     let a:world.state = a:world.resume_state
+        " endif
     elseif !a:world.initialized
         " TLogVAR a:world.initialized, a:world.win_wnr, a:world.bufnr
         let a:world.filetype = &filetype
diff --git a/sources_non_forked/tlib/autoload/tlib/persistent.vim b/sources_non_forked/tlib/autoload/tlib/persistent.vim
index b5791744..26232d59 100644
--- a/sources_non_forked/tlib/autoload/tlib/persistent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/persistent.vim
@@ -3,7 +3,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-05-11.
 " @Last Change: 2012-05-11.
-" @Revision:    7
+" @Revision:    9
 
 " The directory for persistent data files. If empty, use 
 " |tlib#dir#MyRuntime|.'/share'.
@@ -29,13 +29,8 @@ function! tlib#persistent#Filename(type, ...) "{{{3
     return tlib#cache#Filename(a:type, file, mkdir, tlib#persistent#Dir())
 endf
 
-function! tlib#persistent#Get(cfile) "{{{3
-    if !empty(a:cfile) && filereadable(a:cfile)
-        let val = readfile(a:cfile, 'b')
-        return eval(join(val, "\n"))
-    else
-        return {}
-    endif
+function! tlib#persistent#Get(...) "{{{3
+    return call('tlib#cache#Get', a:000)
 endf
 
 function! tlib#persistent#Value(...) "{{{3
diff --git a/sources_non_forked/tlib/autoload/tlib/progressbar.vim b/sources_non_forked/tlib/autoload/tlib/progressbar.vim
index 6ff5a77f..6ca0ce9b 100644
--- a/sources_non_forked/tlib/autoload/tlib/progressbar.vim
+++ b/sources_non_forked/tlib/autoload/tlib/progressbar.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-09-30.
 " @Last Change: 2010-01-07.
-" @Revision:    0.0.66
+" @Revision:    0.0.69
 
 if &cp || exists("loaded_tlib_progressbar_autoload")
     finish
@@ -57,6 +57,7 @@ function! tlib#progressbar#Display(value, ...) "{{{3
         let pbr = repeat('.', s:width[0] - val)
         let txt = printf(s:format[0], '['.pbl.pbr.']') . extra
         let &l:statusline = txt
+        " TLogDBG txt
         redrawstatus
         " redraw
         " call tlib#notify#Echo(txt)
diff --git a/sources_non_forked/tlib/autoload/tlib/scratch.vim b/sources_non_forked/tlib/autoload/tlib/scratch.vim
index e043f050..e64eb9e6 100644
--- a/sources_non_forked/tlib/autoload/tlib/scratch.vim
+++ b/sources_non_forked/tlib/autoload/tlib/scratch.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-07-18.
-" @Last Change: 2013-11-11.
-" @Revision:    0.0.251
+" @Last Change: 2014-02-06.
+" @Revision:    0.0.252
 
 if &cp || exists("loaded_tlib_scratch_autoload")
     finish
@@ -100,6 +100,8 @@ function! tlib#scratch#UseScratch(...) "{{{3
         endif
     endif
     let keyargs.scratch = bufnr('%')
+    let keyargs.scratch_tabpagenr = tabpagenr()
+    let keyargs.scratch_winnr = winnr()
     " TLogVAR 2, winnr(), bufnr('%'), bufname("%"), keyargs.scratch
     return keyargs.scratch
 endf
diff --git a/sources_non_forked/tlib/autoload/tlib/tab.vim b/sources_non_forked/tlib/autoload/tlib/tab.vim
index c6159586..6fc3bd46 100644
--- a/sources_non_forked/tlib/autoload/tlib/tab.vim
+++ b/sources_non_forked/tlib/autoload/tlib/tab.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-08-27.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.29
+" @Last Change: 2014-02-06.
+" @Revision:    0.0.30
 
 if &cp || exists("loaded_tlib_tab_autoload")
     finish
@@ -50,6 +50,8 @@ endf
 
 
 function! tlib#tab#Set(tabnr) "{{{3
-    exec a:tabnr .'tabnext'
+    if a:tabnr > 0
+        exec a:tabnr .'tabnext'
+    endif
 endf
 
diff --git a/sources_non_forked/tlib/autoload/tlib/vim.vim b/sources_non_forked/tlib/autoload/tlib/vim.vim
index 150c4161..7154aeb1 100644
--- a/sources_non_forked/tlib/autoload/tlib/vim.vim
+++ b/sources_non_forked/tlib/autoload/tlib/vim.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2010-07-19.
 " @Last Change: 2012-06-08.
-" @Revision:    35
+" @Revision:    37
 
 
 let s:restoreframecmd = ''
@@ -120,3 +120,33 @@ function! s:RestoreFrameParams() "{{{3
     endif
 endf
 
+
+" :display: tlib#vim##CopyFunction(old, new, overwrite=0)
+function! tlib#vim#CopyFunction(old, new, ...) "{{{3
+    let overwrite = a:0 >= 1 ? a:1 : 0
+    redir => oldfn
+    exec 'silent function' a:old
+    redir END
+    if exists('*'. a:new)
+        if overwrite > 0
+            exec 'delfunction' a:new
+        elseif overwrite < 0
+            throw 'tlib#vim##CopyFunction: Function already exists: '. a:old .' -> '. a:new
+        else
+            return
+        endif
+    endif
+    let fn = split(oldfn, '\n')
+    let fn = map(fn, 'substitute(v:val, ''^\d\+'', "", "")')
+    let fn[0] = substitute(fn[0], '\V\^\s\*fu\%[nction]!\?\s\+\zs'. a:old, a:new, '')
+    let t = @t
+    try
+        let @t = join(fn, "\n")
+        redir => out
+        @t
+        redir END
+    finally
+        let @t = t
+    endtry
+endf
+
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index a295ce19..816524b9 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -38,6 +38,13 @@ Contents~
         :TBrowseOutput ......................... |:TBrowseOutput|
         :TBrowseScriptnames .................... |:TBrowseScriptnames|
         :TTimeCommand .......................... |:TTimeCommand|
+        Add .................................... |Add()|
+        TestGetArg ............................. |TestGetArg()|
+        TestGetArg1 ............................ |TestGetArg1()|
+        TestArgs ............................... |TestArgs()|
+        TestArgs1 .............................. |TestArgs1()|
+        TestArgs2 .............................. |TestArgs2()|
+        TestArgs3 .............................. |TestArgs3()|
         g:tlib#debug ........................... |g:tlib#debug|
         tlib#notify#Echo ....................... |tlib#notify#Echo()|
         tlib#notify#TrimMessage ................ |tlib#notify#TrimMessage()|
@@ -53,6 +60,7 @@ Contents~
         tlib#vim#Maximize ...................... |tlib#vim#Maximize()|
         tlib#vim#RestoreWindow ................. |tlib#vim#RestoreWindow()|
         g:tlib#vim#use_wmctrl .................. |g:tlib#vim#use_wmctrl|
+        tlib#vim#CopyFunction .................. |tlib#vim#CopyFunction()|
         tlib#progressbar#Init .................. |tlib#progressbar#Init()|
         tlib#progressbar#Display ............... |tlib#progressbar#Display()|
         tlib#progressbar#Restore ............... |tlib#progressbar#Restore()|
@@ -89,6 +97,9 @@ Contents~
         tlib#char#Get .......................... |tlib#char#Get()|
         tlib#char#IsAvailable .................. |tlib#char#IsAvailable()|
         tlib#char#GetWithTimeout ............... |tlib#char#GetWithTimeout()|
+        g:tlib#Filter_glob#seq ................. |g:tlib#Filter_glob#seq|
+        g:tlib#Filter_glob#char ................ |g:tlib#Filter_glob#char|
+        tlib#Filter_glob#New ................... |tlib#Filter_glob#New()|
         g:tlib_scratch_pos ..................... |g:tlib_scratch_pos|
         g:tlib#scratch#hidden .................. |g:tlib#scratch#hidden|
         tlib#scratch#UseScratch ................ |tlib#scratch#UseScratch()|
@@ -124,6 +135,8 @@ Contents~
         tlib#agent#CopyItems ................... |tlib#agent#CopyItems()|
         tlib#agent#PageUp ...................... |tlib#agent#PageUp()|
         tlib#agent#PageDown .................... |tlib#agent#PageDown()|
+        tlib#agent#Home ........................ |tlib#agent#Home()|
+        tlib#agent#End ......................... |tlib#agent#End()|
         tlib#agent#Up .......................... |tlib#agent#Up()|
         tlib#agent#Down ........................ |tlib#agent#Down()|
         tlib#agent#UpN ......................... |tlib#agent#UpN()|
@@ -178,8 +191,6 @@ Contents~
         tlib#bitwise#ShiftLeft ................. |tlib#bitwise#ShiftLeft()|
         tlib#bitwise#Add ....................... |tlib#bitwise#Add()|
         tlib#bitwise#Sub ....................... |tlib#bitwise#Sub()|
-        g:tlib#Filter_cnfx#expander ............ |g:tlib#Filter_cnfx#expander|
-        tlib#Filter_cnfx#New ................... |tlib#Filter_cnfx#New()|
         tlib#url#Decode ........................ |tlib#url#Decode()|
         tlib#url#DecodeChar .................... |tlib#url#DecodeChar()|
         tlib#url#EncodeChar .................... |tlib#url#EncodeChar()|
@@ -235,6 +246,7 @@ Contents~
         g:tlib_inputlist_shortmessage .......... |g:tlib_inputlist_shortmessage|
         tlib#World#New ......................... |tlib#World#New()|
         prototype.PrintLines
+        prototype.Suspend
         tlib#tab#BufMap ........................ |tlib#tab#BufMap()|
         tlib#tab#TabWinNr ...................... |tlib#tab#TabWinNr()|
         tlib#tab#Set ........................... |tlib#tab#Set()|
@@ -409,6 +421,33 @@ plugin/02tlib.vim~
     Time the execution time of CMD.
 
 
+========================================================================
+test/tlib.vim~
+
+                                                    *Add()*
+Add(a,b)
+    List
+
+                                                    *TestGetArg()*
+TestGetArg(...)
+    Optional arguments
+
+                                                    *TestGetArg1()*
+TestGetArg1(...)
+
+                                                    *TestArgs()*
+TestArgs(...)
+
+                                                    *TestArgs1()*
+TestArgs1(...)
+
+                                                    *TestArgs2()*
+TestArgs2(...)
+
+                                                    *TestArgs3()*
+TestArgs3(...)
+
+
 ========================================================================
 autoload/tlib.vim~
 
@@ -451,7 +490,7 @@ tlib#persistent#Dir(?mode = 'bg')
 tlib#persistent#Filename(type, ?file=%, ?mkdir=0)
 
                                                     *tlib#persistent#Get()*
-tlib#persistent#Get(cfile)
+tlib#persistent#Get(...)
 
                                                     *tlib#persistent#Value()*
 tlib#persistent#Value(...)
@@ -500,6 +539,9 @@ g:tlib#vim#use_wmctrl          (default: executable('wmctrl'))
     default method of setting 'lines' and 'columns' to a large 
     value.
 
+                                                    *tlib#vim#CopyFunction()*
+tlib#vim##CopyFunction(old, new, overwrite=0)
+
 
 ========================================================================
 autoload/tlib/progressbar.vim~
@@ -731,6 +773,25 @@ tlib#char#IsAvailable()
 tlib#char#GetWithTimeout(timeout, ...)
 
 
+========================================================================
+autoload/tlib/Filter_glob.vim~
+
+                                                    *g:tlib#Filter_glob#seq*
+g:tlib#Filter_glob#seq         (default: '*')
+    A character that should be expanded to '\.\{-}'.
+
+                                                    *g:tlib#Filter_glob#char*
+g:tlib#Filter_glob#char        (default: '?')
+    A character that should be expanded to '\.\?'.
+
+                                                    *tlib#Filter_glob#New()*
+tlib#Filter_glob#New(...)
+    The same as |tlib#Filter_cnf#New()| but a a customizable character 
+    |see tlib#Filter_glob#seq| is expanded to '\.\{-}' and 
+    |g:tlib#Filter_glob#char| is expanded to '\.'.
+    The pattern is a '/\V' very no-'/magic' regexp pattern.
+
+
 ========================================================================
 autoload/tlib/scratch.vim~
 
@@ -829,7 +890,7 @@ tlib#cache#Filename(type, ?file=%, ?mkdir=0, ?dir='')
 tlib#cache#Save(cfile, dictionary)
 
                                                     *tlib#cache#Get()*
-tlib#cache#Get(cfile)
+tlib#cache#Get(cfile, ...)
 
                                                     *tlib#cache#Value()*
 tlib#cache#Value(cfile, generator, ftime, ...)
@@ -939,6 +1000,12 @@ tlib#agent#PageUp(world, selected)
                                                     *tlib#agent#PageDown()*
 tlib#agent#PageDown(world, selected)
 
+                                                    *tlib#agent#Home()*
+tlib#agent#Home(world, selected)
+
+                                                    *tlib#agent#End()*
+tlib#agent#End(world, selected)
+
                                                     *tlib#agent#Up()*
 tlib#agent#Up(world, selected, ...)
 
@@ -1116,20 +1183,6 @@ tlib#bitwise#Add(num1, num2, ...)
 tlib#bitwise#Sub(num1, num2, ...)
 
 
-========================================================================
-autoload/tlib/Filter_cnfx.vim~
-
-                                                    *g:tlib#Filter_cnfx#expander*
-g:tlib#Filter_cnfx#expander    (default: '+')
-    A character that should be expanded to '\.\{-}'.
-
-                                                    *tlib#Filter_cnfx#New()*
-tlib#Filter_cnfx#New(...)
-    The same as |tlib#Filter_cnfd#New()| but a a customizable character 
-    |see tlib#Filter_cnfx#expander| is expanded to '\.\{-}'. 
-    The pattern is a '/\V' very no-'/magic' regexp pattern.
-
-
 ========================================================================
 autoload/tlib/url.vim~
 
@@ -1274,18 +1327,17 @@ g:tlib#input#livesearch_threshold (default: 1000)
     filter. This is useful on slower machines or with very long lists.
 
                                                     *g:tlib#input#filter_mode*
-g:tlib#input#filter_mode       (default: 'cnfx')
+g:tlib#input#filter_mode       (default: 'glob')
     Determine how |tlib#input#List()| and related functions work.
-    Can be "cnf", "cnfd", "cnfx", "seq", or "fuzzy". See:
-      cnfx ... Like cnfd but |g:tlib#Filter_cnfx#expander| is interpreted 
-               as a wildcard (this is the default method)
-        - A plus character ("+") acts as a wildcard as if ".\{-}" (see 
-          |/\{-|) were entered.
+    Can be "glob", "cnf", "cnfd", "seq", or "fuzzy". See:
+      glob ... Like cnf but "*" and "?" (see |g:tlib#Filter_glob#seq|, 
+          |g:tlib#Filter_glob#char|) are interpreted as glob-like 
+          |wildcards| (this is the default method)
         - Examples:
-            - "f+o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
+            - "f*o" matches "fo", "fxo", and "fxxxoo", but doesn't match 
               "far".
         - Otherwise it is a derivate of the cnf method (see below).
-        - See also |tlib#Filter_cnfx#New()|.
+        - See also |tlib#Filter_glob#New()|.
       cnfd ... Like cnf but "." is interpreted as a wildcard, i.e. it is 
                expanded to "\.\{-}"
         - A period character (".") acts as a wildcard as if ".\{-}" (see 
@@ -1568,6 +1620,8 @@ tlib#World#New(...)
 
 prototype.PrintLines
 
+prototype.Suspend
+
 
 ========================================================================
 autoload/tlib/tab.vim~
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index c60dfd3b..6cbab75d 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-04-10.
 " @Last Change: 2013-09-25.
-" @Revision:    748
+" @Revision:    749
 " GetLatestVimScripts: 1863 1 tlib.vim
 
 if &cp || exists("loaded_tlib")
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 107
+let loaded_tlib = 108
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 1b4dfa3f..6b13dcf0 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -19,6 +19,7 @@ function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
       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] = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index ba98b71e..e4e1b202 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -36,19 +36,17 @@ function! airline#extensions#whitespace#check()
 
     let mixed = 0
     if index(checks, 'indent') > -1
-      let indents = [search('^ \{2,}', 'nb'), search('^ \{2,}', 'n'), search('^\t', 'nb'), search('^\t', 'n')]
-      let mixed = indents[0] != 0 && indents[1] != 0 && indents[2] != 0 && indents[3] != 0
+      let mixed = search('\v(^\t+ +)|(^ +\t+)', 'nw')
     endif
 
-    if trailing != 0 || mixed
+    if trailing != 0 || mixed != 0
       let b:airline_whitespace_check = s:symbol
       if s:show_message
         if trailing != 0
           let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:trailing_format, trailing)
         endif
-        if mixed
-          let mixnr = indents[0] == indents[1] ? indents[0] : indents[2]
-          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixnr)
+        if mixed != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixed)
         endif
       endif
     endif
diff --git a/sources_non_forked/vim-commentary/CONTRIBUTING.markdown b/sources_non_forked/vim-commentary/CONTRIBUTING.markdown
new file mode 100644
index 00000000..b3f00951
--- /dev/null
+++ b/sources_non_forked/vim-commentary/CONTRIBUTING.markdown
@@ -0,0 +1 @@
+See the [contribution guidelines for pathogen.vim](https://github.com/tpope/vim-pathogen/blob/master/CONTRIBUTING.markdown).
diff --git a/sources_non_forked/vim-commentary/README.markdown b/sources_non_forked/vim-commentary/README.markdown
index 4db3ed99..0b60009a 100644
--- a/sources_non_forked/vim-commentary/README.markdown
+++ b/sources_non_forked/vim-commentary/README.markdown
@@ -1,5 +1,4 @@
-commentary.vim
-==============
+# commentary.vim
 
 Comment stuff out.  Use `gcc` to comment out a line (takes a count),
 `gc` to comment out the target of a motion (for example, `gcap` to
@@ -15,10 +14,9 @@ minimalism, it weighs in at under 100 lines of code.
 Oh, and it uncomments, too.  The above maps actually toggle, and `gcu`
 uncomments a set of adjacent commented lines.  Install
 [repeat.vim](https://github.com/tpope/vim-repeat) to enable
-repeating `gcu` with `.` (the other maps are repeatable without it).
+repeating `gcu` with `.`.  (The other maps are repeatable without it.)
 
-Installation
-------------
+## Installation
 
 If you don't have a preferred installation method, I recommend
 installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
@@ -30,8 +28,7 @@ then simply copy and paste:
 Once help tags have been generated, you can view the manual with
 `:help commentary`.
 
-FAQ
----
+## FAQ
 
 > My favorite file type isn't supported!
 
@@ -39,14 +36,7 @@ Relax!  You just have to adjust `'commentstring'`:
 
     autocmd FileType apache set commentstring=#\ %s
 
-Contributing
-------------
-
-See the contribution guidelines for
-[pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
-
-Self-Promotion
---------------
+## Self-Promotion
 
 Like commentary.vim? Follow the repository on
 [GitHub](https://github.com/tpope/vim-commentary) and vote for it on
@@ -55,8 +45,7 @@ you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
 [Twitter](http://twitter.com/tpope) and
 [GitHub](https://github.com/tpope).
 
-License
--------
+## License
 
 Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
 See `:help license`.
diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/sources_non_forked/vim-commentary/doc/commentary.txt
index 63dbe267..e8c81ea4 100644
--- a/sources_non_forked/vim-commentary/doc/commentary.txt
+++ b/sources_non_forked/vim-commentary/doc/commentary.txt
@@ -4,7 +4,7 @@ Author:  Tim Pope <http://tpo.pe/>
 License: Same terms as Vim itself (see |license|)
 
 Comment stuff out.  Then uncomment it later.  Relies on 'commentstring' to be
-correctly set.
+correctly set, or uses b:commentary_format if it is set.
 
 The gc mappings are preferred, while the \\ mappings are provided for
 backwards compatibility.
@@ -25,4 +25,7 @@ gcc                     Comment or uncomment [count] lines.
 gcu                     Uncomment the current and adjacent commented lines.
 \\u
 
+The |User| CommentaryPost autocommand fires after a successful operation and
+can be used for advanced customization.
+
  vim:tw=78:et:ft=help:norl:
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index cc6f14b2..d7272d5b 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -1,6 +1,6 @@
 " commentary.vim - Comment stuff out
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      1.1
+" Version:      1.2
 " GetLatestVimScripts: 3695 1 :AutoInstall: commentary.vim
 
 if exists("g:loaded_commentary") || &cp || v:version < 700
@@ -8,6 +8,12 @@ if exists("g:loaded_commentary") || &cp || v:version < 700
 endif
 let g:loaded_commentary = 1
 
+function! s:surroundings() abort
+  return split(substitute(substitute(
+        \ get(b:, 'commentary_format', &commentstring)
+        \ ,'\S\zs%s',' %s','') ,'%s\ze\S', '%s ', ''), '%s', 1)
+endfunction
+
 function! s:go(type,...) abort
   if a:0
     let [lnum1, lnum2] = [a:type, a:1]
@@ -15,7 +21,7 @@ function! s:go(type,...) abort
     let [lnum1, lnum2] = [line("'["), line("']")]
   endif
 
-  let [l, r] = split(substitute(substitute(&commentstring,'\S\zs%s',' %s',''),'%s\ze\S','%s ',''),'%s',1)
+  let [l, r] = s:surroundings()
   let uncomment = 2
   for lnum in range(lnum1,lnum2)
     let line = matchstr(getline(lnum),'\S.*\s\@<!')
@@ -38,10 +44,11 @@ function! s:go(type,...) abort
     endif
     call setline(lnum,line)
   endfor
+  silent doautocmd User CommentaryPost
 endfunction
 
-function! s:undo()
-  let [l, r] = split(substitute(substitute(&commentstring,'\S\zs%s',' %s',''),'%s\ze\S','%s ',''),'%s',1)
+function! s:undo() abort
+  let [l, r] = s:surroundings()
   let lnums = [line('.')+1, line('.')-2]
   for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']]
     while lnums[index] != bound && line ==# '' || !(stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
@@ -65,7 +72,7 @@ if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
   nmap gcu <Plug>CommentaryUndo
 endif
 
-if maparg('\\','n') ==# '' && maparg('\','n') ==# ''
+if maparg('\\','n') ==# '' && maparg('\','n') ==# '' && get(g:, 'commentary_map_backslash', 1)
   xmap \\  <Plug>Commentary
   nmap \\  <Plug>Commentary
   nmap \\\ <Plug>CommentaryLine
diff --git a/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown b/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown
index 8583e1e4..e651dcae 100644
--- a/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown
+++ b/sources_non_forked/vim-fugitive/CONTRIBUTING.markdown
@@ -3,13 +3,13 @@ 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.
 
-If your [commit message sucks](http://stopwritingramblingcommitmessages.com/),
-I'm not going to accept your pull request.  I've explained very politely
-dozens of times that
-[my general guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-are absolute rules on my own repositories, so I may lack the energy to explain
-it to you yet another time.  And please, if I ask you to change something,
-`git commit --amend`.
+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
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 8ddb28da..80020dc6 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -139,6 +139,9 @@ function! fugitive#extract_git_dir(path) abort
     if index(split($GIT_CEILING_DIRECTORIES, ':'), root) >= 0
       break
     endif
+    if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
+      return $GIT_DIR
+    endif
     let dir = s:sub(root, '[\/]$', '') . '/.git'
     let type = getftype(dir)
     if type ==# 'dir' && fugitive#is_git_dir(dir)
@@ -736,14 +739,16 @@ function! s:stage_info(lnum) abort
   endwhile
   if !lnum
     return ['', '']
-  elseif getline(lnum+1) =~# '^# .*\<git \%(reset\|rm --cached\) ' || getline(lnum) ==# '# Changes to be committed:'
+  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) ==# '# 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+1) =~# '^# .*\<git add/rm ' || getline(lnum) ==# '# Unmerged paths:'
+  elseif getline(lnum+2) =~# '^# .*\<git \%(add\|rm\)' || getline(lnum) ==# '# Unmerged paths:'
     return [matchstr(filename, colon.' *\zs.*'), 'unmerged']
   else
-    return [filename, 'untracked']
+    return ['', 'unknown']
   endif
 endfunction
 
@@ -1142,7 +1147,8 @@ function! s:Edit(cmd,bang,...) abort
   endif
 
   if a:bang
-    let args = s:gsub(join(a:000, ' '), '\\@<!%(\\\\)*\zs[%#]', '\=s:buffer().expand(submatch(0))')
+    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('$')
@@ -1155,7 +1161,7 @@ function! s:Edit(cmd,bang,...) abort
       return 'redraw|echo '.string(':!'.git.' '.args)
     else
       let temp = resolve(tempname())
-      let s:temp_files[temp] = buffer.repo().dir()
+      let s:temp_files[temp] = { 'dir': buffer.repo().dir(), 'args': arglist }
       silent execute a:cmd.' '.temp
       if a:cmd =~# 'pedit'
         wincmd P
@@ -1630,7 +1636,8 @@ function! s:Blame(bang,line1,line2,count,args) abort
     else
       let cmd += ['--contents', '-']
     endif
-    let basecmd = escape(call(s:repo().git_command,cmd+['--',s:buffer().path()],s:repo()),'!')
+    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()
@@ -1671,7 +1678,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
         setlocal scrollbind nowrap nofoldenable
         let top = line('w0') + &scrolloff
         let current = line('.')
-        let s:temp_files[temp] = s:repo().dir()
+        let s:temp_files[temp] = { 'dir': s:repo().dir(), 'args': cmd }
         exe 'keepalt leftabove vsplit '.temp
         let b:fugitive_blamed_bufnr = bufnr
         let w:fugitive_leave = restore
@@ -2309,8 +2316,9 @@ augroup fugitive_temp
   autocmd!
   autocmd BufNewFile,BufReadPost *
         \ if has_key(s:temp_files,expand('<afile>:p')) |
-        \   let b:git_dir = s:temp_files[expand('<afile>:p')] |
+        \   let b:git_dir = s:temp_files[expand('<afile>:p')].dir |
         \   let b:git_type = 'temp' |
+        \   let b:git_args = s:temp_files[expand('<afile>:p')].args |
         \   call fugitive#detect(expand('<afile>:p')) |
         \   setlocal bufhidden=delete |
         \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
diff --git a/sources_non_forked/vim-golang/autoload/go/complete.vim b/sources_non_forked/vim-golang/autoload/go/complete.vim
new file mode 100644
index 00000000..8dd43de4
--- /dev/null
+++ b/sources_non_forked/vim-golang/autoload/go/complete.vim
@@ -0,0 +1,103 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" This file provides a utility function that performs auto-completion of
+" package names, for use by other commands.
+
+let s:goos = $GOOS
+let s:goarch = $GOARCH
+
+if len(s:goos) == 0
+  if exists('g:golang_goos')
+    let s:goos = g:golang_goos
+  elseif has('win32') || has('win64')
+    let s:goos = 'windows'
+  elseif has('macunix')
+    let s:goos = 'darwin'
+  else
+    let s:goos = '*'
+  endif
+endif
+
+if len(s:goarch) == 0
+  if exists('g:golang_goarch')
+    let s:goarch = g:golang_goarch
+  else
+    let s:goarch = '*'
+  endif
+endif
+
+function! go#complete#PackageMembers(package, member)
+  silent! let content = system('godoc ' . a:package)
+  if v:shell_error || !len(content)
+    return []
+  endif
+  let lines = filter(split(content, "\n"),"v:val !~ '^\\s\\+$'")
+  try
+    let mx1 = '^\s\+\(\S+\)\s\+=\s\+.*'
+    let mx2 = '^\%(const\|var\|type\|func\) \([A-Z][^ (]\+\).*'
+    let candidates =
+    \   map(filter(copy(lines), 'v:val =~ mx1'), 'substitute(v:val, mx1, "\\1", "")')
+    \ + map(filter(copy(lines), 'v:val =~ mx2'), 'substitute(v:val, mx2, "\\1", "")')
+    return filter(candidates, '!stridx(v:val, a:member)')
+  catch
+    return []
+  endtry
+endfunction
+
+function! go#complete#Package(ArgLead, CmdLine, CursorPos)
+  let dirs = []
+
+  let words = split(a:CmdLine, '\s\+', 1)
+  if len(words) > 2
+    " Complete package members
+    return go#complete#PackageMembers(words[1], words[2])
+  endif
+
+  if executable('go')
+    let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
+    if v:shell_error
+      echomsg '\'go env GOROOT\' failed'
+    endif
+  else
+    let goroot = $GOROOT
+  endif
+
+  if len(goroot) != 0 && isdirectory(goroot)
+    let dirs += [goroot]
+  endif
+
+  let pathsep = ':'
+  if s:goos == 'windows'
+    let pathsep = ';'
+  endif
+  let workspaces = split($GOPATH, pathsep)
+  if workspaces != []
+    let dirs += workspaces
+  endif
+
+  if len(dirs) == 0
+    " should not happen
+    return []
+  endif
+
+  let ret = {}
+  for dir in dirs
+    " this may expand to multiple lines
+    let root = split(expand(dir . '/pkg/' . s:goos . '_' . s:goarch), "\n")
+    call add(root, expand(dir . '/src'))
+    for r in root
+      for i in split(globpath(r, a:ArgLead.'*'), "\n")
+        if isdirectory(i)
+          let i .= '/'
+        elseif i !~ '\.a$'
+          continue
+        endif
+        let i = substitute(substitute(i[len(r)+1:], '[\\]', '/', 'g'), '\.a$', '', 'g')
+        let ret[i] = i
+      endfor
+    endfor
+  endfor
+  return sort(keys(ret))
+endfunction
diff --git a/sources_non_forked/vim-golang/compiler/go.vim b/sources_non_forked/vim-golang/compiler/go.vim
new file mode 100644
index 00000000..2c8cce49
--- /dev/null
+++ b/sources_non_forked/vim-golang/compiler/go.vim
@@ -0,0 +1,30 @@
+" Copyright 2013 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" compiler/go.vim: Vim compiler file for Go.
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "go"
+
+if exists(":CompilerSet") != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+CompilerSet makeprg=go\ build
+CompilerSet errorformat=
+        \%-G#\ %.%#,
+        \%A%f:%l:%c:\ %m,
+        \%A%f:%l:\ %m,
+        \%C%*\\s%m,
+        \%-G%.%#
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftdetect/gofiletype.vim b/sources_non_forked/vim-golang/ftdetect/gofiletype.vim
new file mode 100644
index 00000000..b658f6b0
--- /dev/null
+++ b/sources_non_forked/vim-golang/ftdetect/gofiletype.vim
@@ -0,0 +1,23 @@
+" We take care to preserve the user's fileencodings and fileformats,
+" because those settings are global (not buffer local), yet we want
+" to override them for loading Go files, which are defined to be UTF-8.
+let s:current_fileformats = ''
+let s:current_fileencodings = ''
+
+" define fileencodings to open as utf-8 encoding even if it's ascii.
+function! s:gofiletype_pre()
+  let s:current_fileformats = &g:fileformats
+  let s:current_fileencodings = &g:fileencodings
+  set fileencodings=utf-8 fileformats=unix
+  setlocal filetype=go
+endfunction
+
+" restore fileencodings as others
+function! s:gofiletype_post()
+  let &g:fileformats = s:current_fileformats
+  let &g:fileencodings = s:current_fileencodings
+endfunction
+
+au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
+au BufRead *.go call s:gofiletype_pre()
+au BufReadPost *.go call s:gofiletype_post()
diff --git a/sources_non_forked/vim-golang/ftplugin/go.vim b/sources_non_forked/vim-golang/ftplugin/go.vim
new file mode 100644
index 00000000..8066733c
--- /dev/null
+++ b/sources_non_forked/vim-golang/ftplugin/go.vim
@@ -0,0 +1,17 @@
+" Copyright 2013 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" go.vim: Vim filetype plugin for Go.
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setl com< cms<"
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/fmt.vim b/sources_non_forked/vim-golang/ftplugin/go/fmt.vim
new file mode 100644
index 00000000..359545bd
--- /dev/null
+++ b/sources_non_forked/vim-golang/ftplugin/go/fmt.vim
@@ -0,0 +1,69 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" fmt.vim: Vim command to format Go files with gofmt.
+"
+" This filetype plugin add a new commands for go buffers:
+"
+"   :Fmt
+"
+"       Filter the current Go buffer through gofmt.
+"       It tries to preserve cursor position and avoids
+"       replacing the buffer with stderr output.
+"
+" Options:
+"
+"   g:go_fmt_commands [default=1]
+"
+"       Flag to indicate whether to enable the commands listed above.
+"
+"   g:gofmt_command [default="gofmt"]
+"
+"       Flag naming the gofmt executable to use.
+"
+if exists("b:did_ftplugin_go_fmt")
+    finish
+endif
+
+if !exists("g:go_fmt_commands")
+    let g:go_fmt_commands = 1
+endif
+
+if !exists("g:gofmt_command")
+    let g:gofmt_command = "gofmt"
+endif
+
+if g:go_fmt_commands
+    command! -buffer Fmt call s:GoFormat()
+endif
+
+function! s:GoFormat()
+    let view = winsaveview()
+    silent execute "%!" . g:gofmt_command
+    if v:shell_error
+        let errors = []
+        for line in getline(1, line('$'))
+            let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
+            if !empty(tokens)
+                call add(errors, {"filename": @%,
+                                 \"lnum":     tokens[2],
+                                 \"col":      tokens[3],
+                                 \"text":     tokens[4]})
+            endif
+        endfor
+        if empty(errors)
+            % | " Couldn't detect gofmt error format, output errors
+        endif
+        undo
+        if !empty(errors)
+            call setqflist(errors, 'r')
+        endif
+        echohl Error | echomsg "Gofmt returned error" | echohl None
+    endif
+    call winrestview(view)
+endfunction
+
+let b:did_ftplugin_go_fmt = 1
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/import.vim b/sources_non_forked/vim-golang/ftplugin/go/import.vim
new file mode 100644
index 00000000..91c8697a
--- /dev/null
+++ b/sources_non_forked/vim-golang/ftplugin/go/import.vim
@@ -0,0 +1,250 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" import.vim: Vim commands to import/drop Go packages.
+"
+" This filetype plugin adds three new commands for go buffers:
+"
+"   :Import {path}
+"
+"       Import ensures that the provided package {path} is imported
+"       in the current Go buffer, using proper style and ordering.
+"       If {path} is already being imported, an error will be
+"       displayed and the buffer will be untouched.
+"
+"   :ImportAs {localname} {path}
+"
+"       Same as Import, but uses a custom local name for the package.
+"
+"   :Drop {path}
+"
+"       Remove the import line for the provided package {path}, if
+"       present in the current Go buffer.  If {path} is not being
+"       imported, an error will be displayed and the buffer will be
+"       untouched.
+"
+" If you would like to add shortcuts, you can do so by doing the following:
+"
+"   Import fmt
+"   au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR>
+"
+"   Drop fmt
+"   au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR>
+"
+"   Import the word under your cursor
+"   au Filetype go nnoremap <buffer> <LocalLeader>k
+"       \ :exe 'Import ' . expand('<cword>')<CR>
+"
+" The backslash '\' is the default maplocalleader, so it is possible that
+" your vim is set to use a different character (:help maplocalleader).
+"
+" Options:
+"
+"   g:go_import_commands [default=1]
+"
+"       Flag to indicate whether to enable the commands listed above.
+"
+if exists("b:did_ftplugin_go_import")
+    finish
+endif
+
+if !exists("g:go_import_commands")
+    let g:go_import_commands = 1
+endif
+
+if g:go_import_commands
+    command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>)
+    command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>)
+    command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>)
+endif
+
+function! s:SwitchImport(enabled, localname, path)
+    let view = winsaveview()
+    let path = a:path
+
+    " Quotes are not necessary, so remove them if provided.
+    if path[0] == '"'
+        let path = strpart(path, 1)
+    endif
+    if path[len(path)-1] == '"'
+        let path = strpart(path, 0, len(path) - 1)
+    endif
+    if path == ''
+        call s:Error('Import path not provided')
+        return
+    endif
+
+    " Extract any site prefix (e.g. github.com/).
+    " If other imports with the same prefix are grouped separately,
+    " we will add this new import with them.
+    " Only up to and including the first slash is used.
+    let siteprefix = matchstr(path, "^[^/]*/")
+
+    let qpath = '"' . path . '"'
+    if a:localname != ''
+        let qlocalpath = a:localname . ' ' . qpath
+    else
+        let qlocalpath = qpath
+    endif
+    let indentstr = 0
+    let packageline = -1 " Position of package name statement
+    let appendline = -1  " Position to introduce new import
+    let deleteline = -1  " Position of line with existing import
+    let linesdelta = 0   " Lines added/removed
+
+    " Find proper place to add/remove import.
+    let line = 0
+    while line <= line('$')
+        let linestr = getline(line)
+
+        if linestr =~# '^package\s'
+            let packageline = line
+            let appendline = line
+
+        elseif linestr =~# '^import\s\+('
+            let appendstr = qlocalpath
+            let indentstr = 1
+            let appendline = line
+            let firstblank = -1
+            let lastprefix = ""
+            while line <= line("$")
+                let line = line + 1
+                let linestr = getline(line)
+                let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)')
+                if empty(m)
+                    if siteprefix == "" && a:enabled
+                        " must be in the first group
+                        break
+                    endif
+                    " record this position, but keep looking
+                    if firstblank < 0
+                        let firstblank = line
+                    endif
+                    continue
+                endif
+                if m[1] == ')'
+                    " if there's no match, add it to the first group
+                    if appendline < 0 && firstblank >= 0
+                        let appendline = firstblank
+                    endif
+                    break
+                endif
+                let lastprefix = matchstr(m[4], "^[^/]*/")
+                if a:localname != '' && m[3] != ''
+                    let qlocalpath = printf('%-' . (len(m[3])-1) . 's %s', a:localname, qpath)
+                endif
+                let appendstr = m[2] . qlocalpath
+                let indentstr = 0
+                if m[4] == path
+                    let appendline = -1
+                    let deleteline = line
+                    break
+                elseif m[4] < path
+                    " don't set candidate position if we have a site prefix,
+                    " we've passed a blank line, and this doesn't share the same
+                    " site prefix.
+                    if siteprefix == "" || firstblank < 0 || match(m[4], "^" . siteprefix) >= 0
+                        let appendline = line
+                    endif
+                elseif siteprefix != "" && match(m[4], "^" . siteprefix) >= 0
+                    " first entry of site group
+                    let appendline = line - 1
+                    break
+                endif
+            endwhile
+            break
+
+        elseif linestr =~# '^import '
+            if appendline == packageline
+                let appendstr = 'import ' . qlocalpath
+                let appendline = line - 1
+            endif
+            let m = matchlist(linestr, '^import\(\s\+\)\(\S*\s*\)"\(.\+\)"')
+            if !empty(m)
+                if m[3] == path
+                    let appendline = -1
+                    let deleteline = line
+                    break
+                endif
+                if m[3] < path
+                    let appendline = line
+                endif
+                if a:localname != '' && m[2] != ''
+                    let qlocalpath = printf("%s %" . len(m[2])-1 . "s", a:localname, qpath)
+                endif
+                let appendstr = 'import' . m[1] . qlocalpath
+            endif
+
+        elseif linestr =~# '^\(var\|const\|type\|func\)\>'
+            break
+
+        endif
+        let line = line + 1
+    endwhile
+
+    " Append or remove the package import, as requested.
+    if a:enabled
+        if deleteline != -1
+            call s:Error(qpath . ' already being imported')
+        elseif appendline == -1
+            call s:Error('No package line found')
+        else
+            if appendline == packageline
+                call append(appendline + 0, '')
+                call append(appendline + 1, 'import (')
+                call append(appendline + 2, ')')
+                let appendline += 2
+                let linesdelta += 3
+                let appendstr = qlocalpath
+                let indentstr = 1
+            endif
+            call append(appendline, appendstr)
+            execute appendline + 1
+            if indentstr
+                execute 'normal >>'
+            endif
+            let linesdelta += 1
+        endif
+    else
+        if deleteline == -1
+            call s:Error(qpath . ' not being imported')
+        else
+            execute deleteline . 'd'
+            let linesdelta -= 1
+
+            if getline(deleteline-1) =~# '^import\s\+(' && getline(deleteline) =~# '^)'
+                " Delete empty import block
+                let deleteline -= 1
+                execute deleteline . "d"
+                execute deleteline . "d"
+                let linesdelta -= 2
+            endif
+
+            if getline(deleteline) == '' && getline(deleteline - 1) == ''
+                " Delete spacing for removed line too.
+                execute deleteline . "d"
+                let linesdelta -= 1
+            endif
+        endif
+    endif
+
+    " Adjust view for any changes.
+    let view.lnum += linesdelta
+    let view.topline += linesdelta
+    if view.topline < 0
+        let view.topline = 0
+    endif
+
+    " Put buffer back where it was.
+    call winrestview(view)
+
+endfunction
+
+function! s:Error(s)
+    echohl Error | echo a:s | echohl None
+endfunction
+
+let b:did_ftplugin_go_import = 1
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/test.sh b/sources_non_forked/vim-golang/ftplugin/go/test.sh
new file mode 100644
index 00000000..d8a5b895
--- /dev/null
+++ b/sources_non_forked/vim-golang/ftplugin/go/test.sh
@@ -0,0 +1,78 @@
+#!/bin/bash -e
+#
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Tests for import.vim.
+
+cd $(dirname $0)
+
+cat > base.go <<EOF
+package test
+
+import (
+	"bytes"
+	"io"
+	"net"
+
+	"mycorp/foo"
+)
+EOF
+
+fail=0
+
+# usage: test_one command pattern
+# Pattern is a PCRE expression that will match across lines.
+test_one() {
+  echo 2>&1 -n "$1: "
+  vim -e -s -u /dev/null -U /dev/null --noplugin -c "source import.vim" \
+    -c "$1" -c 'wq! test.go' base.go
+  # ensure blank lines are treated correctly
+  if ! gofmt test.go | cmp test.go -; then
+    echo 2>&1 "gofmt conflict"
+    gofmt test.go | diff -u test.go - | sed "s/^/	/" 2>&1
+    fail=1
+    return
+  fi
+  if ! [[ $(cat test.go) =~ $2 ]]; then
+    echo 2>&1 "$2 did not match"
+    cat test.go | sed "s/^/	/" 2>&1
+    fail=1
+    return
+  fi
+  echo 2>&1 "ok"
+}
+
+# Tests for Import
+
+test_one "Import baz" '"baz".*"bytes"'
+test_one "Import io/ioutil" '"io".*"io/ioutil".*"net"'
+test_one "Import myc" '"io".*"myc".*"net"'  # prefix of a site prefix
+test_one "Import nat" '"io".*"nat".*"net"'
+test_one "Import net/http" '"net".*"net/http".*"mycorp/foo"'
+test_one "Import zoo" '"net".*"zoo".*"mycorp/foo"'
+test_one "Import mycorp/bar" '"net".*"mycorp/bar".*"mycorp/foo"'
+test_one "Import mycorp/goo" '"net".*"mycorp/foo".*"mycorp/goo"'
+
+# Tests for Drop
+
+cat > base.go <<EOF
+package test
+
+import (
+	"foo"
+
+	"something"
+	"zoo"
+)
+EOF
+
+test_one "Drop something" '\([^"]*"foo"[^"]*"zoo"[^"]*\)'
+
+rm -f base.go test.go
+if [ $fail -gt 0 ]; then
+  echo 2>&1 "FAIL"
+  exit 1
+fi
+echo 2>&1 "PASS"
diff --git a/sources_non_forked/vim-golang/indent/go.vim b/sources_non_forked/vim-golang/indent/go.vim
new file mode 100644
index 00000000..faf4d79e
--- /dev/null
+++ b/sources_non_forked/vim-golang/indent/go.vim
@@ -0,0 +1,65 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" indent/go.vim: Vim indent file for Go.
+"
+" TODO:
+" - function invocations split across lines
+" - general line splits (line ends in an operator)
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+" C indentation is too far off useful, mainly due to Go's := operator.
+" Let's just define our own.
+setlocal nolisp
+setlocal autoindent
+setlocal indentexpr=GoIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+
+if exists("*GoIndent")
+  finish
+endif
+
+function! GoIndent(lnum)
+  let prevlnum = prevnonblank(a:lnum-1)
+  if prevlnum == 0
+    " top of file
+    return 0
+  endif
+
+  " grab the previous and current line, stripping comments.
+  let prevl = substitute(getline(prevlnum), '//.*$', '', '')
+  let thisl = substitute(getline(a:lnum), '//.*$', '', '')
+  let previ = indent(prevlnum)
+
+  let ind = previ
+
+  if prevl =~ '[({]\s*$'
+    " previous line opened a block
+    let ind += &sw
+  endif
+  if prevl =~# '^\s*\(case .*\|default\):$'
+    " previous line is part of a switch statement
+    let ind += &sw
+  endif
+  " TODO: handle if the previous line is a label.
+
+  if thisl =~ '^\s*[)}]'
+    " this line closed a block
+    let ind -= &sw
+  endif
+
+  " Colons are tricky.
+  " We want to outdent if it's part of a switch ("case foo:" or "default:").
+  " We ignore trying to deal with jump labels because (a) they're rare, and
+  " (b) they're hard to disambiguate from a composite literal key.
+  if thisl =~# '^\s*\(case .*\|default\):$'
+    let ind -= &sw
+  endif
+
+  return ind
+endfunction
diff --git a/sources_non_forked/vim-golang/mirror.txt b/sources_non_forked/vim-golang/mirror.txt
new file mode 100644
index 00000000..7fc4f60f
--- /dev/null
+++ b/sources_non_forked/vim-golang/mirror.txt
@@ -0,0 +1,6 @@
+This is a mirror of the misc/vim portion of the official Go repository. It is
+automatically updated.
+
+Any contributions or issues should be made to the official repository.
+
+http://golang.org/doc/contribute.html
diff --git a/sources_non_forked/vim-golang/plugin/godoc.vim b/sources_non_forked/vim-golang/plugin/godoc.vim
new file mode 100644
index 00000000..a145d313
--- /dev/null
+++ b/sources_non_forked/vim-golang/plugin/godoc.vim
@@ -0,0 +1,130 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" godoc.vim: Vim command to see godoc.
+"
+"
+" Commands:
+"
+"   :Godoc
+"
+"       Open the relevant Godoc for either the word[s] passed to the command or
+"       the, by default, the word under the cursor.
+"
+" Options:
+"
+"   g:go_godoc_commands [default=1]
+"
+"       Flag to indicate whether to enable the commands listed above.
+
+if exists("g:loaded_godoc")
+  finish
+endif
+let g:loaded_godoc = 1
+
+let s:buf_nr = -1
+let s:last_word = ''
+
+if !exists('g:go_godoc_commands')
+  let g:go_godoc_commands = 1
+endif
+
+if g:go_godoc_commands
+  command! -nargs=* -range -complete=customlist,go#complete#Package Godoc :call s:Godoc(<f-args>)
+endif
+
+nnoremap <silent> <Plug>(godoc-keyword) :<C-u>call <SID>Godoc('')<CR>
+
+function! s:GodocView()
+  if !bufexists(s:buf_nr)
+    leftabove new
+    file `="[Godoc]"`
+    let s:buf_nr = bufnr('%')
+  elseif bufwinnr(s:buf_nr) == -1
+    leftabove split
+    execute s:buf_nr . 'buffer'
+    delete _
+  elseif bufwinnr(s:buf_nr) != bufwinnr('%')
+    execute bufwinnr(s:buf_nr) . 'wincmd w'
+  endif
+
+  setlocal filetype=godoc
+  setlocal bufhidden=delete
+  setlocal buftype=nofile
+  setlocal noswapfile
+  setlocal nobuflisted
+  setlocal modifiable
+  setlocal nocursorline
+  setlocal nocursorcolumn
+  setlocal iskeyword+=:
+  setlocal iskeyword-=-
+
+  nnoremap <buffer> <silent> K :Godoc<cr>
+
+  au BufHidden <buffer> call let <SID>buf_nr = -1
+endfunction
+
+function! s:GodocWord(word)
+  if !executable('godoc')
+    echohl WarningMsg
+    echo "godoc command not found."
+    echo "  install with: go get code.google.com/p/go.tools/cmd/godoc"
+    echohl None
+    return 0
+  endif
+  let word = a:word
+  silent! let content = system('godoc ' . word)
+  if v:shell_error || !len(content)
+    if len(s:last_word)
+      silent! let content = system('godoc ' . s:last_word.'/'.word)
+      if v:shell_error || !len(content)
+        echo 'No documentation found for "' . word . '".'
+        return 0
+      endif
+      let word = s:last_word.'/'.word
+    else
+      echo 'No documentation found for "' . word . '".'
+      return 0
+    endif
+  endif
+  let s:last_word = word
+  silent! call s:GodocView()
+  setlocal modifiable
+  silent! %d _
+  silent! put! =content
+  silent! normal gg
+  setlocal nomodifiable
+  setfiletype godoc
+  return 1
+endfunction
+
+function! s:Godoc(...)
+  if !len(a:000)
+    let oldiskeyword = &iskeyword
+    setlocal iskeyword+=.
+    let word = expand('<cword>')
+    let &iskeyword = oldiskeyword
+    let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g')
+    let words = split(word, '\.\ze[^./]\+$')
+  else
+    let words = a:000
+  endif
+  if !len(words)
+    return
+  endif
+  if s:GodocWord(words[0])
+    if len(words) > 1
+      if search('^\%(const\|var\|type\|\s\+\) ' . words[1] . '\s\+=\s')
+        return
+      endif
+      if search('^func ' . words[1] . '(')
+        silent! normal zt
+        return
+      endif
+      echo 'No documentation found for "' . words[1] . '".'
+    endif
+  endif
+endfunction
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/readme.txt b/sources_non_forked/vim-golang/readme.txt
new file mode 100644
index 00000000..b8469f92
--- /dev/null
+++ b/sources_non_forked/vim-golang/readme.txt
@@ -0,0 +1,101 @@
+Vim plugins for Go (http://golang.org)
+======================================
+
+To use all the Vim plugins, add these lines to your $HOME/.vimrc.
+
+  " Some Linux distributions set filetype in /etc/vimrc.
+  " Clear filetype flags before changing runtimepath to force Vim to reload them.
+  filetype off
+  filetype plugin indent off
+  set runtimepath+=$GOROOT/misc/vim
+  filetype plugin indent on
+  syntax on
+
+If you want to select fewer plugins, use the instructions in the rest of
+this file.
+
+A popular configuration is to gofmt Go source files when they are saved.
+To do that, add this line to the end of your $HOME/.vimrc.
+
+  autocmd FileType go autocmd BufWritePre <buffer> Fmt
+
+
+Vim syntax highlighting
+-----------------------
+
+To install automatic syntax highlighting for GO programs:
+
+  1. Copy or link the filetype detection script to the ftdetect directory
+     underneath your vim runtime directory (normally $HOME/.vim/ftdetect)
+  2. Copy or link syntax/go.vim to the syntax directory underneath your vim
+     runtime directory (normally $HOME/.vim/syntax). Linking this file rather
+     than just copying it will ensure any changes are automatically reflected
+     in your syntax highlighting.
+  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
+
+     syntax on
+
+In a typical unix environment you might accomplish this using the following
+commands:
+
+  mkdir -p $HOME/.vim/ftdetect
+  mkdir -p $HOME/.vim/syntax
+  mkdir -p $HOME/.vim/autoload/go
+  ln -s $GOROOT/misc/vim/ftdetect/gofiletype.vim $HOME/.vim/ftdetect/
+  ln -s $GOROOT/misc/vim/syntax/go.vim $HOME/.vim/syntax
+  ln -s $GOROOT/misc/vim/autoload/go/complete.vim $HOME/.vim/autoload/go
+  echo "syntax on" >> $HOME/.vimrc
+
+
+Vim filetype plugins
+--------------------
+
+To install one of the available filetype plugins:
+
+  1. Same as 1 above.
+  2. Copy or link ftplugin/go.vim to the ftplugin directory underneath your vim
+     runtime directory (normally $HOME/.vim/ftplugin). Copy or link one or more
+     additional plugins from ftplugin/go/*.vim to the Go-specific subdirectory
+     in the same place ($HOME/.vim/ftplugin/go/*.vim).
+  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
+
+     filetype plugin on
+
+
+Vim indentation plugin
+----------------------
+
+To install automatic indentation:
+
+  1. Same as 1 above.
+  2. Copy or link indent/go.vim to the indent directory underneath your vim
+     runtime directory (normally $HOME/.vim/indent).
+  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
+
+     filetype indent on
+
+
+Vim compiler plugin
+-------------------
+
+To install the compiler plugin:
+
+  1. Same as 1 above.
+  2. Copy or link compiler/go.vim to the compiler directory underneath your vim
+     runtime directory (normally $HOME/.vim/compiler).
+  3. Activate the compiler plugin with ":compiler go". To always enable the
+     compiler plugin in Go source files add an autocommand to your .vimrc file
+     (normally $HOME/.vimrc):
+
+     autocmd FileType go compiler go
+
+
+Godoc plugin
+------------
+
+To install godoc plugin:
+
+  1. Same as 1 above.
+  2. Copy or link plugin/godoc.vim to $HOME/.vim/plugin/godoc,
+     syntax/godoc.vim to $HOME/.vim/syntax/godoc.vim,
+     and autoload/go/complete.vim to $HOME/.vim/autoload/go/complete.vim.
diff --git a/sources_non_forked/vim-golang/syntax/go.vim b/sources_non_forked/vim-golang/syntax/go.vim
new file mode 100644
index 00000000..1ce6cb27
--- /dev/null
+++ b/sources_non_forked/vim-golang/syntax/go.vim
@@ -0,0 +1,207 @@
+" Copyright 2009 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" go.vim: Vim syntax file for Go.
+"
+" Options:
+"   There are some options for customizing the highlighting; the recommended
+"   settings are the default values, but you can write:
+"     let OPTION_NAME = 0
+"   in your ~/.vimrc file to disable particular options. You can also write:
+"     let OPTION_NAME = 1
+"   to enable particular options. At present, all options default to on.
+"
+"   - go_highlight_array_whitespace_error
+"     Highlights white space after "[]".
+"   - go_highlight_chan_whitespace_error
+"     Highlights white space around the communications operator that don't follow
+"     the standard style.
+"   - go_highlight_extra_types
+"     Highlights commonly used library types (io.Reader, etc.).
+"   - go_highlight_space_tab_error
+"     Highlights instances of tabs following spaces.
+"   - go_highlight_trailing_whitespace_error
+"     Highlights trailing white space.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("go_highlight_array_whitespace_error")
+  let go_highlight_array_whitespace_error = 1
+endif
+if !exists("go_highlight_chan_whitespace_error")
+  let go_highlight_chan_whitespace_error = 1
+endif
+if !exists("go_highlight_extra_types")
+  let go_highlight_extra_types = 1
+endif
+if !exists("go_highlight_space_tab_error")
+  let go_highlight_space_tab_error = 1
+endif
+if !exists("go_highlight_trailing_whitespace_error")
+  let go_highlight_trailing_whitespace_error = 1
+endif
+
+syn case match
+
+syn keyword     goDirective         package import
+syn keyword     goDeclaration       var const type
+syn keyword     goDeclType          struct interface
+
+hi def link     goDirective         Statement
+hi def link     goDeclaration       Keyword
+hi def link     goDeclType          Keyword
+
+" Keywords within functions
+syn keyword     goStatement         defer go goto return break continue fallthrough
+syn keyword     goConditional       if else switch select
+syn keyword     goLabel             case default
+syn keyword     goRepeat            for range
+
+hi def link     goStatement         Statement
+hi def link     goConditional       Conditional
+hi def link     goLabel             Label
+hi def link     goRepeat            Repeat
+
+" Predefined types
+syn keyword     goType              chan map bool string error
+syn keyword     goSignedInts        int int8 int16 int32 int64 rune
+syn keyword     goUnsignedInts      byte uint uint8 uint16 uint32 uint64 uintptr
+syn keyword     goFloats            float32 float64
+syn keyword     goComplexes         complex64 complex128
+
+hi def link     goType              Type
+hi def link     goSignedInts        Type
+hi def link     goUnsignedInts      Type
+hi def link     goFloats            Type
+hi def link     goComplexes         Type
+
+" Treat func specially: it's a declaration at the start of a line, but a type
+" elsewhere. Order matters here.
+syn match       goType              /\<func\>/
+syn match       goDeclaration       /^func\>/
+
+" Predefined functions and values
+syn keyword     goBuiltins          append cap close complex copy delete imag len
+syn keyword     goBuiltins          make new panic print println real recover
+syn keyword     goConstants         iota true false nil
+
+hi def link     goBuiltins          Keyword
+hi def link     goConstants         Keyword
+
+" Comments; their contents
+syn keyword     goTodo              contained TODO FIXME XXX BUG
+syn cluster     goCommentGroup      contains=goTodo
+syn region      goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell
+syn region      goComment           start="//" end="$" contains=@goCommentGroup,@Spell
+
+hi def link     goComment           Comment
+hi def link     goTodo              Todo
+
+" Go escapes
+syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
+syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
+syn match       goEscapeX           display contained "\\x\x\{2}"
+syn match       goEscapeU           display contained "\\u\x\{4}"
+syn match       goEscapeBigU        display contained "\\U\x\{8}"
+syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
+
+hi def link     goEscapeOctal       goSpecialString
+hi def link     goEscapeC           goSpecialString
+hi def link     goEscapeX           goSpecialString
+hi def link     goEscapeU           goSpecialString
+hi def link     goEscapeBigU        goSpecialString
+hi def link     goSpecialString     Special
+hi def link     goEscapeError       Error
+
+" Strings and their contents
+syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
+syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+syn region      goRawString         start=+`+ end=+`+
+
+hi def link     goString            String
+hi def link     goRawString         String
+
+" Characters; their contents
+syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
+syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
+
+hi def link     goCharacter         Character
+
+" Regions
+syn region      goBlock             start="{" end="}" transparent fold
+syn region      goParen             start='(' end=')' transparent
+
+" Integers
+syn match       goDecimalInt        "\<\d\+\([Ee]\d\+\)\?\>"
+syn match       goHexadecimalInt    "\<0x\x\+\>"
+syn match       goOctalInt          "\<0\o\+\>"
+syn match       goOctalError        "\<0\o*[89]\d*\>"
+
+hi def link     goDecimalInt        Integer
+hi def link     goHexadecimalInt    Integer
+hi def link     goOctalInt          Integer
+hi def link     Integer             Number
+
+" Floating point
+syn match       goFloat             "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\d\+[Ee][-+]\d\+\>"
+
+hi def link     goFloat             Float
+
+" Imaginary literals
+syn match       goImaginary         "\<\d\+i\>"
+syn match       goImaginary         "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\d\+[Ee][-+]\d\+i\>"
+
+hi def link     goImaginary         Number
+
+" Spaces after "[]"
+if go_highlight_array_whitespace_error != 0
+  syn match goSpaceError display "\(\[\]\)\@<=\s\+"
+endif
+
+" Spacing errors around the 'chan' keyword
+if go_highlight_chan_whitespace_error != 0
+  " receive-only annotation on chan type
+  syn match goSpaceError display "\(<-\)\@<=\s\+\(chan\>\)\@="
+  " send-only annotation on chan type
+  syn match goSpaceError display "\(\<chan\)\@<=\s\+\(<-\)\@="
+  " value-ignoring receives in a few contexts
+  syn match goSpaceError display "\(\(^\|[={(,;]\)\s*<-\)\@<=\s\+"
+endif
+
+" Extra types commonly seen
+if go_highlight_extra_types != 0
+  syn match goExtraType /\<bytes\.\(Buffer\)\>/
+  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+  syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
+  syn match goExtraType /\<unsafe\.Pointer\>/
+endif
+
+" Space-tab error
+if go_highlight_space_tab_error != 0
+  syn match goSpaceError display " \+\t"me=e-1
+endif
+
+" Trailing white space error
+if go_highlight_trailing_whitespace_error != 0
+  syn match goSpaceError display excludenl "\s\+$"
+endif
+
+hi def link     goExtraType         Type
+hi def link     goSpaceError        Error
+
+" Search backwards for a global declaration to start processing the syntax.
+"syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
+
+" There's a bug in the implementation of grouphere. For now, use the
+" following as a more expensive/less precise workaround.
+syn sync minlines=500
+
+let b:current_syntax = "go"
diff --git a/sources_non_forked/vim-golang/syntax/godoc.vim b/sources_non_forked/vim-golang/syntax/godoc.vim
new file mode 100644
index 00000000..bd4443f7
--- /dev/null
+++ b/sources_non_forked/vim-golang/syntax/godoc.vim
@@ -0,0 +1,20 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+syn match  godocTitle "^\([A-Z][A-Z ]*\)$"
+
+command -nargs=+ HiLink hi def link <args>
+
+HiLink godocTitle Title
+
+delcommand HiLink
+
+let b:current_syntax = "godoc"
+
+" vim:ts=4 sts=2 sw=2:
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 42a5f82e..4e16a923 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -640,27 +640,30 @@ fun! snipMate#ScopesByFile()
 endf
 
 " used by both: completion and insert snippet
-fun! snipMate#GetSnippetsForWordBelowCursor(word, suffix, break_on_first_match)
+fun! snipMate#GetSnippetsForWordBelowCursor(word, exact)
 	" Setup lookups: '1.2.3' becomes [1.2.3] + [3, 2.3]
 	let parts = split(a:word, '\W\zs')
 	if len(parts) > 2
 		let parts = parts[-2:] " max 2 additional items, this might become a setting
 	endif
-	let lookups = [a:word.a:suffix]
+	let lookups = [a:word]
 	let lookup = ''
 	for w in reverse(parts)
 		let lookup = w . lookup
 		if index(lookups, lookup) == -1
-			call add(lookups, lookup.a:suffix)
+			call add(lookups, lookup)
 		endif
 	endfor
 
 	" allow matching '.'
 	if a:word =~ '\.$'
-		call add(lookups, '.'.a:suffix)
+		call add(lookups, '.')
 	endif
 
-	call filter(lookups, 'v:val != ""')
+	" Remove empty lookup entries, but only if there are other nonempty lookups
+	if len(lookups) > 1
+		call filter(lookups, 'v:val != ""')
+	endif
 
 	let matching_snippets = []
 	let snippet = ''
@@ -668,12 +671,14 @@ fun! snipMate#GetSnippetsForWordBelowCursor(word, suffix, break_on_first_match)
 	for word in lookups
 		let s:c.word = word
 		for [k,snippetD] in items(funcref#Call(s:c['get_snippets'], [snipMate#ScopesByFile(), word]))
-			if a:suffix == ''
-				" hack: require exact match
-				if k !=# word | continue | endif
+			" hack: require exact match
+			if a:exact && k !=# word
+				continue
 			endif
 			call add(matching_snippets, [k, snippetD])
-			if a:break_on_first_match | break| endif
+			if a:exact
+				break
+			endif
 		endfor
 	endfor
 	return matching_snippets
@@ -708,7 +713,7 @@ fun! snipMate#WordBelowCursor()
 endf
 
 fun! snipMate#GetSnippetsForWordBelowCursorForComplete(word)
-	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(a:word, '*', 0), 'v:val[0]')
+	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(a:word, 0), 'v:val[0]')
 	return filter(snippets, 'v:val =~# "\\V\\^' . escape(a:word, '"\') . '"')
 endf
 
@@ -769,7 +774,7 @@ function! snipMate#TriggerSnippet(...)
 	endif
 
 	let word = matchstr(getline('.'), '\S\+\%'.col('.').'c')
-	let list = snipMate#GetSnippetsForWordBelowCursor(word, '',  1)
+	let list = snipMate#GetSnippetsForWordBelowCursor(word, 1)
 	if empty(list)
 		let snippet = ''
 	else
diff --git a/sources_non_forked/vim-snippets/AUTHORS b/sources_non_forked/vim-snippets/AUTHORS
deleted file mode 100644
index c5c68c6a..00000000
--- a/sources_non_forked/vim-snippets/AUTHORS
+++ /dev/null
@@ -1,45 +0,0 @@
-Aaron Broder
-Adam Folmert
-Alberto Pose
-Angel Alonso
-Ben Orenstein
-Bill Casarin
-Christopher Joslyn
-Daniel Hahler
-Elliot Murphy
-Eustaquio Rangel
-Henrik Nyh
-Honza Pokorny
-Iuri Fernandes Queiroz
-Jakub Nawalaniec
-James F. Herdman
-Jon Bernard
-Kozo NISHIDA
-Leandro Pincini
-Marc Weber
-Marcin Kulik
-Marjan.Hratson
-Micah Elliott
-Michael Sanders
-Naveed Massjouni
-Rob Hudson
-Rok Garbas
-Sebastian Schulze
-Srushti Ambekallu
-Stephen Tudor
-Steven Oliver
-Stuart Colville
-Tom Adams
-Zied ABID
-fo60213
-marutanm
-msanders
-Povilas Balzaravičius Pawka
-Dmitry Dementev
-Travis Holton
-Chrisyue
-Erik Westrup
-Matt Deacalion Stevens
-
-TODO: add contributors from github.com/SirVer/Ultisnip having contributed to
-github.com/SirVer/Ultisnip/UltiSnips/* files
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 64733ebc..7a94766f 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -1,5 +1,3 @@
-IMPORTANT: comment on: [What about merging with Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
-
 Snipmate & UltiSnip Snippets
 ============================
 
@@ -9,51 +7,48 @@ 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
+- `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/garbas/vim-snipmate:
-      VimL, snipmate-snippets, engine sometimes behaves strange, supports
-      rewriting snippets on the fly (eg adding a second version with folding
-      markers)
+- [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 completness)
+ 
+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
 
-    github.com/MarcWeber/UltiSnips:
-      python, snipmate-snippets and UltiSnips-snippets
+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).
 
-    github.com/SirVer/ultisnips:
-      python, UltiSnips-snippets
-
-    github.com/Shougo/neosnippet:
-      viml, has a compatible mode allowing to reuse most snipmate snippets ?
-
-    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 completness)
-
-    This tries to be a more comprehensive list (which still is incomplete)
-    http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
-
-UltiSnips engine has additional features such as "nested snippets".
-
-Which one to use? If you have python give MarcWeber/UltiSnips a try because its
-fast and supports all important features. You can prefer the UltiSnip versions
-of the snippets by setting the "always_use_first_snippet" option to 1.
+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 and cope with the minor bugs found in the engine.
+[garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
+minor bugs found in the engine.
 
 
 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
@@ -84,7 +79,8 @@ If you still have trouble getting this to work create a github ticket, ask on
 irc or the mailinglist.
 
 Policies / for contributors
-===========================
+---------------------------
+
 Some snippets are useful for almost all languages, so let's try to have the same
 triggers for them:
 
@@ -96,11 +92,7 @@ el  : else ..
 wh  : while (cond) ...
 ```
 
-If you're not satisfied with these defaults, open a ticket that we implement
-aliasing. Then you can remap "else" to "el" or the like.
-
-
-Don't add stupid placeholder default texts like
+Don't add useless placeholder default texts like
 ```
 if (${1:condition}){
   ${2:some code here}
@@ -127,7 +119,7 @@ Discuss at: https://github.com/honza/vim-snippets/issues/230
 
 
 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:
 
@@ -138,15 +130,15 @@ so that all users can benefit from them.  People can list their snippet reposito
 
 Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
-
 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
@@ -170,17 +162,6 @@ let g:snipMate.scope_aliases = {}
 let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
 ```
 
-or github.com/MarcWeber/UltiSnips this way:
-
-
-```vim
-let g:UltiSnips = {}
-
-let g:UltiSnips.snipmate_ft_filter = {
-            \ 'default' : {'filetypes': ["FILETYPE"] },
-            \ 'ruby'    : {'filetypes': ["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.
 
@@ -192,16 +173,15 @@ ruby-library-version triplet. Sometimes postfixing a name such as
 
 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 stop again
-at will. So its ok if people maintain a language only for a short period of
-time - or jump in and get things done - don't let the flow stop :)
-vim-snippets is not like the "linux kernel".
+Notes: People are interested in snippets - and their interest may wane again.
+This list is kept up-to-date on a best effort basis.
 
 * Python - [honza](http://github.com/honza)
 * Javascript - [honza](http://github.com/honza)
@@ -220,18 +200,13 @@ 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.
 
-Because MarcWeber/UltiSnips [6] supports also snipmate-snippets there is no
-need to duplicate all snippets - only those snippets who use advanced UltiSnips
-features should be duplicated in UltiSnips (?)
+Because UltiSnips reads snipmate-snippets too there is no need to duplicate all
+snippets - only those snippets who use advanced UltiSnips features should be
+duplicated in UltiSnips.
 
 Currently all snippets from UltiSnips have been put into UltiSnips - some work
 on merging should be done (dropping duplicates etc)
 
-Authors
--------
-
-For a list of authors, please see the `AUTHORS` files.
-
 License
 -------
 
@@ -243,5 +218,4 @@ terms of the MIT license.
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
-[6]: http://github.com/MarcWeber/UltiSnips
 [7]: http://github.com/SirVer/ultisnips
diff --git a/sources_non_forked/vim-snippets/UltiSnips/README b/sources_non_forked/vim-snippets/UltiSnips/README
index eafd0866..41d85923 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/README
+++ b/sources_non_forked/vim-snippets/UltiSnips/README
@@ -1,4 +1,5 @@
-This directory contains the main scripts that come bundled with UltiSnips.
+This directory contains the snippets for UltiSnips.
+https://github.com/sirver/ultisnips
 
 Standing On The Shoulders of Giants
 ===================================
@@ -10,12 +11,7 @@ two projects:
    TextMate: http://svn.textmate.org/trunk/Bundles/
    SnipMate: http://code.google.com/p/snipmate/
 
-All snippets from those sources were copied and cleaned up, so that they are 
-  - not using shell script, only python (so they are cross platform compatible)
-  - not using any feature that UltiSnips doesn't offer
-
-UltiSnips has seen contributions by various individuals. Those contributions
-have been merged into this collection seamlessly and without further comments.
+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/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index 8844e281..532010e7 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -1,6 +1,11 @@
 # 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 #
 ##############
@@ -12,71 +17,62 @@ Automatically filled during usage"""
 _commentDict = { }
 
 def _parse_comments(s):
-    """ Parses vim's comments option to extract comment format """
-    i = iter(s.split(","))
+	""" 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 = i.next().split(':', 1)
+	rv = []
+	try:
+		while True:
+			# get the flags and text of a comment part
+			flags, text = next(i).split(':', 1)
 
-            if len(flags) == 0:
-                if len(text) == 1:
-                    rv.append((text,text,text, ""))
-            # parse 3-part comment, but ignore those with O flag
-            elif flags[0] == 's' and 'O' not in flags:
-                ctriple = []
-                indent = ""
+			if len(flags) == 0:
+				rv.append((text, text, text, ""))
+			# parse 3-part comment, but ignore those with O flag
+			elif flags[0] == 's' and 'O' not in flags:
+				ctriple = []
+				indent = ""
 
-                if flags[-1] in string.digits:
-                    indent = " " * int(flags[-1])
-                ctriple.append(text)
+				if flags[-1] in string.digits:
+					indent = " " * int(flags[-1])
+				ctriple.append(text)
 
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'm')
-                ctriple.append(text)
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'm')
+				ctriple.append(text)
 
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'e')
-                ctriple.append(text)
-                ctriple.append(indent)
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'e')
+				ctriple.append(text)
+				ctriple.append(indent)
 
-                rv.append(ctriple)
-
-            elif flags[0] == 'b':
-                if len(text) == 1:
-                    rv.insert(0, (text,text,text, ""))
-
-    except StopIteration:
-       return rv
+				rv.append(ctriple)
+			elif flags[0] == 'b':
+				if len(text) == 1:
+					rv.insert(0, (text,text,text, ""))
+	except StopIteration:
+		return rv
 
 def _get_comment_format():
-    """ Returns a 4-element tuple representing the comment format for
-    the current file. """
-
-    ft = vim.eval("&filetype")
-    # check if the comment dict has the format for the current file
-    if _commentDict.has_key(ft):
-        return _commentDict[ft]
-
-    # otherwise parse vim's comments and add it for later use
-    commentformat = _parse_comments(vim.eval("&comments"))[0]
-    _commentDict[ft] = commentformat
-
-    return commentformat
+	""" Returns a 4-element tuple representing the comment format for
+	the current file. """
+	return _parse_comments(vim.eval("&comments"))[0]
 
 
-def make_box(twidth, bwidth = None):
-   if bwidth is None:
-      bwidth = twidth + 2
-   b,m,e,i = _get_comment_format()
-   sline = b + m + bwidth*m + 2*m
-   nspaces = (bwidth - twidth)//2 
-   mlines = i + m + " " + " "*nspaces
-   mlinee = " " + " "*(bwidth-twidth-nspaces) + m
-   eline = i + 2*m + bwidth*m + m + e
-   return sline, mlines, mlinee, eline
+def make_box(twidth, bwidth=None):
+	b, m, e, i = _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(",")
+
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -91,14 +87,29 @@ endsnippet
 
 snippet bbox "A nice box over the full width" b
 `!p
-box = make_box(len(t[1]), 71)
+width = int(vim.eval("&textwidth")) or 71
+box = make_box(len(t[1]), width)
 snip.rv = box[0] + '\n' + box[1]
 `${1:content}`!p
-box = make_box(len(t[1]), 71)
+box = make_box(len(t[1]), width)
 snip.rv = box[2] + '\n' + 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 #
 ##########################
diff --git a/sources_non_forked/vim-snippets/UltiSnips/bib.snippets b/sources_non_forked/vim-snippets/UltiSnips/bib.snippets
new file mode 100644
index 00000000..c9b8df5c
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets b/sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets
index 034ccdec..b8ab0dfd 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/bindzone.snippets
@@ -1,27 +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")
+	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 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.
+				IN		NS				ns01.$1.
+				IN		MX		10		mail.$1.
 
-ns01.$1         IN      A       
-mail.$1         IN      A   
+ns01.$1			IN		A
+mail.$1			IN		A
 endsnippet
 
 snippet A "Insert A Record" b
-${1:hostname}   IN      A   ${2:ip}
+${1:hostname}	IN		A	${2:ip}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/c.snippets b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
index 062a36ae..5b8eae84 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/c.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
@@ -2,6 +2,8 @@
 #                            TextMate Snippets                            #
 ###########################################################################
 
+priority -50
+
 snippet def "#define ..."
 #define ${1}
 endsnippet
@@ -12,9 +14,9 @@ snippet ifndef "#ifndef ... #define ... #endif"
 #endif
 endsnippet
 
-snippet #if "#if #endif" !b
+snippet #if "#if #endif" b
 #if ${1:0}
-${VISUAL:code}$0
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
 #endif
 endsnippet
 
@@ -36,17 +38,24 @@ $0
 endsnippet
 
 snippet main "main() (main)"
-int main(int argc, char const *argv[])
+int main(int argc, char *argv[])
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 	return 0;
 }
 endsnippet
 
-snippet for "for int loop (fori)"
-for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+snippet for "for loop (for)"
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet fori "for int loop (fori)"
+for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }
 endsnippet
 
@@ -62,7 +71,7 @@ if not snip.c:
 	rand = ''.join(random.sample(string.ascii_letters+string.digits, 8))
 	snip.rv = ('%s_%s' % (name,rand)).upper()
 else:
-    snip.rv = snip.c`}
+	snip.rv = snip.c`}
 #define $1
 
 ${0}
@@ -75,9 +84,15 @@ snippet td "Typedef"
 typedef ${1:int} ${2:MyCustomType};
 endsnippet
 
+snippet wh "while loop"
+while(${1:/* condition */}) {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
 snippet do "do...while loop (do)"
 do {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 } while(${1:/* condition */});
 endsnippet
 
@@ -88,18 +103,30 @@ endsnippet
 snippet if "if .. (if)"
 if (${1:/* condition */})
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)"
+else {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)"
+else if (${1:/* condition */}) {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }
 endsnippet
 
 snippet ife "if .. else (ife)"
 if (${1:/* condition */})
 {
-        ${2:/* code */}
+	${2:/* code */}
 }
 else
 {
-        ${3:/* else */}
+	${3:/* else */}
 }
 endsnippet
 
@@ -114,4 +141,15 @@ struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`}
 };
 endsnippet
 
+snippet fun "function" b
+${1:void} ${2:function_name}(${3})
+{
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet fund "function declaration" b
+${1:void} ${2:function_name}(${3});
+endsnippet
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
index 68d40349..467b2b57 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
@@ -1,5 +1,4 @@
-# From the TextMate bundle
-# with some modification
+priority -50
 
 snippet fun "Function" b
 ${1:name} = `!p snip.rv = "(" if t[2] else ""`${2:args}`!p snip.rv = ") " if t[2] else ""`->
@@ -10,52 +9,52 @@ 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"
+snippet if "If" b
 if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ife "If .. Else"
+snippet ife "If .. Else" b
 if ${1:condition}
 	${2:# body...}
 else
 	${3:# body...}
 endsnippet
 
-snippet eif "Else if" b
+snippet elif "Else if" b
 else if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ifte "Ternary if"
+snippet ifte "Ternary if" b
 if ${1:condition} then ${2:value} else ${3:other}
 endsnippet
 
-snippet unl "Unless"
+snippet unl "Unless" b
 ${1:action} unless ${2:condition}
 endsnippet
 
-snippet fora "Array Comprehension"
+snippet fora "Array Comprehension" b
 for ${1:name} in ${2:array}
 	${0:# body...}
 endsnippet
 
-snippet foro "Object Comprehension"
+snippet foro "Object Comprehension" b
 for ${1:key}, ${2:value} of ${3:Object}
 	${0:# body...}
 endsnippet
 
-snippet forr "Range Comprehension (inclusive)"
+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)"
+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"
+snippet swi "Switch" b
 switch ${1:object}
 	when ${2:value}
 		${3:# body...}
@@ -63,7 +62,7 @@ switch ${1:object}
 		$0
 endsnippet
 
-snippet swit "Switch when .. then"
+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}
@@ -77,7 +76,7 @@ class ${1:ClassName}`!p snip.rv = " extends " if t[2] else ""`${2:Ancestor}
 	$0
 endsnippet
 
-snippet try "Try .. Catch"
+snippet try "Try .. Catch" b
 try
 	$1
 catch ${2:error}
@@ -95,4 +94,3 @@ endsnippet
 snippet log "Log" b
 console.log ${1:"${2:msg}"}
 endsnippet
-
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets
index 47d1e6b5..0dd35cd6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets
@@ -2,8 +2,12 @@
 # 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
@@ -160,4 +164,3 @@ endsnippet
 snippet noscw "expect was not called with (coffee)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments})
 endsnippet
-
diff --git a/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets b/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
index 6999c1f9..3d79a64e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
@@ -1,3 +1,10 @@
+priority -50
+
+extends c
+
+# We want to overwrite everything in parent ft.
+priority -49
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -20,7 +27,7 @@ endsnippet
 snippet ns "namespace .. (namespace)"
 namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 {
-	$0
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/cs.snippets b/sources_non_forked/vim-snippets/UltiSnips/cs.snippets
new file mode 100644
index 00000000..aca245e5
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/cs.snippets
@@ -0,0 +1,328 @@
+#######################################################################
+#                      C# Snippets for UltiSnips                      #
+#######################################################################
+
+priority -50
+
+#########################
+#  classes and structs  #
+#########################
+
+snippet namespace "namespace" b
+namespace ${1:MyNamespace}
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet class "class" w
+class ${1: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 ${1}Exception("${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
+
+# 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
+
+
+##################
+#  full 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
+
+
+##############
+#  comments  #
+##############
+
+snippet /// "XML comment" b
+/// <summary>
+/// $1
+/// </summary>
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/css.snippets b/sources_non_forked/vim-snippets/UltiSnips/css.snippets
index d14d51c0..32c3f217 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/css.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/css.snippets
@@ -2,6 +2,8 @@
 #                    Most of these came from TextMate                     #
 ###########################################################################
 
+priority -50
+
 snippet ! "!important CSS (!)"
 ${1:!important}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/d.snippets b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
index 7f38c6d8..99da292e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/d.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
@@ -1,5 +1,7 @@
 # Simple shortcuts
 
+priority -50
+
 snippet imp "import (imp)" b
 import ${1:std.stdio};
 endsnippet
@@ -42,22 +44,22 @@ endsnippet
 
 snippet pub "public (pub)" b
 public:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet priv "private (priv)" b
 private:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet prot "protected (prot)" b
 protected:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet pack "package (pack)" b
 package:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet ret "return (ret)"
@@ -96,7 +98,7 @@ endsnippet
 
 snippet enf "enforce (enf)" b
 enforce(${1:/*condition*/},
-        new ${2}Exception(${3:/*args*/}));
+	new ${2}Exception(${3:/*args*/}));
 endsnippet
 
 # Branches
@@ -104,67 +106,67 @@ endsnippet
 snippet if "if .. (if)"
 if(${1:/*condition*/})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet ife "if .. else (ife)" b
 if(${1:/*condition*/})
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 else
 {
-    ${3:/*else*/}
+	${3:/*else*/}
 }
 endsnippet
 
 snippet el "else (el)" b
 else
 {
-    ${VISUAL}${1:/*code*/}
+	${VISUAL}${1:/*code*/}
 }
 endsnippet
 
-snippet eif "else if (elif)" b
+snippet elif "else if (elif)" b
 else if(${1:/*condition*/})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet sw "switch (sw)"
 switch(${1:/*var*/})
 {
-    case ${2:/*value*/}:
-        ${3:/*code*/}
-        break;
-    case ${4:/*value*/}:
-        ${5:/*code*/}
-        break;
-    ${7:/*more cases*/}
-    default:
-        ${6:assert(false);}
+	case ${2:/*value*/}:
+		${3:/*code*/}
+		break;
+	case ${4:/*value*/}:
+		${5:/*code*/}
+		break;
+	${7:/*more cases*/}
+	default:
+		${6:assert(false);}
 }
 endsnippet
 
 snippet fsw "final switch (fsw)"
 switch(${1:/*var*/})
 {
-    case ${2:/*value*/}:
-        ${3:/*code*/}
-        break;
-    case ${4:/*value*/}:
-        ${5:/*code*/}
-        break;
-    ${7:/*more cases*/}
+	case ${2:/*value*/}:
+		${3:/*code*/}
+		break;
+	case ${4:/*value*/}:
+		${5:/*code*/}
+		break;
+	${7:/*more cases*/}
 }
 endsnippet
 
 snippet case "case (case)" b
 case ${1:/*value*/}:
-    ${2:/*code*/}
-    break;
+	${2:/*code*/}
+	break;
 endsnippet
 
 snippet ?: "ternary operator (?:)"
@@ -176,42 +178,42 @@ endsnippet
 snippet do "do while (do)" b
 do
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 } while(${1:/*condition*/});
 endsnippet
 
 snippet wh "while (wh)" b
 while(${1:/*condition*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
 snippet for "for (for)" b
 for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet forever "forever (forever)" b
 for(;;)
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet fore "foreach (fore)"
 foreach(${1:/*elem*/}; ${2:/*range*/})
 {
-    ${VISUAL}${3:/*code*/}
+	${VISUAL}${3:/*code*/}
 }
 endsnippet
 
 snippet forif "foreach if (forif)" b
 foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
 {
-    ${VISUAL}${4:/*code*/}
+	${VISUAL}${4:/*code*/}
 }
 endsnippet
 
@@ -219,8 +221,8 @@ endsnippet
 snippet in "in contract (in)" b
 in
 {
-    assert(${1:/*condition*/}, "${2:error message}");
-    ${3}
+	assert(${1:/*condition*/}, "${2:error message}");
+	${3}
 }
 body
 endsnippet
@@ -228,8 +230,8 @@ endsnippet
 snippet out "out contract (out)" b
 out${1:(result)}
 {
-    assert(${2:/*condition*/}, "${3:error message}");
-    ${4}
+	assert(${2:/*condition*/}, "${3:error message}");
+	${4}
 }
 body
 endsnippet
@@ -237,8 +239,8 @@ endsnippet
 snippet inv "invariant (inv)" b
 invariant()
 {
-    assert(${1:/*condition*/}, "${2:error message}");
-    ${3}
+	assert(${1:/*condition*/}, "${2:error message}");
+	${3}
 }
 endsnippet
 
@@ -247,29 +249,29 @@ endsnippet
 snippet fun "function definition (fun)"
 ${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
 {
-    ${VISUAL}${5:/*code*/}
+	${VISUAL}${5:/*code*/}
 }
 endsnippet
 
 snippet void "void function definition (void)"
 void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
 {
-    ${VISUAL}${4:/*code*/}
+	${VISUAL}${4:/*code*/}
 }
 endsnippet
 
 snippet this "ctor (this)" w
 this(${1:/*args*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
-snippet get "getter property (get)" !
+snippet get "getter property (get)"
 @property ${1:/*type*/} ${2:/*member_name*/}() const pure nothrow {return ${3:$2_};}
 endsnippet
 
-snippet set "setter property (set)" !
+snippet set "setter property (set)"
 @property void ${1:/*member_name*/}(${2:/*type*/} rhs) pure nothrow {${3:$1_} = rhs;}
 endsnippet
 
@@ -278,7 +280,7 @@ endsnippet
 snippet main "Main" b
 void main(string[] args)
 {
-    ${VISUAL}${0: /*code*/}
+	${VISUAL}${0: /*code*/}
 }
 endsnippet
 
@@ -293,7 +295,7 @@ endsnippet
 snippet scope "scope (scope)" b
 scope(${1:exit})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
@@ -302,7 +304,7 @@ endsnippet
 snippet with "with (with)"
 with(${1})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
@@ -311,33 +313,33 @@ endsnippet
 snippet try "try/catch (try)" b
 try
 {
-    ${VISUAL}${1:/*code to try*/}
+	${VISUAL}${1:/*code to try*/}
 }
 catch(${2}Exception e)
 {
-    ${3:/*handle exception*/}
+	${3:/*handle exception*/}
 }
 endsnippet
 
 snippet tryf "try/catch/finally (tryf)" b
 try
 {
-    ${VISUAL}${1:/*code to try*/}
+	${VISUAL}${1:/*code to try*/}
 }
 catch(${2}Exception e)
 {
-    ${3:/*handle exception*/}
+	${3:/*handle exception*/}
 }
 finally
 {
-    ${4:/*cleanup*/}
+	${4:/*cleanup*/}
 }
 endsnippet
 
 snippet catch "catch (catch)" b
 catch(${1}Exception e)
 {
-    ${2:/*handle exception*/}
+	${2:/*handle exception*/}
 }
 endsnippet
 
@@ -351,35 +353,35 @@ endsnippet
 snippet struct "struct (struct)"
 struct ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet union "union (union)"
 union ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet class "class (class)"
 class ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet inter "interface (inter)"
 interface ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet enum "enum (enum)"
 enum ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
@@ -388,12 +390,12 @@ endsnippet
 
 snippet exc "exception declaration (exc)" b
 /// ${3:/*documentation*/}
-class ${1}Exception : ${2}Exception 
+class ${1}Exception : ${2}Exception
 {
-    public this(string msg, string file = __FILE__, int line = __LINE__)
-    {
-        super(msg, file, line);
-    }
+	public this(string msg, string file = __FILE__, int line = __LINE__)
+	{
+		super(msg, file, line);
+	}
 }
 endsnippet
 
@@ -403,14 +405,14 @@ endsnippet
 snippet version "version (version)" b
 version(${1:/*version name*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
 snippet debug "debug" b
 debug
 {
-    ${VISUAL}${1:/*code*/}
+	${VISUAL}${1:/*code*/}
 }
 endsnippet
 
@@ -420,7 +422,7 @@ endsnippet
 snippet temp "template (temp)" b
 template ${2:/*name*/}(${1:/*args*/})
 {
-    ${3:/*code*/}
+	${3:/*code*/}
 }
 endsnippet
 
@@ -438,7 +440,7 @@ endsnippet
 snippet unittest "unittest (unittest)" b
 unittest
 {
-    ${1:/*code*/}
+	${1:/*code*/}
 }
 endsnippet
 
@@ -448,41 +450,41 @@ endsnippet
 snippet opDis "opDispatch (opDis)" b
 ${1:/*return type*/} opDispatch(string s)()
 {
-    ${2:/*code*/};
+	${2:/*code*/};
 }
 endsnippet
 
 snippet op= "opAssign (op=)" b
 void opAssign(${1} rhs) ${2:@safe pure nothrow}
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 endsnippet
 
 snippet opCmp "opCmp (opCmp)" b
 int opCmp(${1} rhs) @safe const pure nothrow
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 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;
+	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:/*code*/}
+	${1:/*code*/}
 }
 endsnippet
 
@@ -490,12 +492,11 @@ endsnippet
 # Comments
 
 
-snippet todo "TODO (todo)" !
+snippet todo "TODO (todo)"
 // TODO: ${1}
 endsnippet
 
 
-
 # DDoc
 
 snippet doc "generic ddoc block (doc)" b
@@ -508,7 +509,7 @@ snippet fdoc "function ddoc block (fdoc)" b
 /// ${1:description}
 ///
 /// ${2:Params:  ${3:param} = ${4:param description}
-///          ${5}}
+///			 ${5}}
 ///
 /// ${6:Returns: ${7:return value}}
 ///
@@ -517,7 +518,7 @@ endsnippet
 
 snippet Par "Params (Par)"
 Params:  ${1:param} = ${2:param description}
-///         ${3}
+///			${3}
 endsnippet
 
 snippet Ret "Returns (Ret)"
@@ -543,16 +544,16 @@ snippet gpl "GPL (gpl)" b
 // 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}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/django.snippets b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
index 553babab..9d6ce279 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/django.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 # Generic Tags
 snippet %
 {% ${1} %}${2}
@@ -5,7 +7,7 @@ endsnippet
 
 snippet %%
 {% ${1:tag_name} %}
-  ${2}
+	${2}
 {% end$1 %}
 endsnippet
 
@@ -17,14 +19,14 @@ endsnippet
 
 snippet autoescape
 {% autoescape ${1:off} %}
-  ${2}
+	${2}
 {% endautoescape %}
 endsnippet
 
 snippet block
 {% block ${1} %}
-  ${2}
-{% endblock %}
+	${2}
+{% endblock $1 %}
 endsnippet
 
 snippet #
@@ -33,7 +35,7 @@ endsnippet
 
 snippet comment
 {% comment %}
-  ${1}
+	${1}
 {% endcomment %}
 endsnippet
 
@@ -51,7 +53,7 @@ endsnippet
 
 snippet filter
 {% filter ${1} %}
-  ${2}
+	${2}
 {% endfilter %}
 endsnippet
 
@@ -61,24 +63,24 @@ endsnippet
 
 snippet for
 {% for ${1} in ${2} %}
-  ${3}
+	${3}
 {% endfor %}
 endsnippet
 
 snippet empty
 {% empty %}
-  ${1}
+	${1}
 endsnippet
 
 snippet if
 {% if ${1} %}
-  ${2}
+	${2}
 {% endif %}
 endsnippet
 
-snippet el
+snippet else
 {% else %}
-  ${1}
+	${1}
 endsnippet
 
 snippet ifchanged
@@ -87,13 +89,13 @@ endsnippet
 
 snippet ifequal
 {% ifequal ${1} ${2} %}
-  ${3}
+	${3}
 {% endifequal %}
 endsnippet
 
 snippet ifnotequal
 {% ifnotequal ${1} ${2} %}
-  ${3}
+	${3}
 {% endifnotequal %}
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets b/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
index ae7ea201..1f53edfb 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
@@ -1,4 +1,4 @@
-# Credit: @iurifg
+priority -50
 
 snippet do
 do
diff --git a/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets b/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
index 78231626..e27fbefa 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
@@ -2,6 +2,8 @@
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
 
+priority -50
+
 snippet pat "Case:Receive:Try Clause"
 ${1:pattern}${2: when ${3:guard}} ->;
 	${4:body}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index cd462fb2..118cdfec 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -1,3 +1,5 @@
+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
@@ -11,16 +13,15 @@
 #
 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
+	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
 
 
@@ -42,7 +43,7 @@ endsnippet
 
 snippet ft "form_tag"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-  $0
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
@@ -52,11 +53,11 @@ endsnippet
 
 snippet for "for loop (ERB)"
 <% if !${1:list}.blank? %>
-  <% for ${2:item} in ${1} %>
-    $3
-  <% end %>
+	<% for ${2:item} in ${1} %>
+		$3
+	<% end %>
 <% else %>
-  $4
+	$4
 <% end %>
 
 endsnippet
@@ -74,7 +75,7 @@ snippet ffhf "form_for hidden_field 2"
 endsnippet
 
 snippet ffl "form_for label 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!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 ffpf "form_for password_field 2"
@@ -99,7 +100,7 @@ endsnippet
 
 snippet fields "fields_for"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
@@ -122,7 +123,7 @@ snippet f. "f.hidden_field"
 endsnippet
 
 snippet f. "f.label"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!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"
@@ -148,14 +149,14 @@ endsnippet
 snippet ffe "form_for with errors"
 `!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_INLINE', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+`!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"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+`!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
 
@@ -271,9 +272,9 @@ snippet st "submit_tag"
 `!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 el "else (ERB)"
+snippet else "else (ERB)"
 <% else %>
-  
+	$0
 endsnippet
 
 snippet if "if (ERB)"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/go.snippets b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
index ea46931b..d01e3f1c 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
@@ -1,5 +1,7 @@
 # Snippets for Go
 
+priority -50
+
 # when to abbriviate and when not?
 # b doesn't work here, because it ignores whitespace
 # optional local name?
@@ -31,37 +33,55 @@ const (
 )
 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
+
 # statements
-snippet for "For loop" !b
+snippet for "For loop" b
 for ${1:condition}${1/(.+)/ /}{
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet forr "For range loop" !b
+snippet forr "For range loop" b
 for ${2:name} := range ${1:collection} {
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet if "If statement" !b
+snippet if "If statement" b
 if ${1:condition}${1/(.+)/ /}{
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet switch "Switch statement" !b
+snippet switch "Switch statement" b
 switch ${1:expression}${1/(.+)/ /}{
 case${0}
 }
 endsnippet
 
-snippet case "Case clause" !b
+snippet select "Select statement" b
+select {
+case${0}
+}
+endsnippet
+
+snippet case "Case clause" b
 case ${1:condition}:
 	${0:${VISUAL}}
 endsnippet
 
-snippet default "Default clause" !b
+snippet default "Default clause" b
 default:
 	${0:${VISUAL}}
 endsnippet
@@ -86,22 +106,26 @@ func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
 endsnippet
 
 # types and variables
-snippet map "Map type" !b
+snippet map "Map type" b
 map[${1:keytype}]${2:valtype}
 endsnippet
 
-snippet : "Variable declaration :=" !b
+snippet : "Variable declaration :=" b
 ${1:name} := ${0:value}
 endsnippet
 
-snippet var "Variable declaration" !b
+snippet var "Variable declaration" b
 var ${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value}}
 endsnippet
 
-snippet vars "Variables declaration" !b
+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:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
index 99f947f8..ad217fd8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
@@ -1,13 +1,15 @@
-snippet ife "if ... then ... else ..."
+priority -50
+
+snippet if "if ... then ... else ..."
 if ${1:condition}
-   then ${2:expression}
-   else ${3:expression}
+	then ${2:expression}
+	else ${3:expression}
 endsnippet
 
 snippet case "case ... of ..."
-case ${1} of
-     ${2} -> ${3}
-     ${4} -> ${5}
+case ${1:expression} of
+	${2:pattern} -> ${3:expression}
+	${4:pattern} -> ${5:expression}
 endsnippet
 
 snippet :: "Type signature"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/help.snippets b/sources_non_forked/vim-snippets/UltiSnips/help.snippets
index bd0bb12f..61327385 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/help.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/help.snippets
@@ -1,10 +1,12 @@
 # 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]))
+	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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index fd11d70b..31f7cc34 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -1,13 +1,15 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
 
 global !p
 def x(snip):
-    if snip.ft.startswith("x"):
-        snip.rv = '/'
-    else:
-        snip.rv = ""
+	if snip.ft.startswith("x"):
+		snip.rv = '/'
+	else:
+		snip.rv = ""
 endglobal
 
 ############
@@ -123,21 +125,21 @@ endsnippet
 #############
 # HTML TAGS #
 #############
-snippet input "Input with Label"
+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 "XHTML   <input>"
+snippet input "XHTML   <input>" w
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
 endsnippet
 
 
-snippet opt "Option"
+snippet opt "Option" w
 <option${1: value="${2:option}"}>${3:$2}</option>
 endsnippet
 
-snippet select "Select Box"
+snippet select "Select Box" w
 <select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
 	<option${9: value="${10:option1}"}>${11:$10}</option>
 	<option${12: value="${13:option2}"}>${14:$13}</option>${15:}
@@ -146,18 +148,22 @@ snippet select "Select Box"
 endsnippet
 
 
-snippet textarea "XHTML   <textarea>"
+snippet textarea "XHTML   <textarea>" w
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
-snippet mailto "XHTML <a mailto: >"
+snippet mailto "XHTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
-snippet base "XHTML <base>"
+snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
+snippet img "XHTML <img>" w
+<img src="${1:imgsrc}">
+endsnippet
+
 snippet body "XHTML <body>"
 <body id="${1:`!p
 snip.rv = snip.fn and 'Hallo' or 'Nothin'
@@ -166,13 +172,13 @@ snip.rv = snip.fn and 'Hallo' or 'Nothin'
 </body>
 endsnippet
 
-snippet div "XHTML <div>"
-<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
-   $0
+snippet div "XHTML <div>" 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
 </div>
 endsnippet
 
-snippet form "XHTML <form>"
+snippet form "XHTML <form>" w
 <form action="${1:`!p
 snip.rv = (snip.basename or 'unnamed') + '_submit'
 `}" method="${2:get}" accept-charset="utf-8">
@@ -182,7 +188,7 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 </form>
 endsnippet
 
-snippet h1 "XHTML <h1>"
+snippet h1 "XHTML <h1>" w
 <h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
 endsnippet
 
@@ -194,71 +200,70 @@ snippet head "XHTML <head>"
 </head>
 endsnippet
 
-snippet link "XHTML <link>"
+snippet link "XHTML <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 meta "XHTML <meta>"
+snippet meta "XHTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
-snippet scriptsrc "XHTML <script src...>"
+snippet scriptsrc "XHTML <script src...>" w
 <script src="$1" type="text/javascript" charset="${3:utf-8}"></script>
 endsnippet
 
-snippet script "XHTML <script>"
+snippet script "XHTML <script>" w
 <script type="text/javascript" charset="utf-8">
 	$0
 </script>
 endsnippet
 
-snippet style "XHTML <style>"
+snippet style "XHTML <style>" w
 <style type="text/css" media="screen">
 	$0
 </style>
 endsnippet
 
-snippet table "XHTML <table>"
+snippet table "XHTML <table>" w
 <table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
 	<tr><th>${5:Header}</th></tr>
 	<tr><td>${0:Data}</td></tr>
 </table>
 endsnippet
 
-snippet a "Link"
+snippet a "Link" w
 <a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
 endsnippet
 
-snippet p "paragraph"
+snippet p "paragraph" w
 <p>$0</p>
 endsnippet
 
-snippet li "list item"
-<li></li>
+snippet li "list item" w
+<li>$0</li>
 endsnippet
 
-snippet ul "unordered list"
+snippet ul "unordered list" w
 <ul>
 $0
 </ul>
 endsnippet
 
-snippet td "table cell"
+snippet td "table cell" w
 <td>$0</td>
 endsnippet
 
-snippet tr "table row"
+snippet tr "table row" w
 <tr>$0</tr>
 endsnippet
 
-snippet title "XHTML <title>"
+snippet title "XHTML <title>" w
 <title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 endsnippet
 
-snippet fieldset "Fieldset"
+snippet fieldset "Fieldset" w
 <fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
 	<legend>$1</legend>
-	
 	$0
 </fieldset>
 endsnippet
@@ -282,7 +287,7 @@ snippet html5 "HTML5 Template"
 <html>
 <head>
 	<title>${1}</title>
-	<meta charset="utf-8">
+	<meta charset="utf-8" />
 </head>
 <body>
 	<header>
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
index 1f77ad7b..48ff4b72 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
@@ -1,6 +1,8 @@
 # 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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets b/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
index 9df5f788..5836a2f6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
@@ -1 +1,3 @@
+priority -50
+
 extends html, django
diff --git a/sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets b/sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets
new file mode 100644
index 00000000..fa3b3c22
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/htmljinja.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html, jinja2
diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 617c1616..96cc7a9e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -1,27 +1,75 @@
-###########################################################################
-#                            TEXTMATE SNIPPETS                            #
-###########################################################################
+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 += " "
+	if snip.opt("g:ultisnips_java_brace_style", "") == "nl":
+		snip += ""
+	else:
+		snip.rv += " "
+def getArgs(group):
+	import re
+	word = re.compile('[a-zA-Z><.]+ \w+')
+	return [i.split(" ") for i in word.findall(group) ]
+
+def camel(word):
+	return word[0].upper() + 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 
+abstract $0
 endsnippet
 
 snippet as "assert" b
 assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
 endsnippet
 
+snippet at "assert true" b
+assertTrue(${1:actual});
+endsnippet
+
+snippet af "assert false" b
+assertFalse(${1:actual});$0
+endsnippet
+
+snippet ae "assert equals" b
+assertEquals(${1:expected}, ${2:actual});
+endsnippet
+
 snippet br "break"
 break;
 
@@ -39,19 +87,85 @@ catch (${1:Exception} ${2:e})`!p nl(snip)`{
 }
 endsnippet
 
-snippet cl "class" b
-class ${1:`!p
+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\t\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." + 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
-static public final String ${1:var} = "$2";$0
+public static final String ${1:var} = "$2";$0
 endsnippet
 
 snippet co "constant" b
-static public final ${1:String} ${2:var} = $3;$0
+public static final ${1:String} ${2:var} = $3;$0
 endsnippet
 
 snippet de "default" b
@@ -59,7 +173,7 @@ default:
 	$0
 endsnippet
 
-snippet eif "else if" b
+snippet elif "else if" b
 else if ($1)`!p nl(snip)`{
 	$0
 }
@@ -72,7 +186,7 @@ else`!p nl(snip)`{
 endsnippet
 
 snippet fi "final" b
-final 
+final $0
 endsnippet
 
 snippet fore "for (each)" b
@@ -81,6 +195,12 @@ for ($1 : $2)`!p nl(snip)`{
 }
 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
@@ -99,7 +219,7 @@ $0
 endsnippet
 
 snippet im "import"  b
-import 
+import ${1:java}.${2:util}.$0
 endsnippet
 
 snippet in "interface" b
@@ -108,6 +228,48 @@ interface ${1:`!p snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent
 }
 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." + i[1] + " = " + i[1]
+if len(args) == 0:
+	snip.rv += "\n"`
+}
+endsnippet
+
 snippet j.b "java_beans_" i
 java.beans.
 endsnippet
@@ -134,15 +296,70 @@ public static void main(String[] args)`!p nl(snip)`{
 }
 endsnippet
 
-snippet m "method" b
-${1:void} ${2:method}($3) ${4:throws $5 }{
+snippet try "try/catch" b
+try {
+	$1
+} 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 = t[2].lower()`;
+}
+endsnippet
+
+snippet /set(ter)?/ "setter" br
+public void set${1:Name}(${2:String} $1) {
+	return this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+}
+endsnippet
+
+snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
+public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
+	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+}
+
+public $2 get$1() {
+	return `!p snip.rv = t[1].lower()`;
+}
 endsnippet
 
 snippet pa "package" b
-package 
+package $0
 endsnippet
 
 snippet p "print" b
@@ -154,33 +371,33 @@ System.out.println($1);$0
 endsnippet
 
 snippet pr "private" b
-private 
+private $0
 endsnippet
 
 snippet po "protected" b
-protected 
+protected $0
 endsnippet
 
 snippet pu "public" b
-public 
+public $0
 endsnippet
 
 snippet re "return" b
-return 
+return $0
 endsnippet
 
 snippet st "static"
-static 
+static $0
 endsnippet
 
 snippet sw "switch" b
 switch ($1)`!p nl(snip)`{
-	$0
+	case $2: $0
 }
 endsnippet
 
 snippet sy "synchronized"
-synchronized 
+synchronized $0
 endsnippet
 
 snippet tc "test case"
@@ -190,17 +407,19 @@ public class ${1:`!p snip.rv = snip.basename or "untitled"`} extends ${2:TestCas
 endsnippet
 
 snippet t "test" b
-public void test${1:Name}() throws Exception`!p nl(snip)`{
+`!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 $0
-endsnippet
-
-snippet v "variable" b
-${1:String} ${2:var}${3: = ${0:null}};
+throw new $0
 endsnippet
 
 snippet wh "while" b
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 439ec874..f8d4790e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -6,19 +8,19 @@ 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(element){
-	$0
+'${1:${2:#thing}:${3:click}}': function(element) {
+	${VISUAL}$0
 }${10:,}
 endsnippet
 
 snippet :f "Object Method"
-${1:method_name}: function(${3:attribute}){
-	$0
+${1:method_name}: function(${3:attribute}) {
+	${VISUAL}$0
 }${10:,}
 endsnippet
 
 snippet :, "Object Value JS"
-${1:value_name}:${0:value},
+${1:value_name}: ${0:value},
 endsnippet
 
 snippet : "Object key key: 'value'"
@@ -26,47 +28,135 @@ ${1:key}: ${2:"${3:value}"}${4:, }
 endsnippet
 
 snippet proto "Prototype (proto)"
-${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) ,,{
-	${0}
-}
- 
+${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
+	${VISUAL}$0
+};
+
 endsnippet
 
-snippet for "for (...) {...} (faster)"
-for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2--){
-	${3:$1[$2]}$0
+snippet for "for (...) {...} (counting up)" b
+for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+	${VISUAL}$0
 }
 endsnippet
 
-snippet for "for (...) {...}"
-for (var ${2:i}=0; $2 < ${1:Things}.length; $2++) {
-	${3:$1[$2]}$0
+snippet ford "for (...) {...} (counting down, faster)" b
+for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+	${VISUAL}$0
 }
 endsnippet
 
 snippet fun "function (fun)"
-function ${1:function_name} (${2:argument}) {
-	${0}
+function ${1:function_name}(${2:argument}) {
+	${VISUAL}$0
 }
 endsnippet
 
-# for one line if .. else you usually use a ? b : c
+snippet iife "Immediately-Invoked Function Expression (iife)"
+(function (${1:argument}) {
+	${VISUAL}$0
+}(${2:$1}));
+endsnippet
+
 snippet ife "if ___ else"
-if (${1}) {
-	${2}
-} else {
-	${3}
+if (${1:condition}) {
+	${2://code}
+}
+else {
+	${3://code}
 }
 endsnippet
 
 snippet if "if"
-if (${1}) {
-	${2}
+if (${1:condition}) {
+	${VISUAL}$0
 }
 endsnippet
 
 snippet timeout "setTimeout function"
-setTimeout(function() {$0}${2:}, ${1:10})
+setTimeout(function() {
+	${VISUAL}$0
+}${2:.bind(${3:this})}, ${1:10});
+endsnippet
+
+# Snippets for Console Debug Output
+
+snippet ca "console.assert" b
+console.assert(${1:assertion}, ${2:"${3:message}"});
+endsnippet
+
+snippet cclear "console.clear" b
+console.clear();
+endsnippet
+
+snippet cdir "console.dir" b
+console.dir(${1:object});
+endsnippet
+
+snippet cdirx "console.dirxml" b
+console.dirxml(${1:object});
+endsnippet
+
+snippet ce "console.error" b
+console.error(${1:"${2:value}"});
+endsnippet
+
+snippet cgroup "console.group" b
+console.group("${1:label}");
+${VISUAL}$0
+console.groupEnd();
+endsnippet
+
+snippet cgroupc "console.groupCollapsed" b
+console.groupCollapsed("${1:label}");
+${VISUAL}$0
+console.groupEnd();
+endsnippet
+
+snippet ci "console.info" b
+console.info(${1:"${2:value}"});
+endsnippet
+
+snippet cl "console.log" b
+console.log(${1:"${2:value}"});
+endsnippet
+
+snippet cprof "console.profile" b
+console.profile("${1:label}");
+${VISUAL}$0
+console.profileEnd();
+endsnippet
+
+snippet ctable "console.table" b
+console.table(${1:"${2:value}"});
+endsnippet
+
+snippet ctime "console.time" b
+console.time("${1:label}");
+${VISUAL}$0
+console.timeEnd("$1");
+endsnippet
+
+snippet ctimestamp "console.timeStamp" b
+console.timeStamp("${1:label}");
+endsnippet
+
+snippet ctrace "console.trace" b
+console.trace();
+endsnippet
+
+snippet cw "console.warn" b
+console.warn(${1:"${2:value}"});
+endsnippet
+
+# AMD (Asynchronous Module Definition) snippets
+
+snippet def "define an AMD module"
+define(${1:optional_name, }[${2:'jquery'}], ${3:callback});
+endsnippet
+
+snippet req "require an AMD module"
+require([${1:'dependencies'}], ${2:callback});
 endsnippet
 
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
index 543a26ad..1b7e7b8d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
@@ -2,6 +2,8 @@
 #                        Ember snippets                           #
 ###################################################################
 
+priority -50
+
 # Application
 snippet eapp "App.Name = Ember.Application.create({});"
 ${1:App.Name} = Ember.Application.create({});
@@ -10,48 +12,48 @@ endsnippet
 # Models
 snippet emod "App.ModelName = Ember.Model.extend({...});"
 ${1:model_name} = Ember.Model.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # View
 snippet eview "App.ViewName = Ember.Model.extend({...});"
 ${1:view_name} = Ember.View.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Controller
 snippet econtroller "App.ControllerName = Ember.Model.extend({...});"
 ${1:controller_name} = Ember.ObjectController.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Route
 snippet eroute "App.RouteName = Ember.Route.extend({...});"
 ${1:route_name} = Ember.Route.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 snippet eview "App.ViewName = Ember.Model.create({...});"
 ${1:view_name} = Ember.View.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Object
 snippet eobj "App.ObjectName = Ember.Object.extend({...});"
 ${1:object_name} = Ember.Object.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Mixin
 snippet emix "App.MixinName = Ember.Model.extend({...});"
 ${1:view_name} = Ember.Mixin.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
@@ -67,13 +69,13 @@ endsnippet
 # Computer properties
 snippet cpro "property_name: function() {...}.property(),"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.property('${3:argumenet}'),
 endsnippet
 
 snippet cpro ": function() {...}.property('property'),"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.property(),
 endsnippet
 
@@ -81,7 +83,7 @@ endsnippet
 # Observes
 snippet proo "property_name: function() {...}.property()"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.observes('${3:property}'),
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
index 49e38a35..3a872985 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
@@ -1,8 +1,8 @@
-#
+priority -50
+
 # JavaScript versions -- from the TextMate bundle + some additions
 # for jasmine-jquery matchers
 #
-extends javascript
 
 snippet des "Describe (js)" b
 describe('${1:description}', function() {
@@ -165,4 +165,3 @@ endsnippet
 snippet noscw "expect was not called with (js)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments});
 endsnippet
-
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
new file mode 100644
index 00000000..ca943fc7
--- /dev/null
+++ b/sources_non_forked/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_email`} (${2:`!v g:snips_author`})
+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/sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets b/sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets
index 6fef6edf..ded01dcf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/jinja2.snippets
@@ -1,3 +1,4 @@
+priority -50
 
 # http://jinja.pocoo.org/
 
@@ -11,7 +12,7 @@
 
 snippet block "block" b
 {% block ${1:name} %}
-    $2
+		$2
 {% endblock $1 %}
 endsnippet
 
@@ -33,7 +34,7 @@ endsnippet
 
 snippet raw "escaped block" b
 {% raw %}
-    $1
+		$1
 {% endraw %}
 endsnippet
 
@@ -60,7 +61,7 @@ endsnippet
 
 snippet filter "filter" b
 {% filter ${1:filter} %}
-    $2
+	$2
 {% endfilter %}
 endsnippet
 
@@ -78,57 +79,57 @@ endsnippet
 
 snippet for "for" b
 {% for ${1:item} in ${2:sequence} %}
-    $3
+	$3
 {% endfor %}
 endsnippet
 
 
 snippet for "for/else" b
 {% for ${1:item} in ${2:sequence} %}
-    $3
+	$3
 {% else %}
-    $4
+	$4
 {% endfor %}
 endsnippet
 
 
 snippet if "if" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% endif %}
 endsnippet
 
 
 snippet if "if/else" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% else %}
-    $3
+	$3
 {% endif %}
 endsnippet
 
 
 snippet if "if/elif/else" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% elif %}
-    $3
+	$3
 {% else %}
-    $4
+	$4
 {% endif %}
 endsnippet
 
 
 snippet macro "macro" b
 {% macro ${1:name}(${2:args}) %}
-    $3
+	$3
 {% endmacro %}
 endsnippet
 
 
 snippet call "call" b
 {% call ${1:name}(${2:args}) %}
-    $3
+	$3
 {% endcall %}
 endsnippet
 
@@ -140,25 +141,24 @@ endsnippet
 
 snippet trans "translation" b
 {% trans %}
-    $1
+	$1
 {% endtrans %}
 endsnippet
 
 
 snippet with "with" b
 {% with %}
-    $1
+	$1
 {% endwith %}
 endsnippet
 
-
 snippet autoescape "autoescape" b
 {% autoescape ${1:true} %}
-    $2
+	$2
 {% endautoescape %}
 endsnippet
 
-# Filters 
+# Filters
 # @todo: expand only when snippet is preceeded by a |
 
 snippet batch "batch items" w
diff --git a/sources_non_forked/vim-snippets/UltiSnips/json.snippets b/sources_non_forked/vim-snippets/UltiSnips/json.snippets
index 81e65611..b0cad830 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/json.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/json.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet s "String" b
 "${1:key}": "${0:value}",
 endsnippet
@@ -8,12 +10,11 @@ endsnippet
 
 snippet a "Array" b
 [
-   ${VISUAL}$0
+	${VISUAL}$0
 ],
 endsnippet
 snippet o "Object" b
 {
-   ${VISUAL}$0
+	${VISUAL}$0
 },
 endsnippet
-
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets b/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
new file mode 100644
index 00000000..4bf46916
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
@@ -0,0 +1,8 @@
+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/sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets b/sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets
new file mode 100644
index 00000000..29169a55
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/lhaskell.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends haskell
diff --git a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
index 1b82a245..bc59c60c 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 #################################
 # Snippets for the Lua language #
 #################################
@@ -8,25 +10,25 @@ endsnippet
 
 snippet !fun(ction)?! "New function" br
 function ${1:new_function}(${2:args})
-   $0
+	$0
 end
 endsnippet
 
 snippet forp "pair for loop" b
 for ${1:name},${2:val} in pairs(${3:table_name}) do
-   $0
+	$0
 end
 endsnippet
 
 snippet fori "ipair for foop" b
 for ${1:idx},${2:val} in ipairs(${3:table_name}) do
-   $0
+	$0
 end
 endsnippet
 
 snippet for "numeric for loop" b
 for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
-   $0
+	$0
 end
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/mako.snippets b/sources_non_forked/vim-snippets/UltiSnips/mako.snippets
index 92a7be38..fb31ec84 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/mako.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/mako.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 #################
 # From snipmate #
 #################
diff --git a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
index c3189b8a..fa708ab8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
@@ -1,6 +1,4 @@
-###########################################################################
-#                          SNIPPETS for MARKDOWN                          #
-###########################################################################
+priority -50
 
 ###########################
 # Sections and Paragraphs #
diff --git a/sources_non_forked/vim-snippets/UltiSnips/objc.snippets b/sources_non_forked/vim-snippets/UltiSnips/objc.snippets
index 0c676641..45e41fc1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/objc.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/objc.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -11,11 +13,11 @@ snippet Imp "#import <> (Imp)"
 endsnippet
 
 snippet cl "020 Class (objc)"
-@interface ${1:`!p 
+@interface ${1:`!p
 if len(fn):
-   snip.rv = re.sub(r'\..*$', '', fn)
+		snip.rv = re.sub(r'\..*$', '', fn)
 else:
-   snip.rv = "object"
+		snip.rv = "object"
 `} : ${2:NSObject}
 {
 }
@@ -118,7 +120,7 @@ snippet arracc "LoD array (arracc)"
 	[${3:${1/./\l$0/}} addObject:anObject];
 }
 
-- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i 
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i
 {
 	[$3 insertObject:anObject atIndex:i];
 }
@@ -189,7 +191,7 @@ if(choice == NSAlertDefaultReturn) // "$3"
 }
 else if(choice == NSAlertAlternateReturn) // "$4"
 {
-	
+		$0
 }
 endsnippet
 
@@ -217,7 +219,7 @@ endsnippet
 snippet responds "Responds to Selector"
 if ([${1:self} respondsToSelector:@selector(${2:someSelector:})])
 {
-    [$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
+		[$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
index 157eb91a..1ebc3477 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ocaml.snippets
@@ -1,20 +1,22 @@
+priority -50
+
 snippet rs "raise" b
 raise (${1:Not_found})
 endsnippet
 
 snippet open "open"
 let open ${1:module} in
-${2}
+${2:e}
 endsnippet
 
 snippet try "try"
-try ${1}
+try ${1:e}
 with ${2:Not_found} -> ${3:()}
 endsnippet
 
 snippet ref "ref"
-let ${1} = ref ${2} in
-${3}
+let ${1:name} = ref ${2:val} in
+${3:e}
 endsnippet
 
 snippet matchl "pattern match on a list"
@@ -24,83 +26,88 @@ match ${1:list} with
 endsnippet
 
 snippet matcho "pattern match on an option type"
-match ${1} with
-| Some(${2}) -> ${3:()}
+match ${1:x} with
+| Some(${2:y}) -> ${3:()}
 | None -> ${4:()}
 endsnippet
 
 snippet fun "anonymous function"
-(fun ${1} -> ${2})
+(fun ${1:x} -> ${2:x})
 endsnippet
 
 snippet cc "commment"
-(* ${1} *)
+(* ${1:comment} *)
 endsnippet
 
 snippet let "let .. in binding"
-let ${1} = ${2} in
-${3}
+let ${1:x} = ${2:v} in
+${3:e}
 endsnippet
 
 snippet lr "let rec"
-let rec ${1} =
-  ${2}
+let rec ${1:f} =
+	${2:expr}
 endsnippet
 
-snippet ife "if"
-if ${1} then
-  ${2}
+snippet if "if"
+if ${1:(* condition *)} then
+	${2:(* A *)}
 else
-  ${3}
+	${3:(* B *)}
 endsnippet
 
-snippet if "If"
-if ${1} then
-  ${2}
+snippet If "If"
+if ${1:(* condition *)} then
+	${2:(* A *)}
 endsnippet
 
-snippet wh "while"
-while ${1} do
-  ${2}
+snippet while "while"
+while ${1:(* condition *)} do
+	${2:(* A *)}
 done
 endsnippet
 
 snippet for "for"
 for ${1:i} = ${2:1} to ${3:10} do
-  ${4}
+	${4:(* BODY *)}
 done
 endsnippet
 
 snippet match "match"
-match ${1} with
-| ${2} -> ${3}
+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}
+	${2:methods}
 end
 endsnippet
 
 snippet obj "obj"
 object
-  ${2}
+	${2:methods}
 end
 endsnippet
 
 snippet Obj "object"
 object (self)
-  ${2}
+	${2:methods}
 end
 endsnippet
 
 snippet {{ "object functional update"
-{< ${1} = ${2} >}
+{< ${1:x} = ${2:y} >}
 endsnippet
 
 snippet beg "beg"
 begin
-  ${1}${VISUAL}
+	${1:block}
 end
 endsnippet
 
@@ -110,19 +117,19 @@ endsnippet
 
 snippet mod "module - no signature"
 module ${1:(* Name *)} = struct
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
 snippet Mod "module with signature"
 module ${1:(* Name *)} : ${2:(* SIG *)} = struct
-  ${3}
+	${3:(* BODY *)}
 end
 endsnippet
 
 snippet sig "anonymous signature"
 sig
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
@@ -132,36 +139,36 @@ endsnippet
 
 snippet func "define functor - no signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) = struct
-  ${4}
+	${4:(* BODY *)}
 end
 endsnippet
 
 snippet Func "define functor - with signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
-  ${5}
+	${5:(* BODY *)}
 end
 endsnippet
 
 snippet mot "Declare module signature"
 module type ${1:(* Name *)} = sig
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
 snippet module "Module with anonymous signature"
 module ${1:(* Name *)} : sig
-  ${2}
+	${2:(* SIGNATURE *)}
 end = struct
-  ${3}
+	${3:(* BODY *)}
 end
 endsnippet
 
 snippet oo "odoc"
-(** ${1} *)
+(** ${1:odoc} *)
 endsnippet
 
 snippet qt "inline qtest"
 (*$T ${1:name}
-   ${2:test}
+	${2:test}
 *)
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
index e183b115..abaae3f5 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
@@ -1,10 +1,13 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
 snippet ife "Conditional if..else (ife)"
 if ($1) {
 	${2:# body...}
-} else {
+}
+else {
 	${3:# else...}
 }
 
@@ -13,9 +16,11 @@ endsnippet
 snippet ifee "Conditional if..elsif..else (ifee)"
 if ($1) {
 	${2:# body...}
-} elsif ($3) {
+}
+elsif ($3) {
 	${4:# elsif...}
-} else {
+}
+else {
 	${5:# else...}
 }
 
@@ -49,7 +54,7 @@ ${1:expression} while ${2:condition};
 endsnippet
 
 snippet test "Test"
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 
 use strict;
 use Test::More tests => ${1:1};
@@ -62,7 +67,7 @@ endsnippet
 snippet class "class"
 package ${1:ClassName};
 
-${2:use base qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
+${2:use parent qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
 	my $class = shift;
 	$class = ref $class if ref $class;
 	my $self = bless {}, $class;
@@ -74,11 +79,12 @@ ${2:use base qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
 endsnippet
 
 snippet eval "eval"
+local $@;
 eval {
 	${1:# do something risky...}
 };
-if ($@) {
-	${2:# handle failure...}
+if (my $${2:exception} = $@) {
+	${3:# handle failure...}
 }
 
 endsnippet
@@ -105,8 +111,7 @@ if ($1) {
 endsnippet
 
 snippet slurp "slurp"
-my $${1:var};
-{ local $/ = undef; local *FILE; open FILE, "<${2:file}"; $$1 = <FILE>; close FILE }
+my $${1:var} = do { local $/ = undef; open my $fh, '<', ${2:$file}; <$fh> };
 
 endsnippet
 
@@ -117,7 +122,7 @@ unless ($1) {
 
 endsnippet
 
-snippet wh "while"
+snippet while "while"
 while ($1) {
 	${2:# body...}
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index b7d01670..24f6cc52 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -1,108 +1,264 @@
-snippet <? "php open tag" b
-<?php
+priority -50
 
+## Snippets from SnipMate, taken from
+## https://github.com/scrooloose/snipmate-snippets.git
 
+snippet array "array"
+$${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet
 
-snippet vdd "php var_dump and die"
-var_dump(${1}); die();
+snippet def "def"
+define('${1}'${2});${3}
 endsnippet
 
-snippet ns "php namespace" b
-namespace ${1:`!p 
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`};
-
+snippet do "do"
+do {
+	${2:// code... }
+} while (${1:/* condition */});"
 endsnippet
 
-snippet nc "php namespace and class or interface" b
-namespace ${1:`!p 
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`};
-
+snippet doc_f "doc_f"
 /**
- * ${3:@author `whoami`}${4}
- */
-`!p
-m = re.search(r'Abstract', path)
-if m:
-	snip.rv = 'abstract '
-``!p
-if re.search(r'Interface', path):
-	snip.rv = 'interface'
-elif re.search(r'Trait', path):
-	snip.rv = 'trait'
-else:
-	snip.rv = 'class'
-` ${2:`!p
-snip.rv = re.match(r'.*(?=\.)', fn).group()
-`}
-{
+ * $2
+ * @return ${4:void}
+ * @author ${5:`!v g:snips_author`}
+ **/
+${1:public }function ${2:someFunc}(${3})
+{${6}
 }
 endsnippet
 
-snippet st "php static function" b
-${1:public} static function $2($3)
-{
-	${4}
-}
-endsnippet
-
-snippet __ "php constructor" b
-${1:public} function __construct($2)
-{
-	${3}
-}
-endsnippet
-
-snippet sg "Setter and Getter" b
+snippet doc_i "doc_i"
 /**
- * @var ${3:`!p snip.rv = t[2][0:1].upper() + t[2][1:]`}
- * 
- * ${4}
+ * $1
+ * @package ${2:default}
+ * @author ${3:`!v g:snips_author`}
+ **/
+interface ${1:someClass}
+{${4}
+} // END interface $1"
+endsnippet
+
+snippet else "else"
+else {
+	${1:// code...}
+}
+endsnippet
+
+snippet for "for"
+for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
+	${4:// code...}
+}
+endsnippet
+
+snippet foreachk "foreachk"
+foreach ($${1:variable} as $${2:key} => $${3:value}){
+	${4:// code...}
+}
+endsnippet
+
+snippet get "get"
+$_GET['${1}']${2}
+endsnippet
+
+snippet if "if"
+if (${1:/* condition */}) {
+	${2:// code...}
+}
+endsnippet
+
+snippet inc "inc"
+include '${1:file}';${2}
+endsnippet
+
+snippet log "log"
+error_log(var_export(${1}, true));${2}
+endsnippet
+
+snippet post "post"
+$_POST['${1}']${2}
+endsnippet
+
+snippet req1 "req1"
+require_once '${1:file}';${2}
+endsnippet
+
+snippet session "session"
+$_SESSION['${1}']${2}
+endsnippet
+
+snippet t "t"
+$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
+endsnippet
+
+snippet var "var"
+var_export(${1});${2}
+endsnippet
+
+snippet getter "PHP Class Getter" b
+/*
+ * Getter for $1
  */
-${1:protected} $${2};
-
-public function set`!p snip.rv = t[2][0:1].upper() + t[2][1:]`(`!p
-if re.match(r'^(\\|[A-Z]).*', t[3]):
-	snip.rv = t[3] + ' '
-else:
-	snip.rv = ''
-`$$2)
+public function get${1/\w+\s*/\u$0/}()
 {
-	$this->$2 = $$2;
-
-	return $this;
-}
-
-public function get`!p snip.rv = t[2][0:1].upper() + t[2][1:]`()
-{
-	return $this->$2;
+	return $this->$1;$2
 }
+$4
 endsnippet
 
-snippet if "php if" !b
-if (${1}) {
-	${2}
+snippet setter "PHP Class Setter" b
+/*
+ * Setter for $1
+ */
+public function set${1/\w+\s*/\u$0/}($$1)
+{
+	$this->$1 = $$1;$3
+	${4:return $this;}
 }
+$0
 endsnippet
 
-snippet ife "php ife" !b
-if (${1}) {
-	${2}
+snippet gs "PHP Class Getter Setter" b
+/*
+ * Getter for ${1/(\w+)\s*;/$1/}
+ */
+public function get${1/(\w+)\s*;/\u$1/}()
+{
+	return $this->${1/(\w+)\s*;/$1/};$2
+}
+
+/*
+ * Setter for ${1/(\w+)\s*;/$1/}
+ */
+public function set${1/(\w+)\s*;/\u$1/}($${1/(\w+)\s*;/$1/})
+{
+	$this->${1/(\w+)\s*;/$1/} = $${1/(\w+)\s*;/$1/};$3
+	${4:return $this;}
+}
+$0
+endsnippet
+
+snippet pub "Public function" b
+public function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pro "Protected function" b
+protected function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pri "Private function" b
+private function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pubs "Public static function" b
+public static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pros "Protected static function" b
+protected static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pris "Private static function" b
+private static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet fu "Function snip" b
+function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet fore "Foreach loop"
+foreach ($${1:variable} as $${3:value}){
+	${VISUAL}${4}
+}
+$0
+endsnippet
+
+snippet new "New class instance" b
+$$1 = new $1($2);
+$0
+endsnippet
+
+snippet ife "if else"
+if (${1:/* condition */}) {
+	${2:// code...}
 } else {
+	${3:// code...}
+}
+$0
+endsnippet
 
+snippet class "Class declaration template" b
+/**
+ * Class ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * @author ${2:`!v g:snips_author`}
+ */
+class $1
+{
+	public function ${3:__construct}(${4:$options})
+	{
+		${4:// code}
+	}
+}
+$0
+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
+
+snippet pr "Dumb debug helper in HTML"
+echo '<pre>' . var_export($1, 1) . '</pre>';$0
+endsnippet
+
+snippet pc "Dumb debug helper in cli"
+var_export($1);$0
+endsnippet
+
+# Symfony 2 based snippets
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+	$3
+	return ${4:array();}$0
 }
 endsnippet
 
-snippet /** "php comment block" b
-/**
- * @${1}
- */
-endsnippet
+# :vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
similarity index 90%
rename from sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
index 6609f3fa..1a310a19 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php/phpunit.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
@@ -1,7 +1,9 @@
-# sugguestion? report bugs? 
+# suggestion? report bugs?
 # please go to https://github.com/chrisyue/vim-snippets/issues
+priority -50
+
 snippet test "phpunit test class" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
similarity index 94%
rename from sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
index 77f923f6..3d433169 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php/symfony2.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
@@ -1,8 +1,10 @@
-# sugguestion? report bugs? 
+# sugguestion? report bugs?
 # go to https://github.com/chrisyue/vim-snippets/issues
 
+priority -50
+
 snippet contr "Symfony2 controller" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -52,7 +54,7 @@ abspath = os.path.abspath(path)`
 endsnippet
 
 snippet comm "Symfony2 command" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -89,7 +91,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet subs "Symfony2 subscriber" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -120,7 +122,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet transf "Symfony2 form data transformer" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -154,7 +156,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet ent "Symfony2 doctrine entity" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -167,7 +169,7 @@ use Doctrine\ORM\Mapping as ORM;
  * ${3:@author `whoami`}
  *
  * @ORM\Entity()
- * @ORM\Table(name="`!p 
+ * @ORM\Table(name="`!p
 tmp = re.match(r'.*(?=\.)', fn).group()
 tmp = re.sub(r'\B([A-Z])', r'_\1', tmp)
 snip.rv = tmp.lower()
@@ -191,7 +193,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet form "Symfony2 form type" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -209,33 +211,33 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends AbstractType
 {
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function buildForm(FormBuilderInterface $builder, array $options)
-	{   
+	{
 	}
 
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function setDefaultOptions(OptionsResolverInterface $resolver)
-	{   
-	    $resolver->setDefaults(); 
-	} 
+	{
+		$resolver->setDefaults();
+	}
 
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function getName()
-	{   
+	{
 		return '${1}';
 	}
 }
 endsnippet
 
 snippet ev "Symfony2 event" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/puppet.snippets b/sources_non_forked/vim-snippets/UltiSnips/puppet.snippets
index 68ae0fe4..1b2cfc57 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/puppet.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/puppet.snippets
@@ -1,78 +1,235 @@
-# Snippets for Puppet
+priority -50
 
-snippet /^class/ "Class declaration" r
-class ${1:name} {
-    ${0:# body}
+#########################################################################
+#  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},
+	owner => ${1:username},
+	group => ${2:groupname},
 }
 endsnippet
 
-# Resource types
-snippet package "Package resource type" b
-package { "${1:name}":
-    ensure => ${2:installed},
-}
-endsnippet
-
-snippet file "File resource type" b
-file { "${1:name}":
-    source => "puppet://${2:path}",
-    mode   => ${3:mode},
-endsnippet
-
 snippet group "Group resource type" b
-group { "${1:groupname}":
-    ensure => ${3:present},
-    gid    => ${2:gid},
-endsnippet
-
-snippet user "user resource type" b
-group { "${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 exec "Exec resource type" b
-exec { "${1:command}":
-    refreshonly => true,
-}
-endsnippet
-
-snippet cron "Cron resource type" b
-cron { "${1:name}":
-    user    => ${2:user},
-    command => "${3:command}",
-    minute  => ${3:minute},
-    hour    => ${4:hour},
+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",
+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,
+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/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index a770d2a9..357d01d3 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
@@ -14,6 +16,10 @@ if __name__ == '__main__':
 	${1:main()}$0
 endsnippet
 
+snippet for "for loop" b
+for ${1:item} in ${2:iterable}:
+	${3:pass}
+endsnippet
 
 ##########
 # COMMON #
@@ -29,67 +35,81 @@ NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
 
+SINGLE_QUOTES = 0x1
+DOUBLE_QUOTES = 0x2
+
 def get_args(arglist):
-    args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
-    args = [arg for arg in args if arg and arg != "self"]
+	args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg and arg != "self"]
 
-    return args
+	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 tripple_quotes(snip):
+	if get_quoting_style(snip) == SINGLE_QUOTES:
+		return "'''"
+	return '"""'
+
 def get_style(snip):
-    style = snip.opt("g:ultisnips_python_style", "normal")
+	style = snip.opt("g:ultisnips_python_style", "normal")
 
-    if    style == "doxygen": return DOXYGEN
-    elif  style == "sphinx": return SPHINX
-    else: return NORMAL
+	if    style == "doxygen": return DOXYGEN
+	elif  style == "sphinx": return SPHINX
+	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
+	if style == DOXYGEN:
+		return "@param %s @todo" % arg
+	elif style == SPHINX:
+		return ":param %s: @todo" % arg
+	elif style == NORMAL:
+		return ":%s: @todo" % arg
 
 
 def format_return(style):
-    if style == DOXYGEN:
-        return "@return: @todo"
-    elif style in (NORMAL, SPHINX):
-        return ":returns: @todo"
+	if style == DOXYGEN:
+		return "@return: @todo"
+	elif style in (NORMAL, SPHINX):
+		return ":returns: @todo"
 
 
 def write_docstring_args(args, snip):
-    if not args:
-        snip.rv += ' """'
-        return
+	if not args:
+		snip.rv += ' {0}'.format(tripple_quotes(snip))
+		return
 
-    snip.rv += '\n' + snip.mkline('', indent='')
+	snip.rv += '\n' + snip.mkline('', indent='')
 
-    style = get_style(snip)
+	style = get_style(snip)
 
-    for arg in args:
-        snip += format_arg(arg, style)
+	for arg in args:
+		snip += format_arg(arg, style)
 
 
 def write_init_body(args, parents, snip):
-    parents = [p.strip() for p in parents.split(",")]
-    parents = [p for p in parents if p != 'object']
+	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)"
+	for p in parents:
+		snip += p + ".__init__(self)"
 
-    if parents:
-        snip.rv += '\n' + snip.mkline('', indent='')
+	if parents:
+		snip.rv += '\n' + snip.mkline('', indent='')
 
-    for arg in args:
-        snip += "self._%s = %s" % (arg, arg)
+	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)
+	args = ['"_%s"' % arg for arg in args]
+	snip += '__slots__ = (%s,)' % ', '.join(args)
 
 endglobal
 
@@ -99,10 +119,11 @@ endglobal
 
 snippet class "class with docstrings" b
 class ${1:MyClass}(${2:object}):
-	"""${3:Docstring for $1 }"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
 
 	def __init__(self$4):
-		"""${5:@todo: to be defined}`!p
+		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -110,8 +131,8 @@ args = get_args(t[4])
 
 write_docstring_args(args, snip)
 if args:
-    snip.rv += '\n' + snip.mkline('', indent='')
-    snip += '"""'
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += '{0}'.format(tripple_quotes(snip))
 
 write_init_body(args, t[2], snip)
 `
@@ -121,7 +142,8 @@ endsnippet
 
 snippet slotclass "class with slots and docstrings" b
 class ${1:MyClass}(${2:object}):
-	"""${3:Docstring for $1 }"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
 `!p
 snip >> 1
 args = get_args(t[4])
@@ -129,7 +151,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		"""${5:@todo: to be defined}`!p
+		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -137,8 +159,8 @@ args = get_args(t[4])
 
 write_docstring_args(args, snip)
 if args:
-    snip.rv += '\n' + snip.mkline('', indent='')
-    snip += '"""'
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += tripple_quotes(snip)
 
 write_init_body(args, t[2], snip)
 `
@@ -330,19 +352,19 @@ endsnippet
 snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
-   snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
-	"""${4:@todo: Docstring for $1}`!p
+	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
+	`!p snip.rv = tripple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
 args = get_args(t[2])
 if args:
-   write_docstring_args(args, snip)
+	write_docstring_args(args, snip)
 
 style = get_style(snip)
 snip += format_return(style)
 snip.rv += '\n' + snip.mkline('', indent='')
-snip += '"""' `
+snip += tripple_quotes(snip) `
 	${0:pass}
 endsnippet
 
@@ -362,23 +384,57 @@ endsnippet
 ##############
 snippet roprop "Read Only Property" b
 @property
-def ${1:property}(self):
+def ${1:name}(self):
 	${2:return self._$1}$0
 endsnippet
 
 snippet rwprop "Read write property" b
-def ${1:property}():
-	${2/.+/(?0:""")/}${2:The RW property $1}`!p if t[2]:
-   snip.rv += '"""'
-   snip >> 1
-   snip += ""
+def ${1:name}():
+	`!p snip.rv = tripple_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 += tripple_quotes(snip)
 else:
-   snip.rv = ""`def fget(self):
+	snip.rv = ""`
+	def fget(self):
 		return self._$1$0
+
 	def fset(self, value):
 		self._$1 = value
 	return locals()
-$1 = property(**$1())
+
+$1 = property(**$1(), doc=$1.__doc__)
+endsnippet
+
+
+####################
+# If / Else / Elif #
+####################
+snippet if "If" b
+if ${1:condition}:
+	${2:pass}
+endsnippet
+
+snippet ife "If / Else" b
+if ${1:condition}:
+	${2:pass}
+else:
+	${3:pass}
+endsnippet
+
+snippet ifee "If / Elif / Else" b
+if ${1:condition}:
+	${2:pass}
+elif ${3:condition}:
+	${4:pass}
+else:
+	${5:pass}
 endsnippet
 
 
@@ -430,6 +486,14 @@ snippet pdb "Set PDB breakpoint" b
 import pdb; pdb.set_trace()
 endsnippet
 
+snippet ipdb "Set IPDB breakpoint" b
+import ipdb; ipdb.set_trace()
+endsnippet
+
+snippet pudb "Set PUDB breakpoint" b
+import pudb; pudb.set_trace()
+endsnippet
+
 snippet ae "Assert equal" b
 self.assertEqual(${1:first},${2:second})
 endsnippet
@@ -453,7 +517,8 @@ endsnippet
 
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
-	"""${3:Test case docstring}"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = tripple_quotes(snip)`
 
 	def setUp(self):
 		${4:pass}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rails.snippets b/sources_non_forked/vim-snippets/UltiSnips/rails.snippets
index 9e0e29f8..5c521795 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rails.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rails.snippets
@@ -1,6 +1,4 @@
-###########################################################################
-#                    GENERATED FROM get_tm_snippets.py                    #
-###########################################################################
+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?} \}}}
@@ -77,90 +75,90 @@ endsnippet
 
 snippet resources "Create resources controller class"
 class ${1:Model}sController < ApplicationController
-  before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
+	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
+	# 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
+		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/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
+	# 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
+		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
+	# 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/}])
+	# 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
+		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_attributes(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
+	# PUT /${1/./\l$0/}s/1
+	# PUT /${1/./\l$0/}s/1.xml
+	def update
+		respond_to do |wants|
+			if @${1/./\l$0/}.update_attributes(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
+	# 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
+		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
+	private
+		def find_${1/./\l$0/}
+			@${1/./\l$0/} = ${1:Model}.find(params[:id])
+		end
 
 end
 
@@ -227,31 +225,31 @@ assert_response :${1:success}, @response.body$0
 endsnippet
 
 snippet aftc "after_create"
-after_create 
+after_create $0
 endsnippet
 
 snippet aftd "after_destroy"
-after_destroy 
+after_destroy $0
 endsnippet
 
 snippet afts "after_save"
-after_save 
+after_save $0
 endsnippet
 
 snippet aftu "after_update"
-after_update 
+after_update $0
 endsnippet
 
 snippet aftv "after_validation"
-after_validation 
+after_validation $0
 endsnippet
 
 snippet aftvoc "after_validation_on_create"
-after_validation_on_create 
+after_validation_on_create $0
 endsnippet
 
 snippet aftvou "after_validation_on_update"
-after_validation_on_update 
+after_validation_on_update $0
 endsnippet
 
 snippet asg "assert(var = assigns(:var))"
@@ -261,13 +259,13 @@ endsnippet
 
 snippet asd "assert_difference"
 assert_difference "${1:Model}.${2:count}", ${3:1} do
-  $0
+	$0
 end
 endsnippet
 
 snippet asnd "assert_no_difference"
 assert_no_difference "${1:Model}.${2:count}" do
-  $0
+	$0
 end
 endsnippet
 
@@ -298,27 +296,27 @@ end}
 endsnippet
 
 snippet befc "before_create"
-before_create 
+before_create $0
 endsnippet
 
 snippet befd "before_destroy"
-before_destroy 
+before_destroy $0
 endsnippet
 
 snippet befs "before_save"
-before_save 
+before_save $0
 endsnippet
 
 snippet befu "before_update"
-before_update 
+before_update $0
 endsnippet
 
 snippet befv "before_validation"
-before_validation 
+before_validation $0
 endsnippet
 
 snippet befvoc "before_validation_on_create"
-before_validation_on_create 
+before_validation_on_create $0
 endsnippet
 
 snippet befvou "before_validation_on_update"
@@ -456,13 +454,13 @@ endsnippet
 
 snippet mapr "map.resource"
 ${1:map}.resource :${2:resource}${10: do |${11:$2}|
-  $0
+	$0
 end}
 endsnippet
 
 snippet maprs "map.resources"
 ${1:map}.resources :${2:resource}${10: do |${11:$2}|
-  $0
+	$0
 end}
 endsnippet
 
@@ -605,7 +603,7 @@ endsnippet
 
 snippet resw "respond_with"
 respond_with(${1:@${2:model}})${3: do |format|
-  format.${4:html} { $0 \}
+	format.${4:html} { $0 \}
 end}
 endsnippet
 
@@ -807,32 +805,32 @@ endsnippet
 
 snippet sweeper "Create sweeper class"
 class ${1:Model}Sweeper < ActionController::Caching::Sweeper
-  observe ${1:Model}
+	observe ${1:Model}
 
-  def after_save(${1/./\l$0/})
-    expire_cache(${1/./\l$0/})
-  end
+	def after_save(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
 
-  def after_destroy(${1/./\l$0/})
-    expire_cache(${1/./\l$0/})
-  end
+	def after_destroy(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
 
-  private
+	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
+		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}}
+	${1:get :${2:action}}
+	${3:put :${4:action}}
+	${5:post :${6:action}}
+	${7:delete :${8:action}}
 end
 endsnippet
 
@@ -854,16 +852,16 @@ endsnippet
 
 snippet member "member routes"
 member do
-  ${1:get :${2:action}}
-  ${3:put :${4:action}}
-  ${5:post :${6:action}}
-  ${7:delete :${8:action}}
+	${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
+	$3
 end}
 endsnippet
 
@@ -877,9 +875,9 @@ endsnippet
 
 snippet scopee "scope with extension"
 scope :${1:name}, ${2:where(${3::${4:field} => ${5:'${6:value}'}})} do
-  def ${7:method_name}
-    $0
-  end
+	def ${7:method_name}
+		$0
+	end
 end
 endsnippet
 
@@ -893,13 +891,13 @@ setup do
 end
 endsnippet
 
-snippet trans "Translation snippet" 
+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}
+	${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})${6}
 end
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
index 88e0caaf..e8aef2b2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
+priority -50
+
 ###########################################################################
-#                              General Stuff                              #
+#							   General Stuff							  #
 ###########################################################################
 global !p
 import vim
@@ -12,25 +14,25 @@ from collections import Counter
 
 #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'] 
+			  '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"]
+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',
-              'list-table','class','sectnum',
-              'role','default-role','unicode',
-              'raw']
+			  'parsed-literal','code','highlights',
+			  'pull-quote','compound','container',
+			  'list-table','class','sectnum',
+			  'role','default-role','unicode',
+			  'raw']
 
 NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
-                           'footer', 'date', 'include', 'title']
+						   'footer', 'date', 'include', 'title']
 
 INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 # CJK chars
@@ -39,115 +41,115 @@ CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-
 
 
 def has_cjk(char):
-    """
-    Detect char contains CJK character
-    
-    :param char: characters needs to be detect 
-    """
-    try:
-        CJK_RE.finditer(char).next()
-    except StopIteration:
-        return False
-    else:
-        return True
+	"""
+	Detect char contains CJK character
+
+	:param char: characters needs to be detect
+	"""
+	try:
+		CJK_RE.finditer(char).next()
+	except StopIteration:
+		return False
+	else:
+		return True
 
 def real_filename(filename):
-    """peal extension name off if possible
-    # i.e. "foo.bar.png will return "foo.bar"
+	"""pealeextension name off if possible
+	# i.e. "foo.bar.png will return "foo.bar"
 	"""
-    return ospath.splitext(filename)[0]
+	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
+	"""
+	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
 
 
 def rst_char_len(char):
-    """ 
-    return len of string which fit in rst
-    For instance:chinese "我" decode as only one character, 
-    However, the rst interpreter needs 2 "=" instead of 1.
+	"""
+	return len of string which fit in rst
+	For instance:chinese "我" decode as only one character,
+	However, the rst interpreter needs 2 "=" instead of 1.
 
-    :param: char needs to be count
-    """
-    return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
+	:param: char needs to be count
+	"""
+	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
 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 xrange(1, times+1):
-            msg += "%s. Item\n" % x
-        return msg
-    else:
-        return ("%s Item\n" % leading) * times
+	"""
+	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 xrange(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
+	"""
+	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
+	: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
+	"""
+	find most popular code type in the given rst
 
-    :param path: file to detect
+	: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
 
-    :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
- 
 
 def complete(t, opts):
-    """
-    get options that start with t
+	"""
+	get options that start with t
 
-    :param t: query string
-    :param opts: list that needs to be completed
+	:param t: query string
+	:param opts: list that needs to be completed
 
-    :return: a string that start with t
-    """
-    msg = "({0})"
-    if t:
-        opts = [ m[len(t):] for m in opts if m.startswith(t) ]
-    if len(opts) == 1:
-        return opts[0]
+	:return: a string that start with t
+	"""
+	msg = "({0})"
+	if t:
+		opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+	if len(opts) == 1:
+		return opts[0]
 
-    if not len(opts):
-        msg = "{0}"
-    return msg.format("|".join(opts))
+	if not len(opts):
+		msg = "{0}"
+	return msg.format("|".join(opts))
 
 endglobal
 
@@ -199,22 +201,22 @@ snippet em "Emphasize string" i
 `!p
 # dirty but works with CJK charactor detection
 if has_cjk(vim.current.line):
-    snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
-if has_cjk(vim.current.line): 
-    snip.rv ="\ "
+	snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
 else:
-    snip.rv = " "
+	snip.rv = " "
 `$0
 endsnippet
 
 snippet st "Strong string" i
-`!p 
+`!p
 if has_cjk(vim.current.line):
-    snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
-if has_cjk(vim.current.line): 
-    snip.rv ="\ "
+	snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
 else:
-    snip.rv = " "
+	snip.rv = " "
 `$0
 endsnippet
 
@@ -236,12 +238,12 @@ snip.rv = make_items(match.groupdict()['num'], 1)
 `
 endsnippet
 ###########################################################################
-#                         More Specialized Stuff.                         #
+#						  More Specialized Stuff.						  #
 ###########################################################################
 snippet cb "Code Block" b
 .. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
-   ${2:code}
+	${2:code}
 
 $0
 endsnippet
@@ -249,7 +251,7 @@ endsnippet
 # match snippets :
 # img, inc, fig
 snippet id "Includable Directives" b
-`!p 
+`!p
 real_name=real_filename(ospath.basename(t[2]))
 di=t[1][:2]
 
@@ -257,28 +259,28 @@ link=""
 content=""
 
 if di == 'im':
-    link = "|{0}|".format(real_name)
+	link = "|{0}|".format(real_name)
 
 if di == 'fi':
-    content="""
-    :alt: {0}
-    {0}""".format(real_name)
+	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:file}`!p if content:
-    snip.rv +="    "+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])
+	snip.rv='.. FILE {0} does not exist'.format(t[2])
 else:
-    snip.rv=""
+	snip.rv=""
 `$0
 endsnippet
 
 snippet di "Directives" b
 .. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
 
-    ${3:Content}
+	${3:Content}
 $0
 endsnippet
 
@@ -289,8 +291,8 @@ endsnippet
 
 snippet sa "Specific Admonitions" b
 .. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
-    
-    ${2:Content}
+
+	${2:Content}
 
 $0
 endsnippet
@@ -298,8 +300,8 @@ 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\`\ 
+						  TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
+														path))`:\`$2\`\
 endsnippet
 
 ############
@@ -309,6 +311,6 @@ endsnippet
 snippet sid "SideBar" b
 .. sidebar:: ${1:SideBar Title}
 
-    ${2:SideBar Content}
+	${2:SideBar Content}
 endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
index 90001b1a..09a114f6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet "^#!" "#!/usr/bin/env ruby" r
 #!/usr/bin/env ruby
 $0
@@ -25,7 +27,7 @@ endsnippet
 
 snippet if "if <condition> ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 end
 endsnippet
 
@@ -33,9 +35,9 @@ endsnippet
 
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 else
-	${3}
+	${3:# TODO}
 end
 endsnippet
 
@@ -43,11 +45,11 @@ endsnippet
 
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 elsif ${3:condition}
-	${4}
+	${4:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -55,7 +57,7 @@ endsnippet
 
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -63,9 +65,9 @@ endsnippet
 
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
-	${2}
+	${2:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -73,11 +75,11 @@ endsnippet
 
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
-	${2}
+	${2:# TODO}
 elsif ${3:condition}
-	${4}
+	${4:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -85,7 +87,7 @@ endsnippet
 
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2: ${3:*args}}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -93,7 +95,7 @@ endsnippet
 
 snippet defi "def initialize ..."
 def initialize${1: ${2:*args}}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -101,23 +103,23 @@ endsnippet
 
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2: ${3:*args}}
-	${4}
+	${4:# TODO}
 rescue
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4} }
+(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
 endsnippet
 
 
 
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -138,42 +140,42 @@ endsnippet
 
 
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
 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}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
 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}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -194,71 +196,71 @@ endsnippet
 
 
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
 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}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
 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}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3} }
+${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
-snippet each_?s(lice)? "<array>.each_slice(n) do |slice| <block> end"
-each_slice(${1:2}) do |${2:slice}|
-	${0}
+snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
+${1:elements}.each_slice(${2:2}) do |${3:slice}|
+	${0:# TODO}
 end
 endsnippet
 
 
 
-snippet Each_?s(lice)? "<array>.each_slice(n) { |slice| <block> }"
-each_slice(${1:2}) { |${2:slice}| ${3} }
+snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
+${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
 endsnippet
 
 
@@ -273,7 +275,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -288,7 +290,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -303,7 +305,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -318,7 +320,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -333,7 +335,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -348,14 +350,14 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 
-snippet "(\S+)\.Each_w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
+snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
 `!p snip.rv=match.group(1)`.each_with_index { |${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)
@@ -364,7 +366,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3} }$0
+`},${2:i}| ${3:# TODO} }$0
 endsnippet
 
 
@@ -379,7 +381,7 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -387,14 +389,14 @@ endsnippet
 
 
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
 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}
+	${0:# TODO}
 end
 endsnippet
 
@@ -424,24 +426,26 @@ snippet "(\S+)\.Index" ".index do |item| ... end" r
 end
 endsnippet
 
-# comments about do and dov see snippets/ruby.snippets
-snippet do "do ... end" i
+
+
+snippet do "do |<key>| ... end" i
+do |${1:args}|
+	$0
+end
+endsnippet
+
+
+
+snippet Do "do ... end" i
 do
 	$0
 end
 endsnippet
 
-snippet dov "do |<key>| ... end" i
-do |${1:v}|
-	$2
-end
-endsnippet
-
-
 
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -449,15 +453,15 @@ endsnippet
 
 snippet Until "begin ... end until <expression>"
 begin
-	${0}
+	${0:# TODO}
 end until ${1:expression}
 endsnippet
 
 
 
-snippet wh "while <expression> ... end"
+snippet while "while <expression> ... end"
 while ${1:expression}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -465,7 +469,7 @@ endsnippet
 
 snippet While "begin ... end while <expression>"
 begin
-	${0}
+	${0:# TODO}
 end while ${1:expression}
 endsnippet
 
@@ -491,9 +495,9 @@ endsnippet
 
 snippet begin "begin ... rescue ... end"
 begin
-	${1}
+	${1:# TODO}
 rescue
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -559,7 +563,7 @@ endsnippet
 
 snippet ###
 =begin
-  $0
+	$0
 =end
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
new file mode 100644
index 00000000..70a44a07
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
@@ -0,0 +1,55 @@
+priority -50
+
+snippet /@?imp/ "@import '...';" br
+@import '${1:file}';
+endsnippet
+
+snippet /@?inc/ "@include mixin(...);" br
+@include ${1:mixin}(${2:arguments});
+endsnippet
+
+snippet /@?ext?/ "@extend %placeholder;" br
+@extend %${1:placeholder};
+endsnippet
+
+snippet /@?mixin/ "@mixin (...) { ... }" br
+@mixin ${1:name}(${2:arguments}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?fun/ "@function (...) { ... }" br
+@function ${1:name}(${2:arguments}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?if/ "@if (...) { ... }" br
+@if ${1:condition} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /(} )?@?else/ "@else { ... }" br
+@else ${1:condition} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?for/ "@for loop" br
+@for ${1:$i} from ${2:1} through ${3:3} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?each/ "@each loop" br
+@each ${1:$item} in ${2:item, item, item} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?while/ "@while loop" br
+@while ${1:$i} ${2:>} ${3:0} {
+	${VISUAL}$0
+}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/sh.snippets b/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
index cce06ef3..9cc45779 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/sh.snippets
@@ -1,21 +1,25 @@
+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 + "')")
+	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", "sh", "kornshell"]:
-            if testShell(scope, shell) == "1":
-                if shell == "kornshell":
-                    return "ksh"
-                return shell
-    return "sh"
+	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
 
 ###########################################################################
@@ -79,7 +83,7 @@ until ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
-snippet wh "while ... (done)"
+snippet while "while ... (done)"
 while ${2:[[ ${1:condition} ]]}; do
 	${0:#statements}
 done
diff --git a/sources_non_forked/vim-snippets/UltiSnips/snippets.snippets b/sources_non_forked/vim-snippets/UltiSnips/snippets.snippets
index 414f350e..ee0c8c76 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/snippets.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/snippets.snippets
@@ -1,16 +1,14 @@
-#########################
-# SNIPPETS for SNIPPETS #
-#########################
+priority -50
 
 # We use a little hack so that the snippet is expanded
 # and parsed correctly
-snippet snip "Snippet definition" !
-`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:!b}
+snippet snip "Snippet definition" b
+`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:b}
 $0
 `!p snip.rv = "endsnippet"`
 endsnippet
 
-snippet global "Global snippet" !
+snippet global "Global snippet" b
 `!p snip.rv = "global"` !p
 $0
 `!p snip.rv = "endglobal"`
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
index fd53d265..65849157 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tcl.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
@@ -16,14 +18,14 @@ foreach ${1:var} ${2:\$list} {
 endsnippet
 
 snippet if "if... (if)" b
-if {${1}} {
+if {${1:condition}} {
 	${2}
 }
 
 endsnippet
 
 snippet proc "proc... (proc)" b
-proc ${1} {${2}} \
+proc ${1:name} {${2:args}} \
 {
 	${3}
 }
@@ -40,8 +42,8 @@ switch ${1:-exact} -- ${2:\$var} {
 
 endsnippet
 
-snippet wh "while... (while)" b
-while {${1}} {
+snippet while "while... (while)" b
+while {${1:condition}} {
 	${2}
 }
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index db533070..c32d21f1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -1,38 +1,28 @@
+priority -50
 
-###########################################################################
-#                             LATEX SNIPPETS                              #
-###########################################################################
+extends texmath
 
-snippet r "\ref{}" w
-\ref{$1}
-endsnippet
-
-###########################################################################
-#                            TEXTMATE SNIPPETS                            #
-###########################################################################
-
-#################
-# GENERAL STUFF #
-#################
 snippet "b(egin)?" "begin{} / end{}" br
 \begin{${1:something}}
 	${0:${VISUAL}}
 \end{$1}
 endsnippet
 
-####################
-# TABULARS, ARRAYS #
-####################
-
 snippet tab
 \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
 
-########################
-# ENUM, DESCR, ITEMIZE #
-########################
+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
@@ -51,74 +41,70 @@ snippet desc "Description" b
 \end{description}
 endsnippet
 
-#####################################
-# SECTIONS, CHAPTERS AND THERE LIKE #
-#####################################
+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:_)/g}}}
+\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
 
 ${0}
-
-% part $2 (end)
 endsnippet
 
 snippet cha "Chapter" b
 \chapter{${1:chapter name}}
-\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% chapter $2 (end)
 endsnippet
 
 snippet sec "Section" b
 \section{${1:section name}}
-\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% section $2 (end)
 endsnippet
 
-
 snippet sub "Subsection" b
 \subsection{${1:subsection name}}
-\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% subsection $2 (end)
 endsnippet
 
 snippet ssub "Subsubsection" b
 \subsubsection{${1:subsubsection name}}
-\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% subsubsection $2 (end)
-
 endsnippet
 
 snippet par "Paragraph" b
 \paragraph{${1:paragraph name}}
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% paragraph $2 (end)
 endsnippet
 
-
 snippet subp "Subparagraph" b
 \subparagraph{${1:subparagraph name}}
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% subparagraph $2 (end)
 endsnippet
 
+snippet ni "Non-indented paragraph" b
+\noindent
+${0}
+endsnippet
+
+snippet pac "Package" b
+\usepackage[${1:options}]{${2:package}}$0
+endsnippet
+
+snippet lp "Long parenthesis"
+\left(${1:${VISUAL:contents}}\right)$0
+endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/texmath.snippets b/sources_non_forked/vim-snippets/UltiSnips/texmath.snippets
index 03589f0f..d0a25e9a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/texmath.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/texmath.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ##############
 # MATH STUFF #
 ##############
diff --git a/sources_non_forked/vim-snippets/UltiSnips/twig.snippets b/sources_non_forked/vim-snippets/UltiSnips/twig.snippets
index 9db43f7d..156b981b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/twig.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/twig.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet bl "twig block" b
 {% block ${1} %}
 ${2}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
index 5655c4b1..5ff22d2e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            SnipMate Snippets                            #
 ###########################################################################
@@ -25,30 +27,30 @@ endsnippet
 
 snippet f
 fun ${1:function_name}(${2})
-	${3}
+	${3:" code}
 endf
 endsnippet
 
 snippet for
-for ${1} in ${2}
-	${3}
+for ${1:needle} in ${2:haystack}
+	${3:" code}
 endfor
 endsnippet
 
 snippet wh
-while ${1}
-	${2}
+while ${1:condition}
+	${2:" code}
 endw
 endsnippet
 
 snippet if
-if ${1}
-	${2}
+if ${1:condition}
+	${2:" code}
 endif
 endsnippet
 
 snippet ife
-if ${1}
+if ${1:condition}
 	${2}
 else
 	${3}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets b/sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets
index e69de29b..a9c5a29a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/xhtml.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html
diff --git a/sources_non_forked/vim-snippets/UltiSnips/xml.snippets b/sources_non_forked/vim-snippets/UltiSnips/xml.snippets
index 80b017ce..92dfb6e1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/xml.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/xml.snippets
@@ -1,3 +1,10 @@
+priority -50
+
+snippet xml "XML declaration" b
+<?xml version="1.0"?>
+
+endsnippet
+
 snippet t "Simple tag" b
 <${1:tag}>
 	${2:content}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/zsh.snippets b/sources_non_forked/vim-snippets/UltiSnips/zsh.snippets
index 80394597..f7986ea5 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/zsh.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/zsh.snippets
@@ -1,9 +1,15 @@
-snippet #! "shebang" !
+priority -50
+
+extends sh
+
+priority -49
+
+snippet #! "shebang" b
 #!/bin/zsh
 
 endsnippet
 
-snippet !env "#!/usr/bin/env (!env)" !
+snippet !env "#!/usr/bin/env (!env)" b
 #!/usr/bin/env zsh
 
 endsnippet
diff --git a/sources_non_forked/vim-snippets/snippets/coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee.snippets
deleted file mode 100644
index 7ed1ebf4..00000000
--- a/sources_non_forked/vim-snippets/snippets/coffee.snippets
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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:# body...}
-# If __ Else
-snippet ife
-	if ${1:condition}
-		${2:# body...}
-	else
-		${0:# body...}
-# Else if
-snippet eif
-	else if ${1:condition}
-		${0:# body...}
-# 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}
-	catch ${2:error}
-		${0}
-# Require
-snippet req
-	${2:$1} = require '${1:sys}'
-# Export
-snippet exp
-	${0:root} = exports ? this
-
-
-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}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index d8892b5b..567003f7 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -361,15 +361,15 @@ snippet footer#
 		${0}
 	</footer>
 snippet form
-	<form action="${1}" method="${2:get}" accept-charset="utf-8">
+	<form action="${1}" method="${2:post}">
 		${0}
 	</form>
 snippet form.
-	<form class="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
+	<form class="${1}" action="${2}" method="${3:post}">
 		${0}
 	</form>
 snippet form#
-	<form id="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
+	<form id="${1}" action="${2}" method="${3:post}">
 		${0}
 	</form>
 snippet h1
diff --git a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets b/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
deleted file mode 100644
index ef6f66c7..00000000
--- a/sources_non_forked/vim-snippets/snippets/javascript-jquery.snippets
+++ /dev/null
@@ -1,589 +0,0 @@
-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/sources_non_forked/vim-snippets/snippets/javascript.d3.snippets b/sources_non_forked/vim-snippets/snippets/javascript.d3.snippets
deleted file mode 100644
index a3f7fa7a..00000000
--- a/sources_non_forked/vim-snippets/snippets/javascript.d3.snippets
+++ /dev/null
@@ -1,30 +0,0 @@
-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)
-	  .attr("height", $8)
-	    .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/sources_non_forked/vim-snippets/snippets/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript.snippets
deleted file mode 100644
index 0a046dbf..00000000
--- a/sources_non_forked/vim-snippets/snippets/javascript.snippets
+++ /dev/null
@@ -1,200 +0,0 @@
-# Prototype
-snippet proto
-	${1:class_name}.prototype.${2:method_name} =
-	function(${3:first_argument}) {
-		${0:// body...}
-	};
-# Function
-snippet fun
-	function ${1:function_name}(${2:argument}) {
-		${0:// body...}
-	}
-# Anonymous Function
-snippet f
-	function (${1}) {
-		${0}
-	}${2:;}
-# Immediate function
-snippet (f
-	(function (${1}) {
-		${0}
-	}(${2}));
-# if
-snippet if
-	if (${1:true}) {
-		${0}
-	}
-# if ... else
-snippet ife
-	if (${1:true}) {
-		${2}
-	} else {
-		${0}
-	}
-# tertiary conditional
-snippet ter
-	${1:/* condition */} ? ${2:a} : ${0:b}
-# switch
-snippet switch
-	switch (${1:expression}) {
-		case '${3:case}':
-			${4}
-			break;
-		${0}
-		default:
-			${2}
-	}
-# case
-snippet case
-	case '${1:case}':
-		${2}
-		break;
-	${0}
-# for (...) {...}
-snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
-		var ${3:v} = $1[$2];${0:}
-	}
-# for (...) {...} (Improved Native For-Loop)
-snippet forr
-	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
-		var ${3:v} = $1[$2];${0:}
-	}
-# while (...) {...}
-snippet wh
-	while (${1:/* condition */}) {
-		${0}
-	}
-# try
-snippet try
-	try {
-		${1}
-	} catch (${2:e}) {
-		${0:/* handle error */}
-	}
-# do...while
-snippet do
-	do {
-		${0}
-	} while (${1:/* condition */});
-# Object Method
-snippet :f
-	${1:method_name}: function (${2:attribute}) {
-		${0}
-	}${3:,}
-# setTimeout function
-snippet timeout
-	setTimeout(function () {${0}}${2}, ${1:10});
-# Get Elements
-snippet get
-	getElementsBy${1:TagName}('${2}')
-# Get Element
-snippet gett
-	getElementBy${1:Id}('${2}')
-# console.log (Firebug)
-snippet cl
-	console.log(${0});
-# return
-snippet ret
-	return ${0:result}
-# for (property in object ) { ... }
-snippet fori
-	for (var ${1:prop} in ${2:Things}) {
-		${0:$2[$1]}
-	}
-# hasOwnProperty
-snippet has
-	hasOwnProperty(${0})
-# docstring
-snippet /**
-	/**
-	 * ${0:description}
-	 *
-	 */
-snippet @par
-	@param {${1:type}} ${2:name} ${0:description}
-snippet @ret
-	@return {${1:type}} ${0:description}
-# JSON.parse
-snippet jsonp
-	JSON.parse(${0:jstr});
-# JSON.stringify
-snippet jsons
-	JSON.stringify(${0:object});
-# self-defining function
-snippet sdf
-	var ${1:function_name} = function (${2:argument}) {
-		${3}
-
-		$1 = function ($2) {
-			${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}
-		}
-	);
diff --git a/sources_non_forked/vim-snippets/snippets/javascript_jquery.snippets b/sources_non_forked/vim-snippets/snippets/javascript_jquery.snippets
deleted file mode 100644
index 9b4966db..00000000
--- a/sources_non_forked/vim-snippets/snippets/javascript_jquery.snippets
+++ /dev/null
@@ -1 +0,0 @@
-javascript-jquery.snippets
\ No newline at end of file
diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/sources_non_forked/vim-snippets/snippets/vim.snippets
index dd1e65e8..8e8093b9 100644
--- a/sources_non_forked/vim-snippets/snippets/vim.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vim.snippets
@@ -25,9 +25,8 @@ snippet for
 snippet forkv
 	for [${1},${2}] in items(${3})
 		${0}
-            unlet $1 $2
+		unlet $1 $2
 	endfor
-
 snippet wh
 	while ${1}
 		${0}
diff --git a/update_plugins.py b/update_plugins.py
index 3dacaf08..78de7826 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -38,6 +38,7 @@ vim-zenroom2 https://github.com/amix/vim-zenroom2
 syntastic https://github.com/scrooloose/syntastic
 vim-repeat https://github.com/tpope/vim-repeat
 vim-commentary https://github.com/tpope/vim-commentary
+vim-golang https://github.com/jnwhiteh/vim-golang
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'

From cdea5a5ee3c8593d31b19396a46b6a4eef508da9 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Tue, 11 Mar 2014 21:59:33 +0100
Subject: [PATCH 36/61] New snippets

---
 .../snippets/coffee/angular_coffee.snippets   | 116 ++++
 .../snippets/coffee/coffee.snippets           | 101 +++
 .../snippets/coffee/jquery_coffee.snippets    | 524 ++++++++++++++++
 .../javascript/javascript-jquery.snippets     | 589 ++++++++++++++++++
 .../javascript/javascript.d3.snippets         |  30 +
 .../snippets/javascript/javascript.snippets   | 200 ++++++
 6 files changed, 1560 insertions(+)
 create mode 100644 sources_non_forked/vim-snippets/snippets/coffee/angular_coffee.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/coffee/coffee.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/coffee/jquery_coffee.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript/javascript-jquery.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets

diff --git a/sources_non_forked/vim-snippets/snippets/coffee/angular_coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee/angular_coffee.snippets
new file mode 100644
index 00000000..f98cae35
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/coffee/coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee/coffee.snippets
new file mode 100644
index 00000000..bb964346
--- /dev/null
+++ b/sources_non_forked/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:# body...}
+# If __ Else
+snippet ife
+	if ${1:condition}
+		${2:# body...}
+	else
+		${0:# body...}
+# Else if
+snippet eif
+	else if ${1:condition}
+		${0:# body...}
+# 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}
+	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/sources_non_forked/vim-snippets/snippets/coffee/jquery_coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee/jquery_coffee.snippets
new file mode 100644
index 00000000..10bcd775
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/javascript/javascript-jquery.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript-jquery.snippets
new file mode 100644
index 00000000..ef6f66c7
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets
new file mode 100644
index 00000000..a3f7fa7a
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/javascript/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)
+	  .attr("height", $8)
+	    .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/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
new file mode 100644
index 00000000..0a046dbf
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -0,0 +1,200 @@
+# Prototype
+snippet proto
+	${1:class_name}.prototype.${2:method_name} =
+	function(${3:first_argument}) {
+		${0:// body...}
+	};
+# Function
+snippet fun
+	function ${1:function_name}(${2:argument}) {
+		${0:// body...}
+	}
+# Anonymous Function
+snippet f
+	function (${1}) {
+		${0}
+	}${2:;}
+# Immediate function
+snippet (f
+	(function (${1}) {
+		${0}
+	}(${2}));
+# if
+snippet if
+	if (${1:true}) {
+		${0}
+	}
+# if ... else
+snippet ife
+	if (${1:true}) {
+		${2}
+	} else {
+		${0}
+	}
+# tertiary conditional
+snippet ter
+	${1:/* condition */} ? ${2:a} : ${0:b}
+# switch
+snippet switch
+	switch (${1:expression}) {
+		case '${3:case}':
+			${4}
+			break;
+		${0}
+		default:
+			${2}
+	}
+# case
+snippet case
+	case '${1:case}':
+		${2}
+		break;
+	${0}
+# for (...) {...}
+snippet for
+	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
+		var ${3:v} = $1[$2];${0:}
+	}
+# for (...) {...} (Improved Native For-Loop)
+snippet forr
+	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
+		var ${3:v} = $1[$2];${0:}
+	}
+# while (...) {...}
+snippet wh
+	while (${1:/* condition */}) {
+		${0}
+	}
+# try
+snippet try
+	try {
+		${1}
+	} catch (${2:e}) {
+		${0:/* handle error */}
+	}
+# do...while
+snippet do
+	do {
+		${0}
+	} while (${1:/* condition */});
+# Object Method
+snippet :f
+	${1:method_name}: function (${2:attribute}) {
+		${0}
+	}${3:,}
+# setTimeout function
+snippet timeout
+	setTimeout(function () {${0}}${2}, ${1:10});
+# Get Elements
+snippet get
+	getElementsBy${1:TagName}('${2}')
+# Get Element
+snippet gett
+	getElementBy${1:Id}('${2}')
+# console.log (Firebug)
+snippet cl
+	console.log(${0});
+# return
+snippet ret
+	return ${0:result}
+# for (property in object ) { ... }
+snippet fori
+	for (var ${1:prop} in ${2:Things}) {
+		${0:$2[$1]}
+	}
+# hasOwnProperty
+snippet has
+	hasOwnProperty(${0})
+# docstring
+snippet /**
+	/**
+	 * ${0:description}
+	 *
+	 */
+snippet @par
+	@param {${1:type}} ${2:name} ${0:description}
+snippet @ret
+	@return {${1:type}} ${0:description}
+# JSON.parse
+snippet jsonp
+	JSON.parse(${0:jstr});
+# JSON.stringify
+snippet jsons
+	JSON.stringify(${0:object});
+# self-defining function
+snippet sdf
+	var ${1:function_name} = function (${2:argument}) {
+		${3}
+
+		$1 = function ($2) {
+			${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}
+		}
+	);

From ac3ef260c8838af9d168bac588f0634d42e7590b Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Fri, 18 Apr 2014 13:52:50 +0100
Subject: [PATCH 37/61] Removed PeepOpen (CTRLp is much better)

---
 vimrcs/plugins_config.vim | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index 73d96bc7..fc0072bd 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -45,19 +45,13 @@ endif
 let g:ctrlp_working_path_mode = 0
 
 let g:ctrlp_map = '<c-f>'
+map <leader>j :CtrlP<cr>
 map <c-b> :CtrlPBuffer<cr>
 
 let g:ctrlp_max_height = 20
 let g:ctrlp_custom_ignore = 'node_modules\|^\.DS_Store\|^\.git\|^\.coffee'
 
 
-""""""""""""""""""""""""""""""
-" => Peepopen
-""""""""""""""""""""""""""""""
-map <leader>j :PeepOpen<cr>
-
-
-
 """"""""""""""""""""""""""""""
 " => ZenCoding
 """"""""""""""""""""""""""""""

From 6a16a9393c145893e2cafd43a76423235cf69b0f Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Fri, 18 Apr 2014 13:58:02 +0100
Subject: [PATCH 38/61] Updated plugins

---
 sources_non_forked/ack.vim/README.md          | 125 +++----
 sources_non_forked/ack.vim/Rakefile           |  23 --
 sources_non_forked/ack.vim/autoload/ack.vim   | 143 ++++++++
 sources_non_forked/ack.vim/doc/ack.txt        | 149 +++++++-
 .../ack.vim/doc/ack_quick_help.txt            |  14 +
 sources_non_forked/ack.vim/ftplugin/qf.vim    |   9 +
 sources_non_forked/ack.vim/plugin/ack.vim     | 149 +++-----
 sources_non_forked/goyo.vim/plugin/goyo.vim   |   5 +-
 sources_non_forked/syntastic/CONTRIBUTING.md  |   2 +-
 sources_non_forked/syntastic/README.markdown  |  51 ++-
 .../autoload/syntastic/postprocess.vim        |  19 --
 .../autoload/syntastic/preprocess.vim         |  39 +++
 .../syntastic/autoload/syntastic/util.vim     |  52 ++-
 .../syntastic/doc/syntastic.txt               |  44 ++-
 .../syntastic/plugin/syntastic.vim            |   8 +-
 .../syntastic/plugin/syntastic/checker.vim    |  18 +
 .../syntastic/plugin/syntastic/loclist.vim    |   4 +
 .../syntastic/plugin/syntastic/registry.vim   |   1 +
 .../syntax_checkers/actionscript/mxmlc.vim    |   2 +-
 .../syntastic/syntax_checkers/c/oclint.vim    |   9 +-
 .../syntastic/syntax_checkers/c/splint.vim    |   3 +
 .../syntax_checkers/css/prettycss.vim         |   5 +-
 .../syntax_checkers/haskell/hdevtools.vim     |  28 +-
 .../syntax_checkers/haskell/hlint.vim         |   8 +-
 .../syntax_checkers/haskell/scan.vim          |  43 +++
 .../syntastic/syntax_checkers/html/jshint.vim |   3 +-
 .../syntastic/syntax_checkers/html/tidy.vim   | 194 ++++++-----
 .../syntax_checkers/java/checkstyle.vim       |   5 +-
 .../syntastic/syntax_checkers/java/javac.vim  |  22 +-
 .../syntax_checkers/javascript/eslint.vim     |  15 +-
 .../syntax_checkers/javascript/jscs.vim       |   9 +-
 .../syntax_checkers/javascript/jshint.vim     |  15 +-
 .../syntax_checkers/javascript/jsl.vim        |   3 +-
 .../syntax_checkers/javascript/jsxhint.vim    |   4 -
 .../syntax_checkers/python/pylama.vim         |   5 +-
 .../syntax_checkers/python/pylint.vim         |  10 +-
 .../syntastic/syntax_checkers/r/lint.vim      |  78 +++++
 .../syntastic/syntax_checkers/r/svtools.vim   |  77 +++++
 .../syntax_checkers/racket/code-ayatollah.vim |   5 +-
 .../syntastic/syntax_checkers/tex/chktex.vim  |   9 +-
 .../syntax_checkers/typescript/tsc.vim        |   9 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |  11 +-
 .../syntastic/syntax_checkers/xhtml/tidy.vim  |  26 +-
 .../syntastic/syntax_checkers/xml/plutil.vim  |  42 +++
 .../tlib/autoload/tlib/World.vim              |   4 +-
 .../tlib/autoload/tlib/cache.vim              |  45 ++-
 .../tlib/autoload/tlib/input.vim              |   7 +-
 .../tlib/autoload/tlib/list.vim               |  40 ++-
 .../tlib/autoload/tlib/persistent.vim         |  11 +-
 sources_non_forked/tlib/doc/tlib.txt          |   8 +
 sources_non_forked/tlib/plugin/02tlib.vim     |  10 +-
 .../autoload/airline/extensions.vim           |   3 +-
 .../autoload/airline/extensions/branch.vim    |  54 ++-
 .../autoload/airline/extensions/eclim.vim     |   2 +-
 .../autoload/airline/extensions/tabline.vim   |   8 +-
 .../airline/extensions/whitespace.vim         |  10 +-
 .../autoload/airline/themes/luna.vim          |   2 +-
 .../autoload/airline/themes/sol.vim           |  10 +-
 .../vim-airline/doc/airline.txt               |   9 +-
 .../vim-commentary/README.markdown            |  10 +-
 .../vim-commentary/doc/commentary.txt         |  19 +-
 .../vim-commentary/plugin/commentary.vim      |  39 ++-
 .../vim-fugitive/doc/fugitive.txt             |   2 +
 .../vim-fugitive/plugin/fugitive.vim          | 126 ++++---
 .../vim-markdown/ftplugin/markdown.vim        |  28 ++
 .../vim-snipmate/Contributors.md              |   1 +
 sources_non_forked/vim-snipmate/README.md     |  28 ++
 .../vim-snipmate/autoload/snipMate.vim        | 123 +++----
 .../vim-snipmate/doc/snipMate.txt             |  13 +-
 .../vim-snipmate/plugin/snipMate.vim          |  77 +++--
 .../vim-snipmate/plugin/snipMateInterface.vim |   2 -
 .../vim-snippets/UltiSnips/html.snippets      |   2 +-
 .../vim-snippets/UltiSnips/java.snippets      |  21 +-
 .../vim-snippets/UltiSnips/php.snippets       |  12 +-
 .../vim-snippets/UltiSnips/proto.snippets     |  52 +++
 .../vim-snippets/UltiSnips/python.snippets    |  80 ++++-
 .../vim-snippets/UltiSnips/r.snippets         | 144 ++++++++
 .../vim-snippets/UltiSnips/rnoweb.snippets    |   3 +
 .../vim-snippets/UltiSnips/rst.snippets       |  23 +-
 .../vim-snippets/UltiSnips/rust.snippets      | 215 ++++++++++++
 .../vim-snippets/UltiSnips/soy.snippets       |  63 ++++
 .../vim-snippets/plugin/vimsnippets.vim       |  37 ++
 .../vim-snippets/pythonx/vimsnippets.py       |  20 ++
 .../vim-snippets/snippets/django.snippets     |   6 +-
 .../vim-snippets/snippets/erlang.snippets     | 322 +++++++++++++++++-
 .../vim-snippets/snippets/eruby.snippets      |   2 +
 .../vim-snippets/snippets/haskell.snippets    |   2 +
 .../vim-snippets/snippets/jade.snippets       |  18 +
 .../vim-snippets/snippets/python.snippets     |   8 +
 .../vim-snippets/snippets/ruby.snippets       |  43 +++
 .../vim-snippets/snippets/scala.snippets      |   3 +-
 91 files changed, 2554 insertions(+), 708 deletions(-)
 delete mode 100644 sources_non_forked/ack.vim/Rakefile
 create mode 100644 sources_non_forked/ack.vim/autoload/ack.vim
 create mode 100644 sources_non_forked/ack.vim/doc/ack_quick_help.txt
 create mode 100644 sources_non_forked/ack.vim/ftplugin/qf.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/r/lint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
 delete mode 100644 sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/proto.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/r.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/rnoweb.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/rust.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/soy.snippets
 create mode 100644 sources_non_forked/vim-snippets/plugin/vimsnippets.vim
 create mode 100644 sources_non_forked/vim-snippets/pythonx/vimsnippets.py
 create mode 100644 sources_non_forked/vim-snippets/snippets/jade.snippets

diff --git a/sources_non_forked/ack.vim/README.md b/sources_non_forked/ack.vim/README.md
index e7182452..d9dbb929 100644
--- a/sources_non_forked/ack.vim/README.md
+++ b/sources_non_forked/ack.vim/README.md
@@ -1,101 +1,60 @@
-# ack.vim #
+# ack.vim
 
 This plugin is a front for the Perl module
 [App::Ack](http://search.cpan.org/~petdance/ack/ack).  Ack can be used as a
 replacement for 99% of the uses of _grep_.  This plugin will allow you to run
 ack from vim, and shows the results in a split window.
 
-The *Official Version* of this plugin is available at [vim.org](http://www.vim.org/scripts/script.php?script_id=2572).
-
-## Installation ##
-
+## Installation
 
 ### Ack
 
-You have to install [ack](http://betterthangrep.com/), of course.
-
-Install on Debian / Ubuntu with:
-
-    sudo apt-get install ack-grep
-
-Install on Fedora with:
-
-    su -l -c 'yum install ack'
-
-Install on openSUSE with:
-
-    sudo zypper install ack
-
-Install on Gentoo with:
-
-    sudo emerge ack
-
-Install with Homebrew:
-
-    brew install ack
-
-Install with MacPorts:
-
-    sudo port install p5-app-ack
-
-Install with Gentoo Prefix:
-
-    emerge ack
-
-Install on FreeBSD with:
-
-    cd /usr/ports/textproc/p5-ack/ && make install clean
-
-You can specify a custom ack name and path in your .vimrc like so:
-
-    let g:ackprg="<custom-ack-path-goes-here> -H --nocolor --nogroup --column"
-
-Otherwise, you are on your own.
+You will need the ack, of course, to install it follow the
+[manual](http://beyondgrep.com/install/)
 
 ### The Plugin
 
-If you have [Rake](http://rake.rubyforge.org/) installed, you can just run: `rake install`.
+To install it is recommended to use one of the popular package managers for Vim,
+rather than installing by drag and drop all required files into your `.vim` folder.
 
-Otherwise, the file ack.vim goes in ~/.vim/plugin, and the ack.txt file belongs in ~/.vim/doc.  Be sure to run
+#### Manual (not recommended)
 
-    :helptags ~/.vim/doc
+Just
+[download](https://github.com/mileszs/ack.vim/archive/kb-improve-readme.zip) the
+plugin and put it in your `~/.vim/`(or `%PROGRAMFILES%/Vim/vimfiles` on windows)
 
-afterwards.
+#### Vundle
 
+    Bundle 'mileszs/ack.vim'
 
-## Usage ##
+#### NeoBundle
 
-    :Ack [options] {pattern} [{directory}]
+    NeoBundle 'mileszs/ack.vim'
 
-Search recursively in {directory} (which defaults to the current directory) for the {pattern}.
+## Usage
+
+    :Ack [options] {pattern} [{directories}]
+
+Search recursively in {directory} (which defaults to the current directory) for
+the {pattern}.
 
 Files containing the search term will be listed in the split window, along with
 the line number of the occurrence, once for each occurrence.  [Enter] on a line
 in this window will open the file, and place the cursor on the matching line.
 
-Just like where you use :grep, :grepadd, :lgrep, and :lgrepadd, you can use `:Ack`, `:AckAdd`, `:LAck`, and `:LAckAdd` respectively. (See `doc/ack.txt`, or install and `:h Ack` for more information.)
+Just like where you use :grep, :grepadd, :lgrep, and :lgrepadd, you can use
+`:Ack`, `:AckAdd`, `:LAck`, and `:LAckAdd` respectively.
+(See `doc/ack.txt`, or install and `:h Ack` for more information.)
 
-**From the [ack docs](http://betterthangrep.com/)** (my favorite feature):
+For more ack options see
+[ack documentation](http://beyondgrep.com/documentation/)
 
-    --type=TYPE, --type=noTYPE
-
-        Specify the types of files to include or exclude from a search. TYPE is a filetype, like perl or xml. --type=perl can also be specified as --perl, and --type=noperl can be done as --noperl.
-
-        If a file is of both type "foo" and "bar", specifying --foo and --nobar will exclude the file, because an exclusion takes precedence over an inclusion.
-
-        Type specifications can be repeated and are ORed together.
-
-        See ack --help=types for a list of valid types.
-
-### Gotchas ###
-
-Some characters have special meaning, and need to be escaped your search pattern. For instance, '#'. You have to escape it like this `:Ack '\\\#define foo'` to search for `#define foo`. (From [blueyed in issue #5](https://github.com/mileszs/ack.vim/issues/5).)
-
-### Keyboard Shortcuts ###
+### Keyboard Shortcuts
 
 In the quickfix window, you can use:
 
     o    to open (same as enter)
+    O    to open and close quickfix window
     go   to preview file (open but maintain focus on ack.vim results)
     t    to open in new tab
     T    to open in new tab silently
@@ -106,9 +65,29 @@ In the quickfix window, you can use:
     q    to close the quickfix window
 
 This Vim plugin is derived (and by derived, I mean copied, essentially) from
-Antoine Imbert's blog post [Ack and Vim
-Integration](http://blog.ant0ine.com/typepad/2007/03/ack-and-vim-integration.html) (in
-particular, the function at the bottom of the post).  I added a help file that
+Antoine Imbert's blog post
+[Ack and Vim Integration](http://blog.ant0ine.com/typepad/2007/03/ack-and-vim-integration.html)
+(in particular, the function at the bottom of the post).  I added a help file that
 provides just enough reference to get you going.  I also highly recommend you
-check out the docs for the Perl script 'ack', for obvious reasons: [ack -
-grep-like text finder](http://betterthangrep.com/).
+check out the docs for the Perl script 'ack', for obvious reasons:
+[ack - grep-like text finder](http://beyondgrep.com/).
+
+### Gotchas
+
+Some characters have special meaning, and need to be escaped your search
+pattern. For instance, '#'. You have to escape it like this :Ack '\\\#define
+foo' to search for #define foo. (From blueyed in issue #5.)
+
+## Changelog
+
+### 1.0
+
+* Remove support to ack 1.x
+* Start to use a Changelog
+* Use `autoload` directory to define functions, instead of `plugin`.
+* Add option to auto fold the results(`g:ack_autofold_results`)
+* Improve documentation, list all options and shortcuts
+* Improve highlight option to work when passes directories or use quotes.
+* Add g:ack_mapping
+* Add g:ack_default_options
+* Add a help toggle `?`(like NERDTree)
diff --git a/sources_non_forked/ack.vim/Rakefile b/sources_non_forked/ack.vim/Rakefile
deleted file mode 100644
index af5a8695..00000000
--- a/sources_non_forked/ack.vim/Rakefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Added by Josh Nichols, a.k.a. technicalpickles
-require 'rake'
-
-files = ['doc/ack.txt', 'plugin/ack.vim']
-
-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 "  Copied #{file} to #{target_file}"
-  end
-
-end
diff --git a/sources_non_forked/ack.vim/autoload/ack.vim b/sources_non_forked/ack.vim/autoload/ack.vim
new file mode 100644
index 00000000..ff8d8eb6
--- /dev/null
+++ b/sources_non_forked/ack.vim/autoload/ack.vim
@@ -0,0 +1,143 @@
+function! ack#Ack(cmd, args)
+  redraw
+  echo "Searching ..."
+
+  " If no pattern is provided, search for the word under the cursor
+  if empty(a:args)
+    let l:grepargs = expand("<cword>")
+  else
+    let l:grepargs = a:args . join(a:000, ' ')
+  end
+  let l:ackprg_run = g:ackprg
+
+  " Format, used to manage column jump
+  if a:cmd =~# '-g$'
+    let g:ackformat="%f"
+    let l:ackprg_run = substitute(l:ackprg_run, '-H\|--column', '', 'g')
+  else
+    let g:ackformat="%f:%l:%c:%m,%f:%l:%m"
+  endif
+
+  let grepprg_bak = &grepprg
+  let grepformat_bak = &grepformat
+  let &grepprg=l:ackprg_run
+  let &grepformat=g:ackformat
+
+  try
+    " NOTE: we escape special chars, but not everything using shellescape to
+    "       allow for passing arguments etc
+    silent execute a:cmd . " " . escape(l:grepargs, '|#%')
+  finally
+    let &grepprg=grepprg_bak
+    let &grepformat=grepformat_bak
+  endtry
+
+  if a:cmd =~# '^l'
+    let s:handler = g:ack_lhandler
+    let s:apply_mappings = g:ack_apply_lmappings
+    let s:close_cmd = ':lclose<CR>'
+  else
+    let s:handler = g:ack_qhandler
+    let s:apply_mappings = g:ack_apply_qmappings
+    let s:close_cmd = ':cclose<CR>'
+  endif
+
+  call ack#show_results()
+  call <SID>highlight(l:grepargs)
+
+  redraw!
+endfunction
+
+function! ack#show_results()
+  execute s:handler
+  call <SID>apply_maps()
+endfunction
+
+function! s:apply_maps()
+  let g:ack_mappings.q = s:close_cmd
+
+  execute "nnoremap <buffer> <silent> ? :call ack#quick_help()<CR>"
+
+  if s:apply_mappings && &ft == "qf"
+    if g:ack_autoclose
+      for key_map in items(g:ack_mappings)
+        execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1) . s:close_cmd)
+      endfor
+      execute "nnoremap <buffer> <silent> <CR> <CR>" . s:close_cmd
+    else
+      for key_map in items(g:ack_mappings)
+        execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1))
+      endfor
+    endif
+
+    if exists("g:ackpreview") " if auto preview in on, remap j and k keys
+      execute "nnoremap <buffer> <silent> j j<CR><C-W><C-W>"
+      execute "nnoremap <buffer> <silent> k k<CR><C-W><C-W>"
+    endif
+  endif
+endfunction
+
+function! ack#quick_help()
+  execute "edit " . globpath(&rtp, "doc/ack_quick_help.txt")
+
+  silent normal gg
+  setlocal buftype=nofile
+  setlocal bufhidden=hide
+  setlocal noswapfile
+  setlocal nobuflisted
+  setlocal nomodifiable
+  setlocal filetype=help
+  setlocal nonumber
+  setlocal norelativenumber
+  setlocal nowrap
+  setlocal foldlevel=20
+  setlocal foldmethod=diff
+  nnoremap <buffer> <silent> ? :q!<CR>:call ack#show_results()<CR>
+endfunction
+
+function! s:highlight(args)
+  if !g:ackhighlight
+    return
+  endif
+
+  let @/ = matchstr(a:args, "\\v\\w+\>|['\"]\\zs[^\"]+\\ze['\"]")
+  setlocal hlsearch
+  call feedkeys(":let v:hlsearch=1 \| echo \<CR>", "n")
+endfunction
+
+function! ack#AckFromSearch(cmd, args)
+  let search = getreg('/')
+  " translate vim regular expression to perl regular expression.
+  let search = substitute(search, '\(\\<\|\\>\)', '\\b', 'g')
+  call ack#Ack(a:cmd, '"' . search . '" ' . a:args)
+endfunction
+
+function! s:GetDocLocations()
+  let dp = ''
+  for p in split(&rtp, ',')
+    let p = p . '/doc/'
+    if isdirectory(p)
+      let dp = p . '*.txt ' . dp
+    endif
+  endfor
+
+  return dp
+endfunction
+
+function! ack#AckHelp(cmd, args)
+  let args = a:args . ' ' . s:GetDocLocations()
+  call ack#Ack(a:cmd, args)
+endfunction
+
+function! ack#AckWindow(cmd, args)
+  let files = tabpagebuflist()
+  " remove duplicated filenames (files appearing in more than one window)
+  let files = filter(copy(sort(files)), 'index(files,v:val,v:key+1)==-1')
+  call map(files, "bufname(v:val)")
+  " remove unnamed buffers as quickfix (empty strings before shellescape)
+  call filter(files, 'v:val != ""')
+  " expand to full path (avoid problems with cd/lcd in au QuickFixCmdPre)
+  let files = map(files, "shellescape(fnamemodify(v:val, ':p'))")
+  let args = a:args . ' ' . join(files)
+  call ack#Ack(a:cmd, args)
+endfunction
diff --git a/sources_non_forked/ack.vim/doc/ack.txt b/sources_non_forked/ack.vim/doc/ack.txt
index ec06da3a..33c10529 100644
--- a/sources_non_forked/ack.vim/doc/ack.txt
+++ b/sources_non_forked/ack.vim/doc/ack.txt
@@ -16,7 +16,7 @@ shows the results in a split window.
     Search recursively in {directory} (which defaults to the current
     directory) for the {pattern}.  Behaves just like the |:grep| command, but
     will open the |Quickfix| window for you. If [!] is not given the first
-    error is jumped to.
+    occurence is jumped to.
 
 :AckAdd [options] {pattern} [{directory}]                            *:AckAdd*
 
@@ -45,7 +45,7 @@ shows the results in a split window.
 
 :AckHelp[!] [options] {pattern}                                      *:AckHelp*
 
-    Search vim documentation files for the {pattern}.  Behaves just like the 
+    Search vim documentation files for the {pattern}.  Behaves just like the
     |:Ack| command, but searches only vim documentation .txt files
 
 :LAckHelp [options] {pattern}                                        *:LAckHelp*
@@ -53,6 +53,16 @@ shows the results in a split window.
     Just like |:AckHelp| but instead of the |quickfix| list, matches are placed
     in the current |location-list|.
 
+:AckWindow[!] [options] {pattern}                                 *:AckWindow*
+
+    Search all buffers visible in the screen (current tab page only) files for
+    the {pattern}.
+
+:LAckWindow [options] {pattern}                                   *:LAckWindow*
+
+    Just like |:AckWindow| but instead of the |quickfix| list, matches are
+    placed in the current |location-list|.
+
 Files containing the search term will be listed in the split window, along
 with the line number of the occurrence, once for each occurrence.  <Enter> on
 a line in this window will open the file, and place the cursor on the matching
@@ -60,6 +70,139 @@ line.
 
 See http://betterthangrep.com/ for more information.
 
+
+==============================================================================
+CONFIGURATION                                              *ack-configuration*
+
+                                                                    *g:ackprg*
+g:ackprg
+Default for ubuntu: "ack-grep"
+Default for other systems: "ack"
+
+Use this option to specify the ack command and its options
+
+Example:
+>
+        let g:ackprg = "other-bin-ack"
+<
+
+                                                        g:ack_default_options*
+g:ack_default_options
+Default: " -s -H --nocolor --nogroup --column"
+
+Use this option to specify the options used by ack
+
+Example:
+>
+        let g:ackprg =
+              \ " -s -H --nocolor --nogroup --column --smart-case --follow"
+<
+
+                                                       *g:ack_apply_qmappings*
+g:ack_apply_qmappings
+Default: 1
+
+This option enable mappings on quickview window.
+
+                                                       *g:ack_apply_lmappings*
+g:ack_apply_lmappings
+Default: 1
+
+This option enable mappings on Location list window.
+
+                                                              *g:ack_mappings*
+g:ack_mappings
+Default: {
+      \ "t": "<C-W><CR><C-W>T",
+      \ "T": "<C-W><CR><C-W>TgT<C-W>j",
+      \ "o": "<CR>",
+      \ "O": "<CR><C-W><C-W>:ccl<CR>",
+      \ "go": "<CR><C-W>j",
+      \ "h": "<C-W><CR><C-W>K",
+      \ "H": "<C-W><CR><C-W>K<C-W>b",
+      \ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
+      \ "gv": "<C-W><CR><C-W>H<C-W>b<C-W>J" }
+
+This option list all maps create on quickfix/Location list window.
+
+Example, if you want to open the result in the middle of the screen:
+>
+        let g:ack_mappings = { "o": "<CR>zz" }
+<
+
+                                                              *g:ack_qhandler*
+g:ack_qhandler
+Default: "botright copen"
+
+Command to open the quickview window.
+
+If you want to open a quickview window with 30 lines you can do:
+>
+        let g:ack_qhandler = "botright copen 30"
+<
+
+                                                              *g:ack_lhandler*
+g:ack_lhandler
+Default: "botright lopen"
+
+Command to open the Location list window.
+
+If you want to open a Location list window with 30 lines you can do:
+>
+        let g:ack_lhandler = "botright lopen 30"
+<
+
+                                                              *g:ackhighlight*
+
+g:ackhighlight
+Default: 0
+
+Use this option to highlight the searched term.
+
+Example:
+>
+        let g:ackhighlight = 1
+<
+
+                                                             *g:ack_autoclose*
+g:ack_autoclose
+Default: 0
+
+Use this option to specify whether to close the quickfix window after
+using any of the shortcuts.
+
+Example:
+>
+        let g:ack_autoclose = 1
+<
+
+                                                      *g:ack_autofold_results*
+
+g:ack_autofold_results
+Default: 0
+
+Use this option to fold the results in quickfix by file name. Only the current
+fold will be open by default and while you press 'j' and 'k' to move between the
+results if you hit other fold the last one will be closed and the current will
+be open.
+
+Example:
+>
+        let g:ack_autofold_results = 1
+<
+
+                                                                *g:ackpreview*
+
+g:ackpreview
+Default: 0
+
+Use this option to automagically open the file with 'j' or 'k'.
+
+Example:
+>
+        let g:ackpreview = 1
+<
+
 ==============================================================================
 MAPPINGS                                                        *ack-mappings*
 
@@ -67,6 +210,8 @@ The following keyboard shortcuts are available in the quickfix window:
 
 o                   open file (same as enter).
 
+O                   open file and close quickfix window.
+
 go                  preview file (open but maintain focus on ack.vim results).
 
 t                   open in a new tab.
diff --git a/sources_non_forked/ack.vim/doc/ack_quick_help.txt b/sources_non_forked/ack.vim/doc/ack_quick_help.txt
new file mode 100644
index 00000000..5c52f6cb
--- /dev/null
+++ b/sources_non_forked/ack.vim/doc/ack_quick_help.txt
@@ -0,0 +1,14 @@
+====  ack.vim quick help ===============
+
+  *?:*  Show this help
+  *t:*  Open in a new tab
+  *T:*  Open in a new tab silently
+  *o:*  Open
+  *O:*  Open and close result window
+ *go:*  Preview
+  *h:*  Horizontal open
+  *H:*  Horizontal open silently
+  *v:*  Vertical open
+ *gv:*  Vertical open silently
+
+========================================
diff --git a/sources_non_forked/ack.vim/ftplugin/qf.vim b/sources_non_forked/ack.vim/ftplugin/qf.vim
new file mode 100644
index 00000000..7da45a4c
--- /dev/null
+++ b/sources_non_forked/ack.vim/ftplugin/qf.vim
@@ -0,0 +1,9 @@
+if g:ack_autofold_results
+  setlocal foldlevel=0
+  setlocal foldmethod=expr
+  setlocal foldexpr=matchstr(getline(v:lnum),'^[^\|]\\+')==#matchstr(getline(v:lnum+1),'^[^\|]\\+')?1:'<1'
+  setlocal foldenable
+  setlocal foldclose=all
+  setlocal foldopen=all
+  nnoremap <buffer> j jzz
+endif
diff --git a/sources_non_forked/ack.vim/plugin/ack.vim b/sources_non_forked/ack.vim/plugin/ack.vim
index 3c664bd5..e5d0507b 100644
--- a/sources_non_forked/ack.vim/plugin/ack.vim
+++ b/sources_non_forked/ack.vim/plugin/ack.vim
@@ -1,16 +1,17 @@
-" NOTE: You must, of course, install the ack script
-"       in your path.
-" On Debian / Ubuntu:
-"   sudo apt-get install ack-grep
-" With MacPorts:
-"   sudo port install p5-app-ack
-" With Homebrew:
-"   brew install ack
+if !exists("g:ack_default_options")
+  let g:ack_default_options = " -s -H --nocolor --nogroup --column"
+endif
 
 " Location of the ack utility
 if !exists("g:ackprg")
-  let s:ackcommand = executable('ack-grep') ? 'ack-grep' : 'ack'
-  let g:ackprg=s:ackcommand." -H --nocolor --nogroup --column"
+  if executable('ack')
+    let g:ackprg = "ack"
+  elseif executable('ack-grep')
+    let g:ackprg = "ack-grep"
+  else
+    finish
+  endif
+  let g:ackprg .= g:ack_default_options
 endif
 
 if !exists("g:ack_apply_qmappings")
@@ -21,102 +22,50 @@ if !exists("g:ack_apply_lmappings")
   let g:ack_apply_lmappings = !exists("g:ack_lhandler")
 endif
 
+let s:ack_mappings = {
+      \ "t": "<C-W><CR><C-W>T",
+      \ "T": "<C-W><CR><C-W>TgT<C-W>j",
+      \ "o": "<CR>",
+      \ "O": "<CR><C-W><C-W>:ccl<CR>",
+      \ "go": "<CR><C-W>j",
+      \ "h": "<C-W><CR><C-W>K",
+      \ "H": "<C-W><CR><C-W>K<C-W>b",
+      \ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
+      \ "gv": "<C-W><CR><C-W>H<C-W>b<C-W>J" }
+
+if exists("g:ack_mappings")
+  let g:ack_mappings = extend(s:ack_mappings, g:ack_mappings)
+else
+  let g:ack_mappings = s:ack_mappings
+endif
+
 if !exists("g:ack_qhandler")
-  let g:ack_qhandler="botright copen"
+  let g:ack_qhandler = "botright copen"
 endif
 
 if !exists("g:ack_lhandler")
-  let g:ack_lhandler="botright lopen"
+  let g:ack_lhandler = "botright lopen"
 endif
 
-function! s:Ack(cmd, args)
-  redraw
-  echo "Searching ..."
+if !exists("g:ackhighlight")
+  let g:ackhighlight = 0
+endif
 
-  " If no pattern is provided, search for the word under the cursor
-  if empty(a:args)
-    let l:grepargs = expand("<cword>")
-  else
-    let l:grepargs = a:args . join(a:000, ' ')
-  end
+if !exists("g:ack_autoclose")
+  let g:ack_autoclose = 0
+endif
 
-  " Format, used to manage column jump
-  if a:cmd =~# '-g$'
-    let g:ackformat="%f"
-  else
-    let g:ackformat="%f:%l:%c:%m,%f:%l:%m"
-  end
+if !exists("g:ack_autofold_results")
+  let g:ack_autofold_results = 0
+endif
 
-  let grepprg_bak=&grepprg
-  let grepformat_bak=&grepformat
-  try
-    let &grepprg=g:ackprg
-    let &grepformat=g:ackformat
-    silent execute a:cmd . " " . escape(l:grepargs, '|')
-  finally
-    let &grepprg=grepprg_bak
-    let &grepformat=grepformat_bak
-  endtry
-
-  if a:cmd =~# '^l'
-    exe g:ack_lhandler
-    let l:apply_mappings = g:ack_apply_lmappings
-    let l:close_cmd = ':lclose<CR>'
-  else
-    exe g:ack_qhandler
-    let l:apply_mappings = g:ack_apply_qmappings
-    let l:close_cmd = ':cclose<CR>'
-  endif
-
-  if l:apply_mappings
-    exec "nnoremap <silent> <buffer> q " . l:close_cmd
-    exec "nnoremap <silent> <buffer> t <C-W><CR><C-W>T"
-    exec "nnoremap <silent> <buffer> T <C-W><CR><C-W>TgT<C-W><C-W>"
-    exec "nnoremap <silent> <buffer> o <CR>"
-    exec "nnoremap <silent> <buffer> go <CR><C-W><C-W>"
-    exec "nnoremap <silent> <buffer> h <C-W><CR><C-W>K"
-    exec "nnoremap <silent> <buffer> H <C-W><CR><C-W>K<C-W>b"
-    exec "nnoremap <silent> <buffer> v <C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t"
-    exec "nnoremap <silent> <buffer> gv <C-W><CR><C-W>H<C-W>b<C-W>J"
-  endif
-
-  " If highlighting is on, highlight the search keyword.
-  if exists("g:ackhighlight")
-    let @/ = substitute(l:grepargs,'["'']','','g')
-    set hlsearch
-  end
-
-  redraw!
-endfunction
-
-function! s:AckFromSearch(cmd, args)
-  let search =  getreg('/')
-  " translate vim regular expression to perl regular expression.
-  let search = substitute(search,'\(\\<\|\\>\)','\\b','g')
-  call s:Ack(a:cmd, '"' .  search .'" '. a:args)
-endfunction
-
-function! s:GetDocLocations()
-    let dp = ''
-    for p in split(&rtp,',')
-        let p = p.'/doc/'
-        if isdirectory(p)
-            let dp = p.'*.txt '.dp
-        endif
-    endfor
-    return dp
-endfunction
-
-function! s:AckHelp(cmd,args)
-    let args = a:args.' '.s:GetDocLocations()
-    call s:Ack(a:cmd,args)
-endfunction
-
-command! -bang -nargs=* -complete=file Ack call s:Ack('grep<bang>',<q-args>)
-command! -bang -nargs=* -complete=file AckAdd call s:Ack('grepadd<bang>', <q-args>)
-command! -bang -nargs=* -complete=file AckFromSearch call s:AckFromSearch('grep<bang>', <q-args>)
-command! -bang -nargs=* -complete=file LAck call s:Ack('lgrep<bang>', <q-args>)
-command! -bang -nargs=* -complete=file LAckAdd call s:Ack('lgrepadd<bang>', <q-args>)
-command! -bang -nargs=* -complete=file AckFile call s:Ack('grep<bang> -g', <q-args>)
-command! -bang -nargs=* -complete=help AckHelp call s:AckHelp('grep<bang>',<q-args>)
-command! -bang -nargs=* -complete=help LAckHelp call s:AckHelp('lgrep<bang>',<q-args>)
+command! -bang -nargs=* -complete=file Ack           call ack#Ack('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckAdd        call ack#Ack('grepadd<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckFromSearch call ack#AckFromSearch('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file LAck          call ack#Ack('lgrep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file LAckAdd       call ack#Ack('lgrepadd<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckFile       call ack#Ack('grep<bang> -g', <q-args>)
+command! -bang -nargs=* -complete=help AckHelp       call ack#AckHelp('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=help LAckHelp      call ack#AckHelp('lgrep<bang>', <q-args>)
+command! -bang -nargs=* -complete=help AckWindow     call ack#AckWindow('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=help LAckWindow    call ack#AckWindow('lgrep<bang>', <q-args>)
diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 751162ce..311589ed 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -46,7 +46,7 @@ function! s:init_pad(command)
   execute a:command
 
   setlocal buftype=nofile bufhidden=wipe nomodifiable nobuflisted noswapfile
-        \ nonu nocursorline winfixwidth winfixheight statusline=\ 
+      \ nonu nocursorline nocursorcolumn winfixwidth winfixheight statusline=\ 
   if exists('&rnu')
     setlocal nornu
   endif
@@ -115,6 +115,8 @@ function! s:tranquilize()
 endfunction
 
 function! s:goyo_on(width)
+  let s:orig_tab = tabpagenr()
+
   " New tab
   tab split
 
@@ -249,6 +251,7 @@ function! s:goyo_off()
     bd
   endif
   tabclose
+  execute 'normal! '.s:orig_tab.'gt'
 
   let wmh = remove(goyo_revert, 'winminheight')
   let wh  = remove(goyo_revert, 'winheight')
diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/sources_non_forked/syntastic/CONTRIBUTING.md
index 764ffffc..2eac8325 100644
--- a/sources_non_forked/syntastic/CONTRIBUTING.md
+++ b/sources_non_forked/syntastic/CONTRIBUTING.md
@@ -29,7 +29,7 @@ Following 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](http://www.refactoring.com/catalog/introduceExplainingVariable.html) to aid readability.
+* Code for maintainability. We would rather a function be a couple of lines longer and have (for example) some [explaining variables](http://www.refactoring.com/catalog/extractVariable.html) to aid readability.
 
 # Syntax checker style notes
 
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 653bd7c6..cdb6f559 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -40,10 +40,11 @@ CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir,
 Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
 Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
 LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
-OCaml, Perl, Perl POD, PHP, gettext Portable Object, Puppet, Python, Racket,
-reStructuredText, Ruby, Rust, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig,
-TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope
-page templates, and zsh.
+OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and iOS property
+lists, Puppet, Python, Racket, R, reStructuredText, Ruby, Rust, SASS/SCSS,
+Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL,
+xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.  See the
+[wiki][3] for details about the corresponding supported checkers.
 
 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
@@ -111,6 +112,8 @@ If you get an error when you do this, then you probably didn't install
 
 ## 3\. FAQ
 
+<a name="faqinfo"></a>
+
 __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
@@ -125,6 +128,8 @@ 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
 create an issue - or better yet, create a pull request.
 
+<a name="faqperl"></a>
+
 __Q. The `perl` checker has stopped working...__
 
 A. The `perl` checker runs `perl -c` against your file, which in turn
@@ -138,6 +143,8 @@ still producing useful results, the checker is now disabled by default.  To
 let g:syntastic_enable_perl_checker = 1
 ```
 
+<a name="faqloclist"></a>
+
 __Q. I run a checker and the location list is not updated...__
 
 A. By default the location list is changed only when you run the `:Errors`
@@ -148,6 +155,8 @@ your vimrc:
 let g:syntastic_always_populate_loc_list = 1
 ```
 
+<a name="faqargs"></a>
+
 __Q. How can I pass additional arguments to a checker?__
 
 A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
@@ -162,6 +171,8 @@ let g:syntastic_ruby_mri_args = "--my --args --here"
 
 See `:help syntastic-checker-options` for more information.
 
+<a name="faqcheckers"></a>
+
 __Q. Syntastic supports several checkers for my filetype - how do I tell it
 which one(s) to use?__
 
@@ -190,6 +201,32 @@ 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>`.
+
+e.g. 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`.  You can't run checkers for
+"foreign" filetypes though (e.g. you can't run, say, a Python checker if the
+current filetype is `php`).
+
+<a name="faqaggregate"></a>
+
+__Q. How can I display together the errors found by all checkers enabled for
+the current file?__
+
+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="faqlnext"></a>
+
 __Q. How can I jump between the different errors without using the location
 list at the bottom of the window?__
 
@@ -200,6 +237,8 @@ If you use these commands a lot then you may want to add shortcut mappings to
 your vimrc, or install something like [unimpaired][2], which provides such
 mappings (among other things).
 
+<a name="faqstyle"></a>
+
 __Q. A syntax checker is giving me unwanted/strange style tips?__
 
 A. Some filetypes (e.g. php) have style checkers as well as syntax
@@ -214,6 +253,8 @@ let g:syntastic_quiet_messages = { "type": "style" }
 ```
 See `:help syntastic_quiet_messages` for details.
 
+<a name="faqbdelete"></a>
+
 __Q. The error window is closed automatically when I :quit the current buffer
 but not when I :bdelete it?__
 
@@ -248,5 +289,5 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [6]: http://stackoverflow.com/questions/tagged/syntastic
 [7]: https://github.com/davidhalter/jedi-vim
 [8]: https://github.com/klen/python-mode
-[9]: https://github.com/Valloric/YouCompleteMe
+[9]: http://valloric.github.io/YouCompleteMe/
 [10]: http://perldoc.perl.org/perlrun.html#*-c*
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
index 1558f0f8..377e64a7 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -8,25 +8,6 @@ set cpo&vim
 
 " Public functions {{{1
 
-function! s:compareErrorItems(a, b) " {{{2
-    if a:a['bufnr'] != a:b['bufnr']
-        " group by files
-        return a:a['bufnr'] - a:b['bufnr']
-    elseif a:a['lnum'] != a:b['lnum']
-        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
-        return get(a:a, 'col', 0) - get(a:b, 'col', 0)
-    endif
-endfunction " }}}2
-
-" natural sort
-function! syntastic#postprocess#sort(errors) " {{{2
-    return sort(copy(a:errors), 's:compareErrorItems')
-endfunction " }}}2
-
 " merge consecutive blanks
 function! syntastic#postprocess#compressWhitespace(errors) " {{{2
     for e in a:errors
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index f1af35be..4501e3ff 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -56,6 +56,45 @@ function! syntastic#preprocess#perl(errors) " {{{2
     return syntastic#util#unique(out)
 endfunction " }}}2
 
+function! syntastic#preprocess#rparse(errors) " {{{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#validator(errors) " {{{2
     let out = []
     for e in a:errors
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index d1dc2618..d4fa034b 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -101,7 +101,7 @@ function! syntastic#util#wideMsg(msg) " {{{2
     "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(" ", &ts - s:width(v:val) % &ts)'), '') . chunks[-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
@@ -218,6 +218,13 @@ function! syntastic#util#dictFilter(errors, filter) " {{{2
     endtry
 endfunction " }}}2
 
+function! syntastic#util#sortLoclist(errors) " {{{2
+    for e in a:errors
+        call s:setScreenColumn(e)
+    endfor
+    call sort(a:errors, 's:compareErrorItems')
+endfunction " }}}2
+
 " }}}1
 
 " Private functions {{{1
@@ -254,6 +261,49 @@ function! s:translateElement(key, term) " {{{2
     return ret
 endfunction " }}}2
 
+function! s:screenWidth(str, tabstop) " {{{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
+
+function! s:setScreenColumn(item) " {{{2
+    if !has_key(a:item, 'scol')
+        let col = get(a:item, 'col', 0)
+        if col != 0 && a:item['vcol'] == 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'] = s:screenWidth(strpart(line, 0, col), getbufvar(buf, '&tabstop'))
+        else
+            let a:item['scol'] = col
+        endif
+    endif
+endfunction " }}}2
+
+function! s:compareErrorItems(a, b) " {{{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
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index 86a5ed2b..fd0fb2b9 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -39,6 +39,8 @@ CONTENTS                                                  *syntastic-contents*
         6.2.Interaction with python-mode...........|syntastic-pymode|
         6.3.Interaction with the fish shell........|syntastic-fish|
         6.4.Using syntastic with the fizsh shell...|syntastic-fizsh|
+        6.5.Interaction with Eclim.................|syntastic-eclim|
+        6.6.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
     7.About........................................|syntastic-about|
     8.License......................................|syntastic-license|
 
@@ -186,7 +188,12 @@ 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 these labels by unsetting '|syntastic_id_checkers|'.
+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.
 
 ------------------------------------------------------------------------------
 2.6 Filtering errors                              *syntastic-filtering-errors*
@@ -278,6 +285,14 @@ a file with a composite filetype), 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'*
+Default: 1
+By default, when |syntastic_aggregate_errors| is enabled, 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'*
 Default: 1
@@ -557,10 +572,10 @@ Use |:SyntasticInfo| to see which checkers are available for a given filetype.
 ------------------------------------------------------------------------------
 5.2 Choosing the executable                            *syntastic-config-exec*
 
-                                    *'syntastic_<filetype>_<subchecker>_exec'*
+                                       *'syntastic_<filetype>_<checker>_exec'*
 The executable used by a checker is normally defined automatically, when the
 checkers is registered. You can however override it by setting the variable
-'g:syntastic_<filetype>_<subchecker>_exec': >
+'g:syntastic_<filetype>_<checker>_exec': >
     let g:syntastic_ruby_mri_exec = '~/bin/ruby2'
 <
 ------------------------------------------------------------------------------
@@ -569,7 +584,7 @@ checkers is registered. You can however override it by setting the variable
 Most checkers use the 'makeprgBuild()' function and provide many options by
 default - in fact you can customise every part of the command that gets called.
 
-                                *'syntastic_<filetype>_<subchecker>_<option>'*
+                                   *'syntastic_<filetype>_<checker>_<option>'*
 Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
     let makeprg = self.makeprgBuild({
                 \ 'exe': self.getExec(),
@@ -580,7 +595,7 @@ Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
 The result is a 'makeprg' of the form: >
     <exe> <args> <filename> <post_args> <tail>
 <
-                                     *'syntastic_<filetype>_<subchecker>_exe'*
+                                        *'syntastic_<filetype>_<checker>_exe'*
 All arguments 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(). These variables also
@@ -598,7 +613,7 @@ To override the args and the tail: >
     let g:syntastic_ruby_mri_tail = "> /tmp/my-output-file-biatch"
 <
 The general form of the override options is: >
-    syntastic_<filetype>_<subchecker>_<option-name>
+    syntastic_<filetype>_<checker>_<option-name>
 <
 For checkers that do not use the 'makeprgBuild()' function you will have to
 look at the source code of the checker in question. If there are specific
@@ -663,6 +678,23 @@ interactive features of 'fizsh'. Using a more traditional shell such as 'zsh',
 'bash', 'ksh', or the original Bourne 'sh' might be a better choice: >
     set shell=zsh
 <
+------------------------------------------------------------------------------
+6.5. Interaction with Eclim                                  *syntastic-eclim*
+
+As far as syntastic is concerned there shouldn't be any compatibility problems
+with the 'Eclim' Vim plugin (see http://eclim.org/). However, at the time of
+this writing there are several reports that 'Eclim' triggers a bug in Vim that
+makes syntastic forget some of its configuration parameters. No solutions or
+workarounds are known for now.
+
+------------------------------------------------------------------------------
+6.6. Interaction with 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. About                                                     *syntastic-about*
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 28f26381..39b22805 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -18,7 +18,7 @@ if has('reltime')
     let g:syntastic_start = reltime()
 endif
 
-let g:syntastic_version = '3.4.0'
+let g:syntastic_version = '3.4.0-34'
 
 " Sanity checks {{{1
 
@@ -64,6 +64,7 @@ let g:syntastic_defaults = {
         \ 'loc_list_height':          10,
         \ 'quiet_messages':           {},
         \ 'reuse_loc_lists':          (v:version >= 704),
+        \ 'sort_aggregated_errors':   1,
         \ 'stl_format':               '[Syntax: line:%F (%t)]',
         \ 'style_error_symbol':       'S>',
         \ 'style_warning_symbol':     'S>',
@@ -297,6 +298,7 @@ function! s:CacheErrors(checker_names) " {{{2
         let filetypes = s:resolveFiletypes()
         let aggregate_errors = syntastic#util#var('aggregate_errors')
         let decorate_errors = (aggregate_errors || len(filetypes) > 1) && syntastic#util#var('id_checkers')
+        let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
 
         let clist = []
         for type in filetypes
@@ -352,6 +354,10 @@ function! s:CacheErrors(checker_names) " {{{2
         " }}}3
 
         call syntastic#log#debug(g:SyntasticDebugLoclist, 'aggregated:', newLoclist)
+        if sort_aggregated_errors
+            call newLoclist.sort()
+            call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', newLoclist)
+        endif
     endif
 
     let b:syntastic_loclist = newLoclist
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 504342d4..e93291ba 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -13,6 +13,7 @@ function! g:SyntasticChecker.New(args) " {{{2
     let newObj._filetype = a:args['filetype']
     let newObj._name = a:args['name']
     let newObj._exec = get(a:args, 'exec', newObj._name)
+    let newObj._sort = 0
 
     if has_key(a:args, 'redirect')
         let [filetype, name] = split(a:args['redirect'], '/')
@@ -68,6 +69,7 @@ function! g:SyntasticChecker.getLocListRaw() " {{{2
     call self._populateHighlightRegexes(list)
     call syntastic#log#debug(g:SyntasticDebugLoclist, name . ' raw:', list)
     call self._quietMessages(list)
+    call self._sortMessages(list)
     return list
 endfunction " }}}2
 
@@ -75,6 +77,14 @@ function! g:SyntasticChecker.getLocList() " {{{2
     return g:SyntasticLoclist.New(self.getLocListRaw())
 endfunction " }}}2
 
+function! g:SyntasticChecker.getWantSort() " {{{2
+    return self._sort
+endfunction " }}}2
+
+function! g:SyntasticChecker.setWantSort(val) " {{{2
+    let self._sort = a:val
+endfunction " }}}2
+
 function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
     let basename = self._filetype . '_' . self._name . '_'
 
@@ -121,6 +131,14 @@ function! g:SyntasticChecker._quietMessages(errors) " {{{2
     endif
 endfunction " }}}2
 
+function! g:SyntasticChecker._sortMessages(errors) " {{{2
+    " don't sort now if we're going to sort the aggregated list later
+    if self._sort && !(syntastic#util#var('aggregate_errors') && syntastic#util#var('sort_aggregated_errors'))
+        call syntastic#util#sortLoclist(a:errors)
+        call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', a:errors)
+    endif
+endfunction " }}}2
+
 function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
     if has_key(self, '_highlightRegexFunc')
         for e in a:errors
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index 3d3a649e..074c4fc6 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -37,6 +37,10 @@ function! g:SyntasticLoclist.extend(other) " {{{2
     return g:SyntasticLoclist.New(list)
 endfunction " }}}2
 
+function! g:SyntasticLoclist.sort() " {{{2
+    call syntastic#util#sortLoclist(self._rawLoclist)
+endfunction " }}}2
+
 function! g:SyntasticLoclist.isEmpty() " {{{2
     return empty(self._rawLoclist)
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 09ca4c90..72ba93ad 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -60,6 +60,7 @@ let s:defaultCheckers = {
         \ 'pod':         ['podchecker'],
         \ 'puppet':      ['puppet', 'puppetlint'],
         \ 'python':      ['python', 'flake8', 'pylint'],
+        \ 'r':           [],
         \ 'racket':      ['racket'],
         \ 'rst':         ['rst2pseudoxml'],
         \ 'ruby':        ['mri'],
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
index e423aa0d..0c4d09db 100644
--- a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -47,7 +47,7 @@ endfunction
 function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args_before': (g:syntastic_actionscript_mxmlc_conf != '' ?
-        \   ' -load-config+=' . g:syntastic_actionscript_mxmlc_conf : ''),
+        \   ' -load-config+=' . syntastic#util#shexpand(g:syntastic_actionscript_mxmlc_conf) : ''),
         \ 'args_after': '-output=' . syntastic#util#DevNull() })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
index e3dd0ad4..ca717c48 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -30,7 +30,6 @@ set cpo&vim
 
 function! SyntaxCheckers_c_oclint_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args_after': '-text',
         \ 'post_args_before': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
 
     let errorformat =
@@ -42,12 +41,16 @@ function! SyntaxCheckers_c_oclint_GetLocList() dict
         \ '%W%f:%l:%c: warning: %m,' .
         \ '%-G%.%#'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'postprocess': ['compressWhitespace', 'sort'],
+        \ 'postprocess': ['compressWhitespace'],
         \ 'returns': [0, 3, 5] })
+
+    call self.setWantSort(1)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
index 991a681b..f56af1ae 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
@@ -35,8 +35,11 @@ function! SyntaxCheckers_c_splint_GetLocList() dict
 
     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 %.%#'
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
index 10d6af3d..06fd7e46 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -43,13 +43,14 @@ function! SyntaxCheckers_css_prettycss_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr("")},
-        \ 'postprocess': ['sort'] })
+        \ 'defaults': {'bufnr': bufnr("")} })
 
     for e in loclist
         let e["text"] .= ')'
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
index 29abca7e..81954916 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -19,22 +19,28 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haskell_hdevtools_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': self.getExecEscaped() . ' check',
-        \ 'args': get(g:, 'hdevtools_options', '') })
+    if exists('g:hdevtools_options')
+        let g:syntastic_haskell_hdevtools_args = g:hdevtools_options
+    endif
 
-    let errorformat= '\%-Z\ %#,'.
-        \ '%W%f:%l:%c:\ Warning:\ %m,'.
-        \ '%W%f:%l:%c:\ Warning:,'.
-        \ '%E%f:%l:%c:\ %m,'.
-        \ '%E%>%f:%l:%c:,'.
-        \ '%+C\ \ %#%m,'.
-        \ '%W%>%f:%l:%c:,'.
-        \ '%+C\ \ %#%tarning:\ %m,'
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'check',
+        \ 'fname': syntastic#util#shexpand('%:p') })
+
+    let errorformat =
+        \ '%-Z %#,'.
+        \ '%W%f:%l:%v: Warning: %m,'.
+        \ '%W%f:%l:%v: Warning:,'.
+        \ '%E%f:%l:%v: %m,'.
+        \ '%E%>%f:%l:%v:,'.
+        \ '%+C  %#%m,'.
+        \ '%W%>%f:%l:%v:,'.
+        \ '%+C  %#%tarning: %m,'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'defaults': {'vcol': 1},
         \ 'postprocess': ['compressWhitespace'] })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
index e859d299..592e4d39 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
@@ -14,16 +14,18 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haskell_hlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
+    let makeprg = self.makeprgBuild({
+        \ 'fname': syntastic#util#shexpand('%:p')})
 
     let errorformat =
-        \ '%E%f:%l:%c: Error: %m,' .
-        \ '%W%f:%l:%c: Warning: %m,' .
+        \ '%E%f:%l:%v: Error: %m,' .
+        \ '%W%f:%l:%v: Warning: %m,' .
         \ '%C%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'defaults': {'vcol': 1},
         \ 'postprocess': ['compressWhitespace'] })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
new file mode 100644
index 00000000..ed74a004
--- /dev/null
+++ b/sources_non_forked/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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_scan_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%v: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'scan'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index 0f3055bc..2c64fb62 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -34,7 +34,8 @@ endfunction
 function! SyntaxCheckers_html_jshint_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'exe': expand(g:syntastic_jshint_exec),
-        \ 'args': (g:syntastic_html_jshint_conf != '' ? '--config ' . g:syntastic_html_jshint_conf : ''),
+        \ 'args': (g:syntastic_html_jshint_conf != '' ?
+        \       '--config ' . syntastic#util#shexpand(g:syntastic_html_jshint_conf) : ''),
         \ 'args_after': '--verbose --extract always' })
 
     let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 9c87cf90..67dab605 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -10,7 +10,15 @@
 "
 "============================================================================
 "
-" Checker option:
+" Note: if you need to check HTML5 sources, you might consider installing a
+" fork of HTML Tidy, named "HTML Tidy for HTML5":
+"
+"   http://w3c.github.io/tidy-html5/
+"
+" HTML Tidy for HTML5 can be used without changes by this checker, just install
+" it and point g:syntastic_html_tidy_exec to the executable.
+"
+" Checker options:
 "
 " - g:syntastic_html_tidy_ignore_errors (list; default: [])
 "   list of errors to ignore
@@ -48,108 +56,108 @@ set cpo&vim
 " TODO: join this with xhtml.vim for 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',
-                \}
+            \ '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
 
 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\""
-                \ ]
+        \ "<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\""
+    \ ]
 
 let s:blocklevel_tags = [
-                \ "main",
-                \ "section",
-                \ "article",
-                \ "aside",
-                \ "header",
-                \ "footer",
-                \ "nav",
-                \ "figure",
-                \ "figcaption"
-                \ ]
+        \ "main",
+        \ "section",
+        \ "article",
+        \ "aside",
+        \ "header",
+        \ "footer",
+        \ "nav",
+        \ "figure",
+        \ "figcaption"
+    \ ]
 
 let s:inline_tags = [
-                \ "video",
-                \ "audio",
-                \ "source",
-                \ "embed",
-                \ "mark",
-                \ "progress",
-                \ "meter",
-                \ "time",
-                \ "ruby",
-                \ "rt",
-                \ "rp",
-                \ "canvas",
-                \ "command",
-                \ "details",
-                \ "datalist"
-                \ ]
+        \ "video",
+        \ "audio",
+        \ "source",
+        \ "embed",
+        \ "mark",
+        \ "progress",
+        \ "meter",
+        \ "time",
+        \ "ruby",
+        \ "rt",
+        \ "rp",
+        \ "canvas",
+        \ "command",
+        \ "details",
+        \ "datalist"
+    \ ]
 
 let s:empty_tags = [
-                \ "wbr",
-                \ "keygen"
-                \ ]
+        \ "wbr",
+        \ "keygen"
+    \ ]
 
 function! s:IgnoreError(text)
     for i in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 092d1992..387c2c9f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -37,8 +37,9 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
         \ 'args_after': '-cp ' . g:syntastic_java_checkstyle_classpath .
-        \               ' com.puppycrawl.tools.checkstyle.Main -c ' . g:syntastic_java_checkstyle_conf_file .
-        \               ' -f xml',
+        \       ' com.puppycrawl.tools.checkstyle.Main -c ' .
+        \       syntastic#util#shexpand(g:syntastic_java_checkstyle_conf_file) .
+        \       ' -f xml',
         \ 'fname': fname })
 
     let errorformat = '%f:%t:%l:%c:%m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 7bdd0ebd..cf15b4ba 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -43,7 +43,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! s:CygwinPath(path)
-    return substitute(system("cygpath -m " . a:path), '\n', '', 'g')
+    return substitute(system("cygpath -m " . syntastic#util#shescape(a:path)), '\n', '', 'g')
 endfunction
 
 if !exists("g:syntastic_java_javac_temp_dir")
@@ -123,8 +123,8 @@ function! s:SplitClasspath(classpath)
 endfunction
 
 function! s:LoadConfigFile()
-    if filereadable(g:syntastic_java_javac_config_file)
-        exe 'source '.g:syntastic_java_javac_config_file
+    if filereadable(expand(g:syntastic_java_javac_config_file))
+        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file))
     endif
 endfunction
 
@@ -137,9 +137,9 @@ function! s:SaveClasspath()
     endfor
     " save classpath to config file
     if g:syntastic_java_javac_config_file_enabled
-        if filereadable(g:syntastic_java_javac_config_file)
+        if filereadable(expand(g:syntastic_java_javac_config_file))
             " load lines from config file
-            let lines = readfile(g:syntastic_java_javac_config_file)
+            let lines = readfile(expand(g:syntastic_java_javac_config_file))
             " strip g:syntastic_java_javac_classpath options from config file lines
             let i = 0
             while i < len(lines)
@@ -155,7 +155,7 @@ function! s:SaveClasspath()
         " add new g:syntastic_java_javac_classpath option to config
         call add(lines, 'let g:syntastic_java_javac_classpath = "'.path.'"')
         " save config file lines
-        call writefile(lines, g:syntastic_java_javac_config_file)
+        call writefile(lines, expand(g:syntastic_java_javac_config_file))
     endif
     " set new classpath
     let g:syntastic_java_javac_classpath = path
@@ -192,7 +192,7 @@ function! s:SaveConfig()
     let lines = getline(1, line('$'))
     if g:syntastic_java_javac_config_file_enabled
         " save config file lines
-        call writefile(lines, g:syntastic_java_javac_config_file)
+        call writefile(lines, expand(g:syntastic_java_javac_config_file))
     endif
     let &modified = 0
 endfunction
@@ -202,8 +202,8 @@ function! s:EditConfig()
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
         let lines = []
-        if filereadable(g:syntastic_java_javac_config_file)
-            let lines = readfile(g:syntastic_java_javac_config_file)
+        if filereadable(expand(g:syntastic_java_javac_config_file))
+            let lines = readfile(expand(g:syntastic_java_javac_config_file))
         endif
         execute (len(lines) + 5) . 'sp ' . fnameescape(command)
 
@@ -329,7 +329,7 @@ function! s:MavenOutputDirectory()
         endif
 
         if has('win32unix')
-            let output_dir=s:CygwinPath(output_dir)
+            let output_dir = s:CygwinPath(output_dir)
         endif
         return output_dir
     endif
@@ -408,7 +408,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
     let fname = fnameescape(expand ( '%:p:h' ) . sep . expand ( '%:t' ))
 
     if has('win32unix')
-        let fname =  s:CygwinPath(fname)
+        let fname = s:CygwinPath(fname)
     endif
 
     let makeprg = self.makeprgBuild({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index c23cbbc7..ee744acb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -21,22 +21,31 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
+    return
+        \ executable('eslint') &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion('eslint --version'), [0, 1])
+endfunction
+
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args': (g:syntastic_javascript_eslint_conf != '' ? '--config ' . g:syntastic_javascript_eslint_conf : '') })
+        \ 'args_before': '-f compact',
+        \ 'args': (g:syntastic_javascript_eslint_conf != '' ?
+        \       '--config ' . syntastic#util#shexpand(g:syntastic_javascript_eslint_conf) : '') })
 
     let errorformat =
         \ '%E%f: line %l\, col %c\, Error - %m'
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['sort'] })
+        \ 'errorformat': errorformat })
 
     for e in loclist
         let e['col'] += 1
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index c9cb4e95..c5017522 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -19,14 +19,19 @@ set cpo&vim
 
 function! SyntaxCheckers_javascript_jscs_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter checkstyle' })
+
     let errorformat = '%f:%t:%l:%c:%m'
-    return SyntasticMake({
+
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
         \ 'preprocess': 'checkstyle',
-        \ 'postprocess': ['sort'],
         \ 'returns': [0, 2] })
+
+    call self.setWantSort(1)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index cf0924cc..712fe16e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -25,19 +25,22 @@ function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
     if !exists('g:syntastic_jshint_exec')
         let g:syntastic_jshint_exec = self.getExec()
     endif
-    return executable(expand(g:syntastic_jshint_exec))
+    if !executable(expand(g:syntastic_jshint_exec))
+        return 0
+    endif
+    let s:jshint_version = syntastic#util#getVersion(syntastic#util#shexpand(g:syntastic_jshint_exec) . ' --version')
+    return syntastic#util#versionIsAtLeast(s:jshint_version, [1])
 endfunction
 
 function! SyntaxCheckers_javascript_jshint_GetLocList() dict
-    let exe = syntastic#util#shexpand(g:syntastic_jshint_exec)
     if !exists('s:jshint_new')
-        let s:jshint_new =
-            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 1])
+        let s:jshint_new = syntastic#util#versionIsAtLeast(s:jshint_version, [1, 1])
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args': (g:syntastic_javascript_jshint_conf != '' ? '--config ' . g:syntastic_javascript_jshint_conf : ''),
+        \ 'exe': syntastic#util#shexpand(g:syntastic_jshint_exec),
+        \ 'args': (g:syntastic_javascript_jshint_conf != '' ?
+        \       '--config ' . syntastic#util#shexpand(g:syntastic_javascript_jshint_conf) : ''),
         \ 'args_after': (s:jshint_new ? '--verbose ' : '') })
 
     let errorformat = s:jshint_new ?
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
index 0e894bf1..13328c20 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
@@ -23,7 +23,8 @@ set cpo&vim
 
 function! SyntaxCheckers_javascript_jsl_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args': (g:syntastic_javascript_jsl_conf != '' ? '-conf ' . g:syntastic_javascript_jsl_conf : ''),
+        \ 'args': (g:syntastic_javascript_jsl_conf != '' ?
+        \       '-conf ' . syntastic#util#shexpand(g:syntastic_javascript_jsl_conf) : ''),
         \ 'args_after': '-nologo -nofilelisting -nosummary -nocontext -process' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 3a77aba0..21ba6a04 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -18,10 +18,6 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
-    if !executable('jshint') || !syntastic#util#versionIsAtLeast(syntastic#util#getVersion('jshint --version'), [1, 1])
-        return 0
-    endif
-
     let jsxhint_version = system(self.getExecEscaped() . ' --version')
     return
         \ v:shell_error == 0 &&
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index 93aa4bad..25219d77 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -32,8 +32,7 @@ function! SyntaxCheckers_python_pylama_GetLocList() dict
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['sort'] })
+        \ 'errorformat': errorformat })
 
     " adjust for weirdness in each checker
     for e in loclist
@@ -53,6 +52,8 @@ function! SyntaxCheckers_python_pylama_GetLocList() dict
         endif
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 5cc74bb0..4c4b88e0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -32,10 +32,9 @@ function! SyntaxCheckers_python_pylint_GetLocList() dict
         \ '%-Z%p^%.%#,' .
         \ '%-G%.%#'
 
-    let loclist=SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'postprocess': ['sort'],
         \ 'returns': range(32) })
 
     for e in loclist
@@ -55,6 +54,8 @@ function! SyntaxCheckers_python_pylint_GetLocList() dict
         let e['vcol'] = 0
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
@@ -63,9 +64,10 @@ function! s:PylintNew(exe)
     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", that would be.
+        " On NixOS, that would be ".pylint-wrapped 0.26.0".
+        " On Arch Linux it's "pylint2 1.1.0".
         " Have you guys considered switching to creative writing yet? ;)
-        let pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^\.\=pylint\>''')[0]
+        let pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^\.\=pylint[-0-9]*\>''')[0]
         let pylint_version = substitute(pylint_version, '\v^\S+\s+', '', '')
         let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(pylint_version), [1])
     catch /\m^Vim\%((\a\+)\)\=:E684/
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
new file mode 100644
index 00000000..b0cae68d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -0,0 +1,78 @@
+"============================================================================
+"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
+
+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 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 makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape('library(lint); try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%t:%f:%l:%v: %m,' .
+        \ '%t:%f:%l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'rparse',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if e['type'] == 'F'
+            " parse error
+            let e['type'] = 'E'
+            call remove(e, 'subtype')
+        endif
+    endfor
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'lint',
+    \ 'exec': 'R' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
new file mode 100644
index 00000000..1b15c693
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"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 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
+    if !exists('g:syntastic_enable_r_svtools_checker') || !g:syntastic_enable_r_svtools_checker
+        call syntastic#log#error('checker r/svtools: checks disabled for security reasons; set g:syntastic_enable_r_svtools_checker to 1 to override')
+        return []
+    endif
+
+    let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape('library(svTools); ' .
+        \       'try(lint(commandArgs(TRUE), filename = commandArgs(TRUE), type = "flat", sep = ":"))') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%trror:%f:%\s%#%l:%\s%#%v:%m,' .
+        \ '%tarning:%f:%\s%#%l:%\s%#%v:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'svtools',
+    \ 'exec': 'R' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
index f8002a72..ffb02f7b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -38,13 +38,14 @@ function! SyntaxCheckers_racket_code_ayatollah_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'postprocess': ['sort'] })
+        \ 'subtype': 'Style' })
 
     for e in loclist
         let e['col'] += 1
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
index b55eaee8..23392360 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -45,11 +45,14 @@ function! SyntaxCheckers_tex_chktex_GetLocList() dict
         \ '%Z%p^,' .
         \ '%-G%.%#'
 
-    return SyntasticMake({
+    let loclist =  SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'postprocess': ['sort'] })
+        \ 'subtype': 'Style' })
+
+    call self.setWantSort(1)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
index 7f594e09..d2e7349d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -23,11 +23,14 @@ function! SyntaxCheckers_typescript_tsc_GetLocList() dict
         \ '%Eerror %m,' .
         \ '%C%\s%\+%m'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr("")},
-        \ 'postprocess': ['sort'] })
+        \ 'defaults': {'bufnr': bufnr("")} })
+
+    call self.setWantSort(1)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index d0916dce..49a6ecd3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -36,14 +36,9 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
-    let ret = 0
-    try
-        call vimlint#vimlint(syntastic#util#DevNull(), { 'output': [], 'quiet': 1 })
-        let ret = 1
-    catch /\m^Vim\%((\a\+)\)\=:E117/
-        " do nothing
-    endtry
-    return ret
+    return
+        \ globpath(&runtimepath, 'autoload/vimlparser.vim') != '' &&
+        \ globpath(&runtimepath, 'autoload/vimlint.vim') != ''
 endfunction
 
 function! SyntaxCheckers_vim_vimlint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
index 6fa14b32..a3e2d47a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -30,19 +30,19 @@ set cpo&vim
 " 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',
-                \}
+            \ '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
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim b/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
new file mode 100644
index 00000000..a9ad1451
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index 584b6701..ccccf639 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1389
+" @Revision:    1391
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -985,7 +985,7 @@ function! s:prototype.DisplayHelp() dict "{{{3
         endif
         if stridx(self.type, 'm') != -1
             call self.PushHelp('<S-Up/Down>', '(Un)Select items')
-            call self.PushHelp('#, <C-Space>', '(Un)Select the current item')
+            call self.PushHelp('#', '(Un)Select the current item')
             call self.PushHelp('<C|M-a>', '(Un)Select all items')
             call self.PushHelp('<F9>', '(Un)Restrict view to selection')
             " \ '<c-\>        ... Show only selected',
diff --git a/sources_non_forked/tlib/autoload/tlib/cache.vim b/sources_non_forked/tlib/autoload/tlib/cache.vim
index 0c2c7017..2d59c3e0 100644
--- a/sources_non_forked/tlib/autoload/tlib/cache.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cache.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2013-09-25.
-" @Revision:    0.1.230
+" @Revision:    0.1.243
 
 
 " The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
@@ -88,7 +88,11 @@ function! tlib#cache#Filename(type, ...) "{{{3
     " TLogVAR file, dir, mkdir
     let cache_file = tlib#file#Join([dir, file])
     if len(cache_file) > g:tlib#cache#max_filename
-        let shortfilename = pathshorten(file) .'_'. tlib#hash#Adler32(file)
+        if v:version >= 704
+            let shortfilename = pathshorten(file) .'_'. sha256(file)
+        else
+            let shortfilename = pathshorten(file) .'_'. tlib#hash#Adler32(file)
+        endif
         let cache_file = tlib#cache#Filename(a:type, shortfilename, mkdir, dir0)
     else
         if mkdir && !isdirectory(dir)
@@ -108,9 +112,32 @@ function! tlib#cache#Filename(type, ...) "{{{3
 endf
 
 
+let s:timestamps = {}
+
+
+function! s:SetTimestamp(cfile, type) "{{{3
+    if !has_key(s:timestamps, a:cfile)
+        let s:timestamps[a:cfile] = {}
+    endif
+    let s:timestamps[a:cfile].atime = getftime(a:cfile)
+    let s:timestamps[a:cfile][a:type] = s:timestamps[a:cfile].atime
+endf
+
+
 function! tlib#cache#Save(cfile, dictionary) "{{{3
     " TLogVAR a:cfile, a:dictionary
-    call tlib#persistent#Save(a:cfile, a:dictionary)
+    if !empty(a:cfile)
+        " TLogVAR a:dictionary
+        call writefile([string(a:dictionary)], a:cfile, 'b')
+        call s:SetTimestamp(a:cfile, 'write')
+    endif
+endf
+
+
+function! tlib#cache#MTime(cfile) "{{{3
+    let mtime = {'mtime': getftime(a:cfile)}
+    let mtime = extend(mtime, get(s:timestamps, a:cfile, {}))
+    return mtime
 endf
 
 
@@ -118,6 +145,7 @@ function! tlib#cache#Get(cfile, ...) "{{{3
     call tlib#cache#MaybePurge()
     if !empty(a:cfile) && filereadable(a:cfile)
         let val = readfile(a:cfile, 'b')
+        call s:SetTimestamp(a:cfile, 'read')
         return eval(join(val, "\n"))
     else
         let default = a:0 >= 1 ? a:1 : {}
@@ -130,14 +158,9 @@ endf
 " or does not exist, create it calling a generator function.
 function! tlib#cache#Value(cfile, generator, ftime, ...) "{{{3
     if !filereadable(a:cfile) || (a:ftime != 0 && getftime(a:cfile) < a:ftime)
-        if empty(a:generator) && a:0 >= 1
-            " TLogVAR a:1
-            let val = a:1
-        else
-            let args = a:0 >= 1 ? a:1 : []
-            " TLogVAR a:generator, args
-            let val = call(a:generator, args)
-        endif
+        let args = a:0 >= 1 ? a:1 : []
+        " TLogVAR a:generator, args
+        let val = call(a:generator, args)
         " TLogVAR val
         let cval = {'val': val}
         " TLogVAR cval
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index 9805b305..6cd57f5e 100644
--- a/sources_non_forked/tlib/autoload/tlib/input.vim
+++ b/sources_non_forked/tlib/autoload/tlib/input.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1315
+" @Revision:    1317
 
 
 " :filedoc:
@@ -325,6 +325,8 @@ function! tlib#input#ListW(world, ...) "{{{3
     " TLogVAR world.state, world.sticky, world.initial_index
     " let statusline  = &l:statusline
     " let laststatus  = &laststatus
+    let showmode = &showmode
+    set noshowmode
     let lastsearch  = @/
     let scrolloff = &l:scrolloff
     let &l:scrolloff = 0
@@ -779,6 +781,9 @@ function! tlib#input#ListW(world, ...) "{{{3
         " TLogVAR statusline
         " let &l:statusline = statusline
         " let &laststatus = laststatus
+        if &showmode != showmode
+            let &showmode = showmode
+        endif
         silent! let @/  = lastsearch
         let &l:scrolloff = scrolloff
         if s:PopupmenuExists() == 1
diff --git a/sources_non_forked/tlib/autoload/tlib/list.vim b/sources_non_forked/tlib/autoload/tlib/list.vim
index ec756bd0..28fd40b2 100644
--- a/sources_non_forked/tlib/autoload/tlib/list.vim
+++ b/sources_non_forked/tlib/autoload/tlib/list.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2011-03-18.
-" @Revision:    36
+" @Revision:    53
 
 
 """ List related functions {{{1
@@ -140,25 +140,29 @@ endf
 
 
 function! tlib#list#Uniq(list, ...) "{{{3
-    TVarArg ['get_value', '']
-    let s:uniq_values = {}
+    TVarArg ['get_value', ''], ['remove_empty', 0]
+    if remove_empty
+        call filter(a:list, 'type(v:val) == 0 || !empty(v:val)')
+    endif
+    " CREDITS: Based on syntastic#util#unique(list) by scrooloose
+    let seen = {}
+    let uniques = []
     if empty(get_value)
-        call filter(a:list, 's:UniqValue(v:val)')
+        for e in a:list
+            if !has_key(seen, e)
+                let seen[e] = 1
+                call add(uniques, e)
+            endif
+        endfor
     else
-        call filter(a:list, 's:UniqValue(eval(printf(get_value, string(v:val))))')
+        for e in a:list
+            let v = eval(printf(get_value, string(e)))
+            if !has_key(seen, v)
+                let seen[v] = 1
+                call add(uniques, e)
+            endif
+        endfor
     endif
-    unlet s:uniq_values
-    return a:list
+    return uniques
 endf
 
-
-function! s:UniqValue(value) "{{{3
-    if get(s:uniq_values, a:value, 0)
-        return 0
-    else
-        let s:uniq_values[a:value] = 1
-        return 1
-    endif
-endf
-
-
diff --git a/sources_non_forked/tlib/autoload/tlib/persistent.vim b/sources_non_forked/tlib/autoload/tlib/persistent.vim
index 26232d59..de3d4878 100644
--- a/sources_non_forked/tlib/autoload/tlib/persistent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/persistent.vim
@@ -3,7 +3,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-05-11.
 " @Last Change: 2012-05-11.
-" @Revision:    9
+" @Revision:    12
 
 " The directory for persistent data files. If empty, use 
 " |tlib#dir#MyRuntime|.'/share'.
@@ -33,14 +33,15 @@ function! tlib#persistent#Get(...) "{{{3
     return call('tlib#cache#Get', a:000)
 endf
 
+function! tlib#persistent#MTime(cfile) "{{{3
+    return tlib#cache#MTime(a:cfile)
+endf
+
 function! tlib#persistent#Value(...) "{{{3
     return call('tlib#cache#Value', a:000)
 endf
 
 function! tlib#persistent#Save(cfile, dictionary) "{{{3
-    if !empty(a:cfile)
-        " TLogVAR a:dictionary
-        call writefile([string(a:dictionary)], a:cfile, 'b')
-    endif
+    call tlib#cache#Save(a:cfile, a:dictionary)
 endf
 
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index 816524b9..b92c0c2c 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -52,6 +52,7 @@ Contents~
         tlib#persistent#Dir .................... |tlib#persistent#Dir()|
         tlib#persistent#Filename ............... |tlib#persistent#Filename()|
         tlib#persistent#Get .................... |tlib#persistent#Get()|
+        tlib#persistent#MTime .................. |tlib#persistent#MTime()|
         tlib#persistent#Value .................. |tlib#persistent#Value()|
         tlib#persistent#Save ................... |tlib#persistent#Save()|
         g:tlib#vim#simalt_maximize ............. |g:tlib#vim#simalt_maximize|
@@ -116,6 +117,7 @@ Contents~
         tlib#cache#Dir ......................... |tlib#cache#Dir()|
         tlib#cache#Filename .................... |tlib#cache#Filename()|
         tlib#cache#Save ........................ |tlib#cache#Save()|
+        tlib#cache#MTime ....................... |tlib#cache#MTime()|
         tlib#cache#Get ......................... |tlib#cache#Get()|
         tlib#cache#Value ....................... |tlib#cache#Value()|
         tlib#cache#MaybePurge .................. |tlib#cache#MaybePurge()|
@@ -492,6 +494,9 @@ tlib#persistent#Filename(type, ?file=%, ?mkdir=0)
                                                     *tlib#persistent#Get()*
 tlib#persistent#Get(...)
 
+                                                    *tlib#persistent#MTime()*
+tlib#persistent#MTime(cfile)
+
                                                     *tlib#persistent#Value()*
 tlib#persistent#Value(...)
 
@@ -889,6 +894,9 @@ tlib#cache#Filename(type, ?file=%, ?mkdir=0, ?dir='')
                                                     *tlib#cache#Save()*
 tlib#cache#Save(cfile, dictionary)
 
+                                                    *tlib#cache#MTime()*
+tlib#cache#MTime(cfile)
+
                                                     *tlib#cache#Get()*
 tlib#cache#Get(cfile, ...)
 
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index 6cbab75d..7fd693e8 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -1,11 +1,11 @@
-" tlib.vim -- Some utility functions
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
-" @Website:     http://www.vim.org/account/profile.php?user_id=4037
-" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-04-10.
 " @Last Change: 2013-09-25.
-" @Revision:    749
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Revision:    750
+" @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " GetLatestVimScripts: 1863 1 tlib.vim
+" tlib.vim -- Some utility functions
 
 if &cp || exists("loaded_tlib")
     finish
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 108
+let loaded_tlib = 109
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index e41e5ea1..e07bd607 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -207,7 +207,8 @@ function! airline#extensions#load()
     call airline#extensions#promptline#init(s:ext)
   endif
 
-  " load all other extensions not part of the default distribution
+  " 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)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index c0f63db9..12be43fd 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -2,7 +2,6 @@
 " vim: et ts=2 sts=2 sw=2
 
 let s:has_fugitive = exists('*fugitive#head')
-let s:has_fugitive_detect = exists('*fugitive#detect')
 let s:has_lawrencium = exists('*lawrencium#statusline')
 let s:has_vcscommand = get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')
 
@@ -10,36 +9,63 @@ if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
   finish
 endif
 
+let s:git_dirs = {}
+function! s:get_git_branch(path)
+  if has_key(s:git_dirs, a:path)
+    return s:git_dirs[a:path]
+  endif
+
+  let dir = fugitive#extract_git_dir(a:path)
+  if empty(dir)
+    let name = ''
+  else
+    try
+      let line = join(readfile(dir . '/HEAD'))
+      let name = strpart(line, 16)
+    catch
+      let name = ''
+    endtry
+  endif
+
+  let s:git_dirs[a:path] = name
+  return name
+endfunction
+
 function! airline#extensions#branch#head()
-  let head = ''
+  if exists('b:airline_head') && !empty(b:airline_head)
+    return b:airline_head
+  endif
+
+  let b:airline_head = ''
 
   if s:has_fugitive && !exists('b:mercurial_dir')
-    let head = fugitive#head()
+    let b:airline_head = fugitive#head()
 
-    if empty(head) && s:has_fugitive_detect && !exists('b:git_dir')
-      call fugitive#detect(getcwd())
-      let head = fugitive#head()
+    if empty(b:airline_head) && !exists('b:git_dir')
+      let b:airline_head = s:get_git_branch(getcwd())
     endif
   endif
 
-  if empty(head)
+  if empty(b:airline_head)
     if s:has_lawrencium
-      let head = lawrencium#statusline()
+      let b:airline_head = lawrencium#statusline()
     endif
   endif
 
-  if empty(head)
+  if empty(b:airline_head)
     if s:has_vcscommand
       call VCSCommandEnableBufferSetup()
       if exists('b:VCSCommandBufferInfo')
-        let head = get(b:VCSCommandBufferInfo, 0, '')
+        let b:airline_head = get(b:VCSCommandBufferInfo, 0, '')
       endif
     endif
   endif
 
-  return empty(head) || !s:check_in_path()
-        \ ? ''
-        \ : head
+  if empty(b:airline_head) || !s:check_in_path()
+    let b:airline_head = ''
+  endif
+
+  return b:airline_head
 endfunction
 
 function! airline#extensions#branch#get_head()
@@ -78,5 +104,5 @@ 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
 endfunction
-
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
index 8a80813e..18cbae5e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -20,7 +20,7 @@ function! airline#extensions#eclim#get_warnings()
 
   if !empty(eclimList)
     " Remove any non-eclim signs (see eclim#display#signs#Update)
-    call filter(eclimList, "v:val.name =~ '^\(qf_\)\?\(error\|info\|warning\)$'")
+      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\|info\\|warning\\)$"')
 
     if !empty(eclimList)
       let errorsLine = eclimList[0]['line']
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 3c9dc1a4..ec75db75 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -6,6 +6,8 @@ let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
 let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
 let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
+let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
 
 let s:builder_context = {
       \ 'active'        : 1,
@@ -264,8 +266,10 @@ function! s:get_tabs()
   call b.add_raw('%T')
   call b.add_section('airline_tabfill', '')
   call b.split()
-  call b.add_section('airline_tab', ' %999XX ')
-  call b.add_section('airline_tabtype', ' tabs ')
+  call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  if s:show_tab_type
+    call b.add_section('airline_tabtype', ' tabs ')
+  endif
 
   let s:current_bufnr = curbuf
   let s:current_tabnr = curtab
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index e4e1b202..9dd0cd47 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -31,12 +31,18 @@ function! airline#extensions#whitespace#check()
 
     let trailing = 0
     if index(checks, 'trailing') > -1
-      let trailing = search(' $', 'nw')
+      let trailing = search('\s$', 'nw')
     endif
 
     let mixed = 0
     if index(checks, 'indent') > -1
-      let mixed = search('\v(^\t+ +)|(^ +\t+)', 'nw')
+      " [<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 then tabstop value
+      let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
+      let mixed = search('\v' . t_s_t . '|' . t_l_s, 'nw')
     endif
 
     if trailing != 0 || mixed != 0
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim b/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim
index 0024188f..879d8623 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/luna.vim
@@ -44,7 +44,7 @@ let g:airline#themes#luna#palette.visual_modified = {
 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': [ '#450000' , ''        , 52      , ''      , ''     ] ,
+      \ 'airline_c': [ '#e20000' , ''        , 166      , ''      , ''     ] ,
       \ }
 
 let g:airline#themes#luna#palette.tabline = {
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim b/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim
index 31aa34fc..89ea5058 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/sol.vim
@@ -12,7 +12,7 @@ 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' , '#ff3535' , 231 , 203 , '' ] ,
+      \ 'airline_c': [ '#ffffff' , '#ff6868' , 237 , 209 , '' ] ,
       \ }
 
 
@@ -21,7 +21,7 @@ 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': [ '#ffffff' , '#ff6868' , 225 , 167 , '' ] ,
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
       \ }
 let g:airline#themes#sol#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#09643f' , s:I1[2] , 30 , '' ] ,
@@ -38,7 +38,7 @@ 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': [ '#ffffff' , '#ff3535' , 231 , 203 , '' ] ,
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
       \ }
 
 let s:IA = [ '#777777' , '#c7c7c7' , 244 , 251 , '' ]
@@ -52,10 +52,10 @@ let g:airline#themes#sol#palette.tabline = {
       \ 'airline_tabsel':   ['#ffffff', '#004b9a',  231, 31 , ''],
       \ 'airline_tabtype':  ['#343434', '#a0a0a0',  237, 248, ''],
       \ 'airline_tabfill':  ['#343434', '#c7c7c7',  237, 251, ''],
-      \ 'airline_tabmod':   ['#ffffff', '#ff6868',  231, 167, ''],
+      \ 'airline_tabmod':   ['#343434', '#ffdbc7',  237, 216, ''],
       \ }
 
-let s:WI = [ '#eeeeee', '#ff0f38', 255, 201 ]
+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]
      \ ]
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index d5407b91..5a7df84d 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -382,6 +382,9 @@ eclim <https://eclim.org>
 * 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
+
 * defines the name of a formatter for how buffer names are displayed. >
   let g:airline#extensions#tabline#formatter = 'default'
 
@@ -430,6 +433,10 @@ eclim <https://eclim.org>
   let g:airline#extensions#tabline#left_alt_sep = ''
   let g:airline#extensions#tabline#right_sep = ''
   let g:airline#extensions#tabline#right_alt_sep = ''
+
+* configure symbol used to represent close button
+  let g:airline#extensions#tabline#close_symbol = 'X'
+
 <
 Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
 
@@ -616,7 +623,7 @@ to your liking.  Here is an example: >
     return 1
   endfunction
 <
-The above example uses various some example highlight groups to demonstrate
+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`.
diff --git a/sources_non_forked/vim-commentary/README.markdown b/sources_non_forked/vim-commentary/README.markdown
index 0b60009a..84144237 100644
--- a/sources_non_forked/vim-commentary/README.markdown
+++ b/sources_non_forked/vim-commentary/README.markdown
@@ -2,8 +2,8 @@
 
 Comment stuff out.  Use `gcc` to comment out a line (takes a count),
 `gc` to comment out the target of a motion (for example, `gcap` to
-comment out a paragraph), and `gc` in visual mode to comment out the
-selection.  That's it.
+comment out a paragraph), `gc` in visual mode to comment out the selection,
+and `gc` in operator pending mode to target a comment.  That's it.
 
 I wrote this because 5 years after Vim added support for mapping an
 operator, I still couldn't find a commenting plugin that leveraged that
@@ -11,10 +11,8 @@ feature (I overlooked
 [tcomment.vim](https://github.com/tomtom/tcomment_vim)).  Striving for
 minimalism, it weighs in at under 100 lines of code.
 
-Oh, and it uncomments, too.  The above maps actually toggle, and `gcu`
-uncomments a set of adjacent commented lines.  Install
-[repeat.vim](https://github.com/tpope/vim-repeat) to enable
-repeating `gcu` with `.`.  (The other maps are repeatable without it.)
+Oh, and it uncomments, too.  The above maps actually toggle, and `gcgc`
+uncomments a set of adjacent commented lines.
 
 ## Installation
 
diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/sources_non_forked/vim-commentary/doc/commentary.txt
index e8c81ea4..0e5fcf76 100644
--- a/sources_non_forked/vim-commentary/doc/commentary.txt
+++ b/sources_non_forked/vim-commentary/doc/commentary.txt
@@ -9,21 +9,22 @@ correctly set, or uses b:commentary_format if it is set.
 The gc mappings are preferred, while the \\ mappings are provided for
 backwards compatibility.
 
-                                                *gc* *\\*
+                                                *gc*
 gc{motion}              Comment or uncomment lines that {motion} moves over.
-\\{motion}
 
-                                                *gcc* *\\\*
+                                                *gcc*
 gcc                     Comment or uncomment [count] lines.
-\\\
 
-                                                *v_gc* *v_\\*
+                                                *v_gc*
 {Visual}gc              Comment or uncomment the highlighted lines.
-{Visual}\\
 
-                                                *gcu* *\\u*
-gcu                     Uncomment the current and adjacent commented lines.
-\\u
+                                                *o_gc*
+gc                      Text object for a comment (operator pending mode
+                        only.)
+
+                                                *gcgc* *gcu*
+gcgc                    Uncomment the current and adjacent commented lines.
+gcu
 
 The |User| CommentaryPost autocommand fires after a successful operation and
 can be used for advanced customization.
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index d7272d5b..0404e028 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -44,10 +44,16 @@ function! s:go(type,...) abort
     endif
     call setline(lnum,line)
   endfor
-  silent doautocmd User CommentaryPost
+  let modelines = &modelines
+  try
+    set modelines=0
+    silent doautocmd User CommentaryPost
+  finally
+    let &modelines = modelines
+  endtry
 endfunction
 
-function! s:undo() abort
+function! s:textobject(inner) abort
   let [l, r] = s:surroundings()
   let lnums = [line('.')+1, line('.')-2]
   for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']]
@@ -56,27 +62,38 @@ function! s:undo() abort
       let line = matchstr(getline(lnums[index]+dir),'\S.*\s\@<!')
     endwhile
   endfor
-  call s:go(lnums[0], lnums[1])
-  silent! call repeat#set("\<Plug>CommentaryUndo")
+  while (a:inner || lnums[1] != line('$')) && empty(getline(lnums[0]))
+    let lnums[0] += 1
+  endwhile
+  while a:inner && empty(getline(lnums[1]))
+    let lnums[1] -= 1
+  endwhile
+  if lnums[0] <= lnums[1]
+    execute 'normal! 'lnums[0].'GV'.lnums[1].'G'
+  endif
 endfunction
 
 xnoremap <silent> <Plug>Commentary     :<C-U>call <SID>go(line("'<"),line("'>"))<CR>
 nnoremap <silent> <Plug>Commentary     :<C-U>set opfunc=<SID>go<CR>g@
 nnoremap <silent> <Plug>CommentaryLine :<C-U>set opfunc=<SID>go<Bar>exe 'norm! 'v:count1.'g@_'<CR>
-nnoremap <silent> <Plug>CommentaryUndo :<C-U>call <SID>undo()<CR>
+onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(0)<CR>
+nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
+nmap <silent> <Plug>CommentaryUndo <Plug>Commentary<Plug>Commentary
 
-if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
+if 1 || !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
   xmap gc  <Plug>Commentary
   nmap gc  <Plug>Commentary
+  omap gc  <Plug>Commentary
   nmap gcc <Plug>CommentaryLine
-  nmap gcu <Plug>CommentaryUndo
+  nmap cgc <Plug>ChangeCommentary
+  nmap gcu <Plug>Commentary<Plug>Commentary
 endif
 
 if maparg('\\','n') ==# '' && maparg('\','n') ==# '' && get(g:, 'commentary_map_backslash', 1)
-  xmap \\  <Plug>Commentary
-  nmap \\  <Plug>Commentary
-  nmap \\\ <Plug>CommentaryLine
-  nmap \\u <Plug>CommentaryUndo
+  xmap \\  <Plug>Commentary:echomsg '\\ is deprecated. Use gc'<CR>
+  nmap \\  :echomsg '\\ is deprecated. Use gc'<CR><Plug>Commentary
+  nmap \\\ <Plug>CommentaryLine:echomsg '\\ is deprecated. Use gc'<CR>
+  nmap \\u <Plug>CommentaryUndo:echomsg '\\ is deprecated. Use gc'<CR>
 endif
 
 " vim:set et sw=2:
diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
index f40afcfb..58708377 100644
--- a/sources_non_forked/vim-fugitive/doc/fugitive.txt
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -34,6 +34,7 @@ that are part of Git repositories).
                         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|
@@ -177,6 +178,7 @@ that are part of Git repositories).
                         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
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 80020dc6..2043dfec 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -29,7 +29,7 @@ endfunction
 function! s:shellesc(arg) abort
   if a:arg =~ '^[A-Za-z0-9_/.-]\+$'
     return a:arg
-  elseif &shell =~# 'cmd'
+  elseif &shell =~# 'cmd' || &shell =~# 'power'
     return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"'
   else
     return shellescape(a:arg)
@@ -49,14 +49,14 @@ function! s:throw(string) abort
   throw v:errmsg
 endfunction
 
-function! s:warn(str)
+function! s:warn(str) abort
   echohl WarningMsg
   echomsg a:str
   echohl None
   let v:warningmsg = a:str
 endfunction
 
-function! s:shellslash(path)
+function! s:shellslash(path) abort
   if exists('+shellslash') && !&shellslash
     return s:gsub(a:path,'\\','/')
   else
@@ -73,7 +73,7 @@ function! fugitive#git_version(...) abort
   return s:git_versions[g:fugitive_git_executable]
 endfunction
 
-function! s:recall()
+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.*')
@@ -102,7 +102,7 @@ function! s:command(definition) abort
   let s:commands += [a:definition]
 endfunction
 
-function! s:define_commands()
+function! s:define_commands() abort
   for command in s:commands
     exe 'command! -buffer '.command
   endfor
@@ -164,7 +164,7 @@ function! fugitive#extract_git_dir(path) abort
   return ''
 endfunction
 
-function! fugitive#detect(path)
+function! fugitive#detect(path) abort
   if exists('b:git_dir') && (b:git_dir ==# '' || b:git_dir =~# '/$')
     unlet b:git_dir
   endif
@@ -198,6 +198,7 @@ augroup fugitive
   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
 
@@ -221,7 +222,7 @@ function! s:repo(...) abort
   call s:throw('not a git repository: '.expand('%:p'))
 endfunction
 
-function! fugitive#repo(...)
+function! fugitive#repo(...) abort
   return call('s:repo', a:000)
 endfunction
 
@@ -322,6 +323,8 @@ function! s:repo_head(...) dict abort
       " 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
@@ -466,7 +469,7 @@ function! s:buffer_setvar(var,value) dict abort
 endfunction
 
 function! s:buffer_getline(lnum) dict abort
-  return getbufline(self['#'],a:lnum)[0]
+  return get(getbufline(self['#'], a:lnum), 0, '')
 endfunction
 
 function! s:buffer_repo() dict abort
@@ -752,15 +755,15 @@ function! s:stage_info(lnum) abort
   endif
 endfunction
 
-function! s:StageNext(count)
+function! s:StageNext(count) abort
   for i in range(a:count)
     call search('^#\t.*','W')
   endfor
   return '.'
 endfunction
 
-function! s:StagePrevious(count)
-  if line('.') == 1 && exists(':CtrlP')
+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)
@@ -770,7 +773,7 @@ function! s:StagePrevious(count)
   endif
 endfunction
 
-function! s:StageReloadSeek(target,lnum1,lnum2)
+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
@@ -949,7 +952,7 @@ function! s:Commit(args) abort
   try
     try
       execute cd.s:fnameescape(s:repo().tree())
-      if &shell =~# 'cmd'
+      if &shell =~# 'cmd' || &shell =~# 'power'
         let command = ''
         let old_editor = $GIT_EDITOR
         let $GIT_EDITOR = 'false'
@@ -959,7 +962,7 @@ function! s:Commit(args) abort
       let command .= s:repo().git_command('commit').' '.a:args
       if &shell =~# 'csh'
         noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile
-      elseif a:args =~# '\%(^\| \)--interactive\>'
+      elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>'
         noautocmd execute '!'.command.' 2> '.errorfile
       else
         noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile
@@ -982,7 +985,7 @@ function! s:Commit(args) abort
       let error = get(errors,-2,get(errors,-1,'!'))
       if error =~# 'false''\=\.$'
         let args = a:args
-        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[es]|--edit|--interactive|--signoff)%($| )','')
+        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|patch|--signoff)%($| )','')
         let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','')
         let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))')
         let args = '-F '.s:shellesc(msgfile).' '.args
@@ -1028,7 +1031,7 @@ function! s:CommitComplete(A,L,P) abort
   endif
 endfunction
 
-function! s:FinishCommit()
+function! s:FinishCommit() abort
   let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments')
   if !empty(args)
     call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','')
@@ -1091,7 +1094,7 @@ function! s:Grep(cmd,bang,arg) abort
   endtry
 endfunction
 
-function! s:Log(cmd,...)
+function! s:Log(cmd,...) abort
   let path = s:buffer().path('/')
   if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1
     let path = ''
@@ -1389,11 +1392,11 @@ call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execut
 
 augroup fugitive_diff
   autocmd!
-  autocmd BufWinLeave * if s:diff_window_count() == 2 && &diff && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | endif
-  autocmd BufWinEnter * if s:diff_window_count() == 1 && &diff && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff() | endif
+  autocmd BufWinLeave * if &diff && s:diff_window_count() == 2 && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | endif
+  autocmd BufWinEnter * if &diff && s:diff_window_count() == 1 && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff() | endif
 augroup END
 
-function! s:diff_window_count()
+function! s:diff_window_count() abort
   let c = 0
   for nr in range(1,winnr('$'))
     let c += getwinvar(nr,'&diff')
@@ -1401,7 +1404,7 @@ function! s:diff_window_count()
   return c
 endfunction
 
-function! s:diff_restore()
+function! s:diff_restore() abort
   let restore = 'setlocal nodiff noscrollbind'
         \ . ' scrollopt=' . &l:scrollopt
         \ . (&l:wrap ? ' wrap' : ' nowrap')
@@ -1415,14 +1418,14 @@ function! s:diff_restore()
   return restore
 endfunction
 
-function! s:diffthis()
+function! s:diffthis() abort
   if !&diff
     let w:fugitive_diff_restore = s:diff_restore()
     diffthis
   endif
 endfunction
 
-function! s:diffoff()
+function! s:diffoff() abort
   if exists('w:fugitive_diff_restore')
     execute w:fugitive_diff_restore
     unlet w:fugitive_diff_restore
@@ -1431,7 +1434,7 @@ function! s:diffoff()
   endif
 endfunction
 
-function! s:diffoff_all(dir)
+function! s:diffoff_all(dir) abort
   for nr in range(1,winnr('$'))
     if getwinvar(nr,'&diff')
       if nr != winnr()
@@ -1467,7 +1470,7 @@ endfunction
 
 call s:add_methods('buffer',['compare_age'])
 
-function! s:Diff(bang,...)
+function! s:Diff(bang,...) abort
   let vert = a:bang ? '' : 'vertical '
   if exists(':DiffGitCached')
     return 'DiffGitCached'
@@ -1510,6 +1513,9 @@ function! s:Diff(bang,...)
     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)
@@ -1517,6 +1523,11 @@ function! s:Diff(bang,...)
       execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
     endif
     let w:fugitive_diff_restore = restore
+    let winnr = winnr()
+    if getwinvar('#', '&diff')
+      wincmd p
+      call feedkeys("\<C-W>p", 'n')
+    endif
     return ''
   catch /^fugitive:/
     return 'echoerr v:errmsg'
@@ -1526,7 +1537,7 @@ endfunction
 " }}}1
 " Gmove, Gremove {{{1
 
-function! s:Move(force,destination)
+function! s:Move(force,destination) abort
   if a:destination =~# '^/'
     let destination = a:destination[1:-1]
   else
@@ -1560,7 +1571,7 @@ function! s:Move(force,destination)
   endif
 endfunction
 
-function! s:MoveComplete(A,L,P)
+function! s:MoveComplete(A,L,P) abort
   if a:A =~ '^/'
     return s:repo().superglob(a:A)
   else
@@ -1570,7 +1581,7 @@ function! s:MoveComplete(A,L,P)
   endif
 endfunction
 
-function! s:Remove(force)
+function! s:Remove(force) abort
   if s:buffer().commit() ==# ''
     let cmd = ['rm']
   elseif s:buffer().commit() ==# '0'
@@ -1611,7 +1622,7 @@ augroup fugitive_blame
   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
 augroup END
 
-function! s:linechars(pattern)
+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)
@@ -1686,7 +1697,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
         execute top
         normal! zt
         execute current
-        setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable filetype=fugitiveblame
+        setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth filetype=fugitiveblame
         if exists('+concealcursor')
           setlocal concealcursor=nc conceallevel=2
         endif
@@ -1694,6 +1705,8 @@ function! s:Blame(bang,line1,line2,count,args) abort
           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>
@@ -1933,7 +1946,7 @@ function! s:github_url(repo,url,rev,commit,path,type,line1,line2) abort
   for domain in domains
     let domain_pattern .= '\|' . escape(split(domain, '://')[-1], '.')
   endfor
-  let repo = matchstr(a:url,'^\%(https\=://\|git://\|git@\)\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
+  let repo = matchstr(a:url,'^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
   if repo ==# ''
     return ''
   endif
@@ -2035,14 +2048,14 @@ function! s:ReplaceCmd(cmd,...) abort
   let prefix = ''
   try
     if a:0 && a:1 != ''
-      if &shell =~# 'cmd'
+      if &shell =~# 'cmd' || &shell =~# 'power'
         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
-    if &shell =~# 'cmd'
+    if &shell =~# 'cmd' || &shell =~# 'power'
       let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
       call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').' > '.tmp.'"')
     else
@@ -2066,7 +2079,7 @@ function! s:ReplaceCmd(cmd,...) abort
   endtry
 endfunction
 
-function! s:BufReadIndex()
+function! s:BufReadIndex() abort
   if !exists('b:fugitive_display_format')
     let b:fugitive_display_format = filereadable(expand('%').'.lock')
   endif
@@ -2086,7 +2099,7 @@ function! s:BufReadIndex()
     else
       let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
       let dir = getcwd()
-      if fugitive#git_version() =~# '^0\|1\.[1-7]\.'
+      if fugitive#git_version() =~# '^0\|^1\.[1-7]\.'
         let cmd = s:repo().git_command('status')
       else
         let cmd = s:repo().git_command(
@@ -2132,12 +2145,14 @@ function! s:BufReadIndex()
     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> g?   :help fugitive-:Gstatus<CR>
+    nnoremap <buffer> <silent> <F1> :help fugitive-:Gstatus<CR>
   catch /^fugitive:/
     return 'echoerr v:errmsg'
   endtry
 endfunction
 
-function! s:FileRead()
+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:',':&')
@@ -2154,7 +2169,7 @@ function! s:FileRead()
   endtry
 endfunction
 
-function! s:BufReadIndexFile()
+function! s:BufReadIndexFile() abort
   try
     let b:fugitive_type = 'blob'
     let b:git_dir = s:repo().dir()
@@ -2164,6 +2179,7 @@ function! s:BufReadIndexFile()
       if &bufhidden ==# ''
         setlocal bufhidden=delete
       endif
+      setlocal noswapfile
     endtry
     return ''
   catch /^fugitive: rev-parse/
@@ -2174,7 +2190,7 @@ function! s:BufReadIndexFile()
   endtry
 endfunction
 
-function! s:BufWriteIndexFile()
+function! s:BufWriteIndexFile() abort
   let tmp = tempname()
   try
     let path = matchstr(expand('<amatch>'),'//\d/\zs.*')
@@ -2187,7 +2203,7 @@ function! s:BufWriteIndexFile()
     endif
     let info = old_mode.' '.sha1.' '.stage."\t".path
     call writefile([info],tmp)
-    if &shell =~# 'cmd'
+    if &shell =~# 'cmd' || &shell =~# 'power'
       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)
@@ -2205,7 +2221,7 @@ function! s:BufWriteIndexFile()
   endtry
 endfunction
 
-function! s:BufReadObject()
+function! s:BufReadObject() abort
   try
     setlocal noro ma
     let b:git_dir = s:repo().dir()
@@ -2226,7 +2242,7 @@ function! s:BufReadObject()
     endif
 
     let pos = getpos('.')
-    silent %delete
+    silent keepjumps %delete_
     setlocal endofline
 
     try
@@ -2250,23 +2266,25 @@ function! s:BufReadObject()
           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 %T%nparent %P%nauthor %an <%ae> %ad%ncommitter %cn <%ce> %cd%nencoding %e%n%n%s%n%n%b',hash))
-          call search('^parent ')
+          keepjumps call search('^parent ')
           if getline('.') ==# 'parent '
-            silent delete_
+            silent keepjumps delete_
           else
-            silent s/\%(^parent\)\@<! /\rparent /ge
+            silent keepjumps s/\%(^parent\)\@<! /\rparent /ge
           endif
-          if search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
-            silent delete_
+          keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
+          if lnum
+            silent keepjumps delete_
           end
-          1
+          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
-      call setpos('.',pos)
-      setlocal ro noma nomod
+      keepjumps call setpos('.',pos)
+      setlocal ro noma nomod noswapfile
       if &bufhidden ==# ''
         setlocal bufhidden=delete
       endif
@@ -2331,9 +2349,6 @@ augroup END
 function! s:JumpInit() abort
   nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
   if !&modifiable
-    if exists(':CtrlP')
-      nnoremap <buffer> <silent> <C-P> :<C-U>exe 'CtrlP '.fnameescape(<SID>repo().tree())<CR>
-    endif
     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>
@@ -2522,12 +2537,15 @@ endfunction
 " Statusline {{{1
 
 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(...)
+function! fugitive#statusline(...) abort
   if !exists('b:git_dir')
     return ''
   endif
@@ -2543,7 +2561,7 @@ function! fugitive#statusline(...)
   endif
 endfunction
 
-function! fugitive#head(...)
+function! fugitive#head(...) abort
   if !exists('b:git_dir')
     return ''
   endif
diff --git a/sources_non_forked/vim-markdown/ftplugin/markdown.vim b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
index 5d6ebecd..ae3bd262 100644
--- a/sources_non_forked/vim-markdown/ftplugin/markdown.vim
+++ b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
@@ -19,4 +19,32 @@ else
   let b:undo_ftplugin = "setl cms< com< fo< flp<"
 endif
 
+function! MarkdownFold()
+  let line = getline(v:lnum)
+
+  " Regular headers
+  let depth = match(line, '\(^#\+\)\@<=\( .*$\)\@=')
+  if depth > 0
+    return ">" . depth
+  endif
+
+  " Setext style headings
+  let nextline = getline(v:lnum + 1)
+  if (line =~ '^.\+$') && (nextline =~ '^=\+$')
+    return ">1"
+  endif
+
+  if (line =~ '^.\+$') && (nextline =~ '^-\+$')
+    return ">2"
+  endif
+
+  return "="
+endfunction
+
+if has("folding") && exists("g:markdown_folding")
+  setlocal foldexpr=MarkdownFold()
+  setlocal foldmethod=expr
+  let b:undo_ftplugin .= " foldexpr< foldmethod<"
+endif
+
 " vim:set sw=2:
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 6333cf57..4e139e1a 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -9,6 +9,7 @@ Weber](marco-oweber@gmx.de), and [Adnan Zafar](https://github.com/ajzafar) with
 additional contributions from:
 
 * [907th](https://github.com/907th)
+* [adkron](https://github.com/adkron)
 * [alderz](https://github.com/alderz)
 * [asymmetric](https://github.com/asymmetric)
 * [bpugh](https://github.com/bpugh)
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 769fe21b..86d881a5 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -44,6 +44,30 @@ looking at the [vim-snippets][vim-snippets] repository.
         " Optional:
         Bundle "honza/vim-snippets"
 
+## FAQ ##
+
+> How does SnipMate determine which snippets to load? How can I separate, for
+> example, my Rails snippets from my Ruby snippets?
+
+Primarily SnipMate looks at the `'filetype'` and `'syntax'` settings. Taking
+"scopes" from these options, it looks in each `snippets/` directory in
+`'runtimepath'` for files named `scope.snippets`, `scope/*.snippets`, or
+`scope_*.snippets`.
+
+However we understand this may not allow for the flexibility desired by some
+languages. For this we provide two options: scope aliases and the
+`:SnipMateLoadScope` command. Scope aliases simply say "whenever this scope is
+loaded, also load this other scope:
+
+    let g:snipMate = {}
+    let g:snipMate.scope_aliases = {}
+    let g:snipMate.scope_aliases['ruby'] = 'ruby,rails'
+
+will load the `ruby-rails` scope whenever the `ruby` scope is active. The
+`:SnipMateLoadScope foo` command will always load the foo scope in the current
+buffer. The [vim-rails](https://github.com/tpope/vim-rails) plugin automatically
+does `:SnipMateLoadScope rails` when editing a Rails project for example.
+
 ## Release Notes ##
 
 ### Master ###
@@ -53,6 +77,10 @@ looking at the [vim-snippets][vim-snippets] repository.
 * Fix bug with mirrors in the first column
 * Fix bug with tabs in indents ([#143][143])
 * Fix bug with mirrors in placeholders
+* Fix reading single snippet files
+* Fix the use of the visual map at the end of a line
+* Add `:SnipMateLoadScope` command and buffer-local scope aliases
+* Load `<scope>_*.snippets` files
 
 ### 0.87 - 2014-01-04 ###
 
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 4e16a923..44184be6 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -2,7 +2,6 @@
 if !exists('g:snipMate')
   let g:snipMate = {}
 endif
-let s:c = g:snipMate
 
 try
 	call tlib#input#List('mi', '', [])
@@ -13,26 +12,6 @@ endtry
 " match $ which doesn't follow a \
 let s:d = '\%([\\]\@<!\$\)'
 
-" if filetype is objc, cpp, cs or cu also append snippets from scope 'c'
-" you can add multiple by separating scopes by ',', see s:AddScopeAliases
-let s:c.scope_aliases = get(s:c, 'scope_aliases', {})
-if !exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases
-	let s:c.scope_aliases.objc = get(s:c.scope_aliases, 'objc', 'c')
-	let s:c.scope_aliases.cpp = get(s:c.scope_aliases, 'cpp', 'c')
-	let s:c.scope_aliases.cu = get(s:c.scope_aliases, 'cu', 'c')
-	let s:c.scope_aliases.xhtml = get(s:c.scope_aliases, 'xhtml', 'html')
-	let s:c.scope_aliases.html = get(s:c.scope_aliases, 'html', 'javascript')
-	let s:c.scope_aliases.php = get(s:c.scope_aliases, 'php', 'php,html,javascript')
-	let s:c.scope_aliases.ur = get(s:c.scope_aliases, 'ur', 'html,javascript')
-	let s:c.scope_aliases.mxml = get(s:c.scope_aliases, 'mxml', 'actionscript')
-	let s:c.scope_aliases.eruby = get(s:c.scope_aliases, 'eruby', 'eruby-rails,html')
-endif
-
-" set this to "\<tab>" to make snipmate not swallow tab (make sure to not have
-" expandtab set). Remember that you can always enter tabs by <c-v> <tab> then
-" you don't need this
-let s:c['no_match_completion_feedkeys_chars'] = get(s:c, 'no_match_completion_feedkeys_chars', "\t")
-
 fun! Filename(...)
 	let filename = expand('%:t:r')
 	if filename == '' | return a:0 == 2 ? a:2 : '' | endif
@@ -85,11 +64,20 @@ fun! snipMate#expandSnip(snip, col)
 
 	if b:snip_state.stop_count
 		aug snipmate_changes
-			au CursorMoved,CursorMovedI <buffer> call b:snip_state.update_changes()
+			au CursorMoved,CursorMovedI <buffer> if exists('b:snip_state') |
+						\     call b:snip_state.update_changes() |
+						\ else |
+						\     silent! au! snipmate_changes * <buffer> |
+						\ endif
 		aug END
 		call b:snip_state.set_stop(0)
+		let ret = b:snip_state.select_word()
 
-		return b:snip_state.select_word()
+		if b:snip_state.stop_count == 1
+			call b:snip_state.remove()
+		endif
+
+		return ret
 	else
 		unlet b:snip_state
 		" Place cursor at end of snippet if no tab stop is given
@@ -426,12 +414,26 @@ fun! snipMate#ReadSnippetsFile(file)
 	return [result, new_scopes]
 endf
 
+function! s:GetScopes()
+	let ret = exists('b:snipMate_scope_aliases') ? copy(b:snipMate.scope_aliases) : {}
+	let global = get(g:snipMate, 'scope_aliases', {})
+	for alias in keys(global)
+		if has_key(ret, alias)
+			let ret[alias] = join(split(ret[alias], ',')
+						\ + split(global[alias], ','), ',')
+		else
+			let ret[alias] = global[alias]
+		endif
+	endfor
+	return ret
+endfunction
+
 " adds scope aliases to list.
 " returns new list
 " the aliases of aliases are added recursively
 fun! s:AddScopeAliases(list)
   let did = {}
-  let scope_aliases = get(s:c,'scope_aliases', {})
+  let scope_aliases = s:GetScopes()
   let new = a:list
   let new2 =  []
   while !empty(new)
@@ -447,16 +449,22 @@ fun! s:AddScopeAliases(list)
   return keys(did)
 endf
 
-function! s:Glob(path, expr)
-	let res = []
-	for p in split(a:path, ',')
-		let h = fnamemodify(a:expr, ':h')
-		if isdirectory(p . '/' . h)
-			call extend(res, split(glob(p . '/' . a:expr), "\n"))
-		endif
-	endfor
-	return filter(res, 'filereadable(v:val)')
-endfunction
+if v:version >= 704
+	function! s:Glob(path, expr)
+		return split(globpath(a:path, a:expr), "\n")
+	endfunction
+else
+	function! s:Glob(path, expr)
+		let res = []
+		for p in split(a:path, ',')
+			let h = split(fnamemodify(a:expr, ':h'), '/')[0]
+			if isdirectory(p . '/' . h)
+				call extend(res, split(glob(p . '/' . a:expr), "\n"))
+			endif
+		endfor
+		return filter(res, 'filereadable(v:val)')
+	endfunction
+endif
 
 " returns dict of
 " { path: { 'type': one of 'snippet' 'snippets',
@@ -466,12 +474,11 @@ endfunction
 "           'trigger': trigger of snippet
 "         }
 " }
-" use trigger = '*' to match all snippet files
 " use mustExist = 1 to return existing files only
 "
 "     mustExist = 0 is used by OpenSnippetFiles
 function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
-	let paths = join(funcref#Call(s:c.snippet_dirs), ',')
+	let paths = join(funcref#Call(g:snipMate.snippet_dirs), ',')
 	let result = {}
 	let scopes = s:AddScopeAliases(a:scopes)
 	let trigger = escape(a:trigger, "*[]?{}`'$")
@@ -480,19 +487,22 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 	for scope in scopes
 
 		for f in s:Glob(paths, 'snippets/' . scope . '.snippets') +
+					\ s:Glob(paths, 'snippets/' . scope . '_*.snippets') +
 					\ s:Glob(paths, 'snippets/' . scope . '/*.snippets')
 			let result[f] = { 'exists' : 1, 'type' : 'snippets',
 						\ 'name_prefix' : fnamemodify(f, ':t:r') }
 		endfor
 
-		for f in s:Glob(paths, 'snippets/'.scope.'/'.trigger.'.snippet')
+		" We check for trigger* in the next two loops. In the case of an exact
+		" match, that'll be handled in snipMate#GetSnippetsForWordBelowCursor.
+		for f in s:Glob(paths, 'snippets/' . scope . '/' . trigger . '*.snippet')
 			let result[f] = {'exists': 1, 'type': 'snippet', 'name': 'default',
-						\ 'trigger': a:trigger, 'name_prefix' : scope }
+						\ 'trigger': fnamemodify(f, ':t:r'), 'name_prefix' : scope }
 		endfor
 
-		for f in s:Glob(paths, 'snippets/'.scope.'/'.trigger.'/*.snippet')
+		for f in s:Glob(paths, 'snippets/' . scope . '/' . trigger . '*/*.snippet')
 			let result[f] = {'exists': 1, 'type': 'snippet', 'name' : fnamemodify(f, ':t:r'),
-						\ 'trigger': a:trigger, 'name_prefix' : scope }
+						\ 'trigger': fnamemodify(f, ':h:t'), 'name_prefix' : scope }
 		endfor
 
 		if !a:mustExist
@@ -507,21 +517,12 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 endfunction
 
 " should be moved to utils or such?
-function! snipMate#SetByPath(dict, path, value)
+function! snipMate#SetByPath(dict, trigger, path, snippet)
 	let d = a:dict
-	for p in a:path[:-2]
-		if !has_key(d,p) | let d[p] = {} | endif
-		let d = d[p]
-	endfor
-	let d[a:path[-1]] = a:value
-endfunction
-
-function! s:ReadFile(file)
-	if a:file =~ '\.snippet$'
-		return [['', '', readfile(a:file), '1']]
-	else
-		return snipMate#ReadSnippetsFile(a:file)
+	if !has_key(d, a:trigger)
+		let d[a:trigger] = {}
 	endif
+	let d[a:trigger][a:path] = a:snippet
 endfunction
 
 function! s:CachedSnips(file)
@@ -545,13 +546,13 @@ function! snipMate#DefaultPool(scopes, trigger, result)
 			call extend(extra_scopes, new_scopes)
 			for [trigger, name, contents] in snippets
 				if trigger =~ '\V\^' . escape(a:trigger, '\')
-					call snipMate#SetByPath(a:result,
-								\ [trigger, opts.name_prefix . ' ' . name],
-								\ contents)
+					call snipMate#SetByPath(a:result, trigger,
+								\ opts.name_prefix . ' ' . name, contents)
 				endif
 			endfor
 		elseif opts.type == 'snippet'
-			call snipMate#SetByPath(a:result, [opts.trigger, opts.name_prefix.' '.opts.name], readfile(f))
+			call snipMate#SetByPath(a:result, opts.trigger,
+						\ opts.name_prefix . ' ' . opts.name, readfile(f))
 		else
 			throw "unexpected"
 		endif
@@ -636,7 +637,7 @@ endf
 
 fun! snipMate#ScopesByFile()
 	" duplicates are removed in AddScopeAliases
-	return filter(funcref#Call(s:c.get_scopes), "v:val != ''")
+	return filter(funcref#Call(g:snipMate.get_scopes), "v:val != ''")
 endf
 
 " used by both: completion and insert snippet
@@ -669,8 +670,8 @@ fun! snipMate#GetSnippetsForWordBelowCursor(word, exact)
 	let snippet = ''
 	" prefer longest word
 	for word in lookups
-		let s:c.word = word
-		for [k,snippetD] in items(funcref#Call(s:c['get_snippets'], [snipMate#ScopesByFile(), word]))
+		let g:snipMate.word = word
+		for [k,snippetD] in items(funcref#Call(g:snipMate['get_snippets'], [snipMate#ScopesByFile(), word]))
 			" hack: require exact match
 			if a:exact && k !=# word
 				continue
@@ -730,7 +731,7 @@ fun! snipMate#ShowAvailableSnips()
 
 	" Pretty hacky, but really can't have the tab swallowed!
 	if len(matches) == 0
-		call feedkeys(s:c['no_match_completion_feedkeys_chars'], 'n')
+		call feedkeys(g:snipMate['no_match_completion_feedkeys_chars'], 'n')
 		return ""
 	endif
 
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index 5ec50928..4a353375 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -74,6 +74,14 @@ Commands~
                                 files will be shown, with the existing files
                                 shown first.
 
+:SnipMateLoadScope[!] scope [scope ...]
+                                Load snippets from additional scopes. Without
+                                [!] the additional scopes are loaded only in
+                                the current buffer. For example >
+                                    :SnipMateLoadScopes rails
+<                               will load all rails.snippets in the current
+                                buffer.
+
                                                             *SnipMate-options*
 Options~
 
@@ -103,7 +111,9 @@ g:snipMate.scope_aliases        A |Dictionary| associating certain filetypes
                                 addition to "ruby" snippets should be loaded
                                 when editing files with 'filetype' set to
                                 "ruby" or contains "ruby" as an entry in the
-                                case of dotted filetypes.
+                                case of dotted filetypes. A buffer local
+                                variant b:snipMate_scope_aliases is merged
+                                with the global variant.
 
 g:snipMate_no_default_aliases
                                 When set to 1, prevents SnipMate from loading
@@ -178,6 +188,7 @@ settings (taking into account the dotted syntax), the following files are read
 for snippets: >
 
     .../snippets/<scope>.snippets
+    .../snippets/<scope>_<name>.snippets
     .../snippets/<scope>/<name>.snippets
     .../snippets/<scope>/<trigger>.snippet
     .../snippets/<scope>/<trigger>/<description>.snippet
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 34d4ad28..5528b734 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -11,8 +11,8 @@ if exists('loaded_snips') || &cp || version < 700
 	finish
 endif
 let loaded_snips = 1
-if !exists('snips_author') | let snips_author = 'Me' | endif
-" save and reset 'cpo'
+
+" Save and reset 'cpo'
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -24,7 +24,7 @@ endtry
 
 if (!exists('g:snipMateSources'))
   let g:snipMateSources = {}
-  " default source: get snippets based on runtimepath:
+  " Default source: get snippets based on runtimepath
   let g:snipMateSources['default'] = funcref#Function('snipMate#DefaultPool')
 endif
 
@@ -40,52 +40,73 @@ inoremap <silent> <Plug>snipMateTrigger        <C-R>=snipMate#TriggerSnippet(1)<
 inoremap <silent> <Plug>snipMateBack           <C-R>=snipMate#BackwardsSnippet()<CR>
 snoremap <silent> <Plug>snipMateBack           <Esc>a<C-R>=snipMate#BackwardsSnippet()<CR>
 inoremap <silent> <Plug>snipMateShow           <C-R>=snipMate#ShowAvailableSnips()<CR>
-xnoremap <silent> <Plug>snipMateVisual         :<C-U>call <SID>grab_visual()<CR>i
+xnoremap <silent> <Plug>snipMateVisual         :<C-U>call <SID>grab_visual()<CR>gv"_c
 
-" config which can be overridden (shared lines)
-if !exists('g:snipMate')
-  let g:snipMate = {}
+" config variables
+if !exists('g:snips_author')
+	let g:snips_author = 'Me'
+endif
+if !exists('g:snipMate')
+	let g:snipMate = {}
 endif
-let s:snipMate = g:snipMate
 
-let s:snipMate['get_snippets'] = get(s:snipMate, 'get_snippets', funcref#Function("snipMate#GetSnippets"))
+" SnipMate inserts this string when no snippet expansion can be done
+let g:snipMate['no_match_completion_feedkeys_chars'] =
+			\ get(g:snipMate, 'no_match_completion_feedkeys_chars', "\t")
 
-" old snippets_dir: function returning list of paths which is used to read
-" snippets. You can replace it with your own implementation. Defaults to all
-" directories in &rtp/snippets/*
-let s:snipMate['snippet_dirs'] = get(s:snipMate, 'snippet_dirs', funcref#Function('return split(&runtimepath,",")'))
-if type(s:snipMate['snippet_dirs']) == type([])
-	call map(s:snipMate['snippet_dirs'], 'expand(v:val)')
+" Add default scope aliases, without overriding user settings
+let g:snipMate.scope_aliases = get(g:snipMate, 'scope_aliases', {})
+if !exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases
+	let g:snipMate.scope_aliases.objc = get(g:snipMate.scope_aliases, 'objc', 'c')
+	let g:snipMate.scope_aliases.cpp = get(g:snipMate.scope_aliases, 'cpp', 'c')
+	let g:snipMate.scope_aliases.cu = get(g:snipMate.scope_aliases, 'cu', 'c')
+	let g:snipMate.scope_aliases.xhtml = get(g:snipMate.scope_aliases, 'xhtml', 'html')
+	let g:snipMate.scope_aliases.html = get(g:snipMate.scope_aliases, 'html', 'javascript')
+	let g:snipMate.scope_aliases.php = get(g:snipMate.scope_aliases, 'php', 'php,html,javascript')
+	let g:snipMate.scope_aliases.ur = get(g:snipMate.scope_aliases, 'ur', 'html,javascript')
+	let g:snipMate.scope_aliases.mxml = get(g:snipMate.scope_aliases, 'mxml', 'actionscript')
+	let g:snipMate.scope_aliases.eruby = get(g:snipMate.scope_aliases, 'eruby', 'eruby-rails,html')
+endif
+
+let g:snipMate['get_snippets'] = get(g:snipMate, 'get_snippets', funcref#Function("snipMate#GetSnippets"))
+
+" List of paths where snippets/ dirs are located, or a function returning such
+" a list
+let g:snipMate['snippet_dirs'] = get(g:snipMate, 'snippet_dirs', funcref#Function('return split(&runtimepath,",")'))
+if type(g:snipMate['snippet_dirs']) == type([])
+	call map(g:snipMate['snippet_dirs'], 'expand(v:val)')
 endif
 
 " _ is default scope added always
 "
 " &ft honors multiple filetypes and syntax such as in set ft=html.javascript syntax=FOO
-let s:snipMate['get_scopes'] = get(s:snipMate, 'get_scopes', funcref#Function('return split(&ft,"\\.")+[&syntax, "_"]'))
-
-" dummy for compatibility - will be removed
-" moving to autoload to improve loading speed and debugging
-fun! TriggerSnippet()
-	echoe "replace TriggerSnippet by snipMate#TriggerSnippet, please!"
-	return snipMate#TriggerSnippet()
-endf
-fun! BackwardSnippet()
-	echoe "replace BackwardSnippet by snipMate#BackwardsSnippet, please!"
-	return snipMate#BackwardsSnippet()
-endf
+let g:snipMate['get_scopes'] = get(g:snipMate, 'get_scopes', funcref#Function('return split(&ft,"\\.")+[&syntax, "_"]'))
 
 " Modified from Luc Hermitte's function on StackOverflow
 " <http://stackoverflow.com/a/1534347>
 function! s:grab_visual()
 	let a_save = @a
 	try
-		normal! gv"ad
+		normal! gv"ay
 		let b:snipmate_content_visual = @a
 	finally
 		let @a = a_save
 	endtry
 endfunction
 
+function! s:load_scopes(bang, ...)
+	let gb = a:bang ? g: : b:
+	let gb.snipMate = get(gb, 'snipMate', {})
+	let gb.snipMate.scope_aliases = get(gb.snipMate, 'scope_aliases', {})
+	let gb.snipMate.scope_aliases['_'] = join(split(get(gb.snipMate.scope_aliases, '_', ''), ',') + a:000, ',')
+endfunction
+
+command! -bang -bar -nargs=+ SnipMateLoadScopes
+			\ call s:load_scopes(<bang>0, <f-args>)
+
+" Edit snippet files
+command! SnipMateOpenSnippetFiles call snipMate#OpenSnippetFiles()
+
 " restore 'cpo'
 let &cpo = s:save_cpo
 
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim b/sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim
deleted file mode 100644
index e3e391d7..00000000
--- a/sources_non_forked/vim-snipmate/plugin/snipMateInterface.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-" some useful commands
-command! SnipMateOpenSnippetFiles call snipMate#OpenSnippetFiles()
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index 31f7cc34..5746feb6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -194,7 +194,7 @@ endsnippet
 
 snippet head "XHTML <head>"
 <head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8"`!p x(snip)`>
+	<meta charset="utf-8">
 	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 	$0
 </head>
diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 96cc7a9e..21be6bef 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -25,8 +25,13 @@ def getArgs(group):
 	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
@@ -173,13 +178,13 @@ default:
 	$0
 endsnippet
 
-snippet elif "else if" b
+snippet elif "else if"
 else if ($1)`!p nl(snip)`{
 	$0
 }
 endsnippet
 
-snippet /el(se)?/ "else" br
+snippet /el(se)?/ "else" r
 else`!p nl(snip)`{
 	$0
 }
@@ -338,23 +343,23 @@ endsnippet
 
 snippet /get(ter)?/ "getter" br
 public ${1:String} get${2:Name}() {
-	return `!p snip.rv = t[2].lower()`;
+	return `!p snip.rv = mixedCase(t[2])`;
 }
 endsnippet
 
 snippet /set(ter)?/ "setter" br
-public void set${1:Name}(${2:String} $1) {
-	return this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+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 = t[1].lower()`) {
-	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+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])`;
 }
 
 public $2 get$1() {
-	return `!p snip.rv = t[1].lower()`;
+	return `!p snip.rv = mixedCase(t[1])`;
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 24f6cc52..84003a72 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -120,19 +120,19 @@ endsnippet
 
 snippet gs "PHP Class Getter Setter" b
 /*
- * Getter for ${1/(\w+)\s*;/$1/}
+ * Getter for $1
  */
-public function get${1/(\w+)\s*;/\u$1/}()
+public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->${1/(\w+)\s*;/$1/};$2
+	return $this->$1;$2
 }
 
 /*
- * Setter for ${1/(\w+)\s*;/$1/}
+ * Setter for $1
  */
-public function set${1/(\w+)\s*;/\u$1/}($${1/(\w+)\s*;/$1/})
+public function set${1/\w+\s*/\u$0/}($$1)
 {
-	$this->${1/(\w+)\s*;/$1/} = $${1/(\w+)\s*;/$1/};$3
+	$this->$1 = $$1;$3
 	${4:return $this;}
 }
 $0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/proto.snippets b/sources_non_forked/vim-snippets/UltiSnips/proto.snippets
new file mode 100644
index 00000000..923be578
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 357d01d3..64b5cfd2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -34,13 +34,30 @@ global !p
 NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
+GOOGLE  = 0x4
 
 SINGLE_QUOTES = 0x1
 DOUBLE_QUOTES = 0x2
 
+
+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.split('=')[0].strip() for arg in arglist.split(',') if arg]
-	args = [arg for arg in args if arg and arg != "self"]
+	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg.name != 'self']
 
 	return args
 
@@ -51,7 +68,7 @@ def get_quoting_style(snip):
 		return SINGLE_QUOTES
 	return DOUBLE_QUOTES
 
-def tripple_quotes(snip):
+def triple_quotes(snip):
 	if get_quoting_style(snip) == SINGLE_QUOTES:
 		return "'''"
 	return '"""'
@@ -61,6 +78,7 @@ def get_style(snip):
 
 	if    style == "doxygen": return DOXYGEN
 	elif  style == "sphinx": return SPHINX
+	elif  style == "google": return GOOGLE
 	else: return NORMAL
 
 
@@ -71,6 +89,8 @@ def format_arg(arg, style):
 		return ":param %s: @todo" % arg
 	elif style == NORMAL:
 		return ":%s: @todo" % arg
+	elif style == GOOGLE:
+		return "%s (@todo): @todo" % arg
 
 
 def format_return(style):
@@ -78,19 +98,45 @@ def format_return(style):
 		return "@return: @todo"
 	elif style in (NORMAL, SPHINX):
 		return ":returns: @todo"
+	elif style == GOOGLE:
+		return "Returns: @todo"
 
 
 def write_docstring_args(args, snip):
 	if not args:
-		snip.rv += ' {0}'.format(tripple_quotes(snip))
+		snip.rv += ' {0}'.format(triple_quotes(snip))
 		return
 
 	snip.rv += '\n' + snip.mkline('', indent='')
 
 	style = get_style(snip)
 
-	for arg in args:
-		snip += format_arg(arg, style)
+	if style == GOOGLE:
+		write_google_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_init_body(args, parents, snip):
@@ -120,10 +166,10 @@ endglobal
 snippet class "class with docstrings" b
 class ${1:MyClass}(${2:object}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 
 	def __init__(self$4):
-		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined1.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -132,7 +178,7 @@ args = get_args(t[4])
 write_docstring_args(args, snip)
 if args:
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += '{0}'.format(tripple_quotes(snip))
+	snip += '{0}'.format(triple_quotes(snip))
 
 write_init_body(args, t[2], snip)
 `
@@ -143,7 +189,7 @@ endsnippet
 snippet slotclass "class with slots and docstrings" b
 class ${1:MyClass}(${2:object}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 `!p
 snip >> 1
 args = get_args(t[4])
@@ -151,7 +197,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -160,7 +206,7 @@ args = get_args(t[4])
 write_docstring_args(args, snip)
 if args:
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += tripple_quotes(snip)
+	snip += triple_quotes(snip)
 
 write_init_body(args, t[2], snip)
 `
@@ -353,7 +399,7 @@ 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 = tripple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
+	`!p snip.rv = triple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
@@ -364,7 +410,7 @@ if args:
 style = get_style(snip)
 snip += format_return(style)
 snip.rv += '\n' + snip.mkline('', indent='')
-snip += tripple_quotes(snip) `
+snip += triple_quotes(snip) `
 	${0:pass}
 endsnippet
 
@@ -390,7 +436,7 @@ endsnippet
 
 snippet rwprop "Read write property" b
 def ${1:name}():
-	`!p snip.rv = tripple_quotes(snip) if t[2] else ''
+	`!p snip.rv = triple_quotes(snip) if t[2] else ''
 `${2:@todo: Docstring for $1.}`!p
 if t[2]:
 	snip >> 1
@@ -399,7 +445,7 @@ if t[2]:
 	snip.rv += '\n' + snip.mkline('', indent='')
 	snip += format_return(style)
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += tripple_quotes(snip)
+	snip += triple_quotes(snip)
 else:
 	snip.rv = ""`
 	def fget(self):
@@ -518,7 +564,7 @@ endsnippet
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = triple_quotes(snip)`
 
 	def setUp(self):
 		${4:pass}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/r.snippets b/sources_non_forked/vim-snippets/UltiSnips/r.snippets
new file mode 100644
index 00000000..d78a1d72
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/r.snippets
@@ -0,0 +1,144 @@
+priority -50
+
+snippet #! "Hashbang for Rscript (#!)" b
+#!/usr/bin/env Rscript
+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}
+}
+
+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"
+lapply(${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/sources_non_forked/vim-snippets/UltiSnips/rnoweb.snippets b/sources_non_forked/vim-snippets/UltiSnips/rnoweb.snippets
new file mode 100644
index 00000000..773b9aa9
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/rnoweb.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends tex, r
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
index e8aef2b2..3763a95e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
@@ -12,6 +12,8 @@ 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',
@@ -130,27 +132,6 @@ def get_popular_code_type():
 	except IndexError:
 		popular_type = "lua" # Don't break default
 	return popular_type
-
-
-def complete(t, opts):
-	"""
-	get options that start with t
-
-	:param t: query string
-	:param opts: list that needs to be completed
-
-	:return: a string that start with t
-	"""
-	msg = "({0})"
-	if t:
-		opts = [ m[len(t):] for m in opts if m.startswith(t) ]
-	if len(opts) == 1:
-		return opts[0]
-
-	if not len(opts):
-		msg = "{0}"
-	return msg.format("|".join(opts))
-
 endglobal
 
 snippet part "Part" b
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
new file mode 100644
index 00000000..98a371ff
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -0,0 +1,215 @@
+#######################################################################
+#                            Rust Snippets                            #
+#######################################################################
+
+###############
+#  Functions  #
+###############
+snippet fn "A function, optionally with arguments and return type."
+fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet test "Test function"
+#[test]
+fn ${1:test_function_name}() {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet new "A new function"
+pub fn new(${2}) -> ${1:Name} {
+	${VISUAL}${0}return $1 { ${3} };
+}
+endsnippet
+
+snippet main "The main function"
+pub fn main() {
+	${VISUAL}${0}
+}
+endsnippet
+
+
+
+snippet let "A let statement"
+let ${1:name}${3} = ${VISUAL}${2};
+endsnippet
+
+snippet pln "println!(..)" b
+println!("${1}"${2/..*/, /}${2});
+endsnippet
+
+
+
+snippet ec "extern crate ..." b
+extern crate ${1:sync};
+endsnippet
+
+snippet ecl "...extern crate log;" b
+#![feature(phase)]
+#[phase(syntax, link)] extern crate log;
+endsnippet
+
+snippet mod	 "A mod." b
+mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} /* $1 */
+endsnippet
+
+snippet crate "Create header information" b
+// Crate ID
+#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+
+// Additional metadata attributes
+#![desc = "${3:Descrption.}"]
+#![license = "${4:BSD}"]
+#![comment = "${5:Comment.}"]
+
+// Specify the output type
+#![crate_type = "${6:lib}"]
+endsnippet
+
+snippet allow "#[allow(..)]" b
+#[allow(${1:unused_variable})]
+endsnippet
+
+snippet feat "#![feature(..)]" b
+#![feature(${1:macro_rules})]
+endsnippet
+
+
+##################
+#  Common types  #
+##################
+snippet opt "Option<..>"
+Option<${1:int}>
+endsnippet
+
+snippet res "Result<.., ..>"
+Result<${1:~str}, ${2:()}>
+endsnippet
+
+
+
+
+snippet if "if .. (if)" b
+if ${1:/* condition */} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet mat "match"
+match ${1} {
+	${2} => ${3},
+}
+endsnippet
+
+snippet while "while .. {}" b
+while ${1:condition} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet for "for .. in .." b
+for ${1:i} in ${2:range(0u, 10)} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet spawn "spawn(proc() { .. });" b
+spawn(proc() {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+});
+endsnippet
+
+snippet chan "A channel" b
+let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
+endsnippet
+
+snippet duplex "Duplex stream" b
+let (${1:from_child}, ${2:to_child}) = sync::duplex();
+endsnippet
+
+#####################
+#  TODO commenting  #
+#####################
+snippet todo "A Todo comment"
+// [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
+endsnippet
+
+
+############
+#  Struct  #
+############
+snippet st "Struct" b
+struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet stn "Struct with new constructor." b
+pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+	${3:/* code */}
+}
+
+impl $1 {
+	pub fn new(${2}) -> $1 {
+		${4}return $1 {
+			${5}
+		};
+	}
+}
+endsnippet
+
+
+##########
+#  Enum  #
+##########
+snippet enum "An enum" b
+enum ${1:enum_name} {
+	${VISUAL}${0},
+}
+endsnippet
+
+
+##########
+#  Impl  #
+##########
+snippet imp "An impl" b
+impl ${1:Name} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet drop "Drop implementation" b
+impl Drop for ${1:Name} {
+	fn drop(&mut self) {
+		${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	}
+}
+endsnippet
+
+
+############
+#  Traits  #
+############
+snippet trait "Trait block" b
+trait ${1:Name} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+#############
+#  Statics  #
+#############
+snippet ss "A static string."
+static ${1}: &'static str = "${VISUAL}${0}";
+endsnippet
+
+snippet stat "A static variable."
+static ${1}: ${2:uint} = ${VISUAL}${0};
+endsnippet
+
+# vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/soy.snippets b/sources_non_forked/vim-snippets/UltiSnips/soy.snippets
new file mode 100644
index 00000000..9a22a57c
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/plugin/vimsnippets.vim b/sources_non_forked/vim-snippets/plugin/vimsnippets.vim
new file mode 100644
index 00000000..3c3ecf92
--- /dev/null
+++ b/sources_non_forked/vim-snippets/plugin/vimsnippets.vim
@@ -0,0 +1,37 @@
+if exists("b:done_vimsnippets")
+   finish
+endif
+let b:done_vimsnippets = 1
+
+" 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/sources_non_forked/vim-snippets/pythonx/vimsnippets.py b/sources_non_forked/vim-snippets/pythonx/vimsnippets.py
new file mode 100644
index 00000000..b00edb15
--- /dev/null
+++ b/sources_non_forked/vim-snippets/pythonx/vimsnippets.py
@@ -0,0 +1,20 @@
+"""Helper methods used in UltiSnips snippets."""
+
+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))
diff --git a/sources_non_forked/vim-snippets/snippets/django.snippets b/sources_non_forked/vim-snippets/snippets/django.snippets
index cad80eb2..e2a8d6d0 100644
--- a/sources_non_forked/vim-snippets/snippets/django.snippets
+++ b/sources_non_forked/vim-snippets/snippets/django.snippets
@@ -10,6 +10,10 @@
 
 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
@@ -80,7 +84,7 @@ snippet model
 		def __unicode__(self):
 			${5}
 
-		def save(self, force_insert=False, force_update=False):
+		def save(self, *args, **kwargs):
 			${6}
 
 		@models.permalink
diff --git a/sources_non_forked/vim-snippets/snippets/erlang.snippets b/sources_non_forked/vim-snippets/snippets/erlang.snippets
index 88458703..2a0d1a4c 100644
--- a/sources_non_forked/vim-snippets/snippets/erlang.snippets
+++ b/sources_non_forked/vim-snippets/snippets/erlang.snippets
@@ -120,8 +120,12 @@ snippet gen_server
 	        ]).
 
 	%% gen_server callbacks
-	-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	         terminate/2, code_change/3]).
+	-export([init/1,
+	         handle_call/3,
+	         handle_cast/2,
+	         handle_info/2,
+	         terminate/2,
+	         code_change/3]).
 
 	-define(SERVER, ?MODULE).
 
@@ -157,6 +161,320 @@ snippet gen_server
 	code_change(_OldVsn, State, _Extra) ->
 	    {ok, State}.
 
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# OTP gen_fsm
+snippet gen_fsm
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
+
+	-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('', 'my')`}).
+
+	-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
 	%%%===================================================================
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index 95418350..bc13fcbb 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -107,6 +107,8 @@ 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
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index f5f15984..ddb89d9a 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -1,5 +1,7 @@
 snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
+snippet haddock
+	{-# OPTIONS_HADDOCK ${0:hide} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}
diff --git a/sources_non_forked/vim-snippets/snippets/jade.snippets b/sources_non_forked/vim-snippets/snippets/jade.snippets
new file mode 100644
index 00000000..55f0af7b
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index d38df5b1..c221f466 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -1,5 +1,6 @@
 snippet #!
 	#!/usr/bin/env python
+	# -*- coding: utf-8 -*-
 snippet imp
 	import ${0:module}
 snippet uni
@@ -200,3 +201,10 @@ snippet epydoc
 
 	@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})
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 1798e08b..6ee11d4b 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -479,6 +479,8 @@ 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
@@ -749,8 +751,49 @@ 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}
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index 5eddb2c3..09d69ad3 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -194,8 +194,9 @@ snippet mhmap
 snippet as
 	${1:name}.asInstanceOf[${2:T}]
 #isInstanceOf[]
+snippet is
 	${1:name}.isInstanceOf[${2:T}]
-#end
+
 #collections methods
 
 #scope() with one arg

From 505a6a8befcd0c646301100c465758795c1317d2 Mon Sep 17 00:00:00 2001
From: Jesus Alberto Paz Jimenez <alberto.pazjimenez@gmail.com>
Date: Mon, 28 Apr 2014 17:03:32 +0200
Subject: [PATCH 39/61] Update zenroom2.vim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VIM - Vi IMproved 7.4 under cygwin generates the following errors

>Se ha detectado un error al procesar /home/alberto.paz/.vim_runtime/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim:
>línea   65
>E128: Function name must start with a capital or "s:": g:zenroom_goyo_before()
>línea   67
>E133: ":return" no está dentro de una función
>línea   74
>E193: ¡":endfunction" no está dentro de una función!
>línea   76
>E128: Function name must start with a capital or "s:": g:zenroom_goyo_after()
>línea   78
>E133: ":return" no está dentro de una función
>línea   88
>E193: ¡":endfunction" no está dentro de una función!
>línea   90
>E700: Función desconocida: g:zenroom_goyo_before
>E700: Función desconocida: g:zenroom_goyo_after
---
 sources_non_forked/vim-zenroom2/plugin/zenroom2.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index a9781c74..2ea60f07 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -62,7 +62,7 @@ function! s:markdown_room()
     exec( "hi StatusLineNC " . l:highlightfgbgcolor )
 endfunction
 
-function! g:zenroom_goyo_before()
+function! g:Zenroom_goyo_before()
     if !has("gui_running")
         return
     endif
@@ -73,7 +73,7 @@ function! g:zenroom_goyo_before()
     endif
 endfunction
 
-function! g:zenroom_goyo_after()
+function! g:Zenroom_goyo_after()
     if !has("gui_running")
         return
     endif
@@ -87,4 +87,4 @@ function! g:zenroom_goyo_after()
     endif
 endfunction
 
-let g:goyo_callbacks = [ function('g:zenroom_goyo_before'), function('g:zenroom_goyo_after') ]
+let g:goyo_callbacks = [ function('g:Zenroom_goyo_before'), function('g:Zenroom_goyo_after') ]

From d3fd0cf6329c2edb276414445e8d30414f902363 Mon Sep 17 00:00:00 2001
From: Alexander Fomin <xander.fomin@ya.ru>
Date: Thu, 15 May 2014 13:46:51 +0400
Subject: [PATCH 40/61] Make update_plugin.py script compatible with Python 3

---
 update_plugins.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update_plugins.py b/update_plugins.py
index 78de7826..8c4e4599 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -69,7 +69,7 @@ def download_extract_replace(plugin_name, zip_path, temp_dir, source_dir):
 
     shutil.move(plugin_temp_path, plugin_dest_path)
 
-    print 'Updated %s' % plugin_name
+    print('Updated {0}'.format(plugin_name))
 
 
 if __name__ == '__main__':

From 2a769e6cb0673644a8a8306610be3ad8a7ac0a43 Mon Sep 17 00:00:00 2001
From: shenchsh <shenchsh.sysu@gmail.com>
Date: Thu, 22 May 2014 11:25:51 +0800
Subject: [PATCH 41/61] avoid the garbled characters in Chinese language
 windows OS

---
 vimrcs/basic.vim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 68b79b82..8faa41a1 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -72,6 +72,12 @@ command W w !sudo tee % > /dev/null
 " Set 7 lines to the cursor - when moving vertically using j/k
 set so=7
 
+" Avoid garbled characters in Chinese language windows OS
+let $LANG='en' 
+set langmenu=en
+source $VIMRUNTIME/delmenu.vim
+source $VIMRUNTIME/menu.vim
+
 " Turn on the WiLd menu
 set wildmenu
 

From 4ba28bb25ba73e3e1022c433d7edc5a94a335c7c Mon Sep 17 00:00:00 2001
From: Amir Salihefendic <amix@amix.dk>
Date: Tue, 1 Jul 2014 16:11:47 +0100
Subject: [PATCH 42/61] Update README.md

Added syntastic
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0fdb7bcf..792584bf 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ I recommend reading the docs of these plugins to understand them better. Each of
 * [goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2): 
 Remove all clutter and focus only on the essential. Similar to iA Writer or Write Room [Read more here](http://amix.dk/blog/post/19744)
 * [vim-commentary](https://github.com/tpope/vim-commentary): Comment stuff out.  Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion. `gcu` uncomments a set of adjacent commented lines.
+* [syntastic](https://github.com/scrooloose/syntastic): Syntax checking hacks for vim
 
 
 ## Included color schemes

From 1dba960b75349fd8e2f31cb97f45b232a7bc7b6c Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Wed, 2 Jul 2014 12:18:18 +0100
Subject: [PATCH 43/61] Updated plugins

---
 sources_non_forked/ack.vim/README.md          |  44 +-
 sources_non_forked/ack.vim/autoload/ack.vim   |  23 +-
 sources_non_forked/ack.vim/doc/ack.txt        |  16 +-
 sources_non_forked/ack.vim/ftplugin/qf.vim    |   2 +-
 sources_non_forked/ack.vim/plugin/ack.vim     |   8 +-
 sources_non_forked/goyo.vim/plugin/goyo.vim   |   7 +-
 sources_non_forked/nerdtree/README.markdown   |   7 +-
 .../nerdtree/autoload/nerdtree.vim            |  14 +-
 sources_non_forked/nerdtree/doc/NERD_tree.txt |  62 ++-
 .../nerdtree/lib/nerdtree/bookmark.vim        |   8 +-
 .../nerdtree/lib/nerdtree/creator.vim         |   2 +-
 .../nerdtree/lib/nerdtree/menu_item.vim       |   2 +-
 .../nerdtree/lib/nerdtree/path.vim            |  21 +
 .../nerdtree/lib/nerdtree/tree_dir_node.vim   |   4 +-
 .../nerdtree/nerdtree_plugin/fs_menu.vim      |  19 +-
 .../nerdtree/plugin/NERD_tree.vim             |   6 +-
 .../nerdtree/syntax/nerdtree.vim              |  90 ++--
 sources_non_forked/syntastic/CONTRIBUTING.md  | 122 +++--
 sources_non_forked/syntastic/README.markdown  |  37 +-
 .../syntastic/autoload/syntastic/c.vim        |   2 +-
 .../syntastic/autoload/syntastic/log.vim      |  34 +-
 .../autoload/syntastic/postprocess.vim        |   2 +
 .../autoload/syntastic/preprocess.vim         |  24 +
 .../syntastic/autoload/syntastic/util.vim     |   1 +
 .../syntastic/doc/syntastic.txt               |  40 +-
 .../syntastic/plugin/syntastic.vim            |  84 ++--
 .../syntastic/plugin/syntastic/checker.vim    |  16 +-
 .../syntastic/plugin/syntastic/cursor.vim     |   4 +-
 .../plugin/syntastic/highlighting.vim         |  11 +-
 .../syntastic/plugin/syntastic/loclist.vim    |  30 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |   1 +
 .../syntastic/plugin/syntastic/registry.vim   |  84 ++--
 .../syntastic/plugin/syntastic/signs.vim      |  23 +-
 .../syntax_checkers/actionscript/mxmlc.vim    |  12 +-
 .../syntax_checkers/bemhtml/bemhtmllint.vim   |   5 +-
 .../syntastic/syntax_checkers/bro/bro.vim     |  45 ++
 .../syntax_checkers/c/checkpatch.vim          |  25 +-
 .../syntastic/syntax_checkers/c/make.vim      |   2 +-
 .../syntastic/syntax_checkers/cabal/cabal.vim |  55 ++
 .../syntastic/syntax_checkers/co/coco.vim     |   3 +-
 .../syntax_checkers/coffee/coffeelint.vim     |   6 +-
 .../syntastic/syntax_checkers/css/csslint.vim |  10 +-
 .../syntastic/syntax_checkers/css/recess.vim  |  26 +
 .../syntastic/syntax_checkers/d/dmd.vim       |   6 +
 .../syntastic/syntax_checkers/eruby/ruby.vim  |  27 +-
 .../syntastic/syntax_checkers/haml/haml.vim   |  10 +-
 .../syntax_checkers/haskell/hdevtools.vim     |   4 +-
 .../syntastic/syntax_checkers/html/jshint.vim |  23 +-
 .../syntastic/syntax_checkers/html/tidy.vim   |   4 +
 .../syntastic/syntax_checkers/java/javac.vim  | 116 ++---
 .../javascript/closurecompiler.vim            |  32 +-
 .../syntax_checkers/javascript/eslint.vim     |  19 +-
 .../syntax_checkers/javascript/gjslint.vim    |   7 +-
 .../syntax_checkers/javascript/jshint.vim     |  21 +-
 .../syntax_checkers/javascript/jsl.vim        |   9 +-
 .../syntax_checkers/javascript/jslint.vim     |   2 +-
 .../syntastic/syntax_checkers/less/recess.vim |  44 ++
 .../syntastic/syntax_checkers/lisp/clisp.vim  |   7 +-
 .../syntastic/syntax_checkers/perl/perl.vim   |  20 +-
 .../syntastic/syntax_checkers/php/phpcs.vim   |   4 +-
 .../syntax_checkers/puppet/puppetlint.vim     |   7 +-
 .../syntax_checkers/python/flake8.vim         |   3 +-
 .../syntax_checkers/python/frosted.vim        |   4 +-
 .../syntax_checkers/python/pep257.vim         |  34 +-
 .../syntastic/syntax_checkers/python/pep8.vim |   3 +-
 .../syntax_checkers/python/py3kwarn.vim       |   3 +-
 .../syntax_checkers/python/pyflakes.vim       |  15 +-
 .../syntax_checkers/python/pylama.vim         |   4 +-
 .../syntax_checkers/python/pylint.vim         |   1 +
 .../syntax_checkers/python/python.vim         |   4 +-
 .../syntastic/syntax_checkers/r/lint.vim      |   5 +-
 .../syntastic/syntax_checkers/r/svtools.vim   |   3 +-
 .../syntastic/syntax_checkers/ruby/jruby.vim  |  12 +-
 .../syntax_checkers/ruby/macruby.vim          |   2 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |  18 +-
 .../syntax_checkers/ruby/rubylint.vim         |   6 +-
 .../syntastic/syntax_checkers/sass/sass.vim   |   1 +
 .../{rust/rustc.vim => sass/sassc.vim}        |  24 +-
 .../syntastic/syntax_checkers/scala/fsc.vim   |   7 +-
 .../syntax_checkers/scala/scalac.vim          |  10 +-
 .../syntastic/syntax_checkers/scss/sass.vim   |   1 -
 .../syntastic/syntax_checkers/scss/sassc.vim  |  25 +
 .../syntastic/syntax_checkers/sh/sh.vim       |  71 +--
 .../syntax_checkers/typescript/tslint.vim     |  46 ++
 .../syntastic/syntax_checkers/vala/valac.vim  |   2 +-
 .../syntastic/syntax_checkers/vhdl/ghdl.vim   |   2 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |   5 +-
 .../syntastic/syntax_checkers/yaml/yamlxs.vim |  13 +-
 .../syntax_checkers/z80/z80syntaxchecker.vim  |   2 +-
 .../tlib/autoload/tlib/Filter_cnf.vim         |  26 +-
 .../tlib/autoload/tlib/World.vim              |   4 +-
 .../tlib/autoload/tlib/string.vim             |   8 +-
 sources_non_forked/tlib/doc/tlib.txt          |   4 +-
 sources_non_forked/tlib/plugin/02tlib.vim     |   4 +-
 sources_non_forked/vim-airline/README.md      |   2 +-
 .../vim-airline/autoload/airline.vim          |  10 +-
 .../autoload/airline/extensions.vim           |  40 +-
 .../autoload/airline/extensions/branch.vim    |   9 +-
 .../autoload/airline/extensions/hunks.vim     |  17 +-
 .../autoload/airline/extensions/nrrwrgn.vim   |  54 ++
 .../tabline/unique_tail_improved.vim          |   6 +-
 .../airline/extensions/whitespace.vim         |  37 +-
 .../autoload/airline/highlighter.vim          |   5 +-
 .../autoload/airline/themes/bubblegum.vim     |   2 +-
 .../vim-airline/doc/airline.txt               |  34 +-
 .../vim-commentary/README.markdown            |   4 +-
 .../vim-commentary/doc/commentary.txt         |   3 +
 .../vim-commentary/plugin/commentary.vim      |   1 +
 .../vim-fugitive/README.markdown              |   4 +-
 .../vim-fugitive/doc/fugitive.txt             |  58 ++-
 .../vim-fugitive/plugin/fugitive.vim          | 470 ++++++++++++++----
 .../vim-golang/autoload/go/complete.vim       |   2 +-
 sources_non_forked/vim-golang/ftplugin/go.vim |   4 +-
 sources_non_forked/vim-golang/indent/go.vim   |  20 +-
 sources_non_forked/vim-golang/readme.txt      |   8 +-
 .../vim-markdown/README.markdown              |  17 +
 .../vim-markdown/ftplugin/markdown.vim        |   2 +-
 .../vim-markdown/syntax/markdown.vim          |   4 +-
 .../vim-snipmate/after/plugin/snipMate.vim    |   5 -
 .../vim-snipmate/autoload/snipMate.vim        |  38 +-
 .../vim-snipmate/doc/snipMate.txt             |   8 +-
 .../vim-snipmate/plugin/snipMate.vim          |  36 +-
 sources_non_forked/vim-snippets/README.md     |  38 +-
 .../vim-snippets/UltiSnips/c.snippets         |  24 +-
 .../vim-snippets/UltiSnips/cpp.snippets       |   2 +-
 .../vim-snippets/UltiSnips/d.snippets         |  58 +--
 .../vim-snippets/UltiSnips/go.snippets        |   6 +
 .../vim-snippets/UltiSnips/java.snippets      |  10 +-
 .../UltiSnips/javascript.snippets             |  12 +
 .../UltiSnips/javascript_angular.snippets     |  25 +
 .../vim-snippets/UltiSnips/julia.snippets     |  34 ++
 .../vim-snippets/UltiSnips/markdown.snippets  |  11 +
 .../vim-snippets/UltiSnips/pandoc.snippets    |   3 +
 .../UltiSnips/php_symfony2.snippets           |  22 +
 .../vim-snippets/UltiSnips/r.snippets         |  37 +-
 .../vim-snippets/UltiSnips/rust.snippets      | 167 ++++---
 .../vim-snippets/UltiSnips/tex.snippets       |   2 +-
 .../vim-snippets/UltiSnips/vim.snippets       |  42 +-
 .../vim-snippets/snippets/_.snippets          |  18 +
 .../vim-snippets/snippets/css.snippets        |  20 +
 .../vim-snippets/snippets/elixir.snippets     |  33 +-
 .../vim-snippets/snippets/go.snippets         |  12 +
 .../vim-snippets/snippets/html.snippets       |   5 +-
 .../snippets/html_minimal.snippets            |  72 ---
 .../vim-snippets/snippets/java.snippets       |  77 ++-
 .../snippets/javascript/javascript.snippets   |   2 +-
 .../vim-snippets/snippets/julia.snippets      | 102 ++++
 .../vim-snippets/snippets/php.snippets        |   2 +-
 .../vim-snippets/snippets/r.snippets          |  16 +-
 .../vim-snippets/snippets/ruby.snippets       |   4 +-
 .../vim-snippets/snippets/rust.snippets       | 125 +++++
 .../vim-snippets/snippets/scheme.snippets     |  36 ++
 .../vim-snippets/snippets/sh.snippets         |   2 +-
 .../vim-snippets/snippets/tex.snippets        | 159 +++---
 .../vim-snippets/snippets/vim.snippets        |  26 +-
 .../vim-surround/plugin/surround.vim          |  14 +-
 156 files changed, 2657 insertions(+), 1234 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/css/recess.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/less/recess.vim
 rename sources_non_forked/syntastic/syntax_checkers/{rust/rustc.vim => sass/sassc.vim} (57%)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
 create mode 100644 sources_non_forked/vim-markdown/README.markdown
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/julia.snippets
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
 delete mode 100644 sources_non_forked/vim-snippets/snippets/html_minimal.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/julia.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/rust.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/scheme.snippets

diff --git a/sources_non_forked/ack.vim/README.md b/sources_non_forked/ack.vim/README.md
index d9dbb929..008fb3dd 100644
--- a/sources_non_forked/ack.vim/README.md
+++ b/sources_non_forked/ack.vim/README.md
@@ -9,7 +9,7 @@ ack from vim, and shows the results in a split window.
 
 ### Ack
 
-You will need the ack, of course, to install it follow the
+You will need the ack(>= 2.0), of course, to install it follow the
 [manual](http://beyondgrep.com/install/)
 
 ### The Plugin
@@ -75,8 +75,8 @@ check out the docs for the Perl script 'ack', for obvious reasons:
 ### Gotchas
 
 Some characters have special meaning, and need to be escaped your search
-pattern. For instance, '#'. You have to escape it like this :Ack '\\\#define
-foo' to search for #define foo. (From blueyed in issue #5.)
+pattern. For instance, '#'. You have to escape it like this `:Ack '\\\#define
+foo'` to search for '#define foo'. (From blueyed in issue #5.)
 
 ## Changelog
 
@@ -91,3 +91,41 @@ foo' to search for #define foo. (From blueyed in issue #5.)
 * Add g:ack_mapping
 * Add g:ack_default_options
 * Add a help toggle `?`(like NERDTree)
+
+### 1.0.1
+
+* Fixes #124. Bug with `g:ack_autofold_results`
+
+### 1.0.2
+
+* Add compatibility with [vim-dispatch](https://github.com/tpope/vim-dispatch)
+
+### 1.0.3
+
+* Fixes #127. Use `&l:hlsearch` instead of `v:hlsearch` to keep compatibility
+with versions that does not have this variable.
+
+### 1.0.4
+
+* Fixes #128. Always apply mappings, even when using vim-dispatch.
+
+### 1.0.5
+
+* Fixes #128. Fixes the `errorformat` for ack when using vim-dispatch.
+* Do not use vim-dispatch by default. To use vim-dispath must set
+`g:ack_use_dispatch`
+
+### 1.0.6
+
+* Fixes highlight function to work when user passes options. Ex.: Ack -i test
+  Thank's @mannih. (#131, #134)
+
+### 1.0.7
+
+* Fixes highlight function to work when passes more than one option, or options
+with double dashes(--option) Thank's to @MiguelLatorre and @mannih
+
+### 1.0.8
+
+* Fixes (again) highlight, now using negative look behind.
+* Change mappings `o` and `O` to behave as documented
diff --git a/sources_non_forked/ack.vim/autoload/ack.vim b/sources_non_forked/ack.vim/autoload/ack.vim
index ff8d8eb6..fae73b1f 100644
--- a/sources_non_forked/ack.vim/autoload/ack.vim
+++ b/sources_non_forked/ack.vim/autoload/ack.vim
@@ -8,6 +8,7 @@ function! ack#Ack(cmd, args)
   else
     let l:grepargs = a:args . join(a:000, ' ')
   end
+  echom l:grepargs
   let l:ackprg_run = g:ackprg
 
   " Format, used to manage column jump
@@ -26,7 +27,14 @@ function! ack#Ack(cmd, args)
   try
     " NOTE: we escape special chars, but not everything using shellescape to
     "       allow for passing arguments etc
-    silent execute a:cmd . " " . escape(l:grepargs, '|#%')
+    if g:ack_use_dispatch
+      let &l:errorformat = g:ackformat
+      let &l:makeprg=g:ackprg." " . escape(l:grepargs, '|#%')
+      Make
+    else
+      silent execute a:cmd . " " . escape(l:grepargs, '|#%')
+    endif
+
   finally
     let &grepprg=grepprg_bak
     let &grepformat=grepformat_bak
@@ -42,7 +50,12 @@ function! ack#Ack(cmd, args)
     let s:close_cmd = ':cclose<CR>'
   endif
 
-  call ack#show_results()
+  if !g:ack_use_dispatch
+    call ack#show_results()
+  else
+    copen
+  endif
+  call <SID>apply_maps()
   call <SID>highlight(l:grepargs)
 
   redraw!
@@ -50,7 +63,6 @@ endfunction
 
 function! ack#show_results()
   execute s:handler
-  call <SID>apply_maps()
 endfunction
 
 function! s:apply_maps()
@@ -100,9 +112,8 @@ function! s:highlight(args)
     return
   endif
 
-  let @/ = matchstr(a:args, "\\v\\w+\>|['\"]\\zs[^\"]+\\ze['\"]")
-  setlocal hlsearch
-  call feedkeys(":let v:hlsearch=1 \| echo \<CR>", "n")
+  let @/ = matchstr(a:args, "\\v(-)\@<!(\<)\@<=\\w+|['\"]\\zs.{-}\\ze['\"]")
+  call feedkeys(":let &l:hlsearch=1 \| echo \<CR>", "n")
 endfunction
 
 function! ack#AckFromSearch(cmd, args)
diff --git a/sources_non_forked/ack.vim/doc/ack.txt b/sources_non_forked/ack.vim/doc/ack.txt
index 33c10529..6b1be331 100644
--- a/sources_non_forked/ack.vim/doc/ack.txt
+++ b/sources_non_forked/ack.vim/doc/ack.txt
@@ -86,7 +86,7 @@ Example:
         let g:ackprg = "other-bin-ack"
 <
 
-                                                        g:ack_default_options*
+                                                       *g:ack_default_options*
 g:ack_default_options
 Default: " -s -H --nocolor --nogroup --column"
 
@@ -94,7 +94,7 @@ Use this option to specify the options used by ack
 
 Example:
 >
-        let g:ackprg =
+        let g:ack_default_options =
               \ " -s -H --nocolor --nogroup --column --smart-case --follow"
 <
 
@@ -203,6 +203,18 @@ Example:
         let g:ackpreview = 1
 <
 
+                                                          *g:ack_use_dispatch*
+
+g:ack_use_dispatch
+Default: 0
+
+Use this option to use vim-dispatch to search the results in background
+
+Example:
+>
+        let g:ack_use_dispatch = 1
+<
+
 ==============================================================================
 MAPPINGS                                                        *ack-mappings*
 
diff --git a/sources_non_forked/ack.vim/ftplugin/qf.vim b/sources_non_forked/ack.vim/ftplugin/qf.vim
index 7da45a4c..27564fa7 100644
--- a/sources_non_forked/ack.vim/ftplugin/qf.vim
+++ b/sources_non_forked/ack.vim/ftplugin/qf.vim
@@ -1,4 +1,4 @@
-if g:ack_autofold_results
+if exists("g:ack_autofold_results") && g:ack_autofold_results
   setlocal foldlevel=0
   setlocal foldmethod=expr
   setlocal foldexpr=matchstr(getline(v:lnum),'^[^\|]\\+')==#matchstr(getline(v:lnum+1),'^[^\|]\\+')?1:'<1'
diff --git a/sources_non_forked/ack.vim/plugin/ack.vim b/sources_non_forked/ack.vim/plugin/ack.vim
index e5d0507b..6d6c55bc 100644
--- a/sources_non_forked/ack.vim/plugin/ack.vim
+++ b/sources_non_forked/ack.vim/plugin/ack.vim
@@ -22,12 +22,16 @@ if !exists("g:ack_apply_lmappings")
   let g:ack_apply_lmappings = !exists("g:ack_lhandler")
 endif
 
+if !exists("g:ack_use_dispatch")
+  let g:ack_use_dispatch = 0
+end
+
 let s:ack_mappings = {
       \ "t": "<C-W><CR><C-W>T",
       \ "T": "<C-W><CR><C-W>TgT<C-W>j",
       \ "o": "<CR>",
-      \ "O": "<CR><C-W><C-W>:ccl<CR>",
-      \ "go": "<CR><C-W>j",
+      \ "O": "<CR><C-W>p<C-W>c",
+      \ "go": "<CR><C-W>p",
       \ "h": "<C-W><CR><C-W>K",
       \ "H": "<C-W><CR><C-W>K<C-W>b",
       \ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 311589ed..4265e14f 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -104,13 +104,13 @@ function! s:tranquilize()
             \ 'StatusLine', 'StatusLineNC', 'SignColumn']
     " -1 on Vim / '' on GVim
     if bg == -1 || empty(bg)
-      call s:set_color(grp, '', 'NONE')
       call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
       call s:set_color(grp, 'bg', 'NONE')
     else
       call s:set_color(grp, 'fg', bg)
       call s:set_color(grp, 'bg', bg)
     endif
+    call s:set_color(grp, '', 'NONE')
   endfor
 endfunction
 
@@ -244,6 +244,8 @@ function! s:goyo_off()
   let goyo_disabled_airline   = t:goyo_disabled_airline
   let goyo_disabled_powerline = t:goyo_disabled_powerline
   let goyo_disabled_lightline = t:goyo_disabled_lightline
+  let goyo_orig_buffer        = t:goyo_master
+  let [line, col]             = [line('.'), col('.')]
 
   if tabpagenr() == 1
     tabnew
@@ -252,6 +254,9 @@ function! s:goyo_off()
   endif
   tabclose
   execute 'normal! '.s:orig_tab.'gt'
+  if winbufnr(0) == goyo_orig_buffer
+    execute printf('normal! %dG%d|', line, col)
+  endif
 
   let wmh = remove(goyo_revert, 'winminheight')
   let wh  = remove(goyo_revert, 'winheight')
diff --git a/sources_non_forked/nerdtree/README.markdown b/sources_non_forked/nerdtree/README.markdown
index e6178091..bfae5c68 100644
--- a/sources_non_forked/nerdtree/README.markdown
+++ b/sources_non_forked/nerdtree/README.markdown
@@ -60,7 +60,7 @@ Installation
     cd ~/.vim/bundle
     git clone https://github.com/scrooloose/nerdtree.git
 
-Then reload vim, run `:helptags`, and check out `:help NERD_tree.txt`.
+Then reload vim, run `:Helptags`, and check out `:help NERD_tree.txt`.
 
 
 Faq
@@ -80,7 +80,10 @@ A. Stick this in your vimrc: `autocmd vimenter * NERDTree`
 
 __Q. How can I open a NERDTree automatically when vim starts up if no files were specified?__
 
-A. Stick this in your vimrc `autocmd vimenter * if !argc() | NERDTree | endif`
+A. Stick this in your vimrc
+
+    autocmd StdinReadPre * let s:std_in=1
+    autocmd VimEnter * if !argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
 __Q. How can I map a specific key or shortcut to open NERDTree?__
 
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/sources_non_forked/nerdtree/autoload/nerdtree.vim
index 3a2d71a6..35919320 100644
--- a/sources_non_forked/nerdtree/autoload/nerdtree.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree.vim
@@ -513,7 +513,7 @@ function! nerdtree#dumpHelp()
         let @h=@h."\" ". g:NERDTreeMapHelp .": toggle help\n"
         let @h=@h."\"\n\" ----------------------------\n"
         let @h=@h."\" Bookmark commands~\n"
-        let @h=@h."\" :Bookmark <name>\n"
+        let @h=@h."\" :Bookmark [<name>]\n"
         let @h=@h."\" :BookmarkToRoot <name>\n"
         let @h=@h."\" :RevealBookmark <name>\n"
         let @h=@h."\" :OpenBookmark <name>\n"
@@ -1068,9 +1068,17 @@ function! s:closeCurrentDir(node)
     if parent ==# {} || parent.isRoot()
         call nerdtree#echo("cannot close tree root")
     else
-        call a:node.parent.close()
+        while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
+            if parent.parent.getVisibleChildCount() == 1
+                call parent.close()
+                let parent = parent.parent
+            else
+                break
+            endif
+        endwhile
+        call parent.close()
         call nerdtree#renderView()
-        call a:node.parent.putCursorHere(0, 0)
+        call parent.putCursorHere(0, 0)
     endif
 endfunction
 
diff --git a/sources_non_forked/nerdtree/doc/NERD_tree.txt b/sources_non_forked/nerdtree/doc/NERD_tree.txt
index bf038962..4ddc2507 100644
--- a/sources_non_forked/nerdtree/doc/NERD_tree.txt
+++ b/sources_non_forked/nerdtree/doc/NERD_tree.txt
@@ -109,7 +109,7 @@ The following features and functionality are provided by the NERD tree:
 <
 :NERDTreeFromBookmark <bookmark>                       *:NERDTreeFromBookmark*
     Opens a fresh NERD tree with the root initialized to the dir for
-    <bookmark>.  This only reason to use this command over :NERDTree is for
+    <bookmark>.  The only reason to use this command over :NERDTree is for
     the completion (which is for bookmarks rather than directories).
 
 :NERDTreeToggle [<start-directory> | <bookmark>]             *:NERDTreeToggle*
@@ -160,7 +160,7 @@ click bookmarks or use the |NERDTree-o| mapping to activate them. See also,
 
 Note that the following commands are only available in the NERD tree buffer.
 
-:Bookmark <name>
+:Bookmark [<name>]
     Bookmark the current node as <name>. If there is already a <name>
     bookmark, it is overwritten. <name> must not contain spaces.
     If <name> is not provided, it defaults to the file or directory name.
@@ -358,7 +358,7 @@ Default key: O
 Map option: NERDTreeMapOpenRecursively
 Applies to: directories.
 
-Recursively opens the selelected directory.
+Recursively opens the selected directory.
 
 All files and directories are cached, but if a directory would not be
 displayed due to file filters (see |'NERDTreeIgnore'| |NERDTree-f|) or the
@@ -609,17 +609,19 @@ NERD tree. These options should be set in your vimrc.
 
 |'loaded_nerd_tree'|            Turns off the script.
 
-|'NERDChristmasTree'|           Tells the NERD tree to make itself colourful
-                                and pretty.
-
 |'NERDTreeAutoCenter'|          Controls whether the NERD tree window centers
                                 when the cursor moves within a specified
                                 distance to the top/bottom of the window.
+
 |'NERDTreeAutoCenterThreshold'| Controls the sensitivity of autocentering.
 
 |'NERDTreeCaseSensitiveSort'|   Tells the NERD tree whether to be case
                                 sensitive or not when sorting nodes.
 
+|'NERDTreeSortHiddenFirst'|     Tells the NERD tree whether to take the dot
+                                at the beginning of the hidden file names
+                                into account when sorting nodes.
+
 |'NERDTreeChDirMode'|           Tells the NERD tree if/when it should change
                                 vim's current working directory.
 
@@ -631,8 +633,13 @@ NERD tree. These options should be set in your vimrc.
 
 |'NERDTreeIgnore'|              Tells the NERD tree which files to ignore.
 
+|'NERDTreeRespectWildIgnore'|   Tells the NERD tree to respect |'wildignore'|.
+
 |'NERDTreeBookmarksFile'|       Where the bookmarks are stored.
 
+|'NERDTreeBookmarksSort'|       Whether the bookmarks list is sorted on
+                                display.
+
 |'NERDTreeMouseMode'|           Tells the NERD tree how to handle mouse
                                 clicks.
 
@@ -667,8 +674,8 @@ NERD tree. These options should be set in your vimrc.
 |'NERDTreeDirArrows'|           Tells the NERD tree to use arrows instead of
                                 + ~ chars when displaying directories.
 
-|'NERDTreeCasadeOpenSingleChildDir'|
-                                Casade open while selected directory has only
+|'NERDTreeCascadeOpenSingleChildDir'|
+                                Cascade open while selected directory has only
                                 one child that also is a directory.
 
 |'NERDTreeAutoDeleteBuffer'|    Tells the NERD tree to automatically remove 
@@ -686,15 +693,6 @@ If this plugin is making you feel homicidal, it may be a good idea to turn it
 off with this line in your vimrc: >
     let loaded_nerd_tree=1
 <
-------------------------------------------------------------------------------
-                                                         *'NERDChristmasTree'*
-Values: 0 or 1.
-Default: 1.
-
-If this option is set to 1 then some extra syntax highlighting elements are
-added to the nerd tree to make it more colourful.
-
-Set it to 0 for a more vanilla looking tree.
 
 ------------------------------------------------------------------------------
                                                         *'NERDTreeAutoCenter'*
@@ -817,6 +815,13 @@ line: >
 The file filters can be turned on and off dynamically with the |NERDTree-f|
 mapping.
 
+------------------------------------------------------------------------------
+                                                *'NERDTreeRespectWildIgnore'*
+Values: 0 or 1.
+Default: 0.
+
+If set to 1, the |'wildignore'| setting is respected.
+
 ------------------------------------------------------------------------------
                                                      *'NERDTreeBookmarksFile'*
 Values: a path
@@ -824,6 +829,14 @@ Default: $HOME/.NERDTreeBookmarks
 
 This is where bookmarks are saved. See |NERDTreeBookmarkCommands|.
 
+------------------------------------------------------------------------------
+                                                     *'NERDTreeBookmarksSort'*
+Values: 0 or 1
+Default: 1
+
+If set to 0 then the bookmarks list is not sorted.
+If set to 1 the bookmarks list is sorted.
+
 ------------------------------------------------------------------------------
                                                        *'NERDTreeMouseMode'*
 Values: 1, 2 or 3.
@@ -987,16 +1000,17 @@ option: >
 <
 
 ------------------------------------------------------------------------------
-                                          *'NERDTreeCasadeOpenSingleChildDir'*
+                                          *'NERDTreeCascadeOpenSingleChildDir'*
 Values: 0 or 1
 Default: 1.
 
 When opening dir nodes, this option tells NERDTree to recursively open dirs
 that have only one child which is also a dir. NERDTree will stop when it finds
-a dir that contains anything but another single dir. This option may be useful
-for Java projects.  Use one of the follow lines to set this option: >
-    let NERDTreeCasadeOpenSingleChildDir=0
-    let NERDTreeCasadeOpenSingleChildDir=1
+a dir that contains anything but another single dir. This option also causes
+the |NERDTree-x| mapping to close dirs in the same manner. This option may be
+useful for Java projects. Use one of the follow lines to set this option: >
+    let NERDTreeCascadeOpenSingleChildDir=0
+    let NERDTreeCascadeOpenSingleChildDir=1
 <
 
 ------------------------------------------------------------------------------
@@ -1062,8 +1076,8 @@ NERDTreeAddKeyMap({options})                             *NERDTreeAddKeyMap()*
         call NERDTreeAddKeyMap({
                \ 'key': 'foo',
                \ 'callback': 'NERDTreeCDHandler',
-               \ 'quickhelpText': 'echo full path of current node' })
-               \ 'scope': 'DirNode'
+               \ 'quickhelpText': 'echo full path of current node',
+               \ 'scope': 'DirNode' })
 
         function! NERDTreeCDHandler(dirnode)
             call a:dirnode.changeToDir()
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
index 5b845d81..84a6099f 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
@@ -19,7 +19,9 @@ function! s:Bookmark.AddBookmark(name, path)
         endif
     endfor
     call add(s:Bookmark.Bookmarks(), s:Bookmark.New(a:name, a:path))
-    call s:Bookmark.Sort()
+    if g:NERDTreeBookmarksSort ==# 1
+        call s:Bookmark.Sort()
+    endif
 endfunction
 
 " FUNCTION: Bookmark.Bookmarks()   {{{1
@@ -101,7 +103,9 @@ function! s:Bookmark.CacheBookmarks(silent)
                 call nerdtree#echo(invalidBookmarksFound . " invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.")
             endif
         endif
-        call s:Bookmark.Sort()
+        if g:NERDTreeBookmarksSort ==# 1
+            call s:Bookmark.Sort()
+        endif
     endif
 endfunction
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
index 7f0721f0..19c51ffb 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
@@ -279,8 +279,8 @@ function! s:Creator._setCommonBufOptions()
     let b:NERDTreeShowFiles = g:NERDTreeShowFiles
     let b:NERDTreeShowHidden = g:NERDTreeShowHidden
     let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
-    setfiletype nerdtree
     call self._bindMappings()
+    setlocal filetype=nerdtree
 endfunction
 
 "FUNCTION: s:Creator._setupStatusline() {{{1
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim b/sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim
index 6fb9d9e3..92c1bbbf 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/menu_item.vim
@@ -90,7 +90,7 @@ endfunction
 "callback
 function! s:MenuItem.execute()
     if len(self.children)
-        let mc = s:MenuController.New(self.children)
+        let mc = g:NERDTreeMenuController.New(self.children)
         call mc.showMenu()
     else
         if self.callback != -1
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index 58bb0138..047a72a6 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -103,6 +103,10 @@ function! s:Path.compareTo(path)
     elseif thisSS > thatSS
         return 1
     else
+        if !g:NERDTreeSortHiddenFirst
+            let thisPath = substitute(thisPath, '^[._]', '', '')
+            let thatPath = substitute(thatPath, '^[._]', '', '')
+        endif
         "if the sort sequences are the same then compare the paths
         "alphabetically
         let pathCompare = g:NERDTreeCaseSensitiveSort ? thisPath <# thatPath : thisPath <? thatPath
@@ -141,6 +145,7 @@ function! s:Path.Create(fullpath)
 
         "assume its a file and create
         else
+            call s:Path.createParentDirectories(a:fullpath)
             call writefile([], a:fullpath)
         endif
     catch
@@ -161,6 +166,8 @@ function! s:Path.copy(dest)
         throw "NERDTree.CopyingNotSupportedError: Copying is not supported on this OS"
     endif
 
+    call s:Path.createParentDirectories(a:dest)
+
     let dest = s:Path.WinToUnixPath(a:dest)
 
     let cmd = g:NERDTreeCopyCmd . " " . escape(self.str(), nerdtree#escChars()) . " " . escape(dest, nerdtree#escChars())
@@ -197,6 +204,20 @@ function! s:Path.copyingWillOverwrite(dest)
     endif
 endfunction
 
+"FUNCTION: Path.createParentDirectories(path) {{{1
+"
+"create parent directories for this path if needed
+"without throwing any errors is those directories already exist
+"
+"Args:
+"path: full path of the node whose parent directories may need to be created
+function! s:Path.createParentDirectories(path)
+    let dir_path = fnamemodify(a:path, ':h')
+    if !isdirectory(dir_path)
+        call mkdir(dir_path, 'p')
+    endif
+endfunction
+
 "FUNCTION: Path.delete() {{{1
 "
 "Deletes the file represented by this path.
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim b/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
index e3a068ed..520fca6a 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
@@ -229,7 +229,7 @@ function! s:TreeDirNode._initChildren(silent)
     let globDir = dir.str({'format': 'Glob'})
 
     if version >= 703
-        let filesStr = globpath(globDir, '*', 1) . "\n" . globpath(globDir, '.*', 1)
+        let filesStr = globpath(globDir, '*', !g:NERDTreeRespectWildIgnore) . "\n" . globpath(globDir, '.*', !g:NERDTreeRespectWildIgnore)
     else
         let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*')
     endif
@@ -500,7 +500,7 @@ function! s:TreeDirNode.toggleOpen(...)
     if self.isOpen ==# 1
         call self.close()
     else
-        if g:NERDTreeCasadeOpenSingleChildDir == 0
+        if g:NERDTreeCascadeOpenSingleChildDir == 0
             call self.open(opts)
         else
             call self.openAlong(opts)
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
index 9b81ed37..4fdc5d2a 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -82,13 +82,14 @@ endfunction
 function! s:promptToRenameBuffer(bufnum, msg, newFileName)
     echo a:msg
     if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
+        let quotedFileName = "'" . a:newFileName . "'"
         " 1. ensure that a new buffer is loaded
-        exec "badd " . a:newFileName
+        exec "badd " . quotedFileName
         " 2. ensure that all windows which display the just deleted filename
         " display a buffer for a new filename. 
         let s:originalTabNumber = tabpagenr()
         let s:originalWindowNumber = winnr()
-        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':e! " . a:newFileName . "' | endif"
+        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec \":e! " . quotedFileName . "\" | endif"
         exec "tabnext " . s:originalTabNumber
         exec s:originalWindowNumber . "wincmd w"
         " 3. We don't need a previous buffer anymore
@@ -114,7 +115,10 @@ function! NERDTreeAddNode()
         let parentNode = b:NERDTreeRoot.findNode(newPath.getParent())
 
         let newTreeNode = g:NERDTreeFileNode.New(newPath)
-        if parentNode.isOpen || !empty(parentNode.children)
+        if empty(parentNode)
+            call b:NERDTreeRoot.refresh()
+            call nerdtree#renderView()
+        elseif parentNode.isOpen || !empty(parentNode.children)
             call parentNode.addChild(newTreeNode, 1)
             call NERDTreeRender()
             call newTreeNode.putCursorHere(1, 0)
@@ -138,7 +142,7 @@ function! NERDTreeMoveNode()
     endif
 
     try
-        let bufnum = bufnr(curNode.path.str())
+        let bufnum = bufnr("^".curNode.path.str()."$")
 
         call curNode.rename(newNodePath)
         call NERDTreeRender()
@@ -186,7 +190,7 @@ function! NERDTreeDeleteNode()
 
             "if the node is open in a buffer, ask the user if they want to
             "close that buffer
-            let bufnum = bufnr(currentNode.path.str())
+            let bufnum = bufnr("^".currentNode.path.str()."$")
             if buflisted(bufnum)
                 let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)"
                 call s:promptToDelBuffer(bufnum, prompt)
@@ -224,7 +228,10 @@ function! NERDTreeCopyNode()
         if confirmed
             try
                 let newNode = currentNode.copy(newNodePath)
-                if !empty(newNode)
+                if empty(newNode)
+                    call b:NERDTreeRoot.refresh()
+                    call nerdtree#renderView()
+                else
                     call NERDTreeRender()
                     call newNode.putCursorHere(0, 0)
                 endif
diff --git a/sources_non_forked/nerdtree/plugin/NERD_tree.vim b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
index 5bee03ad..cbfa884e 100644
--- a/sources_non_forked/nerdtree/plugin/NERD_tree.vim
+++ b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
@@ -45,28 +45,30 @@ function! s:initVariable(var, value)
 endfunction
 
 "SECTION: Init variable calls and other random constants {{{2
-call s:initVariable("g:NERDChristmasTree", 1)
 call s:initVariable("g:NERDTreeAutoCenter", 1)
 call s:initVariable("g:NERDTreeAutoCenterThreshold", 3)
 call s:initVariable("g:NERDTreeCaseSensitiveSort", 0)
+call s:initVariable("g:NERDTreeSortHiddenFirst", 1)
 call s:initVariable("g:NERDTreeChDirMode", 0)
 call s:initVariable("g:NERDTreeMinimalUI", 0)
 if !exists("g:NERDTreeIgnore")
     let g:NERDTreeIgnore = ['\~$']
 endif
 call s:initVariable("g:NERDTreeBookmarksFile", expand('$HOME') . '/.NERDTreeBookmarks')
+call s:initVariable("g:NERDTreeBookmarksSort", 1)
 call s:initVariable("g:NERDTreeHighlightCursorline", 1)
 call s:initVariable("g:NERDTreeHijackNetrw", 1)
 call s:initVariable("g:NERDTreeMouseMode", 1)
 call s:initVariable("g:NERDTreeNotificationThreshold", 100)
 call s:initVariable("g:NERDTreeQuitOnOpen", 0)
+call s:initVariable("g:NERDTreeRespectWildIgnore", 0)
 call s:initVariable("g:NERDTreeShowBookmarks", 0)
 call s:initVariable("g:NERDTreeShowFiles", 1)
 call s:initVariable("g:NERDTreeShowHidden", 0)
 call s:initVariable("g:NERDTreeShowLineNumbers", 0)
 call s:initVariable("g:NERDTreeSortDirs", 1)
 call s:initVariable("g:NERDTreeDirArrows", !nerdtree#runningWindows())
-call s:initVariable("g:NERDTreeCasadeOpenSingleChildDir", 1)
+call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
 
 if !exists("g:NERDTreeSortOrder")
     let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
diff --git a/sources_non_forked/nerdtree/syntax/nerdtree.vim b/sources_non_forked/nerdtree/syntax/nerdtree.vim
index 636d2af7..7cbba6ee 100644
--- a/sources_non_forked/nerdtree/syntax/nerdtree.vim
+++ b/sources_non_forked/nerdtree/syntax/nerdtree.vim
@@ -7,38 +7,54 @@ syn match NERDTreeFlag #\[RO\]#
 "highlighting for the .. (up dir) line at the top of the tree
 execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line ."#"
 
-"highlighting for the ~/+ symbols for the directory nodes
-syn match NERDTreeClosable #\~\<#
-syn match NERDTreeClosable #\~\.#
-syn match NERDTreeOpenable #+\<#
-syn match NERDTreeOpenable #+\.#he=e-1
-
-"highlighting for the tree structural parts
-syn match NERDTreePart #|#
-syn match NERDTreePart #`#
-syn match NERDTreePartFile #[|`]-#hs=s+1 contains=NERDTreePart
-
 "quickhelp syntax elements
-syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#hs=s+2,he=e-1
-syn match NERDTreeHelpKey #" \{1,2\}[^ ]*,#hs=s+2,he=e-1
-syn match NERDTreeHelpTitle #" .*\~#hs=s+2,he=e-1 contains=NERDTreeFlag
-syn match NERDTreeToggleOn #".*(on)#hs=e-2,he=e-1 contains=NERDTreeHelpKey
-syn match NERDTreeToggleOff #".*(off)#hs=e-3,he=e-1 contains=NERDTreeHelpKey
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*,#ms=s+2,me=e-1
+syn match NERDTreeHelpTitle #" .*\~#ms=s+2,me=e-1
+syn match NERDTreeToggleOn #(on)#ms=s+1,he=e-1
+syn match NERDTreeToggleOff #(off)#ms=e-3,me=e-1
 syn match NERDTreeHelpCommand #" :.\{-}\>#hs=s+3
 syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeFlag,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
 
-"highlighting for readonly files
-syn match NERDTreeRO #.*\[RO\]#hs=s+2 contains=NERDTreeFlag,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
-
 "highlighting for sym links
-syn match NERDTreeLink #[^-| `].* -> # contains=NERDTreeBookmark,NERDTreeOpenable,NERDTreeClosable,NERDTreeDirSlash
+syn match NERDTreeLinkTarget #->.*# containedin=NERDTreeDir,NERDTreeFile
+syn match NERDTreeLinkFile #.* ->#me=e-3 containedin=NERDTreeFile
+syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
 
 "highlighing for directory nodes and file nodes
-syn match NERDTreeDirSlash #/#
-syn match NERDTreeDir #[^-| `].*/# contains=NERDTreeLink,NERDTreeDirSlash,NERDTreeOpenable,NERDTreeClosable
-syn match NERDTreeExecFile  #[|` ].*\*\($\| \)# contains=NERDTreeLink,NERDTreePart,NERDTreeRO,NERDTreePartFile,NERDTreeBookmark
-syn match NERDTreeFile  #|-.*# contains=NERDTreeLink,NERDTreePart,NERDTreeRO,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
-syn match NERDTreeFile  #`-.*# contains=NERDTreeLink,NERDTreePart,NERDTreeRO,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
+syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
+
+if g:NERDTreeDirArrows
+    syn match NERDTreeClosable #▾# containedin=NERDTreeDir,NERDTreeFile
+    syn match NERDTreeOpenable #▸# containedin=NERDTreeDir,NERDTreeFile
+
+    syn match NERDTreeDir #[^▾▸ ].*/#
+    syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
+    syn match NERDTreeFile  #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
+
+    "highlighting for readonly files
+    syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeFlag,NERDTreeBookmark,NERDTreeFile
+else
+    "highlighting for the ~/+ symbols for the directory nodes
+    syn match NERDTreeClosable #\~\<#
+    syn match NERDTreeClosable #\~\.#
+    syn match NERDTreeOpenable #+\<#
+    syn match NERDTreeOpenable #+\.#he=e-1
+
+    "highlighting for the tree structural parts
+    syn match NERDTreePart #|#
+    syn match NERDTreePart #`#
+    syn match NERDTreePartFile #[|`]-#hs=s+1 contains=NERDTreePart
+
+    syn match NERDTreeDir #[^-| `].*/# contains=NERDTreeLink,NERDTreeOpenable,NERDTreeClosable
+    syn match NERDTreeExecFile  #[|` ].*\*\($\| \)# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark
+    syn match NERDTreeFile  #|-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
+    syn match NERDTreeFile  #`-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
+
+    "highlighting for readonly files
+    syn match NERDTreeRO #|-.*\[RO\]#he=e-5 contains=NERDTreeFlag,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
+endif
+
 syn match NERDTreeCWD #^[</].*$#
 
 "highlighting for bookmarks
@@ -50,19 +66,10 @@ syn match NERDTreeBookmarksHeader #^>-\+Bookmarks-\+$# contains=NERDTreeBookmark
 syn match NERDTreeBookmarkName #^>.\{-} #he=e-1 contains=NERDTreeBookmarksLeader
 syn match NERDTreeBookmark #^>.*$# contains=NERDTreeBookmarksLeader,NERDTreeBookmarkName,NERDTreeBookmarksHeader
 
-if exists("g:NERDChristmasTree") && g:NERDChristmasTree
-    hi def link NERDTreePart Special
-    hi def link NERDTreePartFile Type
-    hi def link NERDTreeFile Normal
-    hi def link NERDTreeExecFile Title
-    hi def link NERDTreeDirSlash Identifier
-    hi def link NERDTreeClosable Type
-else
-    hi def link NERDTreePart Normal
-    hi def link NERDTreePartFile Normal
-    hi def link NERDTreeFile Normal
-    hi def link NERDTreeClosable Title
-endif
+hi def link NERDTreePart Special
+hi def link NERDTreePartFile Type
+hi def link NERDTreeExecFile Title
+hi def link NERDTreeDirSlash Identifier
 
 hi def link NERDTreeBookmarksHeader statement
 hi def link NERDTreeBookmarksLeader ignore
@@ -76,11 +83,16 @@ hi def link NERDTreeHelpTitle Macro
 hi def link NERDTreeToggleOn Question
 hi def link NERDTreeToggleOff WarningMsg
 
+hi def link NERDTreeLinkTarget Type
+hi def link NERDTreeLinkFile Macro
+hi def link NERDTreeLinkDir Macro
+
 hi def link NERDTreeDir Directory
 hi def link NERDTreeUp Directory
+hi def link NERDTreeFile Normal
 hi def link NERDTreeCWD Statement
-hi def link NERDTreeLink Macro
 hi def link NERDTreeOpenable Title
+hi def link NERDTreeClosable Title
 hi def link NERDTreeFlag ignore
 hi def link NERDTreeRO WarningMsg
 hi def link NERDTreeBookmark Statement
diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/sources_non_forked/syntastic/CONTRIBUTING.md
index 2eac8325..378b53b3 100644
--- a/sources_non_forked/syntastic/CONTRIBUTING.md
+++ b/sources_non_forked/syntastic/CONTRIBUTING.md
@@ -1,49 +1,105 @@
-# Bug reports / Github issues
+# CONTRIBUTING
+- - -
+1\. [Bug reports / GitHub issues](#bugreps)  
+2\. [Submitting a patch](#patches)  
+3\. [General style notes](#generalstyle)  
+4\. [Syntax checker notes](#checkerstyle)  
+- - -
 
-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.
+<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][0].  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.
-* The version of syntastic you are using.
+* 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.
+For syntax checker bugs also state the version of the checker executable
+that you are using.  Adding debugging information is typically useful
+too:
 
-# Submitting a patch
+* open a file handled by your checker;
+* set `g:syntastic_debug` to 1 or 3;
+* run the checker;
+* copy the output of `:mes`.
 
-* Fork the repo on github
-* Make a [topic branch](https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches) and start hacking
-* Submit a pull request based off your topic branch
+<a name="patches"></a>
 
-Small focused patches are preferred.
+## 2. Submitting a patch
 
-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.
+Before you consider adding features to syntastic, _please_ spend a few
+minutes (re-)reading the latest version of the [manual][1].  Syntastic
+is changing rapidly at times, and it's quite possible that some of the
+features you want to add exist already.
 
-# General style notes
+To submit a patch:
 
-Following the coding conventions/styles used in the syntastic core:
+* fork the [repo][2] on GitHub;
+* make a [topic branch][3] and start hacking;
+* submit a pull request based off your topic branch.
 
-* 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](http://www.refactoring.com/catalog/extractVariable.html) to aid readability.
+Small, focused patches are preferred.
 
-# Syntax checker style notes
+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.
 
-The preferred style for error format strings is one "clause" per line. E.g.
-(from the coffeelint checker):
+Also make sure to update the manual whenever applicable.  Nobody can use
+features that aren't documented.
 
-```viml
-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%.%#'
+<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][4] to
+aid readability.
+
+<a name="checkerstyle"></a>
+
+## 4. Syntax checker notes
+
+Make sure to read the [guide][5] 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%.%#'
 ```
+
+[0]: https://github.com/scrooloose/syntastic/issues
+[1]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt
+[2]: https://github.com/scrooloose/syntastic
+[3]: https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
+[4]: http://www.refactoring.com/catalog/extractVariable.html
+[5]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index cdb6f559..950f7273 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -35,16 +35,16 @@ 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, syntax checking plugins exist for ActionScript,
-Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bourne shell, C, C++, C#, Chef,
-CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust, Elixir,
-Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
+Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
+Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
+Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
 Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
 LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
 OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and iOS property
-lists, Puppet, Python, Racket, R, reStructuredText, Ruby, Rust, SASS/SCSS,
-Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL,
-xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.  See the
-[wiki][3] for details about the corresponding supported checkers.
+lists, Puppet, Python, Racket, R, reStructuredText, Ruby, SASS/SCSS, Scala,
+Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml,
+XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.  See the [wiki][3]
+for details about the corresponding supported checkers.
 
 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
@@ -76,9 +76,8 @@ First I'll show you how to install Tim Pope's [pathogen][1] 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 -so ~/.vim/autoload/pathogen.vim \
-    https://raw.github.com/tpope/vim-pathogen/master/autoload/pathogen.vim
+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
@@ -92,7 +91,7 @@ execute pathogen#infect()
 You now have pathogen installed and can put syntastic into `~/.vim/bundle` like
 this:
 ```sh
-cd ~/.vim/bundle
+cd ~/.vim/bundle && \
 git clone https://github.com/scrooloose/syntastic.git
 ```
 Quit vim and start it back up to reload it, then type:
@@ -143,6 +142,14 @@ still producing useful results, the checker is now disabled by default.  To
 let g:syntastic_enable_perl_checker = 1
 ```
 
+<a name="faqrust"></a>
+
+__Q. What happened to the `rustc` checker?__
+
+A. It has been included in the [Rust compiler package][12].  If you have
+a recent version of the Rust compiler, the checker should be picked up
+automatically by syntastic.
+
 <a name="faqloclist"></a>
 
 __Q. I run a checker and the location list is not updated...__
@@ -272,8 +279,10 @@ cabbrev <silent> bd lclose\|bdelete
 ## 4\. Other resources
 
 The preferred place for posting suggestions, reporting bugs, and general
-discussions related to syntastic is the [issue tracker at GitHub][4].  There
-are also a [google group][5], and a [syntastic tag at StackOverflow][6].
+discussions related to syntastic is the [issue tracker at GitHub][4].
+A guide for writing syntax checkers can be found in the [wiki][11].
+There are also a dedicated [google group][5], and a
+[syntastic tag at StackOverflow][6].
 
 Syntastic aims to provide a common interface to syntax checkers for as many
 languages as possible.  For particular languages, there are, of course, other
@@ -291,3 +300,5 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [8]: https://github.com/klen/python-mode
 [9]: http://valloric.github.io/YouCompleteMe/
 [10]: http://perldoc.perl.org/perlrun.html#*-c*
+[11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
+[12]: https://github.com/rust-lang/rust/
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 4bd79472..22fb0ede 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -180,7 +180,7 @@ endfunction " }}}2
 function! s:getIncludeDirs(filetype) " {{{2
     let include_dirs = []
 
-    if a:filetype =~# '\v^%(c|cpp|d|objc|objcpp)$' &&
+    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)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index 05a3d24e..e227f53e 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -6,7 +6,7 @@ let g:loaded_syntastic_log_autoload = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-let s:deprecation_notices_issued = []
+let s:one_time_notices_issued = []
 
 " Public functions {{{1
 
@@ -27,15 +27,39 @@ function! syntastic#log#error(msg) " {{{2
     echohl None
 endfunction " }}}2
 
-function! syntastic#log#deprecationWarn(msg) " {{{2
-    if index(s:deprecation_notices_issued, a:msg) >= 0
+function! syntastic#log#oneTimeWarn(msg) " {{{2
+    if index(s:one_time_notices_issued, a:msg) >= 0
         return
     endif
 
-    call add(s:deprecation_notices_issued, a:msg)
+    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, ...) " {{{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, ...) " {{{2
     if !s:isDebugEnabled(a:level)
         return
@@ -113,6 +137,7 @@ function! s:isDebugEnabled_dumb(level) " {{{2
 endfunction " }}}2
 
 let s:isDebugEnabled = function(exists('*and') ? 's:isDebugEnabled_smart' : 's:isDebugEnabled_dumb')
+lockvar s:isDebugEnabled
 
 function! s:logRedirect(on) " {{{2
     if exists("g:syntastic_debug_file")
@@ -138,6 +163,7 @@ function! s:logTimestamp_dumb() " {{{2
 endfunction " }}}2
 
 let s:logTimestamp = function(has('reltime') ? 's:logTimestamp_smart' : 's:logTimestamp_dumb')
+lockvar s:logTimestamp
 
 function! s:formatVariable(name) " {{{2
     let vals = []
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
index 377e64a7..65570d98 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -14,6 +14,8 @@ function! syntastic#postprocess#compressWhitespace(errors) " {{{2
         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
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 4501e3ff..56998d26 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -8,6 +8,26 @@ set cpo&vim
 
 " Public functions {{{1
 
+function! syntastic#preprocess#cabal(errors) " {{{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) " {{{2
     let out = []
     let fname = expand('%')
@@ -95,6 +115,10 @@ function! syntastic#preprocess#rparse(errors) " {{{2
     return out
 endfunction " }}}2
 
+function! syntastic#preprocess#tslint(errors) " {{{2
+    return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
+endfunction " }}}2
+
 function! syntastic#preprocess#validator(errors) " {{{2
     let out = []
     for e in a:errors
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index d4fa034b..b4b900b1 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -88,6 +88,7 @@ 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
 
 "print as much of a:msg as possible without "Press Enter" prompt appearing
 function! syntastic#util#wideMsg(msg) " {{{2
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index fd0fb2b9..bb222094 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -38,9 +38,10 @@ CONTENTS                                                  *syntastic-contents*
         6.1.Handling of composite filetypes........|syntastic-composite|
         6.2.Interaction with python-mode...........|syntastic-pymode|
         6.3.Interaction with the fish shell........|syntastic-fish|
-        6.4.Using syntastic with the fizsh shell...|syntastic-fizsh|
-        6.5.Interaction with Eclim.................|syntastic-eclim|
-        6.6.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
+        6.4.Interaction with PowerShell............|syntastic-powershell|
+        6.5.Using syntastic with the fizsh shell...|syntastic-fizsh|
+        6.6.Interaction with Eclim.................|syntastic-eclim|
+        6.7.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
     7.About........................................|syntastic-about|
     8.License......................................|syntastic-license|
 
@@ -83,7 +84,7 @@ see |syntastic-checker-options| for details. You can also change the arguments
 passed to a specific checker as well.
 
 Use |:SyntasticCheck| to manually check right now. Use |:SyntasticToggleMode|
-to switch between active (checking on writting the buffer) and passive (manual)
+to switch between active (checking on writing the buffer) and passive (manual)
 checking.
 
 ==============================================================================
@@ -93,7 +94,7 @@ 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-options| for how to configure and
+user of errors. See |syntastic-global-options| for how to configure and
 activate/deactivate these features.
 
     * A statusline flag
@@ -169,6 +170,8 @@ 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
     SyntasticWarning - Links to 'SpellCap' by default
+    SyntasticStyleError - Links to SyntasticError by default
+    SyntasticStyleWarning - Links to SyntasticWarning by default
 
 Example: >
     highlight SyntasticError guibg=#2f0000
@@ -288,10 +291,12 @@ to label error messages with the names of the checkers that created them. >
 <
                                           *'syntastic_sort_aggregated_errors'*
 Default: 1
-By default, when |syntastic_aggregate_errors| is enabled, 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. >
+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), 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'*
@@ -593,7 +598,7 @@ Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
                 \ 'tail': '> /tmp/output' })
 <
 The result is a 'makeprg' of the form: >
-    <exe> <args> <filename> <post_args> <tail>
+    <exe> <args> <fname> <post_args> <tail>
 <
                                         *'syntastic_<filetype>_<checker>_exe'*
 All arguments above are optional, and can be overridden by setting global
@@ -666,7 +671,16 @@ traditional shell, such as 'zsh', 'bash', 'ksh', or even the original Bourne
     set shell=bash
 <
 ------------------------------------------------------------------------------
-6.4. Using syntastic with the fizsh shell                    *syntastic-fizsh*
+6.4. Interaction with PowerShell                        *syntastic-powershell*
+
+At the time of this writing, syntastic is not compatible with using 'Windows
+PowerShell' (http://technet.microsoft.com/en-us/library/bb978526.aspx) 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': >
+    set shell=cmd.exe
+<
+------------------------------------------------------------------------------
+6.5. Using syntastic with 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
@@ -679,7 +693,7 @@ interactive features of 'fizsh'. Using a more traditional shell such as 'zsh',
     set shell=zsh
 <
 ------------------------------------------------------------------------------
-6.5. Interaction with Eclim                                  *syntastic-eclim*
+6.6. Interaction with Eclim                                  *syntastic-eclim*
 
 As far as syntastic is concerned there shouldn't be any compatibility problems
 with the 'Eclim' Vim plugin (see http://eclim.org/). However, at the time of
@@ -688,7 +702,7 @@ makes syntastic forget some of its configuration parameters. No solutions or
 workarounds are known for now.
 
 ------------------------------------------------------------------------------
-6.6. Interaction with vim-virtualenv                *syntastic-vim-virtualenv*
+6.7. Interaction with 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
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 39b22805..f3724d9f 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -16,9 +16,11 @@ let g:loaded_syntastic_plugin = 1
 
 if has('reltime')
     let g:syntastic_start = reltime()
+    lockvar! g:syntastic_start
 endif
 
-let g:syntastic_version = '3.4.0-34'
+let g:syntastic_version = '3.4.0-90'
+lockvar g:syntastic_version
 
 " Sanity checks {{{1
 
@@ -30,6 +32,8 @@ for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands'
 endfor
 
 let s:running_windows = syntastic#util#isRunningWindows()
+lockvar s:running_windows
+
 if !s:running_windows && executable('uname')
     try
         let s:uname = system('uname')
@@ -37,6 +41,7 @@ if !s:running_windows && executable('uname')
         call syntastic#log#error("your shell " . &shell . " doesn't use traditional UNIX syntax for redirections")
         finish
     endtry
+    lockvar s:uname
 endif
 
 " }}}1
@@ -70,6 +75,7 @@ let g:syntastic_defaults = {
         \ 'style_warning_symbol':     'S>',
         \ 'warning_symbol':           '>>'
     \ }
+lockvar! g:syntastic_defaults
 
 for s:key in keys(g:syntastic_defaults)
     if !exists('g:syntastic_' . s:key)
@@ -78,7 +84,7 @@ for s:key in keys(g:syntastic_defaults)
 endfor
 
 if exists("g:syntastic_quiet_warnings")
-    call syntastic#log#deprecationWarn("variable g:syntastic_quiet_warnings is deprecated, please use let g:syntastic_quiet_messages = {'level': 'warnings'} instead")
+    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([])
@@ -106,13 +112,19 @@ let s:debug_dump_options = [
 if v:version > 703 || (v:version == 703 && has('patch446'))
     call add(s:debug_dump_options, 'shellxescape')
 endif
+lockvar! s:debug_dump_options
 
 " debug constants
-let g:SyntasticDebugTrace         = 1
-let g:SyntasticDebugLoclist       = 2
-let g:SyntasticDebugNotifications = 4
-let g:SyntasticDebugAutocommands  = 8
-let g:SyntasticDebugVariables     = 16
+let     g:SyntasticDebugTrace         = 1
+lockvar g:SyntasticDebugTrace
+let     g:SyntasticDebugLoclist       = 2
+lockvar g:SyntasticDebugLoclist
+let     g:SyntasticDebugNotifications = 4
+lockvar g:SyntasticDebugNotifications
+let     g:SyntasticDebugAutocommands  = 8
+lockvar g:SyntasticDebugAutocommands
+let     g:SyntasticDebugVariables     = 16
+lockvar g:SyntasticDebugVariables
 
 " }}}1
 
@@ -130,7 +142,7 @@ let s:modemap = g:SyntasticModeMap.Instance()
 function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) " {{{2
     let checker_names = []
     for ft in s:resolveFiletypes()
-        call extend(checker_names, keys(s:registry.getCheckersMap(ft)))
+        call extend(checker_names, s:registry.getNamesOfAvailableCheckers(ft))
     endfor
     return join(checker_names, "\n")
 endfunction " }}}2
@@ -169,11 +181,6 @@ command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
 augroup syntastic
     autocmd BufReadPost * call s:BufReadPostHook()
     autocmd BufWritePost * call s:BufWritePostHook()
-
-    autocmd BufWinEnter * call s:BufWinEnterHook()
-
-    " TODO: the next autocmd should be "autocmd BufWinLeave * if &buftype == '' | lclose | endif"
-    " but in recent versions of Vim lclose can no longer be called from BufWinLeave
     autocmd BufEnter * call s:BufEnterHook()
 augroup END
 
@@ -198,24 +205,22 @@ function! s:BufWritePostHook() " {{{2
     call s:UpdateErrors(1)
 endfunction " }}}2
 
-function! s:BufWinEnterHook() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugAutocommands,
-        \ 'autocmd: BufWinEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
-        \ ', &buftype = ' . string(&buftype))
-    if &buftype == ''
-        call s:notifiers.refresh(g:SyntasticLoclist.current())
-    endif
-endfunction " }}}2
-
 function! s:BufEnterHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: BufEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
         \ ', &buftype = ' . string(&buftype))
-    " TODO: at this point there is no b:syntastic_loclist
-    let loclist = filter(getloclist(0), 'v:val["valid"] == 1')
-    let buffers = syntastic#util#unique(map( loclist, 'v:val["bufnr"]' ))
-    if &buftype == 'quickfix' && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
-        call g:SyntasticLoclistHide()
+    if &buftype == ''
+        call s:notifiers.refresh(g:SyntasticLoclist.current())
+    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"] == 1')
+        let owner = str2nr(getbufvar(bufnr(""), 'syntastic_owner_buffer'))
+        let buffers = syntastic#util#unique(map(loclist, 'v:val["bufnr"]') + (owner ? [owner] : []))
+        if !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
+            call SyntasticLoclistHide()
+        endif
     endif
 endfunction " }}}2
 
@@ -223,7 +228,7 @@ function! s:QuitPreHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = !g:syntastic_check_on_wq
-    call g:SyntasticLoclistHide()
+    call SyntasticLoclistHide()
 endfunction " }}}2
 
 " }}}1
@@ -278,7 +283,7 @@ endfunction " }}}2
 "clear the loc list for the buffer
 function! s:ClearCache() " {{{2
     call s:notifiers.reset(g:SyntasticLoclist.current())
-    unlet! b:syntastic_loclist
+    call b:syntastic_loclist.destroy()
 endfunction " }}}2
 
 "detect and cache all syntax errors in this buffer
@@ -296,8 +301,8 @@ function! s:CacheErrors(checker_names) " {{{2
         " }}}3
 
         let filetypes = s:resolveFiletypes()
-        let aggregate_errors = syntastic#util#var('aggregate_errors')
-        let decorate_errors = (aggregate_errors || len(filetypes) > 1) && syntastic#util#var('id_checkers')
+        let aggregate_errors = syntastic#util#var('aggregate_errors') || len(filetypes) > 1
+        let decorate_errors = aggregate_errors && syntastic#util#var('id_checkers')
         let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
 
         let clist = []
@@ -306,8 +311,15 @@ function! s:CacheErrors(checker_names) " {{{2
         endfor
 
         let names = []
+        let unavailable_checkers = 0
         for checker in clist
             let cname = checker.getFiletype() . '/' . checker.getName()
+            if !checker.isAvailable()
+                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Checker ' . cname . ' is not available')
+                let unavailable_checkers += 1
+                continue
+            endif
+
             call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . cname)
 
             let loclist = checker.getLocList()
@@ -317,6 +329,10 @@ function! s:CacheErrors(checker_names) " {{{2
                     call loclist.decorate(cname)
                 endif
                 call add(names, cname)
+                if checker.getWantSort() && !sort_aggregated_errors
+                    call loclist.sort()
+                    call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', loclist)
+                endif
 
                 let newLoclist = newLoclist.extend(loclist)
 
@@ -340,7 +356,7 @@ function! s:CacheErrors(checker_names) " {{{2
         " }}}3
 
         " issue warning about no active checkers {{{3
-        if empty(clist)
+        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')
@@ -360,7 +376,8 @@ function! s:CacheErrors(checker_names) " {{{2
         endif
     endif
 
-    let b:syntastic_loclist = newLoclist
+    call newLoclist.setOwner(bufnr(''))
+    call newLoclist.deploy()
 endfunction " }}}2
 
 function! s:ToggleMode() " {{{2
@@ -550,6 +567,7 @@ endfunction " }}}2
 function! s:uname() " {{{2
     if !exists('s:uname')
         let s:uname = system('uname')
+        lockvar s:uname
     endif
     return s:uname
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index e93291ba..273f0521 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -69,7 +69,6 @@ function! g:SyntasticChecker.getLocListRaw() " {{{2
     call self._populateHighlightRegexes(list)
     call syntastic#log#debug(g:SyntasticDebugLoclist, name . ' raw:', list)
     call self._quietMessages(list)
-    call self._sortMessages(list)
     return list
 endfunction " }}}2
 
@@ -99,7 +98,10 @@ function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticChecker.isAvailable() " {{{2
-    return self._isAvailableFunc()
+    if !has_key(self, '_available')
+        let self._available = self._isAvailableFunc()
+    endif
+    return self._available
 endfunction " }}}2
 
 " }}}1
@@ -131,20 +133,12 @@ function! g:SyntasticChecker._quietMessages(errors) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticChecker._sortMessages(errors) " {{{2
-    " don't sort now if we're going to sort the aggregated list later
-    if self._sort && !(syntastic#util#var('aggregate_errors') && syntastic#util#var('sort_aggregated_errors'))
-        call syntastic#util#sortLoclist(a:errors)
-        call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', a:errors)
-    endif
-endfunction " }}}2
-
 function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
     if has_key(self, '_highlightRegexFunc')
         for e in a:errors
             if e['valid']
                 let term = self._highlightRegexFunc(e)
-                if len(term) > 0
+                if term != ''
                     let e['hl'] = term
                 endif
             endif
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index 71492543..ab66fd01 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -22,7 +22,7 @@ function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
         let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
         let b:oldLine = -1
         autocmd! syntastic CursorMoved
-        autocmd syntastic CursorMoved * call g:SyntasticRefreshCursor()
+        autocmd syntastic CursorMoved * call SyntasticRefreshCursor()
     endif
 endfunction " }}}2
 
@@ -40,7 +40,7 @@ endfunction " }}}2
 " Private methods {{{1
 
 " The following defensive nonsense is needed because of the nature of autocmd
-function! g:SyntasticRefreshCursor() " {{{2
+function! SyntasticRefreshCursor() " {{{2
     if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
         " file not checked
         return
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index 997b2e32..e3451d82 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -5,6 +5,7 @@ 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 = {}
 
@@ -18,6 +19,7 @@ function! g:SyntasticHighlightingNotifier.New() " {{{2
     if !s:setup_done
         call self._setup()
         let s:setup_done = 1
+        lockvar s:setup_done
     endif
 
     return newObj
@@ -35,7 +37,7 @@ function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
         let buf = bufnr('')
         let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
         for item in issues
-            let group = item['type'] ==? 'E' ? 'SyntasticError' : 'SyntasticWarning'
+            let group = 'Syntastic' . get(item, 'subtype', '') . ( item['type'] ==? 'E' ? 'Error' : 'Warning' )
 
             " The function `Syntastic_{filetype}_{checker}_GetHighlightRegex` is
             " used to override default highlighting.
@@ -80,11 +82,16 @@ function! g:SyntasticHighlightingNotifier._setup() " {{{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
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index 074c4fc6..b4471dad 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -20,12 +20,13 @@ function! g:SyntasticLoclist.New(rawLoclist) " {{{2
 
     let newObj._rawLoclist = llist
     let newObj._name = ''
+    let newObj._owner = bufnr('')
 
     return newObj
 endfunction " }}}2
 
 function! g:SyntasticLoclist.current() " {{{2
-    if !exists("b:syntastic_loclist")
+    if !exists("b:syntastic_loclist") || empty(b:syntastic_loclist)
         let b:syntastic_loclist = g:SyntasticLoclist.New([])
     endif
     return b:syntastic_loclist
@@ -53,6 +54,10 @@ function! g:SyntasticLoclist.getRaw() " {{{2
     return self._rawLoclist
 endfunction " }}}2
 
+function! g:SyntasticLoclist.getBuffers() " {{{2
+    return syntastic#util#unique(map(copy(self._rawLoclist), 'str2nr(v:val["bufnr"])') + [self._owner])
+endfunction " }}}2
+
 function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     if !exists("self._stl_format")
         let self._stl_format = ''
@@ -118,6 +123,26 @@ function! g:SyntasticLoclist.setName(name) " {{{2
     let self._name = a:name
 endfunction " }}}2
 
+function! g:SyntasticLoclist.getOwner() " {{{2
+    return self._owner
+endfunction " }}}2
+
+function! g:SyntasticLoclist.setOwner(buffer) " {{{2
+    let self._owner = type(a:buffer) == type(0) ? a:buffer : str2nr(a:buffer)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.deploy() " {{{2
+    for buf in self.getBuffers()
+        call setbufvar(buf, 'syntastic_loclist', self)
+    endfor
+endfunction " }}}2
+
+function! g:SyntasticLoclist.destroy() " {{{2
+    for buf in self.getBuffers()
+        call setbufvar(buf, 'syntastic_loclist', {})
+    endfor
+endfunction " }}}2
+
 function! g:SyntasticLoclist.decorate(tag) " {{{2
     for e in self._rawLoclist
         let e['text'] .= ' [' . a:tag . ']'
@@ -216,6 +241,7 @@ function! g:SyntasticLoclist.show() " {{{2
                 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
@@ -226,7 +252,7 @@ endfunction " }}}2
 
 " Non-method functions {{{1
 
-function! g:SyntasticLoclistHide() " {{{2
+function! SyntasticLoclistHide() " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: hide')
     silent! lclose
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index c268c19b..62821cde 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -6,6 +6,7 @@ let g:loaded_syntastic_notifiers = 1
 let g:SyntasticNotifiers = {}
 
 let s:notifier_types = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
+lockvar! s:notifier_types
 
 " Public methods {{{1
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 72ba93ad..3ab771e1 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -11,8 +11,10 @@ let s:defaultCheckers = {
         \ 'applescript': ['osacompile'],
         \ 'asciidoc':    ['asciidoc'],
         \ 'asm':         ['gcc'],
+        \ 'bro':         ['bro'],
         \ 'bemhtml':     ['bemhtmllint'],
         \ 'c':           ['gcc'],
+        \ 'cabal':       ['cabal'],
         \ 'chef':        ['foodcritic'],
         \ 'co':          ['coco'],
         \ 'cobol':       ['cobc'],
@@ -64,7 +66,6 @@ let s:defaultCheckers = {
         \ 'racket':      ['racket'],
         \ 'rst':         ['rst2pseudoxml'],
         \ 'ruby':        ['mri'],
-        \ 'rust':        ['rustc'],
         \ 'sass':        ['sass'],
         \ 'scala':       ['fsc', 'scalac'],
         \ 'scss':        ['sass', 'scss_lint'],
@@ -89,12 +90,14 @@ let s:defaultCheckers = {
         \ 'zpt':         ['zptlint'],
         \ 'zsh':         ['zsh', 'shellcheck']
     \ }
+lockvar! s:defaultCheckers
 
 let s:defaultFiletypeMap = {
         \ 'gentoo-metadata': 'xml',
         \ 'lhaskell': 'haskell',
         \ 'litcoffee': 'coffee'
     \ }
+lockvar! s:defaultFiletypeMap
 
 let g:SyntasticRegistry = {}
 
@@ -102,14 +105,13 @@ let g:SyntasticRegistry = {}
 
 " Public methods {{{1
 
-" TODO: Handling of filetype aliases: all public methods take aliases as
+" 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() " {{{2
     if !exists('s:SyntasticRegistryInstance')
         let s:SyntasticRegistryInstance = copy(self)
-        let s:SyntasticRegistryInstance._checkerRaw = {}
         let s:SyntasticRegistryInstance._checkerMap = {}
     endif
 
@@ -122,29 +124,23 @@ function! g:SyntasticRegistry.CreateAndRegisterChecker(args) " {{{2
     call registry._registerChecker(checker)
 endfunction " }}}2
 
-function! g:SyntasticRegistry.isCheckable(ftalias) " {{{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) " {{{2
     let ft = s:normaliseFiletype(a:ftalias)
-    call self._loadCheckers(ft)
-    return !empty(self._checkerMap[ft])
-endfunction " }}}2
+    call self._loadCheckersFor(ft)
 
-function! g:SyntasticRegistry.getCheckersMap(ftalias) " {{{2
-    let ft = s:normaliseFiletype(a:ftalias)
-    call self._loadCheckers(ft)
-    return self._checkerMap[ft]
-endfunction " }}}2
-
-function! g:SyntasticRegistry.getCheckers(ftalias, list) " {{{2
-    let checkers_map = self.getCheckersMap(a:ftalias)
+    let checkers_map = self._checkerMap[ft]
     if empty(checkers_map)
         return []
     endif
 
-    let ft = s:normaliseFiletype(a:ftalias)
     call self._checkDeprecation(ft)
 
     let names =
-        \ !empty(a:list) ? a:list :
+        \ !empty(a:hints_list) ? syntastic#util#unique(a:hints_list) :
         \ exists('b:syntastic_checkers') ? b:syntastic_checkers :
         \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
         \ get(s:defaultCheckers, ft, 0)
@@ -153,6 +149,12 @@ function! g:SyntasticRegistry.getCheckers(ftalias, list) " {{{2
         \ self._filterCheckersByName(checkers_map, names) : [checkers_map[keys(checkers_map)[0]]]
 endfunction " }}}2
 
+" Same as getCheckers(), but keep only the checkers available.  This runs the
+" corresponding IsAvailable() functions for all checkers.
+function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) " {{{2
+    return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
+endfunction " }}}2
+
 function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
     let types = keys(s:defaultCheckers)
 
@@ -169,8 +171,15 @@ function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
     return syntastic#util#unique(types)
 endfunction " }}}2
 
+function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
+    let ft = s:normaliseFiletype(a:ftalias)
+    call self._loadCheckersFor(ft)
+    return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
+endfunction " }}}2
+
 function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
-    echomsg "Syntastic info for filetype: " . join(a:ftalias_list, '.')
+    echomsg "Syntastic version: " . g:syntastic_version
+    echomsg "Info for filetype: " . join(a:ftalias_list, '.')
 
     let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:normaliseFiletype(v:val)' ))
     if len(ft_list) != 1
@@ -178,13 +187,13 @@ function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
         let active = []
 
         for ft in ft_list
-            call extend(available, map( keys(self.getCheckersMap(ft)), 'ft . "/" . v:val' ))
-            call extend(active, map( self.getCheckers(ft, []), 'ft . "/" . v:val.getName()' ))
+            call extend(available, map( self.getNamesOfAvailableCheckers(ft), 'ft . "/" . v:val' ))
+            call extend(active, map( self.getCheckersAvailable(ft, []), 'ft . "/" . v:val.getName()' ))
         endfor
     else
         let ft = ft_list[0]
-        let available = keys(self.getCheckersMap(ft))
-        let active = map(self.getCheckers(ft, []), 'v:val.getName()')
+        let available = self.getNamesOfAvailableCheckers(ft)
+        let active = map(self.getCheckersAvailable(ft, []), 'v:val.getName()')
     endif
 
     echomsg "Available checker(s): " . join(sort(available))
@@ -197,52 +206,39 @@ endfunction " }}}2
 
 function! g:SyntasticRegistry._registerChecker(checker) abort " {{{2
     let ft = a:checker.getFiletype()
-
-    if !has_key(self._checkerRaw, ft)
-        let self._checkerRaw[ft] = []
+    if !has_key(self._checkerMap, ft)
         let self._checkerMap[ft] = {}
     endif
 
-    call self._validateUniqueName(a:checker)
-
     let name = a:checker.getName()
-    call add(self._checkerRaw[ft], name)
-
-    if a:checker.isAvailable()
-        let self._checkerMap[ft][name] = a:checker
+    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._filterCheckersByName(checkers_map, list) " {{{2
     return filter( map(copy(a:list), 'get(a:checkers_map, v:val, {})'), '!empty(v:val)' )
 endfunction " }}}2
 
-function! g:SyntasticRegistry._loadCheckers(filetype) " {{{2
-    if has_key(self._checkerRaw, a:filetype)
+function! g:SyntasticRegistry._loadCheckersFor(filetype) " {{{2
+    if has_key(self._checkerMap, a:filetype)
         return
     endif
 
     execute "runtime! syntax_checkers/" . a:filetype . "/*.vim"
 
-    if !has_key(self._checkerRaw, a:filetype)
-        let self._checkerRaw[a:filetype] = []
+    if !has_key(self._checkerMap, a:filetype)
         let self._checkerMap[a:filetype] = {}
     endif
 endfunction " }}}2
 
-function! g:SyntasticRegistry._validateUniqueName(checker) abort " {{{2
-    let ft = a:checker.getFiletype()
-    let name = a:checker.getName()
-    if index(self._checkerRaw[ft], name) > -1
-        throw 'Syntastic: Duplicate syntax checker name: ' . ft . '/' . name
-    endif
-endfunction " }}}2
-
 " Check for obsolete variable g:syntastic_<filetype>_checker
 function! g:SyntasticRegistry._checkDeprecation(filetype) " {{{2
     if exists('g:syntastic_' . a:filetype . '_checker') && !exists('g:syntastic_' . a:filetype . '_checkers')
         let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
-        call syntastic#log#deprecationWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
+        call syntastic#log#oneTimeWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
     endif
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 9c860da2..7f713c69 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -25,6 +25,7 @@ function! g:SyntasticSignsNotifier.New() " {{{2
     if !s:setup_done
         call self._setup()
         let s:setup_done = 1
+        lockvar s:setup_done
     endif
 
     return newObj
@@ -41,7 +42,7 @@ function! g:SyntasticSignsNotifier.refresh(loclist) " {{{2
         call self._signErrors(a:loclist)
     endif
     call self._removeSigns(old_signs)
-    let s:first_sign_id = s:next_sign_id
+    let s:first_sign_id = exists('s:next_sign_id') ? s:next_sign_id : 5000
 endfunction " }}}2
 
 " }}}1
@@ -98,13 +99,15 @@ function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
             if !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
+                if i['lnum'] > 0
+                    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
+                    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
             endif
         endfor
     endif
@@ -113,9 +116,9 @@ endfunction " }}}2
 " Remove the signs with the given ids from this buffer
 function! g:SyntasticSignsNotifier._removeSigns(ids) " {{{2
     if has('signs')
-        for i in a:ids
-            execute "sign unplace " . i
-            call remove(self._bufSignIds(), index(self._bufSignIds(), i))
+        for s in reverse(copy(a:ids))
+            execute "sign unplace " . s
+            call remove(self._bufSignIds(), index(self._bufSignIds(), s))
         endfor
     endif
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
index 0c4d09db..dd47287d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -14,10 +14,6 @@ if exists('g:loaded_syntastic_actionscript_mxmlc_checker')
 endif
 let g:loaded_syntastic_actionscript_mxmlc_checker = 1
 
-if !exists('g:syntastic_actionscript_mxmlc_conf')
-    let g:syntastic_actionscript_mxmlc_conf = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -45,10 +41,10 @@ function! SyntaxCheckers_actionscript_mxmlc_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': (g:syntastic_actionscript_mxmlc_conf != '' ?
-        \   ' -load-config+=' . syntastic#util#shexpand(g:syntastic_actionscript_mxmlc_conf) : ''),
-        \ 'args_after': '-output=' . syntastic#util#DevNull() })
+    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,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
index e6582163..7f52ed3b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
@@ -8,7 +8,7 @@
 "             Want To 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
@@ -29,6 +29,7 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'bemhtmllint',
     \ 'exec': 'bemhtml-lint' })
 
-
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
new file mode 100644
index 00000000..5d75c8ad
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"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_IsAvailable() dict
+    return system(self.getExecEscaped() . ' --help') =~# '--parse-only'
+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 =
+        \ '%trror in %f\, line %l: %m,' .
+        \ '%tarning in %f\, line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'bro',
+    \ 'name': 'bro'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
index f8601d80..957af2de 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
@@ -14,24 +14,27 @@ if exists("g:loaded_syntastic_c_checkpatch_checker")
 endif
 let g:loaded_syntastic_c_checkpatch_checker = 1
 
-" Bail if the user doesn't have `checkpatch.pl` or ./scripts/checkpatch.pl installed.
-if executable("checkpatch.pl")
-    let g:syntastic_c_checker_checkpatch_location = 'checkpatch.pl'
-elseif executable("./scripts/checkpatch.pl")
-    let g:syntastic_c_checker_checkpatch_location = './scripts/checkpatch.pl'
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_c_checkpatch_IsAvailable() dict
-    return exists("g:syntastic_c_checker_checkpatch_location")
+    call syntastic#log#deprecationWarn('c_checker_checkpatch_location', 'c_checkpatch_exe')
+
+    if !exists('g:syntastic_c_checkpatch_exe') && !executable(self.getExec())
+        if executable('checkpatch')
+            let g:syntastic_c_checkpatch_exe = 'checkpatch'
+        elseif executable('./scripts/checkpatch.pl')
+            let g:syntastic_c_checkpatch_exe = fnamemodify('./scripts/checkpatch.pl', ':p')
+        elseif executable('./scripts/checkpatch')
+            let g:syntastic_c_checkpatch_exe = fnamemodify('./scripts/checkpatch', ':p')
+        endif
+    endif
+
+    return executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_c_checkpatch_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': g:syntastic_c_checker_checkpatch_location,
-        \ 'args_after': '--no-summary --no-tree --terse --file' })
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-summary --no-tree --terse --file' })
 
     let errorformat =
         \ '%f:%l: %tARNING: %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/make.vim b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
index fa27273a..8b84173f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/make.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
@@ -19,7 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_c_make_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' -sk'
+    let makeprg = self.makeprgBuild({ 'args': '-sk', 'fname': '' })
 
     let errorformat =
         \ '%-G%f:%s:,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
new file mode 100644
index 00000000..191969be
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        cabal.vim
+"Description: Haskell package description (.cabal file) linting and syntax
+"             validation via 'cabal check'
+"Maintainer: Ian D. Bollinger <ian.bollinger@gmail.com>
+"License:    This program is free software. It comes without any warranty,
+"            to the extent permitted by applicable law. You can redistribute
+"            it and/or modify it under the terms of the Do What The Fuck You
+"            Want To Public License, Version 2, as published by Sam Hocevar.
+"            See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cabal_cabal_checker')
+    finish
+endif
+let g:loaded_syntastic_cabal_cabal_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cabal_cabal_GetHighlightRegex(item)
+    let field = matchstr(a:item['text'], "\\vParse of field '\\zs[^']+")
+    if field != ''
+        return '\v\c^\s*' . field . '\s*:\s*\zs.*$'
+    endif
+    let field = matchstr(a:item['text'], "\\v(^|\\s)'\\zs[^']+\\ze'")
+    if field != ''
+        return '\V\c\<' . escape(field, '\') . '\>'
+    endif
+    return ''
+endfunction
+
+function! SyntaxCheckers_cabal_cabal_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' check'
+
+    let errorformat =
+        \ '%Ecabal: %f:%l: %m,' .
+        \ '%W* %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h'),
+        \ 'preprocess': 'cabal',
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cabal',
+    \ 'name': 'cabal'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
index 3ef5d967..1a58c451 100644
--- a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
@@ -19,7 +19,8 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_co_coco_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-c -o /tmp' })
+    let tmpdir = $TMPDIR != '' ? $TMPDIR : $TMP != '' ? $TMP : '/tmp'
+    let makeprg = self.makeprgBuild({ 'args_after': '-c -o ' . tmpdir })
 
     let errorformat =
         \ '%EFailed at: %f,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index ccc6349a..99f2fad8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -19,7 +19,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--csv' })
+    if !exists('s:coffeelint_new')
+        let s:coffeelint_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version'), [1, 4])
+    endif
+    let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
 
     let errorformat =
         \ '%f\,%l\,%\d%#\,%trror\,%m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
index fe84aaa1..0fc06269 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
@@ -19,17 +19,13 @@ if exists('g:loaded_syntastic_css_csslint_checker')
 endif
 let g:loaded_syntastic_css_csslint_checker = 1
 
-if !exists('g:syntastic_csslint_options')
-    let g:syntastic_csslint_options = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_css_csslint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': g:syntastic_csslint_options,
-        \ 'args_after': '--format=compact' })
+    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 =
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
new file mode 100644
index 00000000..6d043e44
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
@@ -0,0 +1,26 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/less/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'recess',
+    \ 'redirect': 'less/recess'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
index 4f70979b..05e7b6a1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
@@ -35,6 +35,12 @@ function! SyntaxCheckers_d_dmd_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_d_dmd_GetLocList() dict
+    if !exists('g:syntastic_d_include_dirs')
+        let g:syntastic_d_include_dirs = filter(glob($HOME . '/.dub/packages/*', 1, 1), 'isdirectory(v:val)')
+        call map(g:syntastic_d_include_dirs, 'isdirectory(v:val . "/source") ? v:val . "/source" : v:val')
+        call add(g:syntastic_d_include_dirs, './source')
+    endif
+
     return syntastic#c#GetLocList('d', 'dmd', {
         \ 'errorformat':
         \     '%-G%f:%s:,%f(%l): %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 34dc9bdc..47378e0f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -19,22 +19,27 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
-    if !exists("g:syntastic_ruby_exec")
-        let g:syntastic_ruby_exec = self.getExec()
+    if !exists('g:syntastic_eruby_ruby_exec') && exists('g:syntastic_ruby_exec')
+        let g:syntastic_eruby_ruby_exec = g:syntastic_ruby_exec
     endif
-    return executable(expand(g:syntastic_ruby_exec))
+    let s:exe = self.getExec()
+
+    if executable(s:exe)
+        let s:exe = syntastic#util#shescape(s:exe)
+        if !syntastic#util#isRunningWindows()
+            let s:exe = 'RUBYOPT= ' . s:exe
+        endif
+        return 1
+    endif
+
+    return 0
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
-    if !syntastic#util#isRunningWindows()
-        let exe = 'RUBYOPT= ' . exe
-    endif
-
     let fname = "'" . escape(expand('%'), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
-    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 9])
+    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(s:exe . ' --version'), [1, 9])
         let enc = &fileencoding != '' ? &fileencoding : &encoding
         let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
     else
@@ -43,11 +48,11 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
 
     "gsub fixes issue #7, rails has it's own eruby syntax
     let makeprg =
-        \ exe . ' -rerb -e ' .
+        \ s:exe . ' -rerb -e ' .
         \ syntastic#util#shescape('puts ERB.new(File.read(' .
         \     fname . encoding_spec .
         \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
-        \ ' | ' . exe . ' -c'
+        \ ' | ' . s:exe . ' -c'
 
     let errorformat =
         \ '%-GSyntax OK,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
index b01143e9..a26fa6cc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
@@ -19,16 +19,12 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haml_haml_IsAvailable() dict
-    if !exists('g:syntastic_haml_interpreter')
-        let g:syntastic_haml_interpreter = self.getExec()
-    endif
-    return executable(expand(g:syntastic_haml_interpreter))
+    call syntastic#log#deprecationWarn('haml_interpreter', 'haml_haml_exec')
+    return executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_haml_haml_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': syntastic#util#shexpand(g:syntastic_haml_interpreter),
-        \ 'args_after': '-c' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
 
     let errorformat =
         \ 'Haml error on line %l: %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
index 81954916..978abd20 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -19,7 +19,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haskell_hdevtools_GetLocList() dict
-    if exists('g:hdevtools_options')
+    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
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index 2c64fb62..a7274c1b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -14,29 +14,20 @@ if exists('g:loaded_syntastic_html_jshint_checker')
 endif
 let g:loaded_syntastic_html_jshint_checker = 1
 
-if !exists('g:syntastic_jshint_exec')
-    let g:syntastic_jshint_exec = 'jshint'
-endif
-
-if !exists('g:syntastic_html_jshint_conf')
-    let g:syntastic_html_jshint_conf = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_html_jshint_IsAvailable() dict
-    let exe = expand(g:syntastic_jshint_exec)
-    return executable(exe) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [2,4])
+    call syntastic#log#deprecationWarn('jshint_exec', 'html_jshint_exec')
+    return executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [2,4])
 endfunction
 
 function! SyntaxCheckers_html_jshint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': expand(g:syntastic_jshint_exec),
-        \ 'args': (g:syntastic_html_jshint_conf != '' ?
-        \       '--config ' . syntastic#util#shexpand(g:syntastic_html_jshint_conf) : ''),
-        \ 'args_after': '--verbose --extract always' })
+    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\)'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 67dab605..c13451c3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -123,6 +123,7 @@ let s:ignore_errors = [
         \ "proprietary attribute \"aria-valuenow\"",
         \ "proprietary attribute \"aria-valuetext\""
     \ ]
+lockvar! s:ignore_errors
 
 let s:blocklevel_tags = [
         \ "main",
@@ -135,6 +136,7 @@ let s:blocklevel_tags = [
         \ "figure",
         \ "figcaption"
     \ ]
+lockvar! s:blocklevel_tags
 
 let s:inline_tags = [
         \ "video",
@@ -153,11 +155,13 @@ let s:inline_tags = [
         \ "details",
         \ "datalist"
     \ ]
+lockvar! s:inline_tags
 
 let s:empty_tags = [
         \ "wbr",
         \ "keygen"
     \ ]
+lockvar! s:empty_tags
 
 function! s:IgnoreError(text)
     for i in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index cf15b4ba..ecf54725 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -10,32 +10,36 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
 
-if exists("g:loaded_syntastic_java_javac_checker")
+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_tags = ['build', 'properties']
 let g:syntastic_java_javac_maven_pom_properties = {}
 let s:has_maven = 0
 
 " Global Options
-if !exists("g:syntastic_java_javac_executable")
+if !exists('g:syntastic_java_javac_executable')
     let g:syntastic_java_javac_executable = 'javac'
 endif
 
-if !exists("g:syntastic_java_maven_executable")
+if !exists('g:syntastic_java_maven_executable')
     let g:syntastic_java_maven_executable = 'mvn'
 endif
 
-if !exists("g:syntastic_java_javac_options")
+if !exists('g:syntastic_java_javac_options')
     let g:syntastic_java_javac_options = '-Xlint'
 endif
 
-if !exists("g:syntastic_java_javac_classpath")
+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")
+if !exists('g:syntastic_java_javac_delete_output')
     let g:syntastic_java_javac_delete_output = 1
 endif
 
@@ -43,20 +47,22 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! s:CygwinPath(path)
-    return substitute(system("cygpath -m " . syntastic#util#shescape(a:path)), '\n', '', 'g')
+    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
 endfunction
 
-if !exists("g:syntastic_java_javac_temp_dir")
+if !exists('g:syntastic_java_javac_temp_dir')
     if has('win32') || has('win64')
-        let g:syntastic_java_javac_temp_dir = $TEMP."\\vim-syntastic-javac"
+        let g:syntastic_java_javac_temp_dir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-javac'
     elseif has('win32unix')
         let g:syntastic_java_javac_temp_dir = s:CygwinPath('/tmp/vim-syntastic-javac')
+    elseif $TMPDIR != ''
+        let g:syntastic_java_javac_temp_dir = $TMPDIR . '/vim-syntastic-javac'
     else
         let g:syntastic_java_javac_temp_dir = '/tmp/vim-syntastic-javac'
     endif
 endif
 
-if !exists("g:syntastic_java_javac_autoload_maven_classpath")
+if !exists('g:syntastic_java_javac_autoload_maven_classpath')
     let g:syntastic_java_javac_autoload_maven_classpath = 1
 endif
 
@@ -72,16 +78,16 @@ 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")
+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")
+if !exists('g:syntastic_java_javac_maven_pom_classpath')
     let g:syntastic_java_javac_maven_pom_classpath = {}
 endif
 
 function! s:RemoveCarriageReturn(line)
-    return substitute(a:line, '\r', '', 'g')
+    return substitute(a:line, "\r", '', 'g')
 endfunction
 
 " recursively remove directory and all it's sub-directories
@@ -90,36 +96,25 @@ function! s:RemoveDir(dir)
         for f in split(globpath(a:dir, '*'), "\n")
             call s:RemoveDir(f)
         endfor
-        silent! call system('rmdir ' . a:dir)
+        silent! call system('rmdir ' . syntastic#util#shescape(a:dir))
     else
         silent! call delete(a:dir)
     endif
 endfunction
 
+function! s:ClassSep()
+    return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
+endfunction
+
 function! s:AddToClasspath(classpath, path)
     if a:path == ''
         return a:classpath
     endif
-    if a:classpath != '' && a:path != ''
-        if has('win32') || has('win32unix') || has('win64')
-            return a:classpath . ";" . a:path
-        else
-            return a:classpath . ":" . a:path
-        endif
-    else
-        return a:path
-    endif
+    return (a:classpath != '') ? a:classpath . s:ClassSep() . a:path : a:path
 endfunction
 
 function! s:SplitClasspath(classpath)
-    if a:classpath == ''
-        return []
-    endif
-    if has('win32') || has('win32unix') || has('win64')
-        return split(a:classpath, ";")
-    else
-        return split(a:classpath, ":")
-    endif
+    return split(a:classpath, s:ClassSep())
 endfunction
 
 function! s:LoadConfigFile()
@@ -145,15 +140,15 @@ function! s:SaveClasspath()
             while i < len(lines)
                 if match(lines[i], 'g:syntastic_java_javac_classpath') != -1
                     call remove(lines, i)
-                    let i -= 1
+                else
+                    let i += 1
                 endif
-                let i += 1
             endwhile
         else
             let lines = []
         endif
         " add new g:syntastic_java_javac_classpath option to config
-        call add(lines, 'let g:syntastic_java_javac_classpath = "'.path.'"')
+        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))
     endif
@@ -169,7 +164,7 @@ function! s:EditClasspath()
         let path = []
         let pathlines = split(g:syntastic_java_javac_classpath, "\n")
         for p in pathlines
-            let path += s:SplitClasspath(p)
+            call extend(path, s:SplitClasspath(p))
         endfor
         execute (len(path) + 5) . 'sp ' . fnameescape(command)
 
@@ -223,10 +218,12 @@ endfunction
 
 function! s:GetMavenProperties()
     let mvn_properties = {}
-    let pom = findfile("pom.xml", ".;")
+    let pom = findfile('pom.xml', '.;')
     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 ' . 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(system(mvn_cmd . ' help:effective-pom'), "\n")
             let current_path = 'project'
@@ -239,7 +236,7 @@ function! s:GetMavenProperties()
                     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] . "$", '', '')
+                        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)
@@ -262,10 +259,12 @@ if g:syntastic_java_javac_config_file_enabled
 endif
 
 function! s:GetMavenClasspath()
-    let pom = findfile("pom.xml", ".;")
+    let pom = findfile('pom.xml', '.;')
     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 ' . 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(system(mvn_cmd . ' dependency:build-classpath'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0
@@ -308,20 +307,20 @@ function! SyntaxCheckers_java_javac_IsAvailable() dict
 endfunction
 
 function! s:MavenOutputDirectory()
-    let pom = findfile("pom.xml", ".;")
+    let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
         let mvn_properties = s:GetMavenProperties()
         let output_dir = getcwd()
         if has_key(mvn_properties, 'project.properties.build.dir')
             let output_dir = mvn_properties['project.properties.build.dir']
         endif
-        if stridx(expand( '%:p:h' ), "src.main.java") >= 0
+        if stridx(expand( '%:p:h' ), 'src.main.java') >= 0
             let output_dir .= '/target/classes'
             if has_key(mvn_properties, 'project.build.outputDirectory')
                 let output_dir = mvn_properties['project.build.outputDirectory']
             endif
         endif
-        if stridx(expand( '%:p:h' ), "src.test.java") >= 0
+        if stridx(expand( '%:p:h' ), 'src.test.java') >= 0
             let output_dir .= '/target/test-classes'
             if has_key(mvn_properties, 'project.build.testOutputDirectory')
                 let output_dir = mvn_properties['project.build.testOutputDirectory']
@@ -337,13 +336,12 @@ function! s:MavenOutputDirectory()
 endfunction
 
 function! SyntaxCheckers_java_javac_GetLocList() dict
-
     let javac_opts = g:syntastic_java_javac_options
 
-    let output_dir = ""
+    let output_dir = ''
     if g:syntastic_java_javac_delete_output
         let output_dir = g:syntastic_java_javac_temp_dir
-        let javac_opts .= ' -d ' . output_dir
+        let javac_opts .= ' -d ' . syntastic#util#shescape(output_dir)
     endif
 
     " load classpath from config file
@@ -354,12 +352,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
     let javac_classpath = ''
 
     " add classpathes to javac_classpath
-    if has('win32') || has('win32unix') || has('win64')
-        let javac_classpath_split = ';'
-    else
-        let javac_classpath_split = ':'
-    endif
-    for path in split(g:syntastic_java_javac_classpath, javac_classpath_split)
+    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
         if path != ''
             try
                 let ps = glob(path, 0, 1)
@@ -378,7 +371,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
 
     if s:has_maven && g:syntastic_java_javac_autoload_maven_classpath
         if !g:syntastic_java_javac_delete_output
-            let javac_opts .= ' -d ' . s:MavenOutputDirectory()
+            let javac_opts .= ' -d ' . syntastic#util#shescape(s:MavenOutputDirectory())
         endif
         let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
     endif
@@ -386,7 +379,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
     " load custom classpath
     if g:syntastic_java_javac_custom_classpath_command != ''
         let lines = system(g:syntastic_java_javac_custom_classpath_command)
-        if has('win32') || has('win32unix') || has('win64')
+        if syntastic#util#isRunningWindows() || has('win32unix')
             let lines = substitute(lines, "\r\n", "\n", 'g')
         endif
         for l in split(lines, "\n")
@@ -395,17 +388,10 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
     endif
 
     if javac_classpath != ''
-        let javac_opts .= ' -cp "' . fnameescape(javac_classpath) . '"'
+        let javac_opts .= ' -cp ' . syntastic#util#shexpand(javac_classpath)
     endif
 
-    " path seperator
-    if has('win32') || has('win32unix') || has('win64')
-        let sep = "\\"
-    else
-        let sep = '/'
-    endif
-
-    let fname = fnameescape(expand ( '%:p:h' ) . sep . expand ( '%:t' ))
+    let fname = expand('%:p:h') . syntastic#util#Slash() . expand ('%:t')
 
     if has('win32unix')
         let fname = s:CygwinPath(fname)
@@ -413,7 +399,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
         \ 'args': javac_opts,
-        \ 'fname': fname,
+        \ 'fname': syntastic#util#shescape(fname),
         \ 'tail': '2>&1' })
 
     " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
index d23fad05..5dac3abe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -8,48 +8,36 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" To enable this plugin, edit the .vimrc like this:
-"
-"   let g:syntastic_javascript_checker = "closurecompiler"
-"
-" and set the path to the Google Closure Compiler:
-"
-"   let g:syntastic_javascript_closure_compiler_path = '/path/to/google-closure-compiler.jar'
-"
-" It takes additional options for Google Closure Compiler with the variable
-" g:syntastic_javascript_closure_compiler_options.
-"
 
 if exists("g:loaded_syntastic_javascript_closurecompiler_checker")
     finish
 endif
 let g:loaded_syntastic_javascript_closurecompiler_checker = 1
 
-if !exists("g:syntastic_javascript_closure_compiler_options")
-    let g:syntastic_javascript_closure_compiler_options = ""
-endif
-
 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')
+
     return
         \ executable("java") &&
-        \ exists("g:syntastic_javascript_closure_compiler_path") &&
-        \ filereadable(g:syntastic_javascript_closure_compiler_path)
+        \ exists("g:syntastic_javascript_closurecompiler_path") &&
+        \ filereadable(g:syntastic_javascript_closurecompiler_path)
 endfunction
 
 function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
-    if exists("g:syntastic_javascript_closure_compiler_file_list")
-        let file_list = join(readfile(g:syntastic_javascript_closure_compiler_file_list))
+    call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
+    call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
+
+    if exists("g:syntastic_javascript_closurecompiler_file_list")
+        let file_list = join(readfile(g:syntastic_javascript_closurecompiler_file_list))
     else
         let file_list = syntastic#util#shexpand('%')
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe': 'java -jar ' . g:syntastic_javascript_closure_compiler_path,
-        \ 'args': g:syntastic_javascript_closure_compiler_options,
+        \ 'exe_after': '-jar ' . g:syntastic_javascript_closurecompiler_path,
         \ 'args_after': '--js' ,
         \ 'fname': file_list })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index ee744acb..96919c8f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -14,27 +14,24 @@ if exists('g:loaded_syntastic_javascript_eslint_checker')
 endif
 let g:loaded_syntastic_javascript_eslint_checker = 1
 
-if !exists('g:syntastic_javascript_eslint_conf')
-    let g:syntastic_javascript_eslint_conf = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
     return
-        \ executable('eslint') &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion('eslint --version'), [0, 1])
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [0, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': '-f compact',
-        \ 'args': (g:syntastic_javascript_eslint_conf != '' ?
-        \       '--config ' . syntastic#util#shexpand(g:syntastic_javascript_eslint_conf) : '') })
+    call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
+        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+
+    let makeprg = self.makeprgBuild({ 'args_before': '-f compact' })
 
     let errorformat =
-        \ '%E%f: line %l\, col %c\, Error - %m'
+        \ '%E%f: line %l\, col %c\, Error - %m,' .
+        \ '%W%f: line %l\, col %c\, Warning - %m'
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
index 1b171c9c..1704ac27 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
@@ -14,16 +14,13 @@ if exists("g:loaded_syntastic_javascript_gjslint_checker")
 endif
 let g:loaded_syntastic_javascript_gjslint_checker = 1
 
-if !exists("g:syntastic_javascript_gjslint_conf")
-    let g:syntastic_javascript_gjslint_conf = ""
-endif
-
 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': g:syntastic_javascript_gjslint_conf,
         \ 'args_after': '--nosummary --unix_mode --nodebug_indentation --nobeep' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index 712fe16e..997871fe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -14,34 +14,27 @@ if exists('g:loaded_syntastic_javascript_jshint_checker')
 endif
 let g:loaded_syntastic_javascript_jshint_checker = 1
 
-if !exists('g:syntastic_javascript_jshint_conf')
-    let g:syntastic_javascript_jshint_conf = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
-    if !exists('g:syntastic_jshint_exec')
-        let g:syntastic_jshint_exec = self.getExec()
-    endif
-    if !executable(expand(g:syntastic_jshint_exec))
+    call syntastic#log#deprecationWarn('jshint_exec', 'javascript_jshint_exec')
+    if !executable(self.getExec())
         return 0
     endif
-    let s:jshint_version = syntastic#util#getVersion(syntastic#util#shexpand(g:syntastic_jshint_exec) . ' --version')
+    let s:jshint_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
     return syntastic#util#versionIsAtLeast(s:jshint_version, [1])
 endfunction
 
 function! SyntaxCheckers_javascript_jshint_GetLocList() dict
+    call syntastic#log#deprecationWarn('javascript_jshint_conf', 'javascript_jshint_args',
+        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+
     if !exists('s:jshint_new')
         let s:jshint_new = syntastic#util#versionIsAtLeast(s:jshint_version, [1, 1])
     endif
 
-    let makeprg = self.makeprgBuild({
-        \ 'exe': syntastic#util#shexpand(g:syntastic_jshint_exec),
-        \ 'args': (g:syntastic_javascript_jshint_conf != '' ?
-        \       '--config ' . syntastic#util#shexpand(g:syntastic_javascript_jshint_conf) : ''),
-        \ 'args_after': (s:jshint_new ? '--verbose ' : '') })
+    let makeprg = self.makeprgBuild({ 'args_after': (s:jshint_new ? '--verbose ' : '') })
 
     let errorformat = s:jshint_new ?
         \ '%A%f: line %l\, col %v\, %m \(%t%*\d\)' :
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
index 13328c20..8f4148d6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
@@ -14,17 +14,14 @@ if exists("g:loaded_syntastic_javascript_jsl_checker")
 endif
 let g:loaded_syntastic_javascript_jsl_checker = 1
 
-if !exists("g:syntastic_javascript_jsl_conf")
-    let g:syntastic_javascript_jsl_conf = ""
-endif
-
 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': (g:syntastic_javascript_jsl_conf != '' ?
-        \       '-conf ' . syntastic#util#shexpand(g:syntastic_javascript_jsl_conf) : ''),
         \ 'args_after': '-nologo -nofilelisting -nosummary -nocontext -process' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
index 89d3a802..63bb4101 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
@@ -22,7 +22,7 @@ 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, '\')
+        let term = '\V\<' . escape(term, '\') . '\>'
     endif
     return term
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/recess.vim b/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
new file mode 100644
index 00000000..92944189
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
index 2c3876da..5e726a92 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
@@ -20,13 +20,14 @@ set cpo&vim
 
 function! SyntaxCheckers_lisp_clisp_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args_after': '-q -c ' . syntastic#c#NullOutput() })
+        \ 'args_after': '-q',
+        \ 'fname_before': '-c' })
 
     let errorformat  =
         \ '%-G;%.%#,' .
-        \ '%W%>WARNING:%.%#line %l : %m,' .
+        \ '%W%>WARNING:%.%# line %l : %m,' .
         \ '%Z  %#%m,' .
-        \ '%W%>WARNING:%.%#lines %l..%\d\# : %m,' .
+        \ '%W%>WARNING:%.%# lines %l%\%.%\%.%\d%\+ : %m,' .
         \ '%Z  %#%m,' .
         \ '%E%>The following functions were %m,' .
         \ '%Z %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index 2ac6ec98..553c55a5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -50,25 +50,25 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_perl_perl_IsAvailable() dict
-    if !exists('g:syntastic_perl_interpreter')
-        let g:syntastic_perl_interpreter = self.getExec()
+    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 system(syntastic#util#shexpand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
 function! SyntaxCheckers_perl_perl_GetLocList() dict
     if !exists('g:syntastic_enable_perl_checker') || !g:syntastic_enable_perl_checker
-        call syntastic#log#error('checker perl/perl: checks disabled for security reasons; set g:syntastic_enable_perl_checker to 1 to override')
+        call syntastic#log#error('checker perl/perl: checks disabled for security reasons; ' .
+            \ 'set g:syntastic_enable_perl_checker to 1 to override')
         return []
     endif
 
-    let exe = expand(g:syntastic_perl_interpreter)
     if type(g:syntastic_perl_lib_path) == type('')
-        call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
+        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
         let includes = copy(syntastic#util#var('perl_lib_path'))
@@ -79,9 +79,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
         \ (index(shebang['args'], '-t') >= 0 ? ' -t' : '')
     let errorformat = '%f:%l:%m'
 
-    let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args_before': '-c -X ' . extra })
+    let makeprg = self.makeprgBuild({ 'args_before': '-c -X ' . extra })
 
     let errors = SyntasticMake({
         \ 'makeprg': makeprg,
@@ -92,9 +90,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
         return errors
     endif
 
-    let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args_before': '-c -Mwarnings ' . extra })
+    let makeprg = self.makeprgBuild({ 'args_before': '-c -Mwarnings ' . extra })
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
index 23d539df..e6600ac6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
@@ -27,8 +27,8 @@ function! SyntaxCheckers_php_phpcs_GetLocList() dict
         \ 'args_after': '--report=csv' })
 
     let errorformat =
-        \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity,'.
-        \ '"%f"\,%l\,%v\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]'
+        \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity%.%#,'.
+        \ '"%f"\,%l\,%v\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index 2a32a8fa..ff4ba071 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -18,11 +18,6 @@ let g:loaded_syntastic_puppet_puppetlint_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-if exists("g:syntastic_puppet_lint_arguments")
-    let g:syntastic_puppet_puppetlint_args = g:syntastic_puppet_lint_arguments
-    call syntastic#log#deprecationWarn("variable g:syntastic_puppet_lint_arguments is deprecated, please use g:syntastic_puppet_puppetlint_args instead")
-endif
-
 function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
     return
         \ executable("puppet") &&
@@ -32,6 +27,8 @@ function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
 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}:%{linenumber}"' })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
index 61d55cc9..ebc484f2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -19,7 +19,8 @@ function! SyntaxCheckers_python_flake8_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_python_flake8_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
 
     let errorformat =
         \ '%E%f:%l: could not compile,%-Z%p^,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index 5c47de5c..e96a8cc1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -19,7 +19,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_frosted_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-vb' })
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
+        \ 'args_after': '-vb' })
 
     let errorformat =
         \ '%f:%l:%c:%m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 7bd2d91d..60cf916e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -5,7 +5,7 @@
 "
 " For details about pep257 see: https://github.com/GreenSteam/pep257
 
-if exists("g:loaded_syntastic_python_pep257_checker")
+if exists('g:loaded_syntastic_python_pep257_checker')
     finish
 endif
 let g:loaded_syntastic_python_pep257_checker = 1
@@ -14,12 +14,24 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_pep257_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
+    if !exists('s:pep257_new')
+        let s:pep257_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version'), [0, 3])
+    endif
 
-    let errorformat =
-        \ '%E%f:%l:%c%\%.%\%.%\d%\+:%\d%\+: %m,' .
-        \ '%E%f:%l:%c: %m,' .
-        \ '%+C    %m'
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+
+    if s:pep257_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 loclist = SyntasticMake({
         \ 'makeprg': makeprg,
@@ -28,10 +40,12 @@ function! SyntaxCheckers_python_pep257_GetLocList() dict
         \ 'preprocess': 'killEmpty',
         \ 'postprocess': ['compressWhitespace'] })
 
-    " pep257 outputs byte offsets rather than column numbers
-    for e in loclist
-        let e['col'] = get(e, 'col', 0) + 1
-    endfor
+    if s:pep257_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
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
index 310746b3..64c9e640 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
@@ -21,7 +21,8 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_pep8_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
 
     let errorformat = '%f:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
index 5ceb51ab..1a4465e0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -14,7 +14,8 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_py3kwarn_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
 
     let errorformat = '%W%f:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
index 5903b2ef..351eb206 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -26,21 +26,22 @@ function! SyntaxCheckers_python_pyflakes_GetHighlightRegex(i)
         \ || stridx(a:i['text'], 'shadowed by loop variable') >= 0
 
         " fun with Python's %r: try "..." first, then '...'
-        let terms =  split(a:i['text'], '"', 1)
-        if len(terms) > 2
-            return terms[1]
+        let term = matchstr(a:i['text'], '\m^.\{-}"\zs.\{-1,}\ze"')
+        if term != ''
+            return '\V\<' . escape(term, '\') . '\>'
         endif
 
-        let terms =  split(a:i['text'], "'", 1)
-        if len(terms) > 2
-            return terms[1]
+        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 makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
 
     let errorformat =
         \ '%E%f:%l: could not compile,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index 25219d77..b8611814 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -23,7 +23,9 @@ function! SyntaxCheckers_python_pylama_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_python_pylama_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-f pep8' })
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
+        \ 'args_after': '-f pep8' })
 
     " TODO: "WARNING:pylama:..." messages are probably a logging bug
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 4c4b88e0..131ca482 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -23,6 +23,7 @@ endfunction
 
 function! SyntaxCheckers_python_pylint_GetLocList() dict
     let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
         \ '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 =
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index eced4d30..e962065d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -26,7 +26,9 @@ function! SyntaxCheckers_python_python_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:compiler] })
+    let makeprg = self.makeprgBuild({
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
+        \ 'exe': [self.getExec(), s:compiler] })
 
     let errorformat = '%E%f:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index b0cae68d..9112905b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -39,8 +39,11 @@ function! SyntaxCheckers_r_lint_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_r_lint_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
+    let setwd = 'setwd("' . escape(getcwd(), '"\') . '"); '
     let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
-        \ ' -e ' . syntastic#util#shescape('library(lint); try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'library(lint); ' .
+        \       'try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
         \ ' --args ' . syntastic#util#shexpand('%')
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
index 1b15c693..ec924c38 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
@@ -51,8 +51,9 @@ function! SyntaxCheckers_r_svtools_GetLocList() dict
         return []
     endif
 
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
     let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
-        \ ' -e ' . syntastic#util#shescape('library(svTools); ' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'library(svTools); ' .
         \       'try(lint(commandArgs(TRUE), filename = commandArgs(TRUE), type = "flat", sep = ":"))') .
         \ ' --args ' . syntastic#util#shexpand('%')
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
index fc7ea63e..9dba591a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -19,17 +19,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_jruby_GetLocList() dict
-    if syntastic#util#isRunningWindows()
-        let exe = self.getExecEscaped()
-        let args = '-T1'
-    else
-        let exe = 'RUBYOPT= ' . self.getExecEscaped()
-        let args = ''
-    endif
-
     let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args': args,
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'RUBYOPT='),
+        \ 'args': (syntastic#util#isRunningWindows() ? '-T1' : ''),
         \ 'args_after': '-W1 -c' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
index d66595ca..a5fc1c40 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -19,7 +19,7 @@ set cpo&vim
 
 function! SyntaxCheckers_ruby_macruby_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe': 'RUBYOPT= ' . self.getExecEscaped(),
+        \ 'exe_before': 'RUBYOPT=',
         \ 'args_after': '-W1 -c' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index aa7de267..08af1b45 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -18,6 +18,13 @@ 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
+    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]
@@ -28,17 +35,8 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    if !exists('g:syntastic_ruby_exec')
-        let g:syntastic_ruby_exec = self.getExec()
-    endif
-
-    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
-    if !syntastic#util#isRunningWindows()
-        let exe = 'RUBYOPT= ' . exe
-    endif
-
     let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
+        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'RUBYOPT='),
         \ 'args_after': '-w -T1 -c' })
 
     "this is a hack to filter out a repeated useless warning in rspec files
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index 02ed2f2f..07f0d4f0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -20,7 +20,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': 'analyze --presenter=syntastic' })
+    if !exists('s:rubylint_new')
+        let s:rubylint_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version'), [2])
+    endif
+    let makeprg = self.makeprgBuild({ 'args': (s:rubylint_new ? '' : 'analyze ') . '--presenter=syntastic' })
 
     let errorformat = '%f:%t:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
index 353c1a93..a515fe5f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -18,6 +18,7 @@ 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 = tempname()
+lockvar s:sass_cache_location
 
 "By default do not check partials as unknown variables are a syntax error
 if !exists("g:syntastic_sass_check_partials")
diff --git a/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
similarity index 57%
rename from sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim
rename to sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
index 97ef66a0..731d1789 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rust/rustc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
@@ -1,7 +1,7 @@
 "============================================================================
-"File:        rust.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Chad Jablonski <chad.jablonski at gmail dot com>
+"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
@@ -10,22 +10,18 @@
 "
 "============================================================================
 
-if exists("g:loaded_syntastic_rust_rustc_checker")
+if exists("g:loaded_syntastic_sass_sassc_checker")
     finish
 endif
-let g:loaded_syntastic_rust_rustc_checker = 1
+let g:loaded_syntastic_sass_sassc_checker = 1
 
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_rust_rustc_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--no-trans' })
+function! SyntaxCheckers_sass_sassc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'fname_after': syntastic#util#DevNull() })
 
-    let errorformat  =
-        \ '%E%f:%l:%c: %\d%#:%\d%# %.%\{-}error:%.%\{-} %m,'   .
-        \ '%W%f:%l:%c: %\d%#:%\d%# %.%\{-}warning:%.%\{-} %m,' .
-        \ '%C%f:%l %m,' .
-        \ '%-Z%.%#'
+    let errorformat = '%f:%l: %trror: %m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
@@ -33,8 +29,8 @@ function! SyntaxCheckers_rust_rustc_GetLocList() dict
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'rust',
-    \ 'name': 'rustc'})
+    \ 'filetype': 'sass',
+    \ 'name': 'sassc'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
index 92912423..6f1fcf6d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
@@ -15,19 +15,16 @@ if exists('g:loaded_syntastic_scala_fsc_checker')
 endif
 let g:loaded_syntastic_scala_fsc_checker = 1
 
-if !exists('g:syntastic_scala_options')
-    let g:syntastic_scala_options = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_scala_fsc_GetLocList() dict
+    call syntastic#log#deprecationWarn('scala_options', 'scala_fsc_args')
+
     " fsc has some serious problems with the
     " working directory changing after being started
     " that's why we better pass an absolute path
     let makeprg = self.makeprgBuild({
-        \ 'args': g:syntastic_scala_options,
         \ 'args_after': '-Ystop-after:parser',
         \ 'fname': syntastic#util#shexpand('%:p') })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
index ea465f08..0d0c15aa 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
@@ -15,17 +15,13 @@ if exists("g:loaded_syntastic_scala_scalac_checker")
 endif
 let g:loaded_syntastic_scala_scalac_checker = 1
 
-if !exists('g:syntastic_scala_options')
-    let g:syntastic_scala_options = ''
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_scala_scalac_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': g:syntastic_scala_options,
-        \ 'args_after': '-Ystop-after:parser' })
+    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,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
index 61bd6de7..0f837ca5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
@@ -1,4 +1,3 @@
-
 "============================================================================
 "File:        scss.vim
 "Description: scss syntax checking plugin for syntastic
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
new file mode 100644
index 00000000..75fdc2aa
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/sass/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sassc',
+    \ 'redirect': 'sass/sassc'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index 0cae2429..d736f296 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -18,41 +18,6 @@ let g:loaded_syntastic_sh_sh_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! s:GetShell()
-    if !exists('b:shell') || b:shell == ''
-        let b:shell = ''
-        let shebang = getbufline(bufnr('%'), 1)[0]
-        if shebang != ''
-            if stridx(shebang, 'bash') >= 0
-                let b:shell = 'bash'
-            elseif stridx(shebang, 'zsh') >= 0
-                let b:shell = 'zsh'
-            elseif stridx(shebang, 'sh') >= 0
-                let b:shell = 'sh'
-            endif
-        endif
-        " try to use env variable in case no shebang could be found
-        if b:shell == ''
-            let b:shell = fnamemodify(expand('$SHELL'), ':t')
-        endif
-    endif
-    return b:shell
-endfunction
-
-function! s:ForwardToZshChecker()
-    let registry = g:SyntasticRegistry.Instance()
-    if registry.isCheckable('zsh')
-        return registry.getCheckers('zsh', ['zsh'])[0].getLocListRaw()
-    else
-        return []
-    endif
-endfunction
-
-function! s:IsShellValid()
-    return len(s:GetShell()) > 0 && executable(s:GetShell())
-endfunction
-
-
 function! SyntaxCheckers_sh_sh_IsAvailable() dict
     return s:IsShellValid()
 endfunction
@@ -77,6 +42,42 @@ function! SyntaxCheckers_sh_sh_GetLocList() dict
         \ 'errorformat': errorformat })
 endfunction
 
+function! s:GetShell()
+    if !exists('b:shell') || b:shell == ''
+        let b:shell = ''
+        let shebang = syntastic#util#parseShebang()['exe']
+        if shebang != ''
+            if shebang[-strlen('bash'):-1] ==# 'bash'
+                let b:shell = 'bash'
+            elseif shebang[-strlen('zsh'):-1] ==# 'zsh'
+                let b:shell = 'zsh'
+            elseif shebang[-strlen('sh'):-1] ==# 'sh'
+                let b:shell = 'sh'
+            endif
+        endif
+        " try to use env variable in case no shebang could be found
+        if b:shell == ''
+            let b:shell = fnamemodify(expand('$SHELL'), ':t')
+        endif
+    endif
+    return b:shell
+endfunction
+
+function! s:IsShellValid()
+    let shell = s:GetShell()
+    return shell != '' && executable(shell)
+endfunction
+
+function! s:ForwardToZshChecker()
+    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
+
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'sh',
     \ 'name': 'sh' })
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
new file mode 100644
index 00000000..80ca8817
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"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
+
+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
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--format verbose',
+        \ 'fname_before': '-f' })
+
+    " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
+    let errorformat = '%f[%l\, %c]: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'tslint',
+        \ 'returns': [0, 2] })
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'tslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
index e6c1b88d..912e298d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
@@ -37,7 +37,7 @@ set cpo&vim
 
 function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos)
     let length = strlen(matchstr(a:pos['text'], '\m\^\+$'))
-    return '\%>' . (a:pos['col'] - 1) . 'c.*\%<' . (a:pos['col'] + length + 1) . 'c'
+    return '\%>' . (a:pos['col'] - 1) . 'c\%<' . (a:pos['col'] + length) . 'c'
 endfunction
 
 function! s:GetValaModules()
diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
index f101d37f..ff02224a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
@@ -19,7 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_vhdl_ghdl_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-s' })
+    let makeprg = self.makeprgBuild({ 'args_before': '-s' })
 
     let errorformat =  '%f:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 49a6ecd3..309e5878 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -29,7 +29,7 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
             endif
         endif
 
-        return '\V' . (col ? '\%' . col . 'c' : '') . escape(term, '\')
+        return col ? '\%>' . (col - 1) . 'c\%<' . (col + strlen(term)) . 'c' : '\V' . escape(term, '\')
     endif
 
     return ''
@@ -81,7 +81,8 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vim',
-    \ 'name': 'vimlint'})
+    \ 'name': 'vimlint',
+    \ 'exec': 'vim' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index e9d33771..6c12a627 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -24,19 +24,18 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
-    if !exists('g:syntastic_perl_interpreter')
-        let g:syntastic_perl_interpreter = self.getExec()
+    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 system(s:Exe() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
 function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe': s:Exe(),
         \ 'args_before': s:Modules() . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
 
     let errorformat =
@@ -53,13 +52,9 @@ function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
         \ 'defaults': {'bufnr': bufnr("")} })
 endfunction
 
-function! s:Exe()
-    return syntastic#util#shexpand(g:syntastic_perl_interpreter)
-endfunction
-
 function s:Modules()
     if type(g:syntastic_perl_lib_path) == type('')
-        call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
+        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
         let includes = copy(syntastic#util#var('perl_lib_path'))
diff --git a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
index bbf3e48d..6a3998a3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
@@ -14,7 +14,7 @@
 " - Install this python package:
 "   https://github.com/rgiot/pycpcdemotools
 " - Copy/paste this script in your search path:
-"   https://raw.github.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
+"   https://raw.githubusercontent.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
 
 if exists("g:loaded_syntastic_z80_z80syntaxchecker_checker")
     finish
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
index beb04943..568a4f25 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_cnf.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2008-11-25.
-" @Last Change: 2014-01-23.
-" @Revision:    0.0.108
+" @Last Change: 2014-06-02.
+" @Revision:    0.0.109
 
 let s:prototype = tlib#Object#New({'_class': ['Filter_cnf'], 'name': 'cnf'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
@@ -57,28 +57,6 @@ function! s:prototype.AssessName(world, name) dict "{{{3
         elseif a:name =~ '\A'. flt .'\|'. flt .'\A'
             let xa += 1
         endif
-
-        " if a:name =~ '\^'. flt .'\|'. flt .'\$'
-        "     let xa += 4
-        " elseif a:name =~ '\<'. flt .'\|'. flt .'\>'
-        "     let xa += 3
-        " " elseif a:name =~ flt .'\>'
-        " "     let xa += 2
-        " elseif a:name =~ '\A'. flt .'\|'. flt .'\A'
-        "     let xa += 1
-        " endif
-        " if flt[0] =~# '\u' && matchstr(a:name, '\V\.\ze'. flt) =~# '\U'
-        "     let xa += 1
-        " endif
-        " if flt[0] =~# '\U' && matchstr(a:name, '\V\.\ze'. flt) =~# '\u'
-        "     let xa += 1
-        " endif
-        " if flt[-1] =~# '\u' && matchstr(a:name, '\V'. flt .'\zs\.') =~# '\U'
-        "     let xa += 1
-        " endif
-        " if flt[-1] =~# '\U' && matchstr(a:name, '\V'. flt .'\zs\.') =~# '\u'
-        "     let xa += 1
-        " endif
     endfor
     " TLogVAR a:name, xa
     return xa
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index ccccf639..b6a8581d 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1391
+" @Revision:    1393
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -500,6 +500,7 @@ function! s:prototype.SetPrefIdx() dict "{{{3
     let pref_idx = -1
     let pref_weight = -1
     " TLogVAR self.filter_pos, self.filter_neg
+    " let t0 = localtime() " DBG
     for idx in range(1, self.llen)
         let item = self.GetItem(idx)
         let weight = self.matcher.AssessName(self, item)
@@ -509,6 +510,7 @@ function! s:prototype.SetPrefIdx() dict "{{{3
             let pref_weight = weight
         endif
     endfor
+    " TLogVAR localtime() - t0
     " TLogVAR pref_idx
     " TLogDBG self.GetItem(pref_idx)
     if pref_idx == -1
diff --git a/sources_non_forked/tlib/autoload/tlib/string.vim b/sources_non_forked/tlib/autoload/tlib/string.vim
index 8c077cd4..d2ca319b 100644
--- a/sources_non_forked/tlib/autoload/tlib/string.vim
+++ b/sources_non_forked/tlib/autoload/tlib/string.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2009-02-15.
-" @Revision:    0.0.110
+" @Revision:    0.0.115
 
 if &cp || exists("loaded_tlib_string_autoload")
     finish
@@ -23,8 +23,10 @@ function! tlib#string#RemoveBackslashes(text, ...) "{{{3
 endf
 
 
-function! tlib#string#Chomp(string) "{{{3
-    return substitute(a:string, '[[:cntrl:][:space:]]*$', '', '')
+" :display: tlib#string#Chomp(string, ?max=0)
+function! tlib#string#Chomp(string, ...) "{{{3
+    let quant = a:0 >= 1 ? '\{,'. a:1 .'}' : '\+'
+    return substitute(a:string, '[[:cntrl:][:space:]]'. quant .'$', '', '')
 endf
 
 
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index b92c0c2c..9c509b3a 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -2066,7 +2066,7 @@ tlib#string#RemoveBackslashes(text, ?chars=' ')
     chars).
 
                                                     *tlib#string#Chomp()*
-tlib#string#Chomp(string)
+tlib#string#Chomp(string, ?max=0)
 
                                                     *tlib#string#Format()*
 tlib#string#Format(template, dict)
@@ -2092,4 +2092,4 @@ tlib#string#Count(string, rx)
 
 
 
-vim:tw=78:fo=tcq2:isk=!-~,^*,^|,^":ts=8:ft=help:norl:
+vim:tw=78:fo=w2croql:isk=!-~,^*,^|,^":ts=8:ft=help:norl:
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index 7fd693e8..78a8818e 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -2,7 +2,7 @@
 " @Created:     2007-04-10.
 " @Last Change: 2013-09-25.
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    750
+" @Revision:    751
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " GetLatestVimScripts: 1863 1 tlib.vim
 " tlib.vim -- Some utility functions
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 109
+let loaded_tlib = 110
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index 22d06872..b98e3485 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -121,7 +121,7 @@ This plugin follows the standard runtime path structure, and as such it can be i
 *  [NeoBundle][12]
   *  `NeoBundle 'bling/vim-airline'`
 *  [Vundle][13]
-  *  `Bundle 'bling/vim-airline'`
+  *  `Plugin 'bling/vim-airline'`
 *  [VAM][22]
   *  `call vam#ActivateAddons([ 'vim-airline' ])`
 *  manual
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index de66fbac..b4a88817 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -148,16 +148,18 @@ function! airline#check_mode(winnr)
     let w:airline_current_mode = get(g:airline_mode_map, '__')
   endif
 
-  if g:airline_detect_modified
-    if &modified
-      call add(l:mode, 'modified')
-    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 &readonly
+    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)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index e07bd607..c6408d56 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -148,7 +148,7 @@ function! airline#extensions#load()
   endif
 
   if (get(g:, 'airline#extensions#hunks#enabled', 1) && get(g:, 'airline_enable_hunks', 1))
-        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter'))
+        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter') || exists('g:loaded_changes'))
     call airline#extensions#hunks#init(s:ext)
   endif
 
@@ -207,22 +207,28 @@ function! airline#extensions#load()
     call airline#extensions#promptline#init(s:ext)
   endif
 
-  " 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)
-        continue
+  if get(g:, 'airline#extensions#nrrwrgn#enabled', 1) && exists(':NR') == 2
+      call airline#extensions#nrrwrgn#init(s:ext)
+  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)
+          continue
+        endif
+        try
+          call airline#extensions#{name}#init(s:ext)
+        catch
+        endtry
       endif
-      try
-        call airline#extensions#{name}#init(s:ext)
-      catch
-      endtry
-    endif
-  endfor
+    endfor
+  endif
 endfunction
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 12be43fd..954b0f68 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -42,7 +42,7 @@ function! airline#extensions#branch#head()
     let b:airline_head = fugitive#head()
 
     if empty(b:airline_head) && !exists('b:git_dir')
-      let b:airline_head = s:get_git_branch(getcwd())
+      let b:airline_head = s:get_git_branch(expand("%:p:h"))
     endif
   endif
 
@@ -65,6 +65,13 @@ function! airline#extensions#branch#head()
     let b:airline_head = ''
   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].'…'
+    endif
+  endif
+
   return b:airline_head
 endfunction
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
index 6827f5d7..968fd66f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
@@ -1,7 +1,7 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0)
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0) && !get(g:, 'loaded_changes', 0)
   finish
 endif
 
@@ -27,6 +27,19 @@ function! s:get_hunks_gitgutter()
   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
@@ -38,6 +51,8 @@ function! s:get_hunks()
       let s:source_func = 's:get_hunks_signify'
     elseif exists('*GitGutterGetHunkSummary')
       let s:source_func = 's:get_hunks_gitgutter'
+    elseif exists('*changes#GetStats')
+      let s:source_func = 's:get_hunks_changes'
     else
       let s:source_func = 's:get_hunks_empty'
     endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
new file mode 100644
index 00000000..338f6e05
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
@@ -0,0 +1,54 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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 ? "\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/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 6b13dcf0..3590fbb5 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -14,9 +14,9 @@ function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
 
   for nr in a:buffers
     let name = bufname(nr)
-    if !empty(name) && nr != a:bufnr && fnamemodify(name, ':t') == curbuf_tail
+    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 tokens = reverse(split(substitute(fnamemodify(name, ':p:h'), '\\', '/', 'g'), '/'))
       let token_index = 0
       for token in tokens
         if token == '' | continue | endif
@@ -33,7 +33,7 @@ function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
   if do_deduplicate == 1
     let path = []
     let token_index = 0
-    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:.:h'), '\\', '/', 'g'), '/'))
+    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:h'), '\\', '/', 'g'), '/'))
       if token == '.' | break | endif
       let duplicated = 0
       let uniq = 1
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index 9dd0cd47..86574129 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -15,10 +15,25 @@ let s:default_checks = ['indent', 'trailing']
 
 let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
 let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
+let s:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)
 
 let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
 
-let s:enabled = 1
+let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
+
+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 then tabstop value
+    let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
+    return search('\v' . t_s_t . '|' . t_l_s, 'nw')
+  else
+    return search('\v(^\t+ +)|(^ +\t+)', 'nw')
+  endif
+endfunction
 
 function! airline#extensions#whitespace#check()
   if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
@@ -36,13 +51,7 @@ function! airline#extensions#whitespace#check()
 
     let mixed = 0
     if index(checks, 'indent') > -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 then tabstop value
-      let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
-      let mixed = search('\v' . t_s_t . '|' . t_l_s, 'nw')
+      let mixed = s:check_mixed_indent()
     endif
 
     if trailing != 0 || mixed != 0
@@ -62,13 +71,23 @@ endfunction!
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled
-    autocmd! airline_whitespace CursorHold,BufWritePost
+    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
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
index 65a95cc9..17a6cf51 100644
--- a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
@@ -42,7 +42,10 @@ 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 = synIDattr(synIDtrans(hlID(a:group)), 'reverse', has('gui_running') ? 'gui' : 'term')
+  let reverse = has('gui_running')
+        \ ? 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
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
index d18e0324..b941eae7 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
@@ -54,7 +54,7 @@ let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_ma
 let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
 
 " Inactive window
-let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
+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, '', ''],
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 5a7df84d..1206a65a 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -217,6 +217,14 @@ 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 undersirable 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.
+
 -------------------------------------                      *airline-default*
 The default extension understands all of the `g:` variables in the
 |airline-configuration| section, however it also has some more fine-tuned
@@ -228,7 +236,7 @@ configuration values that you can use.
       \ 'x': 60,
       \ 'y': 88,
       \ 'z': 45,
-      \ })
+      \ }
 
   " Note: set to an empty dictionary to disable truncation.
   let g:airline#extensions#default#section_truncate_width = {}
@@ -238,9 +246,8 @@ configuration values that you can use.
   let g:airline#extensions#default#layout = [
       \ [ 'a', 'b', 'c' ],
       \ [ 'x', 'y', 'z', 'warning' ]
-      \ ])
+      \ ]
 <
-
 -------------------------------------                     *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
@@ -275,7 +282,10 @@ vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
 
 * 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
+
 -------------------------------------                    *airline-syntastic*
 syntastic <https://github.com/scrooloose/syntastic>
 
@@ -289,7 +299,7 @@ tagbar <https://github.com/majutsushi/tagbar>
   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 = ''  (default)
   let g:airline#extensions#tagbar#flags = 'f'
   let g:airline#extensions#tagbar#flags = 's'
   let g:airline#extensions#tagbar#flags = 'p'
@@ -307,6 +317,7 @@ csv.vim <https://github.com/chrisbra/csv.vim>
 -------------------------------------                        *airline-hunks*
 vim-gitgutter <https://github.com/airblade/vim-gitgutter>
 vim-signify <https://github.com/mhinz/vim-signify>
+changesPlugin <https://github.com/chrisbra/changesPlugin>
 
 * enable/disable showing a summary of changed hunks under source control. >
   let g:airline#extensions#hunks#enabled = 1
@@ -349,6 +360,14 @@ eclim <https://eclim.org>
 * enable/disable detection of whitespace errors. >
   let g:airline#extensions#whitespace#enabled = 1
 <
+* customize the type of mixed indent checking to perform. >
+  " must be all spaces or all tabs before the first non-whitespace character
+  let g:airline#extensions#whitespace#mixed_indent_algo = 0 (default)
+
+  " certain number of spaces are allowed after tabs, but not in between
+  " this algorithm works well for /** */ style comments in a tab-indented file
+  let g:airline#extensions#whitespace#mixed_indent_algo = 1
+<
 * customize the whitespace symbol. >
   let g:airline#extensions#whitespace#symbol = '!'
 <
@@ -477,6 +496,11 @@ promptline <https://github.com/edkolev/promptline.vim>
   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
 
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
diff --git a/sources_non_forked/vim-commentary/README.markdown b/sources_non_forked/vim-commentary/README.markdown
index 84144237..a39b19c7 100644
--- a/sources_non_forked/vim-commentary/README.markdown
+++ b/sources_non_forked/vim-commentary/README.markdown
@@ -3,7 +3,9 @@
 Comment stuff out.  Use `gcc` to comment out a line (takes a count),
 `gc` to comment out the target of a motion (for example, `gcap` to
 comment out a paragraph), `gc` in visual mode to comment out the selection,
-and `gc` in operator pending mode to target a comment.  That's it.
+and `gc` in operator pending mode to target a comment.  You can also use
+it as a command, either with a range like `:7,17Commentary`, or as part of a
+`:global` invocation like with `:g/TODO/Commentary`. That's it.
 
 I wrote this because 5 years after Vim added support for mapping an
 operator, I still couldn't find a commenting plugin that leveraged that
diff --git a/sources_non_forked/vim-commentary/doc/commentary.txt b/sources_non_forked/vim-commentary/doc/commentary.txt
index 0e5fcf76..d6deed05 100644
--- a/sources_non_forked/vim-commentary/doc/commentary.txt
+++ b/sources_non_forked/vim-commentary/doc/commentary.txt
@@ -26,6 +26,9 @@ gc                      Text object for a comment (operator pending mode
 gcgc                    Uncomment the current and adjacent commented lines.
 gcu
 
+                                                *:Commentary*
+:[range]Commentary      Comment or uncomment [range] lines
+
 The |User| CommentaryPost autocommand fires after a successful operation and
 can be used for advanced customization.
 
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index 0404e028..cce7b8ac 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -79,6 +79,7 @@ nnoremap <silent> <Plug>CommentaryLine :<C-U>set opfunc=<SID>go<Bar>exe 'norm! '
 onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(0)<CR>
 nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
 nmap <silent> <Plug>CommentaryUndo <Plug>Commentary<Plug>Commentary
+command! -range -bar Commentary call s:go(<line1>,<line2>)
 
 if 1 || !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
   xmap gc  <Plug>Commentary
diff --git a/sources_non_forked/vim-fugitive/README.markdown b/sources_non_forked/vim-fugitive/README.markdown
index 68a61e6a..0c5b3071 100644
--- a/sources_non_forked/vim-fugitive/README.markdown
+++ b/sources_non_forked/vim-fugitive/README.markdown
@@ -11,8 +11,8 @@ 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` that
-mofo.  And guess what `:Gcommit` does!
+`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
diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
index 58708377..0d186bff 100644
--- a/sources_non_forked/vim-fugitive/doc/fugitive.txt
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -55,7 +55,7 @@ that are part of Git repositories).
                         p     |:Git| add --patch
                         p     |:Git| reset --patch (staged files)
                         q     close status
-                        R     reload status
+                        r     reload status
                         S     |:Gvsplit|
 
                                                 *fugitive-:Gcommit*
@@ -63,12 +63,32 @@ that are part of Git repositories).
                         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.  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 muck with the index with commands like
-                        git-add and git-reset while a commit message is
-                        pending.
+                        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'.
@@ -84,6 +104,11 @@ that are part of Git repositories).
                         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.
@@ -149,14 +174,16 @@ that are part of Git repositories).
                         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.  Use |do| and |dp| and write to the
-                        index file to simulate "git add --patch".
+                        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".
 
                                                 *fugitive-:Gsdiff*
-:Gsdiff [revision]      Like |:Gdiff|, but split horizontally.
+:Gsdiff [revision]      Like |:Gdiff|, but always split horizontally.
 
                                                 *fugitive-:Gvdiff*
-:Gvdiff [revision]      Identical to |:Gdiff|.  For symmetry with |:Gsdiff|.
+:Gvdiff [revision]      Like |:Gdiff|, but always split vertically.
 
                                                 *fugitive-:Gmove*
 :Gmove {destination}    Wrapper around git-mv that renames the buffer
@@ -172,11 +199,10 @@ that are part of Git repositories).
 
                                                 *fugitive-:Gblame*
 :Gblame [flags]         Run git-blame on the file and open the results in a
-                        scroll bound vertical split.  Press enter on a line to
-                        reblame the file as it was in that commit.  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:
+                        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
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 2043dfec..7232066b 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -1,6 +1,6 @@
 " fugitive.vim - A Git wrapper so awesome, it should be illegal
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.0
+" Version:      2.1
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive') || &cp
@@ -12,7 +12,7 @@ if !exists('g:fugitive_git_executable')
   let g:fugitive_git_executable = 'git'
 endif
 
-" Utility {{{1
+" Section: Utility
 
 function! s:function(name) abort
   return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),''))
@@ -26,10 +26,14 @@ 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 &shell =~# 'cmd' || &shell =~# 'power'
+  elseif s:winshell()
     return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"'
   else
     return shellescape(a:arg)
@@ -57,7 +61,7 @@ function! s:warn(str) abort
 endfunction
 
 function! s:shellslash(path) abort
-  if exists('+shellslash') && !&shellslash
+  if s:winshell()
     return s:gsub(a:path,'\\','/')
   else
     return a:path
@@ -115,8 +119,7 @@ augroup END
 
 let s:abstract_prototype = {}
 
-" }}}1
-" Initialization {{{1
+" Section: Initialization
 
 function! fugitive#is_git_dir(path) abort
   let path = s:sub(a:path, '[\/]$', '') . '/'
@@ -202,8 +205,7 @@ augroup fugitive
   autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
 augroup END
 
-" }}}1
-" Repository {{{1
+" Section: Repository
 
 let s:repo_prototype = {}
 let s:repos = {}
@@ -442,8 +444,7 @@ endfunction
 
 call s:add_methods('repo',['keywordprg'])
 
-" }}}1
-" Buffer {{{1
+" Section: Buffer
 
 let s:buffer_prototype = {}
 
@@ -618,8 +619,7 @@ endfunction
 
 call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit','up'])
 
-" }}}1
-" Git {{{1
+" Section: Git
 
 call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,<q-args>)")
 
@@ -634,36 +634,37 @@ function! s:ExecuteInTree(cmd) abort
   endtry
 endfunction
 
-function! s:Git(bang,cmd) abort
+function! s:Git(bang, args) abort
   if a:bang
-    return s:Edit('edit',1,a:cmd)
+    return s:Edit('edit', 1, a:args)
   endif
-  let git = s:repo().git_command()
+  let git = g:fugitive_git_executable
   if has('gui_running') && !has('win32')
     let git .= ' --no-pager'
   endif
-  let cmd = matchstr(a:cmd,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
-  call s:ExecuteInTree('!'.git.' '.cmd)
+  let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
+  call s:ExecuteInTree('!'.git.' '.args)
   call fugitive#reload_status()
-  return matchstr(a:cmd,'\v\C\\@<!%(\\\\)*\|\zs.*')
+  return matchstr(a:args, '\v\C\\@<!%(\\\\)*\|\zs.*')
 endfunction
 
-function! s:GitComplete(A,L,P) abort
+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
-  let cmds = map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")')
-  if a:L =~ ' [[:alnum:]-]\+ '
-    return s:repo().superglob(a:A)
-  elseif a:A == ''
-    return sort(cmds+keys(s:repo().aliases()))
+  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 filter(sort(cmds+keys(s:repo().aliases())),'v:val[0:strlen(a:A)-1] ==# a:A')
+    return s:repo().superglob(a:A)
   endif
 endfunction
 
-" }}}1
-" Gcd, Glcd {{{1
+" Section: Gcd, Glcd
 
 function! s:DirComplete(A,L,P) abort
   let matches = s:repo().dirglob(a:A)
@@ -673,8 +674,7 @@ endfunction
 call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd  :cd<bang>  `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
 call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :lcd<bang> `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
 
-" }}}1
-" Gstatus {{{1
+" Section: Gstatus
 
 call s:command("-bar Gstatus :execute s:Status()")
 augroup fugitive_status
@@ -744,7 +744,7 @@ function! s:stage_info(lnum) abort
     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) ==# '# Untracked files:'
+  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']
@@ -785,6 +785,28 @@ function! s:StageReloadSeek(target,lnum1,lnum2) abort
   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 delete(s:repo().tree(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'
@@ -864,9 +886,6 @@ function! s:StageToggle(lnum1,lnum2) abort
       if filename ==# ''
         continue
       endif
-      if !exists('first_filename')
-        let first_filename = filename
-      endif
       execute lnum
       if filename =~ ' -> '
         let cmd = ['mv','--'] + reverse(split(filename,' -> '))
@@ -880,6 +899,9 @@ function! s:StageToggle(lnum1,lnum2) abort
       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')
@@ -938,28 +960,28 @@ function! s:StagePatch(lnum1,lnum2) abort
   return 'checktime'
 endfunction
 
-" }}}1
-" Gcommit {{{1
+" Section: Gcommit
 
 call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit(<q-args>)")
 
-function! s:Commit(args) abort
+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 = s:repo().dir('COMMIT_EDITMSG')
+  let msgfile = repo.dir('COMMIT_EDITMSG')
   let outfile = tempname()
   let errorfile = tempname()
   try
     try
-      execute cd.s:fnameescape(s:repo().tree())
-      if &shell =~# 'cmd' || &shell =~# 'power'
+      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 .= s:repo().git_command('commit').' '.a:args
+      let command .= repo.git_command('commit').' '.a:args
       if &shell =~# 'csh'
         noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile
       elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>'
@@ -986,7 +1008,7 @@ function! s:Commit(args) abort
       if error =~# 'false''\=\.$'
         let args = a:args
         let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|patch|--signoff)%($| )','')
-        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','')
+        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 = '-F '.s:shellesc(msgfile).' '.args
         if args !~# '\%(^\| \)--cleanup\>'
@@ -994,6 +1016,8 @@ function! s:Commit(args) abort
         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+'
@@ -1035,18 +1059,131 @@ 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)
+    return s:Commit(args, s:repo(getbufvar(+expand('<abuf>'),'git_dir')))
   endif
   return ''
 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: Gmerge, Gpull
 
-" }}}1
-" Ggrep, Glog {{{1
+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(g:fugitive_git_executable.' -c core.editor=false '.
+            \ a:cmd . (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' ? '' : ' --edit') . ' ' . a:args,
+            \ ' *$', '')
+    endif
+    if !empty($GIT_EDITOR)
+      let old_editor = $GIT_EDITOR
+      let $GIT_EDITOR = 'false'
+    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 -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'
@@ -1054,8 +1191,8 @@ 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=* -complete=customlist,s:EditComplete Glog :execute s:Log('grep<bang>',<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gllog :execute s:Log('lgrep<bang>',<f-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=* -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<bang>',<line1>,<count>,<f-args>)")
 
 function! s:Grep(cmd,bang,arg) abort
   let grepprg = &grepprg
@@ -1072,14 +1209,16 @@ function! s:Grep(cmd,bang,arg) abort
       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'
+    if a:cmd =~# '^l' && exists('changed')
       call setloclist(0, list, 'r')
-    else
+    elseif exists('changed')
       call setqflist(list, 'r')
     endif
     if !a:bang && !empty(list)
@@ -1094,7 +1233,7 @@ function! s:Grep(cmd,bang,arg) abort
   endtry
 endfunction
 
-function! s:Log(cmd,...) abort
+function! s:Log(cmd, line1, line2, ...) abort
   let path = s:buffer().path('/')
   if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1
     let path = ''
@@ -1110,7 +1249,11 @@ function! s:Log(cmd,...) abort
   end
   let cmd += map(copy(a:000),'s:sub(v:val,"^\\%(%(:\\w)*)","\\=fnamemodify(s:buffer().path(),submatch(1))")')
   if path =~# '/.'
-    let cmd += ['--',path[1:-1]]
+    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
@@ -1119,7 +1262,7 @@ function! s:Log(cmd,...) abort
   try
     execute cd.'`=s:repo().tree()`'
     let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#')
-    let &grepformat = '%f::%m'
+    let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#'
     exe a:cmd
   finally
     let &grepformat = grepformat
@@ -1128,8 +1271,7 @@ function! s:Log(cmd,...) abort
   endtry
 endfunction
 
-" }}}1
-" Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread {{{1
+" Section: Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread
 
 function! s:Edit(cmd,bang,...) abort
   let buffer = s:buffer()
@@ -1142,7 +1284,9 @@ function! s:Edit(cmd,bang,...) abort
           if winnr != mywinnr && getwinvar(winnr,'&diff')
             execute winnr.'wincmd w'
             close
-            wincmd p
+            if winnr('$') > 1
+              wincmd p
+            endif
           endif
         endfor
       endif
@@ -1164,7 +1308,7 @@ function! s:Edit(cmd,bang,...) abort
       return 'redraw|echo '.string(':!'.git.' '.args)
     else
       let temp = resolve(tempname())
-      let s:temp_files[temp] = { 'dir': buffer.repo().dir(), 'args': arglist }
+      let s:temp_files[tolower(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist }
       silent execute a:cmd.' '.temp
       if a:cmd =~# 'pedit'
         wincmd P
@@ -1226,8 +1370,7 @@ call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gvspl
 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>)")
 
-" }}}1
-" Gwrite, Gwq {{{1
+" 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>)")
@@ -1314,9 +1457,9 @@ function! s:Write(force,...) abort
   endif
 
   if a:force
-    let error = s:repo().git_chomp_in_tree('add', '--force', file)
+    let error = s:repo().git_chomp_in_tree('add', '--force', '--', path)
   else
-    let error = s:repo().git_chomp_in_tree('add', file)
+    let error = s:repo().git_chomp_in_tree('add', '--', path)
   endif
   if v:shell_error
     let v:errmsg = 'fugitive: '.error
@@ -1383,19 +1526,81 @@ function! s:Wq(force,...) abort
   endif
 endfunction
 
-" }}}1
-" Gdiff {{{1
+augroup fugitive_commit
+  autocmd!
+  autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
+augroup END
 
-call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff(<bang>0,<f-args>)")
-call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff(0,<f-args>)")
-call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff(1,<f-args>)")
+" 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 = g:fugitive_git_executable . ' ' . a:args
+    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('',<f-args>)")
+call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<f-args>)")
+call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<f-args>)")
 
 augroup fugitive_diff
   autocmd!
-  autocmd BufWinLeave * if &diff && s:diff_window_count() == 2 && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) | endif
-  autocmd BufWinEnter * if &diff && s:diff_window_count() == 1 && getbufvar(+expand('<abuf>'), 'git_dir') !=# '' | call s:diffoff() | endif
+  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('$'))
@@ -1412,6 +1617,7 @@ function! s:diff_restore() abort
         \ . ' foldmethod=' . &l:foldmethod
         \ . ' foldcolumn=' . &l:foldcolumn
         \ . ' foldlevel=' . &l:foldlevel
+        \ . (&l:foldenable ? ' foldenable' : ' nofoldenable')
   if has('cursorbind')
     let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind'
   endif
@@ -1470,11 +1676,12 @@ endfunction
 
 call s:add_methods('buffer',['compare_age'])
 
-function! s:Diff(bang,...) abort
-  let vert = a:bang ? '' : 'vertical '
+function! s:Diff(vert,...) abort
+  let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert
   if exists(':DiffGitCached')
     return 'DiffGitCached'
   elseif (!a:0 || a:1 == ':') && 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 `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`'
     execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
@@ -1534,8 +1741,7 @@ function! s:Diff(bang,...) abort
   endtry
 endfunction
 
-" }}}1
-" Gmove, Gremove {{{1
+" Section: Gmove, Gremove
 
 function! s:Move(force,destination) abort
   if a:destination =~# '^/'
@@ -1611,8 +1817,7 @@ augroup fugitive_remove
         \ endif
 augroup END
 
-" }}}1
-" Gblame {{{1
+" Section: Gblame
 
 augroup fugitive_blame
   autocmd!
@@ -1620,6 +1825,7 @@ augroup fugitive_blame
   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
@@ -1633,6 +1839,9 @@ function! s:linechars(pattern) abort
 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')
@@ -1674,12 +1883,18 @@ function! s:Blame(bang,line1,line2,count,args) abort
         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
@@ -1687,9 +1902,12 @@ function! s:Blame(bang,line1,line2,count,args) abort
           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('.')
-        let s:temp_files[temp] = { 'dir': s:repo().dir(), 'args': cmd }
+        let s:temp_files[tolower(temp)] = { 'dir': s:repo().dir(), 'args': cmd }
         exe 'keepalt leftabove vsplit '.temp
         let b:fugitive_blamed_bufnr = bufnr
         let w:fugitive_leave = restore
@@ -1697,6 +1915,9 @@ function! s:Blame(bang,line1,line2,count,args) abort
         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
@@ -1765,7 +1986,7 @@ function! s:BlameCommit(cmd) abort
             let offset -= 1
           endif
         endwhile
-        return 'if foldlevel(".")|foldopen!|endif'
+        return 'normal! zv'
       endif
     endwhile
     execute head
@@ -1808,6 +2029,8 @@ function! s:BlameJump(suffix) abort
   return ''
 endfunction
 
+let s:hash_colors = {}
+
 function! s:BlameSyntax() abort
   let b:current_syntax = 'fugitiveblame'
   let conceal = has('conceal') ? ' conceal' : ''
@@ -1826,7 +2049,7 @@ function! s:BlameSyntax() abort
   syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation
   hi def link FugitiveblameBoundary           Keyword
   hi def link FugitiveblameHash               Identifier
-  hi def link FugitiveblameUncommitted        Function
+  hi def link FugitiveblameUncommitted        Ignore
   hi def link FugitiveblameTime               PreProc
   hi def link FugitiveblameLineNumber         Number
   hi def link FugitiveblameOriginalFile       String
@@ -1834,10 +2057,40 @@ function! s:BlameSyntax() abort
   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 && exists('g:CSApprox_loaded')
+          \ && 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
 
-" }}}1
-" Gbrowse {{{1
+function! s:RehighlightBlame() abort
+  for [hash, cterm] in items(s:hash_colors)
+    if !empty(cterm) || has('gui_running')
+      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 -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)")
 
@@ -1931,8 +2184,10 @@ function! s:Browse(bang,line1,count,...) abort
     if a:bang
       let @* = url
       return 'echomsg '.string(url)
+    elseif exists(':Browse') == 2
+      return 'echomsg '.string(url).'|Browse '.url
     else
-      return 'echomsg '.string(url).'|call fugitive#buffer().repo().git_chomp("web--browse",'.string(url).')'
+      return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)'
     endif
   catch /^fugitive:/
     return 'echoerr v:errmsg'
@@ -2039,8 +2294,7 @@ function! s:instaweb_url(repo,rev,commit,path,type,...) abort
   return url
 endfunction
 
-" }}}1
-" File access {{{1
+" Section: File access
 
 function! s:ReplaceCmd(cmd,...) abort
   let fn = expand('%:p')
@@ -2048,14 +2302,14 @@ function! s:ReplaceCmd(cmd,...) abort
   let prefix = ''
   try
     if a:0 && a:1 != ''
-      if &shell =~# 'cmd' || &shell =~# 'power'
+      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
-    if &shell =~# 'cmd' || &shell =~# 'power'
+    if s:winshell()
       let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
       call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').' > '.tmp.'"')
     else
@@ -2070,7 +2324,10 @@ function! s:ReplaceCmd(cmd,...) abort
   try
     silent edit!
   finally
-    silent exe 'keepalt file '.s:fnameescape(fn)
+    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('$')
@@ -2105,6 +2362,7 @@ function! s:BufReadIndex() abort
         let cmd = s:repo().git_command(
               \ '-c', 'status.displayCommentPrefix=true',
               \ '-c', 'color.status=false',
+              \ '-c', 'status.short=false',
               \ 'status')
       endif
       try
@@ -2135,8 +2393,8 @@ function! s:BufReadIndex() abort
     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('Gvdiff')<CR>
-    nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gvdiff')<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>
@@ -2144,7 +2402,9 @@ function! s:BufReadIndex() abort
     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:/
@@ -2203,7 +2463,7 @@ function! s:BufWriteIndexFile() abort
     endif
     let info = old_mode.' '.sha1.' '.stage."\t".path
     call writefile([info],tmp)
-    if &shell =~# 'cmd' || &shell =~# 'power'
+    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)
@@ -2289,7 +2549,7 @@ function! s:BufReadObject() abort
         setlocal bufhidden=delete
       endif
       if b:fugitive_type !=# 'blob'
-        set filetype=git
+        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
@@ -2323,8 +2583,7 @@ augroup fugitive_files
         \ endif
 augroup END
 
-" }}}1
-" Temp files {{{1
+" Section: Temp files
 
 if !exists('s:temp_files')
   let s:temp_files = {}
@@ -2333,18 +2592,17 @@ endif
 augroup fugitive_temp
   autocmd!
   autocmd BufNewFile,BufReadPost *
-        \ if has_key(s:temp_files,expand('<afile>:p')) |
-        \   let b:git_dir = s:temp_files[expand('<afile>:p')].dir |
+        \ if has_key(s:temp_files,tolower(expand('<afile>:p'))) |
+        \   let b:git_dir = s:temp_files[tolower(expand('<afile>:p'))].dir |
         \   let b:git_type = 'temp' |
-        \   let b:git_args = s:temp_files[expand('<afile>:p')].args |
+        \   let b:git_args = s:temp_files[tolower(expand('<afile>:p'))].args |
         \   call fugitive#detect(expand('<afile>:p')) |
         \   setlocal bufhidden=delete |
         \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
         \ endif
 augroup END
 
-" }}}1
-" Go to file {{{1
+" Section: Go to file
 
 function! s:JumpInit() abort
   nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
@@ -2476,7 +2734,7 @@ function! s:GF(mode) abort
         endwhile
         let offset += matchstr(getline(lnum), type.'\zs\d\+')
         let ref = getline(search('^'.type.'\{3\} [ab]/','bnW'))[4:-1]
-        let dcmd = '+'.offset.'|if foldlevel(".")|foldopen!|endif'
+        let dcmd = '+'.offset.'|normal! zv'
         let dref = ''
 
       elseif getline('.') =~# '^rename from '
@@ -2497,6 +2755,10 @@ function! s:GF(mode) abort
 
       elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$'
         let ref = getline('.')
+
+      elseif expand('<cword>') =~# '^\x\{7,40\}\>'
+        return s:Edit(a:mode,0,expand('<cword>'))
+
       else
         let ref = ''
       endif
@@ -2533,8 +2795,7 @@ function! s:GF(mode) abort
   endtry
 endfunction
 
-" }}}1
-" Statusline {{{1
+" Section: Statusline
 
 function! s:repo_head_ref() dict abort
   if !filereadable(self.dir('HEAD'))
@@ -2569,8 +2830,7 @@ function! fugitive#head(...) abort
   return s:repo().head(a:0 ? a:1 : 0)
 endfunction
 
-" }}}1
-" Folding {{{1
+" Section: Folding
 
 function! fugitive#foldtext() abort
   if &foldmethod !=# 'syntax'
@@ -2618,7 +2878,3 @@ augroup fugitive_foldtext
         \    set foldtext=fugitive#foldtext() |
         \ endif
 augroup END
-
-" }}}1
-
-" vim:set et sw=2:
diff --git a/sources_non_forked/vim-golang/autoload/go/complete.vim b/sources_non_forked/vim-golang/autoload/go/complete.vim
index 8dd43de4..a4fa6b66 100644
--- a/sources_non_forked/vim-golang/autoload/go/complete.vim
+++ b/sources_non_forked/vim-golang/autoload/go/complete.vim
@@ -58,7 +58,7 @@ function! go#complete#Package(ArgLead, CmdLine, CursorPos)
   if executable('go')
     let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
     if v:shell_error
-      echomsg '\'go env GOROOT\' failed'
+      echomsg '''go env GOROOT'' failed'
     endif
   else
     let goroot = $GOROOT
diff --git a/sources_non_forked/vim-golang/ftplugin/go.vim b/sources_non_forked/vim-golang/ftplugin/go.vim
index 8066733c..532fb172 100644
--- a/sources_non_forked/vim-golang/ftplugin/go.vim
+++ b/sources_non_forked/vim-golang/ftplugin/go.vim
@@ -9,9 +9,11 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
+setlocal formatoptions-=t
+
 setlocal comments=s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
 
-let b:undo_ftplugin = "setl com< cms<"
+let b:undo_ftplugin = "setl fo< com< cms<"
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/indent/go.vim b/sources_non_forked/vim-golang/indent/go.vim
index faf4d79e..e3d6e841 100644
--- a/sources_non_forked/vim-golang/indent/go.vim
+++ b/sources_non_forked/vim-golang/indent/go.vim
@@ -24,6 +24,18 @@ if exists("*GoIndent")
   finish
 endif
 
+" The shiftwidth() function is relatively new.
+" Don't require it to exist.
+if exists('*shiftwidth')
+  func s:sw()
+    return shiftwidth()
+  endfunc
+else
+  func s:sw()
+    return &shiftwidth
+  endfunc
+endif
+
 function! GoIndent(lnum)
   let prevlnum = prevnonblank(a:lnum-1)
   if prevlnum == 0
@@ -40,17 +52,17 @@ function! GoIndent(lnum)
 
   if prevl =~ '[({]\s*$'
     " previous line opened a block
-    let ind += &sw
+    let ind += s:sw()
   endif
   if prevl =~# '^\s*\(case .*\|default\):$'
     " previous line is part of a switch statement
-    let ind += &sw
+    let ind += s:sw()
   endif
   " TODO: handle if the previous line is a label.
 
   if thisl =~ '^\s*[)}]'
     " this line closed a block
-    let ind -= &sw
+    let ind -= s:sw()
   endif
 
   " Colons are tricky.
@@ -58,7 +70,7 @@ function! GoIndent(lnum)
   " We ignore trying to deal with jump labels because (a) they're rare, and
   " (b) they're hard to disambiguate from a composite literal key.
   if thisl =~# '^\s*\(case .*\|default\):$'
-    let ind -= &sw
+    let ind -= s:sw()
   endif
 
   return ind
diff --git a/sources_non_forked/vim-golang/readme.txt b/sources_non_forked/vim-golang/readme.txt
index b8469f92..9a9e2287 100644
--- a/sources_non_forked/vim-golang/readme.txt
+++ b/sources_non_forked/vim-golang/readme.txt
@@ -5,9 +5,11 @@ To use all the Vim plugins, add these lines to your $HOME/.vimrc.
 
   " Some Linux distributions set filetype in /etc/vimrc.
   " Clear filetype flags before changing runtimepath to force Vim to reload them.
-  filetype off
-  filetype plugin indent off
-  set runtimepath+=$GOROOT/misc/vim
+  if exists("g:did_load_filetypes")
+    filetype off
+    filetype plugin indent off
+  endif
+  set runtimepath+=$GOROOT/misc/vim " replace $GOROOT with the output of: go env GOROOT
   filetype plugin indent on
   syntax on
 
diff --git a/sources_non_forked/vim-markdown/README.markdown b/sources_non_forked/vim-markdown/README.markdown
new file mode 100644
index 00000000..055b8de2
--- /dev/null
+++ b/sources_non_forked/vim-markdown/README.markdown
@@ -0,0 +1,17 @@
+# Vim Markdown runtime files
+
+This is the development version of Vim's included syntax highlighting and
+filetype plugins for Markdown.  Generally you don't need to install these if
+you are running a recent version of Vim.
+
+One difference between this repository and the upstream files in Vim is that
+the former forces `*.md` as Markdown, while the latter detects it as Modula-2,
+with an exception for `README.md`.  If you'd like to force Markdown without
+installing from this repository, add the following to your vimrc:
+
+    autocmd BufNewFile,BufReadPost *.md set filetype=markdown
+
+## License
+
+Copyright © Tim Pope.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/sources_non_forked/vim-markdown/ftplugin/markdown.vim b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
index ae3bd262..e8627ccc 100644
--- a/sources_non_forked/vim-markdown/ftplugin/markdown.vim
+++ b/sources_non_forked/vim-markdown/ftplugin/markdown.vim
@@ -11,7 +11,7 @@ runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
 
 setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
 setlocal formatoptions+=tcqln formatoptions-=r formatoptions-=o
-setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+
+setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+\\\|^\\[^\\ze[^\\]]\\+\\]:
 
 if exists('b:undo_ftplugin')
   let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 8fc47278..607488d9 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -85,8 +85,8 @@ syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepe
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend
 
-syn match markdownFootnote "\[^[^\]]\]\s*$"
-syn match markdownFootnoteDefinition "^\[^[^\]]\]:"
+syn match markdownFootnote "\[^[^\]]\+\]"
+syn match markdownFootnoteDefinition "^\[^[^\]]\+\]:"
 
 if main_syntax ==# 'markdown'
   for s:type in g:markdown_fenced_languages
diff --git a/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
index 668b2241..d7379c22 100644
--- a/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
@@ -41,11 +41,6 @@ if !exists('g:snips_no_mappings') || !g:snips_no_mappings
 	call s:map_if_not_mapped('<C-R><Tab>', '<Plug>snipMateShow', 'i')
 endif
 
-" FIXME: Without this map, <BS> in select mode deletes the current selection and
-" returns to normal mode. This doesn't update placeholders. Ideally there's some
-" way to update the placeholders without this otherwise useless map.
-silent! snoremap <unique> <BS> b<BS><Esc>
-
 let &cpo = s:save_cpo
 
 " vim:noet:
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 44184be6..1a60cc32 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -262,7 +262,7 @@ function! s:state_proto.update_stops()
 
 		for pos in self.stops
 			if pos == self.cur_stop | continue | endif
-			let changed = pos[0] == curLine && pos[1] > self.start_col
+			let changed = pos[0] == curLine && pos[1] > self.cur_stop[1]
 			let changedVars = 0
 			let endPlaceholder = pos[2] - 1 + pos[1]
 			" Subtract changeLen from each tab stop that was after any of
@@ -321,10 +321,13 @@ function! s:state_proto.update_changes()
 	let self.end_col += change_len
 
 	let col = col('.')
-	if line('.') != self.cur_stop[0] || col < self.start_col || col > self.end_col
-		call self.remove()
-	elseif self.has_vars
-		call self.update_vars(change_len)
+	if mode() == 'i'
+		if line('.') != self.cur_stop[0]
+					\ || col < self.start_col || col > self.end_col
+			call self.remove()
+		elseif self.has_vars
+			call self.update_vars(change_len)
+		endif
 	endif
 
 	let self.prev_len = col('$')
@@ -336,6 +339,7 @@ function! s:state_proto.update_vars(change)
 	let newWord = strpart(getline('.'), self.start_col - 1, newWordLen)
 	let changeLen = a:change
 	let curLine = line('.')
+	let curCol = col('.')
 	let oldStartSnip = self.start_col
 	let updateTabStops = changeLen != 0
 	let i = 0
@@ -374,7 +378,7 @@ function! s:state_proto.update_vars(change)
 	" Reposition the cursor in case a var updates on the same line but before
 	" the current tabstop
 	if oldStartSnip != self.start_col || mode() == 'i'
-		call cursor(0, col('.') + self.start_col - oldStartSnip)
+		call cursor(0, curCol + self.start_col - oldStartSnip)
 	endif
 endfunction
 
@@ -382,12 +386,16 @@ endfunction
 " returns list of
 " ['triggername', 'name', 'contents']
 " if triggername is not set 'default' is assumed
+" TODO: better error checking
 fun! snipMate#ReadSnippetsFile(file)
 	let result = []
 	let new_scopes = []
 	if !filereadable(a:file) | return [result, new_scopes] | endif
 	let inSnip = 0
+	let line_no = 0
 	for line in readfile(a:file) + ["\n"]
+		let line_no += 1
+
 		if inSnip && (line[0] == "\t" || line == '')
 			let content .= strpart(line, 1)."\n"
 			continue
@@ -406,6 +414,10 @@ fun! snipMate#ReadSnippetsFile(file)
 				let trigger = strpart(trigger, 0, space - 1)
 			endif
 			let content = ''
+			if trigger =~ '^\s*$' " discard snippets with empty triggers
+				echom 'Invalid snippet in' a:file 'near line' line_no
+				let inSnip = 0
+			endif
 		elseif line[:6] == 'extends'
 			call extend(new_scopes, map(split(strpart(line, 8)),
 						\ "substitute(v:val, ',*$', '', '')"))
@@ -415,7 +427,7 @@ fun! snipMate#ReadSnippetsFile(file)
 endf
 
 function! s:GetScopes()
-	let ret = exists('b:snipMate_scope_aliases') ? copy(b:snipMate.scope_aliases) : {}
+	let ret = exists('b:snipMate.scope_aliases') ? copy(b:snipMate.scope_aliases) : {}
 	let global = get(g:snipMate, 'scope_aliases', {})
 	for alias in keys(global)
 		if has_key(ret, alias)
@@ -449,11 +461,7 @@ fun! s:AddScopeAliases(list)
   return keys(did)
 endf
 
-if v:version >= 704
-	function! s:Glob(path, expr)
-		return split(globpath(a:path, a:expr), "\n")
-	endfunction
-else
+if v:version < 704 || has('win32')
 	function! s:Glob(path, expr)
 		let res = []
 		for p in split(a:path, ',')
@@ -464,6 +472,10 @@ else
 		endfor
 		return filter(res, 'filereadable(v:val)')
 	endfunction
+else
+	function! s:Glob(path, expr)
+		return split(globpath(a:path, a:expr), "\n")
+	endfunction
 endif
 
 " returns dict of
@@ -517,7 +529,7 @@ function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
 endfunction
 
 " should be moved to utils or such?
-function! snipMate#SetByPath(dict, trigger, path, snippet)
+function! snipMate#SetByPath(dict, trigger, path, snippet) abort
 	let d = a:dict
 	if !has_key(d, a:trigger)
 		let d[a:trigger] = {}
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index 4a353375..aa49586a 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -115,7 +115,9 @@ g:snipMate.scope_aliases        A |Dictionary| associating certain filetypes
                                 variant b:snipMate_scope_aliases is merged
                                 with the global variant.
 
-g:snipMate_no_default_aliases
+g:snipMate_no_default_aliases   Note: This has been renamed to the following.
+
+g:snipMate.no_default_aliases
                                 When set to 1, prevents SnipMate from loading
                                 default scope aliases. The defaults are:
                                     Filetype    Alias ~
@@ -128,6 +130,10 @@ g:snipMate_no_default_aliases
                                     php         php,html,javascript
                                     ur          html,javascript
                                     xhtml       html
+                                Individual defaults can be disabled by setting
+                                them to an empty value: >
+                                    let g:snipMate.scope_aliases.php = ''
+<                                will disable the default PHP alias.
                                 Note: Setting this option does not disable
                                 scope aliases entirely, only those made by
                                 SnipMate itself. Any scope aliases created by
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 5528b734..1d280903 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -56,16 +56,31 @@ let g:snipMate['no_match_completion_feedkeys_chars'] =
 
 " Add default scope aliases, without overriding user settings
 let g:snipMate.scope_aliases = get(g:snipMate, 'scope_aliases', {})
-if !exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases
-	let g:snipMate.scope_aliases.objc = get(g:snipMate.scope_aliases, 'objc', 'c')
-	let g:snipMate.scope_aliases.cpp = get(g:snipMate.scope_aliases, 'cpp', 'c')
-	let g:snipMate.scope_aliases.cu = get(g:snipMate.scope_aliases, 'cu', 'c')
-	let g:snipMate.scope_aliases.xhtml = get(g:snipMate.scope_aliases, 'xhtml', 'html')
-	let g:snipMate.scope_aliases.html = get(g:snipMate.scope_aliases, 'html', 'javascript')
-	let g:snipMate.scope_aliases.php = get(g:snipMate.scope_aliases, 'php', 'php,html,javascript')
-	let g:snipMate.scope_aliases.ur = get(g:snipMate.scope_aliases, 'ur', 'html,javascript')
-	let g:snipMate.scope_aliases.mxml = get(g:snipMate.scope_aliases, 'mxml', 'actionscript')
-	let g:snipMate.scope_aliases.eruby = get(g:snipMate.scope_aliases, 'eruby', 'eruby-rails,html')
+if exists('g:snipMate_no_default_aliases')
+	echom 'The g:snipMate_no_default_aliases option has been renamed.'
+				\ 'See :h snipMate-options.'
+endif
+if (!exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases)
+			\ && (!exists('g:snipMate.no_default_aliases')
+				\ || !g:snipMate.no_default_aliases)
+	let g:snipMate.scope_aliases.objc =
+				\ get(g:snipMate.scope_aliases, 'objc', 'c')
+	let g:snipMate.scope_aliases.cpp =
+				\ get(g:snipMate.scope_aliases, 'cpp', 'c')
+	let g:snipMate.scope_aliases.cu =
+				\ get(g:snipMate.scope_aliases, 'cu', 'c')
+	let g:snipMate.scope_aliases.xhtml =
+				\ get(g:snipMate.scope_aliases, 'xhtml', 'html')
+	let g:snipMate.scope_aliases.html =
+				\ get(g:snipMate.scope_aliases, 'html', 'javascript')
+	let g:snipMate.scope_aliases.php =
+				\ get(g:snipMate.scope_aliases, 'php', 'php,html,javascript')
+	let g:snipMate.scope_aliases.ur =
+				\ get(g:snipMate.scope_aliases, 'ur', 'html,javascript')
+	let g:snipMate.scope_aliases.mxml =
+				\ get(g:snipMate.scope_aliases, 'mxml', 'actionscript')
+	let g:snipMate.scope_aliases.eruby =
+				\ get(g:snipMate.scope_aliases, 'eruby', 'eruby-rails,html')
 endif
 
 let g:snipMate['get_snippets'] = get(g:snipMate, 'get_snippets', funcref#Function("snipMate#GetSnippets"))
@@ -94,6 +109,7 @@ function! s:grab_visual()
 	endtry
 endfunction
 
+" TODO: Allow specifying an arbitrary snippets file
 function! s:load_scopes(bang, ...)
 	let gb = a:bang ? g: : b:
 	let gb.snipMate = get(gb, 'snipMate', {})
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 7a94766f..bf8b3346 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -46,6 +46,19 @@ If you have VimL only (vim without python support) your best option is using
 minor bugs found in the engine.
 
 
+Q: Should "snipmate be deprecated in favour of UltiSnips"?
+
+A: No, because snimpate 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)
+
 Installation
 ------------
 
@@ -70,8 +83,8 @@ Is the place to discuss plugin managers and repository resources.
 About how to install snipate 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 .vmirc:
-(See this pull request)[https://github.com/honza/vim-snippets/pull/307/files].
+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
 =======
@@ -117,6 +130,13 @@ 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
 --------------------
@@ -193,20 +213,6 @@ This list is kept up-to-date on a best effort basis.
 * Falcon - [steveno](https://github.com/steveno)
 * Elixir - [iurifq](https://github.com/iurifq)
 
-Contributing notes
-------------------
-
-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.
-
-Because UltiSnips reads snipmate-snippets too there is no need to duplicate all
-snippets - only those snippets who use advanced UltiSnips features should be
-duplicated in UltiSnips.
-
-Currently all snippets from UltiSnips have been put into UltiSnips - some work
-on merging should be done (dropping duplicates etc)
-
 License
 -------
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/c.snippets b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
index 5b8eae84..e6ea2f9d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/c.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
@@ -16,7 +16,7 @@ endsnippet
 
 snippet #if "#if #endif" b
 #if ${1:0}
-${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+${VISUAL}${0}
 #endif
 endsnippet
 
@@ -40,7 +40,7 @@ endsnippet
 snippet main "main() (main)"
 int main(int argc, char *argv[])
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 	return 0;
 }
 endsnippet
@@ -48,14 +48,14 @@ endsnippet
 snippet for "for loop (for)"
 for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet fori "for int loop (fori)"
 for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
@@ -74,7 +74,7 @@ else:
 	snip.rv = snip.c`}
 #define $1
 
-${0}
+${VISUAL}${0}
 
 #endif /* end of include guard: $1 */
 
@@ -86,13 +86,13 @@ endsnippet
 
 snippet wh "while loop"
 while(${1:/* condition */}) {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet do "do...while loop (do)"
 do {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 } while(${1:/* condition */});
 endsnippet
 
@@ -103,26 +103,26 @@ endsnippet
 snippet if "if .. (if)"
 if (${1:/* condition */})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet el "else .. (else)"
 else {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet eli "else if .. (eli)"
 else if (${1:/* condition */}) {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet ife "if .. else (ife)"
 if (${1:/* condition */})
 {
-	${2:/* code */}
+	${2}
 }
 else
 {
@@ -144,7 +144,7 @@ endsnippet
 snippet fun "function" b
 ${1:void} ${2:function_name}(${3})
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets b/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
index 3d79a64e..c2cb3d03 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/cpp.snippets
@@ -27,7 +27,7 @@ endsnippet
 snippet ns "namespace .. (namespace)"
 namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/d.snippets b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
index 99da292e..9ce27513 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/d.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/d.snippets
@@ -106,14 +106,14 @@ endsnippet
 snippet if "if .. (if)"
 if(${1:/*condition*/})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet ife "if .. else (ife)" b
 if(${1:/*condition*/})
 {
-	${2:/*code*/}
+	${2}
 }
 else
 {
@@ -124,14 +124,14 @@ endsnippet
 snippet el "else (el)" b
 else
 {
-	${VISUAL}${1:/*code*/}
+	${VISUAL}${1}
 }
 endsnippet
 
 snippet elif "else if (elif)" b
 else if(${1:/*condition*/})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
@@ -139,10 +139,10 @@ snippet sw "switch (sw)"
 switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3:/*code*/}
+		${3}
 		break;
 	case ${4:/*value*/}:
-		${5:/*code*/}
+		${5}
 		break;
 	${7:/*more cases*/}
 	default:
@@ -151,13 +151,13 @@ switch(${1:/*var*/})
 endsnippet
 
 snippet fsw "final switch (fsw)"
-switch(${1:/*var*/})
+final switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3:/*code*/}
+		${3}
 		break;
 	case ${4:/*value*/}:
-		${5:/*code*/}
+		${5}
 		break;
 	${7:/*more cases*/}
 }
@@ -165,7 +165,7 @@ endsnippet
 
 snippet case "case (case)" b
 case ${1:/*value*/}:
-	${2:/*code*/}
+	${2}
 	break;
 endsnippet
 
@@ -178,42 +178,42 @@ endsnippet
 snippet do "do while (do)" b
 do
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 } while(${1:/*condition*/});
 endsnippet
 
 snippet wh "while (wh)" b
 while(${1:/*condition*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
 snippet for "for (for)" b
 for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet forever "forever (forever)" b
 for(;;)
 {
-	${VISUAL}${0:/*code*/}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet fore "foreach (fore)"
 foreach(${1:/*elem*/}; ${2:/*range*/})
 {
-	${VISUAL}${3:/*code*/}
+	${VISUAL}${3}
 }
 endsnippet
 
 snippet forif "foreach if (forif)" b
 foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
 {
-	${VISUAL}${4:/*code*/}
+	${VISUAL}${4}
 }
 endsnippet
 
@@ -249,21 +249,21 @@ endsnippet
 snippet fun "function definition (fun)"
 ${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
 {
-	${VISUAL}${5:/*code*/}
+	${VISUAL}${5}
 }
 endsnippet
 
 snippet void "void function definition (void)"
 void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
 {
-	${VISUAL}${4:/*code*/}
+	${VISUAL}${4}
 }
 endsnippet
 
 snippet this "ctor (this)" w
 this(${1:/*args*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -295,7 +295,7 @@ endsnippet
 snippet scope "scope (scope)" b
 scope(${1:exit})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -304,7 +304,7 @@ endsnippet
 snippet with "with (with)"
 with(${1})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
@@ -405,14 +405,14 @@ endsnippet
 snippet version "version (version)" b
 version(${1:/*version name*/})
 {
-	${VISUAL}${2:/*code*/}
+	${VISUAL}${2}
 }
 endsnippet
 
 snippet debug "debug" b
 debug
 {
-	${VISUAL}${1:/*code*/}
+	${VISUAL}${1}
 }
 endsnippet
 
@@ -422,7 +422,7 @@ endsnippet
 snippet temp "template (temp)" b
 template ${2:/*name*/}(${1:/*args*/})
 {
-	${3:/*code*/}
+	${3}
 }
 endsnippet
 
@@ -440,7 +440,7 @@ endsnippet
 snippet unittest "unittest (unittest)" b
 unittest
 {
-	${1:/*code*/}
+	${1}
 }
 endsnippet
 
@@ -450,21 +450,21 @@ endsnippet
 snippet opDis "opDispatch (opDis)" b
 ${1:/*return type*/} opDispatch(string s)()
 {
-	${2:/*code*/};
+	${2};
 }
 endsnippet
 
 snippet op= "opAssign (op=)" b
 void opAssign(${1} rhs) ${2:@safe pure nothrow}
 {
-	${2:/*code*/}
+	${2}
 }
 endsnippet
 
 snippet opCmp "opCmp (opCmp)" b
 int opCmp(${1} rhs) @safe const pure nothrow
 {
-	${2:/*code*/}
+	${2}
 }
 endsnippet
 
@@ -484,7 +484,7 @@ endsnippet
 snippet toString "toString (toString)" b
 string toString() @safe const pure nothrow
 {
-	${1:/*code*/}
+	${1}
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/go.snippets b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
index d01e3f1c..efd15892 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
@@ -52,6 +52,12 @@ for ${1:condition}${1/(.+)/ /}{
 }
 endsnippet
 
+snippet fori "Integer for loop" b
+for ${1:i} := 0; $1 < ${2:N}; $1++ {
+	${0:${VISUAL}}
+}
+endsnippet
+
 snippet forr "For range loop" b
 for ${2:name} := range ${1:collection} {
 	${0:${VISUAL}}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 21be6bef..02b95e1e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -60,7 +60,7 @@ abstract $0
 endsnippet
 
 snippet as "assert" b
-assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
+assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};
 endsnippet
 
 snippet at "assert true" b
@@ -68,7 +68,7 @@ assertTrue(${1:actual});
 endsnippet
 
 snippet af "assert false" b
-assertFalse(${1:actual});$0
+assertFalse(${1:actual});
 endsnippet
 
 snippet ae "assert equals" b
@@ -141,7 +141,7 @@ if len(args) > 0:
 	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]
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
 if len(args) == 0:
 	snip.rv += "\n"`
 	}
@@ -224,7 +224,7 @@ $0
 endsnippet
 
 snippet im "import"  b
-import ${1:java}.${2:util}.$0
+import ${1:java}.${2:util}.$0;
 endsnippet
 
 snippet in "interface" b
@@ -269,7 +269,7 @@ if len(args) > 0:
 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]
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
 if len(args) == 0:
 	snip.rv += "\n"`
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index f8d4790e..5889e059 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -79,6 +79,14 @@ setTimeout(function() {
 }${2:.bind(${3:this})}, ${1:10});
 endsnippet
 
+snippet fi "for prop in obj using hasOwnProperty" b
+for (${1:prop} in ${2:obj}){
+	if ($2.hasOwnProperty($1)) {
+		${VISUAL}$0
+	}
+}
+endsnippet
+
 # Snippets for Console Debug Output
 
 snippet ca "console.assert" b
@@ -121,6 +129,10 @@ snippet cl "console.log" b
 console.log(${1:"${2:value}"});
 endsnippet
 
+snippet cd "console.debug" b
+console.debug(${1:"${2:value}"});
+endsnippet
+
 snippet cprof "console.profile" b
 console.profile("${1:label}");
 ${VISUAL}$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
new file mode 100644
index 00000000..76e9ca1d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
@@ -0,0 +1,25 @@
+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}', function($2) {
+	$0
+});
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/julia.snippets b/sources_non_forked/vim-snippets/UltiSnips/julia.snippets
new file mode 100644
index 00000000..259c5f4c
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
index fa708ab8..0720cbfc 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/markdown.snippets
@@ -39,4 +39,15 @@ 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
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
new file mode 100644
index 00000000..157c9ef0
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
@@ -0,0 +1,3 @@
+priority -49
+
+extends markdown
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
index 3d433169..55423e71 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
@@ -3,6 +3,28 @@
 
 priority -50
 
+snippet classn "Basic class with namespace snippet" b
+namespace `!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * ${1:@author `whoami`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`$2
+{
+    public function __construct(${3:$options})
+    {
+        ${4:// code}
+    }$0
+}
+endsnippet
+
 snippet contr "Symfony2 controller" b
 namespace `!p
 abspath = os.path.abspath(path)
diff --git a/sources_non_forked/vim-snippets/UltiSnips/r.snippets b/sources_non_forked/vim-snippets/UltiSnips/r.snippets
index d78a1d72..10c818c0 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/r.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/r.snippets
@@ -1,9 +1,42 @@
 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
@@ -48,7 +81,7 @@ while(${1}) {
 endsnippet
 
 snippet for "for loop"
-for ({${1:item} in ${2:list}) {
+for (${1:item} in ${2:list}) {
 	${3}
 }
 endsnippet
@@ -88,7 +121,7 @@ lapply(${1:list}, ${0:function})
 endsnippet
 
 snippet sapply "sapply function"
-lapply(${1:list}, ${0:function})
+sapply(${1:list}, ${0:function})
 endsnippet
 
 snippet vapply "vapply function"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index 98a371ff..d7f0047c 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -2,45 +2,70 @@
 #                            Rust Snippets                            #
 #######################################################################
 
-###############
-#  Functions  #
-###############
-snippet fn "A function, optionally with arguments and return type."
+priority -50
+
+snippet fn "A function, optionally with arguments and return type." b
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-snippet test "Test function"
+snippet test "Test function" b
 #[test]
 fn ${1:test_function_name}() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet new "A new function"
-pub fn new(${2}) -> ${1:Name} {
-	${VISUAL}${0}return $1 { ${3} };
-}
-endsnippet
-
-snippet main "The main function"
-pub fn main() {
 	${VISUAL}${0}
 }
 endsnippet
 
 
+snippet bench "Bench function" b
+#[bench]
+fn ${1:bench_function_name}(b: &mut test::Bencher) {
+	b.iter(|| {
+		${VISUAL}${0}
+	})
+}
+endsnippet
 
-snippet let "A let statement"
+snippet new "A new function" b
+pub fn new(${2}) -> ${1:Name} {
+	${VISUAL}${0}return $1 { ${3} };
+}
+endsnippet
+
+snippet main "The main function" b
+pub fn main() {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet let "A let statement" b
 let ${1:name}${3} = ${VISUAL}${2};
 endsnippet
 
+snippet lmut "let mut = .." b
+let mut ${1:name}${3} = ${VISUAL}${2};
+endsnippet
+
+snippet pri "print!(..)" b
+print!("${1}"${2/..*/, /}${2});
+endsnippet
+
 snippet pln "println!(..)" b
 println!("${1}"${2/..*/, /}${2});
 endsnippet
 
+snippet fmt "format!(..)"
+format!("${1}"${2/..*/, /}${2});
+endsnippet
 
+snippet macro "macro_rules!" b
+macro_rules! ${1:name} (
+	(${2:matcher}) => (
+		${3}
+	)
+)
+endsnippet
 
 snippet ec "extern crate ..." b
 extern crate ${1:sync};
@@ -51,10 +76,10 @@ snippet ecl "...extern crate log;" b
 #[phase(syntax, link)] extern crate log;
 endsnippet
 
-snippet mod	 "A mod." b
+snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-} /* $1 */
+	${VISUAL}${0}
+}
 endsnippet
 
 snippet crate "Create header information" b
@@ -78,24 +103,45 @@ snippet feat "#![feature(..)]" b
 #![feature(${1:macro_rules})]
 endsnippet
 
+snippet der "#[deriving(..)]" b
+#[deriving(${1:Show})]
+endsnippet
+
+snippet attr "#[..]" b
+#[${1:inline}]
+endsnippet
 
-##################
-#  Common types  #
-##################
 snippet opt "Option<..>"
 Option<${1:int}>
 endsnippet
 
 snippet res "Result<.., ..>"
-Result<${1:~str}, ${2:()}>
+Result<${1:int}, ${2:()}>
 endsnippet
 
-
-
-
 snippet if "if .. (if)" b
-if ${1:/* condition */} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+if ${1} {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet el "else .. (el)"
+else {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet eli "else if .. (eli)"
+else if ${1} {
+	${VISUAL}${0}
+}
+endsnippet
+
+snippet ife "if .. else (ife)"
+if ${1} {
+	${2}
+} else {
+	${3}
 }
 endsnippet
 
@@ -105,21 +151,27 @@ match ${1} {
 }
 endsnippet
 
+snippet loop "loop {}" b
+loop {
+	${VISUAL}${0}
+}
+endsnippet
+
 snippet while "while .. {}" b
-while ${1:condition} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+while ${1} {
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet for "for .. in .." b
 for ${1:i} in ${2:range(0u, 10)} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet spawn "spawn(proc() { .. });" b
 spawn(proc() {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 });
 endsnippet
 
@@ -131,26 +183,23 @@ snippet duplex "Duplex stream" b
 let (${1:from_child}, ${2:to_child}) = sync::duplex();
 endsnippet
 
-#####################
-#  TODO commenting  #
-#####################
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
+snippet fixme "FIXME comment"
+// FIXME: ${1}
+endsnippet
 
-############
-#  Struct  #
-############
 snippet st "Struct" b
-struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet stn "Struct with new constructor." b
-pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
-	${3:/* code */}
+pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
+	${3}
 }
 
 impl $1 {
@@ -162,48 +211,36 @@ impl $1 {
 }
 endsnippet
 
-
-##########
-#  Enum  #
-##########
 snippet enum "An enum" b
-enum ${1:enum_name} {
+enum ${1:Name} {
 	${VISUAL}${0},
 }
 endsnippet
 
+snippet type "A type" b
+type ${1:NewName} = ${VISUAL}${0};
+endsnippet
 
-##########
-#  Impl  #
-##########
 snippet imp "An impl" b
 impl ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
 snippet drop "Drop implementation" b
 impl Drop for ${1:Name} {
 	fn drop(&mut self) {
-		${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+		${VISUAL}${0}
 	}
 }
 endsnippet
 
-
-############
-#  Traits  #
-############
-snippet trait "Trait block" b
+snippet trait "Trait definition" b
 trait ${1:Name} {
-	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	${VISUAL}${0}
 }
 endsnippet
 
-
-#############
-#  Statics  #
-#############
 snippet ss "A static string."
 static ${1}: &'static str = "${VISUAL}${0}";
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index c32d21f1..ede9090d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -8,7 +8,7 @@ snippet "b(egin)?" "begin{} / end{}" br
 \end{$1}
 endsnippet
 
-snippet tab
+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)/}}
diff --git a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
index 5ff22d2e..dbb2396d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/vim.snippets
@@ -3,58 +3,22 @@ priority -50
 ###########################################################################
 #                            SnipMate Snippets                            #
 ###########################################################################
-snippet header
-" File: ${1:`!v expand('%:t')`}
-" Author: ${2:`!v g:snips_author`}
-" Description: ${3}
-${4:" Last Modified: `!v strftime("%B %d, %Y")`}
-
-$0
-endsnippet
-
-snippet gvar "Global / configuration variable"
+snippet gvar "Global / configuration variable" b
 if !exists("g:${1:MyUltraImportantVar}")
 	let g:$1 = ${2:"${3:<tab>}"}
 endif
 endsnippet
 
-snippet guard
+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
+snippet f "function" b
 fun ${1:function_name}(${2})
 	${3:" code}
 endf
 endsnippet
-
-snippet for
-for ${1:needle} in ${2:haystack}
-	${3:" code}
-endfor
-endsnippet
-
-snippet wh
-while ${1:condition}
-	${2:" code}
-endw
-endsnippet
-
-snippet if
-if ${1:condition}
-	${2:" code}
-endif
-endsnippet
-
-snippet ife
-if ${1:condition}
-	${2}
-else
-	${3}
-endif
-endsnippet
-
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index 6a3d8b28..85616018 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -84,6 +84,24 @@ snippet LGPL3
 	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 (C) `strftime("%Y")` ${2:copyright holder}
+
+	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 BSD2
 	${1:one line to give the program's name and a brief description}
diff --git a/sources_non_forked/vim-snippets/snippets/css.snippets b/sources_non_forked/vim-snippets/snippets/css.snippets
index 8886643a..c4a74dec 100644
--- a/sources_non_forked/vim-snippets/snippets/css.snippets
+++ b/sources_non_forked/vim-snippets/snippets/css.snippets
@@ -965,3 +965,23 @@ 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/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index bd84cd96..077cf031 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -6,122 +6,95 @@ snippet if if .. do .. end
 	if ${1} do
 		${0}
 	end
-
 snippet if if .. do: ..
 	if ${1:condition}, do: ${0}
-
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
 		${2}
 	else
 		${0}
 	end
-
 snippet ife if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${0}
-
 snippet unless unless .. do .. end
 	unless ${1} do
 		${0}
 	end
-
 snippet unless unless .. do: ..
 	unless ${1:condition}, do: ${0}
-
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
 		${2}
 	else
 		${0}
 	end
-
 snippet unlesse unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
-
 snippet cond
 	cond do
 	${1} ->
 		${0}
 	end
-
 snippet case
 	case ${1} do
 	${2} ->
 		${0}
 	end
-
 snippet df
 	def ${1:name}, do: ${2}
-
 snippet def
 	def ${1:name} 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:module_name} do
 		${0}
 	end
-
 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 fn
 	fn(${1:args}) -> ${0} end
-
 snippet fun
-        function do
-        	${0}
-        end
-
+	function do
+		${0}
+	end
 snippet mdoc
 	@moduledoc """
 	${0}
 	"""
-
 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 try try .. rescue .. end
 	try do
 		${1}
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index 0239a3fb..8623eda2 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -230,3 +230,15 @@ snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}
 	}(${0})
+snippet test test function
+	func Test${1:name}(t *testing.T) {
+		${2}
+	}
+	${0}
+snippet bench benchmark function
+	func Benchmark${1:name}(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			${2}
+		}
+	}
+	${0}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 567003f7..5620caae 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -147,6 +147,8 @@ 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
@@ -449,7 +451,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:meta}
 		</head>
diff --git a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets b/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
deleted file mode 100644
index 43e5d4a4..00000000
--- a/sources_non_forked/vim-snippets/snippets/html_minimal.snippets
+++ /dev/null
@@ -1,72 +0,0 @@
-# file containing most useful mappings only
-# when editing this file please be aware that there is ZenCoding and sparkup
-
-# html 5 is recommended from now on
-snippet html5
-	<!doctype html>
-	<html>
-	<head>
-		<meta charset="utf-8">
-		<title>$2</title>
-		$3
-	</head>
-	<body>
-	$4
-	</body>
-	</html>
-
-# ==== TAGS
-# you always need these:
-snippet .
-	class="${1}"
-snippet n
-	name="${1}"
-snippet r
-	rel="${1}"
-snippet t
-	title="${1}"
-
-# not using # because id is faster to type
-snippet id
-	id="${1}"
-snippet idn
-	id="${1}" name="${0:$1}"
-
-snippet label_and_input
-	<label for="${0:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">
-
-
-# FORMS
-# use idn . or n to add id
-snippet input
-	<input type="${1:text}" value="${2}" ${3}>
-snippet submit
-	<input type="submit" value="${2}" ${3}>
-snippet textarea
-	<textarea $1>$2</textarea>
-
-# if you need id or class use snippets above
-snippet form
-	<form method="${1:post/get}" action="$2">
-        $3
-	</form>
-
-# other tags
-snippet br
-	<br/>
-snippet a
-	<a href="#" $2>$3</a>
-snippet img
-	<img src="$1" alt="$2"/>
-# JS/CSS
-snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
-snippet css_block
-	<style type='text/css'>
-	</style>
-snippet script_block
-	<script type="text/javascript" charset="utf-8">
-	</script>
-snippet script_file
-	<script src="${1}" type="text/javascript"></script>
diff --git a/sources_non_forked/vim-snippets/snippets/java.snippets b/sources_non_forked/vim-snippets/snippets/java.snippets
index 1595ffc1..ea2ec7aa 100644
--- a/sources_non_forked/vim-snippets/snippets/java.snippets
+++ b/sources_non_forked/vim-snippets/snippets/java.snippets
@@ -1,10 +1,10 @@
 ## Access Modifiers
 snippet po
-	protected
+	protected ${0}
 snippet pu
-	public
+	public ${0}
 snippet pr
-	private
+	private ${0}
 ##
 ## Annotations
 snippet before
@@ -25,7 +25,7 @@ snippet oo
 ##
 ## Basic Java packages and import
 snippet im
-	import
+	import ${0}
 snippet j.b
 	java.beans.
 snippet j.i
@@ -39,17 +39,17 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
+	class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}
+	interface ${1:`vim_snippets#Filename("$1", "untitled")`} ${2:extends Parent}
 snippet tc
-	public class ${1:`vim_snippets#Filename()`} extends ${0:TestCase}
+	public class ${1:`vim_snippets#Filename("$1")`} extends ${0:TestCase}
 ##
 ## Class Enhancements
 snippet ext
-	extends
+	extends ${0}
 snippet imp
-	implements
+	implements ${0}
 ##
 ## Comments
 snippet /*
@@ -89,15 +89,40 @@ snippet m
 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
+	abstract ${0}
 snippet fi
-	final
+	final ${0}
 snippet st
-	static
+	static ${0}
 snippet sy
-	synchronized
+	synchronized ${0}
 ##
 ## Error Methods
 snippet err
@@ -110,12 +135,30 @@ snippet errln
 ## 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
+	throw ${0}
 snippet ths
-	throws
+	throws ${0}
 snippet try
 	try {
 		${0}
@@ -144,7 +187,7 @@ snippet @au
 snippet @br
 	@brief ${0:Description}
 snippet @fi
-	@file ${0:`vim_snippets#Filename()`}.java
+	@file ${0:`vim_snippets#Filename("$1")`}.java
 snippet @pa
 	@param ${0:param}
 snippet @re
@@ -206,7 +249,7 @@ snippet get
 ##
 ## Terminate Methods or Loops
 snippet re
-	return
+	return ${0}
 snippet br
 	break;
 ##
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index 0a046dbf..39a008ef 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -13,7 +13,7 @@ snippet fun
 snippet f
 	function (${1}) {
 		${0}
-	}${2:;}
+	}
 # Immediate function
 snippet (f
 	(function (${1}) {
diff --git a/sources_non_forked/vim-snippets/snippets/julia.snippets b/sources_non_forked/vim-snippets/snippets/julia.snippets
new file mode 100644
index 00000000..1876ed84
--- /dev/null
+++ b/sources_non_forked/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}
+	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/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index d7b21eb5..831d53db 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -40,7 +40,7 @@ snippet i
 snippet t.
 	$this->
 snippet f
-	function ${1:foo}(${2:array }${3:$bar})
+	function ${1}(${3})
 	{
 		${0}
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/r.snippets b/sources_non_forked/vim-snippets/snippets/r.snippets
index c7ca5aca..7bdeeec0 100644
--- a/sources_non_forked/vim-snippets/snippets/r.snippets
+++ b/sources_non_forked/vim-snippets/snippets/r.snippets
@@ -23,9 +23,19 @@ snippet ei
 		${0}
 	}
 
+# loops
+snippet wh
+	while(${1}) {
+		${2}
+	}
+snippet for
+	for (${1:item} in ${2:list}) {
+		${3}
+	}
+
 # functions
 snippet fun
-	${1:name} = function (${2:variables}) {
+	${1:name} <- function (${2:variables}) {
 		${0}
 	}
 snippet ret
@@ -39,7 +49,7 @@ snippet c
 snippet li
 	list(${0:items})
 snippet mat
-	matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+	matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 
 # apply functions
 snippet apply
@@ -100,7 +110,7 @@ snippet pl
 snippet ggp
 	ggplot(${1:data}, aes(${0:aesthetics}))
 snippet img
-	${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+	${1:(jpeg,bmp,png,tiff)}(filename = '${2:filename}', width = ${3}, height = ${4}, unit = '${5}')
 	${0:plot}
 	dev.off()
 
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 6ee11d4b..5d9c01ea 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -1030,9 +1030,9 @@ snippet aft
 		${0}
 	end
 snippet let
-	let(:${1:object}) ${0}
+	let(:${1:object}) { ${0} }
 snippet let!
-	let!(:${1:object}) ${0}
+	let!(:${1:object}) { ${0} }
 snippet subj
 	subject { ${0} }
 snippet s.
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
new file mode 100644
index 00000000..d4b9264d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -0,0 +1,125 @@
+#################
+# Rust Snippets #
+#################
+
+# Functions
+snippet fn
+	fn ${1:function_name}(${2}) {
+		${0}
+	}
+snippet fn-
+	fn ${1:function_name}(${2}) -> ${3} {
+		${0}
+	}
+snippet test
+	#[test]
+	fn ${1:test_function_name}() {
+		${0}
+	}
+snippet new
+	pub fn new(${2}) -> ${1:Name} {
+		${0}return $1 { ${3} };
+	}
+snippet main
+	pub fn main() {
+		${0}
+	}
+snippet let
+	let ${1:name}${3} = ${2};
+snippet pln
+	println!("${1}");
+snippet pln,
+	println!("${1}", ${2});
+snippet ec
+	extern crate ${1:sync};
+snippet ecl
+	#![feature(phase)]
+	#[phase(syntax, link)] extern crate log;
+snippet mod
+	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	} /* $1 */
+snippet crate
+	// Crate ID
+	#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+	// Additional metadata attributes
+	#![desc = "${3:Descrption.}"]
+	#![license = "${4:BSD}"]
+	#![comment = "${5:Comment.}"]
+	// Specify the output type
+	#![crate_type = "${6:lib}"]
+snippet allow
+	#[allow(${1:unused_variable})]
+snippet feat
+	#![feature(${1:macro_rules})]
+# Common types
+snippet opt
+	Option<${1:int}>
+snippet res
+	Result<${1:~str}, ${2:()}>
+snippet if
+	if ${1:/* condition */} {
+		${0}
+	}
+snippet mat
+	match ${1} {
+		${2} => ${3},
+	}
+snippet while
+	while ${1:condition} {
+		${0}
+	}
+snippet for
+	for ${1:i} in ${2:range(0u, 10)} {
+		${0}
+	}
+snippet spawn
+	spawn(proc() {
+		${0}
+	});
+snippet chan
+	let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
+snippet duplex
+	let (${1:from_child}, ${2:to_child}) = sync::duplex();
+# TODO commenting
+snippet todo
+	// [TODO]: ${1:Description}
+# Struct
+snippet st
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
+
+	impl $1 {
+		pub fn new(${2}) -> $1 {
+			${4}return $1 {
+				${5}
+			};
+		}
+	}
+# Enum
+snippet enum
+	enum ${1:enum_name} {
+		${0},
+	}
+# Impl
+snippet imp
+	impl ${1:Name} {
+		${0}
+	}
+snippet drop
+	impl Drop for ${1:Name} {
+		fn drop(&mut self) {
+			${0}
+		}
+	}
+# Traits
+snippet trait
+	trait ${1:Name} {
+		${0}
+	}
+# Statics
+snippet ss
+	static ${1}: &'static str = "${0}";
+snippet stat
+	static ${1}: ${2:uint} = ${0};
diff --git a/sources_non_forked/vim-snippets/snippets/scheme.snippets b/sources_non_forked/vim-snippets/snippets/scheme.snippets
new file mode 100644
index 00000000..035d5348
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/sh.snippets b/sources_non_forked/vim-snippets/snippets/sh.snippets
index 6bf7089c..c9c6ebc3 100644
--- a/sources_non_forked/vim-snippets/snippets/sh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/sh.snippets
@@ -81,7 +81,7 @@ snippet getopt
 	done
 	shift $(($OPTIND-1))
 snippet root
-	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi
+	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
 snippet fun
 	${1:function_name}() {
 		${0:#function_body}
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index f3c090e6..37fcc91b 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -1,215 +1,224 @@
 #PREAMBLE
 #newcommand
-snippet nc
+snippet nc \newcommand
 	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
-snippet up
+snippet up \usepackage
 	\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
-snippet nuc
+snippet nuc \newunicodechar
 	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
-snippet dmo
+snippet dmo \DeclareMathOperator
 	\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
-snippet begin
+snippet begin \begin{} ... \end{} block
 	\begin{${1:env}}
 		${0}
 	\end{$1}
 # Tabular
-snippet tab
+snippet tab tabular (or arbitrary) environment
 	\begin{${1:tabular}}{${2:c}}
-	${0}
+		${0}
 	\end{$1}
-snippet thm
+snippet thm thm (or arbitrary) environment with optional argument
 	\begin[${1:author}]{${2:thm}}
-	${0}
+		${0}
 	\end{$2}
-snippet center
+snippet center center environment
 	\begin{center}
 		${0}
 	\end{center}
 # Align(ed)
-snippet ali
+snippet ali align(ed) environment
 	\begin{align${1:ed}}
+		\label{eq:${2}}
 		${0}
 	\end{align$1}
 # Gather(ed)
-snippet gat
+snippet gat gather(ed) environment
 	\begin{gather${1:ed}}
 		${0}
 	\end{gather$1}
 # Equation
-snippet eq
+snippet eq equation environment
 	\begin{equation}
+	\label{eq:${2}}
 		${0}
 	\end{equation}
 # Equation
-snippet eq*
+snippet eq* unnumbered equation environment
 	\begin{equation*}
 		${0}
 	\end{equation*}
 # Unnumbered Equation
-snippet \
+snippet \ unnumbered equation: \[ ... \]
 	\[
 		${0}
 	\]
 # Equation array
-snippet eqnarray
+snippet eqnarray eqnarray environment
 	\begin{eqnarray}
 		${0}
 	\end{eqnarray}
+# Label
+snippet lab \label
+	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
-snippet enum
+snippet enum enumerate environment
 	\begin{enumerate}
 		\item ${0}
 	\end{enumerate}
 # Itemize
-snippet itemize
+snippet itemize itemize environment
 	\begin{itemize}
 		\item ${0}
 	\end{itemize}
-snippet item
+snippet item \item
 	\item ${1}
 # Description
-snippet desc
+snippet desc description environment
 	\begin{description}
 		\item[${1}] ${0}
 	\end{description}
 # Endless new item
-snippet ]i
+snippet ]i \item (recursive)
 	\item ${1}
-	${0:]i}
+		${0:]i}
 # Matrix
-snippet mat
+snippet mat smart matrix environment
 	\begin{${1:p/b/v/V/B/small}matrix}
 		${0}
 	\end{$1matrix}
 # Cases
-snippet cas
+snippet cas cases environment
 	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
 		${0}
 	\end{cases}
 # Split
-snippet spl
+snippet spl split environment
 	\begin{split}
 		${0}
 	\end{split}
 # Part
-snippet part
+snippet part document \part
 	\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
 	${0}
 	% part $2 (end)
 # Chapter
-snippet cha
+snippet cha \chapter
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
 	${0}
 # Section
-snippet sec
+snippet sec \section
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Section without number
-snippet sec*
+snippet sec* \section*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Sub Section
-snippet sub
+snippet sub \subsection
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
-snippet sub*
+snippet sub* \subsection*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
-snippet subs
+snippet subs \subsubsection
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
-snippet subs*
+snippet subs* \subsubsection*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Paragraph
-snippet par
+snippet par \paragraph
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
-snippet subp
+snippet subp \subparagraph
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${0}
-snippet ni
+snippet ni \noindent
 	\noindent
 	${0}
 #References
-snippet itd
+snippet itd description \item
 	\item[${1:description}] ${0:item}
-snippet figure
+snippet figure reference to a figure
 	${1:Figure}~\ref{${2:fig:}}
-snippet table
+snippet table reference to a table
 	${1:Table}~\ref{${2:tab:}}
-snippet listing
+snippet listing reference to a listing
 	${1:Listing}~\ref{${2:list}}
-snippet section
+snippet section reference to a section
 	${1:Section}~\ref{sec:${2}} ${0}
-snippet page
+snippet page reference to a page
 	${1:page}~\pageref{${2}} ${0}
-snippet index
+snippet index \index
 	\index{${1:index}} ${0}
 #Citations
-snippet citen
-	\cite{$1} ${0}
-# bibtex commands
-snippet citep
-	\citep{$1} ${0}
-snippet citet
-	\citet{$1} ${0}
-snippet cite
+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 fcite
+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
+snippet it italic text
 	\textit{${0:text}}
-snippet bf
+snippet bf bold face text
 	\textbf{${0:text}}
-snippet under
+snippet under underline text
 	\underline{${0:text}}
-snippet emp
+snippet emp emphasize text
 	\emph{${0:text}}
-snippet sc
+snippet sc small caps text
 	\textsc{${0:text}}
 #Choosing font
-snippet sf
+snippet sf sans serife text
 	\textsf{${0:text}}
-snippet rm
+snippet rm roman font text
 	\textrm{${0:text}}
-snippet tt
+snippet tt typewriter (monospace) text
 	\texttt{${0:text}}
 #misc
-snippet ft
+snippet ft \footnote
 	\footnote{${0:text}}
-snippet fig
+snippet fig figure environment (includegraphics)
 	\begin{figure}
 	\begin{center}
-	    \includegraphics[scale=${1}]{Figures/${2}}
+		\includegraphics[scale=${1}]{Figures/${2}}
 	\end{center}
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
 	${0}
-snippet tikz
+snippet tikz figure environment (tikzpicture)
 	\begin{figure}
 	\begin{center}
 	\begin{tikzpicture}[scale=${1:1}]
@@ -221,33 +230,31 @@ snippet tikz
 	\end{figure}
 	${0}
 #math
-snippet stackrel
+snippet stackrel \stackrel{}{}
 	\stackrel{${1:above}}{${2:below}} ${0}
-snippet frac
+snippet frac \frac{}{}
 	\frac{${1:num}}{${2:denom}} ${0}
-snippet sum
+snippet sum \sum^{}_{}
 	\sum^{${1:n}}_{${2:i=1}} ${0}
-snippet lim
+snippet lim \lim_{}
 	\lim_{${1:x \to +\infty}} ${0}
-snippet frame
-	\begin{frame}[<+->]
-		\frametitle{${1:title}}
-
+snippet frame frame environment
+	\begin{frame}[${1:t}]{${2:title}}
 		${0}
 	\end{frame}
-snippet block
+snippet block block environment
 	\begin{block}{${1:title}}
 	${0}
 	\end{block}
-snippet alert
+snippet alert alertblock environment
 	\begin{alertblock}{${1:title}}
 	${0}
 	\end{alertblock}
-snippet example
+snippet example exampleblock environment
 	\begin{exampleblock}{${1:title}}
 	${0}
 	\end{exampleblock}
-snippet col2
+snippet col2 two-column environment
 	\begin{columns}
 		\begin{column}{0.5\textwidth}
 			${1}
diff --git a/sources_non_forked/vim-snippets/snippets/vim.snippets b/sources_non_forked/vim-snippets/snippets/vim.snippets
index 8e8093b9..b299f512 100644
--- a/sources_non_forked/vim-snippets/snippets/vim.snippets
+++ b/sources_non_forked/vim-snippets/snippets/vim.snippets
@@ -1,50 +1,52 @@
-snippet header
+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
+snippet guard script reload guard
 	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
 	let $1 = 1${0}
-snippet f
+snippet f function
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
 		${0}
 	endf
-snippet t
+snippet t try ... catch statement
 	try
 		${1}
 	catch ${2}
 		${0}
 	endtry
-snippet for
+snippet for for ... in loop
 	for ${1} in ${2}
 		${0}
 	endfor
-snippet forkv
+snippet forkv for [key, value] in loop
 	for [${1},${2}] in items(${3})
 		${0}
 		unlet $1 $2
 	endfor
-snippet wh
+snippet wh while loop
 	while ${1}
 		${0}
 	endw
-snippet if
+snippet if if statement
 	if ${1}
 		${0}
 	endif
-snippet ife
+snippet ife if ... else statement
 	if ${1}
 		${2}
 	else
 		${0}
 	endif
-snippet au
+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
-	Bundle '${0}'
+snippet bun Vundle.vim Plugin definition
+	Plugin '${0}'
+snippet plug Vundle.vim Plugin definition
+	Plugin '${0}'
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index 05b1c5c3..18a49358 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -127,7 +127,7 @@ endfunction
 function! s:wrap(string,char,type,...)
   let keeper = a:string
   let newchar = a:char
-  let s:tag = ""
+  let s:input = ""
   let type = a:type
   let linemode = type ==# 'V' ? 1 : 0
   let special = a:0 ? a:1 : 0
@@ -185,10 +185,10 @@ function! s:wrap(string,char,type,...)
     if dounmapb
       silent! cunmap >
     endif
-    let s:tag = tag
+    let s:input = tag
     if tag != ""
       let tag = substitute(tag,'>*$','','')
-      let s:tag = tag . '>'
+      let s:input = tag . '>'
       let before = '<'.tag.'>'
       if tag =~ '/$'
         let after = ''
@@ -217,6 +217,7 @@ function! s:wrap(string,char,type,...)
   elseif newchar ==# 'f' || newchar ==# 'F'
     let fnc = input('function: ')
     if fnc != ""
+      let s:input = fnc."\<CR>"
       let before = substitute(fnc,'($','','').'('
       let after  = ')'
       if newchar ==# 'F'
@@ -226,6 +227,7 @@ function! s:wrap(string,char,type,...)
     endif
   elseif newchar ==# "\<C-F>"
     let fnc = input('function: ')
+    let s:input = fnc."\<CR>"
     let before = '('.fnc.' '
     let after = ')'
   elseif idx >= 0
@@ -454,7 +456,7 @@ function! s:dosurround(...) " {{{1
   if newchar == ""
     silent! call repeat#set("\<Plug>Dsurround".char,scount)
   else
-    silent! call repeat#set("\<Plug>Csurround".char.newchar.s:tag,scount)
+    silent! call repeat#set("\<Plug>Csurround".char.newchar.s:input,scount)
   endif
 endfunction " }}}1
 
@@ -527,9 +529,9 @@ function! s:opfunc(type,...) " {{{1
   let &selection = sel_save
   let &clipboard = cb_save
   if a:type =~ '^\d\+$'
-    silent! call repeat#set("\<Plug>Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:tag,a:type)
+    silent! call repeat#set("\<Plug>Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:input,a:type)
   else
-    silent! call repeat#set("\<Plug>SurroundRepeat".char.s:tag)
+    silent! call repeat#set("\<Plug>SurroundRepeat".char.s:input)
   endif
 endfunction
 

From 2a9908e4f030e574cd03086ba51aaf6f185bd661 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 3 Aug 2014 23:02:51 +0100
Subject: [PATCH 44/61] Updated plugins

---
 sources_non_forked/goyo.vim/plugin/goyo.vim   |   44 +-
 sources_non_forked/nerdtree/README.markdown   |    2 +-
 .../nerdtree/autoload/nerdtree.vim            | 1003 +----------------
 .../nerdtree/autoload/nerdtree/ui_glue.vim    |  644 +++++++++++
 sources_non_forked/nerdtree/doc/NERD_tree.txt |    3 +
 .../nerdtree/lib/nerdtree/bookmark.vim        |    4 +-
 .../nerdtree/lib/nerdtree/creator.vim         |   89 +-
 .../nerdtree/lib/nerdtree/event.vim           |   13 +
 .../nerdtree/lib/nerdtree/flag_set.vim        |   56 +
 .../nerdtree/lib/nerdtree/key_map.vim         |   20 +-
 .../nerdtree/lib/nerdtree/nerdtree.vim        |   39 +
 .../nerdtree/lib/nerdtree/notifier.vim        |   35 +
 .../nerdtree/lib/nerdtree/opener.vim          |   80 +-
 .../nerdtree/lib/nerdtree/path.vim            |   31 +-
 .../nerdtree/lib/nerdtree/tree_dir_node.vim   |   19 +-
 .../nerdtree/lib/nerdtree/tree_file_node.vim  |   76 +-
 .../nerdtree/lib/nerdtree/ui.vim              |  332 ++++++
 .../nerdtree/nerdtree_plugin/fs_menu.vim      |    4 +-
 .../nerdtree/plugin/NERD_tree.vim             |   15 +-
 .../nerdtree/syntax/nerdtree.vim              |   21 +-
 sources_non_forked/syntastic/README.markdown  |   23 +-
 .../syntastic/autoload/syntastic/log.vim      |    9 +-
 .../syntastic/autoload/syntastic/util.vim     |   35 +-
 .../syntastic/doc/syntastic.txt               |  123 +-
 .../syntastic/plugin/syntastic.vim            |   52 +-
 .../syntastic/plugin/syntastic/balloons.vim   |    1 +
 .../plugin/syntastic/highlighting.vim         |   16 +-
 .../syntastic/plugin/syntastic/loclist.vim    |   10 +
 .../syntastic/plugin/syntastic/modemap.vim    |   25 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |   26 +-
 .../syntastic/plugin/syntastic/registry.vim   |   17 +-
 .../syntastic/plugin/syntastic/signs.vim      |   24 +-
 .../syntax_checkers/arduino/avrgcc.vim        |   26 +
 .../syntastic/syntax_checkers/c/avrgcc.vim    |    2 +
 .../syntax_checkers/elixir/elixir.vim         |    5 +
 .../syntax_checkers/erlang/escript.vim        |    2 +-
 .../syntax_checkers/erlang/syntaxerl.vim      |    2 +
 .../syntastic/syntax_checkers/eruby/ruby.vim  |   21 +-
 .../syntastic/syntax_checkers/html/jshint.vim |    2 +
 .../syntastic/syntax_checkers/html/tidy.vim   |    4 +-
 .../syntastic/syntax_checkers/java/javac.vim  |    3 +-
 .../syntax_checkers/javascript/jshint.vim     |    2 +
 .../syntax_checkers/python/flake8.vim         |    8 +-
 .../syntax_checkers/python/frosted.vim        |    7 +-
 .../syntax_checkers/python/pep257.vim         |    6 +-
 .../syntastic/syntax_checkers/python/pep8.vim |    6 +-
 .../syntax_checkers/python/py3kwarn.vim       |    8 +-
 .../syntax_checkers/python/pyflakes.vim       |    6 +-
 .../syntax_checkers/python/pylama.vim         |    9 +-
 .../syntax_checkers/python/pylint.vim         |    4 +-
 .../syntax_checkers/python/python.vim         |    7 +-
 .../syntastic/syntax_checkers/ruby/jruby.vim  |    6 +-
 .../syntax_checkers/ruby/macruby.vim          |    9 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |    9 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |   13 +-
 sources_non_forked/tlib/autoload/tlib/arg.vim |   47 +-
 sources_non_forked/tlib/autoload/tlib/dir.vim |   11 +-
 .../tlib/autoload/tlib/file.vim               |   23 +-
 .../tlib/autoload/tlib/list.vim               |   14 +-
 sources_non_forked/tlib/autoload/tlib/sys.vim |  127 +++
 sources_non_forked/tlib/autoload/tlib/var.vim |   10 +-
 sources_non_forked/tlib/autoload/tlib/vcs.vim |   17 +-
 sources_non_forked/tlib/doc/tlib.txt          |   75 +-
 sources_non_forked/tlib/plugin/02tlib.vim     |    6 +-
 .../autoload/airline/extensions.vim           |    4 +
 .../autoload/airline/extensions/capslock.vim  |   14 +
 .../vim-airline/autoload/airline/init.vim     |    3 +-
 .../vim-airline/doc/airline.txt               |    8 +-
 .../vim-airline/plugin/airline.vim            |    2 +-
 .../vim-fugitive/README.markdown              |   10 +-
 .../vim-fugitive/plugin/fugitive.vim          |  119 +-
 .../vim-markdown/syntax/markdown.vim          |   17 +-
 .../vim-snipmate/autoload/snipMate.vim        |   30 +-
 .../vim-snipmate/plugin/snipMate.vim          |    2 +-
 sources_non_forked/vim-snippets/.gitignore    |    1 +
 .../vim-snippets/UltiSnips/eruby.snippets     |    2 +
 .../vim-snippets/UltiSnips/java.snippets      |    2 +-
 .../vim-snippets/UltiSnips/ledger.snippets    |    5 +-
 .../vim-snippets/UltiSnips/php.snippets       |    2 +-
 .../vim-snippets/UltiSnips/python.snippets    |   11 +-
 .../vim-snippets/UltiSnips/rst.snippets       |   98 +-
 .../vim-snippets/snippets/html.snippets       |    3 +
 .../snippets/javascript/javascript.snippets   |    3 +
 .../vim-snippets/snippets/rails.snippets      |  484 ++++++++
 .../vim-snippets/snippets/ruby.snippets       |  639 ++---------
 .../vim-snippets/snippets/tex.snippets        |    2 +-
 .../vim-surround/plugin/surround.vim          |    2 +-
 vimrcs/filetypes.vim                          |    2 +-
 88 files changed, 2839 insertions(+), 2014 deletions(-)
 create mode 100644 sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
 create mode 100644 sources_non_forked/nerdtree/lib/nerdtree/event.vim
 create mode 100644 sources_non_forked/nerdtree/lib/nerdtree/flag_set.vim
 create mode 100644 sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
 create mode 100644 sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
 create mode 100644 sources_non_forked/nerdtree/lib/nerdtree/ui.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
 create mode 100644 sources_non_forked/tlib/autoload/tlib/sys.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
 create mode 100644 sources_non_forked/vim-snippets/.gitignore
 create mode 100644 sources_non_forked/vim-snippets/snippets/rails.snippets

diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 4265e14f..5308326a 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -64,7 +64,7 @@ function! s:setup_pad(bufnr, vert, size)
   execute win . 'wincmd w'
   execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
   augroup goyop
-    autocmd WinEnter <buffer> call s:blank()
+    autocmd WinEnter,CursorMoved <buffer> call s:blank()
   augroup END
 
   " To hide scrollbars of pad windows in GVim
@@ -127,6 +127,7 @@ function! s:goyo_on(width)
     \ { 'laststatus':     &laststatus,
     \   'showtabline':    &showtabline,
     \   'fillchars':      &fillchars,
+    \   'winminwidth':    &winminwidth,
     \   'winwidth':       &winwidth,
     \   'winminheight':   &winminheight,
     \   'winheight':      &winheight,
@@ -145,6 +146,12 @@ function! s:goyo_on(width)
     silent! GitGutterDisable
   endif
 
+  " vim-signify
+  let t:goyo_disabled_signify = exists('b:sy') && b:sy.active
+  if t:goyo_disabled_signify
+    SignifyToggle
+  endif
+
   " vim-airline
   let t:goyo_disabled_airline = exists("#airline")
   if t:goyo_disabled_airline
@@ -177,10 +184,10 @@ function! s:goyo_on(width)
   endif
 
   " Global options
-  set winwidth=1
   let &winheight = max([&winminheight, 1])
   set winminheight=1
   set winheight=1
+  set winminwidth=1 winwidth=1
   set laststatus=0
   set showtabline=0
   set noruler
@@ -241,6 +248,7 @@ function! s:goyo_off()
 
   let goyo_revert             = t:goyo_revert
   let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
+  let goyo_disabled_signify   = t:goyo_disabled_signify
   let goyo_disabled_airline   = t:goyo_disabled_airline
   let goyo_disabled_powerline = t:goyo_disabled_powerline
   let goyo_disabled_lightline = t:goyo_disabled_lightline
@@ -258,6 +266,10 @@ function! s:goyo_off()
     execute printf('normal! %dG%d|', line, col)
   endif
 
+  let wmw = remove(goyo_revert, 'winminwidth')
+  let ww  = remove(goyo_revert, 'winwidth')
+  let &winwidth     = ww
+  let &winminwidth  = wmw
   let wmh = remove(goyo_revert, 'winminheight')
   let wh  = remove(goyo_revert, 'winheight')
   let &winheight    = max([wmh, 1])
@@ -273,6 +285,12 @@ function! s:goyo_off()
     silent! GitGutterEnable
   endif
 
+  if goyo_disabled_signify
+    silent! if !b:sy.active
+      SignifyToggle
+    endif
+  endif
+
   if goyo_disabled_airline && !exists("#airline")
     AirlineToggle
     silent! AirlineRefresh
@@ -296,20 +314,26 @@ function! s:goyo_off()
   endif
 endfunction
 
-function! s:goyo(...)
+function! s:goyo(bang, ...)
   let width = a:0 > 0 ? a:1 : get(g:, 'goyo_width', 80)
 
-  if exists('#goyo') == 0
-    call s:goyo_on(width)
-  elseif a:0 > 0
-    let t:goyo_width = width
-    call s:resize_pads()
+  if a:bang
+    if exists('#goyo')
+      call s:goyo_off()
+    endif
   else
-    call s:goyo_off()
+    if exists('#goyo') == 0
+      call s:goyo_on(width)
+    elseif a:0 > 0
+      let t:goyo_width = width
+      call s:resize_pads()
+    else
+      call s:goyo_off()
+    end
   end
 endfunction
 
-command! -nargs=? Goyo call s:goyo(<args>)
+command! -nargs=? -bar -bang Goyo call s:goyo('<bang>' == '!', <args>)
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/sources_non_forked/nerdtree/README.markdown b/sources_non_forked/nerdtree/README.markdown
index bfae5c68..9dacf682 100644
--- a/sources_non_forked/nerdtree/README.markdown
+++ b/sources_non_forked/nerdtree/README.markdown
@@ -83,7 +83,7 @@ __Q. How can I open a NERDTree automatically when vim starts up if no files were
 A. Stick this in your vimrc
 
     autocmd StdinReadPre * let s:std_in=1
-    autocmd VimEnter * if !argc() == 0 && !exists("s:std_in") | NERDTree | endif
+    autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
 __Q. How can I map a specific key or shortcut to open NERDTree?__
 
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/sources_non_forked/nerdtree/autoload/nerdtree.vim
index 35919320..539e7838 100644
--- a/sources_non_forked/nerdtree/autoload/nerdtree.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree.vim
@@ -9,29 +9,6 @@ endfunction
 
 " SECTION: General Functions {{{1
 "============================================================
-"FUNCTION: nerdtree#bufInWindows(bnum){{{2
-"[[STOLEN FROM VTREEEXPLORER.VIM]]
-"Determine the number of windows open to this buffer number.
-"Care of Yegappan Lakshman.  Thanks!
-"
-"Args:
-"bnum: the subject buffers buffer number
-function! nerdtree#bufInWindows(bnum)
-    let cnt = 0
-    let winnum = 1
-    while 1
-        let bufnum = winbufnr(winnum)
-        if bufnum < 0
-            break
-        endif
-        if bufnum ==# a:bnum
-            let cnt = cnt + 1
-        endif
-        let winnum = winnum + 1
-    endwhile
-
-    return cnt
-endfunction
 
 "FUNCTION: nerdtree#checkForBrowse(dir) {{{2
 "inits a secondary nerd tree in the current buffer if appropriate
@@ -57,81 +34,6 @@ function! nerdtree#compareNodes(n1, n2)
     return a:n1.path.compareTo(a:n2.path)
 endfunction
 
-" FUNCTION: nerdtree#createDefaultBindings() {{{2
-function! nerdtree#createDefaultBindings()
-    let s = '<SNR>' . s:SID() . '_'
-
-    call NERDTreeAddKeyMap({ 'key': '<MiddleRelease>', 'scope': "all", 'callback': s."handleMiddleMouse" })
-    call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': "all", 'callback': s."handleLeftClick" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "DirNode", 'callback': s."activateDirNode" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "FileNode", 'callback': s."activateFileNode" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "Bookmark", 'callback': s."activateBookmark" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "all", 'callback': s."activateAll" })
-
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "DirNode", 'callback': s."activateDirNode" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "FileNode", 'callback': s."activateFileNode" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "Bookmark", 'callback': s."activateBookmark" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "all", 'callback': s."activateAll" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Node", 'callback': s."openHSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Node", 'callback': s."openVSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Bookmark", 'callback': s."openHSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Bookmark", 'callback': s."openVSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Node", 'callback': s."previewNodeCurrent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Node", 'callback': s."previewNodeVSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Node", 'callback': s."previewNodeHSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Bookmark", 'callback': s."previewNodeCurrent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Bookmark", 'callback': s."previewNodeVSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Bookmark", 'callback': s."previewNodeHSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': "DirNode", 'callback': s."openNodeRecursively" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': "all", 'callback': s."upDirCurrentRootClosed" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': "all", 'callback': s."upDirCurrentRootOpen" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': "Node", 'callback': s."chRoot" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': "Node", 'callback': s."chCwd" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#chRootCwd" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': "all", 'callback': s."displayHelp" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': "all", 'callback': s."toggleZoom" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': "all", 'callback': s."toggleShowHidden" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': "all", 'callback': s."toggleIgnoreFilter" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': "all", 'callback': s."toggleShowFiles" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': "all", 'callback': s."toggleShowBookmarks" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': "Node", 'callback': s."closeCurrentDir" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': "DirNode", 'callback': s."closeChildren" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': "Node", 'callback': s."showMenu" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': "Node", 'callback': s."jumpToParent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': "Node", 'callback': s."jumpToFirstChild" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': "Node", 'callback': s."jumpToLastChild" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': "all", 'callback': s."jumpToRoot" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': "Node", 'callback': s."jumpToNextSibling" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': "Node", 'callback': s."jumpToPrevSibling" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Node", 'callback': s."openInNewTab" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Node", 'callback': s."openInNewTabSilent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Bookmark", 'callback': s."openInNewTab" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Bookmark", 'callback': s."openInNewTabSilent" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "DirNode", 'callback': s."openExplorer" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': "Bookmark", 'callback': s."deleteBookmark" })
-endfunction
-
 " FUNCTION: nerdtree#deprecated(func, [msg]) {{{2
 " Issue a deprecation warning for a:func. If a second arg is given, use this
 " as the deprecation message
@@ -147,15 +49,6 @@ function! nerdtree#deprecated(func, ...)
     endif
 endfunction
 
-"FUNCTION: nerdtree#escChars(dir) {{{2
-function! nerdtree#escChars()
-    if nerdtree#runningWindows()
-        return " `\|\"#%&,?()\*^<>"
-    endif
-
-    return " \\`\|\"#%&,?()\*^<>[]"
-endfunction
-
 " FUNCTION: nerdtree#exec(cmd) {{{2
 " same as :exec cmd  but eventignore=all is set for the duration
 function! nerdtree#exec(cmd)
@@ -165,68 +58,11 @@ function! nerdtree#exec(cmd)
     let &ei = old_ei
 endfunction
 
-" FUNCTION: nerdtree#findAndRevealPath() {{{2
-function! nerdtree#findAndRevealPath()
-    try
-        let p = g:NERDTreePath.New(expand("%:p"))
-    catch /^NERDTree.InvalidArgumentsError/
-        call nerdtree#echo("no file for the current buffer")
-        return
-    endtry
-
-    if p.isUnixHiddenPath()
-        let showhidden=g:NERDTreeShowHidden
-        let g:NERDTreeShowHidden = 1
-    endif
-
-    if !nerdtree#treeExistsForTab()
-        try
-            let cwd = g:NERDTreePath.New(getcwd())
-        catch /^NERDTree.InvalidArgumentsError/
-            call nerdtree#echo("current directory does not exist.")
-            let cwd = p.getParent()
-        endtry
-
-        if p.isUnder(cwd)
-            call g:NERDTreeCreator.CreatePrimary(cwd.str())
-        else
-            call g:NERDTreeCreator.CreatePrimary(p.getParent().str())
-        endif
-    else
-        if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
-            if !nerdtree#isTreeOpen()
-                call g:NERDTreeCreator.TogglePrimary('')
-            else
-                call nerdtree#putCursorInTreeWin()
-            endif
-            let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-            call nerdtree#chRoot(g:NERDTreeDirNode.New(p.getParent()))
-        else
-            if !nerdtree#isTreeOpen()
-                call g:NERDTreeCreator.TogglePrimary("")
-            endif
-        endif
-    endif
-    call nerdtree#putCursorInTreeWin()
-    call b:NERDTreeRoot.reveal(p)
-
-    if p.isUnixHiddenFile()
-        let g:NERDTreeShowHidden = showhidden
-    endif
-endfunction
-
 " FUNCTION: nerdtree#has_opt(options, name) {{{2
 function! nerdtree#has_opt(options, name)
     return has_key(a:options, a:name) && a:options[a:name] == 1
 endfunction
 
-" FUNCTION: nerdtree#invokeKeyMap(key) {{{2
-"this is needed since I cant figure out how to invoke dict functions from a
-"key map
-function! nerdtree#invokeKeyMap(key)
-    call g:NERDTreeKeyMap.Invoke(a:key)
-endfunction
-
 " FUNCTION: nerdtree#loadClassFiles() {{{2
 function! nerdtree#loadClassFiles()
     runtime lib/nerdtree/path.vim
@@ -238,12 +74,17 @@ function! nerdtree#loadClassFiles()
     runtime lib/nerdtree/tree_dir_node.vim
     runtime lib/nerdtree/opener.vim
     runtime lib/nerdtree/creator.vim
+    runtime lib/nerdtree/flag_set.vim
+    runtime lib/nerdtree/nerdtree.vim
+    runtime lib/nerdtree/ui.vim
+    runtime lib/nerdtree/event.vim
+    runtime lib/nerdtree/notifier.vim
 endfunction
 
 " FUNCTION: nerdtree#postSourceActions() {{{2
 function! nerdtree#postSourceActions()
     call g:NERDTreeBookmark.CacheBookmarks(0)
-    call nerdtree#createDefaultBindings()
+    call nerdtree#ui_glue#createDefaultBindings()
 
     "load all nerdtree plugins
     runtime! nerdtree_plugin/**/*.vim
@@ -254,44 +95,6 @@ function! nerdtree#runningWindows()
     return has("win16") || has("win32") || has("win64")
 endfunction
 
-" Function: s:SID()   {{{2
-function s:SID()
-    if !exists("s:sid")
-        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
-    endif
-    return s:sid
-endfun
-
-" FUNCTION: nerdtree#tabpagevar(tabnr, var) {{{2
-function! nerdtree#tabpagevar(tabnr, var)
-    let currentTab = tabpagenr()
-    let old_ei = &ei
-    set ei=all
-
-    exec "tabnext " . a:tabnr
-    let v = -1
-    if exists('t:' . a:var)
-        exec 'let v = t:' . a:var
-    endif
-    exec "tabnext " . currentTab
-
-    let &ei = old_ei
-
-    return v
-endfunction
-
-" Function: nerdtree#treeExistsForBuffer()   {{{2
-" Returns 1 if a nerd tree root exists in the current buffer
-function! nerdtree#treeExistsForBuf()
-    return exists("b:NERDTreeRoot")
-endfunction
-
-" Function: nerdtree#treeExistsForTab()   {{{2
-" Returns 1 if a nerd tree root exists in the current tab
-function! nerdtree#treeExistsForTab()
-    return exists("t:NERDTreeBufName")
-endfunction
-
 "FUNCTION: nerdtree#treeMarkupReg(dir) {{{2
 function! nerdtree#treeMarkupReg()
     if g:NERDTreeDirArrows
@@ -311,76 +114,9 @@ function! nerdtree#treeWid()
     return 2
 endfunction
 
-"FUNCTION: nerdtree#upDir(keepState) {{{2
-"moves the tree up a level
-"
-"Args:
-"keepState: 1 if the current root should be left open when the tree is
-"re-rendered
-function! nerdtree#upDir(keepState)
-    let cwd = b:NERDTreeRoot.path.str({'format': 'UI'})
-    if cwd ==# "/" || cwd =~# '^[^/]..$'
-        call nerdtree#echo("already at top dir")
-    else
-        if !a:keepState
-            call b:NERDTreeRoot.close()
-        endif
-
-        let oldRoot = b:NERDTreeRoot
-
-        if empty(b:NERDTreeRoot.parent)
-            let path = b:NERDTreeRoot.path.getParent()
-            let newRoot = g:NERDTreeDirNode.New(path)
-            call newRoot.open()
-            call newRoot.transplantChild(b:NERDTreeRoot)
-            let b:NERDTreeRoot = newRoot
-        else
-            let b:NERDTreeRoot = b:NERDTreeRoot.parent
-        endif
-
-        if g:NERDTreeChDirMode ==# 2
-            call b:NERDTreeRoot.path.changeToDir()
-        endif
-
-        call nerdtree#renderView()
-        call oldRoot.putCursorHere(0, 0)
-    endif
-endfunction
-
-" Function: nerdtree#unique(list)   {{{2
-" returns a:list without duplicates
-function! nerdtree#unique(list)
-  let uniqlist = []
-  for elem in a:list
-    if index(uniqlist, elem) ==# -1
-      let uniqlist += [elem]
-    endif
-  endfor
-  return uniqlist
-endfunction
-
 " SECTION: View Functions {{{1
 "============================================================
-"
-"FUNCTION: nerdtree#centerView() {{{2
-"centers the nerd tree window around the cursor (provided the nerd tree
-"options permit)
-function! nerdtree#centerView()
-    if g:NERDTreeAutoCenter
-        let current_line = winline()
-        let lines_to_top = current_line
-        let lines_to_bottom = winheight(nerdtree#getTreeWinNum()) - current_line
-        if lines_to_top < g:NERDTreeAutoCenterThreshold || lines_to_bottom < g:NERDTreeAutoCenterThreshold
-            normal! zz
-        endif
-    endif
-endfunction
 
-" FUNCTION: nerdtree#chRoot(node) {{{2
-" changes the current root to the selected one
-function! nerdtree#chRoot(node)
-    call s:chRoot(a:node)
-endfunction
 "FUNCTION: nerdtree#closeTree() {{{2
 "Closes the primary NERD tree window for this tab
 function! nerdtree#closeTree()
@@ -558,92 +294,6 @@ function! nerdtree#echoWarning(msg)
     echohl normal
 endfunction
 
-"FUNCTION: nerdtree#firstUsableWindow(){{{2
-"find the window number of the first normal window
-function! nerdtree#firstUsableWindow()
-    let i = 1
-    while i <= winnr("$")
-        let bnum = winbufnr(i)
-        if bnum != -1 && getbufvar(bnum, '&buftype') ==# ''
-                    \ && !getwinvar(i, '&previewwindow')
-                    \ && (!getbufvar(bnum, '&modified') || &hidden)
-            return i
-        endif
-
-        let i += 1
-    endwhile
-    return -1
-endfunction
-
-"FUNCTION: nerdtree#getPath(ln) {{{2
-"Gets the full path to the node that is rendered on the given line number
-"
-"Args:
-"ln: the line number to get the path for
-"
-"Return:
-"A path if a node was selected, {} if nothing is selected.
-"If the 'up a dir' line was selected then the path to the parent of the
-"current root is returned
-function! nerdtree#getPath(ln)
-    let line = getline(a:ln)
-
-    let rootLine = g:NERDTreeFileNode.GetRootLineNum()
-
-    "check to see if we have the root node
-    if a:ln == rootLine
-        return b:NERDTreeRoot.path
-    endif
-
-    if !g:NERDTreeDirArrows
-        " in case called from outside the tree
-        if line !~# '^ *[|`▸▾ ]' || line =~# '^$'
-            return {}
-        endif
-    endif
-
-    if line ==# nerdtree#treeUpDirLine()
-        return b:NERDTreeRoot.path.getParent()
-    endif
-
-    let indent = nerdtree#indentLevelFor(line)
-
-    "remove the tree parts and the leading space
-    let curFile = nerdtree#stripMarkupFromLine(line, 0)
-
-    let wasdir = 0
-    if curFile =~# '/$'
-        let wasdir = 1
-        let curFile = substitute(curFile, '/\?$', '/', "")
-    endif
-
-    let dir = ""
-    let lnum = a:ln
-    while lnum > 0
-        let lnum = lnum - 1
-        let curLine = getline(lnum)
-        let curLineStripped = nerdtree#stripMarkupFromLine(curLine, 1)
-
-        "have we reached the top of the tree?
-        if lnum == rootLine
-            let dir = b:NERDTreeRoot.path.str({'format': 'UI'}) . dir
-            break
-        endif
-        if curLineStripped =~# '/$'
-            let lpindent = nerdtree#indentLevelFor(curLine)
-            if lpindent < indent
-                let indent = indent - 1
-
-                let dir = substitute (curLineStripped,'^\\', "", "") . dir
-                continue
-            endif
-        endif
-    endwhile
-    let curFile = b:NERDTreeRoot.path.drive . dir . curFile
-    let toReturn = g:NERDTreePath.New(curFile)
-    return toReturn
-endfunction
-
 "FUNCTION: nerdtree#getTreeWinNum() {{{2
 "gets the nerd tree window number for this tab
 function! nerdtree#getTreeWinNum()
@@ -654,111 +304,11 @@ function! nerdtree#getTreeWinNum()
     endif
 endfunction
 
-"FUNCTION: nerdtree#indentLevelFor(line) {{{2
-function! nerdtree#indentLevelFor(line)
-    let level = match(a:line, '[^ \-+~▸▾`|]') / nerdtree#treeWid()
-    " check if line includes arrows
-    if match(a:line, '[▸▾]') > -1
-        " decrement level as arrow uses 3 ascii chars
-        let level = level - 1
-    endif
-    return level
-endfunction
-
 "FUNCTION: nerdtree#isTreeOpen() {{{2
 function! nerdtree#isTreeOpen()
     return nerdtree#getTreeWinNum() != -1
 endfunction
 
-"FUNCTION: nerdtree#isWindowUsable(winnumber) {{{2
-"Returns 0 if opening a file from the tree in the given window requires it to
-"be split, 1 otherwise
-"
-"Args:
-"winnumber: the number of the window in question
-function! nerdtree#isWindowUsable(winnumber)
-    "gotta split if theres only one window (i.e. the NERD tree)
-    if winnr("$") ==# 1
-        return 0
-    endif
-
-    let oldwinnr = winnr()
-    call nerdtree#exec(a:winnumber . "wincmd p")
-    let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow')
-    let modified = &modified
-    call nerdtree#exec(oldwinnr . "wincmd p")
-
-    "if its a special window e.g. quickfix or another explorer plugin then we
-    "have to split
-    if specialWindow
-        return 0
-    endif
-
-    if &hidden
-        return 1
-    endif
-
-    return !modified || nerdtree#bufInWindows(winbufnr(a:winnumber)) >= 2
-endfunction
-
-" FUNCTION: nerdtree#jumpToChild(direction) {{{2
-" Args:
-" direction: 0 if going to first child, 1 if going to last
-function! nerdtree#jumpToChild(currentNode, direction)
-    if a:currentNode.isRoot()
-        return nerdtree#echo("cannot jump to " . (a:direction ? "last" : "first") .  " child")
-    end
-    let dirNode = a:currentNode.parent
-    let childNodes = dirNode.getVisibleChildren()
-
-    let targetNode = childNodes[0]
-    if a:direction
-        let targetNode = childNodes[len(childNodes) - 1]
-    endif
-
-    if targetNode.equals(a:currentNode)
-        let siblingDir = a:currentNode.parent.findOpenDirSiblingWithVisibleChildren(a:direction)
-        if siblingDir != {}
-            let indx = a:direction ? siblingDir.getVisibleChildCount()-1 : 0
-            let targetNode = siblingDir.getChildByIndex(indx, 1)
-        endif
-    endif
-
-    call targetNode.putCursorHere(1, 0)
-
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: nerdtree#jumpToSibling(currentNode, forward) {{{2
-" moves the cursor to the sibling of the current node in the given direction
-"
-" Args:
-" forward: 1 if the cursor should move to the next sibling, 0 if it should
-" move back to the previous sibling
-function! nerdtree#jumpToSibling(currentNode, forward)
-    let sibling = a:currentNode.findSibling(a:forward)
-
-    if !empty(sibling)
-        call sibling.putCursorHere(1, 0)
-        call nerdtree#centerView()
-    endif
-endfunction
-
-"FUNCTION: nerdtree#promptToDelBuffer(bufnum, msg){{{2
-"prints out the given msg and, if the user responds by pushing 'y' then the
-"buffer with the given bufnum is deleted
-"
-"Args:
-"bufnum: the buffer that may be deleted
-"msg: a message that will be echoed to the user asking them if they wish to
-"     del the buffer
-function! nerdtree#promptToDelBuffer(bufnum, msg)
-    echo a:msg
-    if nr2char(getchar()) ==# 'y'
-        exec "silent bdelete! " . a:bufnum
-    endif
-endfunction
-
 "FUNCTION: nerdtree#putCursorOnBookmarkTable(){{{2
 "Places the cursor at the top of the bookmarks table
 function! nerdtree#putCursorOnBookmarkTable()
@@ -770,7 +320,7 @@ function! nerdtree#putCursorOnBookmarkTable()
         return cursor(1, 2)
     endif
 
-    let rootNodeLine = g:NERDTreeFileNode.GetRootLineNum()
+    let rootNodeLine = b:NERDTree.ui.getRootLineNum()
 
     let line = 1
     while getline(line) !~# '^>-\+Bookmarks-\+$'
@@ -810,116 +360,10 @@ function! nerdtree#renderBookmarks()
 endfunction
 
 "FUNCTION: nerdtree#renderView {{{2
-"The entry function for rendering the tree
 function! nerdtree#renderView()
-    setlocal modifiable
-
-    "remember the top line of the buffer and the current line so we can
-    "restore the view exactly how it was
-    let curLine = line(".")
-    let curCol = col(".")
-    let topLine = line("w0")
-
-    "delete all lines in the buffer (being careful not to clobber a register)
-    silent 1,$delete _
-
-    call nerdtree#dumpHelp()
-
-    "delete the blank line before the help and add one after it
-    if g:NERDTreeMinimalUI == 0
-        call setline(line(".")+1, "")
-        call cursor(line(".")+1, col("."))
-    endif
-
-    if b:NERDTreeShowBookmarks
-        call nerdtree#renderBookmarks()
-    endif
-
-    "add the 'up a dir' line
-    if !g:NERDTreeMinimalUI
-        call setline(line(".")+1, nerdtree#treeUpDirLine())
-        call cursor(line(".")+1, col("."))
-    endif
-
-    "draw the header line
-    let header = b:NERDTreeRoot.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
-    call setline(line(".")+1, header)
-    call cursor(line(".")+1, col("."))
-
-    "draw the tree
-    let old_o = @o
-    let @o = b:NERDTreeRoot.renderToString()
-    silent put o
-    let @o = old_o
-
-    "delete the blank line at the top of the buffer
-    silent 1,1delete _
-
-    "restore the view
-    let old_scrolloff=&scrolloff
-    let &scrolloff=0
-    call cursor(topLine, 1)
-    normal! zt
-    call cursor(curLine, curCol)
-    let &scrolloff = old_scrolloff
-
-    setlocal nomodifiable
-endfunction
-
-"FUNCTION: nerdtree#renderViewSavingPosition {{{2
-"Renders the tree and ensures the cursor stays on the current node or the
-"current nodes parent if it is no longer available upon re-rendering
-function! nerdtree#renderViewSavingPosition()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-
-    "go up the tree till we find a node that will be visible or till we run
-    "out of nodes
-    while currentNode != {} && !currentNode.isVisible() && !currentNode.isRoot()
-        let currentNode = currentNode.parent
-    endwhile
-
-    call nerdtree#renderView()
-
-    if currentNode != {}
-        call currentNode.putCursorHere(0, 0)
-    endif
+    call b:NERDTree.render()
 endfunction
 "
-"FUNCTION: nerdtree#restoreScreenState() {{{2
-"
-"Sets the screen state back to what it was when nerdtree#saveScreenState was last
-"called.
-"
-"Assumes the cursor is in the NERDTree window
-function! nerdtree#restoreScreenState()
-    if !exists("b:NERDTreeOldTopLine") || !exists("b:NERDTreeOldPos") || !exists("b:NERDTreeOldWindowSize")
-        return
-    endif
-    exec("silent vertical resize ".b:NERDTreeOldWindowSize)
-
-    let old_scrolloff=&scrolloff
-    let &scrolloff=0
-    call cursor(b:NERDTreeOldTopLine, 0)
-    normal! zt
-    call setpos(".", b:NERDTreeOldPos)
-    let &scrolloff=old_scrolloff
-endfunction
-
-"FUNCTION: nerdtree#saveScreenState() {{{2
-"Saves the current cursor position in the current buffer and the window
-"scroll position
-function! nerdtree#saveScreenState()
-    let win = winnr()
-    try
-        call nerdtree#putCursorInTreeWin()
-        let b:NERDTreeOldPos = getpos(".")
-        let b:NERDTreeOldTopLine = line("w0")
-        let b:NERDTreeOldWindowSize = winwidth("")
-        call nerdtree#exec(win . "wincmd w")
-    catch /^NERDTree.InvalidOperationError/
-    endtry
-endfunction
-
 "FUNCTION: nerdtree#stripMarkupFromLine(line, removeLeadingSpaces){{{2
 "returns the given line with all the tree parts stripped off
 "
@@ -941,6 +385,9 @@ function! nerdtree#stripMarkupFromLine(line, removeLeadingSpaces)
     "strip off any executable flags
     let line = substitute (line, '*\ze\($\| \)', "","")
 
+    "strip off any generic flags
+    let line = substitute (line, '\[[^]]*\]', "","")
+
     let wasdir = 0
     if line =~# '/$'
         let wasdir = 1
@@ -957,432 +404,4 @@ function! nerdtree#stripMarkupFromLine(line, removeLeadingSpaces)
     return line
 endfunction
 
-"SECTION: Interface bindings {{{1
-"============================================================
-
-"FUNCTION: s:activateAll() {{{2
-"handle the user activating the updir line
-function! s:activateAll()
-    if getline(".") ==# nerdtree#treeUpDirLine()
-        return nerdtree#upDir(0)
-    endif
-endfunction
-"FUNCTION: s:activateDirNode() {{{2
-"handle the user activating a tree node
-function! s:activateDirNode(node)
-    call a:node.activate({'reuse': 1})
-endfunction
-
-"FUNCTION: s:activateFileNode() {{{2
-"handle the user activating a tree node
-function! s:activateFileNode(node)
-    call a:node.activate({'reuse': 1, 'where': 'p'})
-endfunction
-
-"FUNCTION: s:activateBookmark() {{{2
-"handle the user activating a bookmark
-function! s:activateBookmark(bm)
-    call a:bm.activate(!a:bm.path.isDirectory ? {'where': 'p'} : {})
-endfunction
-
-" FUNCTION: nerdtree#bookmarkNode(name) {{{2
-" Associate the current node with the given name
-function! nerdtree#bookmarkNode(...)
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    if currentNode != {}
-        let name = a:1
-        if empty(name)
-            let name = currentNode.path.getLastPathComponent(0)
-        endif
-        try
-            call currentNode.bookmark(name)
-            call nerdtree#renderView()
-        catch /^NERDTree.IllegalBookmarkNameError/
-            call nerdtree#echo("bookmark names must not contain spaces")
-        endtry
-    else
-        call nerdtree#echo("select a node first")
-    endif
-endfunction
-
-" FUNCTION: s:chCwd(node) {{{2
-function! s:chCwd(node)
-    try
-        call a:node.path.changeToDir()
-    catch /^NERDTree.PathChangeError/
-        call nerdtree#echoWarning("could not change cwd")
-    endtry
-endfunction
-
-" FUNCTION: s:chRoot(node) {{{2
-" changes the current root to the selected one
-function! s:chRoot(node)
-    call a:node.makeRoot()
-    call nerdtree#renderView()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
-endfunction
-
-" FUNCTION: s:chRootCwd() {{{2
-" changes the current root to CWD
-function! nerdtree#chRootCwd()
-    try
-        let cwd = g:NERDTreePath.New(getcwd())
-    catch /^NERDTree.InvalidArgumentsError/
-        call nerdtree#echo("current directory does not exist.")
-        return
-    endtry
-    if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
-       return
-    endif
-    call nerdtree#chRoot(g:NERDTreeDirNode.New(cwd))
-endfunction
-
-" FUNCTION: nerdtree#clearBookmarks(bookmarks) {{{2
-function! nerdtree#clearBookmarks(bookmarks)
-    if a:bookmarks ==# ''
-        let currentNode = g:NERDTreeFileNode.GetSelected()
-        if currentNode != {}
-            call currentNode.clearBookmarks()
-        endif
-    else
-        for name in split(a:bookmarks, ' ')
-            let bookmark = g:NERDTreeBookmark.BookmarkFor(name)
-            call bookmark.delete()
-        endfor
-    endif
-    call nerdtree#renderView()
-endfunction
-
-" FUNCTION: s:closeChildren(node) {{{2
-" closes all childnodes of the current node
-function! s:closeChildren(node)
-    call a:node.closeChildren()
-    call nerdtree#renderView()
-    call a:node.putCursorHere(0, 0)
-endfunction
-
-" FUNCTION: s:closeCurrentDir(node) {{{2
-" closes the parent dir of the current node
-function! s:closeCurrentDir(node)
-    let parent = a:node.parent
-    if parent ==# {} || parent.isRoot()
-        call nerdtree#echo("cannot close tree root")
-    else
-        while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
-            if parent.parent.getVisibleChildCount() == 1
-                call parent.close()
-                let parent = parent.parent
-            else
-                break
-            endif
-        endwhile
-        call parent.close()
-        call nerdtree#renderView()
-        call parent.putCursorHere(0, 0)
-    endif
-endfunction
-
-" FUNCTION: s:closeTreeWindow() {{{2
-" close the tree window
-function! s:closeTreeWindow()
-    if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1
-        exec "buffer " . b:NERDTreePreviousBuf
-    else
-        if winnr("$") > 1
-            call nerdtree#closeTree()
-        else
-            call nerdtree#echo("Cannot close last window")
-        endif
-    endif
-endfunction
-
-" FUNCTION: s:deleteBookmark(bm) {{{2
-" if the cursor is on a bookmark, prompt to delete
-function! s:deleteBookmark(bm)
-    echo  "Are you sure you wish to delete the bookmark:\n\"" . a:bm.name . "\" (yN):"
-
-    if  nr2char(getchar()) ==# 'y'
-        try
-            call a:bm.delete()
-            call nerdtree#renderView()
-            redraw
-        catch /^NERDTree/
-            call nerdtree#echoWarning("Could not remove bookmark")
-        endtry
-    else
-        call nerdtree#echo("delete aborted" )
-    endif
-
-endfunction
-
-" FUNCTION: s:displayHelp() {{{2
-" toggles the help display
-function! s:displayHelp()
-    let b:treeShowHelp = b:treeShowHelp ? 0 : 1
-    call nerdtree#renderView()
-    call nerdtree#centerView()
-endfunction
-
-"FUNCTION: s:handleLeftClick() {{{2
-"Checks if the click should open the current node
-function! s:handleLeftClick()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    if currentNode != {}
-
-        "the dir arrows are multibyte chars, and vim's string functions only
-        "deal with single bytes - so split the line up with the hack below and
-        "take the line substring manually
-        let line = split(getline(line(".")), '\zs')
-        let startToCur = ""
-        for i in range(0,len(line)-1)
-            let startToCur .= line[i]
-        endfor
-
-        if currentNode.path.isDirectory
-            if startToCur =~# nerdtree#treeMarkupReg() && startToCur =~# '[+~▾▸] \?$'
-                call currentNode.activate()
-                return
-            endif
-        endif
-
-        if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3
-            let char = strpart(startToCur, strlen(startToCur)-1, 1)
-            if char !~# nerdtree#treeMarkupReg()
-                if currentNode.path.isDirectory
-                    call currentNode.activate()
-                else
-                    call currentNode.activate({'reuse': 1, 'where': 'p'})
-                endif
-                return
-            endif
-        endif
-    endif
-endfunction
-
-" FUNCTION: s:handleMiddleMouse() {{{2
-function! s:handleMiddleMouse()
-    let curNode = g:NERDTreeFileNode.GetSelected()
-    if curNode ==# {}
-        call nerdtree#echo("Put the cursor on a node first" )
-        return
-    endif
-
-    if curNode.path.isDirectory
-        call nerdtree#openExplorer(curNode)
-    else
-        call curNode.open({'where': 'h'})
-    endif
-endfunction
-
-" FUNCTION: s:jumpToFirstChild() {{{2
-" wrapper for the jump to child method
-function! s:jumpToFirstChild(node)
-    call nerdtree#jumpToChild(a:node, 0)
-endfunction
-
-" FUNCTION: s:jumpToLastChild() {{{2
-" wrapper for the jump to child method
-function! s:jumpToLastChild(node)
-    call nerdtree#jumpToChild(a:node, 1)
-endfunction
-
-" FUNCTION: s:jumpToParent(node) {{{2
-" moves the cursor to the parent of the current node
-function! s:jumpToParent(node)
-    if !empty(a:node.parent)
-        call a:node.parent.putCursorHere(1, 0)
-        call nerdtree#centerView()
-    else
-        call nerdtree#echo("cannot jump to parent")
-    endif
-endfunction
-
-" FUNCTION: s:jumpToRoot() {{{2
-" moves the cursor to the root node
-function! s:jumpToRoot()
-    call b:NERDTreeRoot.putCursorHere(1, 0)
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: s:jumpToNextSibling(node) {{{2
-function! s:jumpToNextSibling(node)
-    call nerdtree#jumpToSibling(a:node, 1)
-endfunction
-
-" FUNCTION: s:jumpToPrevSibling(node) {{{2
-function! s:jumpToPrevSibling(node)
-    call nerdtree#jumpToSibling(a:node, 0)
-endfunction
-
-" FUNCTION: nerdtree#openBookmark(name) {{{2
-" put the cursor on the given bookmark and, if its a file, open it
-function! nerdtree#openBookmark(name)
-    try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
-        call targetNode.putCursorHere(0, 1)
-        redraw!
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-        call nerdtree#echo("note - target node is not cached")
-        let bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
-        let targetNode = g:NERDTreeFileNode.New(bookmark.path)
-    endtry
-    if targetNode.path.isDirectory
-        call targetNode.openExplorer()
-    else
-        call targetNode.open({'where': 'p'})
-    endif
-endfunction
-
-" FUNCTION: s:openHSplit(target) {{{2
-function! s:openHSplit(target)
-    call a:target.activate({'where': 'h'})
-endfunction
-
-" FUNCTION: s:openVSplit(target) {{{2
-function! s:openVSplit(target)
-    call a:target.activate({'where': 'v'})
-endfunction
-
-" FUNCTION: s:openExplorer(node) {{{2
-function! s:openExplorer(node)
-    call a:node.openExplorer()
-endfunction
-
-" FUNCTION: s:openInNewTab(target) {{{2
-function! s:openInNewTab(target)
-    call a:target.activate({'where': 't'})
-endfunction
-
-" FUNCTION: s:openInNewTabSilent(target) {{{2
-function! s:openInNewTabSilent(target)
-    call a:target.activate({'where': 't', 'stay': 1})
-endfunction
-
-" FUNCTION: s:openNodeRecursively(node) {{{2
-function! s:openNodeRecursively(node)
-    call nerdtree#echo("Recursively opening node. Please wait...")
-    call a:node.openRecursively()
-    call nerdtree#renderView()
-    redraw
-    call nerdtree#echo("Recursively opening node. Please wait... DONE")
-endfunction
-
-"FUNCTION: s:previewNodeCurrent(node) {{{2
-function! s:previewNodeCurrent(node)
-    call a:node.open({'stay': 1, 'where': 'p', 'keepopen': 1})
-endfunction
-
-"FUNCTION: s:previewNodeHSplit(node) {{{2
-function! s:previewNodeHSplit(node)
-    call a:node.open({'stay': 1, 'where': 'h', 'keepopen': 1})
-endfunction
-
-"FUNCTION: s:previewNodeVSplit(node) {{{2
-function! s:previewNodeVSplit(node)
-    call a:node.open({'stay': 1, 'where': 'v', 'keepopen': 1})
-endfunction
-
-" FUNCTION: nerdtree#revealBookmark(name) {{{2
-" put the cursor on the node associate with the given name
-function! nerdtree#revealBookmark(name)
-    try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
-        call targetNode.putCursorHere(0, 1)
-    catch /^NERDTree.BookmarkNotFoundError/
-        call nerdtree#echo("Bookmark isnt cached under the current root")
-    endtry
-endfunction
-
-" FUNCTION: s:refreshRoot() {{{2
-" Reloads the current root. All nodes below this will be lost and the root dir
-" will be reloaded.
-function! s:refreshRoot()
-    call nerdtree#echo("Refreshing the root node. This could take a while...")
-    call b:NERDTreeRoot.refresh()
-    call nerdtree#renderView()
-    redraw
-    call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
-endfunction
-
-" FUNCTION: s:refreshCurrent(node) {{{2
-" refreshes the root for the current node
-function! s:refreshCurrent(node)
-    let node = a:node
-    if !node.path.isDirectory
-        let node = node.parent
-    endif
-
-    call nerdtree#echo("Refreshing node. This could take a while...")
-    call node.refresh()
-    call nerdtree#renderView()
-    redraw
-    call nerdtree#echo("Refreshing node. This could take a while... DONE")
-endfunction
-
-" FUNCTION: s:showMenu(node) {{{2
-function! s:showMenu(node)
-    let mc = g:NERDTreeMenuController.New(g:NERDTreeMenuItem.AllEnabled())
-    call mc.showMenu()
-endfunction
-
-" FUNCTION: s:toggleIgnoreFilter() {{{2
-" toggles the use of the NERDTreeIgnore option
-function! s:toggleIgnoreFilter()
-    let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled
-    call nerdtree#renderViewSavingPosition()
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: s:toggleShowBookmarks() {{{2
-" toggles the display of bookmarks
-function! s:toggleShowBookmarks()
-    let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
-    if b:NERDTreeShowBookmarks
-        call nerdtree#renderView()
-        call nerdtree#putCursorOnBookmarkTable()
-    else
-        call nerdtree#renderViewSavingPosition()
-    endif
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: s:toggleShowFiles() {{{2
-" toggles the display of hidden files
-function! s:toggleShowFiles()
-    let b:NERDTreeShowFiles = !b:NERDTreeShowFiles
-    call nerdtree#renderViewSavingPosition()
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: s:toggleShowHidden() {{{2
-" toggles the display of hidden files
-function! s:toggleShowHidden()
-    let b:NERDTreeShowHidden = !b:NERDTreeShowHidden
-    call nerdtree#renderViewSavingPosition()
-    call nerdtree#centerView()
-endfunction
-
-" FUNCTION: s:toggleZoom() {{{2
-" zoom (maximize/minimize) the NERDTree window
-function! s:toggleZoom()
-    if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed
-        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
-        exec "silent vertical resize ". size
-        let b:NERDTreeZoomed = 0
-    else
-        exec "vertical resize"
-        let b:NERDTreeZoomed = 1
-    endif
-endfunction
-
-" FUNCTION: s:upDirCurrentRootOpen() {{{2
-function! s:upDirCurrentRootOpen()
-    call nerdtree#upDir(1)
-endfunction
-
-" FUNCTION: s:upDirCurrentRootClosed() {{{2
-function! s:upDirCurrentRootClosed()
-    call nerdtree#upDir(0)
-endfunction
-
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
new file mode 100644
index 00000000..8607389d
--- /dev/null
+++ b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
@@ -0,0 +1,644 @@
+if exists("g:loaded_nerdtree_ui_glue_autoload")
+    finish
+endif
+let g:loaded_nerdtree_ui_glue_autoload = 1
+
+" FUNCTION: nerdtree#ui_glue#createDefaultBindings() {{{1
+function! nerdtree#ui_glue#createDefaultBindings()
+    let s = '<SNR>' . s:SID() . '_'
+
+    call NERDTreeAddKeyMap({ 'key': '<MiddleRelease>', 'scope': "all", 'callback': s."handleMiddleMouse" })
+    call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': "all", 'callback': s."handleLeftClick" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "DirNode", 'callback': s."activateDirNode" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "FileNode", 'callback': s."activateFileNode" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "Bookmark", 'callback': s."activateBookmark" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "all", 'callback': s."activateAll" })
+
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "DirNode", 'callback': s."activateDirNode" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "FileNode", 'callback': s."activateFileNode" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "Bookmark", 'callback': s."activateBookmark" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "all", 'callback': s."activateAll" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Node", 'callback': s."openHSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Node", 'callback': s."openVSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Bookmark", 'callback': s."openHSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Bookmark", 'callback': s."openVSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Node", 'callback': s."previewNodeCurrent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Node", 'callback': s."previewNodeVSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Node", 'callback': s."previewNodeHSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Bookmark", 'callback': s."previewNodeCurrent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Bookmark", 'callback': s."previewNodeVSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Bookmark", 'callback': s."previewNodeHSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': "DirNode", 'callback': s."openNodeRecursively" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': "all", 'callback': s."upDirCurrentRootClosed" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': "all", 'callback': s."upDirCurrentRootOpen" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': "Node", 'callback': s."chRoot" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': "Node", 'callback': s."chCwd" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#ui_glue#chRootCwd" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': "all", 'callback': s."displayHelp" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': "all", 'callback': s."toggleZoom" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': "all", 'callback': s."toggleShowHidden" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': "all", 'callback': s."toggleIgnoreFilter" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': "all", 'callback': s."toggleShowFiles" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': "all", 'callback': s."toggleShowBookmarks" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': "Node", 'callback': s."closeCurrentDir" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': "DirNode", 'callback': s."closeChildren" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': "Node", 'callback': s."showMenu" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': "Node", 'callback': s."jumpToParent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': "Node", 'callback': s."jumpToFirstChild" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': "Node", 'callback': s."jumpToLastChild" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': "all", 'callback': s."jumpToRoot" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': "Node", 'callback': s."jumpToNextSibling" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': "Node", 'callback': s."jumpToPrevSibling" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Node", 'callback': s."openInNewTab" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Node", 'callback': s."openInNewTabSilent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Bookmark", 'callback': s."openInNewTab" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Bookmark", 'callback': s."openInNewTabSilent" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "DirNode", 'callback': s."openExplorer" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': "Bookmark", 'callback': s."deleteBookmark" })
+endfunction
+
+
+"SECTION: Interface bindings {{{1
+"============================================================
+
+"FUNCTION: s:activateAll() {{{1
+"handle the user activating the updir line
+function! s:activateAll()
+    if getline(".") ==# nerdtree#treeUpDirLine()
+        return nerdtree#ui_glue#upDir(0)
+    endif
+endfunction
+
+"FUNCTION: s:activateDirNode() {{{1
+"handle the user activating a tree node
+function! s:activateDirNode(node)
+    call a:node.activate({'reuse': 1})
+endfunction
+
+"FUNCTION: s:activateFileNode() {{{1
+"handle the user activating a tree node
+function! s:activateFileNode(node)
+    call a:node.activate({'reuse': 1, 'where': 'p'})
+endfunction
+
+"FUNCTION: s:activateBookmark() {{{1
+"handle the user activating a bookmark
+function! s:activateBookmark(bm)
+    call a:bm.activate(!a:bm.path.isDirectory ? {'where': 'p'} : {})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
+" Associate the current node with the given name
+function! nerdtree#ui_glue#bookmarkNode(...)
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode != {}
+        let name = a:1
+        if empty(name)
+            let name = currentNode.path.getLastPathComponent(0)
+        endif
+        try
+            call currentNode.bookmark(name)
+            call b:NERDTree.render()
+        catch /^NERDTree.IllegalBookmarkNameError/
+            call nerdtree#echo("bookmark names must not contain spaces")
+        endtry
+    else
+        call nerdtree#echo("select a node first")
+    endif
+endfunction
+
+" FUNCTION: s:chCwd(node) {{{1
+function! s:chCwd(node)
+    try
+        call a:node.path.changeToDir()
+    catch /^NERDTree.PathChangeError/
+        call nerdtree#echoWarning("could not change cwd")
+    endtry
+endfunction
+
+" FUNCTION: s:chRoot(node) {{{1
+" changes the current root to the selected one
+function! s:chRoot(node)
+    call a:node.makeRoot()
+    call b:NERDTree.render()
+    call b:NERDTreeRoot.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
+" changes the current root to CWD
+function! nerdtree#ui_glue#chRootCwd()
+    try
+        let cwd = g:NERDTreePath.New(getcwd())
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo("current directory does not exist.")
+        return
+    endtry
+    if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
+       return
+    endif
+    call s:chRoot(g:NERDTreeDirNode.New(cwd))
+endfunction
+
+" FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
+function! nerdtree#ui_glue#clearBookmarks(bookmarks)
+    if a:bookmarks ==# ''
+        let currentNode = g:NERDTreeFileNode.GetSelected()
+        if currentNode != {}
+            call currentNode.clearBookmarks()
+        endif
+    else
+        for name in split(a:bookmarks, ' ')
+            let bookmark = g:NERDTreeBookmark.BookmarkFor(name)
+            call bookmark.delete()
+        endfor
+    endif
+    call b:NERDTree.render()
+endfunction
+
+" FUNCTION: s:closeChildren(node) {{{1
+" closes all childnodes of the current node
+function! s:closeChildren(node)
+    call a:node.closeChildren()
+    call b:NERDTree.render()
+    call a:node.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:closeCurrentDir(node) {{{1
+" closes the parent dir of the current node
+function! s:closeCurrentDir(node)
+    let parent = a:node.parent
+    if parent ==# {} || parent.isRoot()
+        call nerdtree#echo("cannot close tree root")
+    else
+        while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
+            if parent.parent.getVisibleChildCount() == 1
+                call parent.close()
+                let parent = parent.parent
+            else
+                break
+            endif
+        endwhile
+        call parent.close()
+        call b:NERDTree.render()
+        call parent.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:closeTreeWindow() {{{1
+" close the tree window
+function! s:closeTreeWindow()
+    if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1
+        exec "buffer " . b:NERDTreePreviousBuf
+    else
+        if winnr("$") > 1
+            call nerdtree#closeTree()
+        else
+            call nerdtree#echo("Cannot close last window")
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:deleteBookmark(bm) {{{1
+" if the cursor is on a bookmark, prompt to delete
+function! s:deleteBookmark(bm)
+    echo  "Are you sure you wish to delete the bookmark:\n\"" . a:bm.name . "\" (yN):"
+
+    if  nr2char(getchar()) ==# 'y'
+        try
+            call a:bm.delete()
+            call b:NERDTree.render()
+            redraw
+        catch /^NERDTree/
+            call nerdtree#echoWarning("Could not remove bookmark")
+        endtry
+    else
+        call nerdtree#echo("delete aborted" )
+    endif
+
+endfunction
+
+" FUNCTION: s:displayHelp() {{{1
+" toggles the help display
+function! s:displayHelp()
+    let b:treeShowHelp = b:treeShowHelp ? 0 : 1
+    call b:NERDTree.render()
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:findAndRevealPath() {{{1
+function! s:findAndRevealPath()
+    try
+        let p = g:NERDTreePath.New(expand("%:p"))
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo("no file for the current buffer")
+        return
+    endtry
+
+    if p.isUnixHiddenPath()
+        let showhidden=g:NERDTreeShowHidden
+        let g:NERDTreeShowHidden = 1
+    endif
+
+    if !g:NERDTree.ExistsForTab()
+        try
+            let cwd = g:NERDTreePath.New(getcwd())
+        catch /^NERDTree.InvalidArgumentsError/
+            call nerdtree#echo("current directory does not exist.")
+            let cwd = p.getParent()
+        endtry
+
+        if p.isUnder(cwd)
+            call g:NERDTreeCreator.CreatePrimary(cwd.str())
+        else
+            call g:NERDTreeCreator.CreatePrimary(p.getParent().str())
+        endif
+    else
+        if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
+            if !nerdtree#isTreeOpen()
+                call g:NERDTreeCreator.TogglePrimary('')
+            else
+                call nerdtree#putCursorInTreeWin()
+            endif
+            let b:NERDTreeShowHidden = g:NERDTreeShowHidden
+            call s:chRoot(g:NERDTreeDirNode.New(p.getParent()))
+        else
+            if !nerdtree#isTreeOpen()
+                call g:NERDTreeCreator.TogglePrimary("")
+            endif
+        endif
+    endif
+    call nerdtree#putCursorInTreeWin()
+    call b:NERDTreeRoot.reveal(p)
+
+    if p.isUnixHiddenFile()
+        let g:NERDTreeShowHidden = showhidden
+    endif
+endfunction
+
+"FUNCTION: s:handleLeftClick() {{{1
+"Checks if the click should open the current node
+function! s:handleLeftClick()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode != {}
+
+        "the dir arrows are multibyte chars, and vim's string functions only
+        "deal with single bytes - so split the line up with the hack below and
+        "take the line substring manually
+        let line = split(getline(line(".")), '\zs')
+        let startToCur = ""
+        for i in range(0,len(line)-1)
+            let startToCur .= line[i]
+        endfor
+
+        if currentNode.path.isDirectory
+            if startToCur =~# nerdtree#treeMarkupReg() && startToCur =~# '[+~▾▸] \?$'
+                call currentNode.activate()
+                return
+            endif
+        endif
+
+        if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3
+            let char = strpart(startToCur, strlen(startToCur)-1, 1)
+            if char !~# nerdtree#treeMarkupReg()
+                if currentNode.path.isDirectory
+                    call currentNode.activate()
+                else
+                    call currentNode.activate({'reuse': 1, 'where': 'p'})
+                endif
+                return
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:handleMiddleMouse() {{{1
+function! s:handleMiddleMouse()
+    let curNode = g:NERDTreeFileNode.GetSelected()
+    if curNode ==# {}
+        call nerdtree#echo("Put the cursor on a node first" )
+        return
+    endif
+
+    if curNode.path.isDirectory
+        call nerdtree#openExplorer(curNode)
+    else
+        call curNode.open({'where': 'h'})
+    endif
+endfunction
+
+" FUNCTION: s:jumpToChild(direction) {{{2
+" Args:
+" direction: 0 if going to first child, 1 if going to last
+function! s:jumpToChild(currentNode, direction)
+    if a:currentNode.isRoot()
+        return nerdtree#echo("cannot jump to " . (a:direction ? "last" : "first") .  " child")
+    end
+    let dirNode = a:currentNode.parent
+    let childNodes = dirNode.getVisibleChildren()
+
+    let targetNode = childNodes[0]
+    if a:direction
+        let targetNode = childNodes[len(childNodes) - 1]
+    endif
+
+    if targetNode.equals(a:currentNode)
+        let siblingDir = a:currentNode.parent.findOpenDirSiblingWithVisibleChildren(a:direction)
+        if siblingDir != {}
+            let indx = a:direction ? siblingDir.getVisibleChildCount()-1 : 0
+            let targetNode = siblingDir.getChildByIndex(indx, 1)
+        endif
+    endif
+
+    call targetNode.putCursorHere(1, 0)
+
+    call b:NERDTree.ui.centerView()
+endfunction
+
+
+" FUNCTION: nerdtree#ui_glue#invokeKeyMap(key) {{{1
+"this is needed since I cant figure out how to invoke dict functions from a
+"key map
+function! nerdtree#ui_glue#invokeKeyMap(key)
+    call g:NERDTreeKeyMap.Invoke(a:key)
+endfunction
+
+" FUNCTION: s:jumpToFirstChild() {{{1
+" wrapper for the jump to child method
+function! s:jumpToFirstChild(node)
+    call s:jumpToChild(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToLastChild() {{{1
+" wrapper for the jump to child method
+function! s:jumpToLastChild(node)
+    call s:jumpToChild(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToParent(node) {{{1
+" moves the cursor to the parent of the current node
+function! s:jumpToParent(node)
+    if !empty(a:node.parent)
+        call a:node.parent.putCursorHere(1, 0)
+        call b:NERDTree.ui.centerView()
+    else
+        call nerdtree#echo("cannot jump to parent")
+    endif
+endfunction
+
+" FUNCTION: s:jumpToRoot() {{{1
+" moves the cursor to the root node
+function! s:jumpToRoot()
+    call b:NERDTreeRoot.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:jumpToNextSibling(node) {{{1
+function! s:jumpToNextSibling(node)
+    call s:jumpToSibling(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToPrevSibling(node) {{{1
+function! s:jumpToPrevSibling(node)
+    call s:jumpToSibling(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToSibling(currentNode, forward) {{{2
+" moves the cursor to the sibling of the current node in the given direction
+"
+" Args:
+" forward: 1 if the cursor should move to the next sibling, 0 if it should
+" move back to the previous sibling
+function! s:jumpToSibling(currentNode, forward)
+    let sibling = a:currentNode.findSibling(a:forward)
+
+    if !empty(sibling)
+        call sibling.putCursorHere(1, 0)
+        call b:NERDTree.ui.centerView()
+    endif
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
+" put the cursor on the given bookmark and, if its a file, open it
+function! nerdtree#ui_glue#openBookmark(name)
+    try
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
+        call targetNode.putCursorHere(0, 1)
+        redraw!
+    catch /^NERDTree.BookmarkedNodeNotFoundError/
+        call nerdtree#echo("note - target node is not cached")
+        let bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
+        let targetNode = g:NERDTreeFileNode.New(bookmark.path)
+    endtry
+    if targetNode.path.isDirectory
+        call targetNode.openExplorer()
+    else
+        call targetNode.open({'where': 'p'})
+    endif
+endfunction
+
+" FUNCTION: s:openHSplit(target) {{{1
+function! s:openHSplit(target)
+    call a:target.activate({'where': 'h'})
+endfunction
+
+" FUNCTION: s:openVSplit(target) {{{1
+function! s:openVSplit(target)
+    call a:target.activate({'where': 'v'})
+endfunction
+
+" FUNCTION: s:openExplorer(node) {{{1
+function! s:openExplorer(node)
+    call a:node.openExplorer()
+endfunction
+
+" FUNCTION: s:openInNewTab(target) {{{1
+function! s:openInNewTab(target)
+    call a:target.activate({'where': 't'})
+endfunction
+
+" FUNCTION: s:openInNewTabSilent(target) {{{1
+function! s:openInNewTabSilent(target)
+    call a:target.activate({'where': 't', 'stay': 1})
+endfunction
+
+" FUNCTION: s:openNodeRecursively(node) {{{1
+function! s:openNodeRecursively(node)
+    call nerdtree#echo("Recursively opening node. Please wait...")
+    call a:node.openRecursively()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Recursively opening node. Please wait... DONE")
+endfunction
+
+"FUNCTION: s:previewNodeCurrent(node) {{{1
+function! s:previewNodeCurrent(node)
+    call a:node.open({'stay': 1, 'where': 'p', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeHSplit(node) {{{1
+function! s:previewNodeHSplit(node)
+    call a:node.open({'stay': 1, 'where': 'h', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeVSplit(node) {{{1
+function! s:previewNodeVSplit(node)
+    call a:node.open({'stay': 1, 'where': 'v', 'keepopen': 1})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#revealBookmark(name) {{{1
+" put the cursor on the node associate with the given name
+function! nerdtree#ui_glue#revealBookmark(name)
+    try
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
+        call targetNode.putCursorHere(0, 1)
+    catch /^NERDTree.BookmarkNotFoundError/
+        call nerdtree#echo("Bookmark isnt cached under the current root")
+    endtry
+endfunction
+
+" FUNCTION: s:refreshRoot() {{{1
+" Reloads the current root. All nodes below this will be lost and the root dir
+" will be reloaded.
+function! s:refreshRoot()
+    call nerdtree#echo("Refreshing the root node. This could take a while...")
+    call b:NERDTreeRoot.refresh()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
+endfunction
+
+" FUNCTION: s:refreshCurrent(node) {{{1
+" refreshes the root for the current node
+function! s:refreshCurrent(node)
+    let node = a:node
+    if !node.path.isDirectory
+        let node = node.parent
+    endif
+
+    call nerdtree#echo("Refreshing node. This could take a while...")
+    call node.refresh()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Refreshing node. This could take a while... DONE")
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
+function! nerdtree#ui_glue#setupCommands()
+    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreatePrimary('<args>')
+    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.TogglePrimary('<args>')
+    command! -n=0 -bar NERDTreeClose :call nerdtree#closeTreeIfOpen()
+    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
+    command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
+    command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
+    command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
+    command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
+endfunction
+
+" Function: s:SID()   {{{1
+function s:SID()
+    if !exists("s:sid")
+        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+    endif
+    return s:sid
+endfun
+
+" FUNCTION: s:showMenu(node) {{{1
+function! s:showMenu(node)
+    let mc = g:NERDTreeMenuController.New(g:NERDTreeMenuItem.AllEnabled())
+    call mc.showMenu()
+endfunction
+
+" FUNCTION: s:toggleIgnoreFilter() {{{1
+function! s:toggleIgnoreFilter()
+    call b:NERDTree.ui.toggleIgnoreFilter()
+endfunction
+
+" FUNCTION: s:toggleShowBookmarks() {{{1
+function! s:toggleShowBookmarks()
+    call b:NERDTree.ui.toggleShowBookmarks()
+endfunction
+
+" FUNCTION: s:toggleShowFiles() {{{1
+function! s:toggleShowFiles()
+    call b:NERDTree.ui.toggleShowFiles()
+endfunction
+
+" FUNCTION: s:toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:toggleShowHidden()
+    call b:NERDTree.ui.toggleShowHidden()
+endfunction
+
+" FUNCTION: s:toggleZoom() {{{1
+function! s:toggleZoom()
+    call b:NERDTree.ui.toggleZoom()
+endfunction
+
+"FUNCTION: nerdtree#ui_glue#upDir(keepState) {{{1
+"moves the tree up a level
+"
+"Args:
+"keepState: 1 if the current root should be left open when the tree is
+"re-rendered
+function! nerdtree#ui_glue#upDir(keepState)
+    let cwd = b:NERDTreeRoot.path.str({'format': 'UI'})
+    if cwd ==# "/" || cwd =~# '^[^/]..$'
+        call nerdtree#echo("already at top dir")
+    else
+        if !a:keepState
+            call b:NERDTreeRoot.close()
+        endif
+
+        let oldRoot = b:NERDTreeRoot
+
+        if empty(b:NERDTreeRoot.parent)
+            let path = b:NERDTreeRoot.path.getParent()
+            let newRoot = g:NERDTreeDirNode.New(path)
+            call newRoot.open()
+            call newRoot.transplantChild(b:NERDTreeRoot)
+            let b:NERDTreeRoot = newRoot
+        else
+            let b:NERDTreeRoot = b:NERDTreeRoot.parent
+        endif
+
+        if g:NERDTreeChDirMode ==# 2
+            call b:NERDTreeRoot.path.changeToDir()
+        endif
+
+        call b:NERDTree.render()
+        call oldRoot.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:upDirCurrentRootOpen() {{{1
+function! s:upDirCurrentRootOpen()
+    call nerdtree#ui_glue#upDir(1)
+endfunction
+
+" FUNCTION: s:upDirCurrentRootClosed() {{{1
+function! s:upDirCurrentRootClosed()
+    call nerdtree#ui_glue#upDir(0)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/nerdtree/doc/NERD_tree.txt b/sources_non_forked/nerdtree/doc/NERD_tree.txt
index 4ddc2507..79b649ff 100644
--- a/sources_non_forked/nerdtree/doc/NERD_tree.txt
+++ b/sources_non_forked/nerdtree/doc/NERD_tree.txt
@@ -1060,6 +1060,9 @@ NERDTreeAddKeyMap({options})                             *NERDTreeAddKeyMap()*
     "callback" - the function the new mapping will be bound to
     "quickhelpText" - the text that will appear in the quickhelp (see
     |NERDTree-?|)
+    "override" - if 1 then this new mapping will override whatever previous
+    mapping was defined for the key/scope combo. Useful for overriding the
+    default mappings.
 
     Additionally, a "scope" argument may be supplied. This constrains the
     mapping so that it is only activated if the cursor is on a certain object.
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
index 84a6099f..6de9be4c 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
@@ -275,7 +275,7 @@ function! s:Bookmark.toRoot()
             let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path)
         endtry
         call targetNode.makeRoot()
-        call nerdtree#renderView()
+        call b:NERDTree.render()
         call targetNode.putCursorHere(0, 0)
     endif
 endfunction
@@ -293,7 +293,7 @@ function! s:Bookmark.validate()
         return 1
     else
         call s:Bookmark.CacheBookmarks(1)
-        call nerdtree#renderView()
+        call b:NERDTree.render()
         call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.")
         return 0
     endif
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
index 19c51ffb..86f951ae 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
@@ -7,18 +7,18 @@ let g:NERDTreeCreator = s:Creator
 
 "FUNCTION: s:Creator._bindMappings() {{{1
 function! s:Creator._bindMappings()
-    "make <cr> do the same as the default 'o' mapping
-    exec "nnoremap <silent> <buffer> <cr> :call nerdtree#invokeKeyMap('". g:NERDTreeMapActivateNode ."')<cr>"
+    "make <cr> do the same as the activate node mapping
+    nnoremap <silent> <buffer> <cr> :call nerdtree#ui_glue#invokeKeyMap(g:NERDTreeMapActivateNode)<cr>
 
     call g:NERDTreeKeyMap.BindAll()
 
-    command! -buffer -nargs=? Bookmark :call nerdtree#bookmarkNode('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#revealBookmark('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call nerdtree#openBookmark('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#clearBookmarks('<args>')
+    command! -buffer -nargs=? Bookmark :call nerdtree#ui_glue#bookmarkNode('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#ui_glue#revealBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call nerdtree#ui_glue#openBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#ui_glue#clearBookmarks('<args>')
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>')
-    command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call nerdtree#renderView()
-    command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call nerdtree#renderView()
+    command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
+    command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
     command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
 endfunction
 
@@ -49,26 +49,23 @@ function! s:Creator.createPrimary(name)
         call path.changeToDir()
     endif
 
-    if nerdtree#treeExistsForTab()
+    if g:NERDTree.ExistsForTab()
         if nerdtree#isTreeOpen()
             call nerdtree#closeTree()
         endif
         unlet t:NERDTreeBufName
     endif
 
-    let newRoot = g:NERDTreeDirNode.New(path)
-    call newRoot.open()
-
     call self._createTreeWin()
+    call self._createNERDTree(path)
+    let b:NERDTreeType = "primary"
     let b:treeShowHelp = 0
     let b:NERDTreeIgnoreEnabled = 1
     let b:NERDTreeShowFiles = g:NERDTreeShowFiles
     let b:NERDTreeShowHidden = g:NERDTreeShowHidden
     let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
-    let b:NERDTreeRoot = newRoot
-    let b:NERDTreeType = "primary"
 
-    call nerdtree#renderView()
+    call b:NERDTree.render()
     call b:NERDTreeRoot.putCursorHere(0, 0)
 
     call self._broadcastInitEvent()
@@ -99,18 +96,26 @@ function! s:Creator.createSecondary(dir)
     exec "silent edit " . self._nextBufferName()
 
     let b:NERDTreePreviousBuf = bufnr(previousBuf)
-
-    let b:NERDTreeRoot = g:NERDTreeDirNode.New(path)
-    call b:NERDTreeRoot.open()
-
+    call self._createNERDTree(path)
     call self._setCommonBufOptions()
     let b:NERDTreeType = "secondary"
 
-    call nerdtree#renderView()
+    call b:NERDTree.render()
 
     call self._broadcastInitEvent()
 endfunction
 
+" FUNCTION: s:Creator._createNERDTree(path) {{{1
+function! s:Creator._createNERDTree(path)
+    let b:NERDTree = g:NERDTree.New(a:path)
+    "TODO: This is kept for compatability only since many things use
+    "b:NERDTreeRoot instead of the new NERDTree.root
+    "Remove this one day
+    let b:NERDTreeRoot = b:NERDTree.root
+
+    call b:NERDTree.root.open()
+endfunction
+
 " FUNCTION: s:Creator.CreateMirror() {{{1
 function! s:Creator.CreateMirror()
     let creator = s:Creator.New()
@@ -122,12 +127,12 @@ function! s:Creator.createMirror()
     "get the names off all the nerd tree buffers
     let treeBufNames = []
     for i in range(1, tabpagenr("$"))
-        let nextName = nerdtree#tabpagevar(i, 'NERDTreeBufName')
+        let nextName = self._tabpagevar(i, 'NERDTreeBufName')
         if nextName != -1 && (!exists("t:NERDTreeBufName") || nextName != t:NERDTreeBufName)
             call add(treeBufNames, nextName)
         endif
     endfor
-    let treeBufNames = nerdtree#unique(treeBufNames)
+    let treeBufNames = self._uniq(treeBufNames)
 
     "map the option names (that the user will be prompted with) to the nerd
     "tree buffer names
@@ -158,7 +163,7 @@ function! s:Creator.createMirror()
         return
     endif
 
-    if nerdtree#treeExistsForTab() && nerdtree#isTreeOpen()
+    if g:NERDTree.ExistsForTab() && nerdtree#isTreeOpen()
         call nerdtree#closeTree()
     endif
 
@@ -166,7 +171,7 @@ function! s:Creator.createMirror()
     call self._createTreeWin()
     exec 'buffer ' .  bufferName
     if !&hidden
-        call nerdtree#renderView()
+        call b:NERDTree.render()
     endif
 endfunction
 
@@ -290,6 +295,24 @@ function! s:Creator._setupStatusline()
     endif
 endfunction
 
+" FUNCTION: s:Creator._tabpagevar(tabnr, var) {{{1
+function! s:Creator._tabpagevar(tabnr, var)
+    let currentTab = tabpagenr()
+    let old_ei = &ei
+    set ei=all
+
+    exec "tabnext " . a:tabnr
+    let v = -1
+    if exists('t:' . a:var)
+        exec 'let v = t:' . a:var
+    endif
+    exec "tabnext " . currentTab
+
+    let &ei = old_ei
+
+    return v
+endfunction
+
 "FUNCTION: s:Creator.TogglePrimary(dir) {{{1
 function! s:Creator.TogglePrimary(dir)
     let creator = s:Creator.New()
@@ -304,13 +327,13 @@ endfunction
 "dir: the full path for the root node (is only used if the NERD tree is being
 "initialized.
 function! s:Creator.togglePrimary(dir)
-    if nerdtree#treeExistsForTab()
+    if g:NERDTree.ExistsForTab()
         if !nerdtree#isTreeOpen()
             call self._createTreeWin()
             if !&hidden
-                call nerdtree#renderView()
+                call b:NERDTree.render()
             endif
-            call nerdtree#restoreScreenState()
+            call b:NERDTree.ui.restoreScreenState()
         else
             call nerdtree#closeTree()
         endif
@@ -319,4 +342,16 @@ function! s:Creator.togglePrimary(dir)
     endif
 endfunction
 
+" Function: s:Creator._uniq(list)   {{{1
+" returns a:list without duplicates
+function! s:Creator._uniq(list)
+  let uniqlist = []
+  for elem in a:list
+    if index(uniqlist, elem) ==# -1
+      let uniqlist += [elem]
+    endif
+  endfor
+  return uniqlist
+endfunction
+
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/event.vim b/sources_non_forked/nerdtree/lib/nerdtree/event.vim
new file mode 100644
index 00000000..964e8ff4
--- /dev/null
+++ b/sources_non_forked/nerdtree/lib/nerdtree/event.vim
@@ -0,0 +1,13 @@
+"CLASS: Event
+"============================================================
+let s:Event = {}
+let g:NERDTreeEvent = s:Event
+
+function! s:Event.New(nerdtree, subject, action, params) abort
+    let newObj = copy(self)
+    let newObj.nerdtree = a:nerdtree
+    let newObj.subject = a:subject
+    let newObj.action = a:action
+    let newObj.params = a:params
+    return newObj
+endfunction
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/flag_set.vim b/sources_non_forked/nerdtree/lib/nerdtree/flag_set.vim
new file mode 100644
index 00000000..9d8d3359
--- /dev/null
+++ b/sources_non_forked/nerdtree/lib/nerdtree/flag_set.vim
@@ -0,0 +1,56 @@
+"CLASS: FlagSet
+"============================================================
+let s:FlagSet = {}
+let g:NERDTreeFlagSet = s:FlagSet
+
+"FUNCTION: FlagSet.addFlag(scope, flag) {{{1
+function! s:FlagSet.addFlag(scope, flag)
+    let flags = self._flagsForScope(a:scope)
+    if index(flags, a:flag) == -1
+        call add(flags, a:flag)
+    end
+endfunction
+
+"FUNCTION: FlagSet.clearFlags(scope) {{{1
+function! s:FlagSet.clearFlags(scope)
+    let self._flags[a:scope] = []
+endfunction
+
+"FUNCTION: FlagSet._flagsForScope(scope) {{{1
+function! s:FlagSet._flagsForScope(scope)
+    if !has_key(self._flags, a:scope)
+        let self._flags[a:scope] = []
+    endif
+    return self._flags[a:scope]
+endfunction
+
+"FUNCTION: FlagSet.New() {{{1
+function! s:FlagSet.New()
+    let newObj = copy(self)
+    let newObj._flags = {}
+    return newObj
+endfunction
+
+"FUNCTION: FlagSet.removeFlag(scope, flag) {{{1
+function! s:FlagSet.removeFlag(scope, flag)
+    let flags = self._flagsForScope(a:scope)
+
+    let i = index(flags, a:flag)
+    if i >= 0
+        call remove(flags, i)
+    endif
+endfunction
+
+"FUNCTION: FlagSet.renderToString() {{{1
+function! s:FlagSet.renderToString()
+    let flagstring = ""
+    for i in values(self._flags)
+        let flagstring .= join(i)
+    endfor
+
+    if len(flagstring) == 0
+        return ""
+    endif
+
+    return '[' . flagstring . ']'
+endfunction
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim b/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
index 86457652..2411406e 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/key_map.vim
@@ -44,7 +44,7 @@ function! s:KeyMap.bind()
 
     let premap = self.key == "<LeftRelease>" ? " <LeftRelease>" : " "
 
-    exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#invokeKeyMap("'. keymapInvokeString .'")<cr>'
+    exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>'
 endfunction
 
 "FUNCTION: KeyMap.Remove(key, scope) {{{1
@@ -79,6 +79,16 @@ endfunction
 "If a keymap has the scope of "all" then it will be called if no other keymap
 "is found for a:key and the scope.
 function! s:KeyMap.Invoke(key)
+
+    "required because clicking the command window below another window still
+    "invokes the <LeftRelease> mapping - but changes the window cursor
+    "is in first
+    "
+    "TODO: remove this check when the vim bug is fixed
+    if !g:NERDTree.ExistsForBuf()
+        return {}
+    endif
+
     let node = g:NERDTreeFileNode.GetSelected()
     if !empty(node)
 
@@ -124,8 +134,14 @@ endfunction
 
 "FUNCTION: KeyMap.Create(options) {{{1
 function! s:KeyMap.Create(options)
-    let newKeyMap = copy(self)
     let opts = extend({'scope': 'all', 'quickhelpText': ''}, copy(a:options))
+
+    "dont override other mappings unless the 'override' option is given
+    if get(opts, 'override', 0) == 0 && !empty(s:KeyMap.FindFor(opts['key'], opts['scope']))
+        return
+    end
+
+    let newKeyMap = copy(self)
     let newKeyMap.key = opts['key']
     let newKeyMap.quickhelpText = opts['quickhelpText']
     let newKeyMap.callback = opts['callback']
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim b/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
new file mode 100644
index 00000000..a41490b7
--- /dev/null
+++ b/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
@@ -0,0 +1,39 @@
+"CLASS: NERDTree
+"============================================================
+let s:NERDTree = {}
+let g:NERDTree = s:NERDTree
+
+" Function: s:NERDTree.ExistsForBuffer()   {{{1
+" Returns 1 if a nerd tree root exists in the current buffer
+function! s:NERDTree.ExistsForBuf()
+    return exists("b:NERDTreeRoot")
+endfunction
+
+" Function: s:NERDTree.ExistsForTab()   {{{1
+" Returns 1 if a nerd tree root exists in the current tab
+function! s:NERDTree.ExistsForTab()
+    return exists("t:NERDTreeBufName")
+endfunction
+
+function! s:NERDTree.ForCurrentBuf()
+    if s:NERDTree.ExistsForBuf()
+        return b:NERDTree
+    else
+        return {}
+    endif
+endfunction
+
+function! s:NERDTree.New(path)
+    let newObj = copy(self)
+    let newObj.ui = g:NERDTreeUI.New(newObj)
+    let newObj.root = g:NERDTreeDirNode.New(a:path)
+
+    return newObj
+endfunction
+
+"FUNCTION: s:NERDTree.render() {{{1
+"A convenience function - since this is called often
+function! s:NERDTree.render()
+    call self.ui.render()
+endfunction
+
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
new file mode 100644
index 00000000..b445f8ad
--- /dev/null
+++ b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
@@ -0,0 +1,35 @@
+"CLASS: Notifier
+"============================================================
+let s:Notifier = {}
+
+function! s:Notifier.AddListener(event, funcname)
+    let listeners = s:Notifier.GetListenersForEvent(a:event)
+    if listeners == []
+        let listenersMap = s:Notifier.GetListenersMap()
+        let listenersMap[a:event] = listeners
+    endif
+    call add(listeners, a:funcname)
+endfunction
+
+function! s:Notifier.NotifyListeners(event, path, params)
+    let event = g:NERDTreeEvent.New(b:NERDTree, a:path, a:event, a:params)
+
+    for listener in s:Notifier.GetListenersForEvent(a:event)
+        call {listener}(event)
+    endfor
+endfunction
+
+function! s:Notifier.GetListenersMap()
+    if !exists("s:refreshListenersMap")
+        let s:refreshListenersMap = {}
+    endif
+    return s:refreshListenersMap
+endfunction
+
+function! s:Notifier.GetListenersForEvent(name)
+    let listenersMap = s:Notifier.GetListenersMap()
+    return get(listenersMap, a:name, [])
+endfunction
+
+let g:NERDTreePathNotifier = deepcopy(s:Notifier)
+
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/opener.vim b/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
index bcc0d4fc..845e55c4 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
@@ -3,6 +3,29 @@
 let s:Opener = {}
 let g:NERDTreeOpener = s:Opener
 
+"FUNCTION: s:Opener._bufInWindows(bnum){{{1
+"[[STOLEN FROM VTREEEXPLORER.VIM]]
+"Determine the number of windows open to this buffer number.
+"Care of Yegappan Lakshman.  Thanks!
+"
+"Args:
+"bnum: the subject buffers buffer number
+function! s:Opener._bufInWindows(bnum)
+    let cnt = 0
+    let winnum = 1
+    while 1
+        let bufnum = winbufnr(winnum)
+        if bufnum < 0
+            break
+        endif
+        if bufnum ==# a:bnum
+            let cnt = cnt + 1
+        endif
+        let winnum = winnum + 1
+    endwhile
+
+    return cnt
+endfunction
 "FUNCTION: Opener._checkToCloseTree(newtab) {{{1
 "Check the class options and global options (i.e. NERDTreeQuitOnOpen) to see
 "if the tree should be closed now.
@@ -21,6 +44,24 @@ function! s:Opener._checkToCloseTree(newtab)
     endif
 endfunction
 
+
+"FUNCTION: s:Opener._firstUsableWindow(){{{1
+"find the window number of the first normal window
+function! s:Opener._firstUsableWindow()
+    let i = 1
+    while i <= winnr("$")
+        let bnum = winbufnr(i)
+        if bnum != -1 && getbufvar(bnum, '&buftype') ==# ''
+                    \ && !getwinvar(i, '&previewwindow')
+                    \ && (!getbufvar(bnum, '&modified') || &hidden)
+            return i
+        endif
+
+        let i += 1
+    endwhile
+    return -1
+endfunction
+
 "FUNCTION: Opener._gotoTargetWin() {{{1
 function! s:Opener._gotoTargetWin()
     if b:NERDTreeType ==# "secondary"
@@ -48,6 +89,37 @@ function! s:Opener._gotoTargetWin()
     endif
 endfunction
 
+"FUNCTION: s:Opener._isWindowUsable(winnumber) {{{1
+"Returns 0 if opening a file from the tree in the given window requires it to
+"be split, 1 otherwise
+"
+"Args:
+"winnumber: the number of the window in question
+function! s:Opener._isWindowUsable(winnumber)
+    "gotta split if theres only one window (i.e. the NERD tree)
+    if winnr("$") ==# 1
+        return 0
+    endif
+
+    let oldwinnr = winnr()
+    call nerdtree#exec(a:winnumber . "wincmd p")
+    let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow')
+    let modified = &modified
+    call nerdtree#exec(oldwinnr . "wincmd p")
+
+    "if its a special window e.g. quickfix or another explorer plugin then we
+    "have to split
+    if specialWindow
+        return 0
+    endif
+
+    if &hidden
+        return 1
+    endif
+
+    return !modified || self._bufInWindows(winbufnr(a:winnumber)) >= 2
+endfunction
+
 "FUNCTION: Opener.New(path, opts) {{{1
 "Args:
 "
@@ -190,7 +262,7 @@ function! s:Opener._openDirectory(node)
         call self._gotoTargetWin()
         if empty(self._where)
             call a:node.makeRoot()
-            call nerdtree#renderView()
+            call b:NERDTree.render()
             call a:node.putCursorHere(0, 0)
         elseif self._where == 't'
             call g:NERDTreeCreator.CreatePrimary(a:node.path.str())
@@ -206,12 +278,12 @@ endfunction
 
 "FUNCTION: Opener._previousWindow() {{{1
 function! s:Opener._previousWindow()
-    if !nerdtree#isWindowUsable(winnr("#")) && nerdtree#firstUsableWindow() ==# -1
+    if !self._isWindowUsable(winnr("#")) && self._firstUsableWindow() ==# -1
         call self._newSplit()
     else
         try
-            if !nerdtree#isWindowUsable(winnr("#"))
-                call nerdtree#exec(nerdtree#firstUsableWindow() . "wincmd w")
+            if !self._isWindowUsable(winnr("#"))
+                call nerdtree#exec(self._firstUsableWindow() . "wincmd w")
             else
                 call nerdtree#exec('wincmd p')
             endif
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index 047a72a6..5de1dfe2 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -33,8 +33,10 @@ function! s:Path.bookmarkNames()
 endfunction
 
 "FUNCTION: Path.cacheDisplayString() {{{1
-function! s:Path.cacheDisplayString()
-    let self.cachedDisplayString = self.getLastPathComponent(1)
+function! s:Path.cacheDisplayString() abort
+    let self.cachedDisplayString = self.flagSet.renderToString()
+
+    let self.cachedDisplayString .= self.getLastPathComponent(1)
 
     if self.isExecutable
         let self.cachedDisplayString = self.cachedDisplayString . '*'
@@ -170,7 +172,7 @@ function! s:Path.copy(dest)
 
     let dest = s:Path.WinToUnixPath(a:dest)
 
-    let cmd = g:NERDTreeCopyCmd . " " . escape(self.str(), nerdtree#escChars()) . " " . escape(dest, nerdtree#escChars())
+    let cmd = g:NERDTreeCopyCmd . " " . escape(self.str(), self._escChars()) . " " . escape(dest, self._escChars())
     let success = system(cmd)
     if success != 0
         throw "NERDTree.CopyError: Could not copy ''". self.str() ."'' to: '" . a:dest . "'"
@@ -289,6 +291,15 @@ function! s:Path.exists()
     return filereadable(p) || isdirectory(p)
 endfunction
 
+"FUNCTION: Path._escChars() {{{1
+function! s:Path._escChars()
+    if nerdtree#runningWindows()
+        return " `\|\"#%&,?()\*^<>"
+    endif
+
+    return " \\`\|\"#%&,?()\*^<>[]"
+endfunction
+
 "FUNCTION: Path.getDir() {{{1
 "
 "Returns this path if it is a directory, else this paths parent.
@@ -460,6 +471,7 @@ function! s:Path.New(path)
     call newPath.readInfoFromDisk(s:Path.AbsolutePathFor(a:path))
 
     let newPath.cachedDisplayString = ""
+    let newPath.flagSet = g:NERDTreeFlagSet.New()
 
     return newPath
 endfunction
@@ -537,6 +549,13 @@ endfunction
 "FUNCTION: Path.refresh() {{{1
 function! s:Path.refresh()
     call self.readInfoFromDisk(self.str())
+    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, {})
+    call self.cacheDisplayString()
+endfunction
+
+"FUNCTION: Path.refreshFlags() {{{1
+function! s:Path.refreshFlags()
+    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, {})
     call self.cacheDisplayString()
 endfunction
 
@@ -625,7 +644,7 @@ endfunction
 "
 " returns a string that can be used with :cd
 function! s:Path._strForCd()
-    return escape(self.str(), nerdtree#escChars())
+    return escape(self.str(), self._escChars())
 endfunction
 
 "FUNCTION: Path._strForEdit() {{{1
@@ -633,7 +652,7 @@ endfunction
 "Return: the string for this path that is suitable to be used with the :edit
 "command
 function! s:Path._strForEdit()
-    let p = escape(self.str({'format': 'UI'}), nerdtree#escChars())
+    let p = escape(self.str({'format': 'UI'}), self._escChars())
     let cwd = getcwd() . s:Path.Slash()
 
     "return a relative path if we can
@@ -673,7 +692,7 @@ function! s:Path._strForGlob()
     let toReturn = lead . join(self.pathSegments, s:Path.Slash())
 
     if !nerdtree#runningWindows()
-        let toReturn = escape(toReturn, nerdtree#escChars())
+        let toReturn = escape(toReturn, self._escChars())
     endif
     return toReturn
 endfunction
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim b/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
index 520fca6a..a24c2704 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
@@ -21,7 +21,7 @@ unlet s:TreeDirNode.activate
 function! s:TreeDirNode.activate(...)
     let opts = a:0 ? a:1 : {}
     call self.toggleOpen(opts)
-    call nerdtree#renderView()
+    call b:NERDTree.render()
     call self.putCursorHere(0, 0)
 endfunction
 
@@ -252,6 +252,7 @@ function! s:TreeDirNode._initChildren(silent)
             try
                 let path = g:NERDTreePath.New(i)
                 call self.createChild(path, 0)
+                call g:NERDTreePathNotifier.NotifyListeners('init', path, {})
             catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
                 let invalidFilesFound += 1
             endtry
@@ -438,6 +439,20 @@ function! s:TreeDirNode.refresh()
     endif
 endfunction
 
+"FUNCTION: TreeDirNode.refreshFlags() {{{1
+unlet s:TreeDirNode.refreshFlags
+function! s:TreeDirNode.refreshFlags()
+    call self.path.refreshFlags()
+    for i in self.children
+        call i.refreshFlags()
+    endfor
+endfunction
+
+"FUNCTION: TreeDirNode.refreshDirFlags() {{{1
+function! s:TreeDirNode.refreshDirFlags()
+    call self.path.refreshFlags()
+endfunction
+
 "FUNCTION: TreeDirNode.reveal(path) {{{1
 "reveal the given path, i.e. cache and open all treenodes needed to display it
 "in the UI
@@ -450,7 +465,7 @@ function! s:TreeDirNode.reveal(path)
 
     if self.path.equals(a:path.getParent())
         let n = self.findNode(a:path)
-        call nerdtree#renderView()
+        call b:NERDTree.render()
         call n.putCursorHere(1,0)
         return
     endif
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim b/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim
index ab8d3719..b4924d78 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim
@@ -178,79 +178,20 @@ function! s:TreeFileNode.findSibling(direction)
     return {}
 endfunction
 
-"FUNCTION: TreeFileNode.getLineNum(){{{1
-"returns the line number this node is rendered on, or -1 if it isnt rendered
-function! s:TreeFileNode.getLineNum()
-    "if the node is the root then return the root line no.
-    if self.isRoot()
-        return s:TreeFileNode.GetRootLineNum()
-    endif
-
-    let totalLines = line("$")
-
-    "the path components we have matched so far
-    let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')]
-    "the index of the component we are searching for
-    let curPathComponent = 1
-
-    let fullpath = self.path.str({'format': 'UI'})
-
-
-    let lnum = s:TreeFileNode.GetRootLineNum()
-    while lnum > 0
-        let lnum = lnum + 1
-        "have we reached the bottom of the tree?
-        if lnum ==# totalLines+1
-            return -1
-        endif
-
-        let curLine = getline(lnum)
-
-        let indent = nerdtree#indentLevelFor(curLine)
-        if indent ==# curPathComponent
-            let curLine = nerdtree#stripMarkupFromLine(curLine, 1)
-
-            let curPath =  join(pathcomponents, '/') . '/' . curLine
-            if stridx(fullpath, curPath, 0) ==# 0
-                if fullpath ==# curPath || strpart(fullpath, len(curPath)-1,1) ==# '/'
-                    let curLine = substitute(curLine, '/ *$', '', '')
-                    call add(pathcomponents, curLine)
-                    let curPathComponent = curPathComponent + 1
-
-                    if fullpath ==# curPath
-                        return lnum
-                    endif
-                endif
-            endif
-        endif
-    endwhile
-    return -1
-endfunction
-
 "FUNCTION: TreeFileNode.GetRootForTab(){{{1
 "get the root node for this tab
 function! s:TreeFileNode.GetRootForTab()
-    if nerdtree#treeExistsForTab()
+    if g:NERDTree.ExistsForTab()
         return getbufvar(t:NERDTreeBufName, 'NERDTreeRoot')
     end
     return {}
 endfunction
 
-"FUNCTION: TreeFileNode.GetRootLineNum(){{{1
-"gets the line number of the root node
-function! s:TreeFileNode.GetRootLineNum()
-    let rootLine = 1
-    while getline(rootLine) !~# '^\(/\|<\)'
-        let rootLine = rootLine + 1
-    endwhile
-    return rootLine
-endfunction
-
 "FUNCTION: TreeFileNode.GetSelected() {{{1
 "gets the treenode that the cursor is currently over
 function! s:TreeFileNode.GetSelected()
     try
-        let path = nerdtree#getPath(line("."))
+        let path = b:NERDTree.ui.getPath(line("."))
         if path ==# {}
             return {}
         endif
@@ -270,7 +211,7 @@ endfunction
 "FUNCTION: TreeFileNode.isRoot() {{{1
 "returns 1 if this node is b:NERDTreeRoot
 function! s:TreeFileNode.isRoot()
-    if !nerdtree#treeExistsForBuf()
+    if !g:NERDTree.ExistsForBuf()
         throw "NERDTree.NoTreeError: No tree exists for the current buffer"
     endif
 
@@ -348,7 +289,7 @@ endfunction
 "recurseUpward: try to put the cursor on the parent if the this node isnt
 "visible
 function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
-    let ln = self.getLineNum()
+    let ln = b:NERDTree.ui.getLineNum(self)
     if ln != -1
         if a:isJump
             mark '
@@ -357,11 +298,11 @@ function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
     else
         if a:recurseUpward
             let node = self
-            while node != {} && node.getLineNum() ==# -1
+            while node != {} && b:NERDTree.ui.getLineNum(node) ==# -1
                 let node = node.parent
                 call node.open()
             endwhile
-            call nerdtree#renderView()
+            call b:NERDTree.render()
             call node.putCursorHere(a:isJump, 0)
         endif
     endif
@@ -372,6 +313,11 @@ function! s:TreeFileNode.refresh()
     call self.path.refresh()
 endfunction
 
+"FUNCTION: TreeFileNode.refreshFlags() {{{1
+function! s:TreeFileNode.refreshFlags()
+    call self.path.refreshFlags()
+endfunction
+
 "FUNCTION: TreeFileNode.rename() {{{1
 "Calls the rename method for this nodes path obj
 function! s:TreeFileNode.rename(newName)
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/ui.vim b/sources_non_forked/nerdtree/lib/nerdtree/ui.vim
new file mode 100644
index 00000000..ed93d80c
--- /dev/null
+++ b/sources_non_forked/nerdtree/lib/nerdtree/ui.vim
@@ -0,0 +1,332 @@
+"CLASS: UI
+"============================================================
+let s:UI = {}
+let g:NERDTreeUI = s:UI
+
+
+function! s:UI.lolcats()
+    echomsg "lolcats"
+endfunction
+
+"FUNCTION: s:UI.centerView() {{{2
+"centers the nerd tree window around the cursor (provided the nerd tree
+"options permit)
+function! s:UI.centerView()
+    if g:NERDTreeAutoCenter
+        let current_line = winline()
+        let lines_to_top = current_line
+        let lines_to_bottom = winheight(nerdtree#getTreeWinNum()) - current_line
+        if lines_to_top < g:NERDTreeAutoCenterThreshold || lines_to_bottom < g:NERDTreeAutoCenterThreshold
+            normal! zz
+        endif
+    endif
+endfunction
+
+"FUNCTION: s:UI.new(nerdtree) {{{1
+function! s:UI.New(nerdtree)
+    let newObj = copy(self)
+    let newObj.nerdtree = a:nerdtree
+    return newObj
+endfunction
+
+"FUNCTION: s:UI.getPath(ln) {{{1
+"Gets the full path to the node that is rendered on the given line number
+"
+"Args:
+"ln: the line number to get the path for
+"
+"Return:
+"A path if a node was selected, {} if nothing is selected.
+"If the 'up a dir' line was selected then the path to the parent of the
+"current root is returned
+function! s:UI.getPath(ln)
+    let line = getline(a:ln)
+
+    let rootLine = self.getRootLineNum()
+
+    "check to see if we have the root node
+    if a:ln == rootLine
+        return b:NERDTreeRoot.path
+    endif
+
+    if !g:NERDTreeDirArrows
+        " in case called from outside the tree
+        if line !~# '^ *[|`▸▾ ]' || line =~# '^$'
+            return {}
+        endif
+    endif
+
+    if line ==# nerdtree#treeUpDirLine()
+        return b:NERDTreeRoot.path.getParent()
+    endif
+
+    let indent = self._indentLevelFor(line)
+
+    "remove the tree parts and the leading space
+    let curFile = nerdtree#stripMarkupFromLine(line, 0)
+
+    let wasdir = 0
+    if curFile =~# '/$'
+        let wasdir = 1
+        let curFile = substitute(curFile, '/\?$', '/', "")
+    endif
+
+    let dir = ""
+    let lnum = a:ln
+    while lnum > 0
+        let lnum = lnum - 1
+        let curLine = getline(lnum)
+        let curLineStripped = nerdtree#stripMarkupFromLine(curLine, 1)
+
+        "have we reached the top of the tree?
+        if lnum == rootLine
+            let dir = b:NERDTreeRoot.path.str({'format': 'UI'}) . dir
+            break
+        endif
+        if curLineStripped =~# '/$'
+            let lpindent = self._indentLevelFor(curLine)
+            if lpindent < indent
+                let indent = indent - 1
+
+                let dir = substitute (curLineStripped,'^\\', "", "") . dir
+                continue
+            endif
+        endif
+    endwhile
+    let curFile = b:NERDTreeRoot.path.drive . dir . curFile
+    let toReturn = g:NERDTreePath.New(curFile)
+    return toReturn
+endfunction
+
+"FUNCTION: s:UI.getLineNum(file_node){{{1
+"returns the line number this node is rendered on, or -1 if it isnt rendered
+function! s:UI.getLineNum(file_node)
+    "if the node is the root then return the root line no.
+    if a:file_node.isRoot()
+        return b:NERDTree.ui.getRootLineNum()
+    endif
+
+    let totalLines = line("$")
+
+    "the path components we have matched so far
+    let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')]
+    "the index of the component we are searching for
+    let curPathComponent = 1
+
+    let fullpath = a:file_node.path.str({'format': 'UI'})
+
+    let lnum = b:NERDTree.ui.getRootLineNum()
+    while lnum > 0
+        let lnum = lnum + 1
+        "have we reached the bottom of the tree?
+        if lnum ==# totalLines+1
+            return -1
+        endif
+
+        let curLine = getline(lnum)
+
+        let indent = self._indentLevelFor(curLine)
+        if indent ==# curPathComponent
+            let curLine = nerdtree#stripMarkupFromLine(curLine, 1)
+
+            let curPath =  join(pathcomponents, '/') . '/' . curLine
+            if stridx(fullpath, curPath, 0) ==# 0
+                if fullpath ==# curPath || strpart(fullpath, len(curPath)-1,1) ==# '/'
+                    let curLine = substitute(curLine, '/ *$', '', '')
+                    call add(pathcomponents, curLine)
+                    let curPathComponent = curPathComponent + 1
+
+                    if fullpath ==# curPath
+                        return lnum
+                    endif
+                endif
+            endif
+        endif
+    endwhile
+    return -1
+endfunction
+
+
+"FUNCTION: s:UI.getRootLineNum(){{{1
+"gets the line number of the root node
+function! s:UI.getRootLineNum()
+    let rootLine = 1
+    while getline(rootLine) !~# '^\(/\|<\)'
+        let rootLine = rootLine + 1
+    endwhile
+    return rootLine
+endfunction
+
+"FUNCTION: s:UI._indentLevelFor(line) {{{2
+function! s:UI._indentLevelFor(line)
+    let level = match(a:line, '[^ \-+~▸▾`|]') / nerdtree#treeWid()
+    " check if line includes arrows
+    if match(a:line, '[▸▾]') > -1
+        " decrement level as arrow uses 3 ascii chars
+        let level = level - 1
+    endif
+    return level
+endfunction
+
+
+"FUNCTION: s:UI.restoreScreenState() {{{2
+"
+"Sets the screen state back to what it was when nerdtree#saveScreenState was last
+"called.
+"
+"Assumes the cursor is in the NERDTree window
+function! s:UI.restoreScreenState()
+    if !has_key(self, '_screenState')
+        return
+    endif
+    exec("silent vertical resize " . self._screenState['oldWindowSize'])
+
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(self._screenState['oldTopLine'], 0)
+    normal! zt
+    call setpos(".", self._screenState['oldPos'])
+    let &scrolloff=old_scrolloff
+endfunction
+
+"FUNCTION: s:UI.saveScreenState() {{{2
+"Saves the current cursor position in the current buffer and the window
+"scroll position
+function! s:UI.saveScreenState()
+    let win = winnr()
+    try
+        call nerdtree#putCursorInTreeWin()
+        let self._screenState = {}
+        let self._screenState['oldPos'] = getpos(".")
+        let self._screenState['oldTopLine'] = line("w0")
+        let self._screenState['oldWindowSize']= winwidth("")
+        call nerdtree#exec(win . "wincmd w")
+    catch /^NERDTree.InvalidOperationError/
+    endtry
+endfunction
+
+"FUNCTION: s:UI.render() {{{2
+function! s:UI.render()
+    setlocal modifiable
+
+    "remember the top line of the buffer and the current line so we can
+    "restore the view exactly how it was
+    let curLine = line(".")
+    let curCol = col(".")
+    let topLine = line("w0")
+
+    "delete all lines in the buffer (being careful not to clobber a register)
+    silent 1,$delete _
+
+    call nerdtree#dumpHelp()
+
+    "delete the blank line before the help and add one after it
+    if g:NERDTreeMinimalUI == 0
+        call setline(line(".")+1, "")
+        call cursor(line(".")+1, col("."))
+    endif
+
+    if b:NERDTreeShowBookmarks
+        call nerdtree#renderBookmarks()
+    endif
+
+    "add the 'up a dir' line
+    if !g:NERDTreeMinimalUI
+        call setline(line(".")+1, nerdtree#treeUpDirLine())
+        call cursor(line(".")+1, col("."))
+    endif
+
+    "draw the header line
+    let header = b:NERDTreeRoot.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
+    call setline(line(".")+1, header)
+    call cursor(line(".")+1, col("."))
+
+    "draw the tree
+    let old_o = @o
+    let @o = b:NERDTreeRoot.renderToString()
+    silent put o
+    let @o = old_o
+
+    "delete the blank line at the top of the buffer
+    silent 1,1delete _
+
+    "restore the view
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(topLine, 1)
+    normal! zt
+    call cursor(curLine, curCol)
+    let &scrolloff = old_scrolloff
+
+    setlocal nomodifiable
+endfunction
+
+
+"FUNCTION: UI.renderViewSavingPosition {{{1
+"Renders the tree and ensures the cursor stays on the current node or the
+"current nodes parent if it is no longer available upon re-rendering
+function! s:UI.renderViewSavingPosition()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+
+    "go up the tree till we find a node that will be visible or till we run
+    "out of nodes
+    while currentNode != {} && !currentNode.isVisible() && !currentNode.isRoot()
+        let currentNode = currentNode.parent
+    endwhile
+
+    call b:NERDTree.render()
+
+    if currentNode != {}
+        call currentNode.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:UI.toggleIgnoreFilter() {{{1
+" toggles the use of the NERDTreeIgnore option
+function! s:UI.toggleIgnoreFilter()
+    let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled
+    call b:NERDTree.ui.renderViewSavingPosition()
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowBookmarks() {{{1
+" toggles the display of bookmarks
+function! s:UI.toggleShowBookmarks()
+    let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
+    if b:NERDTreeShowBookmarks
+        call b:NERDTree.render()
+        call nerdtree#putCursorOnBookmarkTable()
+    else
+        call b:NERDTree.ui.renderViewSavingPosition()
+    endif
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowFiles() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowFiles()
+    let b:NERDTreeShowFiles = !b:NERDTreeShowFiles
+    call b:NERDTree.ui.renderViewSavingPosition()
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowHidden()
+    let b:NERDTreeShowHidden = !b:NERDTreeShowHidden
+    call b:NERDTree.ui.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleZoom() {{{1
+" zoom (maximize/minimize) the NERDTree window
+function! s:UI.toggleZoom()
+    if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed
+        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        exec "silent vertical resize ". size
+        let b:NERDTreeZoomed = 0
+    else
+        exec "vertical resize"
+        let b:NERDTreeZoomed = 1
+    endif
+endfunction
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
index 4fdc5d2a..4e03f35e 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -117,7 +117,7 @@ function! NERDTreeAddNode()
         let newTreeNode = g:NERDTreeFileNode.New(newPath)
         if empty(parentNode)
             call b:NERDTreeRoot.refresh()
-            call nerdtree#renderView()
+            call b:NERDTree.render()
         elseif parentNode.isOpen || !empty(parentNode.children)
             call parentNode.addChild(newTreeNode, 1)
             call NERDTreeRender()
@@ -230,7 +230,7 @@ function! NERDTreeCopyNode()
                 let newNode = currentNode.copy(newNodePath)
                 if empty(newNode)
                     call b:NERDTreeRoot.refresh()
-                    call nerdtree#renderView()
+                    call b:NERDTree.render()
                 else
                     call NERDTreeRender()
                     call newNode.putCursorHere(0, 0)
diff --git a/sources_non_forked/nerdtree/plugin/NERD_tree.vim b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
index cbfa884e..28fd3ad1 100644
--- a/sources_non_forked/nerdtree/plugin/NERD_tree.vim
+++ b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
@@ -142,20 +142,13 @@ call nerdtree#loadClassFiles()
 
 " SECTION: Commands {{{1
 "============================================================
-"init the command that users start the nerd tree with
-command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreatePrimary('<args>')
-command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.TogglePrimary('<args>')
-command! -n=0 -bar NERDTreeClose :call nerdtree#closeTreeIfOpen()
-command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
-command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
-command! -n=0 -bar NERDTreeFind call nerdtree#findAndRevealPath()
-command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
-command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
+call nerdtree#ui_glue#setupCommands()
+
 " SECTION: Auto commands {{{1
 "============================================================
 augroup NERDTree
     "Save the cursor position whenever we close the nerd tree
-    exec "autocmd BufWinLeave ". g:NERDTreeCreator.BufNamePrefix() ."* call nerdtree#saveScreenState()"
+    exec "autocmd BufLeave ". g:NERDTreeCreator.BufNamePrefix() ."* call b:NERDTree.ui.saveScreenState()"
 
     "disallow insert mode in the NERDTree
     exec "autocmd BufEnter ". g:NERDTreeCreator.BufNamePrefix() ."* stopinsert"
@@ -201,7 +194,7 @@ endfunction
 
 function! NERDTreeCWD()
     call NERDTreeFocus()
-    call nerdtree#chRootCwd()
+    call nerdtree#ui_glue#chRootCwd()
 endfunction
 " SECTION: Post Source Actions {{{1
 call nerdtree#postSourceActions()
diff --git a/sources_non_forked/nerdtree/syntax/nerdtree.vim b/sources_non_forked/nerdtree/syntax/nerdtree.vim
index 7cbba6ee..5f7b49cc 100644
--- a/sources_non_forked/nerdtree/syntax/nerdtree.vim
+++ b/sources_non_forked/nerdtree/syntax/nerdtree.vim
@@ -1,8 +1,6 @@
 let s:tree_up_dir_line = '.. (up a dir)'
-"NERDTreeFlags are syntax items that should be invisible, but give clues as to
-"how things should be highlighted
-syn match NERDTreeFlag #\~#
-syn match NERDTreeFlag #\[RO\]#
+syn match NERDTreeIgnore #\~#
+syn match NERDTreeIgnore #\[RO\]#
 
 "highlighting for the .. (up dir) line at the top of the tree
 execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line ."#"
@@ -14,7 +12,7 @@ syn match NERDTreeHelpTitle #" .*\~#ms=s+2,me=e-1
 syn match NERDTreeToggleOn #(on)#ms=s+1,he=e-1
 syn match NERDTreeToggleOff #(off)#ms=e-3,me=e-1
 syn match NERDTreeHelpCommand #" :.\{-}\>#hs=s+3
-syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeFlag,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
+syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeIgnore,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
 
 "highlighting for sym links
 syn match NERDTreeLinkTarget #->.*# containedin=NERDTreeDir,NERDTreeFile
@@ -33,7 +31,10 @@ if g:NERDTreeDirArrows
     syn match NERDTreeFile  #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
 
     "highlighting for readonly files
-    syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeFlag,NERDTreeBookmark,NERDTreeFile
+    syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile
+
+    syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile
+    syn match NERDTreeFlags #\[.\]# containedin=NERDTreeDir
 else
     "highlighting for the ~/+ symbols for the directory nodes
     syn match NERDTreeClosable #\~\<#
@@ -52,7 +53,10 @@ else
     syn match NERDTreeFile  #`-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
 
     "highlighting for readonly files
-    syn match NERDTreeRO #|-.*\[RO\]#he=e-5 contains=NERDTreeFlag,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
+    syn match NERDTreeRO #|-.*\[RO\]#he=e-5 contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
+
+    syn match NERDTreeFlags #-\[.\]# containedin=NERDTreeFile,NERDTreePartFile
+    syn match NERDTreeFlags #[+~]\zs\[.\]# containedin=NERDTreeDir
 endif
 
 syn match NERDTreeCWD #^[</].*$#
@@ -93,8 +97,9 @@ hi def link NERDTreeFile Normal
 hi def link NERDTreeCWD Statement
 hi def link NERDTreeOpenable Title
 hi def link NERDTreeClosable Title
-hi def link NERDTreeFlag ignore
+hi def link NERDTreeIgnore ignore
 hi def link NERDTreeRO WarningMsg
 hi def link NERDTreeBookmark Statement
+hi def link NERDTreeFlags Number
 
 hi def link NERDTreeCurrentNode Search
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 950f7273..d0eb41f2 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -35,16 +35,16 @@ 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, syntax checking plugins exist for ActionScript,
-Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
-Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
-Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe,
-Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP,
-LLVM intermediate language, Lua, MATLAB, NASM, Objective-C, Objective-C++,
-OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and iOS property
-lists, Puppet, Python, Racket, R, reStructuredText, Ruby, SASS/SCSS, Scala,
-Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml,
-XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.  See the [wiki][3]
-for details about the corresponding supported checkers.
+Ada, AppleScript, Arduino, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
+C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
+DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
+Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
+Lex, Limbo, LISP, LLVM intermediate language, Lua, MATLAB, NASM, Objective-C,
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X
+and iOS property lists, Puppet, Python, Racket, R, reStructuredText, Ruby,
+SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog,
+VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.
+See the [wiki][3] for details about the corresponding supported checkers.
 
 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
@@ -137,7 +137,8 @@ statements in your file (cf. [perlrun][10]).  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, set `g:syntastic_enable_perl_checker` to 1 in your vimrc:
+(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
 ```
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index e227f53e..bddc7100 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -154,17 +154,10 @@ function! s:logRedirect(on) " {{{2
     endif
 endfunction " }}}2
 
-function! s:logTimestamp_smart() " {{{2
+function! s:logTimestamp() " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:syntastic_start)))[0] . ': '
 endfunction " }}}2
 
-function! s:logTimestamp_dumb() " {{{2
-    return 'syntastic: debug: '
-endfunction " }}}2
-
-let s:logTimestamp = function(has('reltime') ? 's:logTimestamp_smart' : 's:logTimestamp_dumb')
-lockvar s:logTimestamp
-
 function! s:formatVariable(name) " {{{2
     let vals = []
     if exists('g:syntastic_' . a:name)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index b4b900b1..837a280f 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -35,12 +35,12 @@ endfunction " }}}2
 "
 "{'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
 function! syntastic#util#parseShebang() " {{{2
-    for lnum in range(1,5)
+    for lnum in range(1, 5)
         let line = getline(lnum)
-
         if line =~ '^#!'
-            let exe = matchstr(line, '\m^#!\s*\zs[^ \t]*')
-            let args = split(matchstr(line, '\m^#!\s*[^ \t]*\zs.*'))
+            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
@@ -58,7 +58,7 @@ endfunction " }}}2
 
 " Parse a version string.  Return an array of version components.
 function! syntastic#util#parseVersion(version) " {{{2
-    return split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.')
+    return map(split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.'), 'str2nr(v:val)')
 endfunction " }}}2
 
 " Run 'command' in a shell and parse output as a version string.
@@ -74,15 +74,21 @@ endfunction " }}}2
 "
 " See http://semver.org for info about version numbers.
 function! syntastic#util#versionIsAtLeast(installed, required) " {{{2
-    for idx in range(max([len(a:installed), len(a:required)]))
-        let installed_element = get(a:installed, idx, 0)
-        let required_element = get(a:required, idx, 0)
-        if installed_element != required_element
-            return installed_element > required_element
+    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) " {{{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
     " Everything matched, so it is at least the required version.
-    return 1
+    return 0
 endfunction " }}}2
 
 " strwidth() was added in Vim 7.3; if it doesn't exist, we use strlen()
@@ -226,6 +232,13 @@ function! syntastic#util#sortLoclist(errors) " {{{2
     call sort(a:errors, 's:compareErrorItems')
 endfunction " }}}2
 
+" Return a [high, low] list of integers, representing the time
+" (hopefully high resolution) since program start
+" TODO: This assumes reltime() returns a list of integers.
+function! syntastic#util#stamp() " {{{2
+    return reltime(g:syntastic_start)
+endfunction " }}}2
+
 " }}}1
 
 " Private functions {{{1
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index bb222094..daefafdd 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -36,12 +36,14 @@ CONTENTS                                                  *syntastic-contents*
         5.3.Configuring specific checkers..........|syntastic-config-makeprg|
     6.Notes........................................|syntastic-notes|
         6.1.Handling of composite filetypes........|syntastic-composite|
-        6.2.Interaction with python-mode...........|syntastic-pymode|
-        6.3.Interaction with the fish shell........|syntastic-fish|
-        6.4.Interaction with PowerShell............|syntastic-powershell|
-        6.5.Using syntastic with the fizsh shell...|syntastic-fizsh|
-        6.6.Interaction with Eclim.................|syntastic-eclim|
-        6.7.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
+        6.2.Editing files over network.............|syntastic-netrw|
+        6.3.Interaction with python-mode...........|syntastic-pymode|
+        6.4.Interaction with YouCompleteMe.........|syntastic-ycm|
+        6.5.Interaction with the fish shell........|syntastic-fish|
+        6.6.Interaction with PowerShell............|syntastic-powershell|
+        6.7.Using syntastic with the fizsh shell...|syntastic-fizsh|
+        6.8.Interaction with Eclim.................|syntastic-eclim|
+        6.9.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
     7.About........................................|syntastic-about|
     8.License......................................|syntastic-license|
 
@@ -321,8 +323,8 @@ error symbols can be customized:
     syntastic_style_warning_symbol - For style warnings, defaults to 'S>'
 
 Example: >
-    let g:syntastic_error_symbol = '✗'
-    let g:syntastic_warning_symbol = '⚠'
+    let g:syntastic_error_symbol = "✗"
+    let g:syntastic_warning_symbol = "⚠"
 <
                                                  *'syntastic_enable_balloons'*
 Default: 1
@@ -394,12 +396,12 @@ 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 = { 'latex': 'tex',
-                                   \ 'gentoo-metadata': 'xml' }
+    let g:syntastic_filetype_map = { "latex": "tex",
+                                   \ "gentoo-metadata": "xml" }
 <
 Composite filetypes 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' }
+    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
 <
                                                         *'syntastic_mode_map'*
 Default: { "mode": "active",
@@ -411,26 +413,26 @@ done).
 
 The option should be set to something like: >
 
-    let g:syntastic_mode_map = { 'mode': 'active',
-                               \ 'active_filetypes': ['ruby', 'php'],
-                               \ 'passive_filetypes': ['puppet'] }
+    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
+"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 all filetypes in the "active_filetypes" array. In active mode,
-automatic checks are not done for any filetypes in the
-"passive_filetypes" array.
+"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.
 
 At runtime, the |:SyntasticToggleMode| command can be used to switch between
-active and passive mode.
-
-If any of "mode", "active_filetypes", or "passive_filetypes" are not specified
-then they will default to their default value as above.
+active and passive modes.
 
                                                   *'syntastic_quiet_messages'*
 Default: {}
@@ -471,7 +473,7 @@ 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': >
+ones produced by "pylint": >
     let g:syntastic_quiet_messages = { "level": "warnings" }
     let g:syntastic_python_pylint_quiet_messages = { "level" : [] }
 <
@@ -540,7 +542,7 @@ 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' ]
+    let g:syntastic_extra_filetypes = [ "make", "gitcommit" ]
 <
 This will allow |:SyntasticInfo| to do proper tab completion for the new
 filetypes.
@@ -554,14 +556,14 @@ filetypes.
                                            *'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']
+    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
+    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
@@ -592,21 +594,27 @@ default - in fact you can customise every part of the command that gets called.
                                    *'syntastic_<filetype>_<checker>_<option>'*
 Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
     let makeprg = self.makeprgBuild({
-                \ 'exe': self.getExec(),
-                \ 'args': '-a -b -c',
-                \ 'post_args': '--more --args',
-                \ 'tail': '> /tmp/output' })
+                \ "exe": self.getExec(),
+                \ "args": "-a -b -c",
+                \ "post_args": "--more --args",
+                \ "tail": "2>/dev/null" })
 <
 The result is a 'makeprg' of the form: >
     <exe> <args> <fname> <post_args> <tail>
 <
-                                        *'syntastic_<filetype>_<checker>_exe'*
 All arguments 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(). These variables also
 have local versions 'b:syntastic_<filetype>_<checker-name>_<option-name>',
 which take precedence over the global ones in the corresponding buffers.
 
+If one of these variables has a non-empty default and you want it to be empty,
+you can set it to a space, e.g.: >
+    let g:syntastic_javascript_jslint_args = " "
+<
+(setting it to an empty string doesn't work, for implementation reasons).
+
+                                        *'syntastic_<filetype>_<checker>_exe'*
 The 'exe' is normally the same as the 'exec' attribute described above, in
 which case it may be omitted. However, you can use it to add environment
 variables or additional parameters, e.g. to tell the mri checker to use KANJI
@@ -641,37 +649,56 @@ See |syntastic_quiet_messages| for the syntax.
 ------------------------------------------------------------------------------
 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
+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 a simple ones using |syntastic_filetype_map|, e.g.: >
-    let g:syntastic_filetype_map = { 'handlebars.html': 'handlebars' }
+    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
 <
 ------------------------------------------------------------------------------
-6.2 Interaction with python-mode                            *syntastic-pymode*
+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 Interaction with 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_write| to 0. E.g.: >
+'python-mode', by setting |pymode_lint_write| to 0. E.g.: >
     let g:pymode_lint_write = 0
 <
 ------------------------------------------------------------------------------
-6.3 Interaction with the fish shell                           *syntastic-fish*
+6.4 Interaction with 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 |ycm_show_diagnostics_ui| to 0. E.g.: >
+    let g:ycm_show_diagnostics_ui = 0
+<
+------------------------------------------------------------------------------
+6.5 Interaction with 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 don't need to change your login
 shell to address this problem, but you do have to point Vim's 'shell' to a more
-traditional shell, such as 'zsh', 'bash', 'ksh', or even the original Bourne
-'sh': >
+traditional shell, such as "zsh", "bash", "ksh", or even the original Bourne
+"sh": >
     set shell=bash
 <
 ------------------------------------------------------------------------------
-6.4. Interaction with PowerShell                        *syntastic-powershell*
+6.6. Interaction with PowerShell                        *syntastic-powershell*
 
 At the time of this writing, syntastic is not compatible with using 'Windows
 PowerShell' (http://technet.microsoft.com/en-us/library/bb978526.aspx) as Vim's
@@ -680,7 +707,7 @@ Vim's 'shell' to a more traditional program, such as 'cmd.exe': >
     set shell=cmd.exe
 <
 ------------------------------------------------------------------------------
-6.5. Using syntastic with the fizsh shell                    *syntastic-fizsh*
+6.7. Using syntastic with 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
@@ -688,12 +715,12 @@ is possible, but potentially problematic. In order to do it you'll need to set
     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: >
+interactive features of 'fizsh'. Using a more traditional shell such as "zsh",
+"bash", "ksh", or the original Bourne "sh" might be a better choice: >
     set shell=zsh
 <
 ------------------------------------------------------------------------------
-6.6. Interaction with Eclim                                  *syntastic-eclim*
+6.8. Interaction with Eclim                                  *syntastic-eclim*
 
 As far as syntastic is concerned there shouldn't be any compatibility problems
 with the 'Eclim' Vim plugin (see http://eclim.org/). However, at the time of
@@ -702,7 +729,7 @@ makes syntastic forget some of its configuration parameters. No solutions or
 workarounds are known for now.
 
 ------------------------------------------------------------------------------
-6.7. Interaction with vim-virtualenv                *syntastic-vim-virtualenv*
+6.9. Interaction with 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
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index f3724d9f..43a5ace1 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,12 +19,12 @@ if has('reltime')
     lockvar! g:syntastic_start
 endif
 
-let g:syntastic_version = '3.4.0-90'
+let g:syntastic_version = '3.4.0-117'
 lockvar g:syntastic_version
 
 " Sanity checks {{{1
 
-for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'user_commands']
+for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'reltime', 'user_commands']
     if !has(s:feature)
         call syntastic#log#error("need Vim compiled with feature " . s:feature)
         finish
@@ -65,10 +65,11 @@ let g:syntastic_defaults = {
         \ '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,
         \ 'quiet_messages':           {},
-        \ 'reuse_loc_lists':          (v:version >= 704),
+        \ 'reuse_loc_lists':          0,
         \ 'sort_aggregated_errors':   1,
         \ 'stl_format':               '[Syntax: line:%F (%t)]',
         \ 'style_error_symbol':       'S>',
@@ -167,7 +168,7 @@ command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
             \ call syntastic#util#redraw(g:syntastic_full_redraws)
 command! Errors call s:ShowLocList()
 command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
-            \ call s:modemap.echoMode() |
+            \ call s:modemap.modeInfo(<f-args>) |
             \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>))
 command! SyntasticReset
             \ call s:ClearCache() |
@@ -237,6 +238,11 @@ endfunction " }}}2
 
 "refresh and redraw all the error info for this buf when saving or reading
 function! s:UpdateErrors(auto_invoked, ...) " {{{2
+    call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'version')
+    call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
+    call syntastic#log#debugDump(g:SyntasticDebugVariables)
+    call syntastic#log#debug(g:SyntasticDebugTrace, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
+        \ ': ' . (a:0 ? join(a:000) : 'default checkers'))
     if s:skipFile()
         return
     endif
@@ -288,14 +294,13 @@ endfunction " }}}2
 
 "detect and cache all syntax errors in this buffer
 function! s:CacheErrors(checker_names) " {{{2
+    call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: ' .
+        \ (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
     call s:ClearCache()
     let newLoclist = g:SyntasticLoclist.New([])
 
     if !s:skipFile()
         " debug logging {{{3
-        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'version')
-        call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
-        call syntastic#log#debugDump(g:SyntasticDebugVariables)
         call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'aggregate_errors')
         call syntastic#log#debug(g:SyntasticDebugTrace, 'getcwd() = ' . getcwd())
         " }}}3
@@ -376,7 +381,6 @@ function! s:CacheErrors(checker_names) " {{{2
         endif
     endif
 
-    call newLoclist.setOwner(bufnr(''))
     call newLoclist.deploy()
 endfunction " }}}2
 
@@ -408,7 +412,9 @@ endfunction " }}}2
 "   '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) " {{{2
     call syntastic#log#debug(g:SyntasticDebugTrace, 'SyntasticMake: called with options:', a:options)
 
@@ -432,11 +438,31 @@ function! SyntasticMake(options) " {{{2
         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_]\+$'
+                exec 'let env_save[' . string(key) . '] = $' . key
+                exec 'let $' . key . ' = ' . string(a:options['env'][key])
+            endif
+        endfor
+    endif
     let $LC_MESSAGES = 'C'
     let $LC_ALL = ''
+    " }}}3
+
     let err_lines = split(system(a:options['makeprg']), "\n", 1)
+
+    " restore environment variables {{{3
     let $LC_ALL = old_lc_all
     let $LC_MESSAGES = old_lc_messages
+    if len(env_save)
+        for key in keys(env_save)
+            exec 'let $' . key . ' = ' . string(env_save[key])
+        endfor
+    endif
+    " }}}3
 
     call syntastic#log#debug(g:SyntasticDebugLoclist, 'checker output:', err_lines)
 
@@ -497,6 +523,7 @@ function! SyntasticMake(options) " {{{2
 
     return errors
 endfunction " }}}2
+" @vimlint(EVL102, 0, l:env_save)
 
 "return a string representing the state of buffer according to
 "g:syntastic_stl_format
@@ -527,9 +554,14 @@ endfunction " }}}2
 
 " Skip running in special buffers
 function! s:skipFile() " {{{2
-    let force_skip = exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0
     let fname = expand('%')
-    return force_skip || (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname)
+    let skip = (exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0) ||
+        \ (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') ||
+        \ s:ignoreFile(fname) || fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
+    if skip
+        call syntastic#log#debug(g:SyntasticDebugTrace, 'skipFile: skipping')
+    endif
+    return skip
 endfunction " }}}2
 
 " Take a list of errors and add default values to them from a:options
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index c97f7fae..6bf6edb9 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -43,6 +43,7 @@ endfunction " }}}2
 " Reset the error balloons
 " @vimlint(EVL103, 1, a:loclist)
 function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
+    let b:syntastic_balloons = {}
     if has('balloon_eval')
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: reset')
         set nobeval
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index e3451d82..afb6614a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -32,8 +32,8 @@ endfunction " }}}2
 " Sets error highlights in the cuirrent window
 function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
     if self.enabled()
-        call self.reset(a:loclist)
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: refresh')
+        call self._reset()
         let buf = bufnr('')
         let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
         for item in issues
@@ -64,11 +64,7 @@ endfunction " }}}2
 function! g:SyntasticHighlightingNotifier.reset(loclist) " {{{2
     if s:has_highlighting
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: reset')
-        for match in getmatches()
-            if stridx(match['group'], 'Syntastic') == 0
-                call matchdelete(match['id'])
-            endif
-        endfor
+        call self._reset()
     endif
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
@@ -95,6 +91,14 @@ function! g:SyntasticHighlightingNotifier._setup() " {{{2
     endif
 endfunction " }}}2
 
+function! g:SyntasticHighlightingNotifier._reset() " {{{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/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index b4471dad..e7c05bf7 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -46,6 +46,14 @@ function! g:SyntasticLoclist.isEmpty() " {{{2
     return empty(self._rawLoclist)
 endfunction " }}}2
 
+function! g:SyntasticLoclist.isNewerThan(stamp) " {{{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() " {{{2
     return copy(self._rawLoclist)
 endfunction " }}}2
@@ -132,6 +140,8 @@ function! g:SyntasticLoclist.setOwner(buffer) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticLoclist.deploy() " {{{2
+    call self.setOwner(bufnr(''))
+    let self._stamp = syntastic#util#stamp()
     for buf in self.getBuffers()
         call setbufvar(buf, 'syntastic_loclist', self)
     endfor
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index 8f7d3a4e..dd131bcb 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -19,8 +19,8 @@ endfunction " }}}2
 function! g:SyntasticModeMap.synch() " {{{2
     if exists('g:syntastic_mode_map')
         let self._mode = get(g:syntastic_mode_map, 'mode', 'active')
-        let self._activeFiletypes = get(g:syntastic_mode_map, 'active_filetypes', [])
-        let self._passiveFiletypes = get(g:syntastic_mode_map, 'passive_filetypes', [])
+        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 = []
@@ -62,6 +62,27 @@ function! g:SyntasticModeMap.echoMode() " {{{2
     echo "Syntastic: " . self._mode . " mode enabled"
 endfunction " }}}2
 
+function! g:SyntasticModeMap.modeInfo(...) " {{{2
+    echomsg 'Syntastic version: ' . g:syntastic_version
+    let type = a:0 ? a:1 : &filetype
+    echomsg 'Info for filetype: ' . type
+
+    call self.synch()
+    echomsg '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')
+endfunction " }}}2
+
 " }}}1
 
 " Private methods {{{1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 62821cde..49948b1d 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -8,6 +8,9 @@ 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() " {{{2
@@ -20,11 +23,27 @@ function! g:SyntasticNotifiers.Instance() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticNotifiers.refresh(loclist) " {{{2
+    if !a:loclist.isEmpty() && !a:loclist.isNewerThan([])
+        " loclist not fully constructed yet
+        return
+    endif
+
     call syntastic#log#debug(g:SyntasticDebugNotifications, '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()
-            call self._notifier[type].refresh(a:loclist)
+            if index(s:persistent_notifiers, type) > -1
+                " refresh only if loclist has changed since last call
+                if !exists('b:syntastic_' . type . '_stamp')
+                    let b:syntastic_{type}_stamp = []
+                endif
+                if a:loclist.isNewerThan(b:syntastic_{type}_stamp) || a:loclist.isEmpty()
+                    call self._notifier[type].refresh(a:loclist)
+                    let b:syntastic_{type}_stamp = syntastic#util#stamp()
+                endif
+            else
+                call self._notifier[type].refresh(a:loclist)
+            endif
         endif
     endfor
 endfunction " }}}2
@@ -40,6 +59,11 @@ function! g:SyntasticNotifiers.reset(loclist) " {{{2
         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_{type}_stamp = []
+        endif
     endfor
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 3ab771e1..47d83106 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -9,6 +9,7 @@ let s:defaultCheckers = {
         \ 'actionscript':['mxmlc'],
         \ 'ada':         ['gcc'],
         \ 'applescript': ['osacompile'],
+        \ 'arduino':     ['avrgcc'],
         \ 'asciidoc':    ['asciidoc'],
         \ 'asm':         ['gcc'],
         \ 'bro':         ['bro'],
@@ -29,7 +30,7 @@ let s:defaultCheckers = {
         \ 'dart':        ['dartanalyzer'],
         \ 'docbk':       ['xmllint'],
         \ 'dustjs':      ['swiffer'],
-        \ 'elixir':      ['elixir'],
+        \ 'elixir':      [],
         \ 'erlang':      ['escript'],
         \ 'eruby':       ['ruby'],
         \ 'fortran':     ['gfortran'],
@@ -178,9 +179,6 @@ function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
-    echomsg "Syntastic version: " . g:syntastic_version
-    echomsg "Info for filetype: " . join(a:ftalias_list, '.')
-
     let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:normaliseFiletype(v:val)' ))
     if len(ft_list) != 1
         let available = []
@@ -196,8 +194,15 @@ function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
         let active = map(self.getCheckersAvailable(ft, []), 'v:val.getName()')
     endif
 
-    echomsg "Available checker(s): " . join(sort(available))
-    echomsg "Currently enabled checker(s): " . join(active)
+    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
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 7f713c69..e2f4b5de 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -42,7 +42,6 @@ function! g:SyntasticSignsNotifier.refresh(loclist) " {{{2
         call self._signErrors(a:loclist)
     endif
     call self._removeSigns(old_signs)
-    let s:first_sign_id = exists('s:next_sign_id') ? s:next_sign_id : 5000
 endfunction " }}}2
 
 " }}}1
@@ -88,26 +87,29 @@ function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
     let loclist = a:loclist
     if !loclist.isEmpty()
 
-        " errors some first, so that they are not masked by warnings
         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 !has_key(seen, i['lnum'])
+            if i['lnum'] > 0 && !has_key(seen, i['lnum'])
                 let seen[i['lnum']] = 1
 
-                if i['lnum'] > 0
-                    let sign_severity = i['type'] ==? 'W' ? 'Warning' : 'Error'
-                    let sign_subtype = get(i, 'subtype', '')
-                    let sign_type = 'Syntastic' . sign_subtype . sign_severity
+                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
+                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
diff --git a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
new file mode 100644
index 00000000..2a1b867c
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
@@ -0,0 +1,26 @@
+"============================================================================
+"File:        avrgcc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"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_arduino_avrgcc_checker')
+    finish
+endif
+let g:loaded_syntastic_arduino_avrgcc_checker = 1
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'avrgcc',
+    \ 'exec': 'avr-gcc',
+    \ 'redirect': 'c/avrgcc'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
index 0efe4722..5563d61d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
@@ -53,3 +53,5 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index 566131d5..3914fa9b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -24,6 +24,11 @@ function! SyntaxCheckers_elixir_elixir_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_elixir_elixir_GetLocList() dict
+    if !exists('g:syntastic_enable_elixir_checker') || !g:syntastic_enable_elixir_checker
+        call syntastic#log#error('checker elixir/elixir: checks disabled for security reasons; ' .
+            \ 'set g:syntastic_enable_elixir_checker to 1 to override')
+        return []
+    endif
 
     let make_options = {}
     let compile_command = 'elixir'
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
index ed299ec8..b4725505 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
@@ -30,7 +30,7 @@ function! SyntaxCheckers_erlang_escript_GetLocList() dict
     endif
 
     let shebang = syntastic#util#parseShebang()
-    if shebang['exe'] =~# '\m\<escript$' || (shebang['exe'] ==# '/usr/bin/env' && shebang['args'][0] ==# 'escript')
+    if shebang['exe'] ==# 'escript'
         let args = '-s'
         let post_args = ''
     else
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
index 903793c3..91629c43 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
@@ -38,3 +38,5 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 47378e0f..ea6b2f05 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -22,24 +22,14 @@ 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
     endif
-    let s:exe = self.getExec()
-
-    if executable(s:exe)
-        let s:exe = syntastic#util#shescape(s:exe)
-        if !syntastic#util#isRunningWindows()
-            let s:exe = 'RUBYOPT= ' . s:exe
-        endif
-        return 1
-    endif
-
-    return 0
+    return executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
     let fname = "'" . escape(expand('%'), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
-    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(s:exe . ' --version'), [1, 9])
+    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped(). ' --version'), [1, 9])
         let enc = &fileencoding != '' ? &fileencoding : &encoding
         let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
     else
@@ -48,11 +38,11 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
 
     "gsub fixes issue #7, rails has it's own eruby syntax
     let makeprg =
-        \ s:exe . ' -rerb -e ' .
+        \ self.getExecEscaped() . ' -rerb -e ' .
         \ syntastic#util#shescape('puts ERB.new(File.read(' .
         \     fname . encoding_spec .
         \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
-        \ ' | ' . s:exe . ' -c'
+        \ ' | ' . self.getExecEscaped() . ' -c'
 
     let errorformat =
         \ '%-GSyntax OK,'.
@@ -61,9 +51,12 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
         \ '%Z%p^,'.
         \ '%-C%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'env': env,
         \ 'defaults': { 'bufnr': bufnr(""), 'vcol': 1 } })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index a7274c1b..8bb0a530 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -31,6 +31,8 @@ function! SyntaxCheckers_html_jshint_GetLocList() dict
 
     let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
 
+    call self.setWantSort(1)
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index c13451c3..7dcf5223 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -186,9 +186,7 @@ function! s:Args()
 endfunction
 
 function! SyntaxCheckers_html_tidy_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': s:Args(),
-        \ 'tail': '2>&1' })
+    let makeprg = self.makeprgBuild({ 'args_after': s:Args() })
 
     let errorformat =
         \ '%Wline %l column %v - Warning: %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index ecf54725..2e138bea 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -399,8 +399,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
         \ 'args': javac_opts,
-        \ 'fname': syntastic#util#shescape(fname),
-        \ 'tail': '2>&1' })
+        \ 'fname': syntastic#util#shescape(fname) })
 
     " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index 997871fe..69706c0a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -40,6 +40,8 @@ function! SyntaxCheckers_javascript_jshint_GetLocList() dict
         \ '%A%f: line %l\, col %v\, %m \(%t%*\d\)' :
         \ '%E%f: line %l\, col %v\, %m'
 
+    call self.setWantSort(1)
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
index ebc484f2..1e4f1c9b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -19,8 +19,7 @@ function! SyntaxCheckers_python_flake8_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_python_flake8_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+    let makeprg = self.makeprgBuild({})
 
     let errorformat =
         \ '%E%f:%l: could not compile,%-Z%p^,' .
@@ -28,9 +27,12 @@ function! SyntaxCheckers_python_flake8_GetLocList() dict
         \ '%A%f:%l: %t%n %m,' .
         \ '%-G%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 
     for e in loclist
         " E*** and W*** are pep8 errors
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index e96a8cc1..e1284e44 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -19,9 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_frosted_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
-        \ 'args_after': '-vb' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-vb' })
 
     let errorformat =
         \ '%f:%l:%c:%m,' .
@@ -29,9 +27,12 @@ function! SyntaxCheckers_python_frosted_GetLocList() dict
         \ '%-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
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 60cf916e..d4b16575 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -19,8 +19,7 @@ function! SyntaxCheckers_python_pep257_GetLocList() dict
             \ self.getExecEscaped() . ' --version'), [0, 3])
     endif
 
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+    let makeprg = self.makeprgBuild({})
 
     if s:pep257_new
         let errorformat =
@@ -33,9 +32,12 @@ function! SyntaxCheckers_python_pep257_GetLocList() dict
             \ '%+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'] })
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
index 64c9e640..0f35c276 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
@@ -21,14 +21,16 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_pep8_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+    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
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
index 1a4465e0..69a3060f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -14,14 +14,16 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_py3kwarn_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+    let makeprg = self.makeprgBuild({})
 
     let errorformat = '%W%f:%l:%c: %m'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
index 351eb206..530a275c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -40,8 +40,7 @@ function! SyntaxCheckers_python_pyflakes_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_python_pyflakes_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb') })
+    let makeprg = self.makeprgBuild({})
 
     let errorformat =
         \ '%E%f:%l: could not compile,'.
@@ -50,9 +49,12 @@ function! SyntaxCheckers_python_pyflakes_GetLocList() dict
         \ '%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
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index b8611814..01c0ab62 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -23,18 +23,19 @@ function! SyntaxCheckers_python_pylama_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_python_pylama_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
-        \ 'args_after': '-f pep8' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-f pep8' })
 
     " 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 })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 
     " adjust for weirdness in each checker
     for e in loclist
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 131ca482..88dff422 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -23,7 +23,6 @@ endfunction
 
 function! SyntaxCheckers_python_pylint_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
         \ '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 =
@@ -33,9 +32,12 @@ function! SyntaxCheckers_python_pylint_GetLocList() dict
         \ '%-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
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index e962065d..5023ee6c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -26,15 +26,16 @@ function! SyntaxCheckers_python_python_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'TERM=dumb'),
-        \ 'exe': [self.getExec(), s:compiler] })
+    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s: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
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
index 9dba591a..bf57b091 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -20,7 +20,6 @@ set cpo&vim
 
 function! SyntaxCheckers_ruby_jruby_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'RUBYOPT='),
         \ 'args': (syntastic#util#isRunningWindows() ? '-T1' : ''),
         \ 'args_after': '-W1 -c' })
 
@@ -33,9 +32,12 @@ function! SyntaxCheckers_ruby_jruby_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
index a5fc1c40..54c8365f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -18,9 +18,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_macruby_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': 'RUBYOPT=',
-        \ 'args_after': '-W1 -c' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-W1 -c' })
 
     let errorformat =
         \ '%-GSyntax OK,'.
@@ -31,9 +29,12 @@ function! SyntaxCheckers_ruby_macruby_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index 08af1b45..e55c493d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -35,9 +35,7 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe_before': (syntastic#util#isRunningWindows() ? '' : 'RUBYOPT='),
-        \ 'args_after': '-w -T1 -c' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-w -T1 -c' })
 
     "this is a hack to filter out a repeated useless warning in rspec files
     "containing lines like
@@ -62,9 +60,12 @@ function! SyntaxCheckers_ruby_mri_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 309e5878..7122de1f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -53,7 +53,7 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict
     " value 3: the message is a warning
     "
     " References: :help vimlint-errorcode and :help vimlint-variables
-    return vimlint#vimlint(expand('%'), {
+    let param = {
         \ 'output': function('s:vimlintOutput'),
         \ 'quiet':  1,
         \ 'EVL102': 3,
@@ -63,7 +63,16 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict
         \ 'EVL106': 3,
         \ 'EVL201': 3,
         \ 'EVL204': 3,
-        \ 'EVL205': 3 })
+        \ 'EVL205': 3 }
+
+    if exists('g:syntastic_vimlint_options')
+        if type(g:syntastic_vimlint_options) == type({})
+            let options = filter(copy(g:syntastic_vimlint_options), 'v:key =~# "\\m^EVL"')
+            call extend(param, options, 'force')
+        endif
+    endif
+
+    return vimlint#vimlint(expand('%'), param)
 endfunction
 
 " @vimlint(EVL103, 1, a:filename)
diff --git a/sources_non_forked/tlib/autoload/tlib/arg.vim b/sources_non_forked/tlib/autoload/tlib/arg.vim
index e7f1315b..96d5dc5b 100644
--- a/sources_non_forked/tlib/autoload/tlib/arg.vim
+++ b/sources_non_forked/tlib/autoload/tlib/arg.vim
@@ -1,15 +1,8 @@
-" arg.vim
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Created:     2007-06-30.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.50
-
-if &cp || exists("loaded_tlib_arg_autoload")
-    finish
-endif
-let loaded_tlib_arg_autoload = 1
+" @Last Change: 2014-07-01.
+" @Revision:    63
 
 
 " :def: function! tlib#arg#Get(n, var, ?default="", ?test='')
@@ -50,32 +43,40 @@ function! tlib#arg#Key(list, ...) "{{{3
 endf
 
 
-" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0)
+" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':')
 function! tlib#arg#StringAsKeyArgs(string, ...) "{{{1
-    TVarArg ['keys', {}], ['evaluate', 0]
+    TVarArg ['keys', {}], ['evaluate', 0], ['sep', ':']
     let keyargs = {}
     let args = split(a:string, '\\\@<! ')
-    let arglist = map(args, 'matchlist(v:val, ''^\(\w\+\):\(.*\)$'')')
+    let arglist = map(args, 'matchlist(v:val, ''^\%(\(\w\+\)'. sep .'\(.*\)\|\(.*\)\)$'')')
     " TLogVAR a:string, args, arglist
+    let pos = 0
     for matchlist in arglist
-        if len(matchlist) < 3
-            throw 'Malformed key arguments: '. string(matchlist) .' in '. a:string
-        endif
-        let [match, key, val; rest] = matchlist
-        if empty(keys) || has_key(keys, key)
-            let val = substitute(val, '\\\\', '\\', 'g')
-            if evaluate
-                let val = eval(val)
-            endif
-            let keyargs[key] = val
+        if !empty(matchlist[3])
+            let keyargs[pos] = matchlist[3]
+            let pos += 1
         else
-            echom 'Unknown key: '. key .'='. val
+            let [match, key, val; rest] = matchlist
+            if empty(keys) || has_key(keys, key)
+                let val = substitute(val, '\\\\', '\\', 'g')
+                if evaluate
+                    let val = eval(val)
+                endif
+                let keyargs[key] = val
+            else
+                echom 'Unknown key: '. key .'='. val
+            endif
         endif
     endfor
     return keyargs
 endf
 
 
+function! tlib#arg#StringAsKeyArgsEqual(string) "{{{1
+    return tlib#arg#StringAsKeyArgs(a:string, [], 0, '=')
+endf
+
+
 
 """ Command line {{{1
 
diff --git a/sources_non_forked/tlib/autoload/tlib/dir.vim b/sources_non_forked/tlib/autoload/tlib/dir.vim
index c3902972..758ab7d9 100644
--- a/sources_non_forked/tlib/autoload/tlib/dir.vim
+++ b/sources_non_forked/tlib/autoload/tlib/dir.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.37
+" @Last Change: 2014-07-07.
+" @Revision:    0.0.38
 
 if &cp || exists("loaded_tlib_dir_autoload")
     finish
@@ -21,10 +21,11 @@ let s:dir_stack = []
 "   tlib#dir#CanonicName('foo/bar')
 "   => 'foo/bar/'
 function! tlib#dir#CanonicName(dirname) "{{{3
-    if a:dirname !~ '[/\\]$'
-        return a:dirname . g:tlib#dir#sep
+    let dirname = tlib#file#Canonic(a:dirname)
+    if dirname !~ '[/\\]$'
+        return dirname . g:tlib#dir#sep
     endif
-    return a:dirname
+    return dirname
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/file.vim b/sources_non_forked/tlib/autoload/tlib/file.vim
index 85009e37..b4a4d9e6 100644
--- a/sources_non_forked/tlib/autoload/tlib/file.vim
+++ b/sources_non_forked/tlib/autoload/tlib/file.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.142
+" @Last Change: 2014-07-07.
+" @Revision:    0.0.150
 
 if &cp || exists("loaded_tlib_file_autoload")
     finish
@@ -103,6 +103,25 @@ function! tlib#file#Absolute(filename, ...) "{{{3
 endf
 
 
+function! tlib#file#Canonic(filename, ...) "{{{3
+    TVarArg ['mode', '']
+    if a:filename =~ '^\\\\'
+        let mode = 'windows'
+    elseif a:filename =~ '^\(file\|ftp\|http\)s\?:'
+        let mode = 'url'
+    elseif (empty(mode) && g:tlib#sys#windows)
+        let mode = 'windows'
+    endif
+    let filename = a:filename
+    if mode == 'windows'
+        let filename = substitute(filename, '/', '\\', 'g')
+    else
+        let filename = substitute(filename, '\\', '/', 'g')
+    endif
+    return filename
+endf
+
+
 function! s:SetScrollBind(world) "{{{3
     let sb = get(a:world, 'scrollbind', &scrollbind)
     if sb != &scrollbind
diff --git a/sources_non_forked/tlib/autoload/tlib/list.vim b/sources_non_forked/tlib/autoload/tlib/list.vim
index 28fd40b2..31696fae 100644
--- a/sources_non_forked/tlib/autoload/tlib/list.vim
+++ b/sources_non_forked/tlib/autoload/tlib/list.vim
@@ -4,7 +4,7 @@
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
 " @Last Change: 2011-03-18.
-" @Revision:    53
+" @Revision:    57
 
 
 """ List related functions {{{1
@@ -166,3 +166,15 @@ function! tlib#list#Uniq(list, ...) "{{{3
     return uniques
 endf
 
+
+function! tlib#list#ToDictionary(list, default, ...) "{{{3
+    TVarArg ['generator', '']
+    let dict = {}
+    for item in a:list
+        if !empty(item)
+            let dict[item] = empty(generator) ? a:default : call(generator, [item, a:default])
+        endif
+    endfor
+    return dict
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/sys.vim b/sources_non_forked/tlib/autoload/tlib/sys.vim
new file mode 100644
index 00000000..7808153d
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/sys.vim
@@ -0,0 +1,127 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2014-06-30.
+" @Revision:    25
+
+
+if !exists('g:tlib#sys#windows')
+    let g:tlib#sys#windows = &shell !~ 'sh' && (has('win16') || has('win32') || has('win64'))   "{{{2
+endif
+
+
+if !exists('g:tlib#sys#null')
+    let g:tlib#sys#null = g:tlib#sys#windows ? 'NUL' : (filereadable('/dev/null') ? '/dev/null' : '')    "{{{2
+endif
+
+
+let s:executables = {}
+
+function! tlib#sys#IsExecutable(cmd, ...) "{{{3
+    " TLogVAR a:cmd
+    " echom "DBG has_key(s:executables, a:cmd)" has_key(s:executables, a:cmd)
+    if !has_key(s:executables, a:cmd)
+        let executable = executable(a:cmd)
+        " TLogVAR 1, executable
+        let ignore_cyg = a:0 >= 1 ? a:1 : !g:tlib#sys#windows
+        if !executable && !ignore_cyg
+            let executable = tlib#sys#IsCygwinBin(a:cmd)
+            " TLogVAR 2, executable
+        endif
+        let s:executables[a:cmd] = executable
+    endif
+    " echom "DBG s:executables[a:cmd]" s:executables[a:cmd]
+    return s:executables[a:cmd]
+endf
+
+
+if !exists('g:tlib#sys#check_cygpath')
+    " If true, check whether we have to convert a path via cyppath -- 
+    " see |tlib#sys#MaybeUseCygpath|
+    let g:tlib#sys#check_cygpath = g:tlib#sys#windows && tlib#sys#IsExecutable('cygpath')   "{{{2
+endif
+
+
+if !exists('g:tlib#sys#cygwin_path_rx')
+    " If a full windows filename (with slashes instead of backslashes) 
+    " matches this |regexp|, it is assumed to be a cygwin executable.
+    let g:tlib#sys#cygwin_path_rx = '/cygwin/'   "{{{2
+endif
+
+
+if !exists('g:tlib#sys#cygwin_expr')
+    " For cygwin binaries, convert command calls using this vim 
+    " expression.
+    let g:tlib#sys#cygwin_expr = '"bash -c ''". escape(%s, "''\\") ."''"'   "{{{2
+endif
+
+
+let s:cygwin = {}
+
+function! tlib#sys#IsCygwinBin(cmd) "{{{3
+    " TLogVAR a:cmd
+    if !g:tlib#sys#windows
+        return 0
+    elseif has_key(s:cygwin, a:cmd)
+        let rv = s:cygwin[a:cmd]
+    else
+        if !tlib#sys#IsExecutable('cygpath', 1) || !tlib#sys#IsExecutable('which', 1)
+            let rv = 0
+        else
+            let which = substitute(system('which '. shellescape(a:cmd)), '\n$', '', '')
+            " echom "DBG which:" which
+            if which =~ '^/'
+                let filename = system('cygpath -ma '. shellescape(which))
+                " echom "DBG filename:" filename
+                let rv = filename =~ g:tlib#sys#cygwin_path_rx
+            else
+                let rv = 0
+            endif
+        endif
+        let s:cygwin[a:cmd] = rv
+    endif
+    " TLogVAR rv
+    return rv
+endf
+
+
+function! tlib#sys#GetCmd(cmd) "{{{3
+    if !empty(g:tlib#sys#cygwin_expr) && tlib#sys#IsCygwinBin(matchstr(a:cmd, '^\S\+'))
+        let cmd = eval(printf(g:tlib#sys#cygwin_expr, string(a:cmd)))
+        " TLogVAR cmd
+        return cmd
+    else
+        return a:cmd
+    endif
+endf
+
+
+" If cmd seems to be a cygwin executable, use cygpath to convert 
+" filenames. This assumes that cygwin's which command returns full 
+" filenames for non-cygwin executables.
+function! tlib#sys#MaybeUseCygpath(cmd) "{{{3
+    " echom "DBG" a:cmd
+    if g:tlib#sys#check_cygpath && tlib#sys#IsCygwinBin(a:cmd)
+        return 'cygpath -u "%s"'
+    endif
+    return ''
+endf
+
+
+function! tlib#sys#ConvertPath(converter, filename) "{{{3
+    return tlib#string#Chomp(system(printf(a:converter, shellescape(a:filename))))
+endf
+
+
+let s:native_filenames = {}
+
+function! tlib#sys#FileArgs(cmd, files) "{{{3
+    let cygpath = tlib#sys#MaybeUseCygpath(a:cmd)
+    " TLogVAR cygpath
+    if empty(cygpath)
+        return a:files
+    else
+        let files = map(copy(a:files), 'has_key(s:native_filenames, v:val) ? s:native_filenames[v:val] : tlib#sys#CygPath(v:val)')
+        return files
+    endif
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/var.vim b/sources_non_forked/tlib/autoload/tlib/var.vim
index 0f44b8af..86c1350a 100644
--- a/sources_non_forked/tlib/autoload/tlib/var.vim
+++ b/sources_non_forked/tlib/autoload/tlib/var.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.23
+" @Last Change: 2014-07-03.
+" @Revision:    0.0.26
 
 if &cp || exists("loaded_tlib_var_autoload")
     finish
@@ -58,10 +58,12 @@ endf
 "   echo tlib#var#Get('foo', 'bg')  => 2
 "   echo tlib#var#Get('foo', 'wbg') => 3
 function! tlib#var#Get(var, namespace, ...) "{{{3
+    let var_ = substitute(a:var, '#', '_', 'g')
     for namespace in split(a:namespace, '\zs')
-        let var = namespace .':'. a:var
+        let vname = namespace == 'g' ? a:var : var_
+        let var = namespace .':'. vname
         if exists(var)
-            return eval(var)
+            return {var}
         endif
     endfor
     return a:0 >= 1 ? a:1 : ''
diff --git a/sources_non_forked/tlib/autoload/tlib/vcs.vim b/sources_non_forked/tlib/autoload/tlib/vcs.vim
index 42bb0c25..6166db8c 100644
--- a/sources_non_forked/tlib/autoload/tlib/vcs.vim
+++ b/sources_non_forked/tlib/autoload/tlib/vcs.vim
@@ -2,8 +2,8 @@
 " @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-03-08.
-" @Last Change: 2012-09-10.
-" @Revision:    122
+" @Last Change: 2014-07-01.
+" @Revision:    131
 
 
 " A dictionarie of supported VCS (currently: git, hg, svn, bzr).
@@ -49,16 +49,21 @@ if !empty(g:tlib#vcs#check)
             let g:tlib#vcs#executables[s:cmd] = executable(s:cmd1) ? s:cmd1 : ''
         endif
     endfor
+    unlet! s:cmd s:def s:cmd1
 endif
 
 
+function! tlib#vcs#Executable(type) "{{{3
+    return get(g:tlib#vcs#executables, a:type, '')
+endf
+
+
 function! tlib#vcs#FindVCS(filename) "{{{3
     let type = ''
     let dir  = ''
-    " let path = escape(fnamemodify(a:filename, ':p'), ',:') .';'
-    let filename = fnamemodify(a:filename, isdirectory(a:filename) ? ':p:h' : ':p')
-    let path = escape(filename, ';') .';'
-    " TLogVAR a:filename, path
+    let dirname = fnamemodify(a:filename, isdirectory(a:filename) ? ':p' : ':p:h')
+    let path = escape(dirname, ';') .';'
+    " TLogVAR a:filename, dirname, path
     let depth = -1
     for vcs in keys(g:tlib#vcs#def)
         let subdir = g:tlib#vcs#def[vcs].dir
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index 9c509b3a..3d5fc3f3 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -77,6 +77,7 @@ Contents~
         tlib#list#RemoveAll .................... |tlib#list#RemoveAll()|
         tlib#list#Zip .......................... |tlib#list#Zip()|
         tlib#list#Uniq ......................... |tlib#list#Uniq()|
+        tlib#list#ToDictionary ................. |tlib#list#ToDictionary()|
         tlib#cmd#OutputAsList .................. |tlib#cmd#OutputAsList()|
         tlib#cmd#BrowseOutput .................. |tlib#cmd#BrowseOutput()|
         tlib#cmd#BrowseOutputWithCallback ...... |tlib#cmd#BrowseOutputWithCallback()|
@@ -92,6 +93,7 @@ Contents~
         g:tlib#vcs#def ......................... |g:tlib#vcs#def|
         g:tlib#vcs#executables ................. |g:tlib#vcs#executables|
         g:tlib#vcs#check ....................... |g:tlib#vcs#check|
+        tlib#vcs#Executable .................... |tlib#vcs#Executable()|
         tlib#vcs#FindVCS ....................... |tlib#vcs#FindVCS()|
         tlib#vcs#Ls ............................ |tlib#vcs#Ls()|
         tlib#vcs#Diff .......................... |tlib#vcs#Diff()|
@@ -239,7 +241,19 @@ Contents~
         tlib#file#Join ......................... |tlib#file#Join()|
         tlib#file#Relative ..................... |tlib#file#Relative()|
         tlib#file#Absolute ..................... |tlib#file#Absolute()|
+        tlib#file#Canonic ...................... |tlib#file#Canonic()|
         tlib#file#With ......................... |tlib#file#With()|
+        g:tlib#sys#windows ..................... |g:tlib#sys#windows|
+        g:tlib#sys#null ........................ |g:tlib#sys#null|
+        tlib#sys#IsExecutable .................. |tlib#sys#IsExecutable()|
+        g:tlib#sys#check_cygpath ............... |g:tlib#sys#check_cygpath|
+        g:tlib#sys#cygwin_path_rx .............. |g:tlib#sys#cygwin_path_rx|
+        g:tlib#sys#cygwin_expr ................. |g:tlib#sys#cygwin_expr|
+        tlib#sys#IsCygwinBin ................... |tlib#sys#IsCygwinBin()|
+        tlib#sys#GetCmd ........................ |tlib#sys#GetCmd()|
+        tlib#sys#MaybeUseCygpath ............... |tlib#sys#MaybeUseCygpath()|
+        tlib#sys#ConvertPath ................... |tlib#sys#ConvertPath()|
+        tlib#sys#FileArgs ...................... |tlib#sys#FileArgs()|
         tlib#paragraph#GetMetric ............... |tlib#paragraph#GetMetric()|
         tlib#paragraph#Move .................... |tlib#paragraph#Move()|
         g:tlib_inputlist_pct ................... |g:tlib_inputlist_pct|
@@ -269,6 +283,7 @@ Contents~
         tlib#arg#Let ........................... |tlib#arg#Let()|
         tlib#arg#Key ........................... |tlib#arg#Key()|
         tlib#arg#StringAsKeyArgs ............... |tlib#arg#StringAsKeyArgs()|
+        tlib#arg#StringAsKeyArgsEqual .......... |tlib#arg#StringAsKeyArgsEqual()|
         tlib#arg#Ex ............................ |tlib#arg#Ex()|
         tlib#fixes#Winpos ...................... |tlib#fixes#Winpos()|
         g:tlib#dir#sep ......................... |g:tlib#dir#sep|
@@ -658,6 +673,9 @@ tlib#list#Zip(lists, ?default='')
                                                     *tlib#list#Uniq()*
 tlib#list#Uniq(list, ...)
 
+                                                    *tlib#list#ToDictionary()*
+tlib#list#ToDictionary(list, default, ...)
+
 
 ========================================================================
 autoload/tlib/cmd.vim~
@@ -747,6 +765,9 @@ g:tlib#vcs#check               (default: has('win16') || has('win32') || has('wi
     If non-empty, use it as a format string to check whether a VCS is 
     installed on your computer.
 
+                                                    *tlib#vcs#Executable()*
+tlib#vcs#Executable(type)
+
                                                     *tlib#vcs#FindVCS()*
 tlib#vcs#FindVCS(filename)
 
@@ -1571,10 +1592,59 @@ tlib#file#Relative(filename, basedir)
                                                     *tlib#file#Absolute()*
 tlib#file#Absolute(filename, ...)
 
+                                                    *tlib#file#Canonic()*
+tlib#file#Canonic(filename, ...)
+
                                                     *tlib#file#With()*
 tlib#file#With(fcmd, bcmd, files, ?world={})
 
 
+========================================================================
+autoload/tlib/sys.vim~
+
+                                                    *g:tlib#sys#windows*
+g:tlib#sys#windows             (default: &shell !~ 'sh' && (has('win16') || has('win32') || has('win64')))
+
+                                                    *g:tlib#sys#null*
+g:tlib#sys#null                (default: g:tlib#sys#windows ? 'NUL' : (filereadable('/dev/null') ? '/dev/null' : ''))
+
+                                                    *tlib#sys#IsExecutable()*
+tlib#sys#IsExecutable(cmd, ...)
+
+                                                    *g:tlib#sys#check_cygpath*
+g:tlib#sys#check_cygpath       (default: g:tlib#sys#windows && tlib#sys#IsExecutable('cygpath'))
+    If true, check whether we have to convert a path via cyppath -- 
+    see |tlib#sys#MaybeUseCygpath|
+
+                                                    *g:tlib#sys#cygwin_path_rx*
+g:tlib#sys#cygwin_path_rx      (default: '/cygwin/')
+    If a full windows filename (with slashes instead of backslashes) 
+    matches this |regexp|, it is assumed to be a cygwin executable.
+
+                                                    *g:tlib#sys#cygwin_expr*
+g:tlib#sys#cygwin_expr         (default: '"bash -c ''". escape(%s, "''\\") ."''"')
+    For cygwin binaries, convert command calls using this vim 
+    expression.
+
+                                                    *tlib#sys#IsCygwinBin()*
+tlib#sys#IsCygwinBin(cmd)
+
+                                                    *tlib#sys#GetCmd()*
+tlib#sys#GetCmd(cmd)
+
+                                                    *tlib#sys#MaybeUseCygpath()*
+tlib#sys#MaybeUseCygpath(cmd)
+    If cmd seems to be a cygwin executable, use cygpath to convert 
+    filenames. This assumes that cygwin's which command returns full 
+    filenames for non-cygwin executables.
+
+                                                    *tlib#sys#ConvertPath()*
+tlib#sys#ConvertPath(converter, filename)
+
+                                                    *tlib#sys#FileArgs()*
+tlib#sys#FileArgs(cmd, files)
+
+
 ========================================================================
 autoload/tlib/paragraph.vim~
 
@@ -1734,7 +1804,10 @@ tlib#arg#Key(dict, list, ?default='')
     See |:TKeyArg|.
 
                                                     *tlib#arg#StringAsKeyArgs()*
-tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0)
+tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':')
+
+                                                    *tlib#arg#StringAsKeyArgsEqual()*
+tlib#arg#StringAsKeyArgsEqual(string)
 
                                                     *tlib#arg#Ex()*
 tlib#arg#Ex(arg, ?chars='%#! ')
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index 78a8818e..cadec3ea 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -1,8 +1,8 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Created:     2007-04-10.
-" @Last Change: 2013-09-25.
+" @Last Change: 2014-07-03.
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    751
+" @Revision:    753
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " GetLatestVimScripts: 1863 1 tlib.vim
 " tlib.vim -- Some utility functions
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 110
+let loaded_tlib = 112
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index c6408d56..64560738 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -211,6 +211,10 @@ function! airline#extensions#load()
       call airline#extensions#nrrwrgn#init(s:ext)
   endif
 
+  if (get(g:, 'airline#extensions#capslock#enabled', 1) && exists('*CapsLockStatusline'))
+    call airline#extensions#capslock#init(s:ext)
+  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).
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
new file mode 100644
index 00000000..689b5617
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
@@ -0,0 +1,14 @@
+" MIT License. Copyright (c) 2014 Mathias Andersson.
+" vim: et ts=2 sts=2 sw=2
+if !exists('*CapsLockStatusline')
+  finish
+endif
+
+function! airline#extensions#capslock#status()
+  return CapsLockStatusline() == '[caps]' ? 'CAPS' : ''
+endfunction
+
+function! airline#extensions#capslock#init(ext)
+  call airline#parts#define_function('capslock', 'airline#extensions#capslock#status')
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index a60774d8..539f2c49 100644
--- a/sources_non_forked/vim-airline/autoload/airline/init.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -79,6 +79,7 @@ function! airline#init#bootstrap()
   call airline#parts#define_raw('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
   call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
   call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace'])
+  call airline#parts#define_text('capslock', '')
 
   unlet g:airline#init#bootstrapping
 endfunction
@@ -86,7 +87,7 @@ 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', 'paste', 'iminsert'])
+    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'capslock', 'iminsert'])
   endif
   if !exists('g:airline_section_b')
     let g:airline_section_b = airline#section#create(['hunks', 'branch'])
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 1206a65a..cd2a17c5 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -139,7 +139,7 @@ COMMANDS                                                  *airline-commands*
   Toggles between the standard 'statusline' and airline.
 
 :AirlineRefresh                                            *:AirlineRefresh*
-  Refreshes all highlight groups.
+  Refreshes all highlight groups and redraws the statusline.
 
 ==============================================================================
 CUSTOMIZATION                                        *airline-customization*
@@ -502,6 +502,12 @@ 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
+<
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
 
diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/sources_non_forked/vim-airline/plugin/airline.vim
index e75535fe..d53c4929 100644
--- a/sources_non_forked/vim-airline/plugin/airline.vim
+++ b/sources_non_forked/vim-airline/plugin/airline.vim
@@ -103,7 +103,7 @@ endfunction
 command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
 command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
 command! AirlineToggle call <sid>airline_toggle()
-command! AirlineRefresh call airline#load_theme()
+command! AirlineRefresh call airline#load_theme() | call airline#update_statusline()
 
 call <sid>airline_toggle()
 
diff --git a/sources_non_forked/vim-fugitive/README.markdown b/sources_non_forked/vim-fugitive/README.markdown
index 0c5b3071..71b8bc47 100644
--- a/sources_non_forked/vim-fugitive/README.markdown
+++ b/sources_non_forked/vim-fugitive/README.markdown
@@ -55,15 +55,13 @@ and `Git!` to open the output of a command in a temp file.
 
 ## Installation
 
-If you don't have a preferred installation method, I recommend
-installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
-then simply copy and paste:
+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
-
-Once help tags have been generated, you can view the manual with
-`:help fugitive`.
+    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
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 7232066b..b5a204b2 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -185,9 +185,11 @@ function! fugitive#detect(path) abort
     if expand('%:p') =~# '//'
       call buffer.setvar('&path', s:sub(buffer.getvar('&path'), '^\.%(,|$)', ''))
     endif
-    if stridx(buffer.getvar('&tags'), escape(b:git_dir.'/tags', ', ')) == -1
-      call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags'))
-      if &filetype !=# ''
+    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
@@ -1007,9 +1009,10 @@ function! s:Commit(args, ...) abort
       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,'%(%(^| )-- )@<!%(^| )@<=%(-[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
@@ -1162,7 +1165,7 @@ function! s:Merge(cmd, bang, args) abort
   if empty(filter(getqflist(),'v:val.valid'))
     if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG'))
       cclose
-      return 'Gcommit --no-status -t '.s:shellesc(s:repo().dir('MERGE_MSG'))
+      return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG'))
     endif
   endif
   let qflist = getqflist()
@@ -2172,17 +2175,29 @@ function! s:Browse(bang,line1,count,...) abort
       let raw = remote
     endif
 
-    let url = s:github_url(s:repo(),raw,rev,commit,path,type,a:line1,a:count)
-    if url == ''
-      let url = s:instaweb_url(s:repo(),rev,commit,path,type,a:count > 0 ? a:line1 : 0)
-    endif
+    for Handler in g:fugitive_browse_handlers
+      let url = call(Handler, [{
+            \ 'repo': s:repo(),
+            \ 'remote': raw,
+            \ 'revision': rev,
+            \ '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 url == ''
-      call s:throw("Instaweb failed to start and '".remote."' is not a GitHub remote")
+    if empty(url)
+      call s:throw("Instaweb failed to start and '".remote."' is not a supported remote")
     endif
 
     if a:bang
-      let @* = url
+      if has('clipboard')
+        let @* = url
+      endif
       return 'echomsg '.string(url)
     elseif exists(':Browse') == 2
       return 'echomsg '.string(url).'|Browse '.url
@@ -2194,24 +2209,27 @@ function! s:Browse(bang,line1,count,...) abort
   endtry
 endfunction
 
-function! s:github_url(repo,url,rev,commit,path,type,line1,line2) abort
-  let path = a:path
+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(a:url,'^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
+  let repo = matchstr(get(a:opts, 'remote'), '^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
   if repo ==# ''
     return ''
   endif
+  let path = a:opts.path
   if index(domains, 'http://' . matchstr(repo, '^[^:/]*')) >= 0
     let root = 'http://' . s:sub(repo,':','/')
   else
     let root = 'https://' . s:sub(repo,':','/')
   endif
   if path =~# '^\.git/refs/heads/'
-    let branch = a:repo.git_chomp('config','branch.'.path[16:-1].'.merge')[11:-1]
+    let branch = a:opts.repo.git_chomp('config','branch.'.path[16:-1].'.merge')[11:-1]
     if branch ==# ''
       return root . '/commits/' . path[16:-1]
     else
@@ -2224,27 +2242,27 @@ function! s:github_url(repo,url,rev,commit,path,type,line1,line2) abort
   elseif path =~# '^\.git\>'
     return root
   endif
-  if a:rev =~# '^[[:alnum:]._-]\+:'
-    let commit = matchstr(a:rev,'^[^:]*')
-  elseif a:commit =~# '^\d\=$'
-    let local = matchstr(a:repo.head_ref(),'\<refs/heads/\zs.*')
-    let commit = a:repo.git_chomp('config','branch.'.local.'.merge')[11:-1]
+  if a:opts.revision =~# '^[[:alnum:]._-]\+:'
+    let commit = matchstr(a:opts.revision,'^[^:]*')
+  elseif a:opts.commit =~# '^\d\=$'
+    let local = matchstr(a:opts.repo.head_ref(),'\<refs/heads/\zs.*')
+    let commit = a:opts.repo.git_chomp('config','branch.'.local.'.merge')[11:-1]
     if commit ==# ''
       let commit = local
     endif
   else
-    let commit = a:commit
+    let commit = a:opts.commit
   endif
-  if a:type == 'tree'
+  if a:opts.type == 'tree'
     let url = s:sub(root . '/tree/' . commit . '/' . path,'/$','')
-  elseif a:type == 'blob'
+  elseif a:opts.type == 'blob'
     let url = root . '/blob/' . commit . '/' . path
-    if a:line2 > 0 && a:line1 == a:line2
-      let url .= '#L' . a:line1
-    elseif a:line2 > 0
-      let url .= '#L' . a:line1 . '-' . a:line2
+    if get(a:opts, 'line2') && a:opts.line1 == a:opts.line2
+      let url .= '#L' . a:opts.line1
+    elseif get(a:opts, 'line2')
+      let url .= '#L' . a:opts.line1 . '-' . a:opts.line2
     endif
-  elseif a:type == 'tag'
+  elseif a:opts.type == 'tag'
     let commit = matchstr(getline(3),'^tag \zs.*')
     let url = root . '/tree/' . commit
   else
@@ -2253,47 +2271,54 @@ function! s:github_url(repo,url,rev,commit,path,type,line1,line2) abort
   return url
 endfunction
 
-function! s:instaweb_url(repo,rev,commit,path,type,...) abort
-  let output = a:repo.git_chomp('instaweb','-b','unknown')
+function! s:instaweb_url(opts) abort
+  let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
   if output =~# 'http://'
-    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:repo.dir(),':t')
+    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.opts.dir(),':t')
   else
     return ''
   endif
-  if a:path =~# '^\.git/refs/.'
-    return root . ';a=shortlog;h=' . matchstr(a:path,'^\.git/\zs.*')
-  elseif a:path =~# '^\.git\>'
+  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:commit =~# '^\x\{40\}$'
-    if a:type ==# 'commit'
+  if a:opts.commit =~# '^\x\{40\}$'
+    if a:opts.type ==# 'commit'
       let url .= ';a=commit'
     endif
-    let url .= ';h=' . a:repo.rev_parse(a:commit . (a:path == '' ? '' : ':' . a:path))
+    let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path))
   else
-    if a:type ==# 'blob'
+    if a:opts.type ==# 'blob'
       let tmp = tempname()
-      silent execute 'write !'.a:repo.git_command('hash-object','-w','--stdin').' > '.tmp
+      silent execute 'write !'.a:opts.repo.git_command('hash-object','-w','--stdin').' > '.tmp
       let url .= ';h=' . readfile(tmp)[0]
     else
       try
-        let url .= ';h=' . a:repo.rev_parse((a:commit == '' ? 'HEAD' : ':' . a:commit) . ':' . a:path)
+        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:repo.head_ref(),'[^ ]\+$')
+    let root .= ';hb=' . matchstr(a:opts.repo.head_ref(),'[^ ]\+$')
   endif
-  if a:path !=# ''
-    let url .= ';f=' . a:path
+  if a:opts.path !=# ''
+    let url .= ';f=' . a:opts.path
   endif
-  if a:0 && a:1
-    let url .= '#l' . a:1
+  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
@@ -2597,7 +2622,7 @@ augroup fugitive_temp
         \   let b:git_type = 'temp' |
         \   let b:git_args = s:temp_files[tolower(expand('<afile>:p'))].args |
         \   call fugitive#detect(expand('<afile>:p')) |
-        \   setlocal bufhidden=delete |
+        \   setlocal bufhidden=delete nobuflisted |
         \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
         \ endif
 augroup END
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 607488d9..8c981bbe 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -75,12 +75,14 @@ syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" conta
 syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
 syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
 
-syn region markdownItalic start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart
-syn region markdownItalic start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart
-syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic
-syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic
-syn region markdownBoldItalic start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart
-syn region markdownBoldItalic start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart
+let s:concealends = has('conceal') ? ' concealends' : ''
+exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownBold matchgroup=markdownBoldDelimiter start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic' . s:concealends
+exe 'syn region markdownBold matchgroup=markdownBoldDelimiter start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic' . s:concealends
+exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart' . s:concealends
+
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend
@@ -125,8 +127,11 @@ hi def link markdownUrlDelimiter          htmlTag
 hi def link markdownUrlTitleDelimiter     Delimiter
 
 hi def link markdownItalic                htmlItalic
+hi def link markdownItalicDelimiter       markdownItalic
 hi def link markdownBold                  htmlBold
+hi def link markdownBoldDelimiter         markdownBold
 hi def link markdownBoldItalic            htmlBoldItalic
+hi def link markdownBoldItalicDelimiter   markdownBoldItalic
 hi def link markdownCodeDelimiter         Delimiter
 
 hi def link markdownEscape                Special
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 1a60cc32..15d4c300 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -10,7 +10,7 @@ catch /.*/
 endtry
 
 " match $ which doesn't follow a \
-let s:d = '\%([\\]\@<!\$\)'
+let s:d = nr2char(31)
 
 fun! Filename(...)
 	let filename = expand('%:t:r')
@@ -103,6 +103,7 @@ endfunction
 " Prepare snippet to be processed by s:BuildTabStops
 fun! s:ProcessSnippet(snip)
 	let snippet = a:snip
+	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
 
 	if exists('b:snipmate_content_visual')
 		let visual = b:snipmate_content_visual
@@ -118,7 +119,7 @@ fun! s:ProcessSnippet(snip)
 	" Using a loop here instead of a regex fixes a bug with nested "\=".
 	if stridx(snippet, '`') != -1
 		let new = []
-		let snip = split(snippet, '\%(\\\@<!\%(\\\\\)*\)\@<=`', 1)
+		let snip = split(snippet, esc_bslash . '`', 1)
 		let isexp = 0
 		for i in snip
 			if isexp
@@ -131,13 +132,15 @@ fun! s:ProcessSnippet(snip)
 		let snippet = join(new, '')
 		let snippet = substitute(snippet, "\r", "\n", 'g')
 		let snippet = substitute(snippet, '\\`', "`", 'g')
-		let snippet = substitute(snippet, '\\\\', "\\", 'g')
 	endif
 
 	" Place all text after a colon in a tab stop after the tab stop
 	" (e.g. "${#:foo}" becomes "${:foo}foo").
 	" This helps tell the position of the tab stops later.
-	let snippet = substitute(snippet, s:d.'{\d\+:\(.\{-}\)}', '&\1', 'g')
+	let snippet = substitute(snippet, esc_bslash . '\$\({\d\+:\(.\{-}\)}\|{\d\+}\)', s:d . '\1\2', 'g')
+	let snippet = substitute(snippet, esc_bslash . '\$\(\d\+\)', s:d . '\1', 'g')
+	let snippet = substitute(snippet, esc_bslash . '\\\$', '$', 'g')
+	let snippet = substitute(snippet, '\\\\', "\\", 'g')
 
 	" Update the a:snip so that all the $# become the text after
 	" the colon in their associated ${#}.
@@ -153,14 +156,14 @@ fun! s:ProcessSnippet(snip)
 
 	" Add ${0} tab stop if found
 	if snippet =~ s:d . '{0'
-		let snippet = substitute(snippet, s:d.'{0', '${'.i, '')
+		let snippet = substitute(snippet, s:d.'{0', s:d . '{' . i, '')
 		let s = matchstr(snippet, s:d.'{'.i.':\zs.\{-}\ze}')
 		if s != ''
-			let snippet = substitute(snippet, s:d.'0', '$'.i, 'g')
+			let snippet = substitute(snippet, s:d.'0', s:d . i, 'g')
 			let snippet = substitute(snippet, s:d.i, s.'&', 'g')
 		endif
 	else
-		let snippet .= '${'.i.'}'
+		let snippet .= s:d . '{'.i.'}'
 	endif
 
 	if &et " Expand tabs to spaces if 'expandtab' is set.
@@ -194,7 +197,7 @@ endf
 fun! s:BuildTabStops(snip, lnum, col, indent)
 	let snipPos = []
 	let i = 1
-	let withoutVars = substitute(a:snip, '$\d\+', '', 'g')
+	let withoutVars = substitute(a:snip, s:d . '\d\+', '', 'g')
 	while a:snip =~ s:d.'{'.i
 		let beforeTabStop = matchstr(withoutVars, '^.*\ze'.s:d .'{'.i.'\D')
 		let withoutOthers = substitute(withoutVars, ''.s:d .'{\('.i.'\D\)\@!\d\+.\{-}}', '', 'g')
@@ -243,13 +246,12 @@ function! s:state_proto.jump_stop(backwards)
 	" Loop over the snippet when going backwards from the beginning
 	if self.stop_no < 0 | let self.stop_no = self.stop_count - 1 | endif
 
-	if self.stop_no == self.stop_count
-		call self.remove()
-		return ''
-	endif
-
 	call self.set_stop(self.stop_no)
-	return self.select_word()
+	let ret = self.select_word()
+	if self.stop_no == self.stop_count - 1
+		call self.remove()
+	endif
+	return ret
 endfunction
 
 " Updates tab stops/vars
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 1d280903..67a4d028 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -117,7 +117,7 @@ function! s:load_scopes(bang, ...)
 	let gb.snipMate.scope_aliases['_'] = join(split(get(gb.snipMate.scope_aliases, '_', ''), ',') + a:000, ',')
 endfunction
 
-command! -bang -bar -nargs=+ SnipMateLoadScopes
+command! -bang -bar -nargs=+ SnipMateLoadScope
 			\ call s:load_scopes(<bang>0, <f-args>)
 
 " Edit snippet files
diff --git a/sources_non_forked/vim-snippets/.gitignore b/sources_non_forked/vim-snippets/.gitignore
new file mode 100644
index 00000000..0d20b648
--- /dev/null
+++ b/sources_non_forked/vim-snippets/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index 118cdfec..ae58c9f2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -1,3 +1,5 @@
+extends html
+
 priority -50
 
 # TextMate added these variables to cope with changes in ERB handling
diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 02b95e1e..54ca6f35 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -184,7 +184,7 @@ else if ($1)`!p nl(snip)`{
 }
 endsnippet
 
-snippet /el(se)?/ "else" r
+snippet el "else" w
 else`!p nl(snip)`{
 	$0
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets b/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
index 4bf46916..7d7a84da 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ledger.snippets
@@ -2,7 +2,6 @@ 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
+	${6:Expenses}  		\$${7:0.00}
+	${8:Assets:Checking}$0
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 84003a72..b7109120 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -224,7 +224,7 @@ class $1
 {
 	public function ${3:__construct}(${4:$options})
 	{
-		${4:// code}
+		${5:// code}
 	}
 }
 $0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 64b5cfd2..233ad332 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -47,10 +47,10 @@ class Arg(object):
 
 	def __str__(self):
 		return self.name
-	
+
 	def __unicode__(self):
 		return self.name
-	
+
 	def is_kwarg(self):
 		return '=' in self.arg
 
@@ -560,6 +560,13 @@ snippet ar "Assert raises" b
 self.assertRaises(${1:exception}, ${2:func}${3/.+/, /}${3:arguments})
 endsnippet
 
+snippet an "Assert is None" b
+self.assertIsNone(${0:expression})
+endsnippet
+
+snippet ann "Assert is not None" b
+self.assertIsNotNone(${0:expression})
+endsnippet
 
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
index 3763a95e..0596eee1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rst.snippets
@@ -42,18 +42,9 @@ INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
 
 
-def has_cjk(char):
-	"""
-	Detect char contains CJK character
-
-	:param char: characters needs to be detect
-	"""
-	try:
-		CJK_RE.finditer(char).next()
-	except StopIteration:
-		return False
-	else:
-		return True
+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
@@ -74,15 +65,17 @@ def check_file_exist(rst_path, relative_path):
 		return abs_path
 
 
-def rst_char_len(char):
-	"""
-	return len of string which fit in rst
-	For instance:chinese "我" decode as only one character,
-	However, the rst interpreter needs 2 "=" instead of 1.
+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
 
-	:param: char needs to be count
-	"""
-	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
 def	make_items(times, leading='+'):
 	"""
@@ -94,7 +87,7 @@ def	make_items(times, leading='+'):
 	times = int(times)
 	if leading == 1:
 		msg = ""
-		for x in xrange(1, times+1):
+		for x in range(1, times+1):
 			msg += "%s. Item\n" % x
 		return msg
 	else:
@@ -136,43 +129,43 @@ endglobal
 
 snippet part "Part" b
 `!p snip.rv = rst_char_len(t[1])*'#'`
-${1:Part name}
+${1:${VISUAL:Part name}}
 `!p snip.rv = rst_char_len(t[1])*'#'`
 
 $0
 endsnippet
 
-snippet sec "Section" b
-${1:Section name}
-`!p snip.rv = rst_char_len(t[1])*'='`
-
-$0
-endsnippet
-
-snippet ssec "Subsection" b
-${1:Section name}
-`!p snip.rv = rst_char_len(t[1])*'-'`
-
-$0
-endsnippet
-
-snippet sssec "Subsubsection" b
-${1:Section name}
-`!p snip.rv = rst_char_len(t[1])*'^'`
-
-$0
-endsnippet
-
 snippet chap "Chapter" b
 `!p snip.rv = rst_char_len(t[1])*'*'`
-${1:Chapter name}
+${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:Paragraph name}
+${1:${VISUAL:Paragraph name}}
 `!p snip.rv = rst_char_len(t[1])*'"'`
 
 $0
@@ -180,7 +173,7 @@ endsnippet
 
 snippet em "Emphasize string" i
 `!p
-# dirty but works with CJK charactor detection
+# 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):
@@ -224,7 +217,7 @@ endsnippet
 snippet cb "Code Block" b
 .. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
-	${2:code}
+	${2:${VISUAL:code}}
 
 $0
 endsnippet
@@ -247,7 +240,10 @@ if di == 'fi':
 	:alt: {0}
 	{0}""".format(real_name)
 `
-..`!p snip.rv = " %s" % link if link else ""` $1`!p snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)`:: ${2:file}`!p if content:
+..`!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
@@ -261,7 +257,7 @@ endsnippet
 snippet di "Directives" b
 .. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
 
-	${3:Content}
+	${3:${VISUAL:Content}}
 $0
 endsnippet
 
@@ -273,7 +269,7 @@ endsnippet
 snippet sa "Specific Admonitions" b
 .. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
 
-	${2:Content}
+	${2:${VISUAL:Content}}
 
 $0
 endsnippet
@@ -292,6 +288,6 @@ endsnippet
 snippet sid "SideBar" b
 .. sidebar:: ${1:SideBar Title}
 
-	${2:SideBar Content}
+	${2:${VISUAL:SideBar Content}}
 endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 5620caae..3642bbca 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -47,6 +47,9 @@ snippet backspace
 # ⎋
 snippet esc
 	&#x238B;
+# comment
+snippet //
+	<!-- ${1} -->${0}
 # Generic Doctype
 snippet doctype HTML 4.01 Strict
 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index 39a008ef..d20d7136 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -94,6 +94,9 @@ snippet gett
 # console.log (Firebug)
 snippet cl
 	console.log(${0});
+# console.debug (Firebug)
+snippet cd
+	console.debug(${0});
 # return
 snippet ret
 	return ${0:result}
diff --git a/sources_non_forked/vim-snippets/snippets/rails.snippets b/sources_non_forked/vim-snippets/snippets/rails.snippets
new file mode 100644
index 00000000..d8fe2be2
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/rails.snippets
@@ -0,0 +1,484 @@
+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(params[:$1])
+
+		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_attributes(params[:$1])
+				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 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 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 'should ${1: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 ${1:class_name} < ActiveRecord::Migration
+		def up
+			${0}
+		end
+
+		def down
+		end
+	end
+snippet migration class .. < ActiveRecord::Migration .. def change .. end
+	class ${1:class_name} < 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/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 5d9c01ea..fd4172c1 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -1,7 +1,3 @@
-########################################
-# Ruby snippets - for Rails, see below #
-########################################
-
 # encoding for Ruby 1.9
 snippet enc
 	# encoding: utf-8
@@ -35,9 +31,9 @@ snippet beg
 	end
 
 snippet req require
-	require "${1}"
+	require '${1}'
 snippet reqr
-	require_relative "${1}"
+	require_relative '${1}'
 snippet #
 	# =>
 snippet end
@@ -61,7 +57,7 @@ snippet deft
 snippet descendants
 	class Class
 		def descendants
-			ObjectSpace.each_object(::Class).select {|klass| klass < self }
+			ObjectSpace.each_object(::Class).select { |klass| klass < self }
 		end
 	end
 snippet if
@@ -232,13 +228,13 @@ snippet array
 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} }
+	File.foreach(${1:'path/to/file'}) { |${2:line}| ${0} }
 snippet file File.read()
-	File.read(${1:"path/to/file"})
+	File.read(${1:'path/to/file'})
 snippet Dir Dir.global() { |file| .. }
-	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${0} }
+	Dir.glob(${1:'dir/glob/*'}) { |${2:file}| ${0} }
 snippet Dir Dir[".."]
-	Dir[${1:"glob/**/*.rb"}]
+	Dir[${1:'glob/**/*.rb'}]
 snippet dir
 	Filename.dirname(__FILE__)
 snippet deli
@@ -247,7 +243,7 @@ snippet fil
 	fill(${1:range}) { |${2:i}| ${0} }
 # flatten_once()
 snippet flao
-	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}
+	reduce(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2) }
 snippet zip
 	zip(${1:enums}) { |${2:row}| ${0} }
 # downto(0) { |n| .. }
@@ -419,6 +415,10 @@ snippet seld
 	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
@@ -432,12 +432,12 @@ snippet dov
 		${2}
 	end
 snippet :
-	:${1:key} => ${2:"value"}
+	${1:key}: ${2:'value'}
 snippet ope
-	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${0} }
+	open('${1:path/or/url/or/pipe}', '${2:w}') { |${3:io}| ${0} }
 # path_from_here()
 snippet fpath
-	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])
+	File.join(File.dirname(__FILE__), *['${1:rel path here}'])
 # unix_filter {}
 snippet unif
 	ARGF.each_line${1} do |${2:line}|
@@ -445,21 +445,21 @@ snippet unif
 	end
 # option_parse {}
 snippet optp
-	require "optparse"
+	require 'optparse'
 
-	options = {${0:default => "args"}}
+	options = { ${0:default: 'args'} }
 
 	ARGV.options do |opts|
-		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}
+		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}|
+	opts.on('-${1:o}', '--${2:long-option-name}', ${3:String}, '${4:Option description.}') do |${5:opt}|
 		${0}
 	end
 snippet tc
-	require "test/unit"
+	require 'test/unit'
 
-	require "${1:library_file_name}"
+	require '${1:library_file_name}'
 
 	class Test${2:$1} < Test::Unit::TestCase
 		def test_${3:case_name}
@@ -467,18 +467,18 @@ snippet tc
 		end
 	end
 snippet ts
-	require "test/unit"
+	require 'test/unit'
 
-	require "tc_${1:test_case_file}"
-	require "tc_${2:test_case_file}"
+	require 'tc_${1:test_case_file}'
+	require 'tc_${2:test_case_file}'
 snippet as
-	assert ${1:test}, "${2:Failure message.}"
+	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}
+	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2**-20}
 snippet asi
 	assert_includes ${1:collection}, ${2:object}
 snippet asio
@@ -490,9 +490,9 @@ snippet asn
 snippet asnn
 	assert_not_nil ${1:instance}
 snippet asm
-	assert_match /${1:expected_pattern}/, ${2:actual_string}
+	assert_match(/${1:expected_pattern}/, ${2:actual_string})
 snippet asnm
-	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}
+	assert_no_match(/${1:unexpected_pattern}/, ${2:actual_string})
 snippet aso
 	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
@@ -516,7 +516,7 @@ snippet ass assert_send(..)
 snippet asns
 	assert_not_same ${1:unexpected}, ${2:actual}
 snippet ast
-	assert_throws :${1:expected} { ${0} }
+	assert_throws :${1:expected}, -> { ${0} }
 snippet astd
 	assert_throws :${1:expected} do
 		${0}
@@ -528,7 +528,7 @@ snippet asntd
 		${0}
 	end
 snippet fl
-	flunk "${1:Failure message.}"
+	flunk '${1:Failure message.}'
 # Benchmark.bmbm do .. end
 snippet bm-
 	TESTS = ${1:10_000}
@@ -536,31 +536,31 @@ snippet bm-
 		${0}
 	end
 snippet rep
-	results.report("${1:name}:") { TESTS.times { ${0} }}
+	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) }
+	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) }
+	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"})
+	PStore.new('${1:file_name.pstore}')
 snippet tra
 	transaction(${1:true}) { ${0} }
 # xmlread(..)
 snippet xml-
-	REXML::Document.new(File.read(${1:"path/to/file"}))
+	REXML::Document.new(File.read('${1:path/to/file}'))
 # xpath(..) { .. }
 snippet xpa
-	elements.each(${1:"//Xpath"}) do |${2:node}|
+	elements.each('${1://Xpath}') do |${2:node}|
 		${0}
 	end
 # class_from_name()
 snippet clafn
-	split("::").inject(Object) { |par, const| par.const_get(const) }
+	split('::').inject(Object) { |par, const| par.const_get(const) }
 # singleton_class()
 snippet sinc
 	class << self; self end
@@ -569,8 +569,8 @@ snippet nam
 		${0}
 	end
 snippet tas
-	desc "${1:Task description}"
-	task :${2:task_name => [:dependent, :tasks]} do
+	desc '${1:Task description}'
+	task ${2:task_name: [:dependent, :tasks]} do
 		${0}
 	end
 # block
@@ -578,7 +578,7 @@ snippet b
 	{ |${1:var}| ${0} }
 snippet begin
 	begin
-		raise 'A test exception.'
+		fail 'A test exception.'
 	rescue Exception => e
 		puts e.message
 		puts e.backtrace.inspect
@@ -594,418 +594,68 @@ snippet debug
 snippet pry
 	require 'pry'; binding.pry
 snippet strf
-	strftime("${1:%Y-%m-%d %H:%M:%S %z}")${0}
-#############################################
-# Rails snippets - for pure Ruby, see above #
-#############################################
-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}
-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(params[:$1])
-
-		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_attributes(params[:$1])
-				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 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 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:bind var})
-	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} => { ${0} }
-snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
-snippet test
-	test "should ${1: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 ${1:class_name} < ActiveRecord::Migration
-		def up
-			${0}
-		end
-
-		def down
-		end
-	end
-snippet migration class .. < ActiveRecord::Migration .. def change .. end
-	class ${1:class_name} < 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}
+	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     #
 ##########################
@@ -1014,11 +664,11 @@ snippet desc
 		${0}
 	end
 snippet descm
-	describe "${1:#method}" do
-		${0:pending "Not implemented"}
+	describe '${1:#method}' do
+		${0:pending 'Not implemented'}
 	end
 snippet cont
-	context "${1:message}" do
+	context '${1:message}' do
 		${0}
 	end
 snippet bef
@@ -1046,11 +696,11 @@ snippet expb
 snippet experr
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
 snippet shared
-	shared_examples ${0:"shared examples name"}
+	shared_examples ${0:'shared examples name'}
 snippet ibl
-	it_behaves_like ${0:"shared examples name"}
+	it_behaves_like ${0:'shared examples name'}
 snippet it
-	it "${1:spec_name}" do
+	it '${1:spec_name}' do
 		${0}
 	end
 snippet its
@@ -1059,74 +709,3 @@ snippet is
 	it { should ${0} }
 snippet isn
 	it { should_not ${0} }
-#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/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index 37fcc91b..87c150ca 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -1,7 +1,7 @@
 #PREAMBLE
 #newcommand
 snippet nc \newcommand
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
+	\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up \usepackage
 	\usepackage[${1:options}]{${2:package}} ${0}
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index 18a49358..148a5c9a 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -416,7 +416,7 @@ function! s:dosurround(...) " {{{1
     exe 'norm! df'.char
   else
     " One character backwards
-    call search('.','bW')
+    call search('\m.', 'bW')
     exe "norm! da".char
   endif
   let removed = getreg('"')
diff --git a/vimrcs/filetypes.vim b/vimrcs/filetypes.vim
index 65fa0699..2714239d 100644
--- a/vimrcs/filetypes.vim
+++ b/vimrcs/filetypes.vim
@@ -26,7 +26,7 @@ au FileType javascript call JavaScriptFold()
 au FileType javascript setl fen
 au FileType javascript setl nocindent
 
-au FileType javascript imap <c-t> AJS.log();<esc>hi
+au FileType javascript imap <c-t> $log();<esc>hi
 au FileType javascript imap <c-a> alert();<esc>hi
 
 au FileType javascript inoremap <buffer> $r return 

From 3278820a5d3c6e3bdf91fb3446bc1cb40c1b1e5e Mon Sep 17 00:00:00 2001
From: Jesper Lyager Nielsen <lyager@gmail.com>
Date: Fri, 15 Aug 2014 13:21:18 +0200
Subject: [PATCH 45/61] Added 'tablast' to toggle between tabs using
 <leader>tl.

---
 vimrcs/basic.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 68b79b82..6f35c1d8 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -230,6 +230,12 @@ map <leader>tc :tabclose<cr>
 map <leader>tm :tabmove 
 map <leader>t<leader> :tabnext 
 
+" Let 'tl' toggle between this and the last accessed tab
+let g:lasttab = 1
+nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
+au TabLeave * let g:lasttab = tabpagenr()
+
+
 " Opens a new tab with the current buffer's path
 " Super useful when editing files in the same directory
 map <leader>te :tabedit <c-r>=expand("%:p:h")<cr>/
@@ -352,6 +358,7 @@ map <leader>pp :setlocal paste!<cr>
 
 
 
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Helper functions
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

From 89ce0dc5dda122ff36c28e3b78207abe8871279c Mon Sep 17 00:00:00 2001
From: Liu Shuai <liushuai01@dianxinos.com>
Date: Tue, 16 Sep 2014 10:33:45 +0800
Subject: [PATCH 46/61] prevent auto restore last edit position for git commit
 msg.

---
 vimrcs/filetypes.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vimrcs/filetypes.vim b/vimrcs/filetypes.vim
index 2714239d..f6a58f6b 100644
--- a/vimrcs/filetypes.vim
+++ b/vimrcs/filetypes.vim
@@ -52,3 +52,5 @@ function! CoffeeScriptFold()
     setl foldlevelstart=1
 endfunction
 au FileType coffee call CoffeeScriptFold()
+
+au FileType gitcommit call setpos('.', [0, 1, 1, 0])

From 89c36a0d2ca36edc678b77f366f2687f4307d53b Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 27 Sep 2014 16:32:18 +0100
Subject: [PATCH 47/61] Updated plugins

---
 autoload/pathogen.vim                         | 379 +++----
 sources_non_forked/goyo.vim/plugin/goyo.vim   |  14 +-
 sources_non_forked/nerdtree/doc/NERD_tree.txt |   4 +-
 sources_non_forked/syntastic/README.markdown  |  81 +-
 .../syntastic/autoload/syntastic/c.vim        |  64 +-
 .../syntastic/autoload/syntastic/log.vim      |  32 +-
 .../autoload/syntastic/postprocess.vim        |  19 +
 .../syntastic/autoload/syntastic/util.vim     |  70 +-
 .../syntastic/doc/syntastic.txt               | 107 +-
 .../syntastic/plugin/syntastic.vim            |  24 +-
 .../syntastic/plugin/syntastic/checker.vim    |  11 +-
 .../syntastic/plugin/syntastic/cursor.vim     |  95 +-
 .../syntastic/plugin/syntastic/loclist.vim    | 130 ++-
 .../syntastic/plugin/syntastic/registry.vim   |  14 +-
 .../syntax_checkers/arduino/avrgcc.vim        |   2 +-
 .../syntax_checkers/c/clang_check.vim         |  65 ++
 .../syntax_checkers/c/clang_tidy.vim          |  65 ++
 .../syntastic/syntax_checkers/c/oclint.vim    |  15 +-
 .../syntastic/syntax_checkers/c/pc_lint.vim   |  65 ++
 .../syntax_checkers/cpp/clang_check.vim       |  25 +
 .../syntax_checkers/cpp/clang_tidy.vim        |  25 +
 .../syntastic/syntax_checkers/cpp/pc_lint.vim |  26 +
 .../erlang/erlang_check_file.erl              |   9 +-
 .../syntastic/syntax_checkers/eruby/ruby.vim  |  11 +-
 .../syntax_checkers/handlebars/handlebars.vim |   1 +
 .../syntax_checkers/java/checkstyle.vim       |  18 +-
 .../syntax_checkers/javascript/eslint.vim     |   3 +-
 .../syntastic/syntax_checkers/less/lessc.vim  |   1 +
 .../syntax_checkers/ocaml/camlp4o.vim         |   2 +-
 .../syntastic/syntax_checkers/php/php.vim     |   3 +-
 .../syntastic/syntax_checkers/php/phplint.vim |  91 ++
 .../syntax_checkers/puppet/puppet.vim         |   4 +-
 .../syntax_checkers/python/frosted.vim        |   2 +-
 .../syntax_checkers/python/pylint.vim         |   4 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |   2 +-
 .../syntastic/syntax_checkers/sass/sass.vim   |   2 +-
 .../syntax_checkers/scala/scalastyle.vim      |  71 ++
 .../syntax_checkers/scss/scss_lint.vim        |   2 +-
 .../syntastic/syntax_checkers/sh/sh.vim       |   2 +-
 .../syntax_checkers/spec/lacheck.vim          |  43 +
 .../syntax_checkers/text/atdtool.vim          |   2 +
 .../vim-airline/autoload/airline.vim          |   2 +-
 .../autoload/airline/extensions.vim           |   4 +
 .../autoload/airline/extensions/branch.vim    |  13 +-
 .../autoload/airline/extensions/default.vim   |   6 +-
 .../autoload/airline/extensions/tabline.vim   |  88 +-
 .../airline/extensions/windowswap.vim         |  23 +
 .../vim-airline/autoload/airline/init.vim     |   4 +-
 .../vim-airline/autoload/airline/section.vim  |   2 +-
 .../autoload/airline/themes/kalisi.vim        |  59 +-
 .../vim-airline/doc/airline.txt               |  31 +
 .../vim-fugitive/plugin/fugitive.vim          |   2 +-
 sources_non_forked/vim-golang/README.md       |   8 +
 .../vim-golang/autoload/go/complete.vim       | 103 --
 sources_non_forked/vim-golang/compiler/go.vim |  30 -
 .../vim-golang/ftdetect/gofiletype.vim        |  23 -
 sources_non_forked/vim-golang/ftplugin/go.vim |  19 -
 .../vim-golang/ftplugin/go/fmt.vim            |  69 --
 .../vim-golang/ftplugin/go/import.vim         | 250 -----
 .../vim-golang/ftplugin/go/test.sh            |  78 --
 sources_non_forked/vim-golang/indent/go.vim   |  77 --
 sources_non_forked/vim-golang/mirror.txt      |   6 -
 .../vim-golang/plugin/godoc.vim               | 130 ---
 sources_non_forked/vim-golang/readme.txt      | 103 --
 sources_non_forked/vim-golang/syntax/go.vim   | 207 ----
 .../vim-golang/syntax/godoc.vim               |  20 -
 .../vim-less/after/syntax/html.vim            |  22 +
 sources_non_forked/vim-snippets/README.md     |  71 +-
 .../vim-snippets/UltiSnips/ada.snippets       | 324 ++++++
 .../vim-snippets/UltiSnips/all.snippets       |  10 +
 .../vim-snippets/UltiSnips/c.snippets         |   1 -
 .../vim-snippets/UltiSnips/help.snippets      |   5 +
 .../vim-snippets/UltiSnips/html.snippets      |   4 +
 .../vim-snippets/UltiSnips/java.snippets      |   8 +-
 .../UltiSnips/javascript_jasmine.snippets     |   4 +
 .../vim-snippets/UltiSnips/pandoc.snippets    |  11 +-
 .../vim-snippets/UltiSnips/perl.snippets      |   7 +
 .../vim-snippets/UltiSnips/php.snippets       |  12 +-
 .../vim-snippets/UltiSnips/python.snippets    |  22 +-
 .../vim-snippets/UltiSnips/rust.snippets      |  14 +-
 .../vim-snippets/UltiSnips/scss.snippets      |  22 +-
 .../vim-snippets/snippets/ada.snippets        | 255 +++++
 .../snippets/coffee/requirejs_coffee.snippets |  11 +
 .../vim-snippets/snippets/d.snippets          | 338 ++++++
 .../vim-snippets/snippets/html.snippets       |  45 +-
 .../vim-snippets/snippets/java.snippets       |   2 +
 .../javascript/javascript-requirejs.snippets  |  14 +
 .../javascript/javascript.node.snippets       |  50 +
 .../snippets/javascript/javascript.snippets   |  20 +-
 .../vim-snippets/snippets/perl.snippets       |   8 +
 .../vim-snippets/snippets/php.snippets        |   4 +
 .../vim-snippets/snippets/rails.snippets      |   2 +
 .../vim-snippets/snippets/ruby.snippets       |   6 +-
 .../vim-snippets/snippets/rust.snippets       |  14 +-
 .../vim-snippets/snippets/stylus.snippets     | 993 ++++++++++++++++++
 .../vim-snippets/snippets/tex.snippets        |  17 +
 .../vim-snippets/snippets/zsh.snippets        |  12 +-
 97 files changed, 3635 insertions(+), 1655 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/spec/lacheck.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/windowswap.vim
 create mode 100644 sources_non_forked/vim-golang/README.md
 delete mode 100644 sources_non_forked/vim-golang/autoload/go/complete.vim
 delete mode 100644 sources_non_forked/vim-golang/compiler/go.vim
 delete mode 100644 sources_non_forked/vim-golang/ftdetect/gofiletype.vim
 delete mode 100644 sources_non_forked/vim-golang/ftplugin/go.vim
 delete mode 100644 sources_non_forked/vim-golang/ftplugin/go/fmt.vim
 delete mode 100644 sources_non_forked/vim-golang/ftplugin/go/import.vim
 delete mode 100644 sources_non_forked/vim-golang/ftplugin/go/test.sh
 delete mode 100644 sources_non_forked/vim-golang/indent/go.vim
 delete mode 100644 sources_non_forked/vim-golang/mirror.txt
 delete mode 100644 sources_non_forked/vim-golang/plugin/godoc.vim
 delete mode 100644 sources_non_forked/vim-golang/readme.txt
 delete mode 100644 sources_non_forked/vim-golang/syntax/go.vim
 delete mode 100644 sources_non_forked/vim-golang/syntax/godoc.vim
 create mode 100644 sources_non_forked/vim-less/after/syntax/html.vim
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/ada.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/ada.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/coffee/requirejs_coffee.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/d.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript/javascript-requirejs.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/stylus.snippets

diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
index 7b89ccaf..a13ae08f 100755
--- a/autoload/pathogen.vim
+++ b/autoload/pathogen.vim
@@ -1,6 +1,6 @@
 " pathogen.vim - path option manipulation
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.2
+" Version:      2.3
 
 " Install in ~/.vim/autoload (or ~\vimfiles\autoload).
 "
@@ -8,52 +8,49 @@
 " ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
 " .vimrc is the only other setup necessary.
 "
-" The API is documented inline below.  For maximum ease of reading,
-" :set foldmethod=marker
+" The API is documented inline below.
 
 if exists("g:loaded_pathogen") || &cp
   finish
 endif
 let g:loaded_pathogen = 1
 
-function! s:warn(msg)
-  echohl WarningMsg
-  echomsg a:msg
-  echohl NONE
-endfunction
-
 " Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
-" pathogen#surround().  For backwards compatibility purposes, a full path that
-" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
-" instead.
-function! pathogen#infect(...) abort " {{{1
-  for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
-    if path =~# '^[^\\/]\+$'
-      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
-      call pathogen#incubate(path . '/{}')
-    elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
-      call pathogen#incubate(path)
-    elseif path =~# '[\\/]\%({}\|\*\)$'
+" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  Curly braces are expanded with pathogen#expand():
+" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
+" in the runtime path.
+function! pathogen#infect(...) abort
+  for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+    if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
       call pathogen#surround(path)
-    else
+    elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
       call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
       call pathogen#surround(path . '/{}')
+    elseif path =~# '[{}*]'
+      call pathogen#interpose(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#interpose(path . '/{}')
     endif
   endfor
   call pathogen#cycle_filetype()
+  if pathogen#is_disabled($MYVIMRC)
+    return 'finish'
+  endif
   return ''
-endfunction " }}}1
+endfunction
 
 " Split a path into a list.
-function! pathogen#split(path) abort " {{{1
+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 " }}}1
+endfunction
 
 " Convert a list to a path.
-function! pathogen#join(...) abort " {{{1
+function! pathogen#join(...) abort
   if type(a:1) == type(1) && a:1
     let i = 1
     let space = ' '
@@ -77,15 +74,143 @@ function! pathogen#join(...) abort " {{{1
     let i += 1
   endwhile
   return substitute(path,'^,','','')
-endfunction " }}}1
+endfunction
 
 " Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort " {{{1
+function! pathogen#legacyjoin(...) abort
   return call('pathogen#join',[1] + a:000)
-endfunction " }}}1
+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_disabled.
+function! pathogen#is_disabled(path) abort
+  if a:path =~# '\~$'
+    return 1
+  endif
+  let sep = pathogen#slash()
+  let blacklist = map(
+        \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
+        \ pathogen#split($VIMBLACKLIST),
+        \ 'substitute(v:val, "[\\/]$", "", "")')
+  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
+endfunction "}}}1
+
+" 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, ':p:?[\\/]\=$??')
+  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
+  if a:pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
+    let found = map(split(pat, ',', 1), 'pre.v:val.post')
+    let results = []
+    for pattern in found
+      call extend(results, pathogen#expand(pattern))
+    endfor
+    return results
+  elseif a:pattern =~# '{}'
+    let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = a:pattern[strlen(pat) : -1]
+    return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    return [a:pattern]
+  endif
+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 "}}}1
+
+" 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 "}}}1
 
 " Remove duplicates from a list.
-function! pathogen#uniq(list) abort " {{{1
+function! pathogen#uniq(list) abort
   let i = 0
   let seen = {}
   while i < len(a:list)
@@ -100,142 +225,18 @@ function! pathogen#uniq(list) abort " {{{1
     endif
   endwhile
   return a:list
-endfunction " }}}1
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#separator() abort " {{{1
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction " }}}1
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort " {{{1
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
-endfunction "}}}1
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort " {{{1
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() " {{{1
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction " }}}1
-
-" Check if a bundle is disabled.  A bundle is considered disabled if it ends
-" in a tilde or its basename or full name is included in the list
-" g:pathogen_disabled.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  let blacklist = g:pathogen_disabled
-  return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
-endfunction "}}}1
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  If the directory is already included, move it to the
-" outermost position.  Wildcards are added as is.  Ending a path in /{} causes
-" all subdirectories to be added (except those in g:pathogen_disabled).
-function! pathogen#surround(path) abort " {{{1
-  let sep = pathogen#separator()
-  let rtp = pathogen#split(&rtp)
-  if a:path =~# '[\\/]{}$'
-    let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
-    let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
-    let after  = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
-    call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  else
-    let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
-    let before = [path]
-    let after = [path . sep . 'after']
-    call filter(rtp, 'index(before + after, v:val) == -1')
-  endif
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction " }}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.  Deprecated.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
-  return pathogen#surround(a:path . pathogen#separator() . '{}')
-endfunction " }}}1
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  If the argument ends in '/{}', add a separate entry for
-" each subdirectory.  The default argument is 'bundle/{}', which means that
-" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
-" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
-" UNIX).
-function! pathogen#incubate(...) abort " {{{1
-  let sep = pathogen#separator()
-  let name = a:0 ? a:1 : 'bundle/{}'
-  if "\n".s:done_bundles =~# "\\M\n".name."\n"
-    return ""
-  endif
-  let s:done_bundles .= name . "\n"
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      if name =~# '{}$'
-        let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-      else
-        let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
-      endif
-    else
-      if name =~# '{}$'
-        let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
-      else
-        let list += [dir . sep . name, dir]
-      endif
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction " }}}1
-
-" Deprecated alias for pathogen#incubate().
-function! pathogen#runtime_append_all_bundles(...) abort " {{{1
-  if a:0
-    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
-  else
-    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
-  endif
-  return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
 endfunction
 
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort " {{{1
-  let sep = pathogen#separator()
-  for glob in pathogen#split(&rtp)
-    for dir in split(glob(glob), "\n")
-      if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
-        silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
-      endif
-    endfor
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort " {{{1
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction " }}}1
+" 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 "{{{1
@@ -246,18 +247,38 @@ function! pathogen#runtime_findfile(file,count) abort "{{{1
   else
     return fnamemodify(file,':p')
   endif
-endfunction " }}}1
+endfunction
 
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort " {{{1
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
+" Section: Deprecated
+
+function! s:warn(msg) abort
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+  let name = a:0 ? a:1 : 'bundle/{}'
+  call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+  return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
   else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
   endif
-endfunction " }}}1
+  return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
 
 if exists(':Vedit')
   finish
@@ -265,7 +286,7 @@ endif
 
 let s:vopen_warning = 0
 
-function! s:find(count,cmd,file,lcd) " {{{1
+function! s:find(count,cmd,file,lcd)
   let rtp = pathogen#join(1,pathogen#split(&runtimepath))
   let file = pathogen#runtime_findfile(a:file,a:count)
   if file ==# ''
@@ -284,10 +305,10 @@ function! s:find(count,cmd,file,lcd) " {{{1
   else
     return a:cmd.' '.pathogen#fnameescape(file) . warning
   endif
-endfunction " }}}1
+endfunction
 
-function! s:Findcomplete(A,L,P) " {{{1
-  let sep = pathogen#separator()
+function! s:Findcomplete(A,L,P)
+  let sep = pathogen#slash()
   let cheats = {
         \'a': 'autoload',
         \'d': 'doc',
@@ -312,7 +333,7 @@ function! s:Findcomplete(A,L,P) " {{{1
     endfor
   endfor
   return sort(keys(found))
-endfunction " }}}1
+endfunction
 
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
@@ -323,4 +344,4 @@ command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabed
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
 command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
 
-" vim:set et sw=2:
+" 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/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 5308326a..c64d4aae 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -64,7 +64,8 @@ function! s:setup_pad(bufnr, vert, size)
   execute win . 'wincmd w'
   execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
   augroup goyop
-    autocmd WinEnter,CursorMoved <buffer> call s:blank()
+    autocmd WinEnter,CursorMoved <buffer> nested call s:blank()
+    autocmd WinLeave <buffer> call s:hide_statusline()
   augroup END
 
   " To hide scrollbars of pad windows in GVim
@@ -114,6 +115,10 @@ function! s:tranquilize()
   endfor
 endfunction
 
+function! s:hide_statusline()
+  let &l:statusline = repeat(' ', winwidth(0))
+endfunction
+
 function! s:goyo_on(width)
   let s:orig_tab = tabpagenr()
 
@@ -131,7 +136,6 @@ function! s:goyo_on(width)
     \   'winwidth':       &winwidth,
     \   'winminheight':   &winminheight,
     \   'winheight':      &winheight,
-    \   'statusline':     &statusline,
     \   'ruler':          &ruler,
     \   'sidescroll':     &sidescroll,
     \   'sidescrolloff':  &sidescrolloff
@@ -211,19 +215,20 @@ function! s:goyo_on(width)
   call s:resize_pads()
   call s:tranquilize()
 
-  let &statusline = repeat(' ', winwidth(0))
-
   augroup goyo
     autocmd!
     autocmd BufWinLeave <buffer> call s:goyo_off()
     autocmd TabLeave    *        call s:goyo_off()
     autocmd VimResized  *        call s:resize_pads()
     autocmd ColorScheme *        call s:tranquilize()
+    autocmd WinEnter,WinLeave <buffer> call s:hide_statusline()
   augroup END
 
+  call s:hide_statusline()
   if exists('g:goyo_callbacks[0]')
     call g:goyo_callbacks[0]()
   endif
+  silent! doautocmd User GoyoEnter
 endfunction
 
 function! s:goyo_off()
@@ -312,6 +317,7 @@ function! s:goyo_off()
   if exists('g:goyo_callbacks[1]')
     call g:goyo_callbacks[1]()
   endif
+  silent! doautocmd User GoyoLeave
 endfunction
 
 function! s:goyo(bang, ...)
diff --git a/sources_non_forked/nerdtree/doc/NERD_tree.txt b/sources_non_forked/nerdtree/doc/NERD_tree.txt
index 79b649ff..5d5b3f6f 100644
--- a/sources_non_forked/nerdtree/doc/NERD_tree.txt
+++ b/sources_non_forked/nerdtree/doc/NERD_tree.txt
@@ -462,8 +462,8 @@ Jump to the previous sibling of the selected node.
 ------------------------------------------------------------------------------
                                                                   *NERDTree-C*
 Default key: C
-Map option: NERDTreeMapChdir
-Applies to: directories.
+Map option: NERDTreeMapChangeRoot
+Applies to: files and directories.
 
 Make the selected directory node the new tree root. If a file is selected, its
 parent is used.
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index d0eb41f2..8d96daa7 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -40,11 +40,12 @@ C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
 DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
 Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
 Lex, Limbo, LISP, LLVM intermediate language, Lua, MATLAB, NASM, Objective-C,
-Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X
-and iOS property lists, Puppet, Python, Racket, R, reStructuredText, Ruby,
-SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog,
-VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.
-See the [wiki][3] for details about the corresponding supported checkers.
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
+iOS property lists, Puppet, Python, Racket, R, reStructuredText, RPM spec,
+Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
+Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
+and zsh.  See the [wiki][3] for details about the corresponding supported
+checkers.
 
 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
@@ -127,6 +128,16 @@ 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
 create an issue - or better yet, create a pull request.
 
+<a name="faqpython3"></a>
+
+__Q. The `python` checker complains about syntactically valid Python 3 constructs...__
+
+A. Configure the `python` checker to call a Python 3 interpreter rather than
+Python 2, e.g:
+```vim
+let g:syntastic_python_python_exec = '/path/to/python3'
+```
+
 <a name="faqperl"></a>
 
 __Q. The `perl` checker has stopped working...__
@@ -153,7 +164,8 @@ automatically by syntastic.
 
 <a name="faqloclist"></a>
 
-__Q. I run a checker and the location list is not updated...__
+__Q. I run a checker and the location list is not updated...__  
+__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
@@ -200,8 +212,7 @@ To tell syntastic to use `pylint`, you would use this setting:
 let g:syntastic_python_checkers = ['pylint']
 ```
 
-Some filetypes, like PHP, have style checkers as well as syntax checkers. These
-can be chained together like this:
+Checkers can be chained together like this:
 ```vim
 let g:syntastic_php_checkers = ['php', 'phpcs', 'phpmd']
 ```
@@ -219,7 +230,37 @@ e.g. to run `phpcs` and `phpmd`:
 This works for any checkers available for the current filetype, even if they
 aren't listed in `g:syntastic_<filetype>_checkers`.  You can't run checkers for
 "foreign" filetypes though (e.g. you can't run, say, a Python checker if the
-current filetype is `php`).
+filetype of the current file is `php`).
+
+<a name="faqstyle"></a>
+
+__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.
+
+In fact 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 details.
 
 <a name="faqaggregate"></a>
 
@@ -238,29 +279,13 @@ See `:help syntastic-aggregating-errors` for more details.
 __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
+A. Vim provides several built-in commands for this. See `:help :lnext` and
 `:help :lprev`.
 
 If you use these commands a lot then you may want to add shortcut mappings to
 your vimrc, or install something like [unimpaired][2], which provides such
 mappings (among other things).
 
-<a name="faqstyle"></a>
-
-__Q. A syntax checker is giving me unwanted/strange style tips?__
-
-A. Some filetypes (e.g. php) have style checkers as well as syntax
-checkers. You can usually configure the options that are passed to the style
-checkers, or just disable them. Take a look at the [wiki][3] to see what
-options are available.
-
-Alternatively, you can use `g:syntastic_quiet_messages` to filter out the
-messages you don't want to see. e.g. To turn off all style messages:
-```vim
-let g:syntastic_quiet_messages = { "type": "style" }
-```
-See `:help syntastic_quiet_messages` for details.
-
 <a name="faqbdelete"></a>
 
 __Q. The error window is closed automatically when I :quit the current buffer
@@ -303,3 +328,7 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [10]: http://perldoc.perl.org/perlrun.html#*-c*
 [11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
 [12]: https://github.com/rust-lang/rust/
+
+<!--
+vim:tw=79:sw=4:
+-->
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 22fb0ede..5dad1408 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -62,7 +62,7 @@ endfunction " }}}2
 " GetLocList() for C-like compilers
 function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     try
-        let flags = s:getCflags(a:filetype, a:subchecker, a:options)
+        let flags = s:_getCflags(a:filetype, a:subchecker, a:options)
     catch /\m\C^Syntastic: skip checks$/
         return []
     endtry
@@ -70,9 +70,9 @@ function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
         \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
 
-    let errorformat = s:getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+    let errorformat = s:_getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
 
-    let postprocess = s:getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+    let postprocess = s:_getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
         \ ['filterForeignErrors'] : []
 
     " process makeprg
@@ -87,29 +87,29 @@ endfunction " }}}2
 " Private functions {{{1
 
 " initialize c/cpp syntax checker handlers
-function! s:init() " {{{2
+function! s:_init() " {{{2
     let s:handlers = []
     let s:cflags = {}
 
-    call s:regHandler('\m\<cairo',       'syntastic#c#checkPKG', ['cairo', 'cairo'])
-    call s:regHandler('\m\<freetype',    'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
-    call s:regHandler('\m\<glade',       'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
-    call s:regHandler('\m\<glib',        'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
-    call s:regHandler('\m\<gtk',         'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:regHandler('\m\<libsoup',     'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:regHandler('\m\<libxml',      'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:regHandler('\m\<pango',       'syntastic#c#checkPKG', ['pango', 'pango'])
-    call s:regHandler('\m\<SDL',         'syntastic#c#checkPKG', ['sdl', 'sdl'])
-    call s:regHandler('\m\<opengl',      'syntastic#c#checkPKG', ['opengl', 'gl'])
-    call s:regHandler('\m\<webkit',      'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
+    call s:_regHandler('\m\<cairo',       'syntastic#c#checkPKG', ['cairo', 'cairo'])
+    call s:_regHandler('\m\<freetype',    'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
+    call s:_regHandler('\m\<glade',       'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
+    call s:_regHandler('\m\<glib',        'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
+    call s:_regHandler('\m\<gtk',         'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:_regHandler('\m\<libsoup',     'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:_regHandler('\m\<libxml',      'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:_regHandler('\m\<pango',       'syntastic#c#checkPKG', ['pango', 'pango'])
+    call s:_regHandler('\m\<SDL',         'syntastic#c#checkPKG', ['sdl', 'sdl'])
+    call s:_regHandler('\m\<opengl',      'syntastic#c#checkPKG', ['opengl', 'gl'])
+    call s:_regHandler('\m\<webkit',      'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
 
-    call s:regHandler('\m\<php\.h\>',    'syntastic#c#checkPHP',    [])
-    call s:regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
-    call s:regHandler('\m\<ruby',        'syntastic#c#checkRuby',   [])
+    call s:_regHandler('\m\<php\.h\>',    'syntastic#c#checkPHP',    [])
+    call s:_regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
+    call s:_regHandler('\m\<ruby',        'syntastic#c#checkRuby',   [])
 endfunction " }}}2
 
 " return a handler dictionary object
-function! s:regHandler(regex, function, args) " {{{2
+function! s:_regHandler(regex, function, args) " {{{2
     let handler = {}
     let handler["regex"] = a:regex
     let handler["func"] = function(a:function)
@@ -118,7 +118,7 @@ function! s:regHandler(regex, function, args) " {{{2
 endfunction " }}}2
 
 " resolve checker-related user variables
-function! s:getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
+function! s:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{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}
@@ -130,10 +130,10 @@ function! s:getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
 endfunction " }}}2
 
 " resolve user CFLAGS
-function! s:getCflags(ft, ck, opts) " {{{2
+function! s:_getCflags(ft, ck, opts) " {{{2
     " determine whether to parse header files as well
     if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
-        if s:getCheckerVar('g', a:ft, a:ck, 'check_header', 0)
+        if s:_getCheckerVar('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
@@ -143,21 +143,21 @@ function! s:getCflags(ft, ck, opts) " {{{2
         let flags = get(a:opts, 'main_flags', '')
     endif
 
-    let flags .= ' ' . s:getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:getIncludeDirs(a:ft)
+    let flags .= ' ' . s:_getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_getIncludeDirs(a:ft)
 
     " check if the user manually set some cflags
-    let b_cflags = s:getCheckerVar('b', a:ft, a:ck, 'cflags', '')
+    let b_cflags = s:_getCheckerVar('b', a:ft, a:ck, 'cflags', '')
     if b_cflags == ''
         " check whether to search for include files at all
-        if !s:getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
+        if !s:_getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
             if a:ft ==# 'c' || a:ft ==# 'cpp'
                 " refresh the include file search if desired
-                if s:getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-                    let flags .= ' ' . s:searchHeaders()
+                if s:_getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+                    let flags .= ' ' . s:_searchHeaders()
                 else
                     " search for header includes if not cached already
                     if !exists('b:syntastic_' . a:ft . '_includes')
-                        let b:syntastic_{a:ft}_includes = s:searchHeaders()
+                        let b:syntastic_{a:ft}_includes = s:_searchHeaders()
                     endif
                     let flags .= ' ' . b:syntastic_{a:ft}_includes
                 endif
@@ -169,7 +169,7 @@ function! s:getCflags(ft, ck, opts) " {{{2
     endif
 
     " add optional config file parameters
-    let config_file = s:getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let config_file = s:_getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
     let flags .= ' ' . syntastic#c#ReadConfig(config_file)
 
     return flags
@@ -177,7 +177,7 @@ 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:getIncludeDirs(filetype) " {{{2
+function! s:_getIncludeDirs(filetype) " {{{2
     let include_dirs = []
 
     if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
@@ -195,7 +195,7 @@ endfunction " }}}2
 
 " search the first 100 lines for include statements that are
 " given in the handlers dictionary
-function! s:searchHeaders() " {{{2
+function! s:_searchHeaders() " {{{2
     let includes = ''
     let files = []
     let found = []
@@ -324,7 +324,7 @@ let s:default_includes = [
     \ '..' . syntastic#util#Slash() . 'include',
     \ '..' . syntastic#util#Slash() . 'includes' ]
 
-call s:init()
+call s:_init()
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index bddc7100..df72b3c7 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -65,8 +65,8 @@ function! syntastic#log#debug(level, msg, ...) " {{{2
         return
     endif
 
-    let leader = s:logTimestamp()
-    call s:logRedirect(1)
+    let leader = s:_logTimestamp()
+    call s:_logRedirect(1)
 
     if a:0 > 0
         " filter out dictionary functions
@@ -77,7 +77,7 @@ function! syntastic#log#debug(level, msg, ...) " {{{2
         echomsg leader . a:msg
     endif
 
-    call s:logRedirect(0)
+    call s:_logRedirect(0)
 endfunction " }}}2
 
 function! syntastic#log#debugShowOptions(level, names) " {{{2
@@ -85,15 +85,15 @@ function! syntastic#log#debugShowOptions(level, names) " {{{2
         return
     endif
 
-    let leader = s:logTimestamp()
-    call s:logRedirect(1)
+    let leader = s:_logTimestamp()
+    call s:_logRedirect(1)
 
     let vlist = copy(type(a:names) == type("") ? [a:names] : a:names)
     if !empty(vlist)
         call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val)))")
         echomsg leader . join(vlist, ', ')
     endif
-    call s:logRedirect(0)
+    call s:_logRedirect(0)
 endfunction " }}}2
 
 function! syntastic#log#debugShowVariables(level, names) " {{{2
@@ -101,18 +101,18 @@ function! syntastic#log#debugShowVariables(level, names) " {{{2
         return
     endif
 
-    let leader = s:logTimestamp()
-    call s:logRedirect(1)
+    let leader = s:_logTimestamp()
+    call s:_logRedirect(1)
 
     let vlist = type(a:names) == type("") ? [a:names] : a:names
     for name in vlist
-        let msg = s:formatVariable(name)
+        let msg = s:_formatVariable(name)
         if msg != ''
             echomsg leader . msg
         endif
     endfor
 
-    call s:logRedirect(0)
+    call s:_logRedirect(0)
 endfunction " }}}2
 
 function! syntastic#log#debugDump(level) " {{{2
@@ -127,19 +127,19 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! s:isDebugEnabled_smart(level) " {{{2
+function! s:_isDebugEnabled_smart(level) " {{{2
     return and(g:syntastic_debug, a:level)
 endfunction " }}}2
 
-function! s:isDebugEnabled_dumb(level) " {{{2
+function! s:_isDebugEnabled_dumb(level) " {{{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')
+let s:isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
 lockvar s:isDebugEnabled
 
-function! s:logRedirect(on) " {{{2
+function! s:_logRedirect(on) " {{{2
     if exists("g:syntastic_debug_file")
         if a:on
             try
@@ -154,11 +154,11 @@ function! s:logRedirect(on) " {{{2
     endif
 endfunction " }}}2
 
-function! s:logTimestamp() " {{{2
+function! s:_logTimestamp() " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:syntastic_start)))[0] . ': '
 endfunction " }}}2
 
-function! s:formatVariable(name) " {{{2
+function! s:_formatVariable(name) " {{{2
     let vals = []
     if exists('g:syntastic_' . a:name)
         call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
index 65570d98..80fd7cf4 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -46,6 +46,25 @@ function! syntastic#postprocess#filterForeignErrors(errors) " {{{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) " {{{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
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index 837a280f..51831b47 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -96,6 +96,16 @@ endfunction " }}}2
 let s:width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
 lockvar s:width
 
+function! syntastic#util#screenWidth(str, tabstop) " {{{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) " {{{2
     let old_ruler = &ruler
@@ -215,7 +225,7 @@ function! syntastic#util#redraw(full) " {{{2
 endfunction " }}}2
 
 function! syntastic#util#dictFilter(errors, filter) " {{{2
-    let rules = s:translateFilter(a:filter)
+    let rules = s:_translateFilter(a:filter)
     " call syntastic#log#debug(g:SyntasticDebugFilters, "applying filter:", rules)
     try
         call filter(a:errors, rules)
@@ -225,13 +235,6 @@ function! syntastic#util#dictFilter(errors, filter) " {{{2
     endtry
 endfunction " }}}2
 
-function! syntastic#util#sortLoclist(errors) " {{{2
-    for e in a:errors
-        call s:setScreenColumn(e)
-    endfor
-    call sort(a:errors, 's:compareErrorItems')
-endfunction " }}}2
-
 " Return a [high, low] list of integers, representing the time
 " (hopefully high resolution) since program start
 " TODO: This assumes reltime() returns a list of integers.
@@ -243,13 +246,13 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! s:translateFilter(filters) " {{{2
+function! s:_translateFilter(filters) " {{{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)'))
+            call extend(conditions, map(copy(a:filters[k]), 's:_translateElement(k, v:val)'))
         else
-            call add(conditions, s:translateElement(k, a:filters[k]))
+            call add(conditions, s:_translateElement(k, a:filters[k]))
         endif
     endfor
 
@@ -259,7 +262,7 @@ function! s:translateFilter(filters) " {{{2
     return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
 endfunction " }}}2
 
-function! s:translateElement(key, term) " {{{2
+function! s:_translateElement(key, term) " {{{2
     if a:key ==? 'level'
         let ret = 'v:val["type"] !=? ' . string(a:term[0])
     elseif a:key ==? 'type'
@@ -275,49 +278,6 @@ function! s:translateElement(key, term) " {{{2
     return ret
 endfunction " }}}2
 
-function! s:screenWidth(str, tabstop) " {{{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
-
-function! s:setScreenColumn(item) " {{{2
-    if !has_key(a:item, 'scol')
-        let col = get(a:item, 'col', 0)
-        if col != 0 && a:item['vcol'] == 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'] = s:screenWidth(strpart(line, 0, col), getbufvar(buf, '&tabstop'))
-        else
-            let a:item['scol'] = col
-        endif
-    endif
-endfunction " }}}2
-
-function! s:compareErrorItems(a, b) " {{{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
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index daefafdd..8f09e818 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -67,7 +67,7 @@ Take a look at the wiki for a list of supported filetypes and checkers:
     https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
 
 Note: This doc only deals with using syntastic. To learn how to write syntax
-checker integrations, see the guide on the github wiki:
+checker integrations, see the guide on the GitHub wiki:
 
     https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
 
@@ -78,16 +78,17 @@ 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 checkers available for the current filetype with the
+You can see the list of checkers available for the current filetype with the
 |:SyntasticInfo| command.
 
-If you want to override the configured list of checkers for a filetype then
-see |syntastic-checker-options| for details. You can also change the arguments
-passed to a specific checker as well.
+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| for details.
 
-Use |:SyntasticCheck| to manually check right now. Use |:SyntasticToggleMode|
-to switch between active (checking on writing the buffer) and passive (manual)
-checking.
+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.
 
 ==============================================================================
 2. Functionality provided                            *syntastic-functionality*
@@ -155,13 +156,21 @@ Example: >
     highlight SyntasticErrorLine guibg=#2f0000
 <
 ------------------------------------------------------------------------------
-2.3. The error window                         *:Errors* *syntastic-error-window*
+2.3. The error window                                   *syntastic-error-window*
 
-You can use the :Errors command to display the errors for the current buffer
+You can use the |:Errors| command to display the errors for the current buffer
 in the |location-list|.
 
-Note that when you use :Errors, the current location list is overwritten with
-Syntastic's own location list.
+Note that when you use |:Errors|, the current location list is overwritten
+with Syntastic's own 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*
@@ -212,11 +221,14 @@ See also: |'syntastic_<filetype>_<checker>_quiet_messages'|.
 ==============================================================================
 3. Commands                                               *syntastic-commands*
 
-:Errors                                                     *:SyntasticErrors*
+: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'|
@@ -239,7 +251,7 @@ the order specified.  The rules of |syntastic_aggregate_errors| still apply.
 Example: >
     :SyntasticCheck flake8 pylint
 <
-:SyntasticInfo                                               *:SyntasticInfo*
+: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
@@ -303,9 +315,22 @@ messages grouped by checker output, set this variable to 0. >
 <
                                               *'syntastic_echo_current_error'*
 Default: 1
-If enabled, syntastic will echo the error associated with the current line to
-the command window. If multiple errors are found, the first will be used. >
+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'*
+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 show. 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'*
 Default: 1
@@ -407,7 +432,6 @@ default behaviour of running both checkers against the input file: >
 Default: { "mode": "active",
            "active_filetypes": [],
            "passive_filetypes": [] }
-
 Use this option to fine tune when automatic syntax checking is done (or not
 done).
 
@@ -436,7 +460,6 @@ active and passive modes.
 
                                                   *'syntastic_quiet_messages'*
 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": "warnings",
@@ -505,6 +528,12 @@ statusline: >
 <
 If the buffer had 2 warnings, starting on line 5 then this would appear: >
     [Warn: 5 #2]
+<
+                                                   *'b:syntastic_skip_checks'*
+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'*
 Default: 0 in GUI Vim and MacVim, 1 otherwise
@@ -513,6 +542,13 @@ 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'*
+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_debug'*
 Default: 0
 Set this to the sum of one or more of the following flags to enable
@@ -580,11 +616,19 @@ 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 used by a checker is normally defined automatically, when the
-checkers is registered. You can however override it by setting the variable
+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'*
+And 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*
 
@@ -609,21 +653,20 @@ have local versions 'b:syntastic_<filetype>_<checker-name>_<option-name>',
 which take precedence over the global ones in the corresponding buffers.
 
 If one of these variables has a non-empty default and you want it to be empty,
-you can set it to a space, e.g.: >
-    let g:syntastic_javascript_jslint_args = " "
+you can set it to an empty string, e.g.: >
+    let g:syntastic_javascript_jslint_args = ""
 <
-(setting it to an empty string doesn't work, for implementation reasons).
-
                                         *'syntastic_<filetype>_<checker>_exe'*
 The 'exe' is normally the same as the 'exec' attribute described above, in
 which case it may be omitted. However, you can use it to add environment
-variables or additional parameters, e.g. to tell the mri checker to use KANJI
-encoding you could do something like this: >
-    let g:syntastic_ruby_mri_exe = 'RUBYOPT="-Ke" ruby'
+variables, or to change the way the checker is run. For example this setup
+allows you to run PC-Lint under Wine emulation on Linux: >
+    let  g:syntastic_c_pc_lint_exec = "wine"
+    let  g:syntastic_c_pc_lint_exe = "wine c:/path/to/lint-nt.exe"
 <
 To override the args and the tail: >
-    let g:syntastic_ruby_mri_args = "--my --args --here"
-    let g:syntastic_ruby_mri_tail = "> /tmp/my-output-file-biatch"
+    let g:syntastic_c_pc_lint_args = "-w5 -Iz:/usr/include/linux"
+    let g:syntastic_c_pc_lint_tail = "2>/dev/null"
 <
 The general form of the override options is: >
     syntastic_<filetype>_<checker>_<option-name>
@@ -740,9 +783,9 @@ https://github.com/jmcantrell/vim-virtualenv).  This is a limitation of
 7. About                                                     *syntastic-about*
 
 The core maintainers of syntastic are:
-    Martin Grenfell (github: scrooloose)
-    Gregor Uhlenheuer (github: kongo2002)
-    LCD 047 (github: lcd047)
+    Martin Grenfell (GitHub: scrooloose)
+    Gregor Uhlenheuer (GitHub: kongo2002)
+    LCD 047 (GitHub: lcd047)
 
 Find the latest version of syntastic at:
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 43a5ace1..15f999f4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:syntastic_start
 endif
 
-let g:syntastic_version = '3.4.0-117'
+let g:syntastic_version = '3.5.0-37'
 lockvar g:syntastic_version
 
 " Sanity checks {{{1
@@ -56,12 +56,14 @@ let g:syntastic_defaults = {
         \ 'bash_hack':                1,
         \ '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 && &shell =~? '\m\<cmd\.exe$'),
         \ 'filetype_map':             {},
         \ 'full_redraws':             !(has('gui_running') || has('gui_macvim')),
         \ 'id_checkers':              1,
@@ -228,7 +230,7 @@ endfunction " }}}2
 function! s:QuitPreHook() " {{{2
     call syntastic#log#debug(g:SyntasticDebugAutocommands,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
-    let b:syntastic_skip_checks = !g:syntastic_check_on_wq
+    let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
     call SyntasticLoclistHide()
 endfunction " }}}2
 
@@ -481,7 +483,15 @@ function! SyntasticMake(options) " {{{2
         execute 'lcd ' . fnameescape(old_cwd)
     endif
 
-    silent! lolder
+    try
+        silent lolder
+    catch /\m^Vim\%((\a\+)\)\=:E380/
+        " E380: At bottom of quickfix stack
+        call setloclist(0, [], 'r')
+    catch /\m^Vim\%((\a\+)\)\=:E776/
+        " E776: No location list
+        " do nothing
+    endtry
 
     " restore options {{{3
     let &errorformat = old_errorformat
@@ -496,7 +506,7 @@ function! SyntasticMake(options) " {{{2
 
     call syntastic#log#debug(g:SyntasticDebugLoclist, 'raw loclist:', errors)
 
-    if has_key(a:options, 'returns') && index(a:options['returns'], v:shell_error) == -1
+    if syntastic#util#var('exit_checks') && has_key(a:options, 'returns') && index(a:options['returns'], v:shell_error) == -1
         throw 'Syntastic: checker error'
     endif
 
@@ -555,9 +565,9 @@ endfunction " }}}2
 " Skip running in special buffers
 function! s:skipFile() " {{{2
     let fname = expand('%')
-    let skip = (exists('b:syntastic_skip_checks') ? b:syntastic_skip_checks : 0) ||
-        \ (&buftype != '') || !filereadable(fname) || getwinvar(0, '&diff') ||
-        \ s:ignoreFile(fname) || fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
+    let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype != '') ||
+        \ !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname) ||
+        \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
         call syntastic#log#debug(g:SyntasticDebugTrace, 'skipFile: skipping')
     endif
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 273f0521..6ee8d681 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -46,11 +46,9 @@ function! g:SyntasticChecker.getName() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticChecker.getExec() " {{{2
-    if exists('g:syntastic_' . self._filetype . '_' . self._name . '_exec')
-        return expand(g:syntastic_{self._filetype}_{self._name}_exec)
-    endif
-
-    return self._exec
+    return
+        \ expand( exists('b:syntastic_' . self._name . '_exec') ? b:syntastic_{self._name}_exec :
+        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec) )
 endfunction " }}}2
 
 function! g:SyntasticChecker.getExecEscaped() " {{{2
@@ -147,10 +145,9 @@ function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticChecker._getOpt(opts, basename, name, default) " {{{2
-    let user_val = syntastic#util#var(a:basename . a:name)
     let ret = []
     call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
-    call extend( ret, self._shescape(user_val != '' ? user_val : get(a:opts, a:name, a:default)) )
+    call extend( ret, self._shescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
     call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
 
     return ret
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index ab66fd01..d8410ab1 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -20,7 +20,8 @@ function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
     if self.enabled() && !a:loclist.isEmpty()
         call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: refresh')
         let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
-        let b:oldLine = -1
+        let b:syntastic_line = -1
+        let b:syntastic_cursor_columns = a:loclist.getCursorColumns()
         autocmd! syntastic CursorMoved
         autocmd syntastic CursorMoved * call SyntasticRefreshCursor()
     endif
@@ -31,7 +32,7 @@ function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
     call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: reset')
     autocmd! syntastic CursorMoved
     unlet! b:syntastic_messages
-    let b:oldLine = -1
+    let b:syntastic_line = -1
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
@@ -39,29 +40,99 @@ endfunction " }}}2
 
 " Private methods {{{1
 
-" The following defensive nonsense is needed because of the nature of autocmd
 function! SyntasticRefreshCursor() " {{{2
     if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
         " file not checked
         return
     endif
 
-    if !exists('b:oldLine')
-        let b:oldLine = -1
+    if !exists('b:syntastic_line')
+        let b:syntastic_line = -1
     endif
     let l = line('.')
-    if l == b:oldLine
-        return
-    endif
-    let b:oldLine = l
+    let current_messages = get(b:syntastic_messages, l, {})
 
-    if has_key(b:syntastic_messages, l)
-        call syntastic#util#wideMsg(b:syntastic_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_idx')
+            let b:syntastic_idx = -1
+        endif
+
+        if s:_isSameIndex(l, b:syntastic_line, c, b:syntastic_idx, current_messages)
+            return
+        else
+            let b:syntastic_line = l
+        endif
+
+        if !empty(current_messages)
+            let b:syntastic_idx = s:_findIndex(c, current_messages)
+            call syntastic#util#wideMsg(current_messages[b:syntastic_idx].text)
+        else
+            let b:syntastic_idx = -1
+            echo
+        endif
     else
-        echo
+        if l == b:syntastic_line
+            return
+        endif
+        let b:syntastic_line = l
+
+        if !empty(current_messages)
+            call syntastic#util#wideMsg(current_messages[0].text)
+        else
+            echo
+        endif
     endif
 endfunction " }}}2
 
 " }}}1
 
+" Private functions {{{1
+
+function! s:_isSameIndex(line, old_line, column, idx, messages) " {{{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:_findIndex(column, messages) " {{{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/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index e7c05bf7..19a61984 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -21,6 +21,8 @@ function! g:SyntasticLoclist.New(rawLoclist) " {{{2
     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
@@ -39,7 +41,15 @@ function! g:SyntasticLoclist.extend(other) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticLoclist.sort() " {{{2
-    call syntastic#util#sortLoclist(self._rawLoclist)
+    if !self._sorted
+        for e in self._rawLoclist
+            call s:_setScreenColumn(e)
+        endfor
+
+        call sort(self._rawLoclist, self._columns ? 's:_compareErrorItemsByColumns' : 's:_compareErrorItemsByLines')
+
+        let self._sorted = 1
+    endif
 endfunction " }}}2
 
 function! g:SyntasticLoclist.isEmpty() " {{{2
@@ -66,6 +76,10 @@ function! g:SyntasticLoclist.getBuffers() " {{{2
     return syntastic#util#unique(map(copy(self._rawLoclist), 'str2nr(v:val["bufnr"])') + [self._owner])
 endfunction " }}}2
 
+function! g:SyntasticLoclist.getCursorColumns() " {{{2
+    return self._columns
+endfunction " }}}2
+
 function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     if !exists("self._stl_format")
         let self._stl_format = ''
@@ -183,8 +197,8 @@ endfunction " }}}2
 function! g:SyntasticLoclist.messages(buf) " {{{2
     if !exists("self._cachedMessages")
         let self._cachedMessages = {}
-        let errors = self.errors() + self.warnings()
 
+        let errors = self.errors() + self.warnings()
         for e in errors
             let b = e['bufnr']
             let l = e['lnum']
@@ -194,9 +208,32 @@ function! g:SyntasticLoclist.messages(buf) " {{{2
             endif
 
             if !has_key(self._cachedMessages[b], l)
-                let self._cachedMessages[b][l] = e['text']
+                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:_setScreenColumn(e)
+                            endfor
+                            call sort(self._cachedMessages[b][l], 's:_compareErrorItemsByColumns')
+                        endif
+                    endfor
+                endfor
+            endif
+
+            for b in keys(self._cachedMessages)
+                for l in keys(self._cachedMessages[b])
+                    call s:_removeShadowedItems(self._cachedMessages[b][l])
+                endfor
+            endfor
+        endif
     endif
 
     return get(self._cachedMessages, a:buf, {})
@@ -210,7 +247,7 @@ endfunction " }}}2
 "
 "Note that all comparisons are done with ==?
 function! g:SyntasticLoclist.filter(filters) " {{{2
-    let conditions = values(map(copy(a:filters), 's:translate(v:key, v:val)'))
+    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)
@@ -271,10 +308,93 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! s:translate(key, val) " {{{2
+function! s:_translate(key, val) " {{{2
     return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
 endfunction " }}}2
 
+function! s:_setScreenColumn(item) " {{{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:_removeShadowedItems(errors) " {{{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:_compareErrorItemsByColumns(a, b) " {{{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:_compareErrorItemsByLines(a, b) " {{{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/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 47d83106..6a7aab3b 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -72,10 +72,11 @@ let s:defaultCheckers = {
         \ 'scss':        ['sass', 'scss_lint'],
         \ 'sh':          ['sh', 'shellcheck'],
         \ 'slim':        ['slimrb'],
+        \ 'spec':        ['rpmlint'],
         \ 'tcl':         ['nagelfar'],
         \ 'tex':         ['lacheck', 'chktex'],
         \ 'texinfo':     ['makeinfo'],
-        \ 'text':        ['atdtool'],
+        \ 'text':        [],
         \ 'twig':        ['twiglint'],
         \ 'typescript':  ['tsc'],
         \ 'vala':        ['valac'],
@@ -96,7 +97,8 @@ lockvar! s:defaultCheckers
 let s:defaultFiletypeMap = {
         \ 'gentoo-metadata': 'xml',
         \ 'lhaskell': 'haskell',
-        \ 'litcoffee': 'coffee'
+        \ 'litcoffee': 'coffee',
+        \ 'mail': 'text'
     \ }
 lockvar! s:defaultFiletypeMap
 
@@ -130,7 +132,7 @@ endfunction " }}}2
 " not checked for availability (that is, the corresponding IsAvailable() are
 " not run).
 function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) " {{{2
-    let ft = s:normaliseFiletype(a:ftalias)
+    let ft = s:_normaliseFiletype(a:ftalias)
     call self._loadCheckersFor(ft)
 
     let checkers_map = self._checkerMap[ft]
@@ -173,13 +175,13 @@ function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
-    let ft = s:normaliseFiletype(a:ftalias)
+    let ft = s:_normaliseFiletype(a:ftalias)
     call self._loadCheckersFor(ft)
     return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
 endfunction " }}}2
 
 function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
-    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:normaliseFiletype(v:val)' ))
+    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normaliseFiletype(v:val)' ))
     if len(ft_list) != 1
         let available = []
         let active = []
@@ -253,7 +255,7 @@ endfunction " }}}2
 
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:normaliseFiletype(ftalias) " {{{2
+function! s:_normaliseFiletype(ftalias) " {{{2
     let ft = get(s:defaultFiletypeMap, a:ftalias, a:ftalias)
     let ft = get(g:syntastic_filetype_map, ft, ft)
     let ft = substitute(ft, '\m-', '_', 'g')
diff --git a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
index 2a1b867c..98647638 100644
--- a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
@@ -18,7 +18,7 @@ let g:loaded_syntastic_arduino_avrgcc_checker = 1
 runtime! syntax_checkers/c/*.vim
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
+    \ 'filetype': 'arduino',
     \ 'name': 'avrgcc',
     \ 'exec': 'avr-gcc',
     \ 'redirect': 'c/avrgcc'})
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
new file mode 100644
index 00000000..16fbd59b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_clang_check_IsAvailable() dict
+  return executable(self.getExec())
+endfunction
+
+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 loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'clang_check',
+    \ 'exec': 'clang-check'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
new file mode 100644
index 00000000..96d2e0e6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_clang_tidy_IsAvailable() dict
+  return executable(self.getExec())
+endfunction
+
+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 loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'clang_tidy',
+    \ 'exec': 'clang-tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
index ca717c48..cb896914 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -30,15 +30,13 @@ set cpo&vim
 
 function! SyntaxCheckers_c_oclint_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'post_args_before': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
+        \ 'post_args': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
 
     let errorformat =
-        \ '%E%f:%l:%c: %m P1 ,' .
-        \ '%E%f:%l:%c: %m P2 ,' .
-        \ '%W%f:%l:%c: %m P3 ,' .
         \ '%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({
@@ -48,6 +46,15 @@ function! SyntaxCheckers_c_oclint_GetLocList() dict
         \ '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
+
     call self.setWantSort(1)
 
     return loclist
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
new file mode 100644
index 00000000..68050298
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"File:        pc_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Bragg <steve at empresseffects dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_c_pc_lint_checker")
+    finish
+endif
+let g:loaded_syntastic_c_pc_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists('g:syntastic_pc_lint_config_file')
+    let g:syntastic_pc_lint_config_file = 'options.lnt'
+endif
+
+function! SyntaxCheckers_c_pc_lint_GetLocList() dict
+    let config = findfile(g:syntastic_pc_lint_config_file, '.;')
+
+    " -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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
new file mode 100644
index 00000000..3eb7b809
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'clang_check',
+    \ 'exec': 'clang-check',
+    \ 'redirect': 'c/clang_check'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
new file mode 100644
index 00000000..e4266664
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'clang_tidy',
+    \ 'exec': 'clang-tidy',
+    \ 'redirect': 'c/clang_tidy'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
new file mode 100644
index 00000000..95feab5e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
@@ -0,0 +1,26 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/c/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'pc_lint',
+    \ 'exec': 'lint-nt',
+    \ 'redirect': 'c/pc_lint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
index bd94870b..367c110e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/erlang_check_file.erl
@@ -32,7 +32,7 @@ main([FileName, "-rebar", Path, LibDirs]) ->
     %io:format("~p~n", [LibDirs1]),
     compile(FileName, LibDirs1);
 
-main([FileName, LibDirs]) ->
+main([FileName | LibDirs]) ->
     compile(FileName, LibDirs).
 
 compile(FileName, LibDirs) ->
@@ -45,7 +45,12 @@ compile(FileName, LibDirs) ->
                   warn_export_vars,
                   strong_validation,
                   report] ++
-                 [{i, filename:join(Root, I)} || I <- LibDirs]).
+                 [{i, filename:join(Root, I)} || I <- LibDirs] ++
+                 case lists:member("deps/pmod_transform/include", LibDirs) of
+                     true -> [{parse_transform, pmod_pt}];
+                     _    -> []
+                 end
+                ).
 
 get_root(Dir) ->
     Path = filename:split(filename:absname(Dir)),
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index ea6b2f05..3dbc3a5e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -42,9 +42,16 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
         \ syntastic#util#shescape('puts ERB.new(File.read(' .
         \     fname . encoding_spec .
         \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
-        \ ' | ' . self.getExecEscaped() . ' -c'
+        \ ' | ' . self.getExecEscaped() . ' -w -c'
 
-    let errorformat =
+    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,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
index 93c298f6..adf4b611 100644
--- a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
@@ -29,6 +29,7 @@ function! SyntaxCheckers_handlebars_handlebars_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
         \ 'defaults': {'bufnr': bufnr("")} })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 387c2c9f..75431610 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -27,19 +27,27 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
+    return
+        \ executable(self.getExec()) &&
+        \ filereadable(expand(g:syntastic_java_checkstyle_classpath)) &&
+        \ filereadable(expand(g:syntastic_java_checkstyle_conf_file))
+endfunction
+
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
-    let fname = syntastic#util#shescape( expand('%:p:h') . '/' . expand('%:t') )
+    let fname = syntastic#util#shescape( expand('%:p:h') . syntastic#util#Slash() . expand('%:t') )
 
     if has('win32unix')
         let fname = substitute(system('cygpath -m ' . fname), '\m\%x00', '', 'g')
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'args_after': '-cp ' . g:syntastic_java_checkstyle_classpath .
-        \       ' com.puppycrawl.tools.checkstyle.Main -c ' .
-        \       syntastic#util#shexpand(g:syntastic_java_checkstyle_conf_file) .
-        \       ' -f xml',
+        \ 'args_after': [
+        \       '-cp', expand(g:syntastic_java_checkstyle_classpath),
+        \       'com.puppycrawl.tools.checkstyle.Main',
+        \       '-c', expand(g:syntastic_java_checkstyle_conf_file),
+        \       '-f', 'xml'],
         \ 'fname': fname })
 
     let errorformat = '%f:%t:%l:%c:%m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index 96919c8f..f23eb73b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -35,7 +35,8 @@ function! SyntaxCheckers_javascript_eslint_GetLocList() dict
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'] })
 
     for e in loclist
         let e['col'] += 1
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
index 9b5efa96..ce653f51 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -58,6 +58,7 @@ function! SyntaxCheckers_less_lessc_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
         \ 'defaults': {'bufnr': bufnr(""), 'text': "Syntax error"} })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
index d9f57001..5f7a0ee7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -71,7 +71,7 @@ if !exists('g:syntastic_ocaml_use_ocamlc') || !executable('ocamlc')
 endif
 
 if !exists('g:syntastic_ocaml_use_janestreet_core')
-    let g:syntastic_ocaml_use_ocamlc = 0
+    let g:syntastic_ocaml_use_janestreet_core = 0
 endif
 
 if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable("ocamlbuild")
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
index 23c1db9e..558dc0ac 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/php.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
@@ -38,7 +38,8 @@ function! SyntaxCheckers_php_php_GetLocList() dict
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim b/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
new file mode 100644
index 00000000..d857d9e2
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
index 5777993d..38e896cd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -32,8 +32,8 @@ function! SyntaxCheckers_puppet_puppet_GetLocList() dict
     let errorformat =
         \ '%-Gerr: Try ''puppet help parser validate'' for usage,' .
         \ '%-GError: Try ''puppet help parser validate'' for usage,' .
-        \ '%Eerr: Could not parse for environment %*[a-z]: %m at %f:%l,' .
-        \ '%EError: Could not parse for environment %*[a-z]: %m at %f:%l'
+        \ '%A%t%*[a-zA-Z]: %m at %f:%l:%c,' .
+        \ '%A%t%*[a-zA-Z]: %m at %f:%l'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index e1284e44..05a07080 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -42,7 +42,7 @@ function! SyntaxCheckers_python_frosted_GetLocList() dict
         if len(parts) >= 4
             let e["type"] = parts[1][0]
             let e["text"] = parts[3] . ' [' . parts[1] . ']'
-            let e["hl"] = '\V' . escape(parts[2], '\')
+            let e["hl"] = '\V\<' . escape(parts[2], '\') . '\>'
         elseif e["text"] =~? '\v^I\d+:'
             let e["valid"] = 0
         else
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 88dff422..d1373439 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -69,8 +69,10 @@ function! s:PylintNew(exe)
         " 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 pylint_version = filter(split(system(exe . ' --version'), '\m, \=\|\n'), 'v:val =~# ''\m^\.\=pylint[-0-9]*\>''')[0]
+        let pylint_version = filter( split(system(exe . ' --version'), '\m, \=\|\n'),
+                    \ 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
         let pylint_version = substitute(pylint_version, '\v^\S+\s+', '', '')
         let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(pylint_version), [1])
     catch /\m^Vim\%((\a\+)\)\=:E684/
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index e55c493d..8d179c27 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -44,7 +44,7 @@ function! SyntaxCheckers_ruby_mri_GetLocList() dict
     "
     "Which always generate the warning below. Note that ruby >= 1.9.3 includes
     "the word "possibly" in the warning
-    let errorformat = '%-G%.%#warning: %\(possibly %\)%\?useless use of == in void context,'
+    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
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
index a515fe5f..21e0fd6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -43,7 +43,7 @@ function! SyntaxCheckers_sass_sass_GetLocList() dict
         \ 'args_before': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check' })
 
     let errorformat =
-        \ '%ESyntax %trror: %m,' .
+        \ '%E%\m%\%%(Syntax %\)%\?%trror: %m,' .
         \ '%+C              %.%#,' .
         \ '%C        on line %l of %f\, %.%#,' .
         \ '%C        on line %l of %f,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
new file mode 100644
index 00000000..9c0a3cce
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
@@ -0,0 +1,71 @@
+"============================================================================
+"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
+    return
+        \ executable(self.getExec()) &&
+        \ filereadable(expand(g:syntastic_scala_scalastyle_jar)) &&
+        \ filereadable(expand(g:syntastic_scala_scalastyle_config_file))
+endfunction
+
+function! SyntaxCheckers_scala_scalastyle_GetLocList() dict
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar)],
+        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file)] })
+
+    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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index 2f971dce..fa63f19e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -31,7 +31,7 @@ function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'returns': [0, 1, 65] })
+        \ 'returns': [0, 1, 2, 65, 66] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index d736f296..65d84a97 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -57,7 +57,7 @@ function! s:GetShell()
         endif
         " try to use env variable in case no shebang could be found
         if b:shell == ''
-            let b:shell = fnamemodify(expand('$SHELL'), ':t')
+            let b:shell = fnamemodify($SHELL, ':t')
         endif
     endif
     return b:shell
diff --git a/sources_non_forked/syntastic/syntax_checkers/spec/lacheck.vim b/sources_non_forked/syntastic/syntax_checkers/spec/lacheck.vim
new file mode 100644
index 00000000..dfd965dc
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/spec/lacheck.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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
index b0f32c11..48c65f9e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -44,6 +44,8 @@ function! SyntaxCheckers_text_atdtool_GetLocList() dict
         let e['text'] = substitute(e['text'], '\m\n\s\+', ' | ', 'g')
     endfor
 
+    call self.setWantSort(1)
+
     return loclist
 endfunction
 
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index b4a88817..81cf3b5f 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -156,7 +156,7 @@ function! airline#check_mode(winnr)
     call add(l:mode, 'paste')
   endif
 
-  if &readonly
+  if &readonly || ! &modifiable
     call add(l:mode, 'readonly')
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 64560738..1738f626 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -215,6 +215,10 @@ function! airline#extensions#load()
     call airline#extensions#capslock#init(s:ext)
   endif
 
+  if (get(g:, 'airline#extensions#windowswap#enabled', 1) && get(g:, 'loaded_windowswap', 0))
+    call airline#extensions#windowswap#init(s:ext)
+  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).
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 954b0f68..e97cae85 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -21,7 +21,12 @@ function! s:get_git_branch(path)
   else
     try
       let line = join(readfile(dir . '/HEAD'))
-      let name = strpart(line, 16)
+      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
@@ -37,9 +42,11 @@ function! airline#extensions#branch#head()
   endif
 
   let b:airline_head = ''
+  let found_fugitive_head = 0
 
   if s:has_fugitive && !exists('b:mercurial_dir')
-    let b:airline_head = fugitive#head()
+    let b:airline_head = fugitive#head(7)
+    let found_fugitive_head = 1
 
     if empty(b:airline_head) && !exists('b:git_dir')
       let b:airline_head = s:get_git_branch(expand("%:p:h"))
@@ -61,7 +68,7 @@ function! airline#extensions#branch#head()
     endif
   endif
 
-  if empty(b:airline_head) || !s:check_in_path()
+  if empty(b:airline_head) || !found_fugitive_head && !s:check_in_path()
     let b:airline_head = ''
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
index d01349df..53b000d4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -63,7 +63,11 @@ function! airline#extensions#default#apply(builder, context)
   if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
     call <sid>build_sections(a:builder, a:context, s:layout[0])
   else
-    call a:builder.add_section('airline_c'.(a:context.bufnr), ' %f%m ')
+    let text = <sid>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', '', ''))
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index ec75db75..955f3db1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -7,7 +7,9 @@ let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
 let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
 let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
 let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
 let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
+let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
 
 let s:builder_context = {
       \ 'active'        : 1,
@@ -26,6 +28,21 @@ 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)
 let s:spc = g:airline_symbols.space
 
+let s:number_map = &encoding == 'utf-8'
+      \ ? {
+      \ '0': '⁰',
+      \ '1': '¹',
+      \ '2': '²',
+      \ '3': '³',
+      \ '4': '⁴',
+      \ '5': '⁵',
+      \ '6': '⁶',
+      \ '7': '⁷',
+      \ '8': '⁸',
+      \ '9': '⁹'
+      \ }
+      \ : {}
+
 function! airline#extensions#tabline#init(ext)
   if has('gui_running')
     set guioptions-=e
@@ -37,6 +54,9 @@ function! airline#extensions#tabline#init(ext)
 
   call s:toggle_on()
   call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
+  if s:buffer_idx_mode
+    call s:define_buffer_idx_mode_mappings()
+  endif
 endfunction
 
 function! s:toggle_off()
@@ -71,12 +91,20 @@ function! airline#extensions#tabline#load_theme(palette)
   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)
+  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
+
   let l:tabhid  = get(colors, 'airline_tabhid', a:palette.normal.airline_c)
   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)
 endfunction
 
@@ -93,7 +121,12 @@ function! s:on_cursormove(min_count, total_count)
 endfunction
 
 function! airline#extensions#tabline#get()
-  if s:show_buffers && tabpagenr('$') == 1
+  let curtabcnt = tabpagenr('$')
+  if curtabcnt != s:current_tabcnt
+    let s:current_tabcnt = curtabcnt
+    let s:current_bufnr = -1  " force a refresh...
+  endif
+  if s:show_buffers && curtabcnt == 1
     return s:get_buffers()
   else
     return s:get_tabs()
@@ -180,11 +213,13 @@ function! s:get_visible_buffers()
     endif
   endif
 
+  let g:current_visible_buffers = buffers
   return buffers
 endfunction
 
 let s:current_bufnr = -1
 let s:current_tabnr = -1
+let s:current_tabcnt = -1
 let s:current_tabline = ''
 let s:current_modified = 0
 function! s:get_buffers()
@@ -195,6 +230,7 @@ function! s:get_buffers()
     endif
   endif
 
+  let l:index = 1
   let b = airline#builder#new(s:builder_context)
   let tab_bufs = tabpagebuflist(tabpagenr())
   for nr in s:get_visible_buffers()
@@ -202,6 +238,7 @@ function! s:get_buffers()
       call b.add_raw('%#airline_tabhid#...')
       continue
     endif
+
     if cur == nr
       if g:airline_detect_modified && getbufvar(nr, '&modified')
         let group = 'airline_tabmod'
@@ -210,13 +247,25 @@ function! s:get_buffers()
       endif
       let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
     else
-      if index(tab_bufs, nr) > -1
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod_unsel'
+      elseif index(tab_bufs, nr) > -1
         let group = 'airline_tab'
       else
         let group = 'airline_tabhid'
       endif
     endif
-    call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
+
+    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
   endfor
 
   call b.add_section('airline_tabfill', '')
@@ -228,6 +277,35 @@ function! s:get_buffers()
   return s:current_tabline
 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 g:current_visible_buffers[0] == -1
+    let idx = idx + 1
+  endif
+
+  let buf = get(g:current_visible_buffers, idx, 0)
+  if buf != 0
+    exec 'b!' . buf
+  endif
+endfunction
+
+function! s:define_buffer_idx_mode_mappings()
+  noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
+  noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
+  noremap <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
+  noremap <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
+  noremap <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
+  noremap <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
+  noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
+  noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
+  noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
+endfunction
+
 function! s:get_tabs()
   let curbuf = bufnr('%')
   let curtab = tabpagenr()
@@ -266,7 +344,9 @@ function! s:get_tabs()
   call b.add_raw('%T')
   call b.add_section('airline_tabfill', '')
   call b.split()
-  call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  if s:show_close_button
+    call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  endif
   if s:show_tab_type
     call b.add_section('airline_tabtype', ' tabs ')
   endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/windowswap.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/windowswap.vim
new file mode 100644
index 00000000..2beb91c8
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/windowswap.vim
@@ -0,0 +1,23 @@
+" vim: et ts=2 sts=2 sw=2
+
+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()
+  if WindowSwap#HasMarkedWindow() && WindowSwap#GetMarkedWindowNum() == winnr()
+    return g:airline#extensions#windowswap#indicator_text.s:spc
+  endif
+  return ''
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index 539f2c49..021b3b28 100644
--- a/sources_non_forked/vim-airline/autoload/airline/init.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -78,7 +78,7 @@ function! airline#init#bootstrap()
   call airline#parts#define_raw('file', '%f%m')
   call airline#parts#define_raw('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
   call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
-  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace'])
+  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace','windowswap'])
   call airline#parts#define_text('capslock', '')
 
   unlet g:airline#init#bootstrapping
@@ -105,7 +105,7 @@ function! airline#init#sections()
     let g:airline_section_y = airline#section#create_right(['ffenc'])
   endif
   if !exists('g:airline_section_z')
-    let g:airline_section_z = airline#section#create(['%3p%%'.spc, 'linenr', ':%3c '])
+    let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3c '])
   endif
   if !exists('g:airline_section_warning')
     let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
diff --git a/sources_non_forked/vim-airline/autoload/airline/section.vim b/sources_non_forked/vim-airline/autoload/airline/section.vim
index 0baf0779..06d930f4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/section.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/section.vim
@@ -49,7 +49,7 @@ function! s:create(parts, append)
     endif
 
     if exists('part.condition')
-      let partval = substitute(partval, '{', '{'.(part.condition).' ? ', '')
+      let partval = substitute(partval, '{', '\="{".(part.condition)." ? "', '')
       let partval = substitute(partval, '}', ' : ""}', '')
     endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
index 4ff94f57..82c70712 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
@@ -1,43 +1,52 @@
 "
 " Colorscheme: Kalisi for airline. Inspired by powerline.
-" 06.02.2014 Arthur Jaron
+" Arthur Jaron
 " hifreeo@gmail.com
-" 
+" 30.07.2014 
+ 
 
 " Insert mode                                    
-let s:I1 = [ '#ffffff' , '#e80000' , 23  , 231 ] 
-let s:I2 = [ '#c5c5c5' , '#901010' , 74  , 31  ] 
-let s:I3 = [ '#c5c5c5' , '#500000' , 117 , 24  ] 
+let s:I1 = [ '#ffffff' , '#e80000','','']
+let s:I2 = [ '#c5c5c5' , '#901010','','']
+let s:I3 = [ '#c5c5c5' , '#500000','','']
 
-" Visual mode                                    
-let s:V1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] 
-let s:V2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] 
-let s:V3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] 
+" Visual mode                                   
+let s:V1 = [ '#2a5d8e' , '#ffffff','','']
+let s:V2 = [ '#87e7ff' , '#4077df','','']
+let s:V3 = [ '#87e7ff' , '#2a5d8e','','']
 
 " Replace mode
-let s:R1 = [ '#8e00da' , '#ffffff' , 23  , 231 ] 
-let s:R2 = [ '#8e00da' , '#ce99ff' , 74  , 31  ] 
-let s:R3 = [ '#ce99ff' , '#8e00da' , 117 , 24  ] 
+let s:R1 = [ '#6e00ba' , '#ffffff','','']
+let s:R2 = [ '#6e00ba' , '#d358ff','','']
+let s:R3 = [ '#ce99ff' , '#6e00ba','','']
 
 let g:airline#themes#kalisi#palette = {}
+let g:airline#themes#kalisi#palette.accents = {'red': ['#FF0000', '', 88, '']}
+
 
 function! airline#themes#kalisi#refresh()
 
+  let s:StatusLine = airline#themes#get_highlight('StatusLine')
+  let s:StatusLineNC = airline#themes#get_highlight('StatusLineNC')
+
   " Normal mode
-  let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
-  let s:N2 = [ '#afd700' , '#005f00' , 247 , 236 ]
-  let s:N3 = airline#themes#get_highlight('StatusLine')
+  let s:N1 = [ '#005f00' , '#afd700','',''] 
+  let s:N2 = [ '#afd700' , '#005f00','',''] 
+  let s:N3 = s:StatusLine
+
 
   " Tabline Plugin
   let g:airline#themes#kalisi#palette.tabline = {
-        \ 'airline_tab':  ['#A6DB29', '#005f00',  231, 29, ''],
-        \ 'airline_tabsel':  ['#404042', '#A6DB29',  231, 36, ''],
-        \ 'airline_tabtype':  ['#afd700', '#005f00',  231, 36, ''],
-        \ 'airline_tabfill':  ['#ffffff', '#000000',  231, 23, ''],
-        \ 'airline_tabhid':  ['#c5c5c5', '#404042',  231, 88, ''],
-        \ 'airline_tabmod':  ['#ffffff', '#F1266F',  231, 88, ''],
+        \ 'airline_tab':  ['#A6DB29', '#005f00','',''],
+        \ 'airline_tabsel':  ['#404042', '#A6DB29','',''],
+        \ 'airline_tabtype':  ['#afd700', '#204d20','',''],
+        \ 'airline_tabfill':  s:StatusLine,
+        \ 'airline_tabhid':  ['#c5c5c5', '#404042','',''],
+        \ 'airline_tabmod':  ['#ffffff', '#F1266F','','']
         \ }
 
+        " \ 'airline_tabfill':  ['#ffffff', '#2b2b2b','',''],
+        
   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)
@@ -55,3 +64,11 @@ 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:StatusLineNC,
+      \ s:StatusLine,
+      \ [ '#005f00' , '#afd700' , '','', ''] )
+
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index cd2a17c5..ddc81ce0 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -404,6 +404,25 @@ eclim <https://eclim.org>
 * enable/disable displaying tab type (far right)
   let g:airline#extensions#tabline#show_tab_type = 1
 
+* 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
+
+  Note: Mappings will be ignored within a NERDTree buffer.
+
 * defines the name of a formatter for how buffer names are displayed. >
   let g:airline#extensions#tabline#formatter = 'default'
 
@@ -453,6 +472,9 @@ eclim <https://eclim.org>
   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'
 
@@ -507,6 +529,15 @@ vim-capslock <https://github.com/tpope/vim-capslock>
 
 * enable/disable vim-capslock integration >
   let g:airline#extensions#capslock#enabled = 1
+
+-------------------------------------                       *airline-windowswap*
+vim-windowswap <https://github.com/wesQ3/vim-windowswap>
+
+* enable/disable vim-windowswap integration >
+  let g:airline#extensions#windowswap#enabled = 1
+
+* set marked window indicator string >
+  let g:airline#extensions#windowswap#indicator_text = 'WS'
 <
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index b5a204b2..8fabd1cc 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -1195,7 +1195,7 @@ 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=* -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<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
diff --git a/sources_non_forked/vim-golang/README.md b/sources_non_forked/vim-golang/README.md
new file mode 100644
index 00000000..aca52b78
--- /dev/null
+++ b/sources_non_forked/vim-golang/README.md
@@ -0,0 +1,8 @@
+## Vim plugins have moved
+
+The vim plugins have been removed from the Go repository along with all other
+editor plugins. Please visit [The Go Wiki][1] for a current list of plugins. I
+have personally moved over to the [vim-go][2] suite of plugins.
+
+[1]: https://code.google.com/p/go-wiki/wiki/IDEsAndTextEditorPlugins 
+[2]: https://github.com/fatih/vim-go
diff --git a/sources_non_forked/vim-golang/autoload/go/complete.vim b/sources_non_forked/vim-golang/autoload/go/complete.vim
deleted file mode 100644
index a4fa6b66..00000000
--- a/sources_non_forked/vim-golang/autoload/go/complete.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" This file provides a utility function that performs auto-completion of
-" package names, for use by other commands.
-
-let s:goos = $GOOS
-let s:goarch = $GOARCH
-
-if len(s:goos) == 0
-  if exists('g:golang_goos')
-    let s:goos = g:golang_goos
-  elseif has('win32') || has('win64')
-    let s:goos = 'windows'
-  elseif has('macunix')
-    let s:goos = 'darwin'
-  else
-    let s:goos = '*'
-  endif
-endif
-
-if len(s:goarch) == 0
-  if exists('g:golang_goarch')
-    let s:goarch = g:golang_goarch
-  else
-    let s:goarch = '*'
-  endif
-endif
-
-function! go#complete#PackageMembers(package, member)
-  silent! let content = system('godoc ' . a:package)
-  if v:shell_error || !len(content)
-    return []
-  endif
-  let lines = filter(split(content, "\n"),"v:val !~ '^\\s\\+$'")
-  try
-    let mx1 = '^\s\+\(\S+\)\s\+=\s\+.*'
-    let mx2 = '^\%(const\|var\|type\|func\) \([A-Z][^ (]\+\).*'
-    let candidates =
-    \   map(filter(copy(lines), 'v:val =~ mx1'), 'substitute(v:val, mx1, "\\1", "")')
-    \ + map(filter(copy(lines), 'v:val =~ mx2'), 'substitute(v:val, mx2, "\\1", "")')
-    return filter(candidates, '!stridx(v:val, a:member)')
-  catch
-    return []
-  endtry
-endfunction
-
-function! go#complete#Package(ArgLead, CmdLine, CursorPos)
-  let dirs = []
-
-  let words = split(a:CmdLine, '\s\+', 1)
-  if len(words) > 2
-    " Complete package members
-    return go#complete#PackageMembers(words[1], words[2])
-  endif
-
-  if executable('go')
-    let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
-    if v:shell_error
-      echomsg '''go env GOROOT'' failed'
-    endif
-  else
-    let goroot = $GOROOT
-  endif
-
-  if len(goroot) != 0 && isdirectory(goroot)
-    let dirs += [goroot]
-  endif
-
-  let pathsep = ':'
-  if s:goos == 'windows'
-    let pathsep = ';'
-  endif
-  let workspaces = split($GOPATH, pathsep)
-  if workspaces != []
-    let dirs += workspaces
-  endif
-
-  if len(dirs) == 0
-    " should not happen
-    return []
-  endif
-
-  let ret = {}
-  for dir in dirs
-    " this may expand to multiple lines
-    let root = split(expand(dir . '/pkg/' . s:goos . '_' . s:goarch), "\n")
-    call add(root, expand(dir . '/src'))
-    for r in root
-      for i in split(globpath(r, a:ArgLead.'*'), "\n")
-        if isdirectory(i)
-          let i .= '/'
-        elseif i !~ '\.a$'
-          continue
-        endif
-        let i = substitute(substitute(i[len(r)+1:], '[\\]', '/', 'g'), '\.a$', '', 'g')
-        let ret[i] = i
-      endfor
-    endfor
-  endfor
-  return sort(keys(ret))
-endfunction
diff --git a/sources_non_forked/vim-golang/compiler/go.vim b/sources_non_forked/vim-golang/compiler/go.vim
deleted file mode 100644
index 2c8cce49..00000000
--- a/sources_non_forked/vim-golang/compiler/go.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" Copyright 2013 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" compiler/go.vim: Vim compiler file for Go.
-
-if exists("current_compiler")
-    finish
-endif
-let current_compiler = "go"
-
-if exists(":CompilerSet") != 2
-    command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:save_cpo = &cpo
-set cpo-=C
-
-CompilerSet makeprg=go\ build
-CompilerSet errorformat=
-        \%-G#\ %.%#,
-        \%A%f:%l:%c:\ %m,
-        \%A%f:%l:\ %m,
-        \%C%*\\s%m,
-        \%-G%.%#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftdetect/gofiletype.vim b/sources_non_forked/vim-golang/ftdetect/gofiletype.vim
deleted file mode 100644
index b658f6b0..00000000
--- a/sources_non_forked/vim-golang/ftdetect/gofiletype.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" We take care to preserve the user's fileencodings and fileformats,
-" because those settings are global (not buffer local), yet we want
-" to override them for loading Go files, which are defined to be UTF-8.
-let s:current_fileformats = ''
-let s:current_fileencodings = ''
-
-" define fileencodings to open as utf-8 encoding even if it's ascii.
-function! s:gofiletype_pre()
-  let s:current_fileformats = &g:fileformats
-  let s:current_fileencodings = &g:fileencodings
-  set fileencodings=utf-8 fileformats=unix
-  setlocal filetype=go
-endfunction
-
-" restore fileencodings as others
-function! s:gofiletype_post()
-  let &g:fileformats = s:current_fileformats
-  let &g:fileencodings = s:current_fileencodings
-endfunction
-
-au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
-au BufRead *.go call s:gofiletype_pre()
-au BufReadPost *.go call s:gofiletype_post()
diff --git a/sources_non_forked/vim-golang/ftplugin/go.vim b/sources_non_forked/vim-golang/ftplugin/go.vim
deleted file mode 100644
index 532fb172..00000000
--- a/sources_non_forked/vim-golang/ftplugin/go.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Copyright 2013 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" go.vim: Vim filetype plugin for Go.
-
-if exists("b:did_ftplugin")
-    finish
-endif
-let b:did_ftplugin = 1
-
-setlocal formatoptions-=t
-
-setlocal comments=s1:/*,mb:*,ex:*/,://
-setlocal commentstring=//\ %s
-
-let b:undo_ftplugin = "setl fo< com< cms<"
-
-" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/fmt.vim b/sources_non_forked/vim-golang/ftplugin/go/fmt.vim
deleted file mode 100644
index 359545bd..00000000
--- a/sources_non_forked/vim-golang/ftplugin/go/fmt.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" fmt.vim: Vim command to format Go files with gofmt.
-"
-" This filetype plugin add a new commands for go buffers:
-"
-"   :Fmt
-"
-"       Filter the current Go buffer through gofmt.
-"       It tries to preserve cursor position and avoids
-"       replacing the buffer with stderr output.
-"
-" Options:
-"
-"   g:go_fmt_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
-"   g:gofmt_command [default="gofmt"]
-"
-"       Flag naming the gofmt executable to use.
-"
-if exists("b:did_ftplugin_go_fmt")
-    finish
-endif
-
-if !exists("g:go_fmt_commands")
-    let g:go_fmt_commands = 1
-endif
-
-if !exists("g:gofmt_command")
-    let g:gofmt_command = "gofmt"
-endif
-
-if g:go_fmt_commands
-    command! -buffer Fmt call s:GoFormat()
-endif
-
-function! s:GoFormat()
-    let view = winsaveview()
-    silent execute "%!" . g:gofmt_command
-    if v:shell_error
-        let errors = []
-        for line in getline(1, line('$'))
-            let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
-            if !empty(tokens)
-                call add(errors, {"filename": @%,
-                                 \"lnum":     tokens[2],
-                                 \"col":      tokens[3],
-                                 \"text":     tokens[4]})
-            endif
-        endfor
-        if empty(errors)
-            % | " Couldn't detect gofmt error format, output errors
-        endif
-        undo
-        if !empty(errors)
-            call setqflist(errors, 'r')
-        endif
-        echohl Error | echomsg "Gofmt returned error" | echohl None
-    endif
-    call winrestview(view)
-endfunction
-
-let b:did_ftplugin_go_fmt = 1
-
-" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/import.vim b/sources_non_forked/vim-golang/ftplugin/go/import.vim
deleted file mode 100644
index 91c8697a..00000000
--- a/sources_non_forked/vim-golang/ftplugin/go/import.vim
+++ /dev/null
@@ -1,250 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" import.vim: Vim commands to import/drop Go packages.
-"
-" This filetype plugin adds three new commands for go buffers:
-"
-"   :Import {path}
-"
-"       Import ensures that the provided package {path} is imported
-"       in the current Go buffer, using proper style and ordering.
-"       If {path} is already being imported, an error will be
-"       displayed and the buffer will be untouched.
-"
-"   :ImportAs {localname} {path}
-"
-"       Same as Import, but uses a custom local name for the package.
-"
-"   :Drop {path}
-"
-"       Remove the import line for the provided package {path}, if
-"       present in the current Go buffer.  If {path} is not being
-"       imported, an error will be displayed and the buffer will be
-"       untouched.
-"
-" If you would like to add shortcuts, you can do so by doing the following:
-"
-"   Import fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR>
-"
-"   Drop fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR>
-"
-"   Import the word under your cursor
-"   au Filetype go nnoremap <buffer> <LocalLeader>k
-"       \ :exe 'Import ' . expand('<cword>')<CR>
-"
-" The backslash '\' is the default maplocalleader, so it is possible that
-" your vim is set to use a different character (:help maplocalleader).
-"
-" Options:
-"
-"   g:go_import_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
-if exists("b:did_ftplugin_go_import")
-    finish
-endif
-
-if !exists("g:go_import_commands")
-    let g:go_import_commands = 1
-endif
-
-if g:go_import_commands
-    command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>)
-    command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>)
-    command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>)
-endif
-
-function! s:SwitchImport(enabled, localname, path)
-    let view = winsaveview()
-    let path = a:path
-
-    " Quotes are not necessary, so remove them if provided.
-    if path[0] == '"'
-        let path = strpart(path, 1)
-    endif
-    if path[len(path)-1] == '"'
-        let path = strpart(path, 0, len(path) - 1)
-    endif
-    if path == ''
-        call s:Error('Import path not provided')
-        return
-    endif
-
-    " Extract any site prefix (e.g. github.com/).
-    " If other imports with the same prefix are grouped separately,
-    " we will add this new import with them.
-    " Only up to and including the first slash is used.
-    let siteprefix = matchstr(path, "^[^/]*/")
-
-    let qpath = '"' . path . '"'
-    if a:localname != ''
-        let qlocalpath = a:localname . ' ' . qpath
-    else
-        let qlocalpath = qpath
-    endif
-    let indentstr = 0
-    let packageline = -1 " Position of package name statement
-    let appendline = -1  " Position to introduce new import
-    let deleteline = -1  " Position of line with existing import
-    let linesdelta = 0   " Lines added/removed
-
-    " Find proper place to add/remove import.
-    let line = 0
-    while line <= line('$')
-        let linestr = getline(line)
-
-        if linestr =~# '^package\s'
-            let packageline = line
-            let appendline = line
-
-        elseif linestr =~# '^import\s\+('
-            let appendstr = qlocalpath
-            let indentstr = 1
-            let appendline = line
-            let firstblank = -1
-            let lastprefix = ""
-            while line <= line("$")
-                let line = line + 1
-                let linestr = getline(line)
-                let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)')
-                if empty(m)
-                    if siteprefix == "" && a:enabled
-                        " must be in the first group
-                        break
-                    endif
-                    " record this position, but keep looking
-                    if firstblank < 0
-                        let firstblank = line
-                    endif
-                    continue
-                endif
-                if m[1] == ')'
-                    " if there's no match, add it to the first group
-                    if appendline < 0 && firstblank >= 0
-                        let appendline = firstblank
-                    endif
-                    break
-                endif
-                let lastprefix = matchstr(m[4], "^[^/]*/")
-                if a:localname != '' && m[3] != ''
-                    let qlocalpath = printf('%-' . (len(m[3])-1) . 's %s', a:localname, qpath)
-                endif
-                let appendstr = m[2] . qlocalpath
-                let indentstr = 0
-                if m[4] == path
-                    let appendline = -1
-                    let deleteline = line
-                    break
-                elseif m[4] < path
-                    " don't set candidate position if we have a site prefix,
-                    " we've passed a blank line, and this doesn't share the same
-                    " site prefix.
-                    if siteprefix == "" || firstblank < 0 || match(m[4], "^" . siteprefix) >= 0
-                        let appendline = line
-                    endif
-                elseif siteprefix != "" && match(m[4], "^" . siteprefix) >= 0
-                    " first entry of site group
-                    let appendline = line - 1
-                    break
-                endif
-            endwhile
-            break
-
-        elseif linestr =~# '^import '
-            if appendline == packageline
-                let appendstr = 'import ' . qlocalpath
-                let appendline = line - 1
-            endif
-            let m = matchlist(linestr, '^import\(\s\+\)\(\S*\s*\)"\(.\+\)"')
-            if !empty(m)
-                if m[3] == path
-                    let appendline = -1
-                    let deleteline = line
-                    break
-                endif
-                if m[3] < path
-                    let appendline = line
-                endif
-                if a:localname != '' && m[2] != ''
-                    let qlocalpath = printf("%s %" . len(m[2])-1 . "s", a:localname, qpath)
-                endif
-                let appendstr = 'import' . m[1] . qlocalpath
-            endif
-
-        elseif linestr =~# '^\(var\|const\|type\|func\)\>'
-            break
-
-        endif
-        let line = line + 1
-    endwhile
-
-    " Append or remove the package import, as requested.
-    if a:enabled
-        if deleteline != -1
-            call s:Error(qpath . ' already being imported')
-        elseif appendline == -1
-            call s:Error('No package line found')
-        else
-            if appendline == packageline
-                call append(appendline + 0, '')
-                call append(appendline + 1, 'import (')
-                call append(appendline + 2, ')')
-                let appendline += 2
-                let linesdelta += 3
-                let appendstr = qlocalpath
-                let indentstr = 1
-            endif
-            call append(appendline, appendstr)
-            execute appendline + 1
-            if indentstr
-                execute 'normal >>'
-            endif
-            let linesdelta += 1
-        endif
-    else
-        if deleteline == -1
-            call s:Error(qpath . ' not being imported')
-        else
-            execute deleteline . 'd'
-            let linesdelta -= 1
-
-            if getline(deleteline-1) =~# '^import\s\+(' && getline(deleteline) =~# '^)'
-                " Delete empty import block
-                let deleteline -= 1
-                execute deleteline . "d"
-                execute deleteline . "d"
-                let linesdelta -= 2
-            endif
-
-            if getline(deleteline) == '' && getline(deleteline - 1) == ''
-                " Delete spacing for removed line too.
-                execute deleteline . "d"
-                let linesdelta -= 1
-            endif
-        endif
-    endif
-
-    " Adjust view for any changes.
-    let view.lnum += linesdelta
-    let view.topline += linesdelta
-    if view.topline < 0
-        let view.topline = 0
-    endif
-
-    " Put buffer back where it was.
-    call winrestview(view)
-
-endfunction
-
-function! s:Error(s)
-    echohl Error | echo a:s | echohl None
-endfunction
-
-let b:did_ftplugin_go_import = 1
-
-" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/ftplugin/go/test.sh b/sources_non_forked/vim-golang/ftplugin/go/test.sh
deleted file mode 100644
index d8a5b895..00000000
--- a/sources_non_forked/vim-golang/ftplugin/go/test.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash -e
-#
-# Copyright 2012 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Tests for import.vim.
-
-cd $(dirname $0)
-
-cat > base.go <<EOF
-package test
-
-import (
-	"bytes"
-	"io"
-	"net"
-
-	"mycorp/foo"
-)
-EOF
-
-fail=0
-
-# usage: test_one command pattern
-# Pattern is a PCRE expression that will match across lines.
-test_one() {
-  echo 2>&1 -n "$1: "
-  vim -e -s -u /dev/null -U /dev/null --noplugin -c "source import.vim" \
-    -c "$1" -c 'wq! test.go' base.go
-  # ensure blank lines are treated correctly
-  if ! gofmt test.go | cmp test.go -; then
-    echo 2>&1 "gofmt conflict"
-    gofmt test.go | diff -u test.go - | sed "s/^/	/" 2>&1
-    fail=1
-    return
-  fi
-  if ! [[ $(cat test.go) =~ $2 ]]; then
-    echo 2>&1 "$2 did not match"
-    cat test.go | sed "s/^/	/" 2>&1
-    fail=1
-    return
-  fi
-  echo 2>&1 "ok"
-}
-
-# Tests for Import
-
-test_one "Import baz" '"baz".*"bytes"'
-test_one "Import io/ioutil" '"io".*"io/ioutil".*"net"'
-test_one "Import myc" '"io".*"myc".*"net"'  # prefix of a site prefix
-test_one "Import nat" '"io".*"nat".*"net"'
-test_one "Import net/http" '"net".*"net/http".*"mycorp/foo"'
-test_one "Import zoo" '"net".*"zoo".*"mycorp/foo"'
-test_one "Import mycorp/bar" '"net".*"mycorp/bar".*"mycorp/foo"'
-test_one "Import mycorp/goo" '"net".*"mycorp/foo".*"mycorp/goo"'
-
-# Tests for Drop
-
-cat > base.go <<EOF
-package test
-
-import (
-	"foo"
-
-	"something"
-	"zoo"
-)
-EOF
-
-test_one "Drop something" '\([^"]*"foo"[^"]*"zoo"[^"]*\)'
-
-rm -f base.go test.go
-if [ $fail -gt 0 ]; then
-  echo 2>&1 "FAIL"
-  exit 1
-fi
-echo 2>&1 "PASS"
diff --git a/sources_non_forked/vim-golang/indent/go.vim b/sources_non_forked/vim-golang/indent/go.vim
deleted file mode 100644
index e3d6e841..00000000
--- a/sources_non_forked/vim-golang/indent/go.vim
+++ /dev/null
@@ -1,77 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" indent/go.vim: Vim indent file for Go.
-"
-" TODO:
-" - function invocations split across lines
-" - general line splits (line ends in an operator)
-
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-" C indentation is too far off useful, mainly due to Go's := operator.
-" Let's just define our own.
-setlocal nolisp
-setlocal autoindent
-setlocal indentexpr=GoIndent(v:lnum)
-setlocal indentkeys+=<:>,0=},0=)
-
-if exists("*GoIndent")
-  finish
-endif
-
-" The shiftwidth() function is relatively new.
-" Don't require it to exist.
-if exists('*shiftwidth')
-  func s:sw()
-    return shiftwidth()
-  endfunc
-else
-  func s:sw()
-    return &shiftwidth
-  endfunc
-endif
-
-function! GoIndent(lnum)
-  let prevlnum = prevnonblank(a:lnum-1)
-  if prevlnum == 0
-    " top of file
-    return 0
-  endif
-
-  " grab the previous and current line, stripping comments.
-  let prevl = substitute(getline(prevlnum), '//.*$', '', '')
-  let thisl = substitute(getline(a:lnum), '//.*$', '', '')
-  let previ = indent(prevlnum)
-
-  let ind = previ
-
-  if prevl =~ '[({]\s*$'
-    " previous line opened a block
-    let ind += s:sw()
-  endif
-  if prevl =~# '^\s*\(case .*\|default\):$'
-    " previous line is part of a switch statement
-    let ind += s:sw()
-  endif
-  " TODO: handle if the previous line is a label.
-
-  if thisl =~ '^\s*[)}]'
-    " this line closed a block
-    let ind -= s:sw()
-  endif
-
-  " Colons are tricky.
-  " We want to outdent if it's part of a switch ("case foo:" or "default:").
-  " We ignore trying to deal with jump labels because (a) they're rare, and
-  " (b) they're hard to disambiguate from a composite literal key.
-  if thisl =~# '^\s*\(case .*\|default\):$'
-    let ind -= s:sw()
-  endif
-
-  return ind
-endfunction
diff --git a/sources_non_forked/vim-golang/mirror.txt b/sources_non_forked/vim-golang/mirror.txt
deleted file mode 100644
index 7fc4f60f..00000000
--- a/sources_non_forked/vim-golang/mirror.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a mirror of the misc/vim portion of the official Go repository. It is
-automatically updated.
-
-Any contributions or issues should be made to the official repository.
-
-http://golang.org/doc/contribute.html
diff --git a/sources_non_forked/vim-golang/plugin/godoc.vim b/sources_non_forked/vim-golang/plugin/godoc.vim
deleted file mode 100644
index a145d313..00000000
--- a/sources_non_forked/vim-golang/plugin/godoc.vim
+++ /dev/null
@@ -1,130 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" godoc.vim: Vim command to see godoc.
-"
-"
-" Commands:
-"
-"   :Godoc
-"
-"       Open the relevant Godoc for either the word[s] passed to the command or
-"       the, by default, the word under the cursor.
-"
-" Options:
-"
-"   g:go_godoc_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-
-if exists("g:loaded_godoc")
-  finish
-endif
-let g:loaded_godoc = 1
-
-let s:buf_nr = -1
-let s:last_word = ''
-
-if !exists('g:go_godoc_commands')
-  let g:go_godoc_commands = 1
-endif
-
-if g:go_godoc_commands
-  command! -nargs=* -range -complete=customlist,go#complete#Package Godoc :call s:Godoc(<f-args>)
-endif
-
-nnoremap <silent> <Plug>(godoc-keyword) :<C-u>call <SID>Godoc('')<CR>
-
-function! s:GodocView()
-  if !bufexists(s:buf_nr)
-    leftabove new
-    file `="[Godoc]"`
-    let s:buf_nr = bufnr('%')
-  elseif bufwinnr(s:buf_nr) == -1
-    leftabove split
-    execute s:buf_nr . 'buffer'
-    delete _
-  elseif bufwinnr(s:buf_nr) != bufwinnr('%')
-    execute bufwinnr(s:buf_nr) . 'wincmd w'
-  endif
-
-  setlocal filetype=godoc
-  setlocal bufhidden=delete
-  setlocal buftype=nofile
-  setlocal noswapfile
-  setlocal nobuflisted
-  setlocal modifiable
-  setlocal nocursorline
-  setlocal nocursorcolumn
-  setlocal iskeyword+=:
-  setlocal iskeyword-=-
-
-  nnoremap <buffer> <silent> K :Godoc<cr>
-
-  au BufHidden <buffer> call let <SID>buf_nr = -1
-endfunction
-
-function! s:GodocWord(word)
-  if !executable('godoc')
-    echohl WarningMsg
-    echo "godoc command not found."
-    echo "  install with: go get code.google.com/p/go.tools/cmd/godoc"
-    echohl None
-    return 0
-  endif
-  let word = a:word
-  silent! let content = system('godoc ' . word)
-  if v:shell_error || !len(content)
-    if len(s:last_word)
-      silent! let content = system('godoc ' . s:last_word.'/'.word)
-      if v:shell_error || !len(content)
-        echo 'No documentation found for "' . word . '".'
-        return 0
-      endif
-      let word = s:last_word.'/'.word
-    else
-      echo 'No documentation found for "' . word . '".'
-      return 0
-    endif
-  endif
-  let s:last_word = word
-  silent! call s:GodocView()
-  setlocal modifiable
-  silent! %d _
-  silent! put! =content
-  silent! normal gg
-  setlocal nomodifiable
-  setfiletype godoc
-  return 1
-endfunction
-
-function! s:Godoc(...)
-  if !len(a:000)
-    let oldiskeyword = &iskeyword
-    setlocal iskeyword+=.
-    let word = expand('<cword>')
-    let &iskeyword = oldiskeyword
-    let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g')
-    let words = split(word, '\.\ze[^./]\+$')
-  else
-    let words = a:000
-  endif
-  if !len(words)
-    return
-  endif
-  if s:GodocWord(words[0])
-    if len(words) > 1
-      if search('^\%(const\|var\|type\|\s\+\) ' . words[1] . '\s\+=\s')
-        return
-      endif
-      if search('^func ' . words[1] . '(')
-        silent! normal zt
-        return
-      endif
-      echo 'No documentation found for "' . words[1] . '".'
-    endif
-  endif
-endfunction
-
-" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-golang/readme.txt b/sources_non_forked/vim-golang/readme.txt
deleted file mode 100644
index 9a9e2287..00000000
--- a/sources_non_forked/vim-golang/readme.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-Vim plugins for Go (http://golang.org)
-======================================
-
-To use all the Vim plugins, add these lines to your $HOME/.vimrc.
-
-  " Some Linux distributions set filetype in /etc/vimrc.
-  " Clear filetype flags before changing runtimepath to force Vim to reload them.
-  if exists("g:did_load_filetypes")
-    filetype off
-    filetype plugin indent off
-  endif
-  set runtimepath+=$GOROOT/misc/vim " replace $GOROOT with the output of: go env GOROOT
-  filetype plugin indent on
-  syntax on
-
-If you want to select fewer plugins, use the instructions in the rest of
-this file.
-
-A popular configuration is to gofmt Go source files when they are saved.
-To do that, add this line to the end of your $HOME/.vimrc.
-
-  autocmd FileType go autocmd BufWritePre <buffer> Fmt
-
-
-Vim syntax highlighting
------------------------
-
-To install automatic syntax highlighting for GO programs:
-
-  1. Copy or link the filetype detection script to the ftdetect directory
-     underneath your vim runtime directory (normally $HOME/.vim/ftdetect)
-  2. Copy or link syntax/go.vim to the syntax directory underneath your vim
-     runtime directory (normally $HOME/.vim/syntax). Linking this file rather
-     than just copying it will ensure any changes are automatically reflected
-     in your syntax highlighting.
-  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
-
-     syntax on
-
-In a typical unix environment you might accomplish this using the following
-commands:
-
-  mkdir -p $HOME/.vim/ftdetect
-  mkdir -p $HOME/.vim/syntax
-  mkdir -p $HOME/.vim/autoload/go
-  ln -s $GOROOT/misc/vim/ftdetect/gofiletype.vim $HOME/.vim/ftdetect/
-  ln -s $GOROOT/misc/vim/syntax/go.vim $HOME/.vim/syntax
-  ln -s $GOROOT/misc/vim/autoload/go/complete.vim $HOME/.vim/autoload/go
-  echo "syntax on" >> $HOME/.vimrc
-
-
-Vim filetype plugins
---------------------
-
-To install one of the available filetype plugins:
-
-  1. Same as 1 above.
-  2. Copy or link ftplugin/go.vim to the ftplugin directory underneath your vim
-     runtime directory (normally $HOME/.vim/ftplugin). Copy or link one or more
-     additional plugins from ftplugin/go/*.vim to the Go-specific subdirectory
-     in the same place ($HOME/.vim/ftplugin/go/*.vim).
-  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
-
-     filetype plugin on
-
-
-Vim indentation plugin
-----------------------
-
-To install automatic indentation:
-
-  1. Same as 1 above.
-  2. Copy or link indent/go.vim to the indent directory underneath your vim
-     runtime directory (normally $HOME/.vim/indent).
-  3. Add the following line to your .vimrc file (normally $HOME/.vimrc):
-
-     filetype indent on
-
-
-Vim compiler plugin
--------------------
-
-To install the compiler plugin:
-
-  1. Same as 1 above.
-  2. Copy or link compiler/go.vim to the compiler directory underneath your vim
-     runtime directory (normally $HOME/.vim/compiler).
-  3. Activate the compiler plugin with ":compiler go". To always enable the
-     compiler plugin in Go source files add an autocommand to your .vimrc file
-     (normally $HOME/.vimrc):
-
-     autocmd FileType go compiler go
-
-
-Godoc plugin
-------------
-
-To install godoc plugin:
-
-  1. Same as 1 above.
-  2. Copy or link plugin/godoc.vim to $HOME/.vim/plugin/godoc,
-     syntax/godoc.vim to $HOME/.vim/syntax/godoc.vim,
-     and autoload/go/complete.vim to $HOME/.vim/autoload/go/complete.vim.
diff --git a/sources_non_forked/vim-golang/syntax/go.vim b/sources_non_forked/vim-golang/syntax/go.vim
deleted file mode 100644
index 1ce6cb27..00000000
--- a/sources_non_forked/vim-golang/syntax/go.vim
+++ /dev/null
@@ -1,207 +0,0 @@
-" Copyright 2009 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" go.vim: Vim syntax file for Go.
-"
-" Options:
-"   There are some options for customizing the highlighting; the recommended
-"   settings are the default values, but you can write:
-"     let OPTION_NAME = 0
-"   in your ~/.vimrc file to disable particular options. You can also write:
-"     let OPTION_NAME = 1
-"   to enable particular options. At present, all options default to on.
-"
-"   - go_highlight_array_whitespace_error
-"     Highlights white space after "[]".
-"   - go_highlight_chan_whitespace_error
-"     Highlights white space around the communications operator that don't follow
-"     the standard style.
-"   - go_highlight_extra_types
-"     Highlights commonly used library types (io.Reader, etc.).
-"   - go_highlight_space_tab_error
-"     Highlights instances of tabs following spaces.
-"   - go_highlight_trailing_whitespace_error
-"     Highlights trailing white space.
-
-" Quit when a (custom) syntax file was already loaded
-if exists("b:current_syntax")
-  finish
-endif
-
-if !exists("go_highlight_array_whitespace_error")
-  let go_highlight_array_whitespace_error = 1
-endif
-if !exists("go_highlight_chan_whitespace_error")
-  let go_highlight_chan_whitespace_error = 1
-endif
-if !exists("go_highlight_extra_types")
-  let go_highlight_extra_types = 1
-endif
-if !exists("go_highlight_space_tab_error")
-  let go_highlight_space_tab_error = 1
-endif
-if !exists("go_highlight_trailing_whitespace_error")
-  let go_highlight_trailing_whitespace_error = 1
-endif
-
-syn case match
-
-syn keyword     goDirective         package import
-syn keyword     goDeclaration       var const type
-syn keyword     goDeclType          struct interface
-
-hi def link     goDirective         Statement
-hi def link     goDeclaration       Keyword
-hi def link     goDeclType          Keyword
-
-" Keywords within functions
-syn keyword     goStatement         defer go goto return break continue fallthrough
-syn keyword     goConditional       if else switch select
-syn keyword     goLabel             case default
-syn keyword     goRepeat            for range
-
-hi def link     goStatement         Statement
-hi def link     goConditional       Conditional
-hi def link     goLabel             Label
-hi def link     goRepeat            Repeat
-
-" Predefined types
-syn keyword     goType              chan map bool string error
-syn keyword     goSignedInts        int int8 int16 int32 int64 rune
-syn keyword     goUnsignedInts      byte uint uint8 uint16 uint32 uint64 uintptr
-syn keyword     goFloats            float32 float64
-syn keyword     goComplexes         complex64 complex128
-
-hi def link     goType              Type
-hi def link     goSignedInts        Type
-hi def link     goUnsignedInts      Type
-hi def link     goFloats            Type
-hi def link     goComplexes         Type
-
-" Treat func specially: it's a declaration at the start of a line, but a type
-" elsewhere. Order matters here.
-syn match       goType              /\<func\>/
-syn match       goDeclaration       /^func\>/
-
-" Predefined functions and values
-syn keyword     goBuiltins          append cap close complex copy delete imag len
-syn keyword     goBuiltins          make new panic print println real recover
-syn keyword     goConstants         iota true false nil
-
-hi def link     goBuiltins          Keyword
-hi def link     goConstants         Keyword
-
-" Comments; their contents
-syn keyword     goTodo              contained TODO FIXME XXX BUG
-syn cluster     goCommentGroup      contains=goTodo
-syn region      goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell
-syn region      goComment           start="//" end="$" contains=@goCommentGroup,@Spell
-
-hi def link     goComment           Comment
-hi def link     goTodo              Todo
-
-" Go escapes
-syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
-syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
-syn match       goEscapeX           display contained "\\x\x\{2}"
-syn match       goEscapeU           display contained "\\u\x\{4}"
-syn match       goEscapeBigU        display contained "\\U\x\{8}"
-syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
-
-hi def link     goEscapeOctal       goSpecialString
-hi def link     goEscapeC           goSpecialString
-hi def link     goEscapeX           goSpecialString
-hi def link     goEscapeU           goSpecialString
-hi def link     goEscapeBigU        goSpecialString
-hi def link     goSpecialString     Special
-hi def link     goEscapeError       Error
-
-" Strings and their contents
-syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
-syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
-syn region      goRawString         start=+`+ end=+`+
-
-hi def link     goString            String
-hi def link     goRawString         String
-
-" Characters; their contents
-syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
-syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
-
-hi def link     goCharacter         Character
-
-" Regions
-syn region      goBlock             start="{" end="}" transparent fold
-syn region      goParen             start='(' end=')' transparent
-
-" Integers
-syn match       goDecimalInt        "\<\d\+\([Ee]\d\+\)\?\>"
-syn match       goHexadecimalInt    "\<0x\x\+\>"
-syn match       goOctalInt          "\<0\o\+\>"
-syn match       goOctalError        "\<0\o*[89]\d*\>"
-
-hi def link     goDecimalInt        Integer
-hi def link     goHexadecimalInt    Integer
-hi def link     goOctalInt          Integer
-hi def link     Integer             Number
-
-" Floating point
-syn match       goFloat             "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
-syn match       goFloat             "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
-syn match       goFloat             "\<\d\+[Ee][-+]\d\+\>"
-
-hi def link     goFloat             Float
-
-" Imaginary literals
-syn match       goImaginary         "\<\d\+i\>"
-syn match       goImaginary         "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
-syn match       goImaginary         "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
-syn match       goImaginary         "\<\d\+[Ee][-+]\d\+i\>"
-
-hi def link     goImaginary         Number
-
-" Spaces after "[]"
-if go_highlight_array_whitespace_error != 0
-  syn match goSpaceError display "\(\[\]\)\@<=\s\+"
-endif
-
-" Spacing errors around the 'chan' keyword
-if go_highlight_chan_whitespace_error != 0
-  " receive-only annotation on chan type
-  syn match goSpaceError display "\(<-\)\@<=\s\+\(chan\>\)\@="
-  " send-only annotation on chan type
-  syn match goSpaceError display "\(\<chan\)\@<=\s\+\(<-\)\@="
-  " value-ignoring receives in a few contexts
-  syn match goSpaceError display "\(\(^\|[={(,;]\)\s*<-\)\@<=\s\+"
-endif
-
-" Extra types commonly seen
-if go_highlight_extra_types != 0
-  syn match goExtraType /\<bytes\.\(Buffer\)\>/
-  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
-  syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
-  syn match goExtraType /\<unsafe\.Pointer\>/
-endif
-
-" Space-tab error
-if go_highlight_space_tab_error != 0
-  syn match goSpaceError display " \+\t"me=e-1
-endif
-
-" Trailing white space error
-if go_highlight_trailing_whitespace_error != 0
-  syn match goSpaceError display excludenl "\s\+$"
-endif
-
-hi def link     goExtraType         Type
-hi def link     goSpaceError        Error
-
-" Search backwards for a global declaration to start processing the syntax.
-"syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
-
-" There's a bug in the implementation of grouphere. For now, use the
-" following as a more expensive/less precise workaround.
-syn sync minlines=500
-
-let b:current_syntax = "go"
diff --git a/sources_non_forked/vim-golang/syntax/godoc.vim b/sources_non_forked/vim-golang/syntax/godoc.vim
deleted file mode 100644
index bd4443f7..00000000
--- a/sources_non_forked/vim-golang/syntax/godoc.vim
+++ /dev/null
@@ -1,20 +0,0 @@
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-
-if exists("b:current_syntax")
-  finish
-endif
-
-syn case match
-syn match  godocTitle "^\([A-Z][A-Z ]*\)$"
-
-command -nargs=+ HiLink hi def link <args>
-
-HiLink godocTitle Title
-
-delcommand HiLink
-
-let b:current_syntax = "godoc"
-
-" vim:ts=4 sts=2 sw=2:
diff --git a/sources_non_forked/vim-less/after/syntax/html.vim b/sources_non_forked/vim-less/after/syntax/html.vim
new file mode 100644
index 00000000..589c2718
--- /dev/null
+++ b/sources_non_forked/vim-less/after/syntax/html.vim
@@ -0,0 +1,22 @@
+if !exists("g:less_html_style_tags")
+  let g:less_html_style_tags = 1
+endif
+
+if !g:less_html_style_tags
+  finish
+endif
+
+" Unset (but preserve) so that less will run.
+let s:pre_less_cur_syn = b:current_syntax
+unlet b:current_syntax
+
+" Inspired by code from github.com/kchmck/vim-coffee-script
+" and the html syntax file included with vim 7.4.
+
+syn include @htmlLess syntax/less.vim
+
+" We have to explicitly add to htmlHead (containedin) as that region specifies 'contains'.
+syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end=+</style>+ contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead
+
+" Reset since 'less' isn't really the current_syntax.
+let b:current_syntax = s:pre_less_cur_syn
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index bf8b3346..bc9dd691 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -1,4 +1,4 @@
-Snipmate & UltiSnip Snippets
+snipMate & UltiSnip Snippets
 ============================
 
 This repository contains snippets files for various programming languages.
@@ -9,7 +9,7 @@ other improvements already.
 Contents
 --------
 
-- `snippets/*`: snippets using snipmate format
+- `snippets/*`: snippets using snipMate format
 - `UltiSnips/*`: snippets using UltiSnips format
 
 Snippet engines supporting vim-snippets
@@ -28,8 +28,8 @@ snippets by typing the name of a snippet hitting the expansion mapping.
 - [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 completness)
- 
+  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
 
@@ -45,16 +45,15 @@ 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"?
 
-Q: Should "snipmate be deprecated in favour of UltiSnips"?
-
-A: No, because snimpate is VimL, and UltiSnips requires Python.
+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. 
+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
+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)
@@ -68,11 +67,11 @@ which is why Marc Weber thinks that it doesn't make sense to repeat the same
 repetitive information everywhere.
 
 *Recommended way:*
-[vim-addon-manager](vim-addon-manager) (because Marc Weber wrote it for exactly
-this reason, it supports simple dependency management). Eg you're done by this
-line in your .vimrc:
+[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
 ```
@@ -80,16 +79,17 @@ 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 snipate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
+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:
+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 mailinglist.
+
+If you still have trouble getting this to work create a GitHub ticket, ask on
+IRC or the mailing list.
 
 Policies / for contributors
 ---------------------------
@@ -105,7 +105,8 @@ el  : else ..
 wh  : while (cond) ...
 ```
 
-Don't add useless placeholder default texts like
+Don't add useless placeholder default texts like:
+
 ```
 if (${1:condition}){
   ${2:some code here}
@@ -119,7 +120,7 @@ if (${1}){
 }
 ```
 
-Exception: Functions which are used less often, such as Vim's matchall(), matchstr()
+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
 
@@ -140,15 +141,16 @@ on merging should be done (dropping duplicates etc). Also see engines section ab
 
 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/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)
 
-Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
+Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
 
 Future - ideas - examples
 -------------------------
@@ -156,7 +158,6 @@ 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
 ----------------
 
@@ -166,15 +167,15 @@ unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
 
 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 github.com/garbas/vim-snipmate this way:
+* 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 = {}
@@ -183,17 +184,18 @@ 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.
+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
+```
+migrate_lib_20_down
+migrate_lib_20_up
+```
 
 will do it then if syntax has changed.
 
-
 Language maintainers
 --------------------
 
@@ -219,7 +221,6 @@ 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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ada.snippets b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
new file mode 100644
index 00000000..d33c7778
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
@@ -0,0 +1,324 @@
+priority -50
+
+global !p
+
+def ada_case(word):
+	out = word[0].upper()
+	for i in range(1, len(word)):
+		if word[i - 1] == '_':
+			out = out + word[i].upper()
+		else:
+			out = out + word[i]
+	return out
+
+def get_year():
+	import time
+	return time.strftime("%Y")
+
+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
+
+snippet gpl "GPL license header"
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU ${1}General Public License as published by
+-- the Free Software Foundation; either version ${2: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 $1General Public License for more details.
+--
+-- You should have received a copy of the GNU $1General Public License
+-- along with this program; if not, see <http://www.gnu.org/licenses/>.
+--
+-- Copyright (C) ${3:Author}, ${4:`!p snip.rv = get_year()`}
+
+$0
+endsnippet
+
+snippet gplf "GPL file license header"
+-- This file is part of ${1:Program-Name}.
+-- 
+-- $1 is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU ${2}General Public License as published by
+-- the Free Software Foundation, either version ${3:3} of the License, or
+-- (at your option) any later version.
+-- 
+-- $1 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 $2General Public License for more details.
+-- 
+-- You should have received a copy of the GNU $2General Public License
+-- along with $1. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Copyright (C) ${4:Author}, ${5:`!p snip.rv = get_year()`}
+
+$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index 532010e7..f816ba40 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -120,4 +120,14 @@ 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
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/c.snippets b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
index e6ea2f9d..618bfe3d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/c.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
@@ -77,7 +77,6 @@ else:
 ${VISUAL}${0}
 
 #endif /* end of include guard: $1 */
-
 endsnippet
 
 snippet td "Typedef"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/help.snippets b/sources_non_forked/vim-snippets/UltiSnips/help.snippets
index 61327385..b07a7de0 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/help.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/help.snippets
@@ -29,4 +29,9 @@ ${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/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index 5746feb6..fee451f9 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -253,6 +253,10 @@ snippet td "table cell" w
 <td>$0</td>
 endsnippet
 
+snippet th "table header" w
+<th>$0</th>
+endsnippet
+
 snippet tr "table row" w
 <tr>$0</tr>
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/java.snippets b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
index 54ca6f35..e8eb77cc 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/java.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/java.snippets
@@ -180,13 +180,13 @@ endsnippet
 
 snippet elif "else if"
 else if ($1)`!p nl(snip)`{
-	$0
+	$0${VISUAL}
 }
 endsnippet
 
 snippet el "else" w
 else`!p nl(snip)`{
-	$0
+	$0${VISUAL}
 }
 endsnippet
 
@@ -214,7 +214,7 @@ endsnippet
 
 snippet if "if" b
 if ($1)`!p nl(snip)`{
-	$0
+	$0${VISUAL}
 }
 endsnippet
 
@@ -303,7 +303,7 @@ endsnippet
 
 snippet try "try/catch" b
 try {
-	$1
+	$1${VISUAL}
 } catch(${2:Exception} ${3:e}){
 	${4:e.printStackTrace();}
 }
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
index 3a872985..e392459f 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
@@ -50,6 +50,10 @@ snippet ee "expect to equal (js)" b
 expect(${1:target}).toEqual(${2:value});
 endsnippet
 
+snippet eb "expect to be (js)" b
+expect(${1:target}).toBe(${2:value});
+endsnippet
+
 snippet em "expect to match (js)" b
 expect(${1:target}).toMatch(${2:pattern});
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
index 157c9ef0..ad165c56 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
@@ -1,3 +1,12 @@
+extends markdown
+
+# overwrite if necessary
 priority -49
 
-extends markdown
+snippet title "Title Header" b
+% ${1:`!v Filename('', 'title')`}
+% ${2:`!v g:snips_author`}
+% ${3:`!v strftime("%d %B %Y")`}
+
+$0
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
index abaae3f5..67c7f278 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/perl.snippets
@@ -129,4 +129,11 @@ while ($1) {
 
 endsnippet
 
+snippet until "until"
+until ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index b7109120..bf450ff0 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -14,7 +14,7 @@ endsnippet
 snippet do "do"
 do {
 	${2:// code... }
-} while (${1:/* condition */});"
+} while (${1:/* condition */});
 endsnippet
 
 snippet doc_f "doc_f"
@@ -67,6 +67,12 @@ if (${1:/* condition */}) {
 }
 endsnippet
 
+snippet elif "elseif"
+elseif (${1:/* condition */}) {
+	${2:// code...}
+}
+endsnippet
+
 snippet inc "inc"
 include '${1:file}';${2}
 endsnippet
@@ -240,8 +246,8 @@ public function __construct(${1:$dependencies})
 $0
 endsnippet
 
-snippet pr "Dumb debug helper in HTML"
-echo '<pre>' . var_export($1, 1) . '</pre>';$0
+snippet ve "Dumb debug helper in HTML"
+    echo '<pre>' . var_export($1, 1) . '</pre>';$0
 endsnippet
 
 snippet pc "Dumb debug helper in cli"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 233ad332..3387533d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -84,22 +84,22 @@ def get_style(snip):
 
 def format_arg(arg, style):
 	if style == DOXYGEN:
-		return "@param %s @todo" % arg
+		return "@param %s TODO" % arg
 	elif style == SPHINX:
-		return ":param %s: @todo" % arg
+		return ":param %s: TODO" % arg
 	elif style == NORMAL:
-		return ":%s: @todo" % arg
+		return ":%s: TODO" % arg
 	elif style == GOOGLE:
-		return "%s (@todo): @todo" % arg
+		return "%s (TODO): TODO" % arg
 
 
 def format_return(style):
 	if style == DOXYGEN:
-		return "@return: @todo"
+		return "@return: TODO"
 	elif style in (NORMAL, SPHINX):
-		return ":returns: @todo"
+		return ":returns: TODO"
 	elif style == GOOGLE:
-		return "Returns: @todo"
+		return "Returns: TODO"
 
 
 def write_docstring_args(args, snip):
@@ -169,7 +169,7 @@ 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
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -197,7 +197,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -399,7 +399,7 @@ 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
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
@@ -437,7 +437,7 @@ 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
+`${2:TODO: Docstring for $1.}`!p
 if t[2]:
 	snip >> 1
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index d7f0047c..82a1abb8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -73,7 +73,7 @@ endsnippet
 
 snippet ecl "...extern crate log;" b
 #![feature(phase)]
-#[phase(syntax, link)] extern crate log;
+#[phase(plugin, link)] extern crate log;
 endsnippet
 
 snippet mod	 "A module" b
@@ -83,16 +83,16 @@ mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 endsnippet
 
 snippet crate "Create header information" b
-// Crate ID
-#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+// Crate name
+#![crate_name = "${1:crate_name}"]
 
 // Additional metadata attributes
-#![desc = "${3:Descrption.}"]
-#![license = "${4:BSD}"]
-#![comment = "${5:Comment.}"]
+#![desc = "${2:Descrption.}"]
+#![license = "${3:BSD}"]
+#![comment = "${4:Comment.}"]
 
 // Specify the output type
-#![crate_type = "${6:lib}"]
+#![crate_type = "${5:lib}"]
 endsnippet
 
 snippet allow "#[allow(..)]" b
diff --git a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
index 70a44a07..f2142847 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
@@ -1,54 +1,56 @@
+extends css
+
 priority -50
 
-snippet /@?imp/ "@import '...';" br
+snippet imp "@import '...';" b
 @import '${1:file}';
 endsnippet
 
-snippet /@?inc/ "@include mixin(...);" br
+snippet inc "@include mixin(...);" b
 @include ${1:mixin}(${2:arguments});
 endsnippet
 
-snippet /@?ext?/ "@extend %placeholder;" br
+snippet ext "@extend %placeholder;" b
 @extend %${1:placeholder};
 endsnippet
 
-snippet /@?mixin/ "@mixin (...) { ... }" br
+snippet mixin "@mixin (...) { ... }" b
 @mixin ${1:name}(${2:arguments}) {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?fun/ "@function (...) { ... }" br
+snippet fun "@function (...) { ... }" b
 @function ${1:name}(${2:arguments}) {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?if/ "@if (...) { ... }" br
+snippet if "@if (...) { ... }" b
 @if ${1:condition} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /(} )?@?else/ "@else { ... }" br
+snippet else "@else { ... }" b
 @else ${1:condition} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?for/ "@for loop" br
+snippet for "@for loop" b
 @for ${1:$i} from ${2:1} through ${3:3} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?each/ "@each loop" br
+snippet each "@each loop" b
 @each ${1:$item} in ${2:item, item, item} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?while/ "@while loop" br
+snippet while "@while loop" b
 @while ${1:$i} ${2:>} ${3:0} {
 	${VISUAL}$0
 }
diff --git a/sources_non_forked/vim-snippets/snippets/ada.snippets b/sources_non_forked/vim-snippets/snippets/ada.snippets
new file mode 100644
index 00000000..ce377b99
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/ada.snippets
@@ -0,0 +1,255 @@
+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}
+	end if;
+
+snippet ife if ... else
+	if ${1} then
+		${2}
+	else
+		${0}
+	end if;
+
+snippet el else
+	else
+		${0}
+
+snippet eif elsif
+	elsif ${1} then
+		${0}
+
+snippet wh while
+	while ${1} loop
+		${0}
+	end loop;
+
+snippet nwh named while
+	${1}:
+	while ${2} loop
+		${0}
+	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}
+
+snippet gpl GPL license header
+	-- This program is free software; you can redistribute it and/or modify
+	-- it under the terms of the GNU ${1}General Public License as published by
+	-- the Free Software Foundation; either version ${2: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 $1General Public License for more details.
+	--
+	-- You should have received a copy of the GNU $1General Public License
+	-- along with this program; if not, see <http://www.gnu.org/licenses/>.
+	--
+	-- Copyright (C) ${3:Author}, ${4:`strftime("%Y")`}
+
+	${0}
+
+snippet gplf GPL file license header
+	-- This file is part of ${1:Program-Name}.
+	--
+	-- $1 is free software: you can redistribute it and/or modify
+	-- it under the terms of the GNU ${2}General Public License as published by
+	-- the Free Software Foundation, either version ${3:3} of the License, or
+	-- (at your option) any later version.
+	-- 
+	-- $1 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 $2General Public License for more details.
+	-- 
+	-- You should have received a copy of the GNU $2General Public License
+	-- along with $1. If not, see <http://www.gnu.org/licenses/>.
+	--
+	-- Copyright (C) ${4:Author}, ${5:`strftime("%Y")`}
+
+	${0}
+
diff --git a/sources_non_forked/vim-snippets/snippets/coffee/requirejs_coffee.snippets b/sources_non_forked/vim-snippets/snippets/coffee/requirejs_coffee.snippets
new file mode 100644
index 00000000..6dfe1796
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/d.snippets b/sources_non_forked/vim-snippets/snippets/d.snippets
new file mode 100644
index 00000000..216a4d89
--- /dev/null
+++ b/sources_non_forked/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}
+	} catch(${2:Exception} ${3:e}) {
+		${4}
+	}
+snippet tcf
+	try {
+		${0}
+	} catch(${1:Exception} ${2:e}) {
+		${3}
+	} finally {
+		${4}
+	}
+snippet wh
+	while(${1:cond}) {
+		${0}
+	}
+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/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 3642bbca..5fb4aa92 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -330,7 +330,7 @@ snippet dt+
 snippet em
 	<em>${0}</em>
 snippet embed
-	<embed src=${1} type="${0} />
+	<embed src="${1}" type="${0}" />
 snippet fieldset
 	<fieldset>
 		${0}
@@ -353,6 +353,14 @@ 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}
@@ -454,10 +462,23 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8">
-			<meta name="viewport" content="width=device-width">
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-			${2:meta}
+			${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}
@@ -561,6 +582,8 @@ 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
@@ -601,6 +624,10 @@ snippet menu:t
 	</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
@@ -632,7 +659,7 @@ snippet 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">
+	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 		<param name="src" value="$1" />
 		<param name="controller" value="$4" />
 		<param name="autoplay" value="$5" />
@@ -703,6 +730,12 @@ snippet script
 	<script type="text/javascript" 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" type="text/javascript" charset="utf-8"></script>
 snippet section
@@ -780,7 +813,7 @@ snippet td+
 	<td>${1}</td>
 	td+${0}
 snippet textarea
-	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>
+	<textarea name="${1}" id="${2:$1}" rows="${3:8}" cols="${4:40}">${5}</textarea>
 snippet tfoot
 	<tfoot>
 		${0}
diff --git a/sources_non_forked/vim-snippets/snippets/java.snippets b/sources_non_forked/vim-snippets/snippets/java.snippets
index ea2ec7aa..8971b3d6 100644
--- a/sources_non_forked/vim-snippets/snippets/java.snippets
+++ b/sources_non_forked/vim-snippets/snippets/java.snippets
@@ -40,6 +40,8 @@ snippet j.u
 ## 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
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript-requirejs.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript-requirejs.snippets
new file mode 100644
index 00000000..8e72ada6
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
new file mode 100644
index 00000000..9e750877
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
@@ -0,0 +1,50 @@
+# module exports
+snippet ex
+	module.exports = ${1};
+# require
+snippet re
+	var ${1} = require("${2: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/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index d20d7136..bfc53ee8 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -1,22 +1,26 @@
-# Prototype
+# prototype
 snippet proto
-	${1:class_name}.prototype.${2:method_name} =
-	function(${3:first_argument}) {
-		${0:// body...}
+	${1:class_name}.prototype.${2:method_name} = function(${3}) {
+		${0}
 	};
 # Function
 snippet fun
-	function ${1:function_name}(${2:argument}) {
-		${0:// body...}
+	function ${1:function_name}(${2}) {
+		${0}
 	}
 # Anonymous Function
 snippet f
-	function (${1}) {
+	function(${1}) {
 		${0}
 	}
+# Function assigned to variable
+snippet vf
+	var ${1:function_name} = function $1(${2}) {
+		${0}
+	};
 # Immediate function
 snippet (f
-	(function (${1}) {
+	(function(${1}) {
 		${0}
 	}(${2}));
 # if
diff --git a/sources_non_forked/vim-snippets/snippets/perl.snippets b/sources_non_forked/vim-snippets/snippets/perl.snippets
index ea414271..65120a25 100644
--- a/sources_non_forked/vim-snippets/snippets/perl.snippets
+++ b/sources_non_forked/vim-snippets/snippets/perl.snippets
@@ -349,3 +349,11 @@ snippet debug_trace
 		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/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index 831d53db..b200463a 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -347,6 +347,10 @@ 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
diff --git a/sources_non_forked/vim-snippets/snippets/rails.snippets b/sources_non_forked/vim-snippets/snippets/rails.snippets
index d8fe2be2..3a72bfde 100644
--- a/sources_non_forked/vim-snippets/snippets/rails.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rails.snippets
@@ -109,6 +109,8 @@ 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
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index fd4172c1..7097c6d6 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -590,7 +590,11 @@ snippet begin
 
 #debugging
 snippet debug
-	require 'ruby-debug'; debugger; true;
+	require 'byebug'; byebug
+snippet debug19
+	require 'debugger'; debugger
+snippet debug18
+	require 'ruby-debug'; debugger
 snippet pry
 	require 'pry'; binding.pry
 snippet strf
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index d4b9264d..f135eb58 100644
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -34,20 +34,20 @@ snippet ec
 	extern crate ${1:sync};
 snippet ecl
 	#![feature(phase)]
-	#[phase(syntax, link)] extern crate log;
+	#[phase(plugin, link)] extern crate log;
 snippet mod
 	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	} /* $1 */
 snippet crate
-	// Crate ID
-	#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+	// Crate name
+	#![crate_name = "${1:crate_name}"]
 	// Additional metadata attributes
-	#![desc = "${3:Descrption.}"]
-	#![license = "${4:BSD}"]
-	#![comment = "${5:Comment.}"]
+	#![desc = "${2:Descrption.}"]
+	#![license = "${3:BSD}"]
+	#![comment = "${4:Comment.}"]
 	// Specify the output type
-	#![crate_type = "${6:lib}"]
+	#![crate_type = "${5:lib}"]
 snippet allow
 	#[allow(${1:unused_variable})]
 snippet feat
diff --git a/sources_non_forked/vim-snippets/snippets/stylus.snippets b/sources_non_forked/vim-snippets/snippets/stylus.snippets
new file mode 100644
index 00000000..4a305702
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/stylus.snippets
@@ -0,0 +1,993 @@
+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: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}
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index 87c150ca..d48b263c 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -263,3 +263,20 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+# Code listings
+snippet lst
+	\begin{listing}[language=${1:language}]
+		${0}
+	\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/sources_non_forked/vim-snippets/snippets/zsh.snippets b/sources_non_forked/vim-snippets/snippets/zsh.snippets
index 04577a96..fc1c8374 100644
--- a/sources_non_forked/vim-snippets/snippets/zsh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/zsh.snippets
@@ -13,14 +13,14 @@ snippet ife
 		${0:# statements}
 	fi
 snippet eif
-	elif ${1:condition} ; then
+	elif ${1:condition}; then
 		${0:# statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
 		${0:# statements}
 	done
 snippet fori
-	for ${1:needle} in ${2:haystack} ; do
+	for ${1:needle} in ${2:haystack}; do
 		${0:#statements}
 	done
 snippet fore
@@ -57,6 +57,10 @@ snippet [
 snippet always
 	{ ${1:try} } always { ${0:always} }
 snippet fun
-	function ${1:name} (${2:args}) {
-		${0:# body}
+	${1:function_name}() {
+		${0:# function_body}
+	}
+snippet ffun
+	function ${1:function_name}() {
+		${0:# function_body}
 	}

From 75747fb7fed024fbd144c639727cd9a990a2cfae Mon Sep 17 00:00:00 2001
From: sota1235 <t11460ss@sfc.keio.ac.jp>
Date: Tue, 7 Oct 2014 11:12:14 +0900
Subject: [PATCH 48/61] fix zenroom2.vim | bug fix

---
 sources_non_forked/vim-zenroom2/plugin/zenroom2.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index a9781c74..2ea60f07 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -62,7 +62,7 @@ function! s:markdown_room()
     exec( "hi StatusLineNC " . l:highlightfgbgcolor )
 endfunction
 
-function! g:zenroom_goyo_before()
+function! g:Zenroom_goyo_before()
     if !has("gui_running")
         return
     endif
@@ -73,7 +73,7 @@ function! g:zenroom_goyo_before()
     endif
 endfunction
 
-function! g:zenroom_goyo_after()
+function! g:Zenroom_goyo_after()
     if !has("gui_running")
         return
     endif
@@ -87,4 +87,4 @@ function! g:zenroom_goyo_after()
     endif
 endfunction
 
-let g:goyo_callbacks = [ function('g:zenroom_goyo_before'), function('g:zenroom_goyo_after') ]
+let g:goyo_callbacks = [ function('g:Zenroom_goyo_before'), function('g:Zenroom_goyo_after') ]

From 62af39fa19e6c254c39558e774710733003fa353 Mon Sep 17 00:00:00 2001
From: sota1235 <t11460ss@sfc.keio.ac.jp>
Date: Thu, 9 Oct 2014 10:47:57 +0900
Subject: [PATCH 49/61] =?UTF-8?q?add=20indent=20file=20|=20markdown?=
 =?UTF-8?q?=E3=81=A8coffee=E3=81=AE=E3=82=BF=E3=83=96=E3=82=922=E3=81=AB?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sources_non_forked/vim-coffee-script/indent/coffee.vim | 5 +++++
 sources_non_forked/vim-markdown/indent/markdown.vim    | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 sources_non_forked/vim-markdown/indent/markdown.vim

diff --git a/sources_non_forked/vim-coffee-script/indent/coffee.vim b/sources_non_forked/vim-coffee-script/indent/coffee.vim
index 7bd82e3e..e83fa5a4 100644
--- a/sources_non_forked/vim-coffee-script/indent/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/indent/coffee.vim
@@ -426,3 +426,8 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
+
+" tab space
+setlocal expandtab
+setlocal tabstop=2 shiftwidth=2 softtabstop=2
+setlocal autoindent
diff --git a/sources_non_forked/vim-markdown/indent/markdown.vim b/sources_non_forked/vim-markdown/indent/markdown.vim
new file mode 100644
index 00000000..06ccb477
--- /dev/null
+++ b/sources_non_forked/vim-markdown/indent/markdown.vim
@@ -0,0 +1,3 @@
+set noexpandtab
+set tabstop=2
+set shiftwidth=2

From 55f410261963f1015b1393e6744ffc6a3e8b029d Mon Sep 17 00:00:00 2001
From: sota1235 <t11460ss@sfc.keio.ac.jp>
Date: Thu, 9 Oct 2014 10:49:17 +0900
Subject: [PATCH 50/61] =?UTF-8?q?fix=20vimrc/basic.vim=20|=20=E3=83=87?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AE=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=82=924=E3=81=AB=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vimrcs/basic.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 68b79b82..be83d11a 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -175,9 +175,9 @@ set expandtab
 " Be smart when using tabs ;)
 set smarttab
 
-" 1 tab == 4 spaces
-set shiftwidth=4
-set tabstop=4
+" 1 tab == 2 spaces
+set shiftwidth=2
+set tabstop=2
 
 " Linebreak on 500 characters
 set lbr

From 7267320d1d84f1695483875ea75b1dc3ad75f9f4 Mon Sep 17 00:00:00 2001
From: Dennis Hodapp <thehodapp@gmail.com>
Date: Sun, 12 Oct 2014 21:03:28 -0500
Subject: [PATCH 51/61] Add support for mouse if it is available

---
 vimrcs/basic.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 0ad89416..57b9ac9d 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -102,6 +102,11 @@ set hid
 set backspace=eol,start,indent
 set whichwrap+=<,>,h,l
 
+" In many terminal emulators the mouse works just fine, thus enable it.
+if has('mouse')
+  set mouse=a
+endif
+
 " Ignore case when searching
 set ignorecase
 

From fe77d2385233792e98c02d4623b8eada73ae2853 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Tue, 14 Oct 2014 14:30:33 +0100
Subject: [PATCH 52/61] Updated plugins. Removed the tabstop merge that
 010c2940ce8847ec8a14b0755574cba64f26ae7f introduced

---
 sources_non_forked/syntastic/README.markdown  |  18 +-
 .../syntastic/autoload/syntastic/c.vim        |  36 ++--
 .../syntastic/autoload/syntastic/util.vim     |  63 ++++++
 .../syntastic/doc/syntastic.txt               |   3 +-
 .../syntastic/plugin/syntastic.vim            |  49 +++--
 .../syntastic/plugin/syntastic/checker.vim    |   9 +
 .../syntastic/plugin/syntastic/registry.vim   |   8 +-
 .../syntastic/syntax_checkers/bro/bro.vim     |  19 +-
 .../syntax_checkers/c/checkpatch.vim          |  12 +-
 .../syntax_checkers/c/clang_check.vim         |   4 -
 .../syntax_checkers/c/clang_tidy.vim          |   4 -
 .../syntastic/syntax_checkers/c/gcc.vim       |   1 +
 .../syntastic/syntax_checkers/c/pc_lint.vim   |   1 +
 .../syntastic/syntax_checkers/co/coco.vim     |   8 +-
 .../syntastic/syntax_checkers/cobol/cobc.vim  |   1 +
 .../syntax_checkers/coffee/coffee.vim         |  11 +-
 .../syntax_checkers/coffee/coffeelint.vim     |   5 +-
 .../syntastic/syntax_checkers/cpp/gcc.vim     |   1 +
 .../syntastic/syntax_checkers/d/dmd.vim       |   1 +
 .../syntastic/syntax_checkers/docbk/igor.vim  |  55 ++++++
 .../syntax_checkers/elixir/elixir.vim         |   3 +
 .../syntastic/syntax_checkers/eruby/ruby.vim  |   1 +
 .../syntax_checkers/fortran/gfortran.vim      |   1 +
 .../syntastic/syntax_checkers/go/golint.vim   |   4 +-
 .../syntastic/syntax_checkers/go/gotype.vim   |   4 +-
 .../syntastic/syntax_checkers/go/govet.vim    |  10 +-
 .../syntax_checkers/haskell/ghc-mod.vim       |  43 +++--
 .../syntastic/syntax_checkers/haxe/haxe.vim   |   2 +
 .../syntastic/syntax_checkers/html/jshint.vim |  10 +-
 .../syntastic/syntax_checkers/html/tidy.vim   |   4 +-
 .../syntax_checkers/java/checkstyle.vim       |  15 +-
 .../syntastic/syntax_checkers/java/javac.vim  |  24 +--
 .../javascript/closurecompiler.vim            |  26 ++-
 .../syntax_checkers/javascript/eslint.vim     |  11 +-
 .../syntax_checkers/javascript/jshint.vim     |   3 +
 .../syntax_checkers/javascript/jsxhint.vim    |  12 +-
 .../syntastic/syntax_checkers/less/lessc.vim  |   1 +
 .../syntastic/syntax_checkers/lua/luac.vim    |   2 +-
 .../syntax_checkers/markdown/mdl.vim          |  45 +++++
 .../syntastic/syntax_checkers/nroff/igor.vim  |  25 +++
 .../syntastic/syntax_checkers/objc/gcc.vim    |   1 +
 .../syntastic/syntax_checkers/objcpp/gcc.vim  |   1 +
 .../syntax_checkers/puppet/puppet.vim         |   7 +-
 .../syntax_checkers/puppet/puppetlint.vim     |  15 +-
 .../syntastic/syntax_checkers/python/mypy.vim |  35 ++++
 .../syntax_checkers/python/pep257.vim         |   5 +-
 .../syntax_checkers/python/pylint.vim         |  50 ++---
 .../syntax_checkers/python/python.vim         |  10 +-
 .../syntastic/syntax_checkers/rnc/rnv.vim     |  38 ++++
 .../syntax_checkers/rst/rst2pseudoxml.vim     |   2 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |   1 +
 .../syntax_checkers/ruby/rubocop.vim          |  11 +-
 .../syntax_checkers/ruby/rubylint.vim         |   5 +-
 .../syntastic/syntax_checkers/sass/sass.vim   |   6 +-
 .../syntax_checkers/scala/scalastyle.vim      |  14 +-
 .../syntax_checkers/scss/scss_lint.vim        |  12 +-
 .../syntastic/syntax_checkers/sh/sh.vim       |   1 +
 .../syntastic/syntax_checkers/slim/slimrb.vim |   5 +-
 .../spec/{lacheck.vim => rpmlint.vim}         |   0
 .../syntastic/syntax_checkers/tex/chktex.vim  |  13 --
 .../syntastic/syntax_checkers/text/igor.vim   |  25 +++
 .../syntastic/syntax_checkers/vala/valac.vim  |   2 +-
 .../syntax_checkers/verilog/verilator.vim     |   1 +
 .../syntastic/syntax_checkers/vim/vimlint.vim |   8 +-
 .../syntastic/syntax_checkers/xhtml/tidy.vim  |   4 +-
 .../syntastic/syntax_checkers/yaml/jsyaml.vim |   5 +-
 sources_non_forked/vim-airline/README.md      |   2 +-
 .../autoload/airline/themes/raven.vim         |  85 ++++++++
 .../autoload/airline/themes/silver.vim        |  85 ++++++++
 .../vim-coffee-script/Copying.md              |   2 +-
 sources_non_forked/vim-coffee-script/News.md  |   4 +
 .../vim-coffee-script/Readme.md               |   8 +-
 .../vim-coffee-script/after/indent/html.vim   |   2 +-
 .../vim-coffee-script/after/syntax/html.vim   |   2 +-
 .../vim-coffee-script/autoload/coffee.vim     |   2 +-
 .../vim-coffee-script/compiler/cake.vim       |   2 +-
 .../vim-coffee-script/compiler/coffee.vim     |   2 +-
 .../vim-coffee-script/ftdetect/coffee.vim     |   2 +-
 .../vim-coffee-script/ftplugin/coffee.vim     |  13 +-
 .../vim-coffee-script/indent/coffee.vim       |   7 +-
 .../vim-coffee-script/syntax/coffee.vim       |   2 +-
 .../vim-less/after/syntax/html.vim            |  10 +-
 .../vim-markdown/indent/markdown.vim          |   3 -
 .../vim-snipmate/Contributors.md              |   1 +
 .../vim-snipmate/plugin/snipMate.vim          |   4 +
 .../UltiSnips/javascript_angular.snippets     |  46 ++++-
 .../UltiSnips/javascript_jsdoc.snippets       |   2 +-
 .../vim-snippets/UltiSnips/php.snippets       |  67 ++++++-
 .../vim-snippets/UltiSnips/python.snippets    |  48 ++++-
 .../vim-snippets/UltiSnips/scss.snippets      |   8 +-
 .../vim-snippets/UltiSnips/tex.snippets       |   2 +-
 .../vim-snippets/snippets/eruby.snippets      |   2 +
 .../javascript/javascript.node.snippets       |   3 +-
 .../snippets/javascript/javascript.snippets   | 182 +++++++++++-------
 .../vim-snippets/snippets/scala.snippets      |  19 +-
 .../vim-snippets/snippets/scss.snippets       |  36 ++++
 .../vim-zenroom2/README.markdown              |   4 +-
 .../vim-zenroom2/plugin/zenroom2.vim          |   6 +-
 vimrcs/basic.vim                              |   6 +-
 99 files changed, 1142 insertions(+), 359 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
 rename sources_non_forked/syntastic/syntax_checkers/spec/{lacheck.vim => rpmlint.vim} (100%)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/text/igor.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/raven.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/silver.vim
 delete mode 100644 sources_non_forked/vim-markdown/indent/markdown.vim
 create mode 100644 sources_non_forked/vim-snippets/snippets/scss.snippets

diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 8d96daa7..03a62f56 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -39,13 +39,13 @@ Ada, AppleScript, Arduino, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
 C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
 DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
 Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
-Lex, Limbo, LISP, LLVM intermediate language, Lua, MATLAB, NASM, Objective-C,
-Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
-iOS property lists, Puppet, Python, Racket, R, reStructuredText, RPM spec,
-Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
-Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
-and zsh.  See the [wiki][3] for details about the corresponding supported
-checkers.
+Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM,
+Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
+Object, OS X and iOS property lists, Puppet, Python, R, Racket, Relax NG,
+reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo,
+Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML,
+z80, Zope page templates, and zsh.  See the [wiki][3] for details about the
+corresponding supported checkers.
 
 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
@@ -264,8 +264,8 @@ See `:help syntastic_quiet_messages` for details.
 
 <a name="faqaggregate"></a>
 
-__Q. How can I display together the errors found by all checkers enabled for
-the current file?__
+__Q. I have enabled multiple checkers for the current filetype.  How can I
+display all of the errors from all of the checkers together?__
 
 A. Set `g:syntastic_aggregate_errors` to 1 in your vimrc:
 ```vim
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 5dad1408..32226482 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -91,21 +91,21 @@ function! s:_init() " {{{2
     let s:handlers = []
     let s:cflags = {}
 
-    call s:_regHandler('\m\<cairo',       'syntastic#c#checkPKG', ['cairo', 'cairo'])
-    call s:_regHandler('\m\<freetype',    'syntastic#c#checkPKG', ['freetype', 'freetype2', 'freetype'])
-    call s:_regHandler('\m\<glade',       'syntastic#c#checkPKG', ['glade', 'libglade-2.0', 'libglade'])
-    call s:_regHandler('\m\<glib',        'syntastic#c#checkPKG', ['glib', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<gtk',         'syntastic#c#checkPKG', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<libsoup',     'syntastic#c#checkPKG', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:_regHandler('\m\<libxml',      'syntastic#c#checkPKG', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:_regHandler('\m\<pango',       'syntastic#c#checkPKG', ['pango', 'pango'])
-    call s:_regHandler('\m\<SDL',         'syntastic#c#checkPKG', ['sdl', 'sdl'])
-    call s:_regHandler('\m\<opengl',      'syntastic#c#checkPKG', ['opengl', 'gl'])
-    call s:_regHandler('\m\<webkit',      'syntastic#c#checkPKG', ['webkit', 'webkit-1.0'])
+    call s:_regHandler('\m\<cairo',       's:_check_pkg', ['cairo', 'cairo'])
+    call s:_regHandler('\m\<freetype',    's:_check_pkg', ['freetype', 'freetype2', 'freetype'])
+    call s:_regHandler('\m\<glade',       's:_check_pkg', ['glade', 'libglade-2.0', 'libglade'])
+    call s:_regHandler('\m\<glib',        's:_check_pkg', ['glib', 'glib-2.0', 'glib'])
+    call s:_regHandler('\m\<gtk',         's:_check_pkg', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:_regHandler('\m\<libsoup',     's:_check_pkg', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:_regHandler('\m\<libxml',      's:_check_pkg', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:_regHandler('\m\<pango',       's:_check_pkg', ['pango', 'pango'])
+    call s:_regHandler('\m\<SDL',         's:_check_pkg', ['sdl', 'sdl'])
+    call s:_regHandler('\m\<opengl',      's:_check_pkg', ['opengl', 'gl'])
+    call s:_regHandler('\m\<webkit',      's:_check_pkg', ['webkit', 'webkit-1.0'])
 
-    call s:_regHandler('\m\<php\.h\>',    'syntastic#c#checkPHP',    [])
-    call s:_regHandler('\m\<Python\.h\>', 'syntastic#c#checkPython', [])
-    call s:_regHandler('\m\<ruby',        'syntastic#c#checkRuby',   [])
+    call s:_regHandler('\m\<php\.h\>',    's:_check_php',    [])
+    call s:_regHandler('\m\<Python\.h\>', 's:_check_python', [])
+    call s:_regHandler('\m\<ruby',        's:_check_ruby',   [])
 endfunction " }}}2
 
 " return a handler dictionary object
@@ -253,7 +253,7 @@ endfunction " }}}2
 " try to find library with 'pkg-config'
 " search possible libraries from first to last given
 " argument until one is found
-function! syntastic#c#checkPKG(name, ...) " {{{2
+function! s:_check_pkg(name, ...) " {{{2
     if executable('pkg-config')
         if !has_key(s:cflags, a:name)
             for pkg in a:000
@@ -274,7 +274,7 @@ function! syntastic#c#checkPKG(name, ...) " {{{2
 endfunction " }}}2
 
 " try to find PHP includes with 'php-config'
-function! syntastic#c#checkPHP() " {{{2
+function! s:_check_php() " {{{2
     if executable('php-config')
         if !has_key(s:cflags, 'php')
             let s:cflags['php'] = system('php-config --includes')
@@ -286,7 +286,7 @@ function! syntastic#c#checkPHP() " {{{2
 endfunction " }}}2
 
 " try to find the ruby headers with 'rbconfig'
-function! syntastic#c#checkRuby() " {{{2
+function! s:_check_ruby() " {{{2
     if executable('ruby')
         if !has_key(s:cflags, 'ruby')
             let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
@@ -300,7 +300,7 @@ function! syntastic#c#checkRuby() " {{{2
 endfunction " }}}2
 
 " try to find the python headers with distutils
-function! syntastic#c#checkPython() " {{{2
+function! s:_check_python() " {{{2
     if executable('python')
         if !has_key(s:cflags, 'python')
             let s:cflags['python'] = system('python -c ''from distutils import ' .
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index 51831b47..e58b00bc 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -24,6 +24,54 @@ function! syntastic#util#Slash() abort " {{{2
     return (!exists("+shellslash") || &shellslash) ? '/' : '\'
 endfunction " }}}2
 
+" Create a temporary directory
+function! syntastic#util#tmpdir() " {{{2
+    let tempdir = ''
+
+    if (has('unix') || has('mac')) && executable('mktemp')
+        " TODO: option "-t" to mktemp(1) is not portable
+        let tmp = $TMPDIR != '' ? $TMPDIR : $TMP != '' ? $TMP : '/tmp'
+        let out = split(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 = s:CygwinPath('/tmp/vim-syntastic-'  . getpid())
+        elseif $TMPDIR != ''
+            let tempdir = $TMPDIR . '/vim-syntastic-' . getpid()
+        else
+            let tempdir = '/tmp/vim-syntastic-' . getpid()
+        endif
+    endif
+
+    return tempdir
+endfunction " }}}2
+
+" Recursively remove a directory
+function! syntastic#util#rmrf(what) " {{{2
+    if  getftype(a:what) ==# 'dir'
+        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 system(s:rmrf . ' ' . syntastic#util#shescape(a:what))
+        else
+            call s:_rmrf(a:what)
+        endif
+    else
+        silent! call delete(a:what)
+    endif
+endfunction " }}}2
+
 "search the first 5 lines of the file for a magic number and return a map
 "containing the args and the executable
 "
@@ -278,6 +326,21 @@ function! s:_translateElement(key, term) " {{{2
     return ret
 endfunction " }}}2
 
+function! s:_rmrf(what) " {{{2
+    if !exists('s:rmdir')
+        let s:rmdir = syntastic#util#shescape(get(g:, 'netrw_localrmdir', 'rmdir'))
+    endif
+
+    if getftype(a:what) ==# 'dir'
+        for f in split(globpath(a:what, '*'), "\n")
+            call s:_rmrf(f)
+        endfor
+        silent! call system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
+    else
+        silent! call delete(a:what)
+    endif
+endfunction " }}}2
+
 " }}}1
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index 8f09e818..42e7d5d7 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -554,11 +554,12 @@ Default: 0
 Set this to the sum of one or more of the following flags to enable
 debugging:
 
-     1 - trace checker calls
+     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
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 15f999f4..61b3f8b0 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,12 +19,20 @@ if has('reltime')
     lockvar! g:syntastic_start
 endif
 
-let g:syntastic_version = '3.5.0-37'
+let g:syntastic_version = '3.5.0-65'
 lockvar g:syntastic_version
 
 " Sanity checks {{{1
 
-for s:feature in ['autocmd', 'eval', 'modify_fname', 'quickfix', 'reltime', 'user_commands']
+for s:feature in [
+            \ 'autocmd',
+            \ 'eval',
+            \ 'file_in_path',
+            \ 'modify_fname',
+            \ 'quickfix',
+            \ 'reltime',
+            \ 'user_commands'
+        \ ]
     if !has(s:feature)
         call syntastic#log#error("need Vim compiled with feature " . s:feature)
         finish
@@ -38,7 +46,7 @@ if !s:running_windows && executable('uname')
     try
         let s:uname = system('uname')
     catch /\m^Vim\%((\a\+)\)\=:E484/
-        call syntastic#log#error("your shell " . &shell . " doesn't use traditional UNIX syntax for redirections")
+        call syntastic#log#error("your shell " . &shell . " can't handle traditional UNIX syntax for redirections")
         finish
     endtry
     lockvar s:uname
@@ -53,7 +61,7 @@ let g:syntastic_defaults = {
         \ 'always_populate_loc_list': 0,
         \ 'auto_jump':                0,
         \ 'auto_loc_list':            2,
-        \ 'bash_hack':                1,
+        \ 'bash_hack':                0,
         \ 'check_on_open':            0,
         \ 'check_on_wq':              1,
         \ 'cursor_columns':           1,
@@ -82,7 +90,7 @@ lockvar! g:syntastic_defaults
 
 for s:key in keys(g:syntastic_defaults)
     if !exists('g:syntastic_' . s:key)
-        let g:syntastic_{s:key} = g:syntastic_defaults[s:key]
+        let g:syntastic_{s:key} = copy(g:syntastic_defaults[s:key])
     endif
 endfor
 
@@ -128,6 +136,8 @@ let     g:SyntasticDebugAutocommands  = 8
 lockvar g:SyntasticDebugAutocommands
 let     g:SyntasticDebugVariables     = 16
 lockvar g:SyntasticDebugVariables
+let     g:SyntasticDebugCheckers      = 32
+lockvar g:SyntasticDebugCheckers
 
 " }}}1
 
@@ -389,7 +399,7 @@ endfunction " }}}2
 function! s:ToggleMode() " {{{2
     call s:modemap.toggleMode()
     call s:ClearCache()
-    call s:UpdateErrors(1)
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
     call s:modemap.echoMode()
 endfunction " }}}2
 
@@ -421,7 +431,6 @@ function! SyntasticMake(options) " {{{2
     call syntastic#log#debug(g:SyntasticDebugTrace, 'SyntasticMake: called with options:', a:options)
 
     " save options and locale env variables {{{3
-    let old_shell = &shell
     let old_shellredir = &shellredir
     let old_local_errorformat = &l:errorformat
     let old_errorformat = &errorformat
@@ -497,7 +506,6 @@ function! SyntasticMake(options) " {{{2
     let &errorformat = old_errorformat
     let &l:errorformat = old_local_errorformat
     let &shellredir = old_shellredir
-    let &shell = old_shell
     " }}}3
 
     if !s:running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
@@ -587,22 +595,21 @@ function! s:addToErrors(errors, options) " {{{2
     return a:errors
 endfunction " }}}2
 
-" The script changes &shellredir and &shell to stop the screen flicking when
-" shelling out to syntax checkers. Not all OSs support the hacks though.
+" XXX: Is this still needed?
+" The script changes &shellredir to stop the screen
+" flicking when shelling out to syntax checkers.
 function! s:bashHack() " {{{2
-    if !exists('s:bash')
-        if !s:running_windows && (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD")
-            let s:bash =
-                \ executable('/usr/local/bin/bash') ? '/usr/local/bin/bash' :
-                \ executable('/bin/bash') ? '/bin/bash' : ''
-        else
-            let s:bash = ''
+    if g:syntastic_bash_hack
+        if !exists('s:shell_is_bash')
+            let s:shell_is_bash =
+                \ !s:running_windows &&
+                \ (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD") &&
+                \ &shell =~# '\m\<bash$'
         endif
-    endif
 
-    if g:syntastic_bash_hack && s:bash != ''
-        let &shell = s:bash
-        let &shellredir = '&>'
+        if s:shell_is_bash
+            let &shellredir = '&>'
+        endif
     endif
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 6ee8d681..8bc5e255 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -82,6 +82,15 @@ function! g:SyntasticChecker.setWantSort(val) " {{{2
     let self._sort = a:val
 endfunction " }}}2
 
+function! g:SyntasticChecker.log(msg, ...) " {{{2
+    let leader = self._filetype . '/' . self._name . ': '
+    if a:0 > 0
+        call syntastic#log#debug(g:SyntasticDebugCheckers, leader . a:msg, a:1)
+    else
+        call syntastic#log#debug(g:SyntasticDebugCheckers, leader . a:msg)
+    endif
+endfunction " }}}2
+
 function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
     let basename = self._filetype . '_' . self._name . '_'
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 6a7aab3b..7f130211 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -51,6 +51,7 @@ let s:defaultCheckers = {
         \ 'lisp':        ['clisp'],
         \ 'llvm':        ['llvm'],
         \ 'lua':         ['luac'],
+        \ 'markdown':    ['mdl'],
         \ 'matlab':      ['mlint'],
         \ 'nasm':        ['nasm'],
         \ 'nroff':       ['mandoc'],
@@ -65,6 +66,7 @@ let s:defaultCheckers = {
         \ 'python':      ['python', 'flake8', 'pylint'],
         \ 'r':           [],
         \ 'racket':      ['racket'],
+        \ 'rnc':         ['rnv'],
         \ 'rst':         ['rst2pseudoxml'],
         \ 'ruby':        ['mri'],
         \ 'sass':        ['sass'],
@@ -96,9 +98,13 @@ lockvar! s:defaultCheckers
 
 let s:defaultFiletypeMap = {
         \ 'gentoo-metadata': 'xml',
+        \ 'groff': 'nroff',
         \ 'lhaskell': 'haskell',
         \ 'litcoffee': 'coffee',
-        \ 'mail': 'text'
+        \ 'mail': 'text',
+        \ 'mkd': 'markdown',
+        \ 'sgml': 'docbk',
+        \ 'sgmllnx': 'docbk',
     \ }
 lockvar! s:defaultFiletypeMap
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
index 5d75c8ad..7a3c1672 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -18,15 +18,30 @@ 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
-    return system(self.getExecEscaped() . ' --help') =~# '--parse-only'
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    if 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"
+    "example: error in ./foo.bro, line 3: unknown identifier banana, at or near "banana"
     let errorformat =
+        \ 'fatal %trror in %f\, line %l: %m,' .
         \ '%trror in %f\, line %l: %m,' .
         \ '%tarning in %f\, line %l: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
index 957af2de..56a4260f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
@@ -18,18 +18,20 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_c_checkpatch_IsAvailable() dict
-    call syntastic#log#deprecationWarn('c_checker_checkpatch_location', 'c_checkpatch_exe')
+    call syntastic#log#deprecationWarn('c_checker_checkpatch_location', 'c_checkpatch_exec')
 
-    if !exists('g:syntastic_c_checkpatch_exe') && !executable(self.getExec())
+    if !exists('g:syntastic_c_checkpatch_exec') && !executable(self.getExec())
         if executable('checkpatch')
-            let g:syntastic_c_checkpatch_exe = 'checkpatch'
+            let g:syntastic_c_checkpatch_exec = 'checkpatch'
         elseif executable('./scripts/checkpatch.pl')
-            let g:syntastic_c_checkpatch_exe = fnamemodify('./scripts/checkpatch.pl', ':p')
+            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch.pl', ':p')
         elseif executable('./scripts/checkpatch')
-            let g:syntastic_c_checkpatch_exe = fnamemodify('./scripts/checkpatch', ':p')
+            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch', ':p')
         endif
     endif
 
+    call self.log('exec =', self.getExec())
+
     return executable(self.getExec())
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
index 16fbd59b..cc973b07 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -21,10 +21,6 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_c_clang_check_IsAvailable() dict
-  return executable(self.getExec())
-endfunction
-
 function! SyntaxCheckers_c_clang_check_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'post_args':
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
index 96d2e0e6..101de812 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -21,10 +21,6 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_c_clang_tidy_IsAvailable() dict
-  return executable(self.getExec())
-endfunction
-
 function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'post_args':
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
index 4fd19847..796d7730 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
@@ -26,6 +26,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
index 68050298..4987457c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
@@ -24,6 +24,7 @@ endif
 
 function! SyntaxCheckers_c_pc_lint_GetLocList() dict
     let config = findfile(g:syntastic_pc_lint_config_file, '.;')
+    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
diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
index 1a58c451..ca31e226 100644
--- a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
@@ -19,7 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_co_coco_GetLocList() dict
-    let tmpdir = $TMPDIR != '' ? $TMPDIR : $TMP != '' ? $TMP : '/tmp'
+    let tmpdir = syntastic#util#tmpdir()
     let makeprg = self.makeprgBuild({ 'args_after': '-c -o ' . tmpdir })
 
     let errorformat =
@@ -28,9 +28,13 @@ function! SyntaxCheckers_co_coco_GetLocList() dict
         \ '%EFailed at: %f,'.
         \ '%Z%trror: Parse error on line %l: %m'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
index 73f5688d..09fd7eae 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
@@ -27,6 +27,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
index 543647e3..c19c047b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
@@ -22,9 +22,14 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_coffee_coffee_IsAvailable() dict
-    return executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-        \       self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull()), [1,6,2])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+    call self.log(self.getExec() . ' version = ', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [1, 6, 2])
 endfunction
 
 function! SyntaxCheckers_coffee_coffee_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index 99f2fad8..17a656bd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -20,8 +20,9 @@ set cpo&vim
 
 function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
     if !exists('s:coffeelint_new')
-        let s:coffeelint_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-            \ self.getExecEscaped() . ' --version'), [1, 4])
+        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+        call self.log(self.getExec() . ' version =', ver)
+        let s:coffeelint_new = syntastic#util#versionIsAtLeast(ver, [1, 4])
     endif
     let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
index c8d77996..669e6252 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
@@ -26,6 +26,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
index 05e7b6a1..d751ede3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
@@ -31,6 +31,7 @@ function! SyntaxCheckers_d_dmd_IsAvailable() dict
     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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
new file mode 100644
index 00000000..46a12f6b
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index 3914fa9b..79052700 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -20,6 +20,9 @@ set cpo&vim
 
 " TODO: we should probably split this into separate checkers
 function! SyntaxCheckers_elixir_elixir_IsAvailable() dict
+    call self.log(g:SyntasticDebugCheckers,
+        \ 'executable("elixir") = ' . executable('elixir') . ', ' .
+        \ 'executable("mix") = ' . executable('mix'))
     return executable('elixir') && executable('mix')
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 3dbc3a5e..96f94780 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -21,6 +21,7 @@ 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
diff --git a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
index ce0d1aa0..935b6bb8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
@@ -26,6 +26,7 @@ function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict
     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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
index c4107016..e517e6f5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
@@ -21,7 +21,9 @@ set cpo&vim
 function! SyntaxCheckers_go_golint_GetLocList() dict
     let makeprg = self.makeprgBuild({})
 
-    let errorformat = '%f:%l:%c: %m,%-G%.%#'
+    let errorformat =
+        \ '%f:%l:%c: %m,' .
+        \ '%-G%.%#'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
index 010766e0..6c49b997 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
@@ -29,13 +29,11 @@ function! SyntaxCheckers_go_gotype_GetLocList() dict
     " the package for the same reasons specified in go.vim ("figuring out
     " the import path is fickle").
 
-    let errors = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'cwd': expand('%:p:h'),
         \ 'defaults': {'type': 'e'} })
-
-    return errors
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
index 080204a1..c4b7fd93 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
@@ -24,19 +24,21 @@ endfunction
 
 function! SyntaxCheckers_go_govet_GetLocList() dict
     let makeprg = 'go vet'
-    let errorformat = '%Evet: %.%\+: %f:%l:%c: %m,%W%f:%l: %m,%-G%.%#'
+
+    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.
 
-    let errors = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'cwd': expand('%:p:h'),
         \ 'defaults': {'type': 'w'} })
-
-    return errors
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index 7a86ffa6..97760508 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -21,10 +21,33 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
-    " We need either a Vim version that can handle NULs in system() output,
-    " or a ghc-mod version that has the --boundary option.
-    let exe = self.getExec()
-    let s:ghc_mod_new = executable(exe) ? s:GhcModNew(exe) : -1
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    " ghc-mod 5.0.0 and later needs the "version" command to print the
+    " version.  But the "version" command appeared in 4.1.0.  Thus, we need to
+    " know the version in order to know how to find out the version. :)
+
+    " Try "ghc-mod version".
+    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+    if !len(ver)
+        " That didn't work.  Try "ghc-mod" alone.
+        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+    endif
+
+    if len(ver)
+        " Encouraged by the great success in finding out the version, now we
+        " need either a Vim that can handle NULs in system() output, or a
+        " ghc-mod that has the "--boundary" option.
+        let parsed_ver = syntastic#util#parseVersion(ver[0])
+        call self.log(self.getExec() . ' version =', parsed_ver)
+        let s:ghc_mod_new = syntastic#util#versionIsAtLeast(parsed_ver, [2, 1, 2])
+    else
+        call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
+        let s:ghc_mod_new = -1
+    endif
+
     return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new)
 endfunction
 
@@ -49,18 +72,6 @@ function! SyntaxCheckers_haskell_ghc_mod_GetLocList() dict
         \ 'returns': [0] })
 endfunction
 
-function! s:GhcModNew(exe)
-    let exe = syntastic#util#shescape(a:exe)
-    try
-        let ghc_mod_version = filter(split(system(exe), '\n'), 'v:val =~# ''\m^ghc-mod version''')[0]
-        let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(ghc_mod_version), [2, 1, 2])
-    catch /\m^Vim\%((\a\+)\)\=:E684/
-        call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
-        let ret = -1
-    endtry
-    return ret
-endfunction
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'haskell',
     \ 'name': 'ghc_mod',
diff --git a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
index 90589420..3769627f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
@@ -28,6 +28,8 @@ function! SyntaxCheckers_haxe_haxe_GetLocList() dict
     endif
     let hxml = fnamemodify(hxml, ':p')
 
+    call self.log('hxml =', hxml)
+
     if hxml != ''
         let makeprg = self.makeprgBuild({
             \ 'fname': syntastic#util#shescape(fnamemodify(hxml, ':t')) })
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index 8bb0a530..dc236387 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -19,8 +19,14 @@ set cpo&vim
 
 function! SyntaxCheckers_html_jshint_IsAvailable() dict
     call syntastic#log#deprecationWarn('jshint_exec', 'html_jshint_exec')
-    return executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [2,4])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [2, 4])
 endfunction
 
 function! SyntaxCheckers_html_jshint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 7dcf5223..8a178996 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -164,8 +164,8 @@ let s:empty_tags = [
 lockvar! s:empty_tags
 
 function! s:IgnoreError(text)
-    for i in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
-        if stridx(a:text, i) != -1
+    for item in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
+        if stridx(a:text, item) != -1
             return 1
         endif
     endfor
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 75431610..6e059737 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -28,10 +28,17 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
-    return
-        \ executable(self.getExec()) &&
-        \ filereadable(expand(g:syntastic_java_checkstyle_classpath)) &&
-        \ filereadable(expand(g:syntastic_java_checkstyle_conf_file))
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let classpath = expand(g:syntastic_java_checkstyle_classpath)
+    let conf_file = expand(g:syntastic_java_checkstyle_conf_file)
+    call self.log(
+        \ 'filereadable(' . string(classpath) . ') = ' . filereadable(classpath) . ', ' .
+        \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
+
+    return filereadable(classpath) && filereadable(conf_file)
 endfunction
 
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 2e138bea..3623d75f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -51,15 +51,7 @@ function! s:CygwinPath(path)
 endfunction
 
 if !exists('g:syntastic_java_javac_temp_dir')
-    if has('win32') || has('win64')
-        let g:syntastic_java_javac_temp_dir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-javac'
-    elseif has('win32unix')
-        let g:syntastic_java_javac_temp_dir = s:CygwinPath('/tmp/vim-syntastic-javac')
-    elseif $TMPDIR != ''
-        let g:syntastic_java_javac_temp_dir = $TMPDIR . '/vim-syntastic-javac'
-    else
-        let g:syntastic_java_javac_temp_dir = '/tmp/vim-syntastic-javac'
-    endif
+    let g:syntastic_java_javac_temp_dir = syntastic#util#tmpdir()
 endif
 
 if !exists('g:syntastic_java_javac_autoload_maven_classpath')
@@ -90,18 +82,6 @@ function! s:RemoveCarriageReturn(line)
     return substitute(a:line, "\r", '', 'g')
 endfunction
 
-" recursively remove directory and all it's sub-directories
-function! s:RemoveDir(dir)
-    if isdirectory(a:dir)
-        for f in split(globpath(a:dir, '*'), "\n")
-            call s:RemoveDir(f)
-        endfor
-        silent! call system('rmdir ' . syntastic#util#shescape(a:dir))
-    else
-        silent! call delete(a:dir)
-    endif
-endfunction
-
 function! s:ClassSep()
     return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
 endfunction
@@ -419,7 +399,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict
         \ 'postprocess': ['cygwinRemoveCR'] })
 
     if g:syntastic_java_javac_delete_output
-        call s:RemoveDir(output_dir)
+        call syntastic#util#rmrf(output_dir)
     endif
     return errors
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
index 5dac3abe..a4d8edd0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -20,25 +20,33 @@ set cpo&vim
 function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
     call syntastic#log#deprecationWarn('javascript_closure_compiler_path', 'javascript_closurecompiler_path')
 
-    return
-        \ executable("java") &&
-        \ exists("g:syntastic_javascript_closurecompiler_path") &&
-        \ filereadable(g:syntastic_javascript_closurecompiler_path)
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
+    call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
+
+    let jar = expand(cp)
+    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')
 
-    if exists("g:syntastic_javascript_closurecompiler_file_list")
-        let file_list = join(readfile(g:syntastic_javascript_closurecompiler_file_list))
+    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''))
+    if filereadable(flist)
+        let file_list = map( readfile(flist), 'expand(v:var)' )
     else
-        let file_list = syntastic#util#shexpand('%')
+        let file_list = [expand('%')]
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': '-jar ' . g:syntastic_javascript_closurecompiler_path,
-        \ 'args_after': '--js' ,
+        \ 'exe_after': ['-jar', expand(g:syntastic_javascript_closurecompiler_path)],
+        \ 'args_after': '--js',
         \ 'fname': file_list })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index f23eb73b..e848c4a0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -18,9 +18,14 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
-    return
-        \ executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [0, 1])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index 69706c0a..96bba9f8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -22,7 +22,10 @@ function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
+
     let s:jshint_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', s:jshint_version)
+
     return syntastic#util#versionIsAtLeast(s:jshint_version, [1])
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 21ba6a04..1d249237 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -19,10 +19,14 @@ set cpo&vim
 
 function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
     let jsxhint_version = system(self.getExecEscaped() . ' --version')
-    return
-        \ v:shell_error == 0 &&
-        \ jsxhint_version =~# '\m^JSXHint\>' &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(jsxhint_version), [0, 4, 1])
+    if v:shell_error || (jsxhint_version !~# '\m^JSXHint\>')
+        return 0
+    endif
+
+    let ver = syntastic#util#parseVersion(jsxhint_version)
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 4, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_jsxhint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
index ce653f51..786386ac 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -36,6 +36,7 @@ set cpo&vim
 let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . 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
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
index 012f1490..5805e780 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
@@ -47,7 +47,7 @@ endfunction
 function! SyntaxCheckers_lua_luac_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '-p' })
 
-    let errorformat =  'luac: %#%f:%l: %m'
+    let errorformat = 'luac: %#%f:%l: %m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
diff --git a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
new file mode 100644
index 00000000..c18314a5
--- /dev/null
+++ b/sources_non_forked/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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_markdown_mdl_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '--warnings' })
+
+    let errorformat =
+        \ '%E%f:%l: %m,'.
+        \ '%W%f: Kramdown Warning: %m found on line %l'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    call self.setWantSort(1)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'markdown',
+    \ 'name': 'mdl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
new file mode 100644
index 00000000..4c36b499
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/docbk/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nroff',
+    \ 'name': 'igor',
+    \ 'redirect': 'docbk/igor'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
index 09c3daa2..d44eac17 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
@@ -26,6 +26,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
index 853d6657..13ff8c1a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
@@ -26,6 +26,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
index 38e896cd..dedb9544 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -19,9 +19,12 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_puppet_puppet_GetLocList() dict
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+    if !exists('s:puppet_version')
+        let s:puppet_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+        call self.log(self.getExec() . ' version =', s:puppet_version)
+    endif
 
-    if syntastic#util#versionIsAtLeast(ver, [2,7,0])
+    if syntastic#util#versionIsAtLeast(s:puppet_version, [2,7,0])
         let args = 'parser validate --color=false'
     else
         let args = '--color=false --parseonly'
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index ff4ba071..d9948cae 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -19,11 +19,16 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
-    return
-        \ executable("puppet") &&
-        \ executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-        \       self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull()), [0,1,10])
+    call self.log("executable('puppet') = " . executable('puppet') . ', ' .
+        \ "executable(" . string(self.getExec()) . ") = " . executable(self.getExec()))
+    if !executable('puppet') || !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 1, 10])
 endfunction
 
 function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
new file mode 100644
index 00000000..5a560431
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
@@ -0,0 +1,35 @@
+"============================================================================
+"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\, line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'type': 'E' },
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'mypy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index d4b16575..1872456a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -15,8 +15,9 @@ set cpo&vim
 
 function! SyntaxCheckers_python_pep257_GetLocList() dict
     if !exists('s:pep257_new')
-        let s:pep257_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-            \ self.getExecEscaped() . ' --version'), [0, 3])
+        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+        call self.log(self.getExec() . ' version =', ver)
+        let s:pep257_new = syntastic#util#versionIsAtLeast(ver, [0, 3])
     endif
 
     let makeprg = self.makeprgBuild({})
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index d1373439..8e803a38 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -16,14 +16,38 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_python_pylint_IsAvailable() dict
-    let exe = self.getExec()
-    let s:pylint_new = executable(exe) ? s:PylintNew(exe) : -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 pylint_version = filter( split(system(self.getExecEscaped() . ' --version'), '\m, \=\|\n'),
+            \ 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
+        let ver = syntastic#util#parseVersion(substitute(pylint_version, '\v^\S+\s+', '', ''))
+
+        call self.log(self.getExec() . ' version =', ver)
+
+        let s:pylint_new = syntastic#util#versionIsAtLeast(ver, [1])
+    catch /\m^Vim\%((\a\+)\)\=:E684/
+        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
 
 function! SyntaxCheckers_python_pylint_GetLocList() dict
     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') })
+        \ '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,' .
@@ -62,26 +86,6 @@ function! SyntaxCheckers_python_pylint_GetLocList() dict
     return loclist
 endfunction
 
-function! s:PylintNew(exe)
-    let exe = syntastic#util#shescape(a:exe)
-    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 pylint_version = filter( split(system(exe . ' --version'), '\m, \=\|\n'),
-                    \ 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
-        let pylint_version = substitute(pylint_version, '\v^\S+\s+', '', '')
-        let ret = syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(pylint_version), [1])
-    catch /\m^Vim\%((\a\+)\)\=:E684/
-        call syntastic#log#error("checker python/pylint: can't parse version string (abnormal termination?)")
-        let ret = -1
-    endtry
-    return ret
-endfunction
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'python',
     \ 'name': 'pylint' })
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index 5023ee6c..3d1c0aee 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -21,8 +21,14 @@ set cpo&vim
 let s:compiler = expand('<sfile>:p:h') . syntastic#util#Slash() . 'compile.py'
 
 function! SyntaxCheckers_python_python_IsAvailable() dict
-    return executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [2, 6])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [2, 6])
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim b/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
new file mode 100644
index 00000000..db8bd581
--- /dev/null
+++ b/sources_non_forked/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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
index e5fb0a1f..a368e9e6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
@@ -1,6 +1,6 @@
 "============================================================================
 "File:        rst.vim
-"Description: Syntax checking plugin for docutil's reStructuredText files
+"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
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index 8d179c27..b4b8d3af 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -21,6 +21,7 @@ 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
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
index 9177c563..baf2ad4d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -22,9 +22,14 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
-    return
-        \ executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [0, 9, 0])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 9, 0])
 endfunction
 
 function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index 07f0d4f0..b4839f54 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -21,8 +21,9 @@ set cpo&vim
 
 function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
     if !exists('s:rubylint_new')
-        let s:rubylint_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-            \ self.getExecEscaped() . ' --version'), [2])
+        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+        call self.log(self.getExec() . ' version =', ver)
+        let s:rubylint_new = syntastic#util#versionIsAtLeast(ver, [2])
     endif
     let makeprg = self.makeprgBuild({ 'args': (s:rubylint_new ? '' : 'analyze ') . '--presenter=syntastic' })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
index 21e0fd6f..ce8e6939 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -17,9 +17,13 @@ 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 = tempname()
+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
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
index 9c0a3cce..5d282692 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
@@ -27,10 +27,16 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict
-    return
-        \ executable(self.getExec()) &&
-        \ filereadable(expand(g:syntastic_scala_scalastyle_jar)) &&
-        \ filereadable(expand(g:syntastic_scala_scalastyle_config_file))
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let jar = expand(g:syntastic_scala_scalastyle_jar)
+    let conf_file = expand(g:syntastic_scala_scalastyle_config_file)
+    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
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index fa63f19e..523e981c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -18,10 +18,14 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
-    return
-        \ executable(self.getExec()) &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-        \       self.getExecEscaped() . ' --version'), [0, 12])
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 12])
 endfunction
 
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index 65d84a97..95e6b48d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -19,6 +19,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_sh_sh_IsAvailable() dict
+    call self.log('shell =', s:GetShell())
     return s:IsShellValid()
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 8cc2bfc0..51e641a1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -20,8 +20,9 @@ set cpo&vim
 
 function! SyntaxCheckers_slim_slimrb_GetLocList() dict
     if !exists('s:slimrb_new')
-        let s:slimrb_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
-            \ self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull()), [1, 3, 1])
+        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull())
+        call self.log(self.getExec() . ' version =', ver)
+        let s:slimrb_new = syntastic#util#versionIsAtLeast(ver, [1, 3, 1])
     endif
 
     let makeprg = self.makeprgBuild({ 'args_after': '-c' })
diff --git a/sources_non_forked/syntastic/syntax_checkers/spec/lacheck.vim b/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
similarity index 100%
rename from sources_non_forked/syntastic/syntax_checkers/spec/lacheck.vim
rename to sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
index 23392360..aa6ceb34 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -9,19 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about ChkTeX see:
-"
-" http://baruch.ev-en.org/proj/chktex/
-"
-" Checker options:
-"
-" - g:syntastic_tex_chktex_showmsgs (boolean; default: 1)
-"   whether to show informational messages (chktex option "-m");
-"   by default informational messages are shown as warnings
-"
-" - g:syntastic_tex_chktex_args (string; default: empty)
-"   command line options to pass to chktex
 
 if exists('g:loaded_syntastic_tex_chktex_checker')
     finish
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
new file mode 100644
index 00000000..4b358e5a
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
@@ -0,0 +1,25 @@
+"============================================================================
+"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
+
+runtime! syntax_checkers/docbk/*.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'igor',
+    \ 'redirect': 'docbk/igor'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
index 912e298d..c2ca1138 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
@@ -63,7 +63,7 @@ function! s:GetValaVapiDirs()
         elseif type(g:syntastic_vala_vapi_dirs) == type([])
             return copy(g:syntastic_vala_vapi_dirs)
         else
-            echoerr 'g:syntastic_vala_vapi_dirs must be either list or string: fallback to in file modules string'
+            echoerr 'g:syntastic_vala_vapi_dirs must be either a list, or a string: fallback to in-file modules string'
         endif
     endif
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
index 396d72e5..afe58fca 100644
--- a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
@@ -20,6 +20,7 @@ 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))
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 7122de1f..ddcf9273 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -36,9 +36,11 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
-    return
-        \ globpath(&runtimepath, 'autoload/vimlparser.vim') != '' &&
-        \ globpath(&runtimepath, 'autoload/vimlint.vim') != ''
+    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim')
+    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim')
+    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim') = " . string(vimlparser) . ', ' .
+                \ "globpath(&runtimepath, 'autoload/vimlint.vim') = " .    string(vimlint))
+    return vimlparser != '' && vimlint != ''
 endfunction
 
 function! SyntaxCheckers_vim_vimlint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
index a3e2d47a..5c3e6330 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -47,8 +47,8 @@ function! s:TidyEncOptByFenc()
 endfunction
 
 function! s:IgnoreError(text)
-    for i in g:syntastic_xhtml_tidy_ignore_errors
-        if stridx(a:text, i) != -1
+    for item in g:syntastic_xhtml_tidy_ignore_errors
+        if stridx(a:text, item) != -1
             return 1
         endif
     endfor
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
index a0c6dba0..4361edc2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -23,8 +23,9 @@ set cpo&vim
 
 function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
     if !exists('s:js_yaml_new')
-        let s:js_yaml_new =
-            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [2])
+        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+        call self.log(self.getExec() . ' version =', ver)
+        let s:js_yaml_new = syntastic#util#versionIsAtLeast(ver, [2])
     endif
 
     let makeprg = self.makeprgBuild({ 'args_after': (s:js_yaml_new ? '' : '--compact') })
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index b98e3485..0b4ac57f 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -191,7 +191,7 @@ MIT License. Copyright (c) 2013-2014 Bailey Ling.
 [17]: https://github.com/mbbill/undotree
 [18]: https://github.com/scrooloose/nerdtree
 [19]: https://github.com/majutsushi/tagbar
-[20]: https://powerline.readthedocs.org/en/latest/fontpatching.html
+[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
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/raven.vim b/sources_non_forked/vim-airline/autoload/airline/themes/raven.vim
new file mode 100644
index 00000000..02bfd73a
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/autoload/airline/themes/silver.vim b/sources_non_forked/vim-airline/autoload/airline/themes/silver.vim
new file mode 100644
index 00000000..fd85edba
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-coffee-script/Copying.md b/sources_non_forked/vim-coffee-script/Copying.md
index 51cf8d14..a31ad2ff 100644
--- a/sources_non_forked/vim-coffee-script/Copying.md
+++ b/sources_non_forked/vim-coffee-script/Copying.md
@@ -1,7 +1,7 @@
                 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                         Version 2, December 2004
 
-     Copyright (C) 2010 to 2012 Mick Koch <kchmck@gmail.com>
+     Copyright (C) 2010 to 2014 Mick Koch <mick@kochm.co>
 
      Everyone is permitted to copy and distribute verbatim or modified
      copies of this license document, and changing it is allowed as long
diff --git a/sources_non_forked/vim-coffee-script/News.md b/sources_non_forked/vim-coffee-script/News.md
index 97067963..9f3f1390 100644
--- a/sources_non_forked/vim-coffee-script/News.md
+++ b/sources_non_forked/vim-coffee-script/News.md
@@ -1,3 +1,7 @@
+### Version 003 (October 10, 2014)
+
+Almost 3 years' worth of fixes and (hopefully) improvements.
+
 ### Version 002 (December 5, 2011)
 
 Added binary numbers (0b0101) and fixed some bugs (#9, #62, #63, #65).
diff --git a/sources_non_forked/vim-coffee-script/Readme.md b/sources_non_forked/vim-coffee-script/Readme.md
index d557848a..08d61f1d 100644
--- a/sources_non_forked/vim-coffee-script/Readme.md
+++ b/sources_non_forked/vim-coffee-script/Readme.md
@@ -91,7 +91,7 @@ Updating takes two steps:
    set rtp+=~/.vim/bundle/vundle/
    call vundle#rc()
 
-   Bundle 'kchmck/vim-coffee-script'
+   Plugin 'kchmck/vim-coffee-script'
 
    syntax enable
    filetype plugin indent on
@@ -100,9 +100,9 @@ Updating takes two steps:
    If you're adding Vundle to a built-up vimrc, just make sure all these calls
    are in there and that they occur in this order.
 
-3. Open vim and run `:BundleInstall`.
+3. Open vim and run `:PluginInstall`.
 
-To update, open vim and run `:BundleInstall!` (notice the bang!)
+To update, open vim and run `:PluginInstall!` (notice the bang!)
 
 ## Install from a Zip File
 
@@ -313,7 +313,7 @@ the given `RANGE` and any extra `COFFEE-OPTIONS` are passed to `coffee`.
 
 ## CoffeeLint: Lint your CoffeeScript
 
-CoffeeLint runs [coffeelint](http://www.coffeelint.org/) (version 0.5.7 or later
+CoffeeLint runs [coffeelint](http://www.coffeelint.org/) (version 1.4.0 or later
 required) on the current file and adds any issues to the [quickfix] list.
 
   ![CoffeeLint](http://i.imgur.com/UN8Nr5N.png)
diff --git a/sources_non_forked/vim-coffee-script/after/indent/html.vim b/sources_non_forked/vim-coffee-script/after/indent/html.vim
index e6377087..2fa86371 100644
--- a/sources_non_forked/vim-coffee-script/after/indent/html.vim
+++ b/sources_non_forked/vim-coffee-script/after/indent/html.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/after/syntax/html.vim b/sources_non_forked/vim-coffee-script/after/syntax/html.vim
index 9e2eb3a1..82b44f13 100644
--- a/sources_non_forked/vim-coffee-script/after/syntax/html.vim
+++ b/sources_non_forked/vim-coffee-script/after/syntax/html.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/autoload/coffee.vim b/sources_non_forked/vim-coffee-script/autoload/coffee.vim
index 04d5efba..8d727951 100644
--- a/sources_non_forked/vim-coffee-script/autoload/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/autoload/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/compiler/cake.vim b/sources_non_forked/vim-coffee-script/compiler/cake.vim
index 0a3c7037..b49638e7 100644
--- a/sources_non_forked/vim-coffee-script/compiler/cake.vim
+++ b/sources_non_forked/vim-coffee-script/compiler/cake.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/compiler/coffee.vim b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
index 9a91d354..5a914578 100644
--- a/sources_non_forked/vim-coffee-script/compiler/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/compiler/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/ftdetect/coffee.vim b/sources_non_forked/vim-coffee-script/ftdetect/coffee.vim
index 50569298..e6c4d698 100644
--- a/sources_non_forked/vim-coffee-script/ftdetect/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/ftdetect/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim b/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
index c44fe979..347155ac 100644
--- a/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/ftplugin/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -13,6 +13,7 @@ call coffee#CoffeeSetUpVariables()
 setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:# commentstring=#\ %s
 setlocal omnifunc=javascriptcomplete#CompleteJS
+setlocal suffixesadd+=coffee
 
 " Create custom augroups.
 augroup CoffeeBufUpdate | augroup END
@@ -330,7 +331,7 @@ function! s:CoffeeLint(startline, endline, bang, args)
   endif
 
   let output = system(g:coffee_linter .
-  \                   ' -s --csv' .
+  \                   ' -s --reporter csv' .
   \                   ' ' . b:coffee_litcoffee .
   \                   ' ' . g:coffee_lint_options .
   \                   ' ' . a:args .
@@ -394,11 +395,11 @@ if !exists('b:coffee_run_buf')
   call s:CoffeeRunResetVars()
 endif
 
-command! -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
+command! -buffer -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
 \        CoffeeCompile call s:CoffeeCompile(<line1>, <line2>, <q-args>)
-command! -bar -nargs=* -complete=customlist,s:CoffeeComplete
+command! -buffer -bar -nargs=* -complete=customlist,s:CoffeeComplete
 \        CoffeeWatch call s:CoffeeWatch(<q-args>)
-command! -range=% -bar -nargs=* CoffeeRun
+command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
-command! -range=% -bang -bar -nargs=* CoffeeLint
+command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
diff --git a/sources_non_forked/vim-coffee-script/indent/coffee.vim b/sources_non_forked/vim-coffee-script/indent/coffee.vim
index e83fa5a4..4f4570a8 100644
--- a/sources_non_forked/vim-coffee-script/indent/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/indent/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -426,8 +426,3 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
-
-" tab space
-setlocal expandtab
-setlocal tabstop=2 shiftwidth=2 softtabstop=2
-setlocal autoindent
diff --git a/sources_non_forked/vim-coffee-script/syntax/coffee.vim b/sources_non_forked/vim-coffee-script/syntax/coffee.vim
index 7f8df73c..b5784336 100644
--- a/sources_non_forked/vim-coffee-script/syntax/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/syntax/coffee.vim
@@ -1,5 +1,5 @@
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
diff --git a/sources_non_forked/vim-less/after/syntax/html.vim b/sources_non_forked/vim-less/after/syntax/html.vim
index 589c2718..db6cdaa4 100644
--- a/sources_non_forked/vim-less/after/syntax/html.vim
+++ b/sources_non_forked/vim-less/after/syntax/html.vim
@@ -7,8 +7,10 @@ if !g:less_html_style_tags
 endif
 
 " Unset (but preserve) so that less will run.
-let s:pre_less_cur_syn = b:current_syntax
-unlet b:current_syntax
+if exists("b:current_syntax")
+   let s:pre_less_cur_syn = b:current_syntax
+   unlet b:current_syntax
+endif
 
 " Inspired by code from github.com/kchmck/vim-coffee-script
 " and the html syntax file included with vim 7.4.
@@ -19,4 +21,6 @@ syn include @htmlLess syntax/less.vim
 syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end=+</style>+ contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead
 
 " Reset since 'less' isn't really the current_syntax.
-let b:current_syntax = s:pre_less_cur_syn
+if exists("s:pre_less_cur_syn")
+   let b:current_syntax = s:pre_less_cur_syn
+endif
diff --git a/sources_non_forked/vim-markdown/indent/markdown.vim b/sources_non_forked/vim-markdown/indent/markdown.vim
deleted file mode 100644
index 06ccb477..00000000
--- a/sources_non_forked/vim-markdown/indent/markdown.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set noexpandtab
-set tabstop=2
-set shiftwidth=2
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 4e139e1a..536fe8bf 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -26,6 +26,7 @@ additional contributions from:
 * [jherdman](https://github.com/jherdman)
 * [kozo2](https://github.com/kozo2)
 * [lilydjwg](https://github.com/lilydjwg)
+* [lpil](https://github.com/lpil)
 * [marutanm](https://github.com/marutanm)
 * [MicahElliott](https://github.com/MicahElliott)
 * [muffinresearch](https://github.com/muffinresearch)
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 67a4d028..72f7ebc1 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -81,6 +81,10 @@ if (!exists('g:snipMate_no_default_aliases') || !g:snipMate_no_default_aliases)
 				\ get(g:snipMate.scope_aliases, 'mxml', 'actionscript')
 	let g:snipMate.scope_aliases.eruby =
 				\ get(g:snipMate.scope_aliases, 'eruby', 'eruby-rails,html')
+	let g:snipMate.scope_aliases.scss =
+				\ get(g:snipMate.scope_aliases, 'scss', 'css')
+	let g:snipMate.scope_aliases.less =
+				\ get(g:snipMate.scope_aliases, 'less', 'css')
 endif
 
 let g:snipMate['get_snippets'] = get(g:snipMate, 'get_snippets', funcref#Function("snipMate#GetSnippets"))
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
index 76e9ca1d..61b52293 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
@@ -19,7 +19,49 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', function($2) {
+controller('${1:name}', ['${2:param_annotation}', function(${3:param}) {
 	$0
-});
+}]);
+endsnippet
+
+snippet aconts "angular controller with scope" i
+controller('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet adir "angular directive" i
+directive('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet adirs "angular directive with scope" i
+directive('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet afact "angular factory" i
+factory('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet afacts "angular factory with scope" i
+factory('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet aserv "angular service" i
+service('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet aservs "angular service" i
+service('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
index ca943fc7..959f805d 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
@@ -9,7 +9,7 @@ snippet /* "A JSDoc comment" b
 endsnippet
 
 snippet @au "@author email (First Last)"
-@author ${1:`!v g:snips_author_email`} (${2:`!v g:snips_author`})
+@author ${1:`!v g:snips_author`} [${2:`!v g:snips_author_email`}]
 endsnippet
 
 snippet @li "@license Description"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index bf450ff0..def2116b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -145,49 +145,79 @@ $0
 endsnippet
 
 snippet pub "Public function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 public function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pro "Protected function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 protected function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pri "Private function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 private function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${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}${3:return null;}
+	${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}${3:return null;}
+	${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}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
@@ -223,10 +253,25 @@ endsnippet
 
 snippet class "Class declaration template" b
 /**
- * Class ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * Class ${2:`!p snip.rv=snip.fn.split('.')[0]`}
+ * @author ${3:`!v g:snips_author`}
+ */
+$1class $2
+{
+	public function ${4:__construct}(${5:$options})
+	{
+		${6:// code}
+	}
+}
+$0
+endsnippet
+
+snippet interface "interface declaration template" b
+/**
+ * Interface ${1:`!p snip.rv=snip.fn.split('.')[0]`}
  * @author ${2:`!v g:snips_author`}
  */
-class $1
+interface $1
 {
 	public function ${3:__construct}(${4:$options})
 	{
@@ -267,4 +312,10 @@ public function $1Action($2)
 }
 endsnippet
 
+snippet inheritdoc "@inheritdoc docblock"
+/**
+ * {@inheritdoc}
+ */
+endsnippet
+
 # :vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 3387533d..41a3645f 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -157,6 +157,26 @@ 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)
+	snip += format_return(style)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += triple_quotes(snip)
+
 endglobal
 
 ########################################
@@ -400,17 +420,27 @@ 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
-snip.rv = ""
-snip >> 1
+write_function_docstring(t, snip) `
+	${0:pass}
+endsnippet
 
-args = get_args(t[2])
-if args:
-	write_docstring_args(args, snip)
 
-style = get_style(snip)
-snip += format_return(style)
-snip.rv += '\n' + snip.mkline('', indent='')
-snip += triple_quotes(snip) `
+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) `
+	${0: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) `
 	${0:pass}
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
index f2142847..cab17c14 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
@@ -7,21 +7,21 @@ snippet imp "@import '...';" b
 endsnippet
 
 snippet inc "@include mixin(...);" b
-@include ${1:mixin}(${2:arguments});
+@include ${1:mixin}(${2});
 endsnippet
 
 snippet ext "@extend %placeholder;" b
-@extend %${1:placeholder};
+@extend %${1:%placeholder};
 endsnippet
 
 snippet mixin "@mixin (...) { ... }" b
-@mixin ${1:name}(${2:arguments}) {
+@mixin ${1:name}(${2}) {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet fun "@function (...) { ... }" b
-@function ${1:name}(${2:arguments}) {
+@function ${1:name}(${2}) {
 	${VISUAL}$0
 }
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index ede9090d..406948c4 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -15,7 +15,7 @@ $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 endsnippet
 
 snippet fig "Figure environment" b
-\begin{figure}${2:[htpb]}
+\begin{figure}[${2:htpb}]
 	\centering
 	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
 	\caption{${4/(\w+)\.\w+/\u$1/}$0}
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index bc13fcbb..1b206e3d 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -127,3 +127,5 @@ snippet ife
 	<% else %>
 		${0}
 	<% end %>
+snippet pry
+  <% require 'pry'; binding.pry %>
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
index 9e750877..abc3b8d8 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets
@@ -3,7 +3,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	var ${1} = require("${2:module_name}");
+	var ${1} = require('${2:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {
@@ -47,4 +47,3 @@ snippet stdout
 	process.stdout
 snippet stderr
 	process.stderr
-
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index bfc53ee8..5012a43a 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -1,3 +1,5 @@
+# Functions
+
 # prototype
 snippet proto
 	${1:class_name}.prototype.${2:method_name} = function(${3}) {
@@ -23,6 +25,18 @@ snippet (f
 	(function(${1}) {
 		${0}
 	}(${2}));
+# self-defining function
+snippet sdf
+	var ${1:function_name} = function (${2:argument}) {
+		${3}
+
+		$1 = function ($2) {
+			${0}
+		};
+	};
+
+# Flow control
+
 # if
 snippet if
 	if (${1:true}) {
@@ -37,7 +51,7 @@ snippet ife
 	}
 # tertiary conditional
 snippet ter
-	${1:/* condition */} ? ${2:a} : ${0:b}
+	${1:/* condition */} ? ${2:/* if true */} : ${0:/* if false */}
 # switch
 snippet switch
 	switch (${1:expression}) {
@@ -54,21 +68,6 @@ snippet case
 		${2}
 		break;
 	${0}
-# for (...) {...}
-snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
-		var ${3:v} = $1[$2];${0:}
-	}
-# for (...) {...} (Improved Native For-Loop)
-snippet forr
-	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
-		var ${3:v} = $1[$2];${0:}
-	}
-# while (...) {...}
-snippet wh
-	while (${1:/* condition */}) {
-		${0}
-	}
 # try
 snippet try
 	try {
@@ -76,67 +75,48 @@ snippet try
 	} catch (${2:e}) {
 		${0:/* handle error */}
 	}
-# do...while
+# return
+snippet ret
+	return ${0:result};
+
+# Loops
+
+# for loop
+snippet for
+	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
+		var ${3:v} = $1[$2];${0:}
+	}
+# Reversed for loop
+snippet forr
+	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
+		var ${3:v} = $1[$2];${0:}
+	}
+# While loop
+snippet wh
+	while (${1:/* condition */}) {
+		${0}
+	}
+# Do while loop
 snippet do
 	do {
 		${0}
 	} 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}
 	}${3:,}
-# setTimeout function
-snippet timeout
-	setTimeout(function () {${0}}${2}, ${1:10});
-# Get Elements
-snippet get
-	getElementsBy${1:TagName}('${2}')
-# Get Element
-snippet gett
-	getElementBy${1:Id}('${2}')
-# console.log (Firebug)
-snippet cl
-	console.log(${0});
-# console.debug (Firebug)
-snippet cd
-	console.debug(${0});
-# return
-snippet ret
-	return ${0:result}
-# for (property in object ) { ... }
-snippet fori
-	for (var ${1:prop} in ${2:Things}) {
-		${0:$2[$1]}
-	}
 # hasOwnProperty
 snippet has
 	hasOwnProperty(${0})
-# docstring
-snippet /**
-	/**
-	 * ${0:description}
-	 *
-	 */
-snippet @par
-	@param {${1:type}} ${2:name} ${0:description}
-snippet @ret
-	@return {${1:type}} ${0:description}
-# JSON.parse
-snippet jsonp
-	JSON.parse(${0:jstr});
-# JSON.stringify
-snippet jsons
-	JSON.stringify(${0:object});
-# self-defining function
-snippet sdf
-	var ${1:function_name} = function (${2:argument}) {
-		${3}
-
-		$1 = function ($2) {
-			${0}
-		};
-	};
 # singleton
 snippet sing
 	function ${1:Singleton} (${2:argument}) {
@@ -191,7 +171,7 @@ snippet props
 snippet prop
 	Object.defineProperty(
 		${1:object},
-		"${2:property}",
+		'${2:property}',
 		{
 			get : function $1_$2_getter() {
 				// getter code
@@ -205,3 +185,73 @@ snippet prop
 			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
+
+# console.log
+snippet cl
+	console.log(${0});
+# console.debug
+snippet cd
+	console.debug(${0});
+# console.trace
+snippet ct
+	console.trace(${0:label});
+# console.time
+snippet ctime
+	console.time(${0:label});
+# console.assert
+snippet ca
+	console.assert(${1:expression}, ${0:obj});
+# console.dir
+snippet cdir
+	console.dir(${0:obj});
+
+# Misc
+
+# setTimeout function
+snippet timeout
+	setTimeout(function () {${0}}${2}, ${1:10});
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index 09d69ad3..4e147a0f 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -6,32 +6,27 @@
 # Scala lang
 #if
 snippet if
-	if(${1:obj}) {
+	if (${1})
 		${0}
-	}
 #if not
 snippet ifn
-	if(!${1:obj}) {
+	if (!${1})
 		${0}
-	}
 #if-else
 snippet ife
-	if(${1:obj}) {
+	if (${1})
 		${2}
-	} else {
+	else
 		${0}
-	}
 #if-else-if
 snippet ifelif
-	if(${1:obj}) {
+	if (${1})
 		${2}
-	} else if(${3:obj}) {
+	else if (${3})
 		${0}
-	}
 snippet eif
-	else if(${3:obj}) {
+	else if (${3})
 		${0}
-	}
 #while loop
 snippet wh
 	while (${1:obj}) {
diff --git a/sources_non_forked/vim-snippets/snippets/scss.snippets b/sources_non_forked/vim-snippets/snippets/scss.snippets
new file mode 100644
index 00000000..6daee776
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/scss.snippets
@@ -0,0 +1,36 @@
+snippet $
+	$${1:variable}: ${0:value};
+snippet imp
+	@import '${0}';
+snippet mix
+	@mixin ${1:name}(${2}) {
+		${0}
+	}
+snippet inc
+	@include ${1:mixin}(${2});
+snippet ex
+	@extend ${0};
+snippet fun
+	@function ${1:name}(${2:args}) {
+		${0}
+	}
+snippet if
+	@if ${1:condition} {
+		${0}
+	}
+snippet else
+	@else ${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/sources_non_forked/vim-zenroom2/README.markdown b/sources_non_forked/vim-zenroom2/README.markdown
index e8607d37..ee852796 100644
--- a/sources_non_forked/vim-zenroom2/README.markdown
+++ b/sources_non_forked/vim-zenroom2/README.markdown
@@ -7,7 +7,7 @@ zenroom for Vim: Focusing only on the essential](http://amix.dk/blog/post/19744#
 
 Please note that this might not work perfectly with your colorscheme. Patches are welcome to fix this :-)
 
-## Installaion and usage
+## Installation and usage
 
 * Install [goyo.vim](https://github.com/junegunn/goyo.vim)
 * In command mode type :Goyo
@@ -23,7 +23,7 @@ Additionally you may want to have a shortcut. Add this to your vimrc:
 * [vim-zenroom](https://github.com/amix/vim-zenroom)
 
 
-## How it looks like in action
+## How it looks in action
 
 ![Screenshot 3](http://amix.dk/uploads/zenroom_documentation.jpg)
 
diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index 2ea60f07..bcaf25d0 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -62,7 +62,7 @@ function! s:markdown_room()
     exec( "hi StatusLineNC " . l:highlightfgbgcolor )
 endfunction
 
-function! g:Zenroom_goyo_before()
+function! s:zenroom_goyo_before()
     if !has("gui_running")
         return
     endif
@@ -73,7 +73,7 @@ function! g:Zenroom_goyo_before()
     endif
 endfunction
 
-function! g:Zenroom_goyo_after()
+function! s:zenroom_goyo_after()
     if !has("gui_running")
         return
     endif
@@ -87,4 +87,4 @@ function! g:Zenroom_goyo_after()
     endif
 endfunction
 
-let g:goyo_callbacks = [ function('g:Zenroom_goyo_before'), function('g:Zenroom_goyo_after') ]
+let g:goyo_callbacks = [ function('s:zenroom_goyo_before'), function('s:zenroom_goyo_after') ]
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 0ad89416..bdebad2b 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -181,9 +181,9 @@ set expandtab
 " Be smart when using tabs ;)
 set smarttab
 
-" 1 tab == 2 spaces
-set shiftwidth=2
-set tabstop=2
+" 1 tab == 4 spaces
+set shiftwidth=4
+set tabstop=4
 
 " Linebreak on 500 characters
 set lbr

From a304deea5643868964ce2ded9b33855fc8a5f540 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Fri, 31 Oct 2014 21:30:24 +0000
Subject: [PATCH 53/61] Updated plugins

---
 sources_non_forked/nerdtree/README.markdown   |   4 +-
 .../nerdtree/lib/nerdtree/path.vim            |  24 +-
 .../nerdtree/nerdtree_plugin/fs_menu.vim      |   7 +-
 sources_non_forked/syntastic/README.markdown  |  54 +-
 .../syntastic/autoload/syntastic/log.vim      |   4 +-
 .../autoload/syntastic/preprocess.vim         |  50 ++
 .../syntastic/autoload/syntastic/util.vim     |   4 +-
 .../syntastic/doc/syntastic.txt               |  53 +-
 .../syntastic/plugin/syntastic.vim            | 218 ++++---
 .../plugin/syntastic/autoloclist.vim          |   4 +-
 .../syntastic/plugin/syntastic/balloons.vim   |  22 +-
 .../syntastic/plugin/syntastic/checker.vim    |  37 +-
 .../syntastic/plugin/syntastic/cursor.vim     |   4 +-
 .../plugin/syntastic/highlighting.vim         |   4 +-
 .../syntastic/plugin/syntastic/loclist.vim    |  29 +-
 .../syntastic/plugin/syntastic/modemap.vim    |   2 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |  20 +-
 .../syntastic/plugin/syntastic/registry.vim   |  16 +-
 .../syntastic/plugin/syntastic/signs.vim      |   2 +-
 .../syntax_checkers/c/clang_check.vim         |  10 +-
 .../syntax_checkers/c/clang_tidy.vim          |  10 +-
 .../syntastic/syntax_checkers/c/oclint.vim    |   6 +-
 .../syntax_checkers/css/prettycss.vim         |   6 +-
 .../syntax_checkers/elixir/elixir.vim         |   2 +-
 .../syntax_checkers/haskell/scan.vim          |  10 +-
 .../syntastic/syntax_checkers/html/jshint.vim |   2 -
 .../syntastic/syntax_checkers/html/tidy.vim   |  24 +-
 .../javascript/closurecompiler.vim            |  10 +-
 .../syntax_checkers/javascript/eslint.vim     |   6 +-
 .../syntax_checkers/javascript/jscs.vim       |  10 +-
 .../syntax_checkers/javascript/jshint.vim     |   6 +-
 .../syntax_checkers/markdown/mdl.vim          |  10 +-
 .../syntax_checkers/python/prospector.vim     |  78 +++
 .../syntax_checkers/python/pylama.vim         |   6 +-
 .../syntax_checkers/python/pylint.vim         |   8 +-
 .../syntastic/syntax_checkers/r/lint.vim      |   6 +-
 .../syntax_checkers/racket/code-ayatollah.vim |   6 +-
 .../syntastic/syntax_checkers/sh/bashate.vim  |  48 ++
 .../syntastic/syntax_checkers/tex/chktex.vim  |  16 +-
 .../syntax_checkers/text/atdtool.vim          |   6 +-
 .../syntax_checkers/typescript/tsc.vim        |  10 +-
 .../syntax_checkers/typescript/tslint.vim     |  10 +-
 .../syntastic/syntax_checkers/xhtml/tidy.vim  |   4 +-
 sources_non_forked/vim-airline/README.md      |  10 +
 .../autoload/airline/extensions/eclim.vim     |  16 +-
 .../autoload/airline/extensions/tabline.vim   |   4 +-
 .../autoload/airline/themes/kalisi.vim        |  56 +-
 .../autoload/airline/themes/murmur.vim        |  88 ++-
 .../vim-commentary/plugin/commentary.vim      |   2 +-
 sources_non_forked/vim-go/.gitignore          |   1 +
 sources_non_forked/vim-go/README.md           | 269 +++++++++
 sources_non_forked/vim-go/addon-info.json     |   6 +
 sources_non_forked/vim-go/autoload/go/cmd.vim | 144 +++++
 .../vim-go/autoload/go/complete.vim           | 142 +++++
 sources_non_forked/vim-go/autoload/go/def.vim | 106 ++++
 sources_non_forked/vim-go/autoload/go/doc.vim | 159 +++++
 .../vim-go/autoload/go/errcheck.vim           |  36 ++
 sources_non_forked/vim-go/autoload/go/fmt.vim | 141 +++++
 .../vim-go/autoload/go/import.vim             | 236 ++++++++
 .../vim-go/autoload/go/lint.vim               |  30 +
 .../vim-go/autoload/go/oracle.vim             | 224 +++++++
 .../vim-go/autoload/go/package.vim            | 152 +++++
 .../vim-go/autoload/go/play.vim               |  94 +++
 .../vim-go/autoload/go/rename.vim             |  52 ++
 .../vim-go/autoload/go/tool.vim               | 181 ++++++
 sources_non_forked/vim-go/autoload/go/ui.vim  |  89 +++
 .../vim-go/autoload/webapi/json.vim           | 135 +++++
 sources_non_forked/vim-go/compiler/go.vim     |  31 +
 sources_non_forked/vim-go/doc/vim-go.txt      | 571 ++++++++++++++++++
 .../vim-go/ftdetect/gofiletype.vim            |  23 +
 sources_non_forked/vim-go/ftplugin/go.vim     |  63 ++
 .../vim-go/ftplugin/go/commands.vim           |  92 +++
 .../vim-go/ftplugin/go/snippets.vim           |  36 ++
 .../vim-go/ftplugin/go/tagbar.vim             |  55 ++
 .../vim-go/gosnippets/UltiSnips/go.snippets   | 215 +++++++
 .../vim-go/gosnippets/snippets/go.snip        | 243 ++++++++
 sources_non_forked/vim-go/indent/go.vim       |  65 ++
 sources_non_forked/vim-go/plugin/go.vim       | 134 ++++
 sources_non_forked/vim-go/scripts/test.sh     |  78 +++
 sources_non_forked/vim-go/syntax/go.vim       | 276 +++++++++
 sources_non_forked/vim-go/syntax/godoc.vim    |  47 ++
 sources_non_forked/vim-go/syntax/vimgo.vim    |  11 +
 sources_non_forked/vim-golang/README.md       |   8 -
 .../vim-snippets/UltiSnips/css.snippets       | 156 ++++-
 .../vim-snippets/UltiSnips/haskell.snippets   |   9 +-
 .../vim-snippets/UltiSnips/html.snippets      |  12 +-
 .../UltiSnips/javascript_jasmine.snippets     |  13 +
 .../vim-snippets/UltiSnips/python.snippets    |  54 +-
 .../vim-snippets/snippets/eruby.snippets      |   2 +-
 .../vim-snippets/snippets/haskell.snippets    |  10 +-
 .../vim-snippets/snippets/html.snippets       |   4 +-
 .../vim-snippets/snippets/scala.snippets      |   5 +
 .../vim-snippets/snippets/snippets.snippets   |   2 +
 update_plugins.py                             |   2 +-
 94 files changed, 5065 insertions(+), 393 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
 create mode 100644 sources_non_forked/vim-go/.gitignore
 create mode 100644 sources_non_forked/vim-go/README.md
 create mode 100644 sources_non_forked/vim-go/addon-info.json
 create mode 100644 sources_non_forked/vim-go/autoload/go/cmd.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/complete.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/def.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/doc.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/errcheck.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/fmt.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/import.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/lint.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/oracle.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/package.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/play.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/rename.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/tool.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/ui.vim
 create mode 100644 sources_non_forked/vim-go/autoload/webapi/json.vim
 create mode 100644 sources_non_forked/vim-go/compiler/go.vim
 create mode 100644 sources_non_forked/vim-go/doc/vim-go.txt
 create mode 100644 sources_non_forked/vim-go/ftdetect/gofiletype.vim
 create mode 100644 sources_non_forked/vim-go/ftplugin/go.vim
 create mode 100644 sources_non_forked/vim-go/ftplugin/go/commands.vim
 create mode 100644 sources_non_forked/vim-go/ftplugin/go/snippets.vim
 create mode 100644 sources_non_forked/vim-go/ftplugin/go/tagbar.vim
 create mode 100644 sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
 create mode 100644 sources_non_forked/vim-go/gosnippets/snippets/go.snip
 create mode 100644 sources_non_forked/vim-go/indent/go.vim
 create mode 100644 sources_non_forked/vim-go/plugin/go.vim
 create mode 100644 sources_non_forked/vim-go/scripts/test.sh
 create mode 100644 sources_non_forked/vim-go/syntax/go.vim
 create mode 100644 sources_non_forked/vim-go/syntax/godoc.vim
 create mode 100644 sources_non_forked/vim-go/syntax/vimgo.vim
 delete mode 100644 sources_non_forked/vim-golang/README.md

diff --git a/sources_non_forked/nerdtree/README.markdown b/sources_non_forked/nerdtree/README.markdown
index 9dacf682..4234b54f 100644
--- a/sources_non_forked/nerdtree/README.markdown
+++ b/sources_non_forked/nerdtree/README.markdown
@@ -87,7 +87,9 @@ A. Stick this in your vimrc
 
 __Q. How can I map a specific key or shortcut to open NERDTree?__
 
-A. Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want): `map <C-n> :NERDTreeToggle<CR>`
+A. Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want): 
+
+`map <C-n> :NERDTreeToggle<CR>`
 
 __Q. How can I close vim if the only window left open is a NERDTree?__
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index 5de1dfe2..ea6aa032 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -652,25 +652,15 @@ endfunction
 "Return: the string for this path that is suitable to be used with the :edit
 "command
 function! s:Path._strForEdit()
-    let p = escape(self.str({'format': 'UI'}), self._escChars())
-    let cwd = getcwd() . s:Path.Slash()
+    let p = escape(self.str(), self._escChars())
 
-    "return a relative path if we can
-    let isRelative = 0
-    if nerdtree#runningWindows()
-        let isRelative = stridx(tolower(p), tolower(cwd)) == 0
-    else
-        let isRelative = stridx(p, cwd) == 0
-    endif
+    "make it relative
+    let p = fnamemodify(p, ':.')
 
-    if isRelative
-        let p = strpart(p, strlen(cwd))
-
-        "handle the edge case where the file begins with a + (vim interprets
-        "the +foo in `:e +foo` as an option to :edit)
-        if p[0] == "+"
-            let p = '\' . p
-        endif
+    "handle the edge case where the file begins with a + (vim interprets
+    "the +foo in `:e +foo` as an option to :edit)
+    if p[0] == "+"
+        let p = '\' . p
     endif
 
     if p ==# ''
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
index 4e03f35e..e99a85be 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -24,7 +24,7 @@ call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callbac
 call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
 call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
 
-if has("gui_mac") || has("gui_macvim") 
+if has("gui_mac") || has("gui_macvim")
     call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
     call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
     call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
@@ -86,10 +86,11 @@ function! s:promptToRenameBuffer(bufnum, msg, newFileName)
         " 1. ensure that a new buffer is loaded
         exec "badd " . quotedFileName
         " 2. ensure that all windows which display the just deleted filename
-        " display a buffer for a new filename. 
+        " display a buffer for a new filename.
         let s:originalTabNumber = tabpagenr()
         let s:originalWindowNumber = winnr()
-        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec \":e! " . quotedFileName . "\" | endif"
+        let editStr = g:NERDTreePath.New(a:newFileName).str({'format': 'Edit'})
+        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':e! " . editStr . "' | endif"
         exec "tabnext " . s:originalTabNumber
         exec s:originalWindowNumber . "wincmd w"
         " 3. We don't need a previous buffer anymore
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 03a62f56..1f8ede1a 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -28,11 +28,11 @@
 
 ## 1\. Introduction
 
-Syntastic is a syntax checking plugin for Vim that 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.
+Syntastic is a syntax checking plugin for [Vim][13] that 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, syntax checking plugins exist for ActionScript,
 Ada, AppleScript, Arduino, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
@@ -64,16 +64,40 @@ enabled.
 
 ## 2\. Installation
 
-Installing syntastic is easy but first you need to have the [pathogen][1]
-plugin installed.  If you already have [pathogen][1] working then skip
-[Step 1](#step1) and go to [Step 2](#step2).
+<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][13] compiled with a few common
+features: `autocmd`, `eval`, `file_in_path`, `modify_fname`, `quickfix`,
+`reltime`, and `user_commands`. Not all possible combinations of features that
+include the ones above make equal sense on all operating systems, but Vim
+version 7 or later with the "normal", "big", or "huge" feature sets should be
+fine.
+
+Syntastic should work with any modern plugin managers for Vim, such as
+[NeoBundle][14], [Pathogen][1], [Vim-Addon-Manager][15], [Vim-Plug][16], or
+[Vundle][17]. Instructions for installing syntastic with [Pathogen][1] are
+included below for completeness.
+
+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
+[wiki][3] for a list of supported checkers.
+
+<a name="installpathogen"></a>
+
+### 2.2\. Installing syntastic with Pathogen
+
+If you already have [Pathogen][1] working then skip [Step 1](#step1) and go to
+[Step 2](#step2).
 
 <a name="step1"></a>
 
-### 2.1\. Step 1: Install pathogen.vim
+#### 2.2.1\. Step 1: Install pathogen.vim
 
-First I'll show you how to install Tim Pope's [pathogen][1] so that it's easy to
+First I'll show you how to install Tim Pope's [Pathogen][1] 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
@@ -87,7 +111,7 @@ execute pathogen#infect()
 
 <a name="step2"></a>
 
-### 2.2\. Step 2: Install syntastic as a pathogen bundle
+#### 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:
@@ -100,7 +124,8 @@ Quit vim and start it back up to reload it, then type:
 :Helptags
 ```
 If you get an error when you do this, then you probably didn't install
-[pathogen][1] right.  Go back to [Step 1](#step1) and make sure you did the following:
+[Pathogen][1] 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 `call pathogen#infect()` line to your `~/.vimrc` file
@@ -328,6 +353,11 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [10]: http://perldoc.perl.org/perlrun.html#*-c*
 [11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
 [12]: https://github.com/rust-lang/rust/
+[13]: http://www.vim.org/
+[14]: https://github.com/Shougo/neobundle.vim
+[15]: https://github.com/MarcWeber/vim-addon-manager
+[16]: https://github.com/junegunn/vim-plug/
+[17]: https://github.com/gmarik/Vundle.vim
 
 <!--
 vim:tw=79:sw=4:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index df72b3c7..f84eb1d2 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -120,7 +120,7 @@ function! syntastic#log#debugDump(level) " {{{2
         return
     endif
 
-    call syntastic#log#debugShowVariables( a:level, sort(keys(g:syntastic_defaults)) )
+    call syntastic#log#debugShowVariables( a:level, sort(keys(g:_SYNTASTIC_DEFAULTS)) )
 endfunction " }}}2
 
 " }}}1
@@ -155,7 +155,7 @@ function! s:_logRedirect(on) " {{{2
 endfunction " }}}2
 
 function! s:_logTimestamp() " {{{2
-    return 'syntastic: ' . split(reltimestr(reltime(g:syntastic_start)))[0] . ': '
+    return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
 endfunction " }}}2
 
 function! s:_formatVariable(name) " {{{2
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 56998d26..04c88583 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -76,6 +76,56 @@ function! syntastic#preprocess#perl(errors) " {{{2
     return syntastic#util#unique(out)
 endfunction " }}}2
 
+function! syntastic#preprocess#prospector(errors) " {{{2
+    " JSON artifacts
+    let true = 1
+    let false = 0
+    let null = ''
+
+    " A hat tip to Marc Weber for this trick
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    try
+        let errs = eval(join(a:errors, ''))
+    catch
+        let errs = {}
+    endtry
+
+    let out = []
+    if type(errs) == type({}) && has_key(errs, 'messages') && type(errs['messages']) == type([])
+        for e in errs['messages']
+            if type(e) == type({})
+                try
+                    if e['source'] ==# 'pylint'
+                        let e['location']['character'] += 1
+                    endif
+
+                    let msg =
+                        \ e['location']['path'] . ':' .
+                        \ e['location']['line'] . ':' .
+                        \ e['location']['character'] . ': ' .
+                        \ e['code'] . ' ' .
+                        \ e['message'] . ' ' .
+                        \ '[' . e['source'] . ']'
+
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker python/prospector: unknown error format')
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker python/prospector: unknown error format')
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker python/prospector: unknown error format')
+    endif
+
+    return out
+endfunction " }}}2
+
 function! syntastic#preprocess#rparse(errors) " {{{2
     let errlist = copy(a:errors)
 
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index e58b00bc..27ef34b2 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -274,7 +274,7 @@ endfunction " }}}2
 
 function! syntastic#util#dictFilter(errors, filter) " {{{2
     let rules = s:_translateFilter(a:filter)
-    " call syntastic#log#debug(g:SyntasticDebugFilters, "applying filter:", rules)
+    " call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, "applying filter:", rules)
     try
         call filter(a:errors, rules)
     catch /\m^Vim\%((\a\+)\)\=:E/
@@ -287,7 +287,7 @@ endfunction " }}}2
 " (hopefully high resolution) since program start
 " TODO: This assumes reltime() returns a list of integers.
 function! syntastic#util#stamp() " {{{2
-    return reltime(g:syntastic_start)
+    return reltime(g:_SYNTASTIC_START)
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index 42e7d5d7..b6d8dbe4 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -34,6 +34,7 @@ CONTENTS                                                  *syntastic-contents*
         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|
     6.Notes........................................|syntastic-notes|
         6.1.Handling of composite filetypes........|syntastic-composite|
         6.2.Editing files over network.............|syntastic-netrw|
@@ -44,6 +45,7 @@ CONTENTS                                                  *syntastic-contents*
         6.7.Using syntastic with the fizsh shell...|syntastic-fizsh|
         6.8.Interaction with Eclim.................|syntastic-eclim|
         6.9.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
+        6.10.Interaction with vim-auto-save........|syntastic-vim-auto-save|
     7.About........................................|syntastic-about|
     8.License......................................|syntastic-license|
 
@@ -207,7 +209,8 @@ 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.
+grouped together, and sorting within each group is decided by the variables
+|'syntastic_<filetype>_<checker>_sort'|.
 
 ------------------------------------------------------------------------------
 2.6 Filtering errors                              *syntastic-filtering-errors*
@@ -687,6 +690,25 @@ Example: >
 <
 See |syntastic_quiet_messages| for the syntax.
 
+------------------------------------------------------------------------------
+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).
+
 ==============================================================================
 6. Notes                                                     *syntastic-notes*
 
@@ -724,7 +746,7 @@ for python in syntastic (see |syntastic_mode_map|), or disable lint checks in
 
 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"
+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 |ycm_show_diagnostics_ui| to 0. E.g.: >
@@ -766,11 +788,15 @@ interactive features of 'fizsh'. Using a more traditional shell such as "zsh",
 ------------------------------------------------------------------------------
 6.8. Interaction with Eclim                                  *syntastic-eclim*
 
-As far as syntastic is concerned there shouldn't be any compatibility problems
-with the 'Eclim' Vim plugin (see http://eclim.org/). However, at the time of
-this writing there are several reports that 'Eclim' triggers a bug in Vim that
-makes syntastic forget some of its configuration parameters. No solutions or
-workarounds are known for now.
+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.
 
 ------------------------------------------------------------------------------
 6.9. Interaction with vim-virtualenv                *syntastic-vim-virtualenv*
@@ -780,6 +806,19 @@ in Python virtual environments activated by 'vim-virtualenv' (see
 https://github.com/jmcantrell/vim-virtualenv).  This is a limitation of
 'vim-virtualenv'.
 
+------------------------------------------------------------------------------
+6.10. Interaction with vim-auto-save                 *syntastic-vim-auto-save*
+
+At the time of this writing, syntastic checks in active mode are not triggered
+by 'vim-auto-save' (see https://github.com/907th/vim-auto-save). The reason is
+a limitation in 'vim-auto-save', namely a missing flag to an 'autocmd' (see
+|autocmd-nested|). Fortunately it's pretty easy to achieve a similar effect
+without 'vim-auto-save'': >
+    augroup syntastic
+        autocmd CursorHold * nested update
+    augroup END
+    set updatetime=200
+<
 ==============================================================================
 7. About                                                     *syntastic-about*
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 61b3f8b0..4a00a1f4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -15,12 +15,12 @@ endif
 let g:loaded_syntastic_plugin = 1
 
 if has('reltime')
-    let g:syntastic_start = reltime()
-    lockvar! g:syntastic_start
+    let g:_SYNTASTIC_START = reltime()
+    lockvar! g:_SYNTASTIC_START
 endif
 
-let g:syntastic_version = '3.5.0-65'
-lockvar g:syntastic_version
+let g:_SYNTASTIC_VERSION = '3.5.0-72'
+lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
 
@@ -39,24 +39,24 @@ for s:feature in [
     endif
 endfor
 
-let s:running_windows = syntastic#util#isRunningWindows()
-lockvar s:running_windows
+let s:_running_windows = syntastic#util#isRunningWindows()
+lockvar s:_running_windows
 
-if !s:running_windows && executable('uname')
+if !s:_running_windows && executable('uname')
     try
-        let s:uname = system('uname')
+        let s:_uname = system('uname')
     catch /\m^Vim\%((\a\+)\)\=:E484/
         call syntastic#log#error("your shell " . &shell . " can't handle traditional UNIX syntax for redirections")
         finish
     endtry
-    lockvar s:uname
+    lockvar s:_uname
 endif
 
 " }}}1
 
 " Defaults {{{1
 
-let g:syntastic_defaults = {
+let g:_SYNTASTIC_DEFAULTS = {
         \ 'aggregate_errors':         0,
         \ 'always_populate_loc_list': 0,
         \ 'auto_jump':                0,
@@ -71,7 +71,7 @@ let g:syntastic_defaults = {
         \ 'enable_highlighting':      1,
         \ 'enable_signs':             1,
         \ 'error_symbol':             '>>',
-        \ 'exit_checks':              !(s:running_windows && &shell =~? '\m\<cmd\.exe$'),
+        \ 'exit_checks':              !(s:_running_windows && &shell =~? '\m\<cmd\.exe$'),
         \ 'filetype_map':             {},
         \ 'full_redraws':             !(has('gui_running') || has('gui_macvim')),
         \ 'id_checkers':              1,
@@ -86,11 +86,11 @@ let g:syntastic_defaults = {
         \ 'style_warning_symbol':     'S>',
         \ 'warning_symbol':           '>>'
     \ }
-lockvar! g:syntastic_defaults
+lockvar! g:_SYNTASTIC_DEFAULTS
 
-for s:key in keys(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])
+        let g:syntastic_{s:key} = copy(g:_SYNTASTIC_DEFAULTS[s:key])
     endif
 endfor
 
@@ -110,7 +110,7 @@ endif
 
 " Debug {{{1
 
-let s:debug_dump_options = [
+let s:_DEBUG_DUMP_OPTIONS = [
         \ 'shell',
         \ 'shellcmdflag',
         \ 'shellpipe',
@@ -121,23 +121,23 @@ let s:debug_dump_options = [
         \ 'shellxquote'
     \ ]
 if v:version > 703 || (v:version == 703 && has('patch446'))
-    call add(s:debug_dump_options, 'shellxescape')
+    call add(s:_DEBUG_DUMP_OPTIONS, 'shellxescape')
 endif
-lockvar! s:debug_dump_options
+lockvar! s:_DEBUG_DUMP_OPTIONS
 
 " debug constants
-let     g:SyntasticDebugTrace         = 1
-lockvar g:SyntasticDebugTrace
-let     g:SyntasticDebugLoclist       = 2
-lockvar g:SyntasticDebugLoclist
-let     g:SyntasticDebugNotifications = 4
-lockvar g:SyntasticDebugNotifications
-let     g:SyntasticDebugAutocommands  = 8
-lockvar g:SyntasticDebugAutocommands
-let     g:SyntasticDebugVariables     = 16
-lockvar g:SyntasticDebugVariables
-let     g:SyntasticDebugCheckers      = 32
-lockvar g:SyntasticDebugCheckers
+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
 
@@ -180,10 +180,11 @@ command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
             \ call syntastic#util#redraw(g:syntastic_full_redraws)
 command! Errors call s:ShowLocList()
 command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
-            \ call s:modemap.modeInfo(<f-args>) |
-            \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>))
+            \ call s:modemap.modeInfo(<f-args>) <bar>
+            \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>)) <bar>
+            \ call s:explainSkip(<f-args>)
 command! SyntasticReset
-            \ call s:ClearCache() |
+            \ call s:ClearCache() <bar>
             \ call s:notifiers.refresh(g:SyntasticLoclist.New([]))
 command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
 
@@ -206,20 +207,20 @@ endif
 
 function! s:BufReadPostHook() " {{{2
     if g:syntastic_check_on_open
-        call syntastic#log#debug(g:SyntasticDebugAutocommands,
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
             \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
         call s:UpdateErrors(1)
     endif
 endfunction " }}}2
 
 function! s:BufWritePostHook() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     call s:UpdateErrors(1)
 endfunction " }}}2
 
 function! s:BufEnterHook() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
         \ ', &buftype = ' . string(&buftype))
     if &buftype == ''
@@ -238,7 +239,7 @@ function! s:BufEnterHook() " {{{2
 endfunction " }}}2
 
 function! s:QuitPreHook() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugAutocommands,
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
     call SyntasticLoclistHide()
@@ -250,10 +251,10 @@ endfunction " }}}2
 
 "refresh and redraw all the error info for this buf when saving or reading
 function! s:UpdateErrors(auto_invoked, ...) " {{{2
-    call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'version')
-    call syntastic#log#debugShowOptions(g:SyntasticDebugTrace, s:debug_dump_options)
-    call syntastic#log#debugDump(g:SyntasticDebugVariables)
-    call syntastic#log#debug(g:SyntasticDebugTrace, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
+    call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
+    call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS)
+    call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
         \ ': ' . (a:0 ? join(a:000) : 'default checkers'))
     if s:skipFile()
         return
@@ -277,11 +278,11 @@ function! s:UpdateErrors(auto_invoked, ...) " {{{2
 
     let w:syntastic_loclist_set = 0
     if syntastic#util#var('always_populate_loc_list') || do_jump
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist (new)')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: setloclist (new)')
         call setloclist(0, loclist.getRaw())
         let w:syntastic_loclist_set = 1
         if run_checks && do_jump && !loclist.isEmpty()
-            call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: jump')
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: jump')
             silent! lrewind
 
             " XXX: Vim doesn't call autocmd commands in a predictible
@@ -306,15 +307,15 @@ endfunction " }}}2
 
 "detect and cache all syntax errors in this buffer
 function! s:CacheErrors(checker_names) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: ' .
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: ' .
         \ (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
     call s:ClearCache()
     let newLoclist = g:SyntasticLoclist.New([])
 
     if !s:skipFile()
         " debug logging {{{3
-        call syntastic#log#debugShowVariables(g:SyntasticDebugTrace, 'aggregate_errors')
-        call syntastic#log#debug(g:SyntasticDebugTrace, 'getcwd() = ' . getcwd())
+        call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . getcwd())
         " }}}3
 
         let filetypes = s:resolveFiletypes()
@@ -332,12 +333,12 @@ function! s:CacheErrors(checker_names) " {{{2
         for checker in clist
             let cname = checker.getFiletype() . '/' . checker.getName()
             if !checker.isAvailable()
-                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: Checker ' . cname . ' is not available')
+                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:SyntasticDebugTrace, 'CacheErrors: Invoking checker: ' . cname)
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: Invoking checker: ' . cname)
 
             let loclist = checker.getLocList()
 
@@ -346,9 +347,9 @@ function! s:CacheErrors(checker_names) " {{{2
                     call loclist.decorate(cname)
                 endif
                 call add(names, cname)
-                if checker.getWantSort() && !sort_aggregated_errors
+                if checker.wantSort() && !sort_aggregated_errors
                     call loclist.sort()
-                    call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', loclist)
+                    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', loclist)
                 endif
 
                 let newLoclist = newLoclist.extend(loclist)
@@ -381,15 +382,15 @@ function! s:CacheErrors(checker_names) " {{{2
                     call syntastic#log#warn('checkers ' . join(a:checker_names, ', ') . ' are not available')
                 endif
             else
-                call syntastic#log#debug(g:SyntasticDebugTrace, 'CacheErrors: no checkers available for ' . &filetype)
+                call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: no checkers available for ' . &filetype)
             endif
         endif
         " }}}3
 
-        call syntastic#log#debug(g:SyntasticDebugLoclist, 'aggregated:', newLoclist)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'aggregated:', newLoclist)
         if sort_aggregated_errors
             call newLoclist.sort()
-            call syntastic#log#debug(g:SyntasticDebugLoclist, 'sorted:', newLoclist)
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', newLoclist)
         endif
     endif
 
@@ -428,7 +429,7 @@ endfunction " }}}2
 "   'returns' - a list of valid exit codes for the checker
 " @vimlint(EVL102, 1, l:env_save)
 function! SyntasticMake(options) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugTrace, 'SyntasticMake: called with options:', a:options)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'SyntasticMake: called with options:', a:options)
 
     " save options and locale env variables {{{3
     let old_shellredir = &shellredir
@@ -475,32 +476,42 @@ function! SyntasticMake(options) " {{{2
     endif
     " }}}3
 
-    call syntastic#log#debug(g:SyntasticDebugLoclist, 'checker output:', err_lines)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', err_lines)
 
-    if has_key(a:options, 'Preprocess')
-        let err_lines = call(a:options['Preprocess'], [err_lines])
-        call syntastic#log#debug(g:SyntasticDebugLoclist, '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:SyntasticDebugLoclist, 'preprocess:', 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
+        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')
+        catch /\m^Vim\%((\a\+)\)\=:E776/
+            " E776: No location list
+            " do nothing
+        endtry
+    else
+        let errors = []
     endif
-    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')
-    catch /\m^Vim\%((\a\+)\)\=:E776/
-        " E776: No location list
-        " do nothing
-    endtry
 
     " restore options {{{3
     let &errorformat = old_errorformat
@@ -508,16 +519,16 @@ function! SyntasticMake(options) " {{{2
     let &shellredir = old_shellredir
     " }}}3
 
-    if !s:running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
+    if !s:_running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
-    call syntastic#log#debug(g:SyntasticDebugLoclist, 'raw loclist:', errors)
-
-    if syntastic#util#var('exit_checks') && has_key(a:options, 'returns') && index(a:options['returns'], v:shell_error) == -1
+    if bailout
         throw 'Syntastic: checker error'
     endif
 
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'raw loclist:', errors)
+
     if has_key(a:options, 'defaults')
         call s:addToErrors(errors, a:options['defaults'])
     endif
@@ -531,12 +542,12 @@ function! SyntasticMake(options) " {{{2
         for rule in a:options['Postprocess']
             let errors = call(rule, [errors])
         endfor
-        call syntastic#log#debug(g:SyntasticDebugLoclist, 'postprocess (external):', errors)
+        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:SyntasticDebugLoclist, 'postprocess:', errors)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'postprocess:', errors)
     endif
 
     return errors
@@ -577,11 +588,40 @@ function! s:skipFile() " {{{2
         \ !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname) ||
         \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
-        call syntastic#log#debug(g:SyntasticDebugTrace, 'skipFile: skipping')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'skipFile: skipping')
     endif
     return skip
 endfunction " }}}2
 
+" Explain why checks will be skipped for the current file
+function! s:explainSkip(...) " {{{2
+    if !a:0 && s:skipFile()
+        let why = []
+        let fname = expand('%')
+
+        if get(b:, 'syntastic_skip_checks', 0)
+            call add(why, 'b:syntastic_skip_checks set')
+        endif
+        if &buftype != ''
+            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 s:ignoreFile(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:addToErrors(errors, options) " {{{2
     for err in a:errors
@@ -602,7 +642,7 @@ function! s:bashHack() " {{{2
     if g:syntastic_bash_hack
         if !exists('s:shell_is_bash')
             let s:shell_is_bash =
-                \ !s:running_windows &&
+                \ !s:_running_windows &&
                 \ (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD") &&
                 \ &shell =~# '\m\<bash$'
         endif
@@ -614,11 +654,11 @@ function! s:bashHack() " {{{2
 endfunction " }}}2
 
 function! s:uname() " {{{2
-    if !exists('s:uname')
-        let s:uname = system('uname')
-        lockvar s:uname
+    if !exists('s:_uname')
+        let s:_uname = system('uname')
+        lockvar s:_uname
     endif
-    return s:uname
+    return s:_uname
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
index 5362ad6a..efda8952 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
@@ -13,12 +13,12 @@ function! g:SyntasticAutoloclistNotifier.New() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticAutoloclistNotifier.refresh(loclist) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: refresh')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: refresh')
     call g:SyntasticAutoloclistNotifier.AutoToggle(a:loclist)
 endfunction " }}}2
 
 function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'autoloclist: toggle')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: toggle')
     if !a:loclist.isEmpty()
         if syntastic#util#var('auto_loc_list') == 1
             call a:loclist.show()
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index 6bf6edb9..b4f491ca 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -22,20 +22,11 @@ endfunction " }}}2
 
 " Update the error balloons
 function! g:SyntasticBalloonsNotifier.refresh(loclist) " {{{2
-    let b:syntastic_balloons = {}
+    unlet! b:syntastic_balloons
     if self.enabled() && !a:loclist.isEmpty()
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: refresh')
-        let buf = bufnr('')
-        let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
-        if !empty(issues)
-            for i in issues
-                if has_key(b:syntastic_balloons, i['lnum'])
-                    let b:syntastic_balloons[i['lnum']] .= "\n" . i['text']
-                else
-                    let b:syntastic_balloons[i['lnum']] = i['text']
-                endif
-            endfor
-            set beval bexpr=SyntasticBalloonsExprNotifier()
+        let b:syntastic_balloons = a:loclist.balloons()
+        if !empty(b:syntastic_balloons)
+            set ballooneval balloonexpr=SyntasticBalloonsExprNotifier()
         endif
     endif
 endfunction " }}}2
@@ -45,8 +36,9 @@ endfunction " }}}2
 function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
     let b:syntastic_balloons = {}
     if has('balloon_eval')
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'balloons: reset')
-        set nobeval
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'balloons: reset')
+        unlet! b:syntastic_balloons
+        set noballooneval
     endif
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 8bc5e255..740b8d2a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -13,11 +13,14 @@ function! g:SyntasticChecker.New(args) " {{{2
     let newObj._filetype = a:args['filetype']
     let newObj._name = a:args['name']
     let newObj._exec = get(a:args, 'exec', newObj._name)
-    let newObj._sort = 0
 
     if has_key(a:args, 'redirect')
         let [filetype, name] = split(a:args['redirect'], '/')
         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
     else
         let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
     endif
@@ -59,13 +62,13 @@ function! g:SyntasticChecker.getLocListRaw() " {{{2
     let name = self._filetype . '/' . self._name
     try
         let list = self._locListFunc()
-        call syntastic#log#debug(g:SyntasticDebugTrace, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
     catch /\m\C^Syntastic: checker error$/
         let list = []
         call syntastic#log#error('checker ' . name . ' returned abnormal status ' . v:shell_error)
     endtry
     call self._populateHighlightRegexes(list)
-    call syntastic#log#debug(g:SyntasticDebugLoclist, name . ' raw:', list)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, name . ' raw:', list)
     call self._quietMessages(list)
     return list
 endfunction " }}}2
@@ -74,20 +77,12 @@ function! g:SyntasticChecker.getLocList() " {{{2
     return g:SyntasticLoclist.New(self.getLocListRaw())
 endfunction " }}}2
 
-function! g:SyntasticChecker.getWantSort() " {{{2
-    return self._sort
-endfunction " }}}2
-
-function! g:SyntasticChecker.setWantSort(val) " {{{2
-    let self._sort = a:val
-endfunction " }}}2
-
 function! g:SyntasticChecker.log(msg, ...) " {{{2
     let leader = self._filetype . '/' . self._name . ': '
     if a:0 > 0
-        call syntastic#log#debug(g:SyntasticDebugCheckers, leader . a:msg, a:1)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg, a:1)
     else
-        call syntastic#log#debug(g:SyntasticDebugCheckers, leader . a:msg)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg)
     endif
 endfunction " }}}2
 
@@ -111,6 +106,18 @@ function! g:SyntasticChecker.isAvailable() " {{{2
     return self._available
 endfunction " }}}2
 
+function! g:SyntasticChecker.wantSort() " {{{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) " {{{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
@@ -132,11 +139,11 @@ function! g:SyntasticChecker._quietMessages(errors) " {{{2
         call syntastic#log#warn('ignoring invalid syntastic_' . name . '_quiet_messages')
     endtry
 
-    call syntastic#log#debug(g:SyntasticDebugLoclist, 'quiet_messages filter:', quiet_filters)
+    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:SyntasticDebugLoclist, 'filtered by quiet_messages:', a:errors)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'filtered by quiet_messages:', a:errors)
     endif
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index d8410ab1..629cf2d6 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -18,7 +18,7 @@ endfunction " }}}2
 
 function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
     if self.enabled() && !a:loclist.isEmpty()
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: refresh')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: refresh')
         let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
         let b:syntastic_line = -1
         let b:syntastic_cursor_columns = a:loclist.getCursorColumns()
@@ -29,7 +29,7 @@ endfunction " }}}2
 
 " @vimlint(EVL103, 1, a:loclist)
 function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'cursor: reset')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: reset')
     autocmd! syntastic CursorMoved
     unlet! b:syntastic_messages
     let b:syntastic_line = -1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index afb6614a..0f027b17 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -32,7 +32,7 @@ endfunction " }}}2
 " Sets error highlights in the cuirrent window
 function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
     if self.enabled()
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: refresh')
+        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')
@@ -63,7 +63,7 @@ endfunction " }}}2
 " @vimlint(EVL103, 1, a:loclist)
 function! g:SyntasticHighlightingNotifier.reset(loclist) " {{{2
     if s:has_highlighting
-        call syntastic#log#debug(g:SyntasticDebugNotifications, 'highlighting: reset')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: reset')
         call self._reset()
     endif
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index 19a61984..fb7cefb7 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -173,6 +173,29 @@ function! g:SyntasticLoclist.decorate(tag) " {{{2
     endfor
 endfunction " }}}2
 
+function! g:SyntasticLoclist.balloons() " {{{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() " {{{2
     if !exists("self._cachedErrors")
         let self._cachedErrors = self.filter({'type': "E"})
@@ -258,14 +281,14 @@ function! g:SyntasticLoclist.setloclist() " {{{2
         let w:syntastic_loclist_set = 0
     endif
     let replace = g:syntastic_reuse_loc_lists && w:syntastic_loclist_set
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
     call setloclist(0, self.getRaw(), replace ? 'r' : ' ')
     let w:syntastic_loclist_set = 1
 endfunction " }}}2
 
 "display the cached errors for this buf in the location list
 function! g:SyntasticLoclist.show() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: show')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: show')
     call self.setloclist()
 
     if !self.isEmpty()
@@ -300,7 +323,7 @@ endfunction " }}}2
 " Non-method functions {{{1
 
 function! SyntasticLoclistHide() " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'loclist: hide')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
     silent! lclose
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index dd131bcb..6dd9490d 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -63,7 +63,7 @@ function! g:SyntasticModeMap.echoMode() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticModeMap.modeInfo(...) " {{{2
-    echomsg 'Syntastic version: ' . g:syntastic_version
+    echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION
     let type = a:0 ? a:1 : &filetype
     echomsg 'Info for filetype: ' . type
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 49948b1d..11b72c6a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -5,11 +5,11 @@ let g:loaded_syntastic_notifiers = 1
 
 let g:SyntasticNotifiers = {}
 
-let s:notifier_types = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
-lockvar! s:notifier_types
+let s:_NOTIFIER_TYPES = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
+lockvar! s:_NOTIFIER_TYPES
 
-let s:persistent_notifiers = ['signs', 'balloons']
-lockvar! s:persistent_notifiers
+let s:_PERSISTENT_NOTIFIERS = ['signs', 'balloons']
+lockvar! s:_PERSISTENT_NOTIFIERS
 
 " Public methods {{{1
 
@@ -28,11 +28,11 @@ function! g:SyntasticNotifiers.refresh(loclist) " {{{2
         return
     endif
 
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'notifiers: refresh')
+    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
+            if index(s:_PERSISTENT_NOTIFIERS, type) > -1
                 " refresh only if loclist has changed since last call
                 if !exists('b:syntastic_' . type . '_stamp')
                     let b:syntastic_{type}_stamp = []
@@ -49,7 +49,7 @@ function! g:SyntasticNotifiers.refresh(loclist) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticNotifiers.reset(loclist) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'notifiers: reset')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'notifiers: reset')
     for type in self._enabled_types
         let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
 
@@ -61,7 +61,7 @@ function! g:SyntasticNotifiers.reset(loclist) " {{{2
         endif
 
         " also reset stamps
-        if index(s:persistent_notifiers, type) > -1
+        if index(s:_PERSISTENT_NOTIFIERS, type) > -1
             let b:syntastic_{type}_stamp = []
         endif
     endfor
@@ -73,12 +73,12 @@ endfunction " }}}2
 
 function! g:SyntasticNotifiers._initNotifiers() " {{{2
     let self._notifier = {}
-    for type in s:notifier_types
+    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)
+    let self._enabled_types = copy(s:_NOTIFIER_TYPES)
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 7f130211..8f50f8af 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -5,7 +5,7 @@ let g:loaded_syntastic_registry = 1
 
 " Initialisation {{{1
 
-let s:defaultCheckers = {
+let s:_DEFAULT_CHECKERS = {
         \ 'actionscript':['mxmlc'],
         \ 'ada':         ['gcc'],
         \ 'applescript': ['osacompile'],
@@ -94,9 +94,9 @@ let s:defaultCheckers = {
         \ 'zpt':         ['zptlint'],
         \ 'zsh':         ['zsh', 'shellcheck']
     \ }
-lockvar! s:defaultCheckers
+lockvar! s:_DEFAULT_CHECKERS
 
-let s:defaultFiletypeMap = {
+let s:_DEFAULT_FILETYPE_MAP = {
         \ 'gentoo-metadata': 'xml',
         \ 'groff': 'nroff',
         \ 'lhaskell': 'haskell',
@@ -106,7 +106,7 @@ let s:defaultFiletypeMap = {
         \ 'sgml': 'docbk',
         \ 'sgmllnx': 'docbk',
     \ }
-lockvar! s:defaultFiletypeMap
+lockvar! s:_DEFAULT_FILETYPE_MAP
 
 let g:SyntasticRegistry = {}
 
@@ -152,7 +152,7 @@ function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) " {{{2
         \ !empty(a:hints_list) ? syntastic#util#unique(a:hints_list) :
         \ exists('b:syntastic_checkers') ? b:syntastic_checkers :
         \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
-        \ get(s:defaultCheckers, ft, 0)
+        \ get(s:_DEFAULT_CHECKERS, ft, 0)
 
     return type(names) == type([]) ?
         \ self._filterCheckersByName(checkers_map, names) : [checkers_map[keys(checkers_map)[0]]]
@@ -165,9 +165,9 @@ function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
-    let types = keys(s:defaultCheckers)
+    let types = keys(s:_DEFAULT_CHECKERS)
 
-    call extend(types, keys(s:defaultFiletypeMap))
+    call extend(types, keys(s:_DEFAULT_FILETYPE_MAP))
 
     if exists('g:syntastic_filetype_map')
         call extend(types, keys(g:syntastic_filetype_map))
@@ -262,7 +262,7 @@ endfunction " }}}2
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
 function! s:_normaliseFiletype(ftalias) " {{{2
-    let ft = get(s:defaultFiletypeMap, a:ftalias, a:ftalias)
+    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
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index e2f4b5de..9d169490 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -36,7 +36,7 @@ function! g:SyntasticSignsNotifier.enabled() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticSignsNotifier.refresh(loclist) " {{{2
-    call syntastic#log#debug(g:SyntasticDebugNotifications, 'signs: refresh')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'signs: refresh')
     let old_signs = copy(self._bufSignIds())
     if self.enabled()
         call self._signErrors(a:loclist)
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
index cc973b07..6ef9096c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -18,6 +18,10 @@ 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
 
@@ -39,15 +43,11 @@ function! SyntaxCheckers_c_clang_check_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
index 101de812..3514b55b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -18,6 +18,10 @@ 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
 
@@ -39,15 +43,11 @@ function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
index cb896914..51f09b29 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -25,6 +25,10 @@ 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
 
@@ -55,8 +59,6 @@ function! SyntaxCheckers_c_oclint_GetLocList() dict
         let e['text'] = substitute(e['text'], '\m\C P[1-3] ', ': ', '')
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
index 06fd7e46..ee382dbd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -20,6 +20,10 @@ if exists("g:loaded_syntastic_css_prettycss_checker")
 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
 
@@ -49,8 +53,6 @@ function! SyntaxCheckers_css_prettycss_GetLocList() dict
         let e["text"] .= ')'
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index 79052700..c834b51e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -20,7 +20,7 @@ set cpo&vim
 
 " TODO: we should probably split this into separate checkers
 function! SyntaxCheckers_elixir_elixir_IsAvailable() dict
-    call self.log(g:SyntasticDebugCheckers,
+    call self.log(
         \ 'executable("elixir") = ' . executable('elixir') . ', ' .
         \ 'executable("mix") = ' . executable('mix'))
     return executable('elixir') && executable('mix')
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
index ed74a004..e2f4a13d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
@@ -15,6 +15,10 @@ if exists('g:loaded_syntastic_haskell_scan_checker')
 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
 
@@ -23,14 +27,10 @@ function! SyntaxCheckers_haskell_scan_GetLocList() dict
 
     let errorformat = '%f:%l:%v: %m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style' })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index dc236387..30c89b2f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -37,8 +37,6 @@ function! SyntaxCheckers_html_jshint_GetLocList() dict
 
     let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
 
-    call self.setWantSort(1)
-
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 8a178996..9070bfae 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -55,7 +55,7 @@ set cpo&vim
 
 " TODO: join this with xhtml.vim for DRY's sake?
 function! s:TidyEncOptByFenc()
-    let tidy_opts = {
+    let TIDY_OPTS = {
             \ 'utf-8':        '-utf8',
             \ 'ascii':        '-ascii',
             \ 'latin1':       '-latin1',
@@ -69,10 +69,10 @@ function! s:TidyEncOptByFenc()
             \ 'sjis':         '-shiftjis',
             \ 'cp850':        '-ibm858',
         \ }
-    return get(tidy_opts, &fileencoding, '-utf8')
+    return get(TIDY_OPTS, &fileencoding, '-utf8')
 endfunction
 
-let s:ignore_errors = [
+let s:IGNORE_ERRORS = [
         \ "<table> lacks \"summary\" attribute",
         \ "not approved by W3C",
         \ "<input> proprietary attribute \"placeholder\"",
@@ -123,9 +123,9 @@ let s:ignore_errors = [
         \ "proprietary attribute \"aria-valuenow\"",
         \ "proprietary attribute \"aria-valuetext\""
     \ ]
-lockvar! s:ignore_errors
+lockvar! s:IGNORE_ERRORS
 
-let s:blocklevel_tags = [
+let s:BLOCKLEVEL_TAGS = [
         \ "main",
         \ "section",
         \ "article",
@@ -136,9 +136,9 @@ let s:blocklevel_tags = [
         \ "figure",
         \ "figcaption"
     \ ]
-lockvar! s:blocklevel_tags
+lockvar! s:BLOCKLEVEL_TAGS
 
-let s:inline_tags = [
+let s:INLINE_TAGS = [
         \ "video",
         \ "audio",
         \ "source",
@@ -155,16 +155,16 @@ let s:inline_tags = [
         \ "details",
         \ "datalist"
     \ ]
-lockvar! s:inline_tags
+lockvar! s:INLINE_TAGS
 
-let s:empty_tags = [
+let s:EMPTY_TAGS = [
         \ "wbr",
         \ "keygen"
     \ ]
-lockvar! s:empty_tags
+lockvar! s:EMPTY_TAGS
 
 function! s:IgnoreError(text)
-    for item in s:ignore_errors + g:syntastic_html_tidy_ignore_errors
+    for item in s:IGNORE_ERRORS + g:syntastic_html_tidy_ignore_errors
         if stridx(a:text, item) != -1
             return 1
         endif
@@ -173,7 +173,7 @@ function! s:IgnoreError(text)
 endfunction
 
 function! s:NewTags(name)
-    return syntastic#util#shescape(join( s:{a:name} + g:syntastic_html_tidy_{a:name}, ',' ))
+    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
 endfunction
 
 function! s:Args()
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
index a4d8edd0..6a45fb89 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -24,6 +24,11 @@ function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
         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)
 
@@ -45,14 +50,13 @@ function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': ['-jar', expand(g:syntastic_javascript_closurecompiler_path)],
+        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path)]),
         \ 'args_after': '--js',
         \ 'fname': file_list })
 
     let errorformat =
         \ '%-GOK,'.
         \ '%E%f:%l: ERROR - %m,'.
-        \ '%Z%p^,'.
         \ '%W%f:%l: WARNING - %m,'.
         \ '%Z%p^'
 
@@ -64,7 +68,7 @@ endfunction
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'javascript',
     \ 'name': 'closurecompiler',
-    \ 'exec': 'java'})
+    \ 'exec': get(g:, 'syntastic_javascript_closurecompiler_script', 'java')})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index e848c4a0..acb91898 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -14,6 +14,10 @@ if exists('g:loaded_syntastic_javascript_eslint_checker')
 endif
 let g:loaded_syntastic_javascript_eslint_checker = 1
 
+if !exists('g:syntastic_javascript_eslint_sort')
+    let g:syntastic_javascript_eslint_sort = 1
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -47,8 +51,6 @@ function! SyntaxCheckers_javascript_eslint_GetLocList() dict
         let e['col'] += 1
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index c5017522..b1d3b754 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -14,6 +14,10 @@ if exists("g:loaded_syntastic_javascript_jscs_checker")
 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
 
@@ -22,16 +26,12 @@ function! SyntaxCheckers_javascript_jscs_GetLocList() dict
 
     let errorformat = '%f:%t:%l:%c:%m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
         \ 'preprocess': 'checkstyle',
         \ 'returns': [0, 2] })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index 96bba9f8..f0dc59fe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -14,6 +14,10 @@ if exists('g:loaded_syntastic_javascript_jshint_checker')
 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
 
@@ -43,8 +47,6 @@ function! SyntaxCheckers_javascript_jshint_GetLocList() dict
         \ '%A%f: line %l\, col %v\, %m \(%t%*\d\)' :
         \ '%E%f: line %l\, col %v\, %m'
 
-    call self.setWantSort(1)
-
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
diff --git a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
index c18314a5..781a5e38 100644
--- a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
@@ -15,6 +15,10 @@ if exists("g:loaded_syntastic_markdown_mdl_checker")
 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
 
@@ -25,14 +29,10 @@ function! SyntaxCheckers_markdown_mdl_GetLocList() dict
         \ '%E%f:%l: %m,'.
         \ '%W%f: Kramdown Warning: %m found on line %l'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style' })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
new file mode 100644
index 00000000..ea987f97
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
@@ -0,0 +1,78 @@
+"============================================================================
+"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
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [0, 7])
+endfunction
+
+function! SyntaxCheckers_python_prospector_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '--external-config merge',
+        \ '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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index 01c0ab62..b0352b2e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -15,6 +15,10 @@ if exists('g:loaded_syntastic_python_pylama_checker')
 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
 
@@ -55,8 +59,6 @@ function! SyntaxCheckers_python_pylama_GetLocList() dict
         endif
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 8e803a38..25a60e9d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -10,11 +10,15 @@ if exists("g:loaded_syntastic_python_pylint_checker")
 endif
 let g:loaded_syntastic_python_pylint_checker = 1
 
-let s:pylint_new = -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
     if !executable(self.getExec())
         return 0
@@ -81,8 +85,6 @@ function! SyntaxCheckers_python_pylint_GetLocList() dict
         let e['vcol'] = 0
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index 9112905b..792305f3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -19,6 +19,10 @@ 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
 
@@ -65,8 +69,6 @@ function! SyntaxCheckers_r_lint_GetLocList() dict
         endif
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
index ffb02f7b..f76c321c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -19,6 +19,10 @@ 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
 
@@ -44,8 +48,6 @@ function! SyntaxCheckers_racket_code_ayatollah_GetLocList() dict
         let e['col'] += 1
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim b/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
new file mode 100644
index 00000000..73b0dcba
--- /dev/null
+++ b/sources_non_forked/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: 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 et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
index aa6ceb34..7d4c90a2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -15,13 +15,17 @@ if exists('g:loaded_syntastic_tex_chktex_checker')
 endif
 let g:loaded_syntastic_tex_chktex_checker = 1
 
-let s:save_cpo = &cpo
-set cpo&vim
-
 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' })
 
@@ -32,14 +36,10 @@ function! SyntaxCheckers_tex_chktex_GetLocList() dict
         \ '%Z%p^,' .
         \ '%-G%.%#'
 
-    let loclist =  SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style' })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
index 48c65f9e..f092b4bb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -15,6 +15,10 @@ if exists("g:loaded_syntastic_text_atdtool_checker")
 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
 
@@ -44,8 +48,6 @@ function! SyntaxCheckers_text_atdtool_GetLocList() dict
         let e['text'] = substitute(e['text'], '\m\n\s\+', ' | ', 'g')
     endfor
 
-    call self.setWantSort(1)
-
     return loclist
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
index d2e7349d..521a5314 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -9,6 +9,10 @@ if exists("g:loaded_syntastic_typescript_tsc_checker")
 endif
 let g:loaded_syntastic_typescript_tsc_checker = 1
 
+if !exists('g:syntastic_typescript_tsc_sort')
+    let g:syntastic_typescript_tsc_sort = 1
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -23,14 +27,10 @@ function! SyntaxCheckers_typescript_tsc_GetLocList() dict
         \ '%Eerror %m,' .
         \ '%C%\s%\+%m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr("")} })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
index 80ca8817..eeeb8b4c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
@@ -9,6 +9,10 @@ if exists("g:loaded_syntastic_typescript_tslint_checker")
 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
 
@@ -25,15 +29,11 @@ function! SyntaxCheckers_typescript_tslint_GetLocList() dict
     " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
     let errorformat = '%f[%l\, %c]: %m'
 
-    let loclist = SyntasticMake({
+    return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'preprocess': 'tslint',
         \ 'returns': [0, 2] })
-
-    call self.setWantSort(1)
-
-    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
index 5c3e6330..1eed9209 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -29,7 +29,7 @@ set cpo&vim
 
 " TODO: join this with html.vim DRY's sake?
 function! s:TidyEncOptByFenc()
-    let tidy_opts = {
+    let TIDY_OPTS = {
             \ 'utf-8':        '-utf8',
             \ 'ascii':        '-ascii',
             \ 'latin1':       '-latin1',
@@ -43,7 +43,7 @@ function! s:TidyEncOptByFenc()
             \ 'sjis':         '-shiftjis',
             \ 'cp850':        '-ibm858',
         \ }
-    return get(tidy_opts, &fileencoding, '-utf8')
+    return get(TIDY_OPTS, &fileencoding, '-utf8')
 endfunction
 
 function! s:IgnoreError(text)
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index 0b4ac57f..eaf1a47e 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -144,6 +144,16 @@ Finally, you can add the convenience variable `let g:airline_powerline_fonts = 1
 
 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.
+
 # Screenshots
 
 A full list of screenshots for various themes can be found in the [Wiki][14].
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
index 18cbae5e..e2f6531f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -20,12 +20,24 @@ function! airline#extensions#eclim#get_warnings()
 
   if !empty(eclimList)
     " Remove any non-eclim signs (see eclim#display#signs#Update)
-      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\|info\\|warning\\)$"')
+    " 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: line:".string(errorsLine)." (".string(errorsNumber).")]"
+      let errors = "[Eclim:" . type . " line:".string(errorsLine)." (".string(errorsNumber).")]"
       if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
         return errors.(g:airline_symbols.space)
       endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 955f3db1..e0111a59 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -17,8 +17,8 @@ let s:builder_context = {
       \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
       \ }
 if get(g:, 'airline_powerline_fonts', 0)
-  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , "\ue0b0")
-  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , "\ue0b1")
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
 else
   let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
   let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
index 82c70712..78504fab 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/kalisi.vim
@@ -2,26 +2,19 @@
 " Colorscheme: Kalisi for airline. Inspired by powerline.
 " Arthur Jaron
 " hifreeo@gmail.com
-" 30.07.2014 
+" 24.10.2014 
  
-
-" Insert mode                                    
-let s:I1 = [ '#ffffff' , '#e80000','','']
-let s:I2 = [ '#c5c5c5' , '#901010','','']
-let s:I3 = [ '#c5c5c5' , '#500000','','']
-
 " Visual mode                                   
-let s:V1 = [ '#2a5d8e' , '#ffffff','','']
-let s:V2 = [ '#87e7ff' , '#4077df','','']
-let s:V3 = [ '#87e7ff' , '#2a5d8e','','']
+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 = [ '#6e00ba' , '#ffffff','','']
-let s:R2 = [ '#6e00ba' , '#d358ff','','']
-let s:R3 = [ '#ce99ff' , '#6e00ba','','']
+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 = {}
-let g:airline#themes#kalisi#palette.accents = {'red': ['#FF0000', '', 88, '']}
 
 
 function! airline#themes#kalisi#refresh()
@@ -29,35 +22,37 @@ function! airline#themes#kalisi#refresh()
   let s:StatusLine = airline#themes#get_highlight('StatusLine')
   let s:StatusLineNC = airline#themes#get_highlight('StatusLineNC')
 
-  " Normal mode
-  let s:N1 = [ '#005f00' , '#afd700','',''] 
-  let s:N2 = [ '#afd700' , '#005f00','',''] 
-  let s:N3 = s:StatusLine
+  " 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':  ['#A6DB29', '#005f00','',''],
-        \ 'airline_tabsel':  ['#404042', '#A6DB29','',''],
-        \ 'airline_tabtype':  ['#afd700', '#204d20','',''],
-        \ 'airline_tabfill':  s:StatusLine,
-        \ 'airline_tabhid':  ['#c5c5c5', '#404042','',''],
-        \ 'airline_tabmod':  ['#ffffff', '#F1266F','','']
+        \ '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']
         \ }
 
-        " \ 'airline_tabfill':  ['#ffffff', '#2b2b2b','',''],
-        
   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 = [ '#c5c5c5' , '#505052' , 239 , 234 , '' ]
   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 = {
-        \ 'statusline': [ '#F1266F' , '' , '53' , '' , '' ] ,
+        \ 'airline_c':  ['#d7ff00', s:IA[1],'190',s:IA[3]],
         \ }
 
 endfunction
@@ -68,7 +63,8 @@ if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
 let g:airline#themes#kalisi#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ s:StatusLineNC,
       \ s:StatusLine,
-      \ [ '#005f00' , '#afd700' , '','', ''] )
+      \ ['#afd700', '#005f00','148','22'],
+      \ [ '#005f00' , '#afd700' , '22','148']
+      \)
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim b/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
index adebf3bd..08e47572 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/murmur.vim
@@ -1,39 +1,75 @@
 let g:airline#themes#murmur#palette = {}
 
-let s:termbg = 237  " Background for branch and file format blocks
-let s:termbg2= 234  " Background for middle block
-let s:normalbg= 27  " Background for normal mode and file position blocks
-let s:insertbg= 70  " Background for insert mode and file position blocks
-let s:visualbg= 166 " Background for visual mode and file position blocks
-let s:replacebg=88  " Background for replace mode and file position blocks
-let s:alert= 88     " Modefied file alert color
+" 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:BB = ['#AFAF87', '#5F5F5F', 144, s:termbg] " Branch and file format blocks
+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:N1 = ['#FFFFFF', '#5F87FF', 15, s:normalbg]   " Outside blocks in normal mode
-let s:N2 = ['#AFAF87', '#5F5F5F', 39, s:termbg2]    " Middle block
+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': ['#ffffff', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+let g:airline#themes#murmur#palette.normal_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
 
-let s:I1 = ['#FFFFFF', '#87AF5F', 15, s:insertbg]         " Outside blocks in insert mode
-let s:I2 = ['#AFAF87', '#5F5F5F', s:insertbg, s:termbg2]  " Middle block
+" 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': ['#AFAF87', '#5F5F5F', s:alert, s:termbg2, 'bold'] ,}
+let g:airline#themes#murmur#palette.insert_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
 
-let s:R1 = ['#FFFFFF', '#870000', 15, s:replacebg]  " Outside blocks in replace mode
-let s:R2 = ['#AFAF87', '#5F5F5F', 255, s:termbg2]   " Middle block
+" 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': ['#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+let g:airline#themes#murmur#palette.replace_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
 
-let s:V1 = ['#FFFFFF', '#AF5F00', 15, s:visualbg]         " Outside blocks in visual mode
-let s:V2 = ['#AFAF87', '#5F5F5F', s:visualbg, s:termbg2]  " Middle block
+" 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': [ '#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+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 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
-let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
-let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+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
@@ -41,6 +77,6 @@ if !get(g:, 'loaded_ctrlp', 0)
   finish
 endif
 let g:airline#themes#murmur#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ ['#FFFFFF', '#5F87FF', 15, s:normalbg, ''],
-      \ ['#AFAF87', '#5F5F5F', 144, s:termbg, ''],
-      \ ['#AFAF87', '#5F5F5F', 39, s:termbg2, 'bold'])
+      \ [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/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index cce7b8ac..9da6a304 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -81,7 +81,7 @@ nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
 nmap <silent> <Plug>CommentaryUndo <Plug>Commentary<Plug>Commentary
 command! -range -bar Commentary call s:go(<line1>,<line2>)
 
-if 1 || !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
+if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
   xmap gc  <Plug>Commentary
   nmap gc  <Plug>Commentary
   omap gc  <Plug>Commentary
diff --git a/sources_non_forked/vim-go/.gitignore b/sources_non_forked/vim-go/.gitignore
new file mode 100644
index 00000000..926ccaaf
--- /dev/null
+++ b/sources_non_forked/vim-go/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
new file mode 100644
index 00000000..78b0ab5f
--- /dev/null
+++ b/sources_non_forked/vim-go/README.md
@@ -0,0 +1,269 @@
+# vim-go
+
+Go (golang) support for Vim. It comes with pre-defined sensible settings (like
+auto gofmt on save), has autocomplete, snippet support, improved syntax
+highlighting, go toolchain commands, etc...  If needed vim-go installs all
+necessary binaries for providing seamless Vim integration with current
+commands. It's highly customizable and each individual feature can be
+disabled/enabled easily.
+
+![vim-go](https://dl.dropboxusercontent.com/u/174404/vim-go-2.png)
+
+## Features
+
+* Improved Syntax highlighting, such as Functions, Operators, Methods..
+* Auto completion support via `gocode`
+* Better `gofmt` on save, keeps cursor position and doesn't break your undo
+  history
+* Go to symbol/declaration with `godef`
+* Look up documentation with `godoc` inside Vim or open it in browser.
+* Automatically import packages via `goimports`
+* Compile and `go build` your package, install it with `go install`
+* `go run` quickly your current file/files
+* Run `go test` and see any errors in quickfix window
+* Create a coverage profile and display annotated source code in browser to see
+  which functions are covered.
+* Lint your code with `golint`
+* Run your code through `go vet` to catch static errors.
+* Advanced source analysis tool with `oracle`
+* Precise type-safe renaming of identifiers with `gorename`
+* List all source files and dependencies
+* Checking with `errcheck` for unchecked errors.
+* Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
+* Share your current code to [play.golang.org](http://play.golang.org)
+* On-the-fly type information about the word under the cursor
+* Tagbar support to show tags of the source code in a sidebar with `gotags`
+
+## Install
+
+First of all, do not use it with other Go plugins. If you use pathogen, just
+clone it into your bundle directory:
+
+```bash
+$ cd ~/.vim/bundle
+$ git clone https://github.com/fatih/vim-go.git
+```
+
+For Vundle add this line to your vimrc:
+
+```vimrc
+Plugin 'fatih/vim-go'
+```
+and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
+
+Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
+`goimports`, etc..). You can easily install them with the included
+`:GoInstallBinaries`. Those binaries will be automatically downloaded and
+installed to your `$GOBIN` environment (if not set it will use `$GOPATH/bin`).
+It requires `git` and `hg` for fetching the individual Go packages.
+
+### Optional
+
+* Autocompletion is enabled by default via `<C-x><C-o>`, to get real-time
+completion (completion by type) install:
+[YCM](https://github.com/Valloric/YouCompleteMe) or
+[neocomplete](https://github.com/Shougo/neocomplete.vim).
+* To get displayed source code tag informations on a sidebar install
+[tagbar](https://github.com/majutsushi/tagbar).
+* For snippet feature install:
+[ultisnips](https://github.com/SirVer/ultisnips) or
+[neosnippet](https://github.com/Shougo/neosnippet.vim).
+* Screenshot color scheme is a slightly modified molokai: [fatih/molokai](https://github.com/fatih/molokai).
+
+## Usage
+
+All [features](#features) are enabled by default. There are no additional
+settings needed.  Usage and commands are listed in `doc/vim-go.txt`. Just open
+the help page to see all commands:
+
+    :help vim-go
+
+
+## Mappings
+
+vim-go has several `<Plug>` mappings which can be used to create custom
+mappings. Below are some examples you might find useful:
+
+Show a list of interfaces which is implemented by the type under your cursor
+with `<leader>s` 
+
+```vim
+au FileType go nmap <Leader>s <Plug>(go-implements)
+```
+
+Show type info for the word under your cursor with `<leader>i` (useful if you
+have disabled auto showing type info via `g:go_auto_type_info`)
+
+```vim
+au FileType go nmap <Leader>i <Plug>(go-info)
+```
+
+Open the relevant Godoc for the word under the cursor with `<leader>gd` or open
+it vertically with `<leader>gv`
+
+```vim
+au FileType go nmap <Leader>gd <Plug>(go-doc)
+au FileType go nmap <Leader>gv <Plug>(go-doc-vertical)
+```
+
+Or open the Godoc in browser
+
+```vim
+au FileType go nmap <Leader>gb <Plug>(go-doc-browser)
+```
+
+Run commands, such as  `go run` with `<leader>r` for the current file or `go
+build` and `go test` for the current package with `<leader>b` and `<leader>t`.
+Display a beautiful annotated source code to see which functions are covered
+with `<leader>c`.
+
+```vim
+au FileType go nmap <leader>r <Plug>(go-run)
+au FileType go nmap <leader>b <Plug>(go-build)
+au FileType go nmap <leader>t <Plug>(go-test)
+au FileType go nmap <leader>c <Plug>(go-coverage)
+```
+
+By default the mapping `gd` is enabled which opens the target identifier in
+current buffer. You can also open the definition/declaration in a new vertical,
+horizontal or tab for the word under your cursor:
+
+```vim
+au FileType go nmap <Leader>ds <Plug>(go-def-split)
+au FileType go nmap <Leader>dv <Plug>(go-def-vertical)
+au FileType go nmap <Leader>dt <Plug>(go-def-tab)
+```
+
+Rename the identifier under the cursor to a new name
+
+```vim
+au FileType go nmap <Leader>e <Plug>(go-rename)
+```
+
+More `<Plug>` mappings can be seen with `:he go-mappings`. Also these are just
+recommendations, you are free to create more advanced mappings or functions
+based on `:he go-commands`.
+
+## Settings
+Below are some settings you might find useful. For the full list see `:he go-settings`.
+
+Disable opening browser after posting to your snippet to `play.golang.org`:
+
+```vim
+let g:go_play_open_browser = 0
+```
+
+By default vim-go shows errors for the fmt command, to disable it:
+
+```vim
+let g:go_fmt_fail_silently = 1
+```
+
+Enable goimports to automatically insert import paths instead of gofmt:
+
+```vim
+let g:go_fmt_command = "goimports"
+```
+
+Disable auto fmt on save:
+
+```vim
+let g:go_fmt_autosave = 0
+```
+
+By default binaries are installed to `$GOBIN` or `$GOPATH/bin`. To change it:
+
+```vim
+let g:go_bin_path = expand("~/.gotools")
+let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
+```
+
+## Snippets
+
+Snippets are useful and very powerful. By default ultisnips is
+used, however you can change it to neosnippet with:
+
+```vim
+let g:go_snippet_engine = "neosnippet"
+```
+
+Snippet feature is enabled only if the snippet plugins are installed.  Below are
+some examples snippets and the corresponding trigger keywords, The `|`
+character defines the cursor. Ultisnips has support for multiple cursors
+
+
+`ff` is useful for debugging:
+
+```go
+fmt.Printf(" | %+v\n", |)
+```
+
+`errn` expands to:
+
+```go
+if err != nil {
+    return err
+}
+```
+
+Use `gof` to quickly create a anonymous goroutine :
+
+```go
+go func() {
+    |
+}()
+```
+
+To add `json` tags to a struct field, use `json` trigger:
+
+```
+type foo struct {
+    bar string  `json:"myField"
+           ^ type `json` here, hit tab and type "myField". It will expand to `json:"myField"`
+}
+```
+
+...
+
+And many more! For the full list have a look at the
+[included snippets](https://github.com/fatih/vim-go/blob/master/gosnippets/):
+
+## Troubleshooting
+
+### I'm using Fish shell but have some problems using Vim-go
+
+First environment variables in Fish are applied differently, it should be like:
+
+	set -x GOPATH /your/own/gopath
+
+Second, Vim needs a POSIX compatible shell (more info here:
+https://github.com/dag/vim-fish#teach-a-vim-to-fish). If you use Fish to open
+vim, it will make certain shell based commands fail (means vim-go will fail
+too). To overcome this problem change the default shell by adding the following
+into your .vimrc (on the top of the file):
+
+	if $SHELL =~ 'fish'
+	  set shell='/bin/bash'
+	endif
+
+or
+
+	set shell='/bin/bash'
+
+
+## Why another plugin?
+
+This plugin/package is born mainly from frustration. I had to re-install my Vim
+plugins and especially for Go I had to install a lot of separate different
+plugins, setup the necessary binaries to make them work together and hope not
+to lose them again. Lots of plugins out there lack proper settings.
+This plugin is improved and contains all my fixes/changes that I'm using for
+months under heavy go development environment.
+
+Give it a try. I hope you like it. Feel free to contribute to the project.
+
+## Credits
+
+* Go Authors for official vim plugins
+* Gocode, Godef, Golint, Oracle, Goimports, Gotags, Errcheck projects and authors of those projects.
+* Other vim-plugins, thanks for inspiration (vim-golang, go.vim, vim-gocode, vim-godef)
diff --git a/sources_non_forked/vim-go/addon-info.json b/sources_non_forked/vim-go/addon-info.json
new file mode 100644
index 00000000..145d961c
--- /dev/null
+++ b/sources_non_forked/vim-go/addon-info.json
@@ -0,0 +1,6 @@
+{
+  "name": "vim-go",
+  "description": "Full featured Go (golang) support for Vim.",
+  "author": "Fatih Arslan <fatih@arslan.io>",
+  "repository" : {"type": "git", "url": "https://github.com/fatih/vim-go.git"}
+}
diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim
new file mode 100644
index 00000000..75f67173
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/cmd.vim
@@ -0,0 +1,144 @@
+if !exists("g:go_jump_to_error")
+    let g:go_jump_to_error = 1
+endif
+
+function! go#cmd#Run(bang, ...)
+    let default_makeprg = &makeprg
+    if !len(a:000)
+        let &makeprg = "go run " . join(go#tool#Files(), ' ')
+    else
+        let &makeprg = "go run " . expand(a:1)
+    endif
+
+    exe 'make!'
+    if !a:bang
+        cwindow
+        let errors = getqflist()
+        if !empty(errors)
+            if g:go_jump_to_error
+                cc 1 "jump to first error if there is any
+            endif
+        endif
+    endif
+
+    let &makeprg = default_makeprg
+endfunction
+
+function! go#cmd#Install(...)
+    let pkgs = join(a:000, ' ')
+    let command = 'go install '.pkgs
+    let out = go#tool#ExecuteInDir(command)
+    if v:shell_error
+        call go#tool#ShowErrors(out)
+        cwindow
+        return
+    endif
+
+    if exists("$GOBIN")
+        echon "vim-go: " | echohl Function | echon "installed to ". $GOBIN | echohl None
+    else
+        echon "vim-go: " | echohl Function | echon "installed to ". $GOPATH . "/bin" | echohl None
+    endif
+endfunction
+
+function! go#cmd#Build(bang)
+    let default_makeprg = &makeprg
+    let gofiles = join(go#tool#Files(), ' ')
+    if v:shell_error
+        let &makeprg = "go build . errors"
+    else
+        let &makeprg = "go build -o /dev/null " . gofiles
+    endif
+
+    echon "vim-go: " | echohl Identifier | echon "building ..."| echohl None
+    silent! exe 'make!'
+    redraw!
+    if !a:bang
+        cwindow
+        let errors = getqflist()
+        if !empty(errors)
+            if g:go_jump_to_error
+                cc 1 "jump to first error if there is any
+            endif
+        else 
+            redraws! | echon "vim-go: " | echohl Function | echon "[build] SUCCESS"| echohl None
+        endif
+    endif
+
+    let &makeprg = default_makeprg
+endfunction
+
+function! go#cmd#Test(...)
+    let command = "go test ."
+    if len(a:000)
+        let command = "go test " . expand(a:1)
+    endif
+
+    echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
+    let out = go#tool#ExecuteInDir(command)
+    if v:shell_error
+        call go#tool#ShowErrors(out)
+    else
+        call setqflist([])
+    endif
+    cwindow
+
+    let errors = getqflist()
+    if !empty(errors)
+        if g:go_jump_to_error
+            cc 1 "jump to first error if there is any
+        endif
+    else
+        redraw | echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
+    endif
+endfunction
+
+function! go#cmd#Coverage(...)
+    let l:tmpname=tempname()
+
+    let command = "go test -coverprofile=".l:tmpname
+
+    let out = go#tool#ExecuteInDir(command)
+    if v:shell_error
+        call go#tool#ShowErrors(out)
+    else
+        " clear previous quick fix window
+        call setqflist([])
+
+        let openHTML = 'go tool cover -html='.l:tmpname
+        call go#tool#ExecuteInDir(openHTML)
+    endif
+    cwindow
+
+    let errors = getqflist()
+    if !empty(errors)
+        if g:go_jump_to_error
+            cc 1 "jump to first error if there is any
+        endif
+    endif
+
+    call delete(l:tmpname)
+endfunction
+
+function! go#cmd#Vet()
+    echon "vim-go: " | echohl Identifier | echon "calling vet..." | echohl None
+    let out = go#tool#ExecuteInDir('go vet')
+    if v:shell_error
+        call go#tool#ShowErrors(out)
+    else
+        call setqflist([])
+    endif
+    cwindow
+
+    let errors = getqflist()
+    if !empty(errors)
+        if g:go_jump_to_error
+            cc 1 "jump to first error if there is any
+        endif
+    else
+        redraw | echon "vim-go: " | echohl Function | echon "[vet] PASS" | echohl None
+    endif
+endfunction
+
+" vim:ts=4:sw=4:et
+"
diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim
new file mode 100644
index 00000000..d244c5c9
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -0,0 +1,142 @@
+if !exists("g:go_gocode_bin")
+    let g:go_gocode_bin = "gocode"
+endif
+
+
+fu! s:gocodeCurrentBuffer()
+    let buf = getline(1, '$')
+    if &encoding != 'utf-8'
+        let buf = map(buf, 'iconv(v:val, &encoding, "utf-8")')
+    endif
+    if &l:fileformat == 'dos'
+        " XXX: line2byte() depend on 'fileformat' option.
+        " so if fileformat is 'dos', 'buf' must include '\r'.
+        let buf = map(buf, 'v:val."\r"')
+    endif
+    let file = tempname()
+    call writefile(buf, file)
+
+    return file
+endf
+
+let s:vim_system = get(g:, 'gocomplete#system_function', 'system')
+
+fu! s:system(str, ...)
+    return call(s:vim_system, [a:str] + a:000)
+endf
+
+fu! s:gocodeShellescape(arg)
+    try
+        let ssl_save = &shellslash
+        set noshellslash
+        return shellescape(a:arg)
+    finally
+        let &shellslash = ssl_save
+    endtry
+endf
+
+fu! s:gocodeCommand(cmd, preargs, args)
+    for i in range(0, len(a:args) - 1)
+        let a:args[i] = s:gocodeShellescape(a:args[i])
+    endfor
+    for i in range(0, len(a:preargs) - 1)
+        let a:preargs[i] = s:gocodeShellescape(a:preargs[i])
+    endfor
+
+    let bin_path = go#tool#BinPath(g:go_gocode_bin) 
+    if empty(bin_path) 
+        return 
+    endif
+
+    let result = s:system(printf('%s %s %s %s', bin_path, join(a:preargs), a:cmd, join(a:args)))
+    if v:shell_error != 0
+        return "[\"0\", []]"
+    else
+        if &encoding != 'utf-8'
+            let result = iconv(result, 'utf-8', &encoding)
+        endif
+        return result
+    endif
+endf
+
+fu! s:gocodeCurrentBufferOpt(filename)
+    return '-in=' . a:filename
+endf
+
+fu! s:gocodeCursor()
+    if &encoding != 'utf-8'
+        let sep = &l:fileformat == 'dos' ? "\r\n" : "\n"
+        let c = col('.')
+        let buf = line('.') == 1 ? "" : (join(getline(1, line('.')-1), sep) . sep)
+        let buf .= c == 1 ? "" : getline('.')[:c-2]
+        return printf('%d', len(iconv(buf, &encoding, "utf-8")))
+    endif
+    return printf('%d', line2byte(line('.')) + (col('.')-2))
+endf
+
+fu! s:gocodeAutocomplete()
+    let filename = s:gocodeCurrentBuffer()
+    let result = s:gocodeCommand('autocomplete',
+                \ [s:gocodeCurrentBufferOpt(filename), '-f=vim'],
+                \ [expand('%:p'), s:gocodeCursor()])
+    call delete(filename)
+    return result
+endf
+
+function! go#complete#GetInfo()
+    let filename = s:gocodeCurrentBuffer()
+    let result = s:gocodeCommand('autocomplete',
+                \ [s:gocodeCurrentBufferOpt(filename), '-f=godit'],
+                \ [expand('%:p'), s:gocodeCursor()])
+    call delete(filename)
+
+    " first line is: Charcount,,NumberOfCandidates, i.e: 8,,1
+    " following lines are candiates, i.e:  func foo(name string),,foo(
+    let out = split(result, '\n')
+
+    " no candidates are found
+    if len(out) == 1
+        return
+    endif
+
+    " only one candiate is found
+    if len(out) == 2
+        return split(out[1], ',,')[0]
+    endif
+
+    " to many candidates are available, pick one that maches the word under the
+    " cursor
+    let infos = []
+    for info in out[1:]
+        call add(infos, split(info, ',,')[0])
+    endfor
+
+    let wordMatch = '\<' . expand("<cword>") . '\>'
+    " escape single quotes in wordMatch before passing it to filter
+    let wordMatch = substitute(wordMatch, "'", "''", "g")
+    let filtered =  filter(infos, "v:val =~ '".wordMatch."'")
+
+    if len(filtered) == 1
+        return filtered[0]
+    endif
+endfunction
+
+function! go#complete#Info()
+    let result = go#complete#GetInfo()
+    if len(result) > 0
+        echo "vim-go: " | echohl Function | echon result | echohl None
+    endif
+endfunction!
+
+fu! go#complete#Complete(findstart, base)
+    "findstart = 1 when we need to get the text length
+    if a:findstart == 1
+        execute "silent let g:gocomplete_completions = " . s:gocodeAutocomplete()
+        return col('.') - g:gocomplete_completions[0] - 1
+        "findstart = 0 when we need to return the list of completions
+    else
+        return g:gocomplete_completions[1]
+    endif
+endf
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/def.vim b/sources_non_forked/vim-go/autoload/go/def.vim
new file mode 100644
index 00000000..ce6de7e6
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/def.vim
@@ -0,0 +1,106 @@
+if !exists("g:go_godef_bin")
+	let g:go_godef_bin = "godef"
+endif
+
+
+" modified and improved version of vim-godef
+function! go#def#Jump(...)
+	if !len(a:000)
+		" gives us the offset of the word, basicall the position of the word under
+		" he cursor
+		let arg = s:getOffset()
+	else
+		let arg = a:1
+	endif
+
+	let bin_path = go#tool#BinPath(g:go_godef_bin) 
+	if empty(bin_path) 
+		return 
+	endif
+
+	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
+
+	" get output of godef
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+
+	" jump to it
+	call s:godefJump(out, "")
+endfunction
+
+
+function! go#def#JumpMode(mode)
+	let arg = s:getOffset()
+
+	let bin_path = go#tool#BinPath(g:go_godef_bin) 
+	if empty(bin_path) 
+		return 
+	endif
+
+	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
+
+	" get output of godef
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+
+	call s:godefJump(out, a:mode)
+endfunction
+
+
+function! s:getOffset()
+	let pos = getpos(".")[1:2]
+	if &encoding == 'utf-8'
+		let offs = line2byte(pos[0]) + pos[1] - 2
+	else
+		let c = pos[1]
+		let buf = line('.') == 1 ? "" : (join(getline(1, pos[0] - 1), "\n") . "\n")
+		let buf .= c == 1 ? "" : getline(pos[0])[:c-2]
+		let offs = len(iconv(buf, &encoding, "utf-8"))
+	endif
+
+	let argOff = "-o=" . offs
+	return argOff
+endfunction
+
+
+function! s:godefJump(out, mode)
+	let old_errorformat = &errorformat
+	let &errorformat = "%f:%l:%c"
+
+	if a:out =~ 'godef: '
+		let out=substitute(a:out, '\n$', '', '')
+		echom out
+	else
+		let parts = split(a:out, ':')
+		" parts[0] contains filename
+		let fileName = parts[0]
+
+		" put the error format into location list so we can jump automatically to
+		" it
+		lgetexpr a:out
+
+		" needed for restoring back user setting this is because there are two
+		" modes of switchbuf which we need based on the split mode
+		let old_switchbuf = &switchbuf
+
+		if a:mode == "tab"
+			let &switchbuf = "usetab"
+
+			if bufloaded(fileName) == 0
+				tab split 
+			endif
+		else
+			if a:mode  == "split"
+				split
+			elseif a:mode == "vsplit"
+				vsplit
+			endif
+		endif
+
+		" jump to file now
+		ll 1
+		normal zz
+
+		let &switchbuf = old_switchbuf
+	end
+	let &errorformat = old_errorformat
+endfunction
+
diff --git a/sources_non_forked/vim-go/autoload/go/doc.vim b/sources_non_forked/vim-go/autoload/go/doc.vim
new file mode 100644
index 00000000..6c9085c3
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/doc.vim
@@ -0,0 +1,159 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" godoc.vim: Vim command to see godoc.
+"
+"
+" Commands:
+"
+"   :GoDoc
+"
+"       Open the relevant Godoc for either the word[s] passed to the command or
+"       the, by default, the word under the cursor.
+"
+" Options:
+"
+"   g:go_godoc_commands [default=1]
+"
+"       Flag to indicate whether to enable the commands listed above.
+
+let s:buf_nr = -1
+
+if !exists("g:go_doc_command")
+    let g:go_doc_command = "godoc"
+endif
+
+if !exists("g:go_doc_options")
+    let g:go_doc_options = ""
+endif
+
+" returns the package and exported name. exported name might be empty.
+" ie: fmt and Println
+" ie: github.com/fatih/set and New
+function! s:godocWord(args)
+    if !executable('godoc')
+        echohl WarningMsg
+        echo "godoc command not found."
+        echo "  install with: go get code.google.com/p/go.tools/cmd/godoc"
+        echohl None
+        return []
+    endif
+
+    if !len(a:args)
+        let oldiskeyword = &iskeyword
+        setlocal iskeyword+=.
+        let word = expand('<cword>')
+        let &iskeyword = oldiskeyword
+        let word = substitute(word, '[^a-zA-Z0-9\\/._~-]', '', 'g')
+        let words = split(word, '\.\ze[^./]\+$')
+    else
+        let words = a:args
+    endif
+
+    if !len(words) 
+        return []
+    endif
+
+    let pkg = words[0]
+    if len(words) == 1
+        let exported_name = ""
+    else
+        let exported_name = words[1]
+    endif
+
+    let packages = go#tool#Imports()
+
+    if has_key(packages, pkg)
+        let pkg = packages[pkg]
+    endif
+
+    return [pkg, exported_name]
+endfunction
+
+function! go#doc#OpenBrowser(...)
+    let pkgs = s:godocWord(a:000)
+    if empty(pkgs)
+        return
+    endif
+
+    let pkg = pkgs[0]
+    let exported_name = pkgs[1]
+
+    " example url: https://godoc.org/github.com/fatih/set#Set
+    let godoc_url = "https://godoc.org/" . pkg . "#" . exported_name
+    call go#tool#OpenBrowser(godoc_url)
+endfunction
+
+function! go#doc#Open(mode, ...)
+    let pkgs = s:godocWord(a:000)
+    if empty(pkgs)
+        return
+    endif
+
+    let pkg = pkgs[0]
+    let exported_name = pkgs[1]
+
+    let command = g:go_doc_command . ' ' . g:go_doc_options . ' ' . pkg
+
+    silent! let content = system(command)
+    if v:shell_error || !len(content)
+        echo 'No documentation found for "' . pkg . '".'
+        return -1
+    endif
+
+    call s:GodocView(a:mode, content)
+
+    " jump to the specified name
+
+    if search('^func ' . exported_name . '(')
+        silent! normal zt
+        return -1
+    endif
+
+    if search('^type ' . exported_name)
+        silent! normal zt
+        return -1
+    endif
+
+    if search('^\%(const\|var\|type\|\s\+\) ' . pkg . '\s\+=\s')
+        silent! normal zt
+        return -1
+    endif
+
+    " nothing found, jump to top
+    silent! normal gg
+endfunction
+
+function! s:GodocView(position, content)
+    " reuse existing buffer window if it exists otherwise create a new one
+    if !bufexists(s:buf_nr)
+        execute a:position
+        file `="[Godoc]"`
+        let s:buf_nr = bufnr('%')
+    elseif bufwinnr(s:buf_nr) == -1
+        execute a:position
+        execute s:buf_nr . 'buffer'
+    elseif bufwinnr(s:buf_nr) != bufwinnr('%')
+        execute bufwinnr(s:buf_nr) . 'wincmd w'
+    endif
+
+    setlocal filetype=godoc
+    setlocal bufhidden=delete
+    setlocal buftype=nofile
+    setlocal noswapfile
+    setlocal nobuflisted
+    setlocal nocursorline
+    setlocal nocursorcolumn
+    setlocal iskeyword+=:
+    setlocal iskeyword-=-
+
+    setlocal modifiable
+    %delete _ 
+    call append(0, split(a:content, "\n"))
+    $delete _ 
+    setlocal nomodifiable
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/errcheck.vim b/sources_non_forked/vim-go/autoload/go/errcheck.vim
new file mode 100644
index 00000000..06a79192
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/errcheck.vim
@@ -0,0 +1,36 @@
+if !exists("g:go_errcheck_bin")
+    let g:go_errcheck_bin = "errcheck"
+endif
+
+function! go#errcheck#Run() abort
+    let bin_path = go#tool#BinPath(g:go_errcheck_bin) 
+    if empty(bin_path) 
+        return 
+    endif
+
+    let out = system(bin_path . ' ' . shellescape(expand('%:p:h')))
+    if v:shell_error
+        let errors = []
+        let mx = '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)'
+        for line in split(out, '\n')
+            let tokens = matchlist(line, mx)
+
+            if !empty(tokens)
+                call add(errors, {"filename": tokens[1],
+                            \"lnum": tokens[2],
+                            \"col": tokens[3],
+                            \"text": tokens[4]})
+            endif
+        endfor
+        if empty(errors)
+            % | " Couldn't detect error format, output errors
+        endif
+        if !empty(errors)
+            call setqflist(errors, 'r')
+        endif
+        echohl Error | echomsg "GoErrCheck returned error" | echohl None
+    else
+        call setqflist([])
+    endif
+    cwindow
+endfunction
diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim
new file mode 100644
index 00000000..ed1417e2
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -0,0 +1,141 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" fmt.vim: Vim command to format Go files with gofmt.
+"
+" This filetype plugin add a new commands for go buffers:
+"
+"   :Fmt
+"
+"       Filter the current Go buffer through gofmt.
+"       It tries to preserve cursor position and avoids
+"       replacing the buffer with stderr output.
+"
+" Options:
+"
+"   g:go_fmt_command [default="gofmt"]
+"
+"       Flag naming the gofmt executable to use.
+"
+"   g:go_fmt_autosave [default=1]
+"
+"       Flag to auto call :Fmt when saved file
+"
+
+if !exists("g:go_fmt_command")
+    let g:go_fmt_command = "gofmt"
+endif
+
+if !exists("g:go_goimports_bin")
+    let g:go_goimports_bin = "goimports"
+endif
+
+if !exists('g:go_fmt_fail_silently')
+    let g:go_fmt_fail_silently = 0
+endif
+
+if !exists('g:go_fmt_options')
+    let g:go_fmt_options = ''
+endif
+
+let s:got_fmt_error = 0
+
+"  we have those problems : 
+"  http://stackoverflow.com/questions/12741977/prevent-vim-from-updating-its-undo-tree
+"  http://stackoverflow.com/questions/18532692/golang-formatter-and-vim-how-to-destroy-history-record?rq=1
+"
+"  The below function is an improved version that aims to fix all problems.
+"  it doesn't undo changes and break undo history.  If you are here reading
+"  this and have VimL experience, please look at the function for
+"  improvements, patches are welcome :)
+function! go#fmt#Format(withGoimport)
+    " save cursor position and many other things
+    let l:curw=winsaveview()
+
+    " needed for testing if gofmt fails or not
+    let l:tmpname=tempname()
+    call writefile(getline(1,'$'), l:tmpname)
+
+    " save our undo file to be restored after we are done. This is needed to
+    " prevent an additional undo jump due to BufWritePre auto command and also
+    " restore 'redo' history because it's getting being destroyed every
+    " BufWritePre
+    let tmpundofile=tempname()
+    exe 'wundo! ' . tmpundofile
+
+    " get the command first so we can test it
+    let fmt_command = g:go_fmt_command
+    if a:withGoimport  == 1 
+        " check if the user has installed goimports
+        let bin_path = go#tool#BinPath(g:go_goimports_bin) 
+        if empty(bin_path) 
+            return 
+        endif
+
+        let fmt_command = bin_path
+    endif
+
+    " populate the final command with user based fmt options
+    let command = fmt_command . ' ' . g:go_fmt_options
+
+    " execute our command...
+    let out = system(command . " " . l:tmpname)
+
+    "if there is no error on the temp file, gofmt again our original file
+    if v:shell_error == 0
+        " remove undo point caused via BufWritePre
+        try | silent undojoin | catch | endtry
+
+        " do not include stderr to the buffer, this is due to goimports/gofmt
+        " tha fails with a zero exit return value (sad yeah).
+        let default_srr = &srr
+        set srr=>%s 
+
+        " execufe gofmt on the current buffer and replace it
+        silent execute "%!" . command
+
+        " only clear quickfix if it was previously set, this prevents closing
+        " other quickfixes
+        if s:got_fmt_error 
+            let s:got_fmt_error = 0
+            call setqflist([])
+            cwindow
+        endif
+
+        " put back the users srr setting
+        let &srr = default_srr
+    elseif g:go_fmt_fail_silently == 0 
+        "otherwise get the errors and put them to quickfix window
+        let errors = []
+        for line in split(out, '\n')
+            let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
+            if !empty(tokens)
+                call add(errors, {"filename": @%,
+                            \"lnum":     tokens[2],
+                            \"col":      tokens[3],
+                            \"text":     tokens[4]})
+            endif
+        endfor
+        if empty(errors)
+            % | " Couldn't detect gofmt error format, output errors
+        endif
+        if !empty(errors)
+            call setqflist(errors, 'r')
+            echohl Error | echomsg "Gofmt returned error" | echohl None
+        endif
+        let s:got_fmt_error = 1
+        cwindow
+    endif
+
+    " restore our undo history
+    silent! exe 'rundo ' . tmpundofile
+    call delete(tmpundofile)
+
+    " restore our cursor/windows positions
+    call delete(l:tmpname)
+    call winrestview(l:curw)
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/import.vim b/sources_non_forked/vim-go/autoload/go/import.vim
new file mode 100644
index 00000000..6f05488c
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/import.vim
@@ -0,0 +1,236 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" import.vim: Vim commands to import/drop Go packages.
+"
+" This filetype plugin adds three new commands for go buffers:
+"
+"   :GoImport {path}
+"
+"       Import ensures that the provided package {path} is imported
+"       in the current Go buffer, using proper style and ordering.
+"       If {path} is already being imported, an error will be
+"       displayed and the buffer will be untouched.
+"
+"   :GoImportAs {localname} {path}
+"
+"       Same as Import, but uses a custom local name for the package.
+"
+"   :GoDrop {path}
+"
+"       Remove the import line for the provided package {path}, if
+"       present in the current Go buffer.  If {path} is not being
+"       imported, an error will be displayed and the buffer will be
+"       untouched.
+"
+" If you would like to add shortcuts, you can do so by doing the following:
+"
+"   Import fmt
+"   au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR>
+"
+"   Drop fmt
+"   au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR>
+"
+"   Import the word under your cursor
+"   au Filetype go nnoremap <buffer> <LocalLeader>k
+"       \ :exe 'Import ' . expand('<cword>')<CR>
+"
+" The backslash '\' is the default maplocalleader, so it is possible that
+" your vim is set to use a different character (:help maplocalleader).
+"
+function! go#import#SwitchImport(enabled, localname, path)
+    let view = winsaveview()
+    let path = a:path
+
+    " Quotes are not necessary, so remove them if provided.
+    if path[0] == '"'
+        let path = strpart(path, 1)
+    endif
+    if path[len(path)-1] == '"'
+        let path = strpart(path, 0, len(path) - 1)
+    endif
+    if path == ''
+        call s:Error('Import path not provided')
+        return
+    endif
+
+    let exists = go#tool#Exists(path)
+    if exists == -1
+        call s:Error("Can't find import: " . path)
+        return
+    endif
+
+    " Extract any site prefix (e.g. github.com/).
+    " If other imports with the same prefix are grouped separately,
+    " we will add this new import with them.
+    " Only up to and including the first slash is used.
+    let siteprefix = matchstr(path, "^[^/]*/")
+
+    let qpath = '"' . path . '"'
+    if a:localname != ''
+        let qlocalpath = a:localname . ' ' . qpath
+    else
+        let qlocalpath = qpath
+    endif
+    let indentstr = 0
+    let packageline = -1 " Position of package name statement
+    let appendline = -1  " Position to introduce new import
+    let deleteline = -1  " Position of line with existing import
+    let linesdelta = 0   " Lines added/removed
+
+    " Find proper place to add/remove import.
+    let line = 0
+    while line <= line('$')
+        let linestr = getline(line)
+
+        if linestr =~# '^package\s'
+            let packageline = line
+            let appendline = line
+
+        elseif linestr =~# '^import\s\+('
+            let appendstr = qlocalpath
+            let indentstr = 1
+            let appendline = line
+            let firstblank = -1
+            let lastprefix = ""
+            while line <= line("$")
+                let line = line + 1
+                let linestr = getline(line)
+                let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)')
+                if empty(m)
+                    if siteprefix == "" && a:enabled
+                        " must be in the first group
+                        break
+                    endif
+                    " record this position, but keep looking
+                    if firstblank < 0
+                        let firstblank = line
+                    endif
+                    continue
+                endif
+                if m[1] == ')'
+                    " if there's no match, add it to the first group
+                    if appendline < 0 && firstblank >= 0
+                        let appendline = firstblank
+                    endif
+                    break
+                endif
+                let lastprefix = matchstr(m[4], "^[^/]*/")
+                if a:localname != '' && m[3] != ''
+                    let qlocalpath = printf('%-' . (len(m[3])-1) . 's %s', a:localname, qpath)
+                endif
+                let appendstr = m[2] . qlocalpath
+                let indentstr = 0
+                if m[4] == path
+                    let appendline = -1
+                    let deleteline = line
+                    break
+                elseif m[4] < path
+                    " don't set candidate position if we have a site prefix,
+                    " we've passed a blank line, and this doesn't share the same
+                    " site prefix.
+                    if siteprefix == "" || firstblank < 0 || match(m[4], "^" . siteprefix) >= 0
+                        let appendline = line
+                    endif
+                elseif siteprefix != "" && match(m[4], "^" . siteprefix) >= 0
+                    " first entry of site group
+                    let appendline = line - 1
+                    break
+                endif
+            endwhile
+            break
+
+        elseif linestr =~# '^import '
+            if appendline == packageline
+                let appendstr = 'import ' . qlocalpath
+                let appendline = line - 1
+            endif
+            let m = matchlist(linestr, '^import\(\s\+\)\(\S*\s*\)"\(.\+\)"')
+            if !empty(m)
+                if m[3] == path
+                    let appendline = -1
+                    let deleteline = line
+                    break
+                endif
+                if m[3] < path
+                    let appendline = line
+                endif
+                if a:localname != '' && m[2] != ''
+                    let qlocalpath = printf("%s %" . len(m[2])-1 . "s", a:localname, qpath)
+                endif
+                let appendstr = 'import' . m[1] . qlocalpath
+            endif
+
+        elseif linestr =~# '^\(var\|const\|type\|func\)\>'
+            break
+
+        endif
+        let line = line + 1
+    endwhile
+
+    " Append or remove the package import, as requested.
+    if a:enabled
+        if deleteline != -1
+            call s:Error(qpath . ' already being imported')
+        elseif appendline == -1
+            call s:Error('No package line found')
+        else
+            if appendline == packageline
+                call append(appendline + 0, '')
+                call append(appendline + 1, 'import (')
+                call append(appendline + 2, ')')
+                let appendline += 2
+                let linesdelta += 3
+                let appendstr = qlocalpath
+                let indentstr = 1
+            endif
+            call append(appendline, appendstr)
+            execute appendline + 1
+            if indentstr
+                execute 'normal >>'
+            endif
+            let linesdelta += 1
+        endif
+    else
+        if deleteline == -1
+            call s:Error(qpath . ' not being imported')
+        else
+            execute deleteline . 'd'
+            let linesdelta -= 1
+
+            if getline(deleteline-1) =~# '^import\s\+(' && getline(deleteline) =~# '^)'
+                " Delete empty import block
+                let deleteline -= 1
+                execute deleteline . "d"
+                execute deleteline . "d"
+                let linesdelta -= 2
+            endif
+
+            if getline(deleteline) == '' && getline(deleteline - 1) == ''
+                " Delete spacing for removed line too.
+                execute deleteline . "d"
+                let linesdelta -= 1
+            endif
+        endif
+    endif
+
+    " Adjust view for any changes.
+    let view.lnum += linesdelta
+    let view.topline += linesdelta
+    if view.topline < 0
+        let view.topline = 0
+    endif
+
+    " Put buffer back where it was.
+    call winrestview(view)
+
+endfunction
+
+
+function! s:Error(s)
+    echohl Error | echo a:s | echohl None
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/lint.vim b/sources_non_forked/vim-go/autoload/go/lint.vim
new file mode 100644
index 00000000..89c103a6
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/lint.vim
@@ -0,0 +1,30 @@
+" Copyright 2013 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" lint.vim: Vim command to lint Go files with golint.
+"
+"   https://github.com/golang/lint
+"
+" This filetype plugin add a new commands for go buffers:
+"
+"   :GoLint
+"
+"       Run golint for the current Go file.
+"
+if !exists("g:go_golint_bin")
+    let g:go_golint_bin = "golint"
+endif
+
+function! go#lint#Run() abort
+	let bin_path = go#tool#BinPath(g:go_golint_bin) 
+	if empty(bin_path) 
+		return 
+	endif
+
+    silent cexpr system(bin_path . " " . shellescape(expand('%')))
+    cwindow
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
new file mode 100644
index 00000000..2dc24b98
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -0,0 +1,224 @@
+" -*- text -*-
+"  oracle.vim -- Vim integration for the Go oracle.
+"
+"  Part of this plugin was taken directly from the oracle repo, however it's
+"  massively changed for a better integration into vim-go. Thanks Alan Donovan
+"  for the first iteration based on quickfix!  - fatih arslan
+"
+"
+
+if !exists("g:go_oracle_bin")
+    let g:go_oracle_bin = "oracle"
+endif
+
+func! s:qflist(output)
+    let qflist = []
+    " Parse GNU-style 'file:line.col-line.col: message' format.
+    let mx = '^\(\a:[\\/][^:]\+\|[^:]\+\):\(\d\+\):\(\d\+\):\(.*\)$'
+    for line in split(a:output, "\n")
+        let ml = matchlist(line, mx)
+        " Ignore non-match lines or warnings
+        if ml == [] || ml[4] =~ '^ warning:'
+            continue
+        endif
+        let item = {
+                    \  'filename': ml[1],
+                    \  'text': ml[4],
+                    \  'lnum': ml[2],
+                    \  'col': ml[3],
+                    \}
+        let bnr = bufnr(fnameescape(ml[1]))
+        if bnr != -1
+            let item['bufnr'] = bnr
+        endif
+        call add(qflist, item)
+    endfor
+    call setqflist(qflist)
+    cwindow
+endfun
+
+func! s:getpos(l, c)
+    if &encoding != 'utf-8'
+        let buf = a:l == 1 ? '' : (join(getline(1, a:l-1), "\n") . "\n")
+        let buf .= a:c == 1 ? '' : getline('.')[:a:c-2]
+        return len(iconv(buf, &encoding, 'utf-8'))
+    endif
+    return line2byte(a:l) + (a:c-2)
+endfun
+
+func! s:RunOracle(mode, selected) range abort
+    let fname = expand('%:p')
+    let dname = expand('%:p:h')
+    let pkg = go#package#ImportPath(dname)
+
+    if exists('g:go_oracle_scope_file')
+        " let the user defines the scope
+        let sname = shellescape(get(g:, 'go_oracle_scope_file'))
+    elseif exists('g:go_oracle_include_tests') && pkg != -1
+        " give import path so it includes all _test.go files too
+        let sname = shellescape(pkg)
+    else
+        " best usable way, only pass the package itself, without the test
+        " files
+        let sname = join(go#tool#Files(), ' ')
+    endif
+
+    "return with a warning if the bin doesn't exist
+    let bin_path = go#tool#BinPath(g:go_oracle_bin) 
+    if empty(bin_path) 
+        return 
+    endif
+
+    if a:selected != -1
+        let pos1 = s:getpos(line("'<"), col("'<"))
+        let pos2 = s:getpos(line("'>"), col("'>"))
+        let cmd = printf('%s -format json -pos=%s:#%d,#%d %s %s',
+                    \  bin_path,
+                    \  shellescape(fname), pos1, pos2, a:mode, sname)
+    else
+        let pos = s:getpos(line('.'), col('.'))
+        let cmd = printf('%s -format json -pos=%s:#%d %s %s',
+                    \  bin_path,
+                    \  shellescape(fname), pos, a:mode, sname)
+    endif
+
+    echon "vim-go: " | echohl Identifier | echon "analysing ..." | echohl None
+
+    let out = system(cmd)
+    if v:shell_error
+        " unfortunaly oracle outputs a very long stack trace that is not
+        " parsable to show the real error. But the main issue is usually the
+        " package which doesn't build. 
+        " echo out
+        " redraw | echon 'vim-go: could not run static analyser (does it build?)'
+        redraw | echon "vim-go: " | echohl Statement | echon out | echohl None
+        return {}
+    else
+        let json_decoded = webapi#json#decode(out)
+        return json_decoded
+    endif
+endfun
+
+
+" Show 'implements' relation for selected package
+function! go#oracle#Implements(selected)
+    let out = s:RunOracle('implements', a:selected)
+    if empty(out)
+        return
+    endif
+
+    " be sure they exists before we retrieve them from the map
+    if !has_key(out, "implements")
+        return
+    endif
+
+    if has_key(out.implements, "from")
+        let interfaces = out.implements.from
+    elseif has_key(out.implements, "fromptr")
+        let interfaces = out.implements.fromptr
+    else
+        redraw | echon "vim-go: " | echon "does not satisfy any interface"| echohl None
+        return
+    endif
+
+    " get the type name from the type under the cursor
+    let typeName = out.implements.type.name
+
+    " prepare the title
+    let title = typeName . " implements:"
+
+    " start to populate our buffer content
+    let result  = [title, ""]
+
+    for interface in interfaces
+        " don't add runtime interfaces
+        if interface.name !~ '^runtime'
+            let line = interface.name . "\t" . interface.pos
+            call add(result, line)
+        endif
+    endfor
+
+    " open a window and put the result
+    call go#ui#OpenWindow(result)
+
+    " define some buffer related mappings:
+    "
+    " go to definition when hit enter
+    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition()<CR>
+    " close the window when hit ctrl-c
+    nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
+endfunction
+
+" Describe selected syntax: definition, methods, etc
+function! go#oracle#Describe(selected)
+    let out = s:RunOracle('describe', a:selected)
+    if empty(out)
+        return
+    endif
+
+    echo out
+    return
+
+    let detail = out["describe"]["detail"]
+    let desc = out["describe"]["desc"]
+
+    echo '# detail: '. detail
+    " package, constant, variable, type, function or statement labe
+    if detail == "package"
+        echo desc
+        return
+    endif
+
+    if detail == "value"
+        echo desc
+        echo out["describe"]["value"]
+        return
+    endif
+
+    " the rest needs to be implemented
+    echo desc
+endfunction
+
+" Show possible targets of selected function call
+function! go#oracle#Callees(selected)
+    let out = s:RunOracle('callees', a:selected)
+    echo out
+endfunction
+
+" Show possible callers of selected function
+function! go#oracle#Callers(selected)
+    let out = s:RunOracle('callers', a:selected)
+    echo out
+endfunction
+
+" Show the callgraph of the current program.
+function! go#oracle#Callgraph(selected)
+    let out = s:RunOracle('callgraph', a:selected)
+    echo out
+endfunction
+
+" Show path from callgraph root to selected function
+function! go#oracle#Callstack(selected)
+    let out = s:RunOracle('callstack', a:selected)
+    echo out
+endfunction
+
+" Show free variables of selection
+function! go#oracle#Freevars(selected)
+    let out = s:RunOracle('freevars', a:selected)
+    echo out
+endfunction
+
+" Show send/receive corresponding to selected channel op
+function! go#oracle#Peers(selected)
+    let out = s:RunOracle('peers', a:selected)
+    echo out
+endfunction
+
+" Show all refs to entity denoted by selected identifier
+function! go#oracle#Referrers(selected)
+    let out = s:RunOracle('referrers', a:selected)
+    echo out
+endfunction
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/package.vim b/sources_non_forked/vim-go/autoload/go/package.vim
new file mode 100644
index 00000000..fe32a2cc
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/package.vim
@@ -0,0 +1,152 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" This file provides a utility function that performs auto-completion of
+" package names, for use by other commands.
+
+let s:goos = $GOOS
+let s:goarch = $GOARCH
+
+if len(s:goos) == 0
+    if exists('g:golang_goos')
+        let s:goos = g:golang_goos
+    elseif has('win32') || has('win64')
+        let s:goos = 'windows'
+    elseif has('macunix')
+        let s:goos = 'darwin'
+    else
+        let s:goos = '*'
+    endif
+endif
+
+if len(s:goarch) == 0
+    if exists('g:golang_goarch')
+        let s:goarch = g:golang_goarch
+    else
+        let s:goarch = '*'
+    endif
+endif
+
+function! go#package#Paths()
+    let dirs = []
+
+    if executable('go')
+        let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
+        if v:shell_error
+            echomsg '''go env GOROOT'' failed'
+        endif
+    else
+        let goroot = $GOROOT
+    endif
+
+    if len(goroot) != 0 && isdirectory(goroot)
+        let dirs += [goroot]
+    endif
+
+    let pathsep = ':'
+    if s:goos == 'windows'
+        let pathsep = ';'
+    endif
+    let workspaces = split($GOPATH, pathsep)
+    if workspaces != []
+        let dirs += workspaces
+    endif
+
+    return dirs
+endfunction
+
+function! go#package#ImportPath(arg)
+    let path = fnamemodify(resolve(a:arg), ':p')
+    let dirs = go#package#Paths()
+
+    for dir in dirs
+        if len(dir) && match(path, dir) == 0
+            let workspace = dir
+        endif
+    endfor
+
+    if !exists('workspace')
+        return -1
+    endif
+
+    return substitute(path, workspace . '/src/', '', '')
+endfunction
+
+function! go#package#FromPath(arg)
+    let path = fnamemodify(resolve(a:arg), ':p')
+    let dirs = go#package#Paths()
+
+    for dir in dirs
+        if len(dir) && match(path, dir) == 0
+            let workspace = dir
+        endif
+    endfor
+
+    if !exists('workspace')
+        return -1
+    endif
+
+    if isdirectory(path)
+        return substitute(path, workspace . 'src/', '', '')
+    else
+        return substitute(substitute(path, workspace . 'src/', '', ''),
+                         \ '/' . fnamemodify(path, ':t'), '', '')
+    endif
+endfunction
+
+function! go#package#CompleteMembers(package, member)
+    silent! let content = system('godoc ' . a:package)
+    if v:shell_error || !len(content)
+        return []
+    endif
+    let lines = filter(split(content, "\n"),"v:val !~ '^\\s\\+$'")
+    try
+        let mx1 = '^\s\+\(\S+\)\s\+=\s\+.*'
+        let mx2 = '^\%(const\|var\|type\|func\) \([A-Z][^ (]\+\).*'
+        let candidates = map(filter(copy(lines), 'v:val =~ mx1'),
+                            \ 'substitute(v:val, mx1, "\\1", "")')
+                     \ + map(filter(copy(lines), 'v:val =~ mx2'),
+                            \ 'substitute(v:val, mx2, "\\1", "")')
+        return filter(candidates, '!stridx(v:val, a:member)')
+    catch
+        return []
+    endtry
+endfunction
+
+function! go#package#Complete(ArgLead, CmdLine, CursorPos)
+    let words = split(a:CmdLine, '\s\+', 1)
+    if len(words) > 2 && words[0] != "GoImportAs"
+        " Complete package members
+        return go#package#CompleteMembers(words[1], words[2])
+    endif
+
+    let dirs = go#package#Paths()
+
+    if len(dirs) == 0
+        " should not happen
+        return []
+    endif
+
+    let ret = {}
+    for dir in dirs
+        " this may expand to multiple lines
+        let root = split(expand(dir . '/pkg/' . s:goos . '_' . s:goarch), "\n")
+        call add(root, expand(dir . '/src'))
+        for r in root
+            for i in split(globpath(r, a:ArgLead.'*'), "\n")
+                if isdirectory(i)
+                    let i .= '/'
+                elseif i !~ '\.a$'
+                    continue
+                endif
+                let i = substitute(substitute(i[len(r)+1:], '[\\]', '/', 'g'),
+                                  \ '\.a$', '', 'g')
+                let ret[i] = i
+            endfor
+        endfor
+    endfor
+    return sort(keys(ret))
+endfunction
+
+" vim:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/play.vim b/sources_non_forked/vim-go/autoload/go/play.vim
new file mode 100644
index 00000000..4b26fc1d
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/play.vim
@@ -0,0 +1,94 @@
+if !exists("g:go_play_open_browser")
+    let g:go_play_open_browser = 1
+endif
+
+
+function! go#play#Share(count, line1, line2)
+    if !executable('curl')
+        echohl ErrorMsg | echomsg "vim-go: require 'curl' command" | echohl None
+        return
+    endif
+
+    let content = join(getline(a:line1, a:line2), "\n")
+    let share_file = tempname()
+    call writefile(split(content, "\n"), share_file, "b")
+
+    let command = "curl -s -X POST http://play.golang.org/share --data-binary '@".share_file."'"
+    let snippet_id = system(command)
+
+    " we can remove the temp file because it's now posted.
+    call delete(share_file)
+
+    if v:shell_error
+        echo 'A error has occured. Run this command to see what the problem is:'
+        echo command
+        return
+    endif
+
+    let url = "http://play.golang.org/p/".snippet_id
+
+    " copy to clipboard
+    if has('unix') && !has('xterm_clipboard') && !has('clipboard')
+        let @" = url
+    else
+        let @+ = url
+    endif
+
+    if g:go_play_open_browser != 0
+        call go#tool#OpenBrowser(url)
+    endif
+
+    echo "vim-go: snippet uploaded: ".url
+endfunction
+
+
+function! s:get_visual_content()
+    let save_regcont = @"
+    let save_regtype = getregtype('"')
+    silent! normal! gvy
+    let content = @"
+    call setreg('"', save_regcont, save_regtype)
+    return content
+endfunction
+
+" modified version of
+" http://stackoverflow.com/questions/1533565/how-to-get-visually-selected-text-in-vimscript
+" another function that returns the content of visual selection, it's not used
+" but might be useful in the future
+function! s:get_visual_selection()
+    let [lnum1, col1] = getpos("'<")[1:2]
+    let [lnum2, col2] = getpos("'>")[1:2]
+
+    " check if the the visual mode is used before
+    if lnum1 == 0  || lnum2 == 0  || col1 == 0  || col2 == 0
+        return
+    endif
+
+    let lines = getline(lnum1, lnum2)
+    let lines[-1] = lines[-1][: col2 - (&selection == 'inclusive' ? 1 : 2)]
+    let lines[0] = lines[0][col1 - 1:]
+    return join(lines, "\n")
+endfunction
+
+" following two functions are from: https://github.com/mattn/gist-vim 
+" thanks  @mattn
+function! s:get_browser_command()
+    let go_play_browser_command = get(g:, 'go_play_browser_command', '')
+    if go_play_browser_command == ''
+        if has('win32') || has('win64')
+            let go_play_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
+        elseif has('mac') || has('macunix') || has('gui_macvim') || system('uname') =~? '^darwin'
+            let go_play_browser_command = 'open %URL%'
+        elseif executable('xdg-open')
+            let go_play_browser_command = 'xdg-open %URL%'
+        elseif executable('firefox')
+            let go_play_browser_command = 'firefox %URL% &'
+        else
+            let go_play_browser_command = ''
+        endif
+    endif
+    return go_play_browser_command
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/rename.vim b/sources_non_forked/vim-go/autoload/go/rename.vim
new file mode 100644
index 00000000..9e401e31
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/rename.vim
@@ -0,0 +1,52 @@
+if !exists("g:go_gorename_bin")
+    let g:go_gorename_bin = "gorename"
+endif
+
+function! go#rename#Rename(...)
+    let to = ""
+    if a:0 == 0
+        let ask = printf("vim-go: rename '%s' to: ",  expand("<cword>"))
+        let to = input(ask)
+        redraw
+    else
+        let to = a:1
+    endif
+
+
+    "return with a warning if the bin doesn't exist
+    let bin_path = go#tool#BinPath(g:go_gorename_bin) 
+    if empty(bin_path) 
+        return 
+    endif
+
+    let fname = expand('%:p:t')
+    let pos = s:getpos(line('.'), col('.'))
+    let cmd = printf('%s -offset %s:#%d -to %s',  bin_path, shellescape(fname), pos, to)
+
+    let out = go#tool#ExecuteInDir(cmd)
+
+    " strip out newline on the end that gorename puts. If we don't remove, it
+    " will trigger the 'Hit ENTER to continue' prompt
+    let clean = split(out, '\n')
+
+    if v:shell_error
+        redraw | echon "vim-go: " | echohl Statement | echon clean[0] | echohl None
+    else
+        redraw | echon "vim-go: " | echohl Function | echon clean[0] | echohl None
+    endif
+
+    " refresh the buffer so we can see the new content
+    silent execute ":e"
+endfunction
+
+func! s:getpos(l, c)
+    if &encoding != 'utf-8'
+        let buf = a:l == 1 ? '' : (join(getline(1, a:l-1), "\n") . "\n")
+        let buf .= a:c == 1 ? '' : getline('.')[:a:c-2]
+        return len(iconv(buf, &encoding, 'utf-8'))
+    endif
+    return line2byte(a:l) + (a:c-2)
+endfun
+
+" vim:ts=4:sw=4:et
+"
diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim
new file mode 100644
index 00000000..d5691057
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -0,0 +1,181 @@
+function! go#tool#Files()
+    if has ("win32")
+        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\n\"}}{{end}}"'
+    else
+        " let command = "go list -f $'{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}\n{{end}}'"
+
+        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
+
+    endif
+    let out = go#tool#ExecuteInDir(command)
+    return split(out, '\n')
+endfunction
+
+function! go#tool#Deps()
+    if has ("win32")
+        let command = 'go list -f "{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}"'
+    else
+        let command = "go list -f $'{{range $f := .Deps}}{{$f}}\n{{end}}'"
+    endif
+    let out = go#tool#ExecuteInDir(command)
+    return split(out, '\n')
+endfunction
+
+function! go#tool#Imports()
+    let imports = {}
+    if has ("win32")
+        let command = 'go list -f "{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}"'
+    else
+        let command = "go list -f $'{{range $f := .Imports}}{{$f}}\n{{end}}'"
+    endif
+    let out = go#tool#ExecuteInDir(command)
+    if v:shell_error
+        echo out
+        return imports
+    endif
+
+    for package_path in split(out, '\n')
+        let package_name = fnamemodify(package_path, ":t")
+        let imports[package_name] = package_path
+    endfor
+
+    return imports
+endfunction
+
+function! go#tool#ShowErrors(out)
+    let errors = []
+    for line in split(a:out, '\n')
+        let tokens = matchlist(line, '^\s*\(.\{-}\):\(\d\+\):\s*\(.*\)')
+        if !empty(tokens)
+            call add(errors, {"filename" : expand("%:p:h:") . "/" . tokens[1],
+                        \"lnum":     tokens[2],
+                        \"text":     tokens[3]})
+        elseif !empty(errors)
+            " Preserve indented lines.
+            " This comes up especially with multi-line test output.
+            if match(line, '^\s') >= 0
+                call add(errors, {"text": line})
+            endif
+        endif
+    endfor
+
+    if !empty(errors)
+        call setqflist(errors, 'r')
+        return
+    endif
+
+    if empty(errors)
+        " Couldn't detect error format, output errors
+        echo a:out
+    endif
+endfunction
+
+function! go#tool#ExecuteInDir(cmd) abort
+    let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+    let dir = getcwd()
+    try
+        execute cd.'`=expand("%:p:h")`'
+        let out = system(a:cmd)
+    finally
+        execute cd.'`=dir`'
+    endtry
+    return out
+endfunction
+
+" Exists checks whether the given importpath exists or not. It returns 0 if
+" the importpath exists under GOPATH.
+function! go#tool#Exists(importpath)
+    let command = "go list ". a:importpath
+    let out = go#tool#ExecuteInDir(command)
+
+    if v:shell_error
+        return -1
+    endif
+
+    return 0
+endfunction
+
+" BinPath checks whether the given binary exists or not and returns the path
+" of the binary. It returns an empty string doesn't exists.
+function! go#tool#BinPath(binpath)
+    " remove whitespaces if user applied something like 'goimports   '
+    let binpath = substitute(a:binpath, '^\s*\(.\{-}\)\s*$', '\1', '')
+
+    " if it's in PATH just return it
+    if executable(binpath) 
+        return binpath
+    endif
+
+
+    " just get the basename
+    let basename = fnamemodify(binpath, ":t")
+
+    " check if we have an appropriate bin_path
+    let go_bin_path = GetBinPath()
+    if empty(go_bin_path)
+        echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it."
+        return ""
+    endif
+
+    " append our GOBIN and GOPATH paths and be sure they can be found there...
+    " let us search in our GOBIN and GOPATH paths
+    let old_path = $PATH
+    let $PATH = $PATH . ":" .go_bin_path
+
+    if !executable(binpath) 
+        echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it."
+        return ""
+    endif
+
+    " restore back!
+    if go_bin_path
+        let $PATH = old_path
+    endif
+
+    return go_bin_path . '/' . basename
+endfunction
+
+" following two functions are from: https://github.com/mattn/gist-vim 
+" thanks  @mattn
+function! s:get_browser_command()
+    let go_play_browser_command = get(g:, 'go_play_browser_command', '')
+    if go_play_browser_command == ''
+        if has('win32') || has('win64')
+            let go_play_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
+        elseif has('mac') || has('macunix') || has('gui_macvim') || system('uname') =~? '^darwin'
+            let go_play_browser_command = 'open %URL%'
+        elseif executable('xdg-open')
+            let go_play_browser_command = 'xdg-open %URL%'
+        elseif executable('firefox')
+            let go_play_browser_command = 'firefox %URL% &'
+        else
+            let go_play_browser_command = ''
+        endif
+    endif
+    return go_play_browser_command
+endfunction
+
+function! go#tool#OpenBrowser(url)
+    let cmd = s:get_browser_command()
+    if len(cmd) == 0
+        redraw
+        echohl WarningMsg
+        echo "It seems that you don't have general web browser. Open URL below."
+        echohl None
+        echo a:url
+        return
+    endif
+    if cmd =~ '^!'
+        let cmd = substitute(cmd, '%URL%', '\=shellescape(a:url)', 'g')
+        silent! exec cmd
+    elseif cmd =~ '^:[A-Z]'
+        let cmd = substitute(cmd, '%URL%', '\=a:url', 'g')
+        exec cmd
+    else
+        let cmd = substitute(cmd, '%URL%', '\=shellescape(a:url)', 'g')
+        call system(cmd)
+    endif
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/ui.vim b/sources_non_forked/vim-go/autoload/go/ui.vim
new file mode 100644
index 00000000..56ac8c9e
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/ui.vim
@@ -0,0 +1,89 @@
+let s:buf_nr = -1
+
+"OpenWindow opens a new scratch window and put's the content into the window
+function! go#ui#OpenWindow(content)
+    " reuse existing buffer window if it exists otherwise create a new one
+    if !bufexists(s:buf_nr)
+        execute 'botright new'
+        file `="[Implements]"`
+        let s:buf_nr = bufnr('%')
+    elseif bufwinnr(s:buf_nr) == -1
+        execute 'botright new'
+        execute s:buf_nr . 'buffer'
+    elseif bufwinnr(s:buf_nr) != bufwinnr('%')
+        execute bufwinnr(s:buf_nr) . 'wincmd w'
+    endif
+
+
+    " Keep minimum height to 10, if there is more just increase it that it
+    " occupies all results
+    let implements_height = 10
+    if len(a:content) < implements_height
+        exe 'resize ' . implements_height
+    else
+        exe 'resize ' . len(a:content)
+    endif
+	
+		" some sane default values for a readonly buffer
+    setlocal filetype=vimgo
+    setlocal bufhidden=delete
+    setlocal buftype=nofile
+    setlocal noswapfile
+    setlocal nobuflisted
+    setlocal winfixheight
+    setlocal cursorline " make it easy to distinguish
+
+    " we need this to purge the buffer content
+    setlocal modifiable
+
+    "delete everything first from the buffer
+    %delete _  
+
+    " add the content
+    call append(0, a:content)
+
+    " delete last line that comes from the append call
+    $delete _  
+
+    " set it back to non modifiable
+    setlocal nomodifiable
+endfunction
+
+
+" CloseWindow closes the current window
+function! go#ui#CloseWindow()
+    close
+    echo ""
+endfunction
+
+" OpenDefinition parses the current line and jumps to it by openening a new
+" tab
+function! go#ui#OpenDefinition()
+    let curline = getline('.')
+
+    " don't touch our first line and any blank line
+    if curline =~ "implements" || curline =~ "^$"
+        " supress information about calling this function
+        echo "" 
+        return
+    endif
+
+    " format: 'interface file:lnum:coln'
+    let mx = '^\(^\S*\)\s*\(.\{-}\):\(\d\+\):\(\d\+\)'
+
+    " parse it now into the list
+    let tokens = matchlist(curline, mx)
+
+    " convert to: 'file:lnum:coln'
+    let expr = tokens[2] . ":" . tokens[3] . ":" .  tokens[4]
+
+    " jump to it in a new tab, we use explicit lgetexpr so we can later change
+    " the behaviour via settings (like opening in vsplit instead of tab)
+    lgetexpr expr
+    tab split
+    ll 1
+
+    " center the word 
+    norm! zz 
+endfunction
+
diff --git a/sources_non_forked/vim-go/autoload/webapi/json.vim b/sources_non_forked/vim-go/autoload/webapi/json.vim
new file mode 100644
index 00000000..5d6e7ba0
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/webapi/json.vim
@@ -0,0 +1,135 @@
+" json
+" Last Change: 2012-03-08
+" Maintainer:   Yasuhiro Matsumoto <mattn.jp@gmail.com>
+" License:      This file is placed in the public domain.
+" Reference:
+"
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! webapi#json#null()
+  return 0
+endfunction
+
+function! webapi#json#true()
+  return 1
+endfunction
+
+function! webapi#json#false()
+  return 0
+endfunction
+
+function! s:nr2byte(nr)
+  if a:nr < 0x80
+    return nr2char(a:nr)
+  elseif a:nr < 0x800
+    return nr2char(a:nr/64+192).nr2char(a:nr%64+128)
+  else
+    return nr2char(a:nr/4096%16+224).nr2char(a:nr/64%64+128).nr2char(a:nr%64+128)
+  endif
+endfunction
+
+function! s:nr2enc_char(charcode)
+  if &encoding == 'utf-8'
+    return nr2char(a:charcode)
+  endif
+  let char = s:nr2byte(a:charcode)
+  if strlen(char) > 1
+    let char = strtrans(iconv(char, 'utf-8', &encoding))
+  endif
+  return char
+endfunction
+
+function! s:fixup(val, tmp)
+  if type(a:val) == 0
+    return a:val
+  elseif type(a:val) == 1
+    if a:val == a:tmp.'null'
+      return function('webapi#json#null')
+    elseif a:val == a:tmp.'true'
+      return function('webapi#json#true')
+    elseif a:val == a:tmp.'false'
+      return function('webapi#json#false')
+    endif
+    return a:val
+  elseif type(a:val) == 2
+    return a:val
+  elseif type(a:val) == 3
+    return map(a:val, 's:fixup(v:val, a:tmp)')
+  elseif type(a:val) == 4
+    return map(a:val, 's:fixup(v:val, a:tmp)')
+  else
+    return string(a:val)
+  endif
+endfunction
+
+function! webapi#json#decode(json)
+  let json = iconv(a:json, "utf-8", &encoding)
+  if get(g:, 'webapi#json#parse_strict', 1) == 1 && substitute(substitute(substitute(
+    \ json,
+    \ '\\\%(["\\/bfnrt]\|u[0-9a-fA-F]\{4}\)', '\@', 'g'),
+    \ '"[^\"\\\n\r]*\"\|true\|false\|null\|-\?\d\+'
+    \ . '\%(\.\d*\)\?\%([eE][+\-]\{-}\d\+\)\?', ']', 'g'),
+    \ '\%(^\|:\|,\)\%(\s*\[\)\+', '', 'g') !~ '^[\],:{} \t\n]*$'
+    throw json
+  endif
+  let json = substitute(json, '\n', '', 'g')
+  let json = substitute(json, '\\u34;', '\\"', 'g')
+  if v:version >= 703 && has('patch780')
+    let json = substitute(json, '\\u\(\x\x\x\x\)', '\=iconv(nr2char(str2nr(submatch(1), 16), 1), "utf-8", &encoding)', 'g')
+  else
+    let json = substitute(json, '\\u\(\x\x\x\x\)', '\=s:nr2enc_char("0x".submatch(1))', 'g')
+  endif
+  if get(g:, 'webapi#json#allow_nil', 0) != 0
+    let tmp = '__WEBAPI_JSON__'
+    while 1
+      if stridx(json, tmp) == -1
+        break
+      endif
+      let tmp .= '_'
+    endwhile
+    let [null,true,false] = [
+    \ tmp.'null',
+    \ tmp.'true',
+    \ tmp.'false']
+    sandbox let ret = eval(json)
+    call s:fixup(ret, tmp)
+  else
+    let [null,true,false] = [0,1,0]
+    sandbox let ret = eval(json)
+  endif
+  return ret
+endfunction
+
+function! webapi#json#encode(val)
+  if type(a:val) == 0
+    return a:val
+  elseif type(a:val) == 1
+    let json = '"' . escape(a:val, '\"') . '"'
+    let json = substitute(json, "\r", '\\r', 'g')
+    let json = substitute(json, "\n", '\\n', 'g')
+    let json = substitute(json, "\t", '\\t', 'g')
+    let json = substitute(json, '\([[:cntrl:]]\)', '\=printf("\x%02d", char2nr(submatch(1)))', 'g')
+    return iconv(json, &encoding, "utf-8")
+  elseif type(a:val) == 2
+    let s = string(a:val)
+    if s == "function('webapi#json#null')"
+      return 'null'
+    elseif s == "function('webapi#json#true')"
+      return 'true'
+    elseif s == "function('webapi#json#false')"
+      return 'false'
+    endif
+  elseif type(a:val) == 3
+    return '[' . join(map(copy(a:val), 'webapi#json#encode(v:val)'), ',') . ']'
+  elseif type(a:val) == 4
+    return '{' . join(map(keys(a:val), 'webapi#json#encode(v:val).":".webapi#json#encode(a:val[v:val])'), ',') . '}'
+  else
+    return string(a:val)
+  endif
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et:
diff --git a/sources_non_forked/vim-go/compiler/go.vim b/sources_non_forked/vim-go/compiler/go.vim
new file mode 100644
index 00000000..c5ae0bd2
--- /dev/null
+++ b/sources_non_forked/vim-go/compiler/go.vim
@@ -0,0 +1,31 @@
+" Copyright 2013 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" compiler/go.vim: Vim compiler file for Go.
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "go"
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+CompilerSet makeprg=go\ build
+CompilerSet errorformat=
+      \%-G#\ %.%#,
+      \%-G%.%#panic:\ %m,
+      \%A%f:%l:%c:\ %m,
+      \%A%f:%l:\ %m,
+      \%C%*\\s%m,
+      \%-G%.%#
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
new file mode 100644
index 00000000..1dbd5860
--- /dev/null
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -0,0 +1,571 @@
+*vim-go.txt* Go development plugin
+*vim-go*
+
+===============================================================================
+#                                                                             #
+#             ##     ## #### ##     ##          ######    #######             #
+#             ##     ##  ##  ###   ###         ##    ##  ##     ##            #
+#             ##     ##  ##  #### ####         ##        ##     ##            #
+#             ##     ##  ##  ## ### ## ####### ##   #### ##     ##            #
+#              ##   ##   ##  ##     ##         ##    ##  ##     ##            #
+#               ## ##    ##  ##     ##         ##    ##  ##     ##            #
+#                ###    #### ##     ##          ######    #######             #
+#                                                                             #
+===============================================================================
+CONTENTS                                                          *go-contents*
+
+	1. Intro........................................|go-intro|
+	2. Install......................................|go-install|
+	3. Commands.....................................|go-commands|
+	4. Settings.....................................|go-settings|
+	5. Mappings.....................................|go-mappings|
+	6. Troubleshooting..............................|go-troubleshooting|
+	7. Credits......................................|go-credits|
+
+===============================================================================
+INTRO                                                                *go-intro*
+
+Go (golang) support for Vim. vim-go installs automatically all necessary
+binaries for providing seamless Vim integration.  It comes with pre-defined
+sensible settings (like auto gofmt on save), has autocomplete, snippet
+support, improved syntax highlighting, go toolchain commands, etc... It's
+highly customizable and each individual feature can be disabled/enabled
+easily.
+
+  * Improved Syntax highlighting, such as Functions, Operators, Methods..
+  * Auto completion support via `gocode`
+  * Better `gofmt` on save, keeps cursor position and doesn't break your undo
+    history
+  * Go to symbol/declaration with `godef`
+  * Automatically import packages via `goimports`
+  * Compile and `go build` your package, install it with `go install`
+  * `go run` quickly your current file/files
+  * Run `go test` and see any errors in quickfix window
+  * Lint your code with `golint`
+  * Run your code trough `go vet` to catch static errors.
+  * Advanced source analysis tool with `oracle`
+  * Precise type-safe renaming of identifiers with `gorename`
+  * List all source files and dependencies
+  * Checking with `errcheck` for unchecked errors.
+  * Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
+  * Share your current code to play.golang.org
+  * Type information about the underlying identifier 
+  * Tagbar support to show tags of the source code in a sidebar with `gotags`
+
+===============================================================================
+INSTALL                                                           *go-install*
+
+If you use pathogen, just clone it into your bundle directory: >
+
+	$ cd ~/.vim/bundle
+	$ git clone https://github.com/fatih/vim-go.git
+<
+
+For Vundle add this line to your vimrc:
+>
+  Plugin 'fatih/vim-go'
+<
+and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
+
+
+Please be sure all necessary binares are installed (such as `gocode`, `godef`,
+`goimports`, etc..). You can easily install them with the included
+|GoInstallBinaries|. Those binaries will be automatically downloaded and
+installed to your `$GOBIN` environment (if not set it will use `$GOPATH/bin`).
+It requires `git` and `hg` for fetching the individual Go packages.
+
+* Autocompletion is enabled by default via `<C-x><C-o>`, to get real-time
+completion (completion by type) install:
+https://github.com/Valloric/YouCompleteMe or
+https://github.com/Shougo/neocomplete.vim
+* To get displayed source code tag informations on a sidebar install
+https://github.com/majutsushi/tagbar.
+* For snippet feature install:
+https://github.com/SirVer/ultisnips or
+https://github.com/Shougo/neosnippet.vim.
+
+===============================================================================
+COMMANDS                                                          *go-commands*
+
+                                                                  *:GoImport*
+:GoImport [path]
+
+    Import ensures that the provided package {path} is imported in the current
+    Go buffer, using proper style and ordering.  If {path} is already being
+    imported, an error will be displayed and the buffer will be untouched.
+
+                                                                *:GoImportAs*
+:GoImportAs [localname] [path]
+
+    Same as Import, but uses a custom local name for the package.
+
+                                                                    *:GoDrop*
+:GoDrop [path]
+
+    Remove the import line for the provided package {path}, if present in the
+    current Go buffer.  If {path} is not being imported, an error will be
+    displayed and the buffer will be untouched.
+
+                                                                    *:GoLint*
+:GoLint
+
+    Run golint for the current Go file.
+
+                                                                     *:GoDoc*
+:GoDoc [word]
+
+    Open the relevant GoDoc in split window for either the word[s] passed to
+    the command or by default, the word under the cursor.
+
+                                                              *:GoDocBrowser*
+:GoDocBrowser [word]
+
+    Open the relevant GoDoc in browser for either the word[s] passed to the
+    command or by default, the word under the cursor.
+
+                                                                     *:GoFmt*
+:GoFmt
+
+    Filter the current Go buffer through gofmt.  It tries to preserve cursor
+    position and avoids replacing the buffer with stderr output.
+
+                                                                  *:GoImports*
+:GoImports
+
+    Filter the current Go buffer through goimports (needs to be installed).
+    `goimports` automatically discards/add import path based on the code. Like
+    |GoFmt|, It tries to preserve cursor position and avoids replacing the 
+    buffer with stderr output.
+
+                                                                     *:GoPlay*
+:[range]GoPlay
+
+    Share snippet to play.golang.org. If no [range] is given it shares
+    the whole file, otherwise the selected lines are shared. Snippet URL
+    is copied to system clipboard if Vim is compiled with 'clipboard' or
+     'xterm-clipboard' otherwise it's get yanked into the `""` register.
+
+                                                                     *:GoVet*
+:GoVet
+
+    Run `go vet` for the directory under your current file. Vet examines Go
+    source code and reports suspicious constructs, such as Printf calls whose
+    arguments do not align with the format string. Vet uses heuristics that do not
+    guarantee all reports are genuine problems, but it can find errors not caught
+    by the compilers.
+
+                                                                     *:GoDef*
+:GoDef [identifier]
+
+    Goto declaration/definition for the given [identifier]. If no argument is
+    given, it will jump to the declaration under the cursor. By default the
+    mapping `gd` is enabled to invoke GoDef for the identifier under the cursor. 
+    See |g:go_def_mapping_enabled| to disable it.
+
+                                                                     *:GoRun*
+:GoRun[!] [expand]
+
+    Build and run your current main package. By default all main files for the
+    current file is used. If an argument is passed, 'expand' is used as file
+    selector. For example use `:GoRun %` to select the current file only.  
+
+    If [!] is not given the first error is jumped to.
+
+                                                                   *:GoBuild*
+:GoBuild[!]
+
+    Build your package with `go build`. It automatically builds only the files
+    that depends on the current file. GoBuild doesn't produce a result file.
+    Use 'make' to create a result file. 
+
+    If [!] is not given the first error is jumped to.
+
+                                                                    *:GoInfo*
+:GoInfo
+    Show type information about the identifer under the cursor. For example
+    putting it above a function call is going to show the full function
+    signature. It uses gocode to get the type informations.
+
+
+                                                                 *:GoInstall*
+:GoInstall
+
+  Install your package with `go install`.
+
+                                                                    *:GoTest*
+:GoTest [expand]
+
+    Test your _test.go files via in your current directory. Errors are
+    populated in quickfix window.  If an argument is passed, 'expand' is used
+    as file selector (useful for cases like `:GoTest ./...`).
+
+                                                                *:GoCoverage*
+:GoCoverage
+
+    Create a coverage profile and open a browser to display the annotated
+    source code of the current package.
+
+                                                                *:GoErrCheck*
+:GoErrCheck
+
+    Check for unchecked errors in you current package. Errors are populated in
+    quickfix window.
+
+                                                                   *:GoFiles*
+:GoFiles
+
+    Show source files that depends for the current package
+
+                                                                    *:GoDeps*
+:GoDeps
+
+    Show dependencies for the current package
+
+                                                          *:GoInstallBinaries*
+:GoInstallBinaries
+
+    Download and Install all necessary Go tool binaries such as `godef`,
+    `goimports`, `gocode`, etc.. under `g:go_bin_path`
+
+                                                          *:GoUpdateBinaries*
+:GoUpdateBinaries
+
+    Download and Update previously installed Go tool binaries such as `godef`,
+    `goimports`, `gocode`, etc.. under `g:go_bin_path`. This can be used to
+    update the necessary Go binaries.
+
+                                                              *:GoImplements*
+:GoImplements
+
+    Show 'implements' relation for a selected package. A list of interfaces
+    for the type under the cursor (or selected package) is shown in a custom
+    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`.
+
+                                                                *:GoRename*
+:GoRename [to]
+
+    Rename the identifier under the cursor to the desired new name. If no
+    argument is given a prompt will ask for the desired identifier.
+
+===============================================================================
+MAPPINGS                                                        *go-mappings*
+
+vim-go has several <Plug> keys which can be used to create custom mappings
+For example, to create a mapping that `go run` the current file create a
+mapping for the `(go-run)`: >
+
+  au FileType go nmap <leader>r <Plug>(go-run)
+
+As always one is free to create more advanced mappings or functions based
+with |go-commands|. Available <Plug> keys are:
+
+                                                                  *(go-run)*
+
+Calls `go run` for the current file
+
+
+                                                                *(go-build)*
+
+Calls `go build` for the current package
+
+
+                                                                 *(go-info)*
+
+Shows type information for the word under the cursor
+
+
+                                                              *(go-install)*
+
+Calls `go install` for the current package
+
+
+                                                                 *(go-test)*
+
+Calls `go test` for the current package
+
+                                                             *(go-coverage)*
+
+Calls `go test -coverprofile-temp.out` for the current package
+
+                                                                  *(go-vet)*
+
+Calls `go vet` for the current package
+
+
+                                                                *(go-files)*
+
+Show source files that depends for the current package
+
+
+                                                                 *(go-deps)*
+
+Show dependencies for the current package
+
+                                                                  *(go-doc)*
+
+Show the relevant GoDoc for the word under the cursor in a split window
+leftabove (default mode).
+
+                                                            *(go-doc-split)*
+
+Show the relevant GoDoc for the word under the cursor in a split window.
+
+
+                                                         *(go-doc-vertical)*
+
+Show the relevant GoDoc for the word under the cursor in a vertical split
+window.
+
+
+                                                              *(go-doc-tab)*
+
+Show the relevant GoDoc for the word under the cursor in a tab window.
+
+
+                                                          *(go-doc-browser)*
+
+Show the relevant GoDoc for the word under in browser
+
+                                                                  *(go-def)*
+
+Goto declaration/definition. Results are shown in the current buffer.
+
+
+                                                            *(go-def-split)*
+
+Goto declaration/definition. Results are shown in a split window.
+
+
+                                                         *(go-def-vertical)*
+
+Goto declaration/definition. Results are shown in a vertical split window.
+
+
+                                                              *(go-def-tab)*
+
+Goto declaration/definition. Results are shown in a tab window.
+
+                                                          *(go-implements)*
+
+Show the interfaces that the type under the cursor implements.
+
+                                                              *(go-rename)*
+
+Rename the identifier under the cursor to the desired new name
+
+
+
+===============================================================================
+SETTINGS                                                        *go-settings*
+
+                                                *'g:go_play_browser_command'*
+
+Use this option to change the browser that is used to open the snippet url
+posted to play.golang.org with |:GoPlay| or for the relevant documentation
+used with |:GoDocBrowser|. By default it tries to find it automatically for
+the current OS. >
+
+  let g:play_browser_command = ''
+<
+                                                   *'g:go_play_open_browser'*
+
+Use this option to open browser after posting the snippet to play.golang.org
+with |:GoPlay|. By default it's enabled. >
+
+  let g:go_play_open_browser = 1
+<
+                                                      *'g:go_auto_type_info'*
+
+Use this option to show the type info (|:GoInfo|) for the word under the cursor
+automatically. Whenever the cursor changes the type info will be updated.
+By default it's disabled >
+
+  let g:go_auto_type_info = 0
+<
+                                                        *'g:go_fmt_autosave'*
+
+Use this option to auto |:GoFmt| on save. By default it's enabled >
+
+  let g:go_fmt_autosave = 1
+<
+                                                         *'g:go_fmt_command'*
+
+Use this option to define which tool is used to gofmt. By default `gofmt` is
+used >
+
+  let g:go_fmt_command = "gofmt"
+<
+                                                         *'g:go_fmt_options'*
+
+Use this option to add additional options to the |g:go_fmt_command|. Default
+is empty. >
+
+  let g:go_fmt_options = ''
+<
+
+                                                   *'g:go_fmt_fail_silently'*
+
+Use this option to disable showing a quickfix window when |g:go_fmt_command|
+fails. By default it's disabled. >
+
+  let g:go_fmt_fail_silently = 0
+<
+                                              *'g:go_doc_keywordprg_enabled'*
+
+Use this option to change the enable GoDoc to run on words under the cursor
+with the default K , keywordprg shortcut. This shortcut is by default set to
+use the program man. However in go using godoc is more idiomatic. Default is
+enabled. >
+
+  let g:go_doc_keywordprg_enabled = 1
+<
+                                                 *'g:go_def_mapping_enabled'*
+
+Use this option to enabled/ disable the default mapping (`gd`) for GoDef
+enabled. Disabling it allows you to map something else to the mapping `gd`.
+Default is enabled. >
+
+  let g:go_def_mapping_enabled = 1
+<
+                                                         *'g:go_doc_command'*
+
+Use this option to define which tool is used to godoc. By default `godoc` is
+used >
+
+  let g:go_doc_command = "godoc"
+<
+                                                         *'g:go_doc_options'*
+
+Use this option to add additional options to the |g:go_doc_command|. Default
+is empty. >
+
+  let g:go_doc_options = ''
+
+<                                                            *'g:go_bin_path'*
+
+Use this option to change default path for vim-go tools when using 
+|GoInstallBinaries| and |GoUpdateBinaries|. If not set `$GOBIN` or
+`$GOPATH/bin` is used. >
+
+  let g:go_bin_path = ""
+<
+                                                      *'g:go_snippet_engine'*
+
+Use this option to define the default snippet engine.  By default "ultisnips"
+is used. Use "neosnippet" for neosnippet.vim: >
+
+  let g:go_snippet_engine = "ultisnips"
+<
+
+                                      *'g:go_highlight_array_whitespace_error'*
+
+Highlights white space after "[]". >
+
+  let g:go_highlight_array_whitespace_error = 1
+<
+
+                                      *'g:go_highlight_chan_whitespace_error'*
+
+Highlights white space around the communications operator that don't follow
+the standard style. >
+
+  let g:go_highlight_chan_whitespace_error = 1
+<
+
+                                                *'g:go_highlight_extra_types'*
+
+Highlights commonly used library types (io.Reader, etc.). >
+
+  let g:go_highlight_extra_types = 1
+<
+
+                                            *'g:go_highlight_space_tab_error'*
+
+Highlights instances of tabs following spaces. >
+
+  let g:go_highlight_space_tab_error = 1
+<
+                                  *'g:go_highlight_trailing_whitespace_error'*
+
+Highlights trailing white space. >
+
+  let g:go_highlight_trailing_whitespace_error = 1
+
+<
+                                                  *'g:go_highlight_operators'*
+
+Highlights operators such as `:=` , `==`, `-=`, etc ...By default it's
+disabled. >
+
+	let g:go_highlight_operators = 0
+<
+                                                *'g:go_highlight_functions'*
+
+Highlights function names. By default it's disabled. >
+
+	let g:go_highlight_functions = 0
+<
+                                                  *'g:go_highlight_methods'*
+
+Highlights method names. By default it's disabled. >
+
+	let g:go_highlight_methods = 0
+<
+                                                  *'g:go_highlight_structs'*
+
+Highlights struct names. By default it's disabled. >
+
+	let g:go_highlight_structs = 0
+<
+===============================================================================
+TROUBLESHOOTING                                         *go-troubleshooting*
+
+I'm using Fish shell but have some problems using Vim-go~
+
+First environment variables in Fish are applied differently, it should be like:
+>
+	set -x GOPATH /your/own/gopath
+<
+Second, Vim needs a POSIX compatible shell (more info here:
+https://github.com/dag/vim-fish#teach-a-vim-to-fish). If you use Fish to open
+vim, it will make certainx shell based commands fail (means vim-go will fail
+too). To overcome this problem change the default shell by adding the
+following into your .vimrc (on the top of the file):
+>
+	if $SHELL =~ 'fish'
+	  set shell='/bin/sh'
+	endif
+<
+or
+>
+	set shell='/bin/sh'
+>
+
+I'm seeing weirds errors during the startup~
+
+If you see errors like this:
+>
+  Error installing code.google.com/p/go.tools/cmd/goimports:
+	Error installing code.google.com/p/rog-go/exp/cmd/godef:
+<
+that means your local Go setup is broken or the remote website is down.  For
+example sometimes code.google.com times out. To test, just execute a simple go
+get:
+
+>
+	go get code.google.com/p/go.tools/cmd/goimports
+<
+You'll see a more detailed error. If this works, vim-go will work too.
+
+===============================================================================
+CREDITS                                                         *go-credits*
+
+* Go Authors for offical vim plugins
+* Gocode, Godef, Golint, Oracle, Goimports, Errcheck projects and authors of
+  those projects.
+* Other vim-plugins, thanks for inspiration (vim-golang, go.vim, vim-gocode,
+  vim-godef)
+* vim-go contributors: https://github.com/fatih/vim-go/graphs/contributors
+
+
+vim:ft=help:et:ts=2:sw=2:sts=2:norl
diff --git a/sources_non_forked/vim-go/ftdetect/gofiletype.vim b/sources_non_forked/vim-go/ftdetect/gofiletype.vim
new file mode 100644
index 00000000..b658f6b0
--- /dev/null
+++ b/sources_non_forked/vim-go/ftdetect/gofiletype.vim
@@ -0,0 +1,23 @@
+" We take care to preserve the user's fileencodings and fileformats,
+" because those settings are global (not buffer local), yet we want
+" to override them for loading Go files, which are defined to be UTF-8.
+let s:current_fileformats = ''
+let s:current_fileencodings = ''
+
+" define fileencodings to open as utf-8 encoding even if it's ascii.
+function! s:gofiletype_pre()
+  let s:current_fileformats = &g:fileformats
+  let s:current_fileencodings = &g:fileencodings
+  set fileencodings=utf-8 fileformats=unix
+  setlocal filetype=go
+endfunction
+
+" restore fileencodings as others
+function! s:gofiletype_post()
+  let &g:fileformats = s:current_fileformats
+  let &g:fileencodings = s:current_fileencodings
+endfunction
+
+au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
+au BufRead *.go call s:gofiletype_pre()
+au BufReadPost *.go call s:gofiletype_post()
diff --git a/sources_non_forked/vim-go/ftplugin/go.vim b/sources_non_forked/vim-go/ftplugin/go.vim
new file mode 100644
index 00000000..548159ad
--- /dev/null
+++ b/sources_non_forked/vim-go/ftplugin/go.vim
@@ -0,0 +1,63 @@
+" Copyright 2013 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" go.vim: Vim filetype plugin for Go.
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+if !exists("g:go_auto_type_info")
+    let g:go_auto_type_info = 0
+endif
+
+setlocal formatoptions-=t
+
+setlocal comments=s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+setlocal noexpandtab
+
+compiler go
+
+if !exists("g:go_doc_keywordprg_enabled")
+    let g:go_doc_keywordprg_enabled = 1
+endif
+if g:go_doc_keywordprg_enabled
+    " keywordprg doesn't allow to use vim commands, override it
+    nnoremap <buffer> <silent> K :GoDoc<cr> 
+endif
+
+
+if !exists("g:go_def_mapping_enabled")
+    let g:go_def_mapping_enabled = 1
+endif
+if g:go_def_mapping_enabled
+   nnoremap <buffer> <silent> gd :GoDef<cr>
+endif
+
+
+let b:undo_ftplugin = "setl fo< com< cms<"
+
+" Set gocode completion
+setlocal omnifunc=go#complete#Complete
+
+" GoInfo automatic update
+if g:go_auto_type_info != 0
+    setlocal updatetime=300
+    au! CursorHold *.go nested call go#complete#Info()
+endif
+
+
+" autoload settings
+if !exists('g:go_fmt_autosave')
+    let g:go_fmt_autosave = 1
+endif
+
+if g:go_fmt_autosave
+    autocmd BufWritePre <buffer> call go#fmt#Format(-1)
+endif
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
new file mode 100644
index 00000000..e3b0940c
--- /dev/null
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -0,0 +1,92 @@
+if exists("g:go_loaded_commands")
+    finish
+endif
+let g:go_loaded_commands = 1
+
+
+" Some handy plug mappings
+nnoremap <silent> <Plug>(go-run) :<C-u>call go#cmd#Run(expand('%'))<CR>
+nnoremap <silent> <Plug>(go-build) :<C-u>call go#cmd#Build('')<CR>
+nnoremap <silent> <Plug>(go-install) :<C-u>call go#cmd#Install()<CR>
+nnoremap <silent> <Plug>(go-test) :<C-u>call go#cmd#Test('')<CR>
+nnoremap <silent> <Plug>(go-coverage) :<C-u>call go#cmd#Coverage('')<CR>
+nnoremap <silent> <Plug>(go-vet) :<C-u>call go#cmd#Vet()<CR>
+nnoremap <silent> <Plug>(go-files) :<C-u>call go#tool#Files()<CR>
+nnoremap <silent> <Plug>(go-deps) :<C-u>call go#tool#Deps()<CR>
+nnoremap <silent> <Plug>(go-info) :<C-u>call go#complete#Info()<CR>
+nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', expand('<cword>'))<CR>
+
+nnoremap <silent> <Plug>(go-implements) :<C-u>call go#oracle#Implements(-1)<CR>
+
+nnoremap <silent> <Plug>(go-rename) :<C-u>call go#rename#Rename()<CR>
+
+nnoremap <silent> <Plug>(go-def) :<C-u>call go#def#Jump()<CR>
+nnoremap <silent> <Plug>(go-def-vertical) :<C-u>call go#def#JumpMode("vsplit")<CR>
+nnoremap <silent> <Plug>(go-def-split) :<C-u>call go#def#JumpMode("split")<CR>
+nnoremap <silent> <Plug>(go-def-tab) :<C-u>call go#def#JumpMode("tab")<CR>
+
+nnoremap <silent> <Plug>(go-doc) :<C-u>call go#doc#Open("leftabove new")<CR>
+nnoremap <silent> <Plug>(go-doc-tab) :<C-u>call go#doc#Open("tabnew")<CR>
+nnoremap <silent> <Plug>(go-doc-vertical) :<C-u>call go#doc#Open("vnew")<CR>
+nnoremap <silent> <Plug>(go-doc-split) :<C-u>call go#doc#Open("split")<CR>
+nnoremap <silent> <Plug>(go-doc-browser) :<C-u>call go#doc#OpenBrowser()<CR>
+
+
+" gorename
+command! -nargs=? GoRename call go#rename#Rename(<f-args>)
+
+" oracle
+command! -range=% GoImplements call go#oracle#Implements(<count>)
+
+" tool
+command! -nargs=0 GoFiles echo go#tool#Files()
+command! -nargs=0 GoDeps echo go#tool#Deps()
+command! -nargs=* GoInfo call go#complete#Info()
+
+" cmd
+command! -nargs=* -bang GoRun call go#cmd#Run(<bang>0,<f-args>)
+command! -nargs=? -bang GoBuild call go#cmd#Build(<bang>0)
+command! -nargs=* GoInstall call go#cmd#Install(<f-args>)
+command! -nargs=* GoTest call go#cmd#Test(<f-args>)
+command! -nargs=* GoCoverage call go#cmd#Coverage(<f-args>)
+command! -nargs=0 GoVet call go#cmd#Vet()
+
+" -- play
+command! -nargs=0 -range=% GoPlay call go#play#Share(<count>, <line1>, <line2>)
+
+" -- def
+command! -nargs=* -range GoDef :call go#def#Jump(<f-args>)
+
+" -- doc
+command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#doc#Open('leftabove new', <f-args>)
+command! -nargs=* -range -complete=customlist,go#package#Complete GoDocBrowser call go#doc#OpenBrowser(<f-args>)
+
+" -- fmt
+command! -nargs=0 GoFmt call go#fmt#Format(-1)
+command! -nargs=0 GoImports call go#fmt#Format(1)
+
+" -- import
+command! -nargs=? -complete=customlist,go#package#Complete GoDrop call go#import#SwitchImport(0, '', <f-args>)
+command! -nargs=1 -complete=customlist,go#package#Complete GoImport call go#import#SwitchImport(1, '', <f-args>)
+command! -nargs=* -complete=customlist,go#package#Complete GoImportAs call go#import#SwitchImport(1, <f-args>)
+
+" -- lint
+command! GoLint call go#lint#Run()
+
+" -- errcheck
+command! GoErrCheck call go#errcheck#Run()
+
+" Disable all commands until they are fully integrated.
+"
+" command! -range=% GoOracleDescribe call go#oracle#Describe(<count>)
+" command! -range=% GoOracleCallees  call go#oracle#Callees(<count>)
+" command! -range=% GoOracleCallers call go#oracle#Callers(<count>)
+" command! -range=% GoOracleCallgraph call go#oracle#Callgraph(<count>)
+" command! -range=% GoOracleCallstack call go#oracle#Callstack(<count>)
+" command! -range=% GoOracleFreevars call go#oracle#Freevars(<count>)
+" command! -range=% GoOraclePeers call go#oracle#Peers(<count>)
+" command! -range=% GoOracleReferrers call go#oracle#Referrers(<count>)
+
+" vim:ts=4:sw=4:et
+"
+
diff --git a/sources_non_forked/vim-go/ftplugin/go/snippets.vim b/sources_non_forked/vim-go/ftplugin/go/snippets.vim
new file mode 100644
index 00000000..c8315782
--- /dev/null
+++ b/sources_non_forked/vim-go/ftplugin/go/snippets.vim
@@ -0,0 +1,36 @@
+if exists("g:go_loaded_gosnippets")
+  finish
+endif
+let g:go_loaded_gosnippets = 1
+
+" by default UltiSnips
+if !exists("g:go_snippet_engine")
+	let g:go_snippet_engine = "ultisnips"
+endif
+
+function! s:GoUltiSnips()
+	if globpath(&rtp, 'plugin/UltiSnips.vim') == ""
+		return
+	endif
+
+	if !exists("g:UltiSnipsSnippetDirectories")
+			let g:UltiSnipsSnippetDirectories = ["gosnippets/UltiSnips"]
+	else
+			let g:UltiSnipsSnippetDirectories += ["gosnippets/UltiSnips"]
+	endif
+endfunction
+
+function! s:GoNeosnippet()
+	if globpath(&rtp, 'plugin/neosnippet.vim') == ""
+		return
+	endif
+
+	let g:neosnippet#enable_snipmate_compatibility = 1
+	exec 'NeoSnippetSource' globpath(&rtp, 'gosnippets/snippets/go.snip')
+endfunction
+
+if g:go_snippet_engine == "ultisnips"
+	call s:GoUltiSnips()
+elseif g:go_snippet_engine == "neosnippet"
+	call s:GoNeosnippet()
+endif
diff --git a/sources_non_forked/vim-go/ftplugin/go/tagbar.vim b/sources_non_forked/vim-go/ftplugin/go/tagbar.vim
new file mode 100644
index 00000000..5b223638
--- /dev/null
+++ b/sources_non_forked/vim-go/ftplugin/go/tagbar.vim
@@ -0,0 +1,55 @@
+" Check if tagbar is installed under plugins or is directly under rtp
+" this covers pathgen + Vundle/Bundle
+"
+" Also make sure the ctags command exists
+"
+if !executable('ctags')
+	finish
+elseif globpath(&rtp, 'plugin/tagbar.vim') == ""
+	finish
+endif
+
+if !exists("g:go_gotags_bin")
+	let g:go_gotags_bin = "gotags"
+endif
+
+
+function! s:SetTagbar()
+	let bin_path = go#tool#BinPath(g:go_gotags_bin) 
+	if empty(bin_path) 
+		return 
+	endif
+
+	if !exists("g:tagbar_type_go")
+		let g:tagbar_type_go = {
+					\ 'ctagstype' : 'go',
+					\ 'kinds'     : [
+					\ 'p:package',
+					\ 'i:imports:1',
+					\ 'c:constants',
+					\ 'v:variables',
+					\ 't:types',
+					\ 'n:interfaces',
+					\ 'w:fields',
+					\ 'e:embedded',
+					\ 'm:methods',
+					\ 'r:constructor',
+					\ 'f:functions'
+					\ ],
+					\ 'sro' : '.',
+					\ 'kind2scope' : {
+					\ 't' : 'ctype',
+					\ 'n' : 'ntype'
+					\ },
+					\ 'scope2kind' : {
+					\ 'ctype' : 't',
+					\ 'ntype' : 'n'
+					\ },
+					\ 'ctagsbin'  : expand(bin_path),
+					\ 'ctagsargs' : '-sort -silent'
+					\ }
+	endif
+endfunction
+
+
+call s:SetTagbar()
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
new file mode 100644
index 00000000..cb499b57
--- /dev/null
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -0,0 +1,215 @@
+# Snippets for Go
+
+priority -10
+
+# when to abbriviate and when not?
+# b doesn't work here, because it ignores whitespace
+# optional local name?
+snippet import "Import declaration" b
+import (
+	"${1:package}"
+)
+endsnippet
+
+snippet package "Package declaration" b
+// Package $1 provides ${2:...}
+package ${1:main}
+${0:${VISUAL}}
+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
+
+# statements
+snippet for "For loop" b
+for ${1:condition} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet fori "Integer for loop" b
+for ${1:i} := 0; $1 < ${2:N}; $1++ {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet forr "For range loop" b
+for ${2:name} := range ${1:collection} {
+	${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
+
+snippet select "Select statement" b
+select {
+case${0}
+}
+endsnippet
+
+snippet case "Case clause" b
+case ${1:condition}:
+	${0:${VISUAL}}
+endsnippet
+
+snippet default "Default clause" b
+default:
+	${0:${VISUAL}}
+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 anon "Anonymous Function" !b
+${1:fn} := func() {
+	${2}
+}
+endsnippet
+
+# types and variables
+snippet map "Map type" b
+map[${1:keytype}]${2:valtype}
+endsnippet
+
+snippet : "Short 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
+
+snippet er "Error clause " !b
+if err != nil {
+	${0}
+}
+endsnippet
+
+snippet errn "Error return " !b
+if err != nil {
+	return err
+}
+${0}
+endsnippet
+
+snippet errn, "Error return with two return values" !b
+if err != nil {
+	return ${1:nil}, err
+}
+${0}
+endsnippet
+
+snippet errn,, "Error return with three return values" !b
+if err != nil {
+	return ${1:nil}, ${2:nil}, err
+}
+${0}
+endsnippet
+
+snippet ok "OK statement" !b
+if !ok {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet gof "Anonymous Goroutine" !b
+go func() {
+	${1}
+}()
+endsnippet
+
+snippet def "Anonymous Defer" !b
+defer func() {
+	${1}
+}()
+endsnippet
+
+snippet ff "Fmt Printf debug" !b
+fmt.Printf("${1} %+v\n", $1)
+endsnippet
+
+snippet fn "Fmt Println debug" !b
+fmt.Println("${1}")
+endsnippet
+
+snippet lf "Log Printf debug" !b
+log.Printf("${1} %+v\n", $1)
+endsnippet
+
+snippet ln "Log Println debug" !b
+log.Println("${1}")
+endsnippet
+
+snippet make "make allocation" !b
+make(${1:Type}, ${2:size})${0}
+endsnippet
+
+snippet test "test function" b
+func Test${1:Function}(t *testing.T) {
+	${2}
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/sources_non_forked/vim-go/gosnippets/snippets/go.snip b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
new file mode 100644
index 00000000..d4b16c5c
--- /dev/null
+++ b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
@@ -0,0 +1,243 @@
+# 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}
+# 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}
+		}
+	}()
+# gpl
+snippet gpl
+	/*
+	 * 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/>.
+	 *
+	 * Copyright (C) ${1:Author}, `strftime("%Y")`
+	 */
+
+	${0}
+# 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}
+	}
+# else snippet
+snippet el
+	else {
+		${1}
+	}
+# 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
+# if else
+snippet ie
+	if ${1:/* condition */} {
+		${2}
+	} else {
+		${3}
+	}
+	${0}
+# for loop
+snippet fo
+	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
+		${4}
+	}
+	${0}
+# for range loop
+snippet fr
+	for ${1:k}, ${2:v} := range ${3} {
+		${4}
+	}
+	${0}
+# function simple
+snippet fun
+	func ${1:funcName}(${2}) ${3:error} {
+		${4}
+	}
+	${0}
+# function on receiver
+snippet fum
+	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
+		${5}
+	}
+	${0}
+# Fmt Printf debug
+snippet ff
+	fmt.Printf("${1} %+v\n", ${0})
+# Fmt Println debug
+snippet fn
+	fmt.Println("${1}")
+# 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})
+# panic
+snippet pn
+	panic("${0:msg}")
+# print
+snippet pr
+	fmt.Printf("%${1:s}\n", ${2:var})
+# range
+snippet rn
+	range ${0}
+# return
+snippet rt
+	return ${0}
+# result
+snippet rs
+	result
+# select
+snippet sl
+	select {
+	case ${1:v1} := <-${2:chan1}
+		${3}
+	case ${4:v2} := <-${5:chan2}
+		${6}
+	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})
+# test function
+snippet test
+	func Test${1:Function}(t *testing.T) {
+		${2}
+	}
diff --git a/sources_non_forked/vim-go/indent/go.vim b/sources_non_forked/vim-go/indent/go.vim
new file mode 100644
index 00000000..faf4d79e
--- /dev/null
+++ b/sources_non_forked/vim-go/indent/go.vim
@@ -0,0 +1,65 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" indent/go.vim: Vim indent file for Go.
+"
+" TODO:
+" - function invocations split across lines
+" - general line splits (line ends in an operator)
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+" C indentation is too far off useful, mainly due to Go's := operator.
+" Let's just define our own.
+setlocal nolisp
+setlocal autoindent
+setlocal indentexpr=GoIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+
+if exists("*GoIndent")
+  finish
+endif
+
+function! GoIndent(lnum)
+  let prevlnum = prevnonblank(a:lnum-1)
+  if prevlnum == 0
+    " top of file
+    return 0
+  endif
+
+  " grab the previous and current line, stripping comments.
+  let prevl = substitute(getline(prevlnum), '//.*$', '', '')
+  let thisl = substitute(getline(a:lnum), '//.*$', '', '')
+  let previ = indent(prevlnum)
+
+  let ind = previ
+
+  if prevl =~ '[({]\s*$'
+    " previous line opened a block
+    let ind += &sw
+  endif
+  if prevl =~# '^\s*\(case .*\|default\):$'
+    " previous line is part of a switch statement
+    let ind += &sw
+  endif
+  " TODO: handle if the previous line is a label.
+
+  if thisl =~ '^\s*[)}]'
+    " this line closed a block
+    let ind -= &sw
+  endif
+
+  " Colons are tricky.
+  " We want to outdent if it's part of a switch ("case foo:" or "default:").
+  " We ignore trying to deal with jump labels because (a) they're rare, and
+  " (b) they're hard to disambiguate from a composite literal key.
+  if thisl =~# '^\s*\(case .*\|default\):$'
+    let ind -= &sw
+  endif
+
+  return ind
+endfunction
diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim
new file mode 100644
index 00000000..f71a64dd
--- /dev/null
+++ b/sources_non_forked/vim-go/plugin/go.vim
@@ -0,0 +1,134 @@
+" install necessary Go tools
+if exists("g:go_loaded_install")
+    finish
+endif
+let g:go_loaded_install = 1
+
+" these packages are used by vim-go and can be automatically installed if
+" needed by the user with GoInstallBinaries
+let s:packages = [
+            \ "github.com/nsf/gocode", 
+            \ "code.google.com/p/go.tools/cmd/goimports", 
+            \ "code.google.com/p/rog-go/exp/cmd/godef", 
+            \ "code.google.com/p/go.tools/cmd/oracle", 
+            \ "code.google.com/p/go.tools/cmd/gorename",
+            \ "github.com/golang/lint/golint", 
+            \ "github.com/kisielk/errcheck",
+            \ "github.com/jstemmer/gotags",
+            \ ]
+
+" Commands
+command! GoErrCheck call go#errcheck#Run()
+
+command! GoInstallBinaries call s:GoInstallBinaries(-1)
+command! GoUpdateBinaries call s:GoInstallBinaries(1)
+
+
+" GetBinPath returns the binary path of installed go tools
+function! GetBinPath()
+    let bin_path = ""
+
+    " check if our global custom path is set, if not check if $GOBIN is set so
+    " we can use it, otherwise use $GOPATH + '/bin'
+    if exists("g:go_bin_path")
+        let bin_path = g:go_bin_path
+    elseif $GOBIN != ""
+        let bin_path = $GOBIN
+    elseif $GOPATH != ""
+        " take care of multi element GOPATH's
+        let go_paths = split($GOPATH, ":")
+
+        if len(go_paths) == 1 
+            " one single PATH
+            let bin_path = $GOPATH . '/bin/'
+        else
+            " multiple paths, use the first one
+            let bin_path = go_paths[0]. '/bin/'
+        endif
+    else
+        " could not find anything
+        return ""
+    endif
+
+    " add trailing slash if there is no one
+    if bin_path[-1:-1] != '/' | let bin_path .= '/' | endif
+
+    return bin_path
+endfunction
+
+" GoInstallBinaries downloads and install all necessary binaries stated in the
+" packages variable. It uses by default $GOBIN or $GOPATH/bin as the binary
+" target install directory. GoInstallBinaries doesn't install binaries if they
+" exist, to update current binaries pass 1 to the argument.
+function! s:GoInstallBinaries(updateBinaries) 
+    if $GOPATH == ""
+        echohl Error 
+        echomsg "vim.go: $GOPATH is not set"
+        echohl None
+        return
+    endif
+
+    let err = s:CheckBinaries()
+    if err != 0
+        return
+    endif
+
+    let go_bin_path = GetBinPath()
+
+    " change $GOBIN so go get can automatically install to it
+    let $GOBIN = go_bin_path
+
+    " old_path is used to restore users own path
+    let old_path = $PATH
+
+    " vim's executable path is looking in PATH so add our go_bin path to it
+    let $PATH = $PATH . ":" .go_bin_path
+
+    for pkg in s:packages
+        let basename = fnamemodify(pkg, ":t")
+        let binname = "go_" . basename . "_bin"
+
+        let bin = basename
+        if exists("g:{binname}")
+            let bin = g:{binname}
+        endif
+
+        if !executable(bin) || a:updateBinaries == 1
+            if a:updateBinaries == 1 
+                echo "vim-go: Updating ". basename .". Reinstalling ". pkg . " to folder " . go_bin_path
+            else
+                echo "vim-go: ". basename ." not found. Installing ". pkg . " to folder " . go_bin_path
+            endif
+
+            let out = system("go get -u -v ".shellescape(pkg))
+            if v:shell_error
+                echo "Error installing ". pkg . ": " . out
+            endif
+        endif
+    endfor
+
+    " restore back!
+    let $PATH = old_path
+endfunction
+
+" CheckBinaries checks if the necessary binaries to install the Go tool
+" commands are available.
+function! s:CheckBinaries()
+    if !executable('go')
+        echohl Error | echomsg "vim-go: go executable not found." | echohl None
+        return -1
+    endif
+
+    if !executable('git')
+        echohl Error | echomsg "vim-go: git executable not found." | echohl None
+        return -1
+    endif
+
+    if !executable('hg')
+        echohl Error | echomsg "vim.go: hg (mercurial) executable not found." | echohl None
+        return -1
+    endif
+endfunction
+
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/scripts/test.sh b/sources_non_forked/vim-go/scripts/test.sh
new file mode 100644
index 00000000..d8a5b895
--- /dev/null
+++ b/sources_non_forked/vim-go/scripts/test.sh
@@ -0,0 +1,78 @@
+#!/bin/bash -e
+#
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# Tests for import.vim.
+
+cd $(dirname $0)
+
+cat > base.go <<EOF
+package test
+
+import (
+	"bytes"
+	"io"
+	"net"
+
+	"mycorp/foo"
+)
+EOF
+
+fail=0
+
+# usage: test_one command pattern
+# Pattern is a PCRE expression that will match across lines.
+test_one() {
+  echo 2>&1 -n "$1: "
+  vim -e -s -u /dev/null -U /dev/null --noplugin -c "source import.vim" \
+    -c "$1" -c 'wq! test.go' base.go
+  # ensure blank lines are treated correctly
+  if ! gofmt test.go | cmp test.go -; then
+    echo 2>&1 "gofmt conflict"
+    gofmt test.go | diff -u test.go - | sed "s/^/	/" 2>&1
+    fail=1
+    return
+  fi
+  if ! [[ $(cat test.go) =~ $2 ]]; then
+    echo 2>&1 "$2 did not match"
+    cat test.go | sed "s/^/	/" 2>&1
+    fail=1
+    return
+  fi
+  echo 2>&1 "ok"
+}
+
+# Tests for Import
+
+test_one "Import baz" '"baz".*"bytes"'
+test_one "Import io/ioutil" '"io".*"io/ioutil".*"net"'
+test_one "Import myc" '"io".*"myc".*"net"'  # prefix of a site prefix
+test_one "Import nat" '"io".*"nat".*"net"'
+test_one "Import net/http" '"net".*"net/http".*"mycorp/foo"'
+test_one "Import zoo" '"net".*"zoo".*"mycorp/foo"'
+test_one "Import mycorp/bar" '"net".*"mycorp/bar".*"mycorp/foo"'
+test_one "Import mycorp/goo" '"net".*"mycorp/foo".*"mycorp/goo"'
+
+# Tests for Drop
+
+cat > base.go <<EOF
+package test
+
+import (
+	"foo"
+
+	"something"
+	"zoo"
+)
+EOF
+
+test_one "Drop something" '\([^"]*"foo"[^"]*"zoo"[^"]*\)'
+
+rm -f base.go test.go
+if [ $fail -gt 0 ]; then
+  echo 2>&1 "FAIL"
+  exit 1
+fi
+echo 2>&1 "PASS"
diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim
new file mode 100644
index 00000000..59f72ed7
--- /dev/null
+++ b/sources_non_forked/vim-go/syntax/go.vim
@@ -0,0 +1,276 @@
+" Copyright 2009 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" go.vim: Vim syntax file for Go.
+"
+" Options:
+"   There are some options for customizing the highlighting; the recommended
+"   settings are the default values, but you can write:
+"     let OPTION_NAME = 0
+"   in your ~/.vimrc file to disable particular options. You can also write:
+"     let OPTION_NAME = 1
+"   to enable particular options. At present, all options default to on.
+"
+"   - go_highlight_array_whitespace_error
+"     Highlights white space after "[]".
+"   - go_highlight_chan_whitespace_error
+"     Highlights white space around the communications operator that don't follow
+"     the standard style.
+"   - go_highlight_extra_types
+"     Highlights commonly used library types (io.Reader, etc.).
+"   - go_highlight_space_tab_error
+"     Highlights instances of tabs following spaces.
+"   - go_highlight_trailing_whitespace_error
+"     Highlights trailing white space.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("g:go_highlight_array_whitespace_error")
+  let g:go_highlight_array_whitespace_error = 1
+endif
+
+if !exists("g:go_highlight_chan_whitespace_error")
+  let g:go_highlight_chan_whitespace_error = 1
+endif
+
+if !exists("g:go_highlight_extra_types")
+  let g:go_highlight_extra_types = 1
+endif
+
+if !exists("g:go_highlight_space_tab_error")
+  let g:go_highlight_space_tab_error = 1
+endif
+
+if !exists("g:go_highlight_trailing_whitespace_error")
+  let g:go_highlight_trailing_whitespace_error = 1
+endif
+
+if !exists("g:go_highlight_operators")
+	let g:go_highlight_operators = 1
+endif
+
+if !exists("g:go_highlight_functions")
+	let g:go_highlight_functions = 0
+endif
+
+if !exists("g:go_highlight_methods")
+	let g:go_highlight_methods = 0
+endif
+
+if !exists("g:go_highlight_structs")
+	let g:go_highlight_structs = 0
+endif
+
+syn case match
+
+syn keyword     goDirective         package import
+syn keyword     goDeclaration       var const type
+syn keyword     goDeclType          struct interface
+
+hi def link     goDirective         Statement
+hi def link     goDeclaration       Keyword
+hi def link     goDeclType          Keyword
+
+" Keywords within functions
+syn keyword     goStatement         defer go goto return break continue fallthrough
+syn keyword     goConditional       if else switch select
+syn keyword     goLabel             case default
+syn keyword     goRepeat            for range
+
+hi def link     goStatement         Statement
+hi def link     goConditional       Conditional
+hi def link     goLabel             Label
+hi def link     goRepeat            Repeat
+
+" Predefined types
+syn keyword     goType              chan map bool string error
+syn keyword     goSignedInts        int int8 int16 int32 int64 rune
+syn keyword     goUnsignedInts      byte uint uint8 uint16 uint32 uint64 uintptr
+syn keyword     goFloats            float32 float64
+syn keyword     goComplexes         complex64 complex128
+
+hi def link     goType              Type
+hi def link     goSignedInts        Type
+hi def link     goUnsignedInts      Type
+hi def link     goFloats            Type
+hi def link     goComplexes         Type
+
+" Treat func specially: it's a declaration at the start of a line, but a type
+" elsewhere. Order matters here.
+syn match       goDeclaration       /\<func\>/
+
+
+" Predefined functions and values
+syn keyword     goBuiltins          append cap close complex copy delete imag len
+syn keyword     goBuiltins          make new panic print println real recover
+syn keyword     goConstants         iota true false nil
+
+hi def link     goBuiltins          Keyword
+hi def link     goConstants         Keyword
+
+" Comments; their contents
+syn keyword     goTodo              contained TODO FIXME XXX BUG
+syn cluster     goCommentGroup      contains=goTodo
+syn region      goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell
+syn region      goComment           start="//" end="$" contains=@goCommentGroup,@Spell
+
+hi def link     goComment           Comment
+hi def link     goTodo              Todo
+
+" Go escapes
+syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
+syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
+syn match       goEscapeX           display contained "\\x\x\{2}"
+syn match       goEscapeU           display contained "\\u\x\{4}"
+syn match       goEscapeBigU        display contained "\\U\x\{8}"
+syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
+
+hi def link     goEscapeOctal       goSpecialString
+hi def link     goEscapeC           goSpecialString
+hi def link     goEscapeX           goSpecialString
+hi def link     goEscapeU           goSpecialString
+hi def link     goEscapeBigU        goSpecialString
+hi def link     goSpecialString     Special
+hi def link     goEscapeError       Error
+
+" Strings and their contents
+syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
+syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+syn region      goRawString         start=+`+ end=+`+
+
+hi def link     goString            String
+hi def link     goRawString         String
+
+" Characters; their contents
+syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
+syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
+
+hi def link     goCharacter         Character
+
+" Regions
+syn region      goBlock             start="{" end="}" transparent fold
+syn region      goParen             start='(' end=')' transparent
+
+" Integers
+syn match       goDecimalInt        "\<\d\+\([Ee]\d\+\)\?\>"
+syn match       goHexadecimalInt    "\<0x\x\+\>"
+syn match       goOctalInt          "\<0\o\+\>"
+syn match       goOctalError        "\<0\o*[89]\d*\>"
+
+hi def link     goDecimalInt        Integer
+hi def link     goHexadecimalInt    Integer
+hi def link     goOctalInt          Integer
+hi def link     Integer             Number
+
+" Floating point
+syn match       goFloat             "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             "\<\d\+[Ee][-+]\d\+\>"
+
+hi def link     goFloat             Float
+
+" Imaginary literals
+syn match       goImaginary         "\<\d\+i\>"
+syn match       goImaginary         "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         "\<\d\+[Ee][-+]\d\+i\>"
+
+hi def link     goImaginary         Number
+
+" Spaces after "[]"
+if g:go_highlight_array_whitespace_error != 0
+  syn match goSpaceError display "\(\[\]\)\@<=\s\+"
+endif
+
+" Spacing errors around the 'chan' keyword
+if g:go_highlight_chan_whitespace_error != 0
+  " receive-only annotation on chan type
+  syn match goSpaceError display "\(<-\)\@<=\s\+\(chan\>\)\@="
+  " send-only annotation on chan type
+  syn match goSpaceError display "\(\<chan\)\@<=\s\+\(<-\)\@="
+  " value-ignoring receives in a few contexts
+  syn match goSpaceError display "\(\(^\|[={(,;]\)\s*<-\)\@<=\s\+"
+endif
+
+" Extra types commonly seen
+if g:go_highlight_extra_types != 0
+  syn match goExtraType /\<bytes\.\(Buffer\)\>/
+  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+  syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
+  syn match goExtraType /\<unsafe\.Pointer\>/
+endif
+
+" Space-tab error
+if g:go_highlight_space_tab_error != 0
+  syn match goSpaceError display " \+\t"me=e-1
+endif
+
+" Trailing white space error
+if g:go_highlight_trailing_whitespace_error != 0
+  syn match goSpaceError display excludenl "\s\+$"
+endif
+
+hi def link     goExtraType         Type
+hi def link     goSpaceError        Error
+
+
+
+" included from: https://github.com/athom/more-colorful.vim/blob/master/after/syntax/go.vim
+"
+" Comments; their contents
+syn keyword     goTodo              contained NOTE
+hi def link     goTodo              Todo
+
+
+" Operators; 
+if g:go_highlight_operators != 0
+	syn match goOperator /:=/
+	syn match goOperator />=/
+	syn match goOperator /<=/
+	syn match goOperator /==/
+	syn match goOperator /!=/
+	syn match goOperator /+=/
+	syn match goOperator /-=/
+	syn match goOperator /\s>\s/
+	syn match goOperator /\s<\s/
+	syn match goOperator /\s+\s/
+	syn match goOperator /\s-\s/
+	syn match goOperator /\s\*\s/
+	syn match goOperator /\s\/\s/
+	syn match goOperator /\s%\s/
+endif
+hi def link     goOperator					Operator
+
+" Functions; 
+if g:go_highlight_functions != 0
+	syn match goFunction							/\(func\s\+\)\@<=\w\+\((\)\@=/
+	syn match goFunction							/\()\s\+\)\@<=\w\+\((\)\@=/
+endif
+hi def link     goFunction					Function
+
+" Methods; 
+if g:go_highlight_methods != 0
+	syn match goMethod								/\(\.\)\@<=\w\+\((\)\@=/
+endif
+hi def link     goMethod						Type
+
+" Structs; 
+if g:go_highlight_structs != 0
+	syn match goStruct								/\(.\)\@<=\w\+\({\)\@=/
+	syn match goStructDef							/\(type\s\+\)\@<=\w\+\(\s\+struct\s\+{\)\@=/
+endif
+hi def link     goStruct						Function
+hi def link     goStructDef         Function
+
+" Search backwards for a global declaration to start processing the syntax.
+"syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
+
+" There's a bug in the implementation of grouphere. For now, use the
+" following as a more expensive/less precise workaround.
+syn sync minlines=500
+
+let b:current_syntax = "go"
diff --git a/sources_non_forked/vim-go/syntax/godoc.vim b/sources_non_forked/vim-go/syntax/godoc.vim
new file mode 100644
index 00000000..0fba2080
--- /dev/null
+++ b/sources_non_forked/vim-go/syntax/godoc.vim
@@ -0,0 +1,47 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+syn match   godocTitle        "^\([A-Z][A-Z ]*\)$"
+hi def link godocTitle        Title
+
+" Single Line Definitions
+syn match   godocMethodRec    /\i\+\ze)/ contained
+syn match   godocMethodName   /) \zs\i\+\ze(/ contained
+syn match   godocMethod       /^func \((\i\+ [^)]*)\) \i\+(/ contains=godocMethodRec,godocMethodName
+syn match   godocFunction     /^func \zs\i\+\ze(/
+
+syn match   godocType         /^type \zs\i\+\ze.*/
+syn match   godocVar          /^var \zs\i\+\ze.*/
+syn match   godocConst        /^const \zs\i\+\ze.*/
+
+hi def link godocMethodRec    Type
+hi def link godocType         Type
+hi def link godocMethodName   Function
+hi def link godocFunction     Function
+hi def link godocVar          Identifier
+hi def link godocConst        Identifier
+
+" Definition Blocks
+syn region  godocComment      start="/\*" end="\*/" contained
+syn region  godocComment      start="//" end="$" contained
+syn match   godocDefinition   /^\s\+\i\+/ contained
+
+syn region  godocVarBlock     start=/^var (/ end=/^)/ contains=godocComment,godocDefinition
+syn region  godocConstBlock   start=/^const (/ end=/^)/ contains=godocComment,godocDefinition
+syn region  godocTypeBlock    start=/^type \i\+ \(interface\|struct\) {/ end=/^}/ matchgroup=godocType contains=godocComment,godocType
+
+hi def link godocComment      Comment
+hi def link godocDefinition   Identifier
+
+syn sync minlines=500
+
+let b:current_syntax = "godoc"
+
+" vim:ts=4 sts=2 sw=2:
diff --git a/sources_non_forked/vim-go/syntax/vimgo.vim b/sources_non_forked/vim-go/syntax/vimgo.vim
new file mode 100644
index 00000000..d62791d3
--- /dev/null
+++ b/sources_non_forked/vim-go/syntax/vimgo.vim
@@ -0,0 +1,11 @@
+if exists("b:current_syntax")
+    finish
+endif
+
+let b:current_syntax = "vimgo"
+
+syn match   goInterface /^\S*/
+syn region  goTitle start="\%1l" end=":"
+
+hi def link goInterface Type
+hi def link goTitle Label
diff --git a/sources_non_forked/vim-golang/README.md b/sources_non_forked/vim-golang/README.md
deleted file mode 100644
index aca52b78..00000000
--- a/sources_non_forked/vim-golang/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## Vim plugins have moved
-
-The vim plugins have been removed from the Go repository along with all other
-editor plugins. Please visit [The Go Wiki][1] for a current list of plugins. I
-have personally moved over to the [vim-go][2] suite of plugins.
-
-[1]: https://code.google.com/p/go-wiki/wiki/IDEsAndTextEditorPlugins 
-[2]: https://github.com/fatih/vim-go
diff --git a/sources_non_forked/vim-snippets/UltiSnips/css.snippets b/sources_non_forked/vim-snippets/UltiSnips/css.snippets
index 32c3f217..ff265093 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/css.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/css.snippets
@@ -1,19 +1,131 @@
+priority -50
+
+snippet . "selector { }"
+$1 {
+	$0
+}
+endsnippet
+
+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                     #
 ###########################################################################
 
-priority -50
-
-snippet ! "!important CSS (!)"
-${1:!important}
-endsnippet
-
-snippet fixed "Fixed Position Bottom 100% wide IE6"
-${2:bottom: auto;}top: expression(eval(document.documentElement.scrollTop+document.documentElement.clientHeight-${1:THE HEIGHT OF THIS THING IN PIXELS}));
-${3:left: expression(eval(document.documentElement.scrollLeft));
-}${4:width: expression(eval(document.documentElement.clientWidth));}$0
-endsnippet
-
 snippet background "background-attachment: scroll:fixed (background)"
 background-attachment: ${1:scroll/fixed};$0
 endsnippet
@@ -360,26 +472,10 @@ snippet text "text-indent: length (text)"
 text-indent: ${1:10}px;$0
 endsnippet
 
-snippet text "text-shadow: color-hex x y blur (text)"
-text-shadow: #${1:DDD} ${2:10px} ${3:10px} ${4:2px};$0
-endsnippet
-
-snippet text "text-shadow: color-rgb x y blur (text)"
-text-shadow: rgb(${1:255},${2:255},${3:255}) ${4:10px} ${5:10px} ${6:2px};$0
-endsnippet
-
-snippet text "text-shadow: none (text)"
-text-shadow: none;$0
-endsnippet
-
 snippet text "text-transform: capitalize:upper:lower (text)"
 text-transform: ${1:capitalize/uppercase/lowercase};$0
 endsnippet
 
-snippet text "text-transform: none (text)"
-text-transform: none;$0
-endsnippet
-
 snippet vertical "vertical-align: type (vertical)"
 vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
 endsnippet
@@ -396,10 +492,6 @@ snippet word "word-spacing:  length (word)"
 word-spacing: ${1:10px};$0
 endsnippet
 
-snippet word "word-spacing:  normal (word)"
-word-spacing: normal;$0
-endsnippet
-
 snippet z "z-index: index (z)"
 z-index: $1;$0
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
index ad217fd8..419edb4b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
@@ -17,7 +17,7 @@ ${1:name} :: ${2:Type} -> ${3:Type}
 endsnippet
 
 snippet => "Type constraint"
-(${1:Class} ${2:Type var}) => ${3:$2}
+(${1:Class} ${2:a}) => $2
 endsnippet
 
 snippet def "Function definition"
@@ -50,7 +50,7 @@ snippet | "Guard"
 endsnippet
 
 snippet \ "Lambda expression"
-\ ${1:pattern} -> ${2:expression}
+\\${1:pattern} -> ${2:expression}
 endsnippet
 
 snippet [|] "List comprehension"
@@ -61,3 +61,8 @@ snippet let "let ... in ..."
 let ${1:name} = ${2:expression}
 in ${3:expression}
 endsnippet
+
+snippet wh "where x = expression"
+where
+	${1:name} = ${2:expression}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index fee451f9..079db914 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -160,10 +160,6 @@ snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
-snippet img "XHTML <img>" w
-<img src="${1:imgsrc}">
-endsnippet
-
 snippet body "XHTML <body>"
 <body id="${1:`!p
 snip.rv = snip.fn and 'Hallo' or 'Nothin'
@@ -172,7 +168,13 @@ snip.rv = snip.fn and 'Hallo' or 'Nothin'
 </body>
 endsnippet
 
-snippet div "XHTML <div>" w
+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
+</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
 </div>
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
index e392459f..e3f3ad70 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
@@ -169,3 +169,16 @@ endsnippet
 snippet noscw "expect was not called with (js)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments});
 endsnippet
+
+snippet ethbc "expect to have been called (js)" b
+expect(${1:target}).toHaveBeenCalled();
+endsnippet
+
+snippet nthbc "expect not to have been called (js)" b
+expect(${1:target}).not.toHaveBeenCalled();
+endsnippet
+
+snippet ethbcw "expect to have been called with (js)" b
+expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
+endsnippet
+
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 41a3645f..af32c52b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -36,8 +36,8 @@ DOXYGEN = 0x2
 SPHINX  = 0x3
 GOOGLE  = 0x4
 
-SINGLE_QUOTES = 0x1
-DOUBLE_QUOTES = 0x2
+SINGLE_QUOTES = "'"
+DOUBLE_QUOTES = '"'
 
 
 class Arg(object):
@@ -69,9 +69,35 @@ def get_quoting_style(snip):
 	return DOUBLE_QUOTES
 
 def triple_quotes(snip):
-	if get_quoting_style(snip) == SINGLE_QUOTES:
-		return "'''"
-	return '"""'
+	return get_quoting_style(snip) * 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")
@@ -613,4 +639,22 @@ class Test${1:Class}(${2:unittest.TestCase}):
 		${7:pass}
 endsnippet
 
+snippet " "triple quoted string (double quotes)" b
+"""
+${1:doc}
+`!p triple_quotes_handle_trailing(snip, '"')`
+endsnippet
+
+snippet ' "triple quoted string (single quotes)" b
+'''
+${1:doc}
+`!p triple_quotes_handle_trailing(snip, "'")`
+endsnippet
+
+snippet doc "doc block (triple quotes)"
+`!p snip.rv = triple_quotes(snip)`
+${1:doc}
+`!p snip.rv = triple_quotes(snip)`
+endsnippet
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index 1b206e3d..00696963 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -128,4 +128,4 @@ snippet ife
 		${0}
 	<% end %>
 snippet pry
-  <% require 'pry'; binding.pry %>
+	<% require 'pry'; binding.pry %>
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index ddb89d9a..4fecc998 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -14,10 +14,14 @@ snippet info
 	--
 	-- ${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
@@ -52,9 +56,11 @@ snippet do
 	do
 
 snippet λ
-	\${1:x} -> ${0}
+	\\${1:x} -> ${0:expression}
 snippet \
-	\${1:x} -> ${0}
+	\\${1:x} -> ${0:expression}
+snippet (\
+	(\\${1:x} -> ${0:expression})
 snippet <-
 	${1:a} <- ${0:m a}
 snippet ←
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 5fb4aa92..7cb33dde 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -674,11 +674,11 @@ snippet ol
 		${0}
 	</ol>
 snippet ol.
-	<ol class="${1}>
+	<ol class="${1}">
 		${0}
 	</ol>
 snippet ol#
-	<ol id="${1}>
+	<ol id="${1}">
 		${0}
 	</ol>
 snippet ol+
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index 4e147a0f..f824ee28 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -42,6 +42,11 @@ 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 {
diff --git a/sources_non_forked/vim-snippets/snippets/snippets.snippets b/sources_non_forked/vim-snippets/snippets/snippets.snippets
index a97c0169..dc8de42f 100644
--- a/sources_non_forked/vim-snippets/snippets/snippets.snippets
+++ b/sources_non_forked/vim-snippets/snippets/snippets.snippets
@@ -7,3 +7,5 @@ snippet msnip
 		${0}
 snippet v
 	{VISUAL}
+snippet $
+	${${1:1}:${0:text}}
diff --git a/update_plugins.py b/update_plugins.py
index 8c4e4599..62d7e16e 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -38,7 +38,7 @@ vim-zenroom2 https://github.com/amix/vim-zenroom2
 syntastic https://github.com/scrooloose/syntastic
 vim-repeat https://github.com/tpope/vim-repeat
 vim-commentary https://github.com/tpope/vim-commentary
-vim-golang https://github.com/jnwhiteh/vim-golang
+vim-go https://github.com/fatih/vim-go
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'

From 8f6720f6bc7d439cc839837c588d232d0848d029 Mon Sep 17 00:00:00 2001
From: Sagar Jauhari <sagarjauhari@users.noreply.github.com>
Date: Thu, 1 Jan 2015 03:11:57 -0500
Subject: [PATCH 54/61] Added links to goyo and vim-zenroom plugins

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 792584bf..3b30b76f 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Opening recently opened files [mru.vim](https://github.com/vim-scripts/mru.vim):
 This vimrc even works on Windows!
 ![Screenshot 4](http://files1.wedoist.com/4e85163d97b81422240c822c82022f2f/as/screenshot_4.png)
 
-Distraction free mode (using goyo.vim and vim-zenroom2):
+Distraction free mode using [goyo.vim](https://github.com/junegunn/goyo.vim) and [vim-zenroom2](https://github.com/amix/vim-zenroom2):
 ![Screenshot 5](https://d2dq6e731uoz0t.cloudfront.net/a5182977c3d6c2a6cd3f9e97398ca8ca/as/zen_mode.jpg)
 
 

From 0f694fac46977f9d9acb123621de842a063a5ca1 Mon Sep 17 00:00:00 2001
From: Druiced <druiced@DevBox.druiced.com>
Date: Fri, 16 Jan 2015 01:43:18 -0800
Subject: [PATCH 55/61] Note to install ctags

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 792584bf..c12f2ef6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ The awesome version includes a lot of great plugins, configurations and color sc
 	git clone git://github.com/amix/vimrc.git ~/.vim_runtime
 	sh ~/.vim_runtime/install_awesome_vimrc.sh
 
+The taglist.vim plugin will require ctags (http://ctags.sourceforge.net) (Debian: apt-get install ctags)
+
 I also recommend using [Source Code Pro font from Adobe](http://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1960) (it's free and awesome font for writing and programming). The Awesome vimrc is already setup to try to use it
 
 ## How to install on Windows?

From e7a01094b62705f6e2f2c324438880a0eba55ffa Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sun, 18 Jan 2015 12:58:28 +0000
Subject: [PATCH 56/61] Updated plugins

---
 .gitignore                                    |   1 +
 sources_non_forked/goyo.vim/plugin/goyo.vim   |  89 +-
 .../nerdtree/lib/nerdtree/path.vim            |   9 +-
 sources_non_forked/syntastic/README.markdown  | 136 ++-
 .../syntastic/autoload/syntastic/c.vim        | 209 ++--
 .../syntastic/autoload/syntastic/log.vim      |  30 +-
 .../autoload/syntastic/preprocess.vim         |  74 +-
 .../syntastic/autoload/syntastic/util.vim     |  85 +-
 .../syntastic/doc/syntastic.txt               |  89 +-
 .../syntastic/plugin/syntastic.vim            | 154 +--
 .../syntastic/plugin/syntastic/balloons.vim   |  14 +-
 .../syntastic/plugin/syntastic/checker.vim    |  24 +-
 .../syntastic/plugin/syntastic/cursor.vim     |  42 +-
 .../syntastic/plugin/syntastic/loclist.vim    |  37 +-
 .../syntastic/plugin/syntastic/modemap.vim    |  23 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |  10 +-
 .../syntastic/plugin/syntastic/registry.vim   |  70 +-
 .../syntastic/plugin/syntastic/signs.vim      |   6 +-
 .../syntax_checkers/actionscript/mxmlc.vim    |   2 +-
 .../syntastic/syntax_checkers/ada/gcc.vim     |   4 +-
 .../applescript/osacompile.vim                |   2 +-
 .../syntax_checkers/arduino/avrgcc.vim        |  26 -
 .../syntax_checkers/asciidoc/asciidoc.vim     |   2 +-
 .../syntastic/syntax_checkers/asm/gcc.vim     |  22 +-
 .../syntax_checkers/bemhtml/bemhtmllint.vim   |   2 +-
 .../syntastic/syntax_checkers/bro/bro.vim     |   2 +-
 .../syntastic/syntax_checkers/c/avrgcc.vim    |   2 +-
 .../syntax_checkers/c/checkpatch.vim          |   2 +-
 .../syntax_checkers/c/clang_check.vim         |   2 +-
 .../syntax_checkers/c/clang_tidy.vim          |   2 +-
 .../syntastic/syntax_checkers/c/cppcheck.vim  |   9 +-
 .../syntastic/syntax_checkers/c/gcc.vim       |   4 +-
 .../syntastic/syntax_checkers/c/make.vim      |   2 +-
 .../syntastic/syntax_checkers/c/oclint.vim    |   9 +-
 .../syntastic/syntax_checkers/c/pc_lint.vim   |   2 +-
 .../syntastic/syntax_checkers/c/sparse.vim    |  15 +-
 .../syntastic/syntax_checkers/c/splint.vim    |   9 +-
 .../syntastic/syntax_checkers/cabal/cabal.vim |   4 +-
 .../syntax_checkers/chef/foodcritic.vim       |   2 +-
 .../syntastic/syntax_checkers/co/coco.vim     |   2 +-
 .../syntastic/syntax_checkers/cobol/cobc.vim  |   4 +-
 .../syntax_checkers/coffee/coffee.vim         |   2 +-
 .../syntax_checkers/coffee/coffeelint.vim     |   2 +-
 .../syntastic/syntax_checkers/coq/coqtop.vim  |   2 +-
 .../syntax_checkers/cpp/clang_check.vim       |   2 +-
 .../syntax_checkers/cpp/clang_tidy.vim        |   2 +-
 .../syntax_checkers/cpp/cppcheck.vim          |   9 +-
 .../syntastic/syntax_checkers/cpp/cpplint.vim |  14 +-
 .../syntastic/syntax_checkers/cpp/gcc.vim     |   4 +-
 .../syntastic/syntax_checkers/cpp/oclint.vim  |   9 +-
 .../syntastic/syntax_checkers/cpp/pc_lint.vim |   2 +-
 .../syntastic/syntax_checkers/cs/mcs.vim      |   2 +-
 .../syntastic/syntax_checkers/css/csslint.vim |   7 +-
 .../syntastic/syntax_checkers/css/phpcs.vim   |   6 +-
 .../syntax_checkers/css/prettycss.vim         |   7 +-
 .../syntastic/syntax_checkers/css/recess.vim  |   2 +-
 .../syntax_checkers/cucumber/cucumber.vim     |   2 +-
 .../syntastic/syntax_checkers/cuda/nvcc.vim   |  16 +-
 .../syntastic/syntax_checkers/d/dmd.vim       |   4 +-
 .../syntax_checkers/dart/dartanalyzer.vim     |   4 +-
 .../syntastic/syntax_checkers/docbk/igor.vim  |   2 +-
 .../syntax_checkers/docbk/xmllint.vim         |   2 +-
 .../syntax_checkers/dustjs/swiffer.vim        |   2 +-
 .../syntax_checkers/elixir/elixir.vim         |   4 +-
 .../syntax_checkers/erlang/escript.vim        |   6 +-
 .../syntax_checkers/erlang/syntaxerl.vim      |   2 +-
 .../syntastic/syntax_checkers/eruby/ruby.vim  |   4 +-
 .../syntax_checkers/fortran/gfortran.vim      |   4 +-
 .../syntastic/syntax_checkers/glsl/cgc.vim    |  16 +-
 .../syntastic/syntax_checkers/go/go.vim       |  21 +-
 .../syntastic/syntax_checkers/go/gofmt.vim    |   5 +-
 .../syntastic/syntax_checkers/go/golint.vim   |   3 +-
 .../syntastic/syntax_checkers/go/gotype.vim   |   4 +-
 .../syntastic/syntax_checkers/go/govet.vim    |  11 +-
 .../syntastic/syntax_checkers/haml/haml.vim   |   2 +-
 .../syntax_checkers/haml/haml_lint.vim        |   2 +-
 .../syntax_checkers/handlebars/handlebars.vim |   2 +-
 .../syntax_checkers/haskell/ghc-mod.vim       |   6 +-
 .../syntax_checkers/haskell/hdevtools.vim     |   2 +-
 .../syntax_checkers/haskell/hlint.vim         |   2 +-
 .../syntax_checkers/haskell/scan.vim          |   2 +-
 .../syntastic/syntax_checkers/haxe/haxe.vim   |   4 +-
 .../syntastic/syntax_checkers/hss/hss.vim     |   2 +-
 .../syntastic/syntax_checkers/html/jshint.vim |   2 +-
 .../syntastic/syntax_checkers/html/tidy.vim   | 111 +-
 .../syntax_checkers/html/validator.vim        |  22 +-
 .../syntastic/syntax_checkers/html/w3.vim     |  11 +-
 .../syntax_checkers/java/checkstyle.vim       |  12 +-
 .../syntastic/syntax_checkers/java/javac.vim  | 300 +++---
 .../javascript/closurecompiler.vim            |  12 +-
 .../syntax_checkers/javascript/eslint.vim     |   2 +-
 .../syntax_checkers/javascript/flow.vim       |  56 +
 .../syntax_checkers/javascript/gjslint.vim    |   2 +-
 .../syntax_checkers/javascript/jscs.vim       |   2 +-
 .../syntax_checkers/javascript/jshint.vim     |   2 +-
 .../syntax_checkers/javascript/jsl.vim        |   2 +-
 .../syntax_checkers/javascript/jslint.vim     |   4 +-
 .../syntax_checkers/javascript/jsxhint.vim    |   2 +-
 .../syntax_checkers/json/jsonlint.vim         |   2 +-
 .../syntax_checkers/json/jsonval.vim          |   2 +-
 .../syntastic/syntax_checkers/less/lessc.vim  |  11 +-
 .../syntastic/syntax_checkers/less/recess.vim |   2 +-
 .../syntastic/syntax_checkers/lex/flex.vim    |   2 +-
 .../syntastic/syntax_checkers/limbo/limbo.vim |   4 +-
 .../syntastic/syntax_checkers/lisp/clisp.vim  |  14 +-
 .../syntastic/syntax_checkers/llvm/llvm.vim   |   2 +-
 .../syntastic/syntax_checkers/lua/luac.vim    |   2 +-
 .../syntax_checkers/lua/luacheck.vim          |  67 ++
 .../syntax_checkers/markdown/mdl.vim          |   2 +-
 .../syntax_checkers/matlab/mlint.vim          |   2 +-
 .../syntastic/syntax_checkers/nasm/nasm.vim   |   4 +-
 .../syntastic/syntax_checkers/nroff/igor.vim  |   2 +-
 .../syntax_checkers/nroff/mandoc.vim          |   2 +-
 .../syntastic/syntax_checkers/objc/gcc.vim    |   4 +-
 .../syntastic/syntax_checkers/objc/oclint.vim |   9 +-
 .../syntastic/syntax_checkers/objcpp/gcc.vim  |   4 +-
 .../syntax_checkers/objcpp/oclint.vim         |   9 +-
 .../syntax_checkers/ocaml/camlp4o.vim         |  78 +-
 .../syntastic/syntax_checkers/perl/perl.vim   |  12 +-
 .../syntax_checkers/perl/perlcritic.vim       |  16 +-
 .../syntax_checkers/perl/podchecker.vim       |   2 +-
 .../syntastic/syntax_checkers/php/php.vim     |   2 +-
 .../syntastic/syntax_checkers/php/phpcs.vim   |  11 +-
 .../syntastic/syntax_checkers/php/phplint.vim |   2 +-
 .../syntastic/syntax_checkers/php/phpmd.vim   |   7 +-
 .../syntastic/syntax_checkers/po/msgfmt.vim   |   2 +-
 .../syntax_checkers/pod/podchecker.vim        |   2 +-
 .../syntax_checkers/puppet/puppet.vim         |   2 +-
 .../syntax_checkers/puppet/puppetlint.vim     |   2 +-
 .../syntastic/syntax_checkers/python/codec.py |  31 +
 .../syntax_checkers/python/flake8.vim         |   2 +-
 .../syntax_checkers/python/frosted.vim        |   2 +-
 .../syntastic/syntax_checkers/python/mypy.vim |   2 +-
 .../syntax_checkers/python/pep257.vim         |   4 +-
 .../syntastic/syntax_checkers/python/pep8.vim |   4 +-
 .../syntax_checkers/python/prospector.vim     |   2 +-
 .../syntax_checkers/python/py3kwarn.vim       |   2 +-
 .../syntax_checkers/python/pyflakes.vim       |   2 +-
 .../syntax_checkers/python/pylama.vim         |   2 +-
 .../syntax_checkers/python/pylint.vim         |   2 +-
 .../syntax_checkers/python/python.vim         |  12 +-
 .../syntastic/syntax_checkers/r/lint.vim      |   2 +-
 .../syntastic/syntax_checkers/r/svtools.vim   |   2 +-
 .../syntax_checkers/racket/code-ayatollah.vim |   4 +-
 .../syntax_checkers/racket/racket.vim         |   2 +-
 .../syntastic/syntax_checkers/rnc/rnv.vim     |   2 +-
 .../syntax_checkers/rst/rst2pseudoxml.vim     |   2 +-
 .../syntax_checkers/rst/rstcheck.vim          |   2 +-
 .../syntastic/syntax_checkers/ruby/jruby.vim  |   2 +-
 .../syntax_checkers/ruby/macruby.vim          |   2 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |   2 +-
 .../syntastic/syntax_checkers/ruby/reek.vim   |  59 ++
 .../syntax_checkers/ruby/rubocop.vim          |   9 +-
 .../syntax_checkers/ruby/rubylint.vim         |   2 +-
 .../syntastic/syntax_checkers/sass/sass.vim   |   4 +-
 .../syntastic/syntax_checkers/sass/sassc.vim  |   2 +-
 .../syntastic/syntax_checkers/scala/fsc.vim   |   2 +-
 .../syntax_checkers/scala/scalac.vim          |   2 +-
 .../syntax_checkers/scala/scalastyle.vim      |  10 +-
 .../syntastic/syntax_checkers/scss/sass.vim   |   2 +-
 .../syntastic/syntax_checkers/scss/sassc.vim  |   2 +-
 .../syntax_checkers/scss/scss_lint.vim        |  18 +-
 .../syntastic/syntax_checkers/sh/bashate.vim  |   2 +-
 .../syntax_checkers/sh/checkbashisms.vim      |   2 +-
 .../syntastic/syntax_checkers/sh/sh.vim       |  26 +-
 .../syntax_checkers/sh/shellcheck.vim         |   2 +-
 .../syntastic/syntax_checkers/slim/slimrb.vim |   2 +-
 .../syntax_checkers/spec/rpmlint.vim          |   2 +-
 .../syntax_checkers/tcl/nagelfar.vim          |   7 +-
 .../syntastic/syntax_checkers/tex/chktex.vim  |   2 +-
 .../syntastic/syntax_checkers/tex/lacheck.vim |   2 +-
 .../syntax_checkers/texinfo/makeinfo.vim      |   2 +-
 .../syntax_checkers/text/atdtool.vim          |   2 +-
 .../syntastic/syntax_checkers/text/igor.vim   |   2 +-
 .../syntax_checkers/text/language_check.vim   |   2 +-
 .../syntax_checkers/twig/twiglint.vim         |   2 +-
 .../syntax_checkers/typescript/tsc.vim        |   2 +-
 .../syntax_checkers/typescript/tslint.vim     |   2 +-
 .../syntastic/syntax_checkers/vala/valac.vim  |  63 +-
 .../syntax_checkers/verilog/verilator.vim     |   4 +-
 .../syntastic/syntax_checkers/vhdl/ghdl.vim   |   2 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |  32 +-
 .../syntax_checkers/xhtml/jshint.vim          |   2 +-
 .../syntastic/syntax_checkers/xhtml/tidy.vim  |  34 +-
 .../syntastic/syntax_checkers/xml/plutil.vim  |   2 +-
 .../syntastic/syntax_checkers/xml/xmllint.vim |   2 +-
 .../syntax_checkers/xslt/xmllint.vim          |   2 +-
 .../syntastic/syntax_checkers/yacc/bison.vim  |   2 +-
 .../syntastic/syntax_checkers/yaml/jsyaml.vim |   5 +-
 .../syntastic/syntax_checkers/yaml/yamlxs.vim |   3 +-
 .../syntax_checkers/z80/z80syntaxchecker.vim  |  10 +-
 .../syntastic/syntax_checkers/zpt/zptlint.vim |  11 +-
 .../syntax_checkers/zsh/shellcheck.vim        |   2 +-
 .../syntastic/syntax_checkers/zsh/zsh.vim     |   2 +-
 .../tlib/autoload/tlib/World.vim              |  15 +-
 sources_non_forked/tlib/autoload/tlib/cmd.vim |  12 +-
 .../tlib/autoload/tlib/input.vim              |  50 +-
 sources_non_forked/tlib/autoload/tlib/var.vim |  20 +-
 sources_non_forked/tlib/autoload/tlib/vcs.vim |   4 +-
 sources_non_forked/tlib/doc/tlib.txt          |  26 +-
 sources_non_forked/tlib/plugin/02tlib.vim     |   4 +-
 .../vim-airline/autoload/airline/builder.vim  | 122 ++-
 .../autoload/airline/extensions.vim           |   4 +-
 .../autoload/airline/extensions/branch.vim    |   1 +
 .../autoload/airline/extensions/ctrlp.vim     |   5 +-
 .../autoload/airline/extensions/default.vim   |   6 +-
 .../autoload/airline/extensions/quickfix.vim  |   2 +-
 .../autoload/airline/extensions/tabline.vim   |  60 +-
 .../tabline/unique_tail_improved.vim          |   2 +
 .../airline/extensions/virtualenv.vim         |   9 +-
 .../airline/extensions/whitespace.vim         |   2 +-
 .../autoload/airline/themes/bubblegum.vim     |   8 +
 .../autoload/airline/themes/durant.vim        |  59 ++
 .../vim-airline/doc/airline.txt               |   3 +
 sources_non_forked/vim-airline/t/builder.vim  |  38 +-
 .../vim-airline/t/extensions_default.vim      |   1 +
 .../vim-commentary/plugin/commentary.vim      |   5 +-
 .../vim-fugitive/plugin/fugitive.vim          |  57 +-
 sources_non_forked/vim-go/README.md           |  67 +-
 sources_non_forked/vim-go/autoload/go/cmd.vim |  48 +-
 .../vim-go/autoload/go/complete.vim           |  14 +-
 sources_non_forked/vim-go/autoload/go/def.vim |  25 +-
 sources_non_forked/vim-go/autoload/go/doc.vim |  24 +-
 .../vim-go/autoload/go/errcheck.vim           |  18 +-
 sources_non_forked/vim-go/autoload/go/fmt.vim |  27 +-
 .../vim-go/autoload/go/oracle.vim             |  47 +-
 .../vim-go/autoload/go/rename.vim             |   4 +-
 .../vim-go/autoload/go/textobj.vim            |  15 +
 .../vim-go/autoload/go/tool.vim               |  25 +-
 sources_non_forked/vim-go/autoload/go/ui.vim  |  16 +-
 sources_non_forked/vim-go/compiler/go.vim     |   6 +-
 sources_non_forked/vim-go/doc/vim-go.txt      |  74 +-
 sources_non_forked/vim-go/ftplugin/go.vim     |  47 +-
 .../vim-go/ftplugin/go/commands.vim           |  17 +-
 .../vim-go/gosnippets/UltiSnips/go.snippets   | 468 ++++++---
 .../vim-go/gosnippets/snippets/go.snip        | 301 +++---
 sources_non_forked/vim-go/plugin/go.vim       | 109 +-
 sources_non_forked/vim-go/syntax/go.vim       |  12 +-
 .../vim-multiple-cursors/.gitignore           |   1 +
 .../vim-multiple-cursors/README.md            |  77 +-
 .../autoload/multiple_cursors.vim             | 203 ++--
 .../doc/multiple_cursors.txt                  |  15 +
 .../plugin/multiple_cursors.vim               |  15 +-
 .../vim-repeat/autoload/repeat.vim            |   3 +-
 .../vim-snipmate/autoload/snipMate.vim        |   5 +-
 sources_non_forked/vim-snippets/README.md     |  18 +-
 .../vim-snippets/UltiSnips/ada.snippets       |  44 -
 .../vim-snippets/UltiSnips/all.snippets       |  12 +-
 .../vim-snippets/UltiSnips/eruby.snippets     |  61 +-
 .../vim-snippets/UltiSnips/html.snippets      |  20 +-
 .../UltiSnips/javascript.snippets             |  21 +-
 .../UltiSnips/javascript_angular.snippets     |  30 +-
 .../UltiSnips/php_laravel.snippets            | 260 +++++
 .../UltiSnips/php_phpunit.snippets            |   6 +
 .../vim-snippets/UltiSnips/ruby.snippets      | 281 +----
 .../vim-snippets/UltiSnips/rust.snippets      | 185 +---
 .../vim-snippets/UltiSnips/tex.snippets       |  11 +
 .../vim-snippets/snippets/_.snippets          |  46 +-
 .../snippets/actionscript.snippets            |   4 -
 .../vim-snippets/snippets/ada.snippets        |  38 -
 .../vim-snippets/snippets/awk.snippets        | 102 ++
 .../vim-snippets/snippets/clojure.snippets    |  45 +-
 .../snippets/codeigniter.snippets             | 218 ++++
 .../vim-snippets/snippets/fortran.snippets    |  93 ++
 .../vim-snippets/snippets/go.snippets         |   7 +-
 .../vim-snippets/snippets/haskell.snippets    |   2 +
 .../vim-snippets/snippets/html.snippets       |  12 +-
 .../vim-snippets/snippets/markdown.snippets   |  88 +-
 .../vim-snippets/snippets/python.snippets     |  13 +
 .../vim-snippets/snippets/ruby.snippets       |  22 +
 .../vim-snippets/snippets/rust.snippets       |  59 +-
 .../vim-snippets/snippets/scala.snippets      |  14 +-
 .../vim-snippets/snippets/scss.snippets       |  10 +-
 .../vim-snippets/snippets/stylus.snippets     | 994 +++++++++---------
 274 files changed, 4547 insertions(+), 3075 deletions(-)
 delete mode 100644 sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/python/codec.py
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/textobj.vim
 create mode 100644 sources_non_forked/vim-multiple-cursors/.gitignore
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/awk.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/codeigniter.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/fortran.snippets

diff --git a/.gitignore b/.gitignore
index 6524f395..66d01465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 my_configs.vim
 tags
+.DS_Store
diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index c64d4aae..7c43f4ef 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -1,4 +1,4 @@
-" Copyright (c) 2013 Junegunn Choi
+" Copyright (c) 2014 Junegunn Choi
 "
 " MIT License
 "
@@ -33,13 +33,12 @@ function! s:set_color(group, attr, color)
   execute printf("hi %s %s%s=%s", a:group, gui ? 'gui' : 'cterm', a:attr, a:color)
 endfunction
 
-function! s:blank()
-  let main = bufwinnr(t:goyo_master)
-  if main != -1
-    execute main . 'wincmd w'
-  else
+function! s:blank(repel)
+  if bufwinnr(t:goyo_pads.r) <= bufwinnr(t:goyo_pads.l) + 1
+    \ || bufwinnr(t:goyo_pads.b) <= bufwinnr(t:goyo_pads.t) + 3
     call s:goyo_off()
   endif
+  execute 'wincmd' a:repel
 endfunction
 
 function! s:init_pad(command)
@@ -59,12 +58,12 @@ function! s:init_pad(command)
   return bufnr
 endfunction
 
-function! s:setup_pad(bufnr, vert, size)
+function! s:setup_pad(bufnr, vert, size, repel)
   let win = bufwinnr(a:bufnr)
   execute win . 'wincmd w'
   execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
   augroup goyop
-    autocmd WinEnter,CursorMoved <buffer> nested call s:blank()
+    execute 'autocmd WinEnter,CursorMoved <buffer> nested call s:blank("'.a:repel.'")'
     autocmd WinLeave <buffer> call s:hide_statusline()
   augroup END
 
@@ -86,17 +85,21 @@ function! s:hmargin()
 endfunction
 
 function! s:resize_pads()
+  let t:goyo_width         = max([2, t:goyo_width])
+  let t:goyo_margin_top    = min([max([2, t:goyo_margin_top]),    &lines / 2 - 1])
+  let t:goyo_margin_bottom = min([max([2, t:goyo_margin_bottom]), &lines / 2 - 1])
+
   let hmargin = s:hmargin()
-  let tmargin = get(g:, 'goyo_margin_top', 4)
-  let bmargin = get(g:, 'goyo_margin_bottom', 4)
 
   augroup goyop
     autocmd!
   augroup END
-  call s:setup_pad(t:goyo_pads.t, 0, tmargin - 1)
-  call s:setup_pad(t:goyo_pads.b, 0, bmargin - 2)
-  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1)
-  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1)
+  call s:setup_pad(t:goyo_pads.t, 0, t:goyo_margin_top - 1, 'j')
+  call s:setup_pad(t:goyo_pads.b, 0, t:goyo_margin_bottom - 2, 'k')
+  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1, 'l')
+  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1, 'h')
+
+  let t:goyo_width = winwidth(0)
 endfunction
 
 function! s:tranquilize()
@@ -119,6 +122,41 @@ function! s:hide_statusline()
   let &l:statusline = repeat(' ', winwidth(0))
 endfunction
 
+function! s:hide_linenr()
+  if !get(g:, 'goyo_linenr', 0)
+    setlocal nonu
+    if exists('&rnu')
+      setlocal nornu
+    endif
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+endfunction
+
+function! s:maps_nop()
+  let mapped = filter(['R', 'H', 'J', 'K', 'L', '|', '_', '='],
+                    \ "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <c-w>'.escape(c, '|').' <nop>'
+  endfor
+  return mapped
+endfunction
+
+function! s:maps_resize()
+  let commands = {
+  \ '>': ':<c-u>let t:goyo_width = winwidth(0) + 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '<': ':<c-u>let t:goyo_width = winwidth(0) - 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '+': ':<c-u>let t:goyo_margin_top -= v:count1 <bar> let t:goyo_margin_bottom -= v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '-': ':<c-u>let t:goyo_margin_top += v:count1 <bar> let t:goyo_margin_bottom += v:count1 <bar> call <sid>resize_pads()<cr>'
+  \ }
+  let mapped = filter(keys(commands), "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <silent> <c-w>'.c.' '.commands[c]
+  endfor
+  return mapped
+endfunction
+
 function! s:goyo_on(width)
   let s:orig_tab = tabpagenr()
 
@@ -127,6 +165,8 @@ function! s:goyo_on(width)
 
   let t:goyo_master = winbufnr(0)
   let t:goyo_width  = a:width
+  let t:goyo_margin_top = get(g:, 'goyo_margin_top', 4)
+  let t:goyo_margin_bottom = get(g:, 'goyo_margin_bottom', 4)
   let t:goyo_pads = {}
   let t:goyo_revert =
     \ { 'laststatus':     &laststatus,
@@ -140,6 +180,7 @@ function! s:goyo_on(width)
     \   'sidescroll':     &sidescroll,
     \   'sidescrolloff':  &sidescrolloff
     \ }
+  let t:goyo_maps = extend(s:maps_nop(), s:maps_resize())
   if has('gui_running')
     let t:goyo_revert.guioptions = &guioptions
   endif
@@ -177,16 +218,7 @@ function! s:goyo_on(width)
     silent! call lightline#disable()
   endif
 
-  if !get(g:, 'goyo_linenr', 0)
-    setlocal nonu
-    if exists('&rnu')
-      setlocal nornu
-    endif
-  endif
-  if exists('&colorcolumn')
-    setlocal colorcolumn=
-  endif
-
+  call s:hide_linenr()
   " Global options
   let &winheight = max([&winminheight, 1])
   set winminheight=1
@@ -217,11 +249,11 @@ function! s:goyo_on(width)
 
   augroup goyo
     autocmd!
-    autocmd BufWinLeave <buffer> call s:goyo_off()
     autocmd TabLeave    *        call s:goyo_off()
     autocmd VimResized  *        call s:resize_pads()
     autocmd ColorScheme *        call s:tranquilize()
-    autocmd WinEnter,WinLeave <buffer> call s:hide_statusline()
+    autocmd BufWinEnter *        call s:hide_linenr() | call s:hide_statusline()
+    autocmd WinEnter,WinLeave *  call s:hide_statusline()
   augroup END
 
   call s:hide_statusline()
@@ -251,6 +283,10 @@ function! s:goyo_off()
   augroup END
   augroup! goyop
 
+  for c in t:goyo_maps
+    execute 'nunmap <c-w>'.escape(c, '|')
+  endfor
+
   let goyo_revert             = t:goyo_revert
   let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
   let goyo_disabled_signify   = t:goyo_disabled_signify
@@ -268,6 +304,7 @@ function! s:goyo_off()
   tabclose
   execute 'normal! '.s:orig_tab.'gt'
   if winbufnr(0) == goyo_orig_buffer
+    " Doesn't work if window closed with `q`
     execute printf('normal! %dG%d|', line, col)
   endif
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index ea6aa032..dbecb027 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -623,8 +623,13 @@ function! s:Path.str(...)
 
     if has_key(options, 'truncateTo')
         let limit = options['truncateTo']
-        if len(toReturn) > limit
-            let toReturn = "<" . strpart(toReturn, len(toReturn) - limit + 1)
+        if len(toReturn) > limit-1
+            let toReturn = toReturn[(len(toReturn)-limit+1):]
+            if len(split(toReturn, '/')) > 1
+                let toReturn = '</' . join(split(toReturn, '/')[1:], '/') . '/'
+            else
+                let toReturn = '<' . toReturn
+            endif
         endif
     endif
 
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 1f8ede1a..4d03421e 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -18,10 +18,27 @@
 
 
 - - -
-1\. [Introduction](#introduction)  
-2\. [Installation](#installation)  
-3\. [FAQ](#faq)  
-4\. [Other resources](#otherresources)  
+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. [The `python` checker complains about syntactically valid Python 3 constructs...](#faqpython3)  
+4.3. [Are there any local checkers for HTML5 that I can use with syntastic?](#faqhtml5)  
+4.4. [The `perl` checker has stopped working...](#faqperl)  
+4.5. [What happened to the `rustc` checker?](#faqrust)  
+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 pass additional arguments to a checker?](#faqargs)  
+4.8. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
+4.9. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
+4.10. [I have enabled multiple checkers for the current filetype.  How can I display all of the errors from all of the checkers together?](#faqaggregate)  
+4.11. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
+4.12. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
+5. [Resources](#otherresources)  
+
 - - -
 
 <a name="introduction"></a>
@@ -35,17 +52,17 @@ 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, syntax checking plugins exist for ActionScript,
-Ada, AppleScript, Arduino, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
-C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
-DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
-Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
-Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM,
-Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
-Object, OS X and iOS property lists, Puppet, Python, R, Racket, Relax NG,
-reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo,
-Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML,
-z80, Zope page templates, and zsh.  See the [wiki][3] for details about the
-corresponding supported checkers.
+Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
+Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
+Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell,
+Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo,
+LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM, Objective-C,
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
+iOS property lists, Puppet, Python, R, Racket, Relax NG, reStructuredText, RPM
+spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
+Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
+and zsh.  See the [wiki][3] for details about the corresponding supported
+checkers.
 
 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
@@ -128,18 +145,36 @@ If you get an error when you do this, then you probably didn't install
 following:
 
 1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
-2. Added the `call pathogen#infect()` line to your `~/.vimrc` file
+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 a large number of 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>
 
-## 3\. FAQ
+## 4\. FAQ
 
 <a name="faqinfo"></a>
 
-__Q. I installed syntastic but it isn't reporting any errors...__
+__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
 is installed. For example: by default, python requires either `flake8` or
@@ -155,7 +190,7 @@ create an issue - or better yet, create a pull request.
 
 <a name="faqpython3"></a>
 
-__Q. The `python` checker complains about syntactically valid Python 3 constructs...__
+__4.2. Q. The `python` checker complains about syntactically valid Python 3 constructs...__
 
 A. Configure the `python` checker to call a Python 3 interpreter rather than
 Python 2, e.g:
@@ -163,9 +198,27 @@ Python 2, e.g:
 let g:syntastic_python_python_exec = '/path/to/python3'
 ```
 
+<a name="faqhtml5"></a>
+
+__4.3. Q. Are there any local checkers for HTML5 that I can use with syntastic?__
+
+[HTML Tidy][18] has a fork named [HTML Tidy for HTML5][19].  It's a drop
+in replacement, and syntastic can use it without changes.  Just install it
+somewhere and point `g:syntastic_html_tidy_exec` to its executable.
+
+Alternatively, you can install [vnu.jar][21] from the [validator.nu][20]
+project and run it as a [HTTP server][23]:
+```sh
+$ java -Xss512k -cp /path/to/vnu.jar nu.validator.servlet.Main 8888
+```
+Then you can [configure][22] syntastic to use it:
+```vim
+let g:syntastic_html_validator_api = 'http://localhost:8888/'
+```
+
 <a name="faqperl"></a>
 
-__Q. The `perl` checker has stopped working...__
+__4.4. 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`
@@ -174,14 +227,14 @@ 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:
+and set `g:syntastic_enable_perl_checker` to 1 in your `vimrc`:
 ```vim
 let g:syntastic_enable_perl_checker = 1
 ```
 
 <a name="faqrust"></a>
 
-__Q. What happened to the `rustc` checker?__
+__4.5. Q. What happened to the `rustc` checker?__
 
 A. It has been included in the [Rust compiler package][12].  If you have
 a recent version of the Rust compiler, the checker should be picked up
@@ -189,27 +242,27 @@ automatically by syntastic.
 
 <a name="faqloclist"></a>
 
-__Q. I run a checker and the location list is not updated...__  
-__Q. I run`:lopen` or `:lwindow` and the error window is empty...__
+__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:
+your `vimrc`:
 ```vim
 let g:syntastic_always_populate_loc_list = 1
 ```
 
 <a name="faqargs"></a>
 
-__Q. How can I pass additional arguments to a checker?__
+__4.7. Q. How can I pass additional arguments to a checker?__
 
 A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
 that do can be configured using global variables. The general form of the
 global `args` variables is `syntastic_<filetype>_<checker>_args`.
 
-So, If you wanted to pass "--my --args --here" to the ruby mri checker you
-would add this line to your vimrc:
+So, 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"
 ```
@@ -218,10 +271,10 @@ See `:help syntastic-checker-options` for more information.
 
 <a name="faqcheckers"></a>
 
-__Q. Syntastic supports several checkers for my filetype - how do I tell it
+__4.8. Q. Syntastic supports several checkers for my filetype - how do I tell it
 which one(s) to use?__
 
-A. Stick a line like this in your vimrc:
+A. Stick a line like this in your `vimrc`:
 ```vim
 let g:syntastic_<filetype>_checkers = ['<checker-name>']
 ```
@@ -259,7 +312,7 @@ filetype of the current file is `php`).
 
 <a name="faqstyle"></a>
 
-__Q. What is the difference between syntax checkers and style checkers?__
+__4.9. 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
@@ -289,10 +342,10 @@ See `:help syntastic_quiet_messages` for details.
 
 <a name="faqaggregate"></a>
 
-__Q. I have enabled multiple checkers for the current filetype.  How can I
+__4.10. Q. I have enabled multiple checkers for the current filetype.  How can I
 display all of the errors from all of the checkers together?__
 
-A. Set `g:syntastic_aggregate_errors` to 1 in your vimrc:
+A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
 ```vim
 let g:syntastic_aggregate_errors = 1
 ```
@@ -301,19 +354,19 @@ See `:help syntastic-aggregating-errors` for more details.
 
 <a name="faqlnext"></a>
 
-__Q. How can I jump between the different errors without using the location
+__4.11. 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 :lprev`.
+`: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][2], which provides such
+your `vimrc`, or install something like [unimpaired][2], which provides such
 mappings (among other things).
 
 <a name="faqbdelete"></a>
 
-__Q. The error window is closed automatically when I :quit the current buffer
+__4.12. 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
@@ -324,10 +377,9 @@ nnoremap <silent> <C-d> :lclose<CR>:bdelete<CR>
 cabbrev <silent> bd lclose\|bdelete
 ```
 
-
 <a name="otherresources"></a>
 
-## 4\. Other resources
+## 5\. Resources
 
 The preferred place for posting suggestions, reporting bugs, and general
 discussions related to syntastic is the [issue tracker at GitHub][4].
@@ -358,6 +410,12 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [15]: https://github.com/MarcWeber/vim-addon-manager
 [16]: https://github.com/junegunn/vim-plug/
 [17]: https://github.com/gmarik/Vundle.vim
+[18]: http://tidy.sourceforge.net/
+[19]: http://w3c.github.io/tidy-html5/
+[20]: http://about.validator.nu/
+[21]: https://github.com/validator/validator/releases/latest
+[22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
+[23]: http://validator.github.io/validator/#standalone
 
 <!--
 vim:tw=79:sw=4:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 32226482..44279d1f 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -18,9 +18,17 @@ 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) " {{{2
-    " search in the current file's directory upwards
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: looking for', a:file)
+
+    " search upwards from the current file's directory
     let config = findfile(a:file, '.;')
-    if config == '' || !filereadable(config)
+    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
 
@@ -31,6 +39,7 @@ function! syntastic#c#ReadConfig(file) " {{{2
     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
 
@@ -62,7 +71,7 @@ endfunction " }}}2
 " GetLocList() for C-like compilers
 function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     try
-        let flags = s:_getCflags(a:filetype, a:subchecker, a:options)
+        let flags = s:_get_cflags(a:filetype, a:subchecker, a:options)
     catch /\m\C^Syntastic: skip checks$/
         return []
     endtry
@@ -70,9 +79,9 @@ function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
         \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
 
-    let errorformat = s:_getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+    let errorformat = s:_get_checker_var('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
 
-    let postprocess = s:_getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+    let postprocess = s:_get_checker_var('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
         \ ['filterForeignErrors'] : []
 
     " process makeprg
@@ -91,25 +100,25 @@ function! s:_init() " {{{2
     let s:handlers = []
     let s:cflags = {}
 
-    call s:_regHandler('\m\<cairo',       's:_check_pkg', ['cairo', 'cairo'])
-    call s:_regHandler('\m\<freetype',    's:_check_pkg', ['freetype', 'freetype2', 'freetype'])
-    call s:_regHandler('\m\<glade',       's:_check_pkg', ['glade', 'libglade-2.0', 'libglade'])
-    call s:_regHandler('\m\<glib',        's:_check_pkg', ['glib', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<gtk',         's:_check_pkg', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<libsoup',     's:_check_pkg', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:_regHandler('\m\<libxml',      's:_check_pkg', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:_regHandler('\m\<pango',       's:_check_pkg', ['pango', 'pango'])
-    call s:_regHandler('\m\<SDL',         's:_check_pkg', ['sdl', 'sdl'])
-    call s:_regHandler('\m\<opengl',      's:_check_pkg', ['opengl', 'gl'])
-    call s:_regHandler('\m\<webkit',      's:_check_pkg', ['webkit', 'webkit-1.0'])
+    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:_regHandler('\m\<php\.h\>',    's:_check_php',    [])
-    call s:_regHandler('\m\<Python\.h\>', 's:_check_python', [])
-    call s:_regHandler('\m\<ruby',        's:_check_ruby',   [])
+    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
 
-" return a handler dictionary object
-function! s:_regHandler(regex, function, args) " {{{2
+" register a handler dictionary object
+function! s:_registerHandler(regex, function, args) " {{{2
     let handler = {}
     let handler["regex"] = a:regex
     let handler["func"] = function(a:function)
@@ -117,8 +126,75 @@ function! s:_regHandler(regex, function, args) " {{{2
     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, ...) " {{{2
+    if executable('pkg-config')
+        if !has_key(s:cflags, a:name)
+            for pkg in a:000
+                let pkg_flags = 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() " {{{2
+    if executable('php-config')
+        if !has_key(s:cflags, 'php')
+            let s:cflags['php'] = 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() " {{{2
+    if executable('python')
+        if !has_key(s:cflags, 'python')
+            let s:cflags['python'] = 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() " {{{2
+    if executable('ruby')
+        if !has_key(s:cflags, 'ruby')
+            let s:cflags['ruby'] = 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:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
+function! s:_get_checker_var(scope, filetype, subchecker, name, default) " {{{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}
@@ -130,10 +206,10 @@ function! s:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
 endfunction " }}}2
 
 " resolve user CFLAGS
-function! s:_getCflags(ft, ck, opts) " {{{2
+function! s:_get_cflags(ft, ck, opts) " {{{2
     " determine whether to parse header files as well
-    if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
-        if s:_getCheckerVar('g', a:ft, a:ck, 'check_header', 0)
+    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
@@ -143,21 +219,21 @@ function! s:_getCflags(ft, ck, opts) " {{{2
         let flags = get(a:opts, 'main_flags', '')
     endif
 
-    let flags .= ' ' . s:_getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_getIncludeDirs(a:ft)
+    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:_getCheckerVar('b', a:ft, a:ck, 'cflags', '')
+    let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
     if b_cflags == ''
         " check whether to search for include files at all
-        if !s:_getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
+        if !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
             if a:ft ==# 'c' || a:ft ==# 'cpp'
                 " refresh the include file search if desired
-                if s:_getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-                    let flags .= ' ' . s:_searchHeaders()
+                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:_searchHeaders()
+                        let b:syntastic_{a:ft}_includes = s:_search_headers()
                     endif
                     let flags .= ' ' . b:syntastic_{a:ft}_includes
                 endif
@@ -169,7 +245,7 @@ function! s:_getCflags(ft, ck, opts) " {{{2
     endif
 
     " add optional config file parameters
-    let config_file = s:_getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    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)
 
     return flags
@@ -177,7 +253,7 @@ 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:_getIncludeDirs(filetype) " {{{2
+function! s:_get_include_dirs(filetype) " {{{2
     let include_dirs = []
 
     if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
@@ -195,7 +271,7 @@ endfunction " }}}2
 
 " search the first 100 lines for include statements that are
 " given in the handlers dictionary
-function! s:_searchHeaders() " {{{2
+function! s:_search_headers() " {{{2
     let includes = ''
     let files = []
     let found = []
@@ -221,7 +297,7 @@ function! s:_searchHeaders() " {{{2
     " search included headers
     for hfile in files
         if hfile != ''
-            let filename = expand('%:p:h') . syntastic#util#Slash() . hfile
+            let filename = expand('%:p:h', 1) . syntastic#util#Slash() . hfile
 
             try
                 let lines = readfile(filename, '', 100)
@@ -250,69 +326,6 @@ function! s:_searchHeaders() " {{{2
     return includes
 endfunction " }}}2
 
-" try to find library with 'pkg-config'
-" search possible libraries from first to last given
-" argument until one is found
-function! s:_check_pkg(name, ...) " {{{2
-    if executable('pkg-config')
-        if !has_key(s:cflags, a:name)
-            for pkg in a:000
-                let pkg_flags = 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:_check_php() " {{{2
-    if executable('php-config')
-        if !has_key(s:cflags, 'php')
-            let s:cflags['php'] = 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 ruby headers with 'rbconfig'
-function! s:_check_ruby() " {{{2
-    if executable('ruby')
-        if !has_key(s:cflags, 'ruby')
-            let s:cflags['ruby'] = 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
-
-" try to find the python headers with distutils
-function! s:_check_python() " {{{2
-    if executable('python')
-        if !has_key(s:cflags, 'python')
-            let s:cflags['python'] = 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
-
 " }}}1
 
 " default include directories
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index f84eb1d2..8573a2fc 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -61,11 +61,11 @@ endfunction " }}}2
 " @vimlint(EVL102, 0, l:OLD_VAR)
 
 function! syntastic#log#debug(level, msg, ...) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    let leader = s:_log_timestamp()
     call s:_logRedirect(1)
 
     if a:0 > 0
@@ -81,11 +81,11 @@ function! syntastic#log#debug(level, msg, ...) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugShowOptions(level, names) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    let leader = s:_log_timestamp()
     call s:_logRedirect(1)
 
     let vlist = copy(type(a:names) == type("") ? [a:names] : a:names)
@@ -97,16 +97,16 @@ function! syntastic#log#debugShowOptions(level, names) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugShowVariables(level, names) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    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:_formatVariable(name)
+        let msg = s:_format_variable(name)
         if msg != ''
             echomsg leader . msg
         endif
@@ -116,7 +116,7 @@ function! syntastic#log#debugShowVariables(level, names) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugDump(level) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
@@ -136,14 +136,14 @@ function! s:_isDebugEnabled_dumb(level) " {{{2
     return (g:syntastic_debug / a:level) % 2
 endfunction " }}}2
 
-let s:isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
-lockvar s:isDebugEnabled
+let s:_isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
+lockvar s:_isDebugEnabled
 
 function! s:_logRedirect(on) " {{{2
     if exists("g:syntastic_debug_file")
         if a:on
             try
-                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file))
+                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file, 1))
             catch /\m^Vim\%((\a\+)\)\=:/
                 silent! redir END
                 unlet g:syntastic_debug_file
@@ -154,11 +154,15 @@ function! s:_logRedirect(on) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_logTimestamp() " {{{2
+" }}}1
+
+" Utilities {{{1
+
+function! s:_log_timestamp() " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
 endfunction " }}}2
 
-function! s:_formatVariable(name) " {{{2
+function! s:_format_variable(name) " {{{2
     let vals = []
     if exists('g:syntastic_' . a:name)
         call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 04c88583..85d59818 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -30,7 +30,7 @@ endfunction " }}}2
 
 function! syntastic#preprocess#checkstyle(errors) " {{{2
     let out = []
-    let fname = expand('%')
+    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"'))
@@ -59,6 +59,70 @@ function! syntastic#preprocess#cppcheck(errors) " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
 endfunction " }}}2
 
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! syntastic#preprocess#flow(errors) " {{{2
+    " JSON artifacts
+    let true = 1
+    let false = 0
+    let null = ''
+
+    " A hat tip to Marc Weber for this trick
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    try
+        let errs = eval(join(a:errors, ''))
+    catch
+        let errs = {}
+    endtry
+
+    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'] ? 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: unknown error format')
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker javascript/flow: unknown error format')
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/flow: unknown error format')
+    endif
+
+    return out
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
+
 function! syntastic#preprocess#killEmpty(errors) " {{{2
     return filter(copy(a:errors), 'v:val != ""')
 endfunction " }}}2
@@ -67,7 +131,7 @@ function! syntastic#preprocess#perl(errors) " {{{2
     let out = []
 
     for e in a:errors
-        let parts = matchlist(e, '\v^(.*)\sat\s(.*)\sline\s(\d+)(.*)$')
+        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
@@ -76,6 +140,9 @@ function! syntastic#preprocess#perl(errors) " {{{2
     return syntastic#util#unique(out)
 endfunction " }}}2
 
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
 function! syntastic#preprocess#prospector(errors) " {{{2
     " JSON artifacts
     let true = 1
@@ -125,6 +192,9 @@ function! syntastic#preprocess#prospector(errors) " {{{2
 
     return out
 endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
 
 function! syntastic#preprocess#rparse(errors) " {{{2
     let errlist = copy(a:errors)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index 27ef34b2..f6ef7009 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -47,6 +47,13 @@ function! syntastic#util#tmpdir() " {{{2
         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
@@ -54,6 +61,11 @@ endfunction " }}}2
 
 " Recursively remove a directory
 function! syntastic#util#rmrf(what) " {{{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'
         if !exists('s:rmrf')
             let s:rmrf =
@@ -141,14 +153,14 @@ 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
+let s:_width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
+lockvar s:_width
 
 function! syntastic#util#screenWidth(str, tabstop) " {{{2
     let chunks = split(a:str, "\t", 1)
-    let width = s:width(chunks[-1])
+    let width = s:_width(chunks[-1])
     for c in chunks[:-2]
-        let cwidth = s:width(c)
+        let cwidth = s:_width(c)
         let width += cwidth + a:tabstop - cwidth % a:tabstop
     endfor
     return width
@@ -166,7 +178,7 @@ function! syntastic#util#wideMsg(msg) " {{{2
     "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 = 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
@@ -212,7 +224,7 @@ function! syntastic#util#findInParent(what, where) " {{{2
 
     let old = ''
     while here != ''
-        let p = split(globpath(here, a:what), '\n')
+        let p = split(globpath(here, a:what, 1), '\n')
 
         if !empty(p)
             return fnamemodify(p[0], ':p')
@@ -249,8 +261,19 @@ function! syntastic#util#shescape(string) " {{{2
 endfunction " }}}2
 
 " A less noisy shellescape(expand())
-function! syntastic#util#shexpand(string) " {{{2
-    return syntastic#util#shescape(expand(a:string))
+function! syntastic#util#shexpand(string, ...) " {{{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) " {{{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
@@ -311,16 +334,38 @@ function! s:_translateFilter(filters) " {{{2
 endfunction " }}}2
 
 function! s:_translateElement(key, term) " {{{2
-    if a:key ==? 'level'
-        let ret = 'v:val["type"] !=? ' . string(a:term[0])
-    elseif a:key ==? 'type'
-        let ret = a:term ==? 'style' ? 'get(v:val, "subtype", "") !=? "style"' : 'has_key(v:val, "subtype")'
-    elseif a:key ==? 'regex'
-        let ret = 'v:val["text"] !~? ' . string(a:term)
-    elseif a:key ==? 'file'
-        let ret = 'bufname(str2nr(v:val["bufnr"])) !~# ' . string(a:term)
+    let fkey = a:key
+    if fkey[0] == '!'
+        let fkey = fkey[1:]
+        let not = 1
     else
-        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(a:key)))
+        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
@@ -332,7 +377,11 @@ function! s:_rmrf(what) " {{{2
     endif
 
     if getftype(a:what) ==# 'dir'
-        for f in split(globpath(a:what, '*'), "\n")
+        if filewritable(a:what) != 2
+            return
+        endif
+
+        for f in split(globpath(a:what, '*', 1), "\n")
             call s:_rmrf(f)
         endfor
         silent! call system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index b6d8dbe4..423bd7d9 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -21,6 +21,7 @@ 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|
@@ -85,13 +86,35 @@ You can see the list of checkers available for the current filetype with the
 
 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| for details.
+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 a large number of 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*
 
@@ -163,8 +186,9 @@ Example: >
 You can use the |:Errors| command to display the errors for the current buffer
 in the |location-list|.
 
-Note that when you use |:Errors|, the current location list is overwritten
-with Syntastic's own location list.
+Note that when you use |:Errors| the current location list is overwritten with
+Syntastic's own location list. The location list is also overwritten when
+|syntastic_auto_jump| is non-zero and the cursor has to jump to an issue.
 
 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
@@ -382,12 +406,17 @@ 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. >
+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
 <
                                                    *'syntastic_auto_loc_list'*
 Default: 2
@@ -424,8 +453,9 @@ 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 = { "latex": "tex",
-                                   \ "gentoo-metadata": "xml" }
+    let g:syntastic_filetype_map = {
+        \ "latex": "tex",
+        \ "gentoo-metadata": "xml" }
 <
 Composite filetypes can also be mapped to simple types, which disables the
 default behaviour of running both checkers against the input file: >
@@ -440,9 +470,10 @@ done).
 
 The option should be set to something like: >
 
-    let g:syntastic_mode_map = { "mode": "active",
-                               \ "active_filetypes": ["ruby", "php"],
-                               \ "passive_filetypes": ["puppet"] }
+    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
@@ -458,30 +489,49 @@ 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'*
+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'*
 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": "warnings",
-                                     \ "type":  "style",
-                                     \ "regex": '\m\[C03\d\d\]',
-                                     \ "file":  ['\m^/usr/include/', '\m\c\.h$'] }
+    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 consist of a single
-element you can omit adding the brackets (e.g. you can write "style" instead
-of ["style"]). Elements with values [] or '' are ignored (this is useful for
+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" - is matched against the messages' text as a case insensitive
               |regular-expression|
-    "file"  - is matched against the filename the error refers to, as a case
-              sensitive |regular-expression|.
+    "file"  - 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.
@@ -685,8 +735,9 @@ options that can be set, these are usually documented in the wiki:
 In the same vein, 'g:syntastic_<filetype>_<checker-name>_quiet_messages' can
 be used to restrict message filters to messages produced by specific checkers.
 Example: >
-    let g:syntastic_python_pylama_quiet_messages = { "type":  "style",
-                                                   \ "regex": '\m\[C03\d\d\]' }
+    let g:syntastic_python_pylama_quiet_messages = {
+        \ "type":  "style",
+        \ "regex": '\m\[C03\d\d\]' }
 <
 See |syntastic_quiet_messages| for the syntax.
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 4a00a1f4..3ab7c094 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.5.0-72'
+let g:_SYNTASTIC_VERSION = '3.5.0-148'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
@@ -154,7 +154,7 @@ let s:modemap = g:SyntasticModeMap.Instance()
 " @vimlint(EVL103, 1, a:argLead)
 function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) " {{{2
     let checker_names = []
-    for ft in s:resolveFiletypes()
+    for ft in s:_resolve_filetypes([])
         call extend(checker_names, s:registry.getNamesOfAvailableCheckers(ft))
     endfor
     return join(checker_names, "\n")
@@ -174,28 +174,56 @@ endfunction " }}}2
 " @vimlint(EVL103, 0, a:cmdLine)
 " @vimlint(EVL103, 0, a:argLead)
 
-command! SyntasticToggleMode call s:ToggleMode()
-command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
-            \ call s:UpdateErrors(0, <f-args>) <bar>
-            \ call syntastic#util#redraw(g:syntastic_full_redraws)
-command! Errors call s:ShowLocList()
-command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
-            \ call s:modemap.modeInfo(<f-args>) <bar>
-            \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>)) <bar>
-            \ call s:explainSkip(<f-args>)
-command! SyntasticReset
-            \ call s:ClearCache() <bar>
-            \ call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
+command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
+command! -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
+command! Errors              call SyntasticErrors()
+command! SyntasticReset      call SyntasticReset()
+command! SyntasticToggleMode call SyntasticToggleMode()
+command! SyntasticSetLoclist call SyntasticSetLoclist()
 
 " }}}1
 
-" Autocommands and hooks {{{1
+" Public API {{{1
+
+function! SyntasticCheck(...) " {{{2
+    call s:UpdateErrors(0, a:000)
+    call syntastic#util#redraw(g:syntastic_full_redraws)
+endfunction " }}}2
+
+function! SyntasticInfo(...) " {{{2
+    call s:modemap.modeInfo(a:000)
+    call s:registry.echoInfoFor(s:_resolve_filetypes(a:000))
+    call s:_explain_skip(a:000)
+endfunction " }}}2
+
+function! SyntasticErrors() " {{{2
+    call g:SyntasticLoclist.current().show()
+endfunction " }}}2
+
+function! SyntasticReset() " {{{2
+    call s:ClearCache()
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+endfunction " }}}2
+
+function! SyntasticToggleMode() " {{{2
+    call s:modemap.toggleMode()
+    call s:ClearCache()
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+    call s:modemap.echoMode()
+endfunction " }}}2
+
+function! SyntasticSetLoclist() " {{{2
+    call g:SyntasticLoclist.current().setloclist()
+endfunction " }}}2
+
+" }}}1
+
+" Autocommands {{{1
 
 augroup syntastic
-    autocmd BufReadPost * call s:BufReadPostHook()
+    autocmd BufReadPost  * call s:BufReadPostHook()
     autocmd BufWritePost * call s:BufWritePostHook()
-    autocmd BufEnter * call s:BufEnterHook()
+    autocmd BufEnter     * call s:BufEnterHook()
 augroup END
 
 if v:version > 703 || (v:version == 703 && has('patch544'))
@@ -209,14 +237,14 @@ function! s:BufReadPostHook() " {{{2
     if g:syntastic_check_on_open
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
             \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
-        call s:UpdateErrors(1)
+        call s:UpdateErrors(1, [])
     endif
 endfunction " }}}2
 
 function! s:BufWritePostHook() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
-    call s:UpdateErrors(1)
+    call s:UpdateErrors(1, [])
 endfunction " }}}2
 
 function! s:BufEnterHook() " {{{2
@@ -232,7 +260,7 @@ function! s:BufEnterHook() " {{{2
         let loclist = filter(copy(getloclist(0)), 'v:val["valid"] == 1')
         let owner = str2nr(getbufvar(bufnr(""), 'syntastic_owner_buffer'))
         let buffers = syntastic#util#unique(map(loclist, 'v:val["bufnr"]') + (owner ? [owner] : []))
-        if !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
+        if get(w:, 'syntastic_loclist_set', 0) && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
             call SyntasticLoclistHide()
         endif
     endif
@@ -242,7 +270,9 @@ function! s:QuitPreHook() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
-    call SyntasticLoclistHide()
+    if get(w:, 'syntastic_loclist_set', 0)
+        call SyntasticLoclistHide()
+    endif
 endfunction " }}}2
 
 " }}}1
@@ -250,30 +280,36 @@ endfunction " }}}2
 " Main {{{1
 
 "refresh and redraw all the error info for this buf when saving or reading
-function! s:UpdateErrors(auto_invoked, ...) " {{{2
+function! s:UpdateErrors(auto_invoked, checker_names) " {{{2
     call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
     call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS)
     call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
-        \ ': ' . (a:0 ? join(a:000) : 'default checkers'))
-    if s:skipFile()
+        \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+    if s:_skip_file()
         return
     endif
 
     call s:modemap.synch()
-    let run_checks = !a:auto_invoked || s:modemap.allowsAutoChecking(&filetype)
+    let run_checks = !a:auto_invoked || s:modemap.doAutoChecking()
     if run_checks
-        call s:CacheErrors(a:000)
+        call s:CacheErrors(a:checker_names)
     endif
 
     let loclist = g:SyntasticLoclist.current()
 
+    if exists('*SyntasticCheckHook')
+        call SyntasticCheckHook(loclist.getRaw())
+    endif
+
     " populate loclist and jump {{{3
-    let do_jump = syntastic#util#var('auto_jump')
+    let do_jump = syntastic#util#var('auto_jump') + 0
     if do_jump == 2
-        let first = loclist.getFirstIssue()
-        let type = get(first, 'type', '')
-        let do_jump = type ==? 'E'
+        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
 
     let w:syntastic_loclist_set = 0
@@ -283,7 +319,7 @@ function! s:UpdateErrors(auto_invoked, ...) " {{{2
         let w:syntastic_loclist_set = 1
         if run_checks && do_jump && !loclist.isEmpty()
             call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: jump')
-            silent! lrewind
+            execute 'silent! lrewind ' . do_jump
 
             " XXX: Vim doesn't call autocmd commands in a predictible
             " order, which can lead to missing filetype when jumping
@@ -312,13 +348,13 @@ function! s:CacheErrors(checker_names) " {{{2
     call s:ClearCache()
     let newLoclist = g:SyntasticLoclist.New([])
 
-    if !s:skipFile()
+    if !s:_skip_file()
         " debug logging {{{3
         call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . getcwd())
         " }}}3
 
-        let filetypes = s:resolveFiletypes()
+        let filetypes = s:_resolve_filetypes([])
         let aggregate_errors = syntastic#util#var('aggregate_errors') || len(filetypes) > 1
         let decorate_errors = aggregate_errors && syntastic#util#var('id_checkers')
         let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
@@ -397,18 +433,6 @@ function! s:CacheErrors(checker_names) " {{{2
     call newLoclist.deploy()
 endfunction " }}}2
 
-function! s:ToggleMode() " {{{2
-    call s:modemap.toggleMode()
-    call s:ClearCache()
-    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-    call s:modemap.echoMode()
-endfunction " }}}2
-
-"display the cached errors for this buf in the location list
-function! s:ShowLocList() " {{{2
-    call g:SyntasticLoclist.current().show()
-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
 "
@@ -440,7 +464,7 @@ function! SyntasticMake(options) " {{{2
     let old_lc_all = $LC_ALL
     " }}}3
 
-    call s:bashHack()
+    call s:_bash_hack()
 
     if has_key(a:options, 'errorformat')
         let &errorformat = a:options['errorformat']
@@ -519,7 +543,7 @@ function! SyntasticMake(options) " {{{2
     let &shellredir = old_shellredir
     " }}}3
 
-    if !s:_running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
+    if !s:_running_windows && (s:_os_name() =~ "FreeBSD" || s:_os_name() =~ "OpenBSD")
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
@@ -530,12 +554,12 @@ function! SyntasticMake(options) " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'raw loclist:', errors)
 
     if has_key(a:options, 'defaults')
-        call s:addToErrors(errors, 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:addToErrors(errors, { 'subtype': a:options['subtype'] })
+        call s:_add_to_errors(errors, { 'subtype': a:options['subtype'] })
     endif
 
     if has_key(a:options, 'Postprocess') && !empty(a:options['Postprocess'])
@@ -566,12 +590,12 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:resolveFiletypes(...) " {{{2
-    let type = a:0 ? a:1 : &filetype
+function! s:_resolve_filetypes(filetypes) " {{{2
+    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
 endfunction " }}}2
 
-function! s:ignoreFile(filename) " {{{2
+function! s:_ignore_file(filename) " {{{2
     let fname = fnamemodify(a:filename, ':p')
     for pattern in g:syntastic_ignore_files
         if fname =~# pattern
@@ -582,22 +606,22 @@ function! s:ignoreFile(filename) " {{{2
 endfunction " }}}2
 
 " Skip running in special buffers
-function! s:skipFile() " {{{2
-    let fname = expand('%')
+function! s:_skip_file() " {{{2
+    let fname = expand('%', 1)
     let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype != '') ||
-        \ !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname) ||
+        \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
         \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'skipFile: skipping')
+        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:explainSkip(...) " {{{2
-    if !a:0 && s:skipFile()
+function! s:_explain_skip(filetypes) " {{{2
+    if empty(a:filetypes) && s:_skip_file()
         let why = []
-        let fname = expand('%')
+        let fname = expand('%', 1)
 
         if get(b:, 'syntastic_skip_checks', 0)
             call add(why, 'b:syntastic_skip_checks set')
@@ -611,7 +635,7 @@ function! s:explainSkip(...) " {{{2
         if getwinvar(0, '&diff')
             call add(why, 'diff mode')
         endif
-        if s:ignoreFile(fname)
+        if s:_ignore_file(fname)
             call add(why, 'filename matching g:syntastic_ignore_files')
         endif
         if fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
@@ -623,7 +647,7 @@ function! s:explainSkip(...) " {{{2
 endfunction " }}}2
 
 " Take a list of errors and add default values to them from a:options
-function! s:addToErrors(errors, options) " {{{2
+function! s:_add_to_errors(errors, options) " {{{2
     for err in a:errors
         for key in keys(a:options)
             if !has_key(err, key) || empty(err[key])
@@ -638,12 +662,12 @@ endfunction " }}}2
 " XXX: Is this still needed?
 " The script changes &shellredir to stop the screen
 " flicking when shelling out to syntax checkers.
-function! s:bashHack() " {{{2
+function! s:_bash_hack() " {{{2
     if g:syntastic_bash_hack
         if !exists('s:shell_is_bash')
             let s:shell_is_bash =
                 \ !s:_running_windows &&
-                \ (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD") &&
+                \ (s:_os_name() !~# "FreeBSD") && (s:_os_name() !~# "OpenBSD") &&
                 \ &shell =~# '\m\<bash$'
         endif
 
@@ -653,7 +677,7 @@ function! s:bashHack() " {{{2
     endif
 endfunction " }}}2
 
-function! s:uname() " {{{2
+function! s:_os_name() " {{{2
     if !exists('s:_uname')
         let s:_uname = system('uname')
         lockvar s:_uname
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index b4f491ca..7ba575f4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -22,10 +22,10 @@ endfunction " }}}2
 
 " Update the error balloons
 function! g:SyntasticBalloonsNotifier.refresh(loclist) " {{{2
-    unlet! b:syntastic_balloons
+    unlet! b:syntastic_private_balloons
     if self.enabled() && !a:loclist.isEmpty()
-        let b:syntastic_balloons = a:loclist.balloons()
-        if !empty(b:syntastic_balloons)
+        let b:syntastic_private_balloons = a:loclist.balloons()
+        if !empty(b:syntastic_private_balloons)
             set ballooneval balloonexpr=SyntasticBalloonsExprNotifier()
         endif
     endif
@@ -34,10 +34,10 @@ endfunction " }}}2
 " Reset the error balloons
 " @vimlint(EVL103, 1, a:loclist)
 function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
-    let b:syntastic_balloons = {}
+    let b:syntastic_private_balloons = {}
     if has('balloon_eval')
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'balloons: reset')
-        unlet! b:syntastic_balloons
+        unlet! b:syntastic_private_balloons
         set noballooneval
     endif
 endfunction " }}}2
@@ -48,10 +48,10 @@ endfunction " }}}2
 " Private functions {{{1
 
 function! SyntasticBalloonsExprNotifier() " {{{2
-    if !exists('b:syntastic_balloons')
+    if !exists('b:syntastic_private_balloons')
         return ''
     endif
-    return get(b:syntastic_balloons, v:beval_lnum, '')
+    return get(b:syntastic_private_balloons, v:beval_lnum, '')
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 740b8d2a..9211e02a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -30,7 +30,7 @@ function! g:SyntasticChecker.New(args) " {{{2
     if exists('*' . prefix . 'IsAvailable')
         let newObj._isAvailableFunc = function(prefix . 'IsAvailable')
     else
-        let newObj._isAvailableFunc = function('SyntasticCheckerIsAvailableDefault')
+        let newObj._isAvailableFunc = function('s:_isAvailableDefault')
     endif
 
     if exists('*' . prefix . 'GetHighlightRegex')
@@ -51,7 +51,7 @@ endfunction " }}}2
 function! g:SyntasticChecker.getExec() " {{{2
     return
         \ expand( exists('b:syntastic_' . self._name . '_exec') ? b:syntastic_{self._name}_exec :
-        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec) )
+        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec), 1 )
 endfunction " }}}2
 
 function! g:SyntasticChecker.getExecEscaped() " {{{2
@@ -162,28 +162,18 @@ endfunction " }}}2
 
 function! g:SyntasticChecker._getOpt(opts, basename, name, default) " {{{2
     let ret = []
-    call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
-    call extend( ret, self._shescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
-    call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
+    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
 
-function! g:SyntasticChecker._shescape(opt) " {{{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
-
 " }}}1
 
-" Non-method functions {{{1
+" Private functions {{{1
 
-function! SyntasticCheckerIsAvailableDefault() dict " {{{2
+function! s:_isAvailableDefault() dict " {{{2
     return executable(self.getExec())
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index 629cf2d6..c81cf827 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -19,8 +19,8 @@ endfunction " }}}2
 function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
     if self.enabled() && !a:loclist.isEmpty()
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: refresh')
-        let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
-        let b:syntastic_line = -1
+        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()
@@ -31,26 +31,26 @@ endfunction " }}}2
 function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: reset')
     autocmd! syntastic CursorMoved
-    unlet! b:syntastic_messages
-    let b:syntastic_line = -1
+    unlet! b:syntastic_private_messages
+    let b:syntastic_private_line = -1
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
 " }}}1
 
-" Private methods {{{1
+" Private functions {{{1
 
 function! SyntasticRefreshCursor() " {{{2
-    if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
+    if !exists('b:syntastic_private_messages') || empty(b:syntastic_private_messages)
         " file not checked
         return
     endif
 
-    if !exists('b:syntastic_line')
-        let b:syntastic_line = -1
+    if !exists('b:syntastic_private_line')
+        let b:syntastic_private_line = -1
     endif
     let l = line('.')
-    let current_messages = get(b:syntastic_messages, l, {})
+    let current_messages = get(b:syntastic_private_messages, l, {})
 
     if !exists('b:syntastic_cursor_columns')
         let b:syntastic_cursor_columns = g:syntastic_cursor_columns
@@ -58,28 +58,28 @@ function! SyntasticRefreshCursor() " {{{2
 
     if b:syntastic_cursor_columns
         let c = virtcol('.')
-        if !exists('b:syntastic_idx')
-            let b:syntastic_idx = -1
+        if !exists('b:syntastic_private_idx')
+            let b:syntastic_private_idx = -1
         endif
 
-        if s:_isSameIndex(l, b:syntastic_line, c, b:syntastic_idx, current_messages)
+        if s:_is_same_index(l, b:syntastic_private_line, c, b:syntastic_private_idx, current_messages)
             return
         else
-            let b:syntastic_line = l
+            let b:syntastic_private_line = l
         endif
 
         if !empty(current_messages)
-            let b:syntastic_idx = s:_findIndex(c, current_messages)
-            call syntastic#util#wideMsg(current_messages[b:syntastic_idx].text)
+            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_idx = -1
+            let b:syntastic_private_idx = -1
             echo
         endif
     else
-        if l == b:syntastic_line
+        if l == b:syntastic_private_line
             return
         endif
-        let b:syntastic_line = l
+        let b:syntastic_private_line = l
 
         if !empty(current_messages)
             call syntastic#util#wideMsg(current_messages[0].text)
@@ -91,9 +91,9 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
-function! s:_isSameIndex(line, old_line, column, idx, messages) " {{{2
+function! s:_is_same_index(line, old_line, column, idx, messages) " {{{2
     if a:old_line >= 0 && a:line == a:old_line && a:idx >= 0
         if len(a:messages) <= 1
             return 1
@@ -113,7 +113,7 @@ function! s:_isSameIndex(line, old_line, column, idx, messages) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_findIndex(column, messages) " {{{2
+function! s:_find_index(column, messages) " {{{2
     let max = len(a:messages) - 1
     if max == 0
         return 0
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index fb7cefb7..ced93578 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -43,10 +43,10 @@ endfunction " }}}2
 function! g:SyntasticLoclist.sort() " {{{2
     if !self._sorted
         for e in self._rawLoclist
-            call s:_setScreenColumn(e)
+            call s:_set_screen_column(e)
         endfor
 
-        call sort(self._rawLoclist, self._columns ? 's:_compareErrorItemsByColumns' : 's:_compareErrorItemsByLines')
+        call sort(self._rawLoclist, self._columns ? 's:_compare_error_items_by_columns' : 's:_compare_error_items_by_lines')
 
         let self._sorted = 1
     endif
@@ -133,8 +133,19 @@ function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     return self._stl_flag
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getFirstIssue() " {{{2
-    return get(self._rawLoclist, 0, {})
+function! g:SyntasticLoclist.getFirstError(...) " {{{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() " {{{2
@@ -243,9 +254,9 @@ function! g:SyntasticLoclist.messages(buf) " {{{2
                     for l in keys(self._cachedMessages[b])
                         if len(self._cachedMessages[b][l]) > 1
                             for e in self._cachedMessages[b][l]
-                                call s:_setScreenColumn(e)
+                                call s:_set_screen_column(e)
                             endfor
-                            call sort(self._cachedMessages[b][l], 's:_compareErrorItemsByColumns')
+                            call sort(self._cachedMessages[b][l], 's:_compare_error_items_by_columns')
                         endif
                     endfor
                 endfor
@@ -253,7 +264,7 @@ function! g:SyntasticLoclist.messages(buf) " {{{2
 
             for b in keys(self._cachedMessages)
                 for l in keys(self._cachedMessages[b])
-                    call s:_removeShadowedItems(self._cachedMessages[b][l])
+                    call s:_remove_shadowed_items(self._cachedMessages[b][l])
                 endfor
             endfor
         endif
@@ -320,7 +331,7 @@ endfunction " }}}2
 
 " }}}1
 
-" Non-method functions {{{1
+" Public functions {{{1
 
 function! SyntasticLoclistHide() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
@@ -329,13 +340,13 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
 function! s:_translate(key, val) " {{{2
     return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
 endfunction " }}}2
 
-function! s:_setScreenColumn(item) " {{{2
+function! s:_set_screen_column(item) " {{{2
     if !has_key(a:item, 'scol')
         let col = get(a:item, 'col', 0)
         if col != 0 && get(a:item, 'vcol', 0) == 0
@@ -352,7 +363,7 @@ function! s:_setScreenColumn(item) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_removeShadowedItems(errors) " {{{2
+function! s:_remove_shadowed_items(errors) " {{{2
     " keep only the first message at a given column
     let i = 0
     while i < len(a:errors) - 1
@@ -384,7 +395,7 @@ function! s:_removeShadowedItems(errors) " {{{2
     endwhile
 endfunction " }}}2
 
-function! s:_compareErrorItemsByColumns(a, b) " {{{2
+function! s:_compare_error_items_by_columns(a, b) " {{{2
     if a:a['bufnr'] != a:b['bufnr']
         " group by file
         return a:a['bufnr'] - a:b['bufnr']
@@ -402,7 +413,7 @@ function! s:_compareErrorItemsByColumns(a, b) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_compareErrorItemsByLines(a, b) " {{{2
+function! s:_compare_error_items_by_lines(a, b) " {{{2
     if a:a['bufnr'] != a:b['bufnr']
         " group by file
         return a:a['bufnr'] - a:b['bufnr']
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index 6dd9490d..4b54a268 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -38,6 +38,15 @@ function! g:SyntasticModeMap.allowsAutoChecking(filetype) " {{{2
     endif
 endfunction " }}}2
 
+function! g:SyntasticModeMap.doAutoChecking() " {{{2
+    let local_mode = get(b:, 'syntastic_mode', '')
+    if local_mode ==# 'active' || local_mode ==# 'passive'
+        return local_mode ==# 'active'
+    endif
+
+    return self.allowsAutoChecking(&filetype)
+endfunction " }}}2
+
 function! g:SyntasticModeMap.isPassive() " {{{2
     return self._mode ==# 'passive'
 endfunction " }}}2
@@ -62,13 +71,13 @@ function! g:SyntasticModeMap.echoMode() " {{{2
     echo "Syntastic: " . self._mode . " mode enabled"
 endfunction " }}}2
 
-function! g:SyntasticModeMap.modeInfo(...) " {{{2
+function! g:SyntasticModeMap.modeInfo(filetypes) " {{{2
     echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION
-    let type = a:0 ? a:1 : &filetype
+    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     echomsg 'Info for filetype: ' . type
 
     call self.synch()
-    echomsg 'Mode: ' . self._mode
+    echomsg 'Global mode: ' . self._mode
     if self._mode ==# 'active'
         if len(self._passiveFiletypes)
             let plural = len(self._passiveFiletypes) != 1 ? 's' : ''
@@ -81,6 +90,14 @@ function! g:SyntasticModeMap.modeInfo(...) " {{{2
         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() ? '' : 'not ') . 'be checked automatically'
+    endif
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 11b72c6a..7f933a17 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -34,12 +34,12 @@ function! g:SyntasticNotifiers.refresh(loclist) " {{{2
         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_' . type . '_stamp')
-                    let b:syntastic_{type}_stamp = []
+                if !exists('b:syntastic_private_' . type . '_stamp')
+                    let b:syntastic_private_{type}_stamp = []
                 endif
-                if a:loclist.isNewerThan(b:syntastic_{type}_stamp) || a:loclist.isEmpty()
+                if a:loclist.isNewerThan(b:syntastic_private_{type}_stamp) || a:loclist.isEmpty()
                     call self._notifier[type].refresh(a:loclist)
-                    let b:syntastic_{type}_stamp = syntastic#util#stamp()
+                    let b:syntastic_private_{type}_stamp = syntastic#util#stamp()
                 endif
             else
                 call self._notifier[type].refresh(a:loclist)
@@ -62,7 +62,7 @@ function! g:SyntasticNotifiers.reset(loclist) " {{{2
 
         " also reset stamps
         if index(s:_PERSISTENT_NOTIFIERS, type) > -1
-            let b:syntastic_{type}_stamp = []
+            let b:syntastic_private_{type}_stamp = []
         endif
     endfor
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 8f50f8af..be597c56 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -9,7 +9,6 @@ let s:_DEFAULT_CHECKERS = {
         \ 'actionscript':['mxmlc'],
         \ 'ada':         ['gcc'],
         \ 'applescript': ['osacompile'],
-        \ 'arduino':     ['avrgcc'],
         \ 'asciidoc':    ['asciidoc'],
         \ 'asm':         ['gcc'],
         \ 'bro':         ['bro'],
@@ -92,7 +91,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'yaml':        ['jsyaml'],
         \ 'z80':         ['z80syntaxchecker'],
         \ 'zpt':         ['zptlint'],
-        \ 'zsh':         ['zsh', 'shellcheck']
+        \ 'zsh':         ['zsh', 'shellcheck'],
     \ }
 lockvar! s:_DEFAULT_CHECKERS
 
@@ -108,6 +107,25 @@ let s:_DEFAULT_FILETYPE_MAP = {
     \ }
 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
@@ -138,7 +156,7 @@ endfunction " }}}2
 " not checked for availability (that is, the corresponding IsAvailable() are
 " not run).
 function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) " {{{2
-    let ft = s:_normaliseFiletype(a:ftalias)
+    let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
 
     let checkers_map = self._checkerMap[ft]
@@ -181,13 +199,13 @@ function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
-    let ft = s:_normaliseFiletype(a:ftalias)
+    let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
     return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
 endfunction " }}}2
 
 function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
-    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normaliseFiletype(v:val)' ))
+    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normalise_filetype(v:val)' ))
     if len(ft_list) != 1
         let available = []
         let active = []
@@ -211,6 +229,30 @@ function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
     let plural = cnt != 1 ? 's' : ''
     let cklist = cnt ? join(active) : '-'
     echomsg 'Currently enabled checker' . plural . ': ' . cklist
+
+    " 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
@@ -257,17 +299,31 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:_normaliseFiletype(ftalias) " {{{2
+function! s:_normalise_filetype(ftalias) " {{{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) " {{{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) " {{{2
+    return index(s:_YCM_TYPES, a:filetype) >= 0
+endfunction " }}}2
+
 " }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 9d169490..e1616af0 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -127,10 +127,10 @@ endfunction " }}}2
 
 " Get all the ids of the SyntaxError signs in the buffer
 function! g:SyntasticSignsNotifier._bufSignIds() " {{{2
-    if !exists("b:syntastic_sign_ids")
-        let b:syntastic_sign_ids = []
+    if !exists("b:syntastic_private_sign_ids")
+        let b:syntastic_private_sign_ids = []
     endif
-    return b:syntastic_sign_ids
+    return b:syntastic_private_sign_ids
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
index dd47287d..83803bdc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -64,4 +64,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
index 14e79a04..5687ff5d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
@@ -23,7 +23,7 @@ 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))
+    return executable(expand(g:syntastic_ada_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_ada_gcc_GetLocList() dict
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim b/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
index 522e6a27..e3131f02 100644
--- a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
@@ -46,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
deleted file mode 100644
index 98647638..00000000
--- a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-"============================================================================
-"File:        avrgcc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"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_arduino_avrgcc_checker')
-    finish
-endif
-let g:loaded_syntastic_arduino_avrgcc_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'arduino',
-    \ 'name': 'avrgcc',
-    \ 'exec': 'avr-gcc',
-    \ 'redirect': 'c/avrgcc'})
-
-" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
index bec2a49d..03262e65 100644
--- a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
index f5ecebe6..7bf7eb6c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
@@ -22,14 +22,14 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_asm_gcc_IsAvailable() dict
+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))
-endfunction
+    return executable(expand(g:syntastic_asm_compiler, 1))
+endfunction " }}}1
 
-function! SyntaxCheckers_asm_gcc_GetLocList() dict
+function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
     return syntastic#c#GetLocList('asm', 'gcc', {
         \ 'errorformat':
         \     '%-G%f:%s:,' .
@@ -37,12 +37,16 @@ function! SyntaxCheckers_asm_gcc_GetLocList() dict
         \     '%f:%l:%c: %tarning: %m,' .
         \     '%f:%l: %m',
         \ 'main_flags': '-x assembler -fsyntax-only -masm=' . s:GetDialect() })
-endfunction
+endfunction " }}}1
 
-function! s:GetDialect()
+" Utilities {{{1
+
+function! s:GetDialect() " {{{2
     return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
-        \ expand('%:e') ==? 'asm' ? 'intel' : 'att'
-endfunction
+        \ expand('%:e', 1) ==? 'asm' ? 'intel' : 'att'
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'asm',
@@ -51,4 +55,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
index 7f52ed3b..03ab79be 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
@@ -32,4 +32,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
index 7a3c1672..410304be 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
index 5563d61d..0fbb9840 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
@@ -54,4 +54,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
index 56a4260f..ea64ec49 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
index 6ef9096c..8110d147 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
index 3514b55b..250506ad 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
index e4223cb2..a9d9b9eb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_cppcheck_config':
-"
-"   let g:syntastic_cppcheck_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_cppcheck_checker")
     finish
@@ -66,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
index 796d7730..4fa92166 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_c_gcc_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_c_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_c_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/make.vim b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
index 8b84173f..e477994d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/make.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
index 51f09b29..3cb8cad5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_oclint_checker")
     finish
@@ -69,4 +62,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
index 4987457c..3a606d29 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
@@ -63,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
index b7c30a0a..dfb29c91 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_sparse_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_sparse_config':
-"
-"   let g:syntastic_sparse_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_sparse_checker")
     finish
@@ -33,13 +26,15 @@ function! SyntaxCheckers_c_sparse_GetLocList() dict
         \ '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 errorformat =
+        \ '%f:%l:%v: %trror: %m,' .
+        \ '%f:%l:%v: %tarning: %m,'
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr("")},
-        \ 'returns': [0] })
+        \ 'returns': [0, 1] })
     return loclist
 endfunction
 
@@ -50,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
index f56af1ae..8d8ee321 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_splint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_splint_config':
-"
-"   let g:syntastic_splint_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_splint_checker")
     finish
@@ -59,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
index 191969be..24059feb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
@@ -40,7 +40,7 @@ function! SyntaxCheckers_cabal_cabal_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'preprocess': 'cabal',
         \ 'defaults': {'bufnr': bufnr('')} })
 endfunction
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim b/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
index e7773331..77e70cbb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
index ca31e226..4780bf1f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
index 09fd7eae..0cff0cc5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
@@ -28,7 +28,7 @@ function! SyntaxCheckers_cobol_cobc_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_cobol_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_cobol_cobc_GetLocList() dict
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
index c19c047b..a1e1a450 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index 17a656bd..53e8c5c6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -46,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
index 292bbaaa..c22bd776 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
@@ -37,4 +37,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
index 3eb7b809..a8bcc90c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'clang-check',
     \ 'redirect': 'c/clang_check'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
index e4266664..d752e661 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'clang-tidy',
     \ 'redirect': 'c/clang_tidy'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
index b4b9d344..97f30f06 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_cppcheck_config':
-"
-"   let g:syntastic_cppcheck_config_file = '.config'
 
 if exists("g:loaded_syntastic_cpp_cppcheck_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'cppcheck',
     \ 'redirect': 'c/cppcheck'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
index 60664343..d6012c6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
@@ -9,18 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about cpplint see:
-"    https://code.google.com/p/google-styleguide/
-"
-" Checker options:
-"
-" - g:syntastic_cpp_cpplint_thres (integer; default: 5)
-"   error threshold: policy violations with a severity above this
-"   value are highlighted as errors, the others are warnings
-"
-" - g:syntastic_cpp_cpplint_args (string; default: '--verbose=3')
-"   command line options to pass to cpplint
 
 if exists("g:loaded_syntastic_cpp_cpplint_checker")
     finish
@@ -61,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
index 669e6252..1243980c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_cpp_gcc_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_cpp_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_cpp_gcc_GetLocList() dict
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
index b467cd75..f0a6fd0b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_cpp_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
index 95feab5e..c1fd1c16 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
@@ -23,4 +23,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'lint-nt',
     \ 'redirect': 'c/pc_lint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim b/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
index d7662a1c..c99a2698 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
index 0fc06269..6c6b05c1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
@@ -8,11 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" Specify additional options to csslint with this option. e.g. to disable
-" warnings:
-"
-"   let g:syntastic_csslint_options = '--warnings=none'
 
 if exists('g:loaded_syntastic_css_csslint_checker')
     finish
@@ -49,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
index 86aefeb6..e2a620b1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
@@ -9,10 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpcs
-"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
-"
 
 if exists("g:loaded_syntastic_css_phpcs_checker")
     finish
@@ -26,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'phpcs',
     \ 'redirect': 'php/phpcs'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
index ee382dbd..334f4e0f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -9,11 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about PrettyCSS see:
-"
-"   - http://fidian.github.io/PrettyCSS/
-"   - https://github.com/fidian/PrettyCSS
 
 if exists("g:loaded_syntastic_css_prettycss_checker")
     finish
@@ -63,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
index 6d043e44..f1467ae6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
@@ -23,4 +23,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'recess',
     \ 'redirect': 'less/recess'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim b/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
index c06a06e5..4da2b974 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
index f93332b1..edfd4f24 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
@@ -6,18 +6,6 @@
 "
 "============================================================================
 
-" in order to also check header files add this to your .vimrc:
-" (this creates an empty .syntastic_dummy.cu file in your source directory)
-"
-"   let g:syntastic_cuda_check_header = 1
-
-" By default, nvcc and thus syntastic, defaults to the most basic architecture.
-" This can produce false errors if the developer intends to compile for newer
-" hardware and use newer features, eg. double precision numbers. To pass a
-" specific target arch to nvcc, e.g. add the following to your .vimrc:
-"
-"   let g:syntastic_cuda_arch = "sm_20"
-
 if exists("g:loaded_syntastic_cuda_nvcc_checker")
     finish
 endif
@@ -53,7 +41,7 @@ function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
         \ '%DMaking %*\a in %f,'.
         \ '%f|%l| %m'
 
-    if expand('%') =~? '\m\%(.h\|.hpp\|.cuh\)$'
+    if expand('%', 1) =~? '\m\%(.h\|.hpp\|.cuh\)$'
         if exists('g:syntastic_cuda_check_header')
             let makeprg =
                 \ 'echo > .syntastic_dummy.cu ; ' .
@@ -75,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
index d751ede3..069d486d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_d_dmd_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_d_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_d_dmd_GetLocList() dict
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
index edf71df3..4305fdf1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
@@ -53,7 +53,7 @@ function! SyntaxCheckers_dart_dartanalyzer_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2] })
+        \ 'returns': [0, 1, 2, 3] })
 
     for e in loclist
         let e['text'] = substitute(e['text'], '\m\\\([\\|]\)', '\1', 'g')
@@ -73,4 +73,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
index 46a12f6b..54488610 100644
--- a/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
index bfb9da0a..722dfadd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'xmllint',
     \ 'redirect': 'xml/xmllint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim b/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
index 0bdf2813..3e4d416c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
@@ -35,4 +35,4 @@ call SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index c834b51e..c77e7594 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -35,7 +35,7 @@ function! SyntaxCheckers_elixir_elixir_GetLocList() dict
 
     let make_options = {}
     let compile_command = 'elixir'
-    let mix_file = syntastic#util#findInParent('mix.exs', expand('%:p:h'))
+    let mix_file = syntastic#util#findInParent('mix.exs', expand('%:p:h', 1))
 
     if filereadable(mix_file)
         let compile_command = 'mix compile'
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
index b4725505..9fd869fc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
@@ -19,13 +19,13 @@ 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') . syntastic#util#Slash() . 'erlang_check_file.erl')
+let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'erlang_check_file.erl')
 
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_erlang_escript_GetLocList() dict
-    if expand('%:e') ==# 'hrl'
+    if expand('%:e', 1) ==# 'hrl'
         return []
     endif
 
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
index 91629c43..83963303 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 96f94780..012242ed 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    let fname = "'" . escape(expand('%'), "\\'") . "'"
+    let fname = "'" . escape(expand('%', 1), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
     if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped(). ' --version'), [1, 9])
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
index 935b6bb8..74a626c8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_fortran_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_fortran_gfortran_GetLocList() dict
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
index 43b9069a..5faee03c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
@@ -27,7 +27,7 @@ let s:glsl_extensions = {
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_glsl_cgc_GetLocList() dict
+function! SyntaxCheckers_glsl_cgc_GetLocList() dict " {{{1
     let makeprg = self.makeprgBuild({
         \ 'args_before': '-oglsl -profile ' . s:GetProfile(),
         \ 'args': (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
@@ -39,9 +39,11 @@ function! SyntaxCheckers_glsl_cgc_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetProfile()
+" Utilities {{{1
+
+function! s:GetProfile() " {{{2
     let save_view = winsaveview()
     let old_foldenable = &foldenable
     let old_lazyredraw = &lazyredraw
@@ -61,11 +63,13 @@ function! s:GetProfile()
         let profile = matchstr(getline(line), magic . '\zs.*')
     else
         let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
-        let profile = get(extensions, tolower(expand('%:e')), 'gpu_vert')
+        let profile = get(extensions, tolower(expand('%:e', 1)), 'gpu_vert')
     endif
 
     return profile
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \'filetype': 'glsl',
@@ -74,4 +78,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
index 868d7140..a7f6b10a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/go.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
@@ -8,10 +8,11 @@
 "             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
@@ -22,7 +23,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_go_IsAvailable() dict
-    return executable('go') && executable('gofmt')
+    return executable(self.getExec()) && executable('gofmt')
 endfunction
 
 function! SyntaxCheckers_go_go_GetLocList() dict
@@ -48,13 +49,17 @@ function! SyntaxCheckers_go_go_GetLocList() dict
 
     " Test files, i.e. files with a name ending in `_test.go`, are not
     " compiled by `go build`, therefore `go test` must be called for those.
-    if match(expand('%'), '\m_test\.go$') == -1
-        let makeprg = 'go build ' . syntastic#c#NullOutput()
+    if match(expand('%', 1), '\m_test\.go$') == -1
+        let cmd = 'build'
+        let opts = syntastic#util#var('go_go_build_args')
         let cleanup = 0
     else
-        let makeprg = 'go test -c ' . syntastic#c#NullOutput()
+        let cmd = 'test -c'
+        let opts = syntastic#util#var('go_go_test_args')
         let cleanup = 1
     endif
+    let opt_str = (type(opts) != type('') || opts != '') ? join(syntastic#util#argsescape(opts)) : opts
+    let makeprg = self.getExec() . ' ' . cmd . ' ' . opt_str . ' ' . syntastic#c#NullOutput()
 
     " The first pattern is for warnings from C compilers.
     let errorformat =
@@ -71,11 +76,11 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     let errors = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'e'} })
 
     if cleanup
-        call delete(expand('%:p:h') . syntastic#util#Slash() . expand('%:p:h:t') . '.test')
+        call delete(expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:p:h:t', 1) . '.test')
     endif
 
     return errors
@@ -88,4 +93,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
index 62b86cbc..92838e8f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
@@ -8,10 +8,11 @@
 "             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
@@ -41,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
index e517e6f5..253a485b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
@@ -28,6 +28,7 @@ function! SyntaxCheckers_go_golint_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'w'},
         \ 'subtype': 'Style' })
 endfunction
 
@@ -38,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
index 6c49b997..70e3082f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_go_gotype_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'e'} })
 endfunction
 
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
index c4b7fd93..98985789 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
@@ -19,11 +19,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_govet_IsAvailable() dict
-    return executable('go')
+    return executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_go_govet_GetLocList() dict
-    let makeprg = 'go vet'
+    let makeprg = self.getExec() . ' vet'
 
     let errorformat =
         \ '%Evet: %.%\+: %f:%l:%c: %m,' .
@@ -37,15 +37,16 @@ function! SyntaxCheckers_go_govet_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'w'} })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'go',
-    \ 'name': 'govet'})
+    \ 'name': 'govet',
+    \ 'exec': 'go' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
index a26fa6cc..c0c73182 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
index 160d9a5a..6db49403 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
@@ -34,4 +34,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
index adf4b611..8ada4c79 100644
--- a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index 97760508..ebc208e3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -30,10 +30,10 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
     " know the version in order to know how to find out the version. :)
 
     " Try "ghc-mod version".
-    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m\sversion''')
     if !len(ver)
         " That didn't work.  Try "ghc-mod" alone.
-        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m\sversion''')
     endif
 
     if len(ver)
@@ -80,4 +80,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
index 978abd20..b2c1781b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
index 592e4d39..f97d67f2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
index e2f4a13d..7cf7e7ba 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
index 3769627f..2b990b8e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
@@ -24,7 +24,7 @@ function! SyntaxCheckers_haxe_haxe_GetLocList() dict
     elseif exists('g:vaxe_hxml')
         let hxml = g:vaxe_hxml
     else
-        let hxml = syntastic#util#findInParent('*.hxml', expand('%:p:h'))
+        let hxml = syntastic#util#findInParent('*.hxml', expand('%:p:h', 1))
     endif
     let hxml = fnamemodify(hxml, ':p')
 
@@ -60,4 +60,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim b/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
index 0f2ef527..76b8b50b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index 30c89b2f..fa163791 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -51,4 +51,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 9070bfae..71a16159 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -17,23 +17,17 @@
 "
 " HTML Tidy for HTML5 can be used without changes by this checker, just install
 " it and point g:syntastic_html_tidy_exec to the executable.
-"
-" Checker options:
-"
-" - g:syntastic_html_tidy_ignore_errors (list; default: [])
-"   list of errors to ignore
-" - g:syntastic_html_tidy_blocklevel_tags (list; default: [])
-"   list of additional blocklevel tags, to be added to "--new-blocklevel-tags"
-" - g:syntastic_html_tidy_inline_tags (list; default: [])
-"   list of additional inline tags, to be added to "--new-inline-tags"
-" - g:syntastic_html_tidy_empty_tags (list; default: [])
-"   list of additional empty tags, to be added to "--new-empty-tags"
 
 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
@@ -50,27 +44,9 @@ if !exists('g:syntastic_html_tidy_empty_tags')
     let g:syntastic_html_tidy_empty_tags = []
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
+" }}}1
 
-" TODO: join this with xhtml.vim for 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
+" Constants {{{1
 
 let s:IGNORE_ERRORS = [
         \ "<table> lacks \"summary\" attribute",
@@ -163,29 +139,9 @@ let s:EMPTY_TAGS = [
     \ ]
 lockvar! s:EMPTY_TAGS
 
-function! s:IgnoreError(text)
-    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
+" }}}1
 
-function! s:NewTags(name)
-    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
-endfunction
-
-function! s:Args()
-    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
-
-function! SyntaxCheckers_html_tidy_GetLocList() dict
+function! SyntaxCheckers_html_tidy_GetLocList() dict " {{{1
     let makeprg = self.makeprgBuild({ 'args_after': s:Args() })
 
     let errorformat =
@@ -207,7 +163,52 @@ function! SyntaxCheckers_html_tidy_GetLocList() dict
     endfor
 
     return loclist
-endfunction
+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',
@@ -216,4 +217,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
index 6a8e503d..809c2458 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
@@ -9,24 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For detail;s about validator see: http://about.validator.nu/
-"
-" Checker options:
-"
-" - g:syntastic_html_validator_api (string; default: 'http://validator.nu/')
-"   URL of the service to use for checking; leave it to the default to run the
-"   checks against http://validator.nu/, or set it to 'http://localhost:8888/'
-"   if you're running a local service as per http://about.validator.nu/#src
-"
-" - g:syntastic_html_validator_parser (string; default: empty)
-"   parser to use; legal values are: xml, xmldtd, html, html5, html4, html4tr;
-"   set it to 'html5' to check HTML5 files;  see the wiki for reference:
-"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#parser
-"
-" - g:syntastic_html_validator_nsfilter (string; default: empty)
-"   sets the nsfilter for the parser; see the wiki for details:
-"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#nsfilter
 
 if exists("g:loaded_syntastic_html_validator_checker")
     finish
@@ -50,7 +32,7 @@ set cpo&vim
 
 function! SyntaxCheckers_html_validator_GetLocList() dict
     let fname = syntastic#util#shexpand('%')
-    let makeprg = self.getExecEscaped() . ' -s --compressed -F out=gnu -F asciiquotes=yes' .
+    let makeprg = self.getExecEscaped() . ' -q -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
@@ -84,4 +66,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
index 747b7583..dd921022 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
@@ -9,13 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" Checker option:
-"
-" - g:syntastic_html_w3_api (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
 
 if exists("g:loaded_syntastic_html_w3_checker")
     finish
@@ -30,7 +23,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_html_w3_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' -s -F output=json ' .
+    let makeprg = self.getExecEscaped() . ' -q -s -F output=json ' .
         \ '-F uploaded_file=@' . syntastic#util#shexpand('%:p') . '\;type=text/html ' .
         \ g:syntastic_html_w3_api
 
@@ -66,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 6e059737..8afa5179 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -32,8 +32,8 @@ function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
         return 0
     endif
 
-    let classpath = expand(g:syntastic_java_checkstyle_classpath)
-    let conf_file = expand(g:syntastic_java_checkstyle_conf_file)
+    let classpath = expand(g:syntastic_java_checkstyle_classpath, 1)
+    let conf_file = expand(g:syntastic_java_checkstyle_conf_file, 1)
     call self.log(
         \ 'filereadable(' . string(classpath) . ') = ' . filereadable(classpath) . ', ' .
         \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
@@ -43,7 +43,7 @@ endfunction
 
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
-    let fname = syntastic#util#shescape( expand('%:p:h') . syntastic#util#Slash() . expand('%:t') )
+    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
 
     if has('win32unix')
         let fname = substitute(system('cygpath -m ' . fname), '\m\%x00', '', 'g')
@@ -51,9 +51,9 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
         \ 'args_after': [
-        \       '-cp', expand(g:syntastic_java_checkstyle_classpath),
+        \       '-cp', expand(g:syntastic_java_checkstyle_classpath, 1),
         \       'com.puppycrawl.tools.checkstyle.Main',
-        \       '-c', expand(g:syntastic_java_checkstyle_conf_file),
+        \       '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
         \       '-f', 'xml'],
         \ 'fname': fname })
 
@@ -74,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 3623d75f..03ff2193 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -18,7 +18,11 @@ let g:syntastic_java_javac_maven_pom_tags = ['build', 'properties']
 let g:syntastic_java_javac_maven_pom_properties = {}
 let s:has_maven = 0
 
-" Global Options
+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
@@ -43,17 +47,6 @@ if !exists('g:syntastic_java_javac_delete_output')
     let g:syntastic_java_javac_delete_output = 1
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! s:CygwinPath(path)
-    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
-endfunction
-
-if !exists('g:syntastic_java_javac_temp_dir')
-    let g:syntastic_java_javac_temp_dir = syntastic#util#tmpdir()
-endif
-
 if !exists('g:syntastic_java_javac_autoload_maven_classpath')
     let g:syntastic_java_javac_autoload_maven_classpath = 1
 endif
@@ -78,32 +71,144 @@ if !exists('g:syntastic_java_javac_maven_pom_classpath')
     let g:syntastic_java_javac_maven_pom_classpath = {}
 endif
 
-function! s:RemoveCarriageReturn(line)
+" }}}1
+
+command! SyntasticJavacEditClasspath call s:EditClasspath()
+
+if g:syntastic_java_javac_config_file_enabled
+    command! SyntasticJavacEditConfig call s:EditConfig()
+endif
+
+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 != ''
+        let lines = system(g:syntastic_java_javac_custom_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 = s: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,'.
+        \ '%A%f:%l:\ %m,'.
+        \ '%+Z%p^,'.
+        \ '%+C%.%#,'.
+        \ '%-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:CygwinPath(path) " {{{2
+    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
+endfunction " }}}2
+
+function! s:RemoveCarriageReturn(line) " {{{2
     return substitute(a:line, "\r", '', 'g')
-endfunction
+endfunction " }}}2
 
-function! s:ClassSep()
+function! s:ClassSep() " {{{2
     return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
-endfunction
+endfunction " }}}2
 
-function! s:AddToClasspath(classpath, path)
+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
+endfunction " }}}2
 
-function! s:SplitClasspath(classpath)
+function! s:SplitClasspath(classpath) " {{{2
     return split(a:classpath, s:ClassSep())
-endfunction
+endfunction " }}}2
 
-function! s:LoadConfigFile()
-    if filereadable(expand(g:syntastic_java_javac_config_file))
-        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file))
+function! s:LoadConfigFile() " {{{2
+    if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
     endif
-endfunction
+endfunction " }}}2
 
-function! s:SaveClasspath()
+function! s:SaveClasspath() " {{{2
     " build classpath from lines
     let path = ''
     let lines = getline(1, line('$'))
@@ -112,9 +217,9 @@ function! s:SaveClasspath()
     endfor
     " save classpath to config file
     if g:syntastic_java_javac_config_file_enabled
-        if filereadable(expand(g:syntastic_java_javac_config_file))
+        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))
+            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)
@@ -130,14 +235,14 @@ function! s:SaveClasspath()
         " 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))
+        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
+endfunction " }}}2
 
-function! s:EditClasspath()
+function! s:EditClasspath() " {{{2
     let command = 'syntastic javac classpath'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
@@ -160,25 +265,25 @@ function! s:EditClasspath()
     else
         execute winnr . 'wincmd w'
     endif
-endfunction
+endfunction " }}}2
 
-function! s:SaveConfig()
+function! s:SaveConfig() " {{{2
     " get lines
     let lines = getline(1, line('$'))
     if g:syntastic_java_javac_config_file_enabled
         " save config file lines
-        call writefile(lines, expand(g:syntastic_java_javac_config_file))
+        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
     endif
     let &modified = 0
-endfunction
+endfunction " }}}2
 
-function! s:EditConfig()
+function! s:EditConfig() " {{{2
     let command = 'syntastic javac config'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
         let lines = []
-        if filereadable(expand(g:syntastic_java_javac_config_file))
-            let lines = readfile(expand(g:syntastic_java_javac_config_file))
+        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)
 
@@ -194,9 +299,9 @@ function! s:EditConfig()
     else
         execute winnr . 'wincmd w'
     endif
-endfunction
+endfunction " }}}2
 
-function! s:GetMavenProperties()
+function! s:GetMavenProperties() " {{{2
     let mvn_properties = {}
     let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
@@ -230,15 +335,9 @@ function! s:GetMavenProperties()
         return g:syntastic_java_javac_maven_pom_properties[pom]
     endif
     return mvn_properties
-endfunction
+endfunction " }}}2
 
-command! SyntasticJavacEditClasspath call s:EditClasspath()
-
-if g:syntastic_java_javac_config_file_enabled
-    command! SyntasticJavacEditConfig call s:EditConfig()
-endif
-
-function! s:GetMavenClasspath()
+function! s:GetMavenClasspath() " {{{2
     let pom = findfile('pom.xml', '.;')
     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)
@@ -279,14 +378,9 @@ function! s:GetMavenClasspath()
         return g:syntastic_java_javac_maven_pom_classpath[pom]
     endif
     return ''
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_java_javac_IsAvailable() dict
-    let s:has_maven = executable(expand(g:syntastic_java_maven_executable))
-    return executable(expand(g:syntastic_java_javac_executable))
-endfunction
-
-function! s:MavenOutputDirectory()
+function! s:MavenOutputDirectory() " {{{2
     let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
         let mvn_properties = s:GetMavenProperties()
@@ -294,13 +388,13 @@ function! s:MavenOutputDirectory()
         if has_key(mvn_properties, 'project.properties.build.dir')
             let output_dir = mvn_properties['project.properties.build.dir']
         endif
-        if stridx(expand( '%:p:h' ), 'src.main.java') >= 0
+        if stridx(expand('%:p:h', 1), 'src.main.java') >= 0
             let output_dir .= '/target/classes'
             if has_key(mvn_properties, 'project.build.outputDirectory')
                 let output_dir = mvn_properties['project.build.outputDirectory']
             endif
         endif
-        if stridx(expand( '%:p:h' ), 'src.test.java') >= 0
+        if stridx(expand('%:p:h', 1), 'src.test.java') >= 0
             let output_dir .= '/target/test-classes'
             if has_key(mvn_properties, 'project.build.testOutputDirectory')
                 let output_dir = mvn_properties['project.build.testOutputDirectory']
@@ -313,97 +407,9 @@ function! s:MavenOutputDirectory()
         return output_dir
     endif
     return '.'
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_java_javac_GetLocList() dict
-    let javac_opts = g:syntastic_java_javac_options
-
-    let output_dir = ''
-    if g:syntastic_java_javac_delete_output
-        let output_dir = g:syntastic_java_javac_temp_dir
-        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
-
-    let javac_classpath = ''
-
-    " add classpathes to javac_classpath
-    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
-        if path != ''
-            try
-                let ps = glob(path, 0, 1)
-            catch
-                let ps = split(glob(path, 0), "\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
-
-    " load custom classpath
-    if g:syntastic_java_javac_custom_classpath_command != ''
-        let lines = system(g:syntastic_java_javac_custom_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
-
-    let fname = expand('%:p:h') . syntastic#util#Slash() . expand ('%:t')
-
-    if has('win32unix')
-        let fname = s: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,'.
-        \ '%A%f:%l:\ %m,'.
-        \ '%+Z%p^,'.
-        \ '%+C%.%#,'.
-        \ '%-G%.%#'
-
-    if g:syntastic_java_javac_delete_output
-        silent! call mkdir(output_dir, 'p')
-    endif
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['cygwinRemoveCR'] })
-
-    if g:syntastic_java_javac_delete_output
-        call syntastic#util#rmrf(output_dir)
-    endif
-    return errors
-
-endfunction
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'java',
@@ -412,4 +418,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
index 6a45fb89..e8102b8c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
     let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
     call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
 
-    let jar = expand(cp)
+    let jar = expand(cp, 1)
     call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar))
 
     return filereadable(jar)
@@ -42,15 +42,15 @@ function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
     call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
     call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
 
-    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''))
+    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''), 1)
     if filereadable(flist)
-        let file_list = map( readfile(flist), 'expand(v:var)' )
+        let file_list = map( readfile(flist), 'expand(v:var, 1)' )
     else
-        let file_list = [expand('%')]
+        let file_list = [expand('%', 1)]
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path)]),
+        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path, 1)]),
         \ 'args_after': '--js',
         \ 'fname': file_list })
 
@@ -73,4 +73,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index acb91898..d66e8b85 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -61,4 +61,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
new file mode 100644
index 00000000..2fc2cc46
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"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_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'check',
+        \ 'args_after': '--show-all-errors --json' })
+
+    let errorformat =
+        \ '%f:%l:%c:%n: %m,' .
+        \ '%f:%l:%c: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'flow',
+        \ 'defaults': {'type': 'E'} })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['nr'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'flow'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
index 1704ac27..5266b15b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index b1d3b754..a3db94e2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index f0dc59fe..63d9bab8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -61,4 +61,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
index 8f4148d6..c3db1cb6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
index 63bb4101..9ade0e8a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
@@ -8,8 +8,8 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
-"Tested with jslint 0.1.4.
 "============================================================================
+
 if exists("g:loaded_syntastic_javascript_jslint_checker")
     finish
 endif
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 1d249237..89677dde 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
index 2b9ec451..83f18dc7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
index 16e30091..55858ca7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
index 786386ac..fce21b74 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -10,13 +10,6 @@
 "
 "============================================================================
 
-" To send additional options to less use the variable g:syntastic_less_options.
-" The default is
-"   let g:syntastic_less_options = "--no-color"
-"
-" To use less-lint instead of less set the variable
-" g:syntastic_less_use_less_lint.
-
 if exists("g:loaded_syntastic_less_lessc_checker")
     finish
 endif
@@ -33,7 +26,7 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
+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)
@@ -70,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/recess.vim b/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
index 92944189..1a8d876e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
index b8bc6483..8070cc6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
index b501e3c9..9c88a2d0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_limbo_limbo_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_before': include . '-w' . output })
 
     let errorformat = '%E%f:%l:%m'
-    if expand('%') =~# '\m\.m$'
+    if expand('%', 1) =~# '\m\.m$'
         let errorformat = '%-G%f:%l: near ` EOF ` : no implementation module,' . errorformat
     endif
 
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
index 5e726a92..50530d8b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
@@ -19,9 +19,13 @@ 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' })
+        \ 'fname_before': '-c',
+        \ 'post_args_after': out })
 
     let errorformat  =
         \ '%-G;%.%#,' .
@@ -33,10 +37,14 @@ function! SyntaxCheckers_lisp_clisp_GetLocList() dict
         \ '%Z %m,' .
         \ '%-G%.%#'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')} })
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
@@ -46,4 +54,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim b/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
index c65a1672..a6755b82 100644
--- a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
index 5805e780..bc05a34f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
@@ -62,4 +62,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim
new file mode 100644
index 00000000..b9efa0d9
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
index 781a5e38..db5c816a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim b/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
index 1b15eeac..1eedec63 100644
--- a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
index 65bf9aa9..4262d285 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
@@ -21,7 +21,7 @@ set cpo&vim
 function! SyntaxCheckers_nasm_nasm_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args_after': '-X gnu -f elf' .
-        \       ' -I ' . syntastic#util#shescape(expand("%:p:h") . "/") .
+        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . '/') .
         \       ' ' . syntastic#c#NullOutput() })
 
     let errorformat = '%f:%l: %t%*[^:]: %m'
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
index 4c36b499..f19cf69c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'igor',
     \ 'redirect': 'docbk/igor'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
index 28085d54..ac7a73f0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
index d44eac17..73da7f81 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_objc_gcc_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_objc_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_objc_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
index a415c41f..21ac7527 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_objc_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
index 13ff8c1a..6ae7ba50 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_objcpp_gcc_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_objcpp_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_objcpp_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
index 84f71d29..58a3d46c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_objcpp_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
index 5f7a0ee7..8a0ee2f6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -9,44 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" The more reliable way to check for a single .ml file is to use ocamlc.
-" You can do that setting this in your .vimrc:
-"
-"   let g:syntastic_ocaml_use_ocamlc = 1
-" It's possible to use ocamlc in conjuction with Jane Street's Core. In order
-" to do that, you have to specify this in your .vimrc:
-"
-"   let g:syntastic_ocaml_use_janestreet_core = 1
-"   let g:syntastic_ocaml_janestreet_core_dir = <path>
-"
-" Where path is the path to your core installation (usually a collection of
-" .cmx and .cmxa files).
-"
-"
-" By default the camlp4o preprocessor is used to check the syntax of .ml, and .mli files,
-" ocamllex is used to check .mll files and menhir is used to check .mly files.
-" The output is all redirected to /dev/null, nothing is written to the disk.
-"
-" If your source code needs camlp4r then you can define this in your .vimrc:
-"
-"   let g:syntastic_ocaml_camlp4r = 1
-"
-" If you used some syntax extensions, or you want to also typecheck the source
-" code, then you can define this:
-"
-"   let g:syntastic_ocaml_use_ocamlbuild = 1
-"
-" This will run ocamlbuild <name>.inferred.mli, so it will write to your _build
-" directory (and possibly rebuild your myocamlbuild.ml plugin), only enable this
-" if you are ok with that.
-"
-" If you are using syntax extensions / external libraries and have a properly
-" set up _tags (and myocamlbuild.ml file) then it should just work
-" to enable this flag and get syntax / type checks through syntastic.
-"
-" For best results your current directory should be the project root
-" (same situation if you want useful output from :make).
 
 if exists("g:loaded_syntastic_ocaml_camlp4o_checker")
     finish
@@ -62,9 +24,7 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict
-    return executable(s:ocamlpp)
-endfunction
+" Checker options {{{1
 
 if !exists('g:syntastic_ocaml_use_ocamlc') || !executable('ocamlc')
     let g:syntastic_ocaml_use_ocamlc = 0
@@ -78,7 +38,13 @@ if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable("ocamlbuild")
     let g:syntastic_ocaml_use_ocamlbuild = 0
 endif
 
-function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict
+" }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict " {{{1
+    return executable(s:ocamlpp)
+endfunction " }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
     let makeprg = s:GetMakeprg()
     if makeprg == ""
         return []
@@ -96,9 +62,11 @@ function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict
         \ '%-G+%.%#'
 
     return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetMakeprg()
+" Utilities {{{1
+
+function! s:GetMakeprg() " {{{2
     if g:syntastic_ocaml_use_ocamlc
         return s:GetOcamlcMakeprg()
     endif
@@ -108,30 +76,30 @@ function! s:GetMakeprg()
     endif
 
     return s:GetOtherMakeprg()
-endfunction
+endfunction " }}}2
 
-function! s:GetOcamlcMakeprg()
+function! s:GetOcamlcMakeprg() " {{{2
     if g:syntastic_ocaml_use_janestreet_core
         let build_cmd = "ocamlc -I "
-        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir)
+        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir, 1)
         let build_cmd .= " -c " . syntastic#util#shexpand('%')
         return build_cmd
     else
         return "ocamlc -c " . syntastic#util#shexpand('%')
     endif
-endfunction
+endfunction " }}}2
 
-function! s:GetOcamlBuildMakeprg()
+function! s:GetOcamlBuildMakeprg() " {{{2
     return "ocamlbuild -quiet -no-log -tag annot," . s:ocamlpp . " -no-links -no-hygiene -no-sanitize " .
                 \ syntastic#util#shexpand('%:r') . ".cmi"
-endfunction
+endfunction " }}}2
 
-function! s:GetOtherMakeprg()
+function! s:GetOtherMakeprg() " {{{2
     "TODO: give this function a better name?
     "
     "TODO: should use throw/catch instead of returning an empty makeprg
 
-    let extension = expand('%:e')
+    let extension = expand('%:e', 1)
     let makeprg = ""
 
     if stridx(extension, 'mly') >= 0 && executable("menhir")
@@ -144,7 +112,9 @@ function! s:GetOtherMakeprg()
     endif
 
     return makeprg
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'ocaml',
@@ -153,4 +123,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index 553c55a5..e0d8f159 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -26,16 +26,6 @@
 " References:
 "
 " - http://perldoc.perl.org/perlrun.html#*-c*
-"
-" Checker options:
-"
-" - g:syntastic_perl_interpreter (string; default: 'perl')
-"   The perl interpreter to use.
-"
-" - g:syntastic_perl_lib_path (list; default: [])
-"   List of include directories to be added to the perl command line. Example:
-"
-"       let g:syntastic_perl_lib_path = [ './lib', './lib/auto' ]
 
 if exists('g:loaded_syntastic_perl_perl_checker')
     finish
@@ -106,4 +96,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
index cd010945..1d060d23 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
@@ -9,20 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about perlcritic see:
-"
-" - http://perlcritic.tigris.org/
-" - https://metacpan.org/module/Perl::Critic
-"
-" Checker options:
-"
-" - g:syntastic_perl_perlcritic_thres (integer; default: 5)
-"   error threshold: policy violations with a severity above this
-"   value are highlighted as errors, the others are warnings
-"
-" - g:syntastic_perl_perlcritic_args (string; default: empty)
-"   command line options to pass to perlcritic
 
 if exists("g:loaded_syntastic_perl_perlcritic_checker")
     finish
@@ -63,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
index 5ffc7365..a633fd8d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'podchecker',
     \ 'redirect': 'pod/podchecker'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
index 558dc0ac..0b61c768 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/php.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
index e6600ac6..90202be9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpcs
-"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
 
 if exists("g:loaded_syntastic_php_phpcs_checker")
     finish
@@ -22,13 +19,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_php_phpcs_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '--tab-width=' . &tabstop,
-        \ 'args_after': '--report=csv' })
+    let makeprg = self.makeprgBuild({ 'args_after': '--report=csv' })
 
     let errorformat =
         \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity%.%#,'.
-        \ '"%f"\,%l\,%v\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
+        \ '"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
@@ -43,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim b/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
index d857d9e2..c5182499 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
@@ -88,4 +88,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
index 6b6022ab..c7a744d5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpmd
-"   - phpmd (see http://phpmd.org)
 
 if exists("g:loaded_syntastic_php_phpmd_checker")
     finish
@@ -44,7 +41,7 @@ function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
     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', '')
+        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 != ''
@@ -77,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
index 254aa91a..2115146a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
index 34a37e55..b79fe72f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
index dedb9544..5cec0357 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -50,4 +50,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index d9948cae..55148782 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/codec.py b/sources_non_forked/syntastic/syntax_checkers/python/codec.py
new file mode 100644
index 00000000..6e980c7b
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
index 1e4f1c9b..fc7c8e59 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -69,4 +69,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index 05a07080..2fea0fe8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -60,4 +60,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
index 5a560431..068ab007 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
@@ -32,4 +32,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 1872456a..374cabe3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -2,8 +2,6 @@
 "File:        pep257.vim
 "Description: Docstring style checking plugin for syntastic.vim
 "============================================================================
-"
-" For details about pep257 see: https://github.com/GreenSteam/pep257
 
 if exists('g:loaded_syntastic_python_pep257_checker')
     finish
@@ -60,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
index 0f35c276..961f0ded 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
@@ -9,8 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about pep8 see: https://github.com/jcrocholl/pep8
 
 if exists("g:loaded_syntastic_python_pep8_checker")
     finish
@@ -47,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
index ea987f97..df6d22b1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
index 69a3060f..159964d0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -33,4 +33,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
index 530a275c..b0db97a7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -71,4 +71,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index b0352b2e..ab49e32b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -71,4 +71,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 25a60e9d..65436b44 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -95,4 +95,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index 3d1c0aee..6d0c11e6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -15,10 +15,14 @@ if exists("g:loaded_syntastic_python_python_checker")
 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:compiler = expand('<sfile>:p:h') . syntastic#util#Slash() . 'compile.py'
+let s:base_path = expand('<sfile>:p:h', 1) . syntastic#util#Slash()
 
 function! SyntaxCheckers_python_python_IsAvailable() dict
     if !executable(self.getExec())
@@ -32,7 +36,9 @@ function! SyntaxCheckers_python_python_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:compiler] })
+    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'
 
@@ -52,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index 792305f3..5e8eec58 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -80,4 +80,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
index ec924c38..388cbbf4 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
index f76c321c..34159e71 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -27,7 +27,7 @@ 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)
+    let s:script = expand(g:syntastic_racket_code_ayatollah_script, 1)
     return executable(self.getExec()) && filereadable(s:script)
 endfunction
 
@@ -59,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
index 71615205..a6c84c18 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim b/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
index db8bd581..1653d218 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
index a368e9e6..fb851fd2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
@@ -59,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
index 5c831490..fc331b3b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
index bf57b091..fbf5b7fa 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
index 54c8365f..f357e370 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index b4b8d3af..8945ea3e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -77,4 +77,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
new file mode 100644
index 00000000..becc23d6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"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
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [1, 3, 0])
+endfunction
+
+function! SyntaxCheckers_ruby_reek_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --quiet --line-number --single-line' })
+
+    let errorformat =
+        \ '%E%.%#: Racc::ParseError: %f:%l :: %m,' .
+        \ '%W%f:%l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    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/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
index baf2ad4d..23bc1ff3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" In order to use rubocop with the default ruby checker (mri):
-"     let g:syntastic_ruby_checkers = ['mri', 'rubocop']
 
 if exists("g:loaded_syntastic_ruby_rubocop_checker")
     finish
@@ -29,11 +26,11 @@ function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
     let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
     call self.log(self.getExec() . ' version =', ver)
 
-    return syntastic#util#versionIsAtLeast(ver, [0, 9, 0])
+    return syntastic#util#versionIsAtLeast(ver, [0, 12, 0])
 endfunction
 
 function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs --silent' })
+    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs' })
 
     let errorformat = '%f:%l:%c: %t: %m'
 
@@ -61,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index b4839f54..e0387df6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
index ce8e6939..da24112a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -39,7 +39,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_sass_sass_GetLocList() dict
-    if !g:syntastic_sass_check_partials && expand('%:t')[0] == '_'
+    if !g:syntastic_sass_check_partials && expand('%:t', 1)[0] == '_'
         return []
     endif
 
@@ -81,4 +81,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
index 731d1789..2c1332a1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
index 6f1fcf6d..25d6a4d7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
index 0d0c15aa..918c0f6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
index 5d282692..1df96c00 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
@@ -31,8 +31,8 @@ function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict
         return 0
     endif
 
-    let jar = expand(g:syntastic_scala_scalastyle_jar)
-    let conf_file = expand(g:syntastic_scala_scalastyle_config_file)
+    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))
 
@@ -42,8 +42,8 @@ endfunction
 function! SyntaxCheckers_scala_scalastyle_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar)],
-        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file)] })
+        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar, 1)],
+        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file, 1)] })
 
     let errorformat =
         \ '%trror file=%f message=%m line=%l column=%c,' .
@@ -74,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
index 0f837ca5..86a30211 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'sass',
     \ 'redirect': 'sass/sass'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
index 75fdc2aa..c5638d33 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'sassc',
     \ 'redirect': 'sass/sassc'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index 523e981c..ab19f27f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -30,12 +30,24 @@ endfunction
 
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
     let makeprg = self.makeprgBuild({})
+
     let errorformat = '%f:%l [%t] %m'
-    return SyntasticMake({
+
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
         \ 'returns': [0, 1, 2, 65, 66] })
+
+    let cutoff = strlen('Syntax Error: ')
+    for e in loclist
+        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({
@@ -46,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim b/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
index 73b0dcba..63b7a486 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim b/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
index 42751cf9..eb68113a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index 95e6b48d..6989fba3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -18,12 +18,12 @@ let g:loaded_syntastic_sh_sh_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_sh_sh_IsAvailable() dict
+function! SyntaxCheckers_sh_sh_IsAvailable() dict " {{{1
     call self.log('shell =', s:GetShell())
     return s:IsShellValid()
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_sh_sh_GetLocList() dict
+function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1
     if s:GetShell() ==# 'zsh'
         return s:ForwardToZshChecker()
     endif
@@ -41,9 +41,11 @@ function! SyntaxCheckers_sh_sh_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetShell()
+" Utilities {{{1
+
+function! s:GetShell() " {{{2
     if !exists('b:shell') || b:shell == ''
         let b:shell = ''
         let shebang = syntastic#util#parseShebang()['exe']
@@ -62,14 +64,14 @@ function! s:GetShell()
         endif
     endif
     return b:shell
-endfunction
+endfunction " }}}2
 
-function! s:IsShellValid()
+function! s:IsShellValid() " {{{2
     let shell = s:GetShell()
     return shell != '' && executable(shell)
-endfunction
+endfunction " }}}2
 
-function! s:ForwardToZshChecker()
+function! s:ForwardToZshChecker() " {{{2
     let registry = g:SyntasticRegistry.Instance()
     let zsh_checkers = registry.getCheckersAvailable('zsh', ['zsh'])
     if !empty(zsh_checkers)
@@ -77,7 +79,9 @@ function! s:ForwardToZshChecker()
     else
         return []
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'sh',
@@ -86,4 +90,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
index de69683c..0e76606b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 51e641a1..8fb05c84 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim b/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
index dfd965dc..7e9431bf 100644
--- a/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
index 0797690e..95ab9903 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
@@ -7,10 +7,11 @@
 "             it and/or modify it under the terms of the Do What 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/.
 "
 "============================================================================
+"
+"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
@@ -40,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
index 7d4c90a2..9b359028 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim b/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
index 0896919c..f1565200 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
@@ -37,4 +37,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
index 63cae936..6eca27d9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
index f092b4bb..d45ba3fe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
index 4b358e5a..bf6fda9d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'igor',
     \ 'redirect': 'docbk/igor'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim b/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
index 20111468..26835e4a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
@@ -34,4 +34,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim b/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
index 36e264bf..b4f9be13 100644
--- a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
index 521a5314..d7073670 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
index eeeb8b4c..4c62299e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
index c2ca1138..0b9fe41e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
@@ -2,23 +2,6 @@
 "File:        vala.vim
 "Description: Syntax checking plugin for syntastic.vim
 "Maintainer:  Konstantin Stepanov (me@kstep.me)
-"Notes:       Add special comment line into your vala file starting with
-"             "// modules: " and containing space delimited list of vala
-"             modules, used by the file, so this script can build correct
-"             --pkg arguments.
-"             Add another special comment line into your vala file starting
-"             with "// vapidirs: " followed by a space delimited list of
-"             the vapi directories so this script can build with the correct
-"             --vapidir arguments
-"             Alternatively you can set the g:syntastic_vala_modules array
-"             and/or the g:syntastic_vala_vapidirs array
-"             in your .vimrc or .lvimrc with localvimrc plugin
-"             (http://www.vim.org/scripts/script.php?script_id=441).
-"             Valac compiler is not the fastest thing in the world, so you
-"             may want to disable this plugin with
-"             let g:syntastic_vala_check_disabled = 1 command in your .vimrc or
-"             command line. Unlet this variable to set it to 0 to reenable
-"             this checker.
 "License:     This program is free software. It comes without any warranty,
 "             to the extent permitted by applicable law. You can redistribute
 "             it and/or modify it under the terms of the Do What The Fuck You
@@ -35,12 +18,29 @@ let g:loaded_syntastic_vala_valac_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos)
+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
+endfunction " }}}1
 
-function! s:GetValaModules()
+function! SyntaxCheckers_vala_valac_GetLocList() dict " {{{1
+    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
+    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
+    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
+
+    let errorformat =
+        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
+        \ '%C%m,'.
+        \ '%Z%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetValaModules() " {{{2
     if exists('g:syntastic_vala_modules')
         if type(g:syntastic_vala_modules) == type('')
             return split(g:syntastic_vala_modules, '\s\+')
@@ -54,9 +54,9 @@ function! s:GetValaModules()
     let modules_line = search('^// modules: ', 'n')
     let modules_str = getline(modules_line)
     return split(strpart(modules_str, 12), '\s\+')
-endfunction
+endfunction " }}}2
 
-function! s:GetValaVapiDirs()
+function! s:GetValaVapiDirs() " {{{2
     if exists('g:syntastic_vala_vapi_dirs')
         if type(g:syntastic_vala_vapi_dirs) == type('')
             return split(g:syntastic_vala_vapi_dirs, '\s\+')
@@ -70,22 +70,9 @@ function! s:GetValaVapiDirs()
     let vapi_line = search('^//\s*vapidirs:\s*','n')
     let vapi_str = getline(vapi_line)
     return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_vala_valac_GetLocList() dict
-    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
-    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
-    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
-
-    let errorformat =
-        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
-        \ '%C%m,'.
-        \ '%Z%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vala',
@@ -94,4 +81,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
index afe58fca..72a46beb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
@@ -21,7 +21,7 @@ function! SyntaxCheckers_verilog_verilator_IsAvailable() dict
         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))
+    return executable(expand(g:syntastic_verilog_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_verilog_verilator_GetLocList() dict
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
index ff02224a..7ec856b9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index ddcf9273..58037e80 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -18,7 +18,7 @@ let g:loaded_syntastic_vim_vimlint_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
+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)
@@ -33,17 +33,17 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
     endif
 
     return ''
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
-    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim')
-    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim')
-    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim') = " . string(vimlparser) . ', ' .
-                \ "globpath(&runtimepath, 'autoload/vimlint.vim') = " .    string(vimlint))
+function! SyntaxCheckers_vim_vimlint_IsAvailable() dict " {{{1
+    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim', 1)
+    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim', 1)
+    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim', 1) = " . string(vimlparser) . ', ' .
+                \ "globpath(&runtimepath, 'autoload/vimlint.vim', 1) = " .    string(vimlint))
     return vimlparser != '' && vimlint != ''
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_vim_vimlint_GetLocList() dict
+function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
     " EVL102: unused variable v
     " EVL103: unused argument v
     " EVL104: variable may not be initialized on some execution path: v
@@ -74,11 +74,13 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict
         endif
     endif
 
-    return vimlint#vimlint(expand('%'), param)
-endfunction
+    return vimlint#vimlint(expand('%', 1), param)
+endfunction " }}}1
+
+" Utilities {{{1
 
 " @vimlint(EVL103, 1, a:filename)
-function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
+function! s:vimlintOutput(filename, pos, ev, eid, mes, obj) " {{{2
     call add(a:obj.error, {
         \ 'bufnr': bufnr(''),
         \ 'lnum': a:pos.lnum,
@@ -87,9 +89,11 @@ function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
         \ 'type': a:ev[0],
         \ 'text': '[' . a:eid . '] ' . a:mes,
         \ 'valid': a:pos.lnum > 0 })
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:filename)
 
+" }}}1
+
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vim',
     \ 'name': 'vimlint',
@@ -98,4 +102,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
index 3312ccef..6a1069c6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'jshint',
     \ 'redirect': 'html/jshint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
index 1eed9209..12e8b155 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -20,12 +20,14 @@ if exists("g:loaded_syntastic_xhtml_tidy_checker")
 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
 
-let s:save_cpo = &cpo
-set cpo&vim
+" Constants {{{1
 
 " TODO: join this with html.vim DRY's sake?
 function! s:TidyEncOptByFenc()
@@ -46,16 +48,9 @@ function! s:TidyEncOptByFenc()
     return get(TIDY_OPTS, &fileencoding, '-utf8')
 endfunction
 
-function! s:IgnoreError(text)
-    for item in g:syntastic_xhtml_tidy_ignore_errors
-        if stridx(a:text, item) != -1
-            return 1
-        endif
-    endfor
-    return 0
-endfunction
+" }}}1
 
-function! SyntaxCheckers_xhtml_tidy_GetLocList() dict
+function! SyntaxCheckers_xhtml_tidy_GetLocList() dict " {{{1
     let encopt = s:TidyEncOptByFenc()
     let makeprg = self.makeprgBuild({ 'args_after': encopt . ' -xml -e' })
 
@@ -77,7 +72,20 @@ function! SyntaxCheckers_xhtml_tidy_GetLocList() dict
     endfor
 
     return loclist
-endfunction
+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',
@@ -86,4 +94,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim b/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
index a9ad1451..6a6c3db1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
index 3076cabb..108abed7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
index e224c256..d84a4eee 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'xmllint',
     \ 'redirect': 'xml/xmllint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim b/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
index 8444879e..0a948b2d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
index 4361edc2..82ca3946 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -8,9 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
-"
-"Installation: $ npm install -g js-yaml
-"
 "============================================================================
 
 if exists("g:loaded_syntastic_yaml_jsyaml_checker")
@@ -49,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index 6c12a627..d5582dbd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -7,7 +7,6 @@
 "             it and/or modify it under the terms of the Do What The Fuck You
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"Installation: cpanm YAML::XS
 "
 "============================================================================
 
@@ -70,4 +69,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
index 6a3998a3..38c65ccc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
@@ -1,5 +1,5 @@
 "============================================================================
-"File:        z80.vim
+"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,
@@ -9,12 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" To obtain this application there are two solutions:
-" - Install this python package:
-"   https://github.com/rgiot/pycpcdemotools
-" - Copy/paste this script in your search path:
-"   https://raw.githubusercontent.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
 
 if exists("g:loaded_syntastic_z80_z80syntaxchecker_checker")
     finish
@@ -42,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
index 6769b55b..f1749f30 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
@@ -9,15 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" In order for this plugin to be useful, you will need to set up the
-" zpt filetype in your vimrc
-"
-"    " set up zope page templates as the zpt filetype
-"    au BufNewFile,BufRead *.pt,*.cpt,*.zpt set filetype=zpt syntax=xml
-"
-" Then install the zptlint program, found on pypi:
-" http://pypi.python.org/pypi/zptlint
 
 if exists("g:loaded_syntastic_zpt_zptlint_checker")
     finish
@@ -48,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
index 42f6fcf1..a0f9e7e3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'shellcheck',
     \ 'redirect': 'sh/shellcheck'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
index 48057631..92a2f13a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index b6a8581d..71c4387c 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1393
+" @Revision:    1397
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -688,7 +688,7 @@ endf
 function! s:prototype.SetInitialFilter(filter) dict "{{{3
     " let self.initial_filter = [[''], [a:filter]]
     if type(a:filter) == 3
-        let self.initial_filter = copy(a:filter)
+        let self.initial_filter = deepcopy(a:filter)
     else
         let self.initial_filter = [[a:filter]]
     endif
@@ -815,7 +815,11 @@ function! s:prototype.UseInputListScratch() dict "{{{3
     endif
     if !exists('w:tlib_list_init')
         " TLogVAR scratch
-        syntax match InputlListIndex /^\d\+:/
+        if has_key(self, 'index_next_syntax')
+            exec 'syntax match InputlListIndex /^\d\+:\s/ nextgroup='. self.index_next_syntax
+        else
+            syntax match InputlListIndex /^\d\+:\s/
+        endif
         syntax match InputlListCursor /^\d\+\* .*$/ contains=InputlListIndex
         syntax match InputlListSelected /^\d\+# .*$/ contains=InputlListIndex
         hi def link InputlListIndex Constant
@@ -1119,10 +1123,11 @@ function! s:prototype.DisplayList(...) dict "{{{3
         if self.state =~ '\<display\>'
             call self.Resize(self.GetResize(ll), eval(get(self, 'resize_vertical', 0)))
             call tlib#normal#WithRegister('gg"tdG', 't')
+            let lines = copy(list)
+            let lines = map(lines, 'substitute(v:val, ''[[:cntrl:][:space:]]'', " ", "g")')
             let w = winwidth(0) - &fdc
             " let w = winwidth(0) - &fdc - 1
-            let lines = copy(list)
-            let lines = map(lines, 'printf("%-'. w .'.'. w .'s", substitute(v:val, ''[[:cntrl:][:space:]]'', " ", "g"))')
+            let lines = map(lines, 'printf("%-'. w .'.'. w .'s", v:val)')
             " TLogVAR lines
             call append(0, lines)
             call tlib#normal#WithRegister('G"tddgg', 't')
diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/sources_non_forked/tlib/autoload/tlib/cmd.vim
index 01975b60..79334325 100644
--- a/sources_non_forked/tlib/autoload/tlib/cmd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cmd.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-08-23.
-" @Last Change: 2014-02-05.
-" @Revision:    0.0.53
+" @Last Change: 2014-10-21.
+" @Revision:    0.0.54
 
 if &cp || exists("loaded_tlib_cmd_autoload")
     finish
@@ -109,3 +109,11 @@ function! tlib#cmd#Time(cmd) "{{{3
     echom 'Time: '. diff .': '. a:cmd
 endf
 
+
+function! tlib#cmd#Capture(cmd) "{{{3
+    redir => s
+    silent exec a:cmd
+    redir END
+    return s
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index 6cd57f5e..1bb571fc 100644
--- a/sources_non_forked/tlib/autoload/tlib/input.vim
+++ b/sources_non_forked/tlib/autoload/tlib/input.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1317
+" @Revision:    1338
 
 
 " :filedoc:
@@ -113,12 +113,17 @@ TLet g:tlib#input#numeric_chars = {
 
 
 " :nodefault:
-" The default key bindings for single-item-select list views. If you 
-" want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-" lines to after/plugin/02tlib.vim: >
+" The default key bindings for single-item-select list views.
 "
-"   let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-"   let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
+" This variable is best customized via the variable 
+" g:tlib_extend_keyagents_InputList_s. If you want to use <c-j>, <c-k> 
+" to move the cursor up and down, add these two lines to your |vimrc| 
+" file:
+"
+"   let g:tlib_extend_keyagents_InputList_s = {
+"       \ 10: 'tlib#agent#Down',
+"       \ 11: 'tlib#agent#Up'
+"       \ }
 TLet g:tlib#input#keyagents_InputList_s = {
             \ "\<PageUp>":   'tlib#agent#PageUp',
             \ "\<PageDown>": 'tlib#agent#PageDown',
@@ -154,6 +159,10 @@ TLet g:tlib#input#keyagents_InputList_s = {
             \ }
             " \ 63:            'tlib#agent#Help',
 
+if exists('g:tlib_extend_keyagents_InputList_s')
+    let g:tlib#input#keyagents_InputList_s = extend(g:tlib#input#keyagents_InputList_s, g:tlib_extend_keyagents_InputList_s)
+endif
+
 
 " :nodefault:
 TLet g:tlib#input#keyagents_InputList_m = {
@@ -166,6 +175,11 @@ TLet g:tlib#input#keyagents_InputList_m = {
             \ }
 " "\<c-space>": 'tlib#agent#Select'
 
+if exists('g:tlib_extend_keyagents_InputList_m')
+    let g:tlib#input#keyagents_InputList_m = extend(g:tlib#input#keyagents_InputList_m, g:tlib_extend_keyagents_InputList_m)
+endif
+
+
 
 " :nodefault:
 TLet g:tlib#input#handlers_EditList = [
@@ -184,6 +198,11 @@ TLet g:tlib#input#handlers_EditList = [
             \ ]
 
 
+" A dictionary KEY => {'agent': AGENT, 'key_name': KEY_NAME} to 
+" customize keyboard shortcuts in the list view.
+TLet g:tlib#input#user_shortcuts = {}
+
+
 " If true, define a popup menu for |tlib#input#List()| and related 
 " functions.
 TLet g:tlib#input#use_popup = has('menu') && (has('gui_gtk') || has('gui_gtk2') || has('gui_win32'))
@@ -381,10 +400,13 @@ function! tlib#input#ListW(world, ...) "{{{3
 
                 " TLogVAR world.filter
                 " TLogVAR world.sticky
-                if world.state =~ '\<pick\>'
+                if world.state =~ '\<picked\>'
+                    " TLogVAR world.rv
+                    throw 'picked'
+                elseif world.state =~ '\<pick\>'
                     let world.rv = world.CurrentItem()
                     " TLogVAR world.rv
-                    throw 'pick'
+                    throw 'picked'
                 elseif world.state =~ 'display'
                     if world.state =~ '^display'
                         " let time03 = str2float(reltimestr(reltime()))  " DBG
@@ -679,6 +701,11 @@ function! tlib#input#ListW(world, ...) "{{{3
                     " let world.state = 'continue'
                 endif
 
+            catch /^picked$/
+                call world.ClearAllMarks()
+                call world.MarkCurrent(world.prefidx)
+                let world.state = 'exit'
+
             catch /^pick$/
                 call world.ClearAllMarks()
                 call world.MarkCurrent(world.prefidx)
@@ -686,7 +713,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                 " TLogDBG 'Pick item #'. world.prefidx
 
             finally
-                " TLogDBG 'finally 1'
+                " TLogDBG 'finally 1', world.state
                 if world.state =~ '\<suspend\>'
                     " if !world.allow_suspend
                     "     echom "Cannot be suspended"
@@ -695,10 +722,10 @@ function! tlib#input#ListW(world, ...) "{{{3
                 elseif !empty(world.list) && !empty(world.base)
                     " TLogVAR world.list
                     if empty(world.state)
-                        " TLogVAR world.state
                         let world.rv = world.CurrentItem()
+                        " TLogVAR world.state, world.rv
                     endif
-                    " TLog "postprocess"
+                    " TLogVAR "postprocess"
                     for handler in world.post_handlers
                         let state = get(handler, 'postprocess', '')
                         " TLogVAR handler
@@ -746,7 +773,6 @@ function! tlib#input#ListW(world, ...) "{{{3
                 return ''
             endif
         elseif !empty(world.return_agent)
-            " TLog "return_agent"
             " TLogDBG 'return agent'
             " TLogVAR world.return_agent
             call world.CloseScratch()
diff --git a/sources_non_forked/tlib/autoload/tlib/var.vim b/sources_non_forked/tlib/autoload/tlib/var.vim
index 86c1350a..564515d9 100644
--- a/sources_non_forked/tlib/autoload/tlib/var.vim
+++ b/sources_non_forked/tlib/autoload/tlib/var.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2014-07-03.
-" @Revision:    0.0.26
+" @Last Change: 2014-07-08.
+" @Revision:    0.0.29
 
 if &cp || exists("loaded_tlib_var_autoload")
     finish
@@ -75,12 +75,16 @@ endf
 " EXAMPLE:
 "   echo tlib#var#List('tlib_', 'g:')
 function! tlib#var#List(rx, ...) "{{{3
-    TVarArg ['prefix', '']
-    redir => vars
-    silent! exec 'let '. prefix
-    redir END
-    let varlist = split(vars, '\n')
-    call map(varlist, 'matchstr(v:val, ''^\S\+'')')
+    TVarArg ['prefix', 'g:']
+    if v:version >= 704
+        exec 'let varlist = keys('. prefix .')'
+    else
+        redir => vars
+        silent! exec 'let '. prefix
+        redir END
+        let varlist = split(vars, '\n')
+        call map(varlist, 'matchstr(v:val, ''^\S\+'')')
+    endif
     call filter(varlist, 'v:val =~ a:rx')
     return varlist
 endf
diff --git a/sources_non_forked/tlib/autoload/tlib/vcs.vim b/sources_non_forked/tlib/autoload/tlib/vcs.vim
index 6166db8c..c7e21bab 100644
--- a/sources_non_forked/tlib/autoload/tlib/vcs.vim
+++ b/sources_non_forked/tlib/autoload/tlib/vcs.vim
@@ -2,8 +2,8 @@
 " @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-03-08.
-" @Last Change: 2014-07-01.
-" @Revision:    131
+" @Last Change: 2014-09-30.
+" @Revision:    133
 
 
 " A dictionarie of supported VCS (currently: git, hg, svn, bzr).
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index 3d5fc3f3..cbf6fdfd 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -85,6 +85,7 @@ Contents~
         tlib#cmd#ParseScriptname ............... |tlib#cmd#ParseScriptname()|
         tlib#cmd#UseVertical ................... |tlib#cmd#UseVertical()|
         tlib#cmd#Time .......................... |tlib#cmd#Time()|
+        tlib#cmd#Capture ....................... |tlib#cmd#Capture()|
         tlib#syntax#Collect .................... |tlib#syntax#Collect()|
         tlib#syntax#Names ...................... |tlib#syntax#Names()|
         tlib#balloon#Register .................. |tlib#balloon#Register()|
@@ -224,6 +225,7 @@ Contents~
         g:tlib#input#keyagents_InputList_s ..... |g:tlib#input#keyagents_InputList_s|
         g:tlib#input#keyagents_InputList_m ..... |g:tlib#input#keyagents_InputList_m|
         g:tlib#input#handlers_EditList ......... |g:tlib#input#handlers_EditList|
+        g:tlib#input#user_shortcuts ............ |g:tlib#input#user_shortcuts|
         g:tlib#input#use_popup ................. |g:tlib#input#use_popup|
         g:tlib#input#format_filename ........... |g:tlib#input#format_filename|
         g:tlib#input#filename_padding_r ........ |g:tlib#input#filename_padding_r|
@@ -723,6 +725,9 @@ tlib#cmd#Time(cmd)
     Print the time in seconds or milliseconds (if your version of VIM 
     has |+reltime|) a command takes.
 
+                                                    *tlib#cmd#Capture()*
+tlib#cmd#Capture(cmd)
+
 
 ========================================================================
 autoload/tlib/syntax.vim~
@@ -1434,13 +1439,17 @@ g:tlib#input#numeric_chars
 
                                                     *g:tlib#input#keyagents_InputList_s*
 g:tlib#input#keyagents_InputList_s
-    The default key bindings for single-item-select list views. If you 
-    want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-    lines to after/plugin/02tlib.vim: >
+    The default key bindings for single-item-select list views.
 
-      let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-      let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
-<
+    This variable is best customized via the variable 
+    g:tlib_extend_keyagents_InputList_s. If you want to use <c-j>, <c-k> 
+    to move the cursor up and down, add these two lines to your |vimrc| 
+    file:
+
+      let g:tlib_extend_keyagents_InputList_s = {
+          \ 10: 'tlib#agent#Down',
+          \ 11: 'tlib#agent#Up'
+          \ }
 
                                                     *g:tlib#input#keyagents_InputList_m*
 g:tlib#input#keyagents_InputList_m
@@ -1448,6 +1457,11 @@ g:tlib#input#keyagents_InputList_m
                                                     *g:tlib#input#handlers_EditList*
 g:tlib#input#handlers_EditList
 
+                                                    *g:tlib#input#user_shortcuts*
+g:tlib#input#user_shortcuts    (default: {})
+    A dictionary KEY => {'agent': AGENT, 'key_name': KEY_NAME} to 
+    customize keyboard shortcuts in the list view.
+
                                                     *g:tlib#input#use_popup*
 g:tlib#input#use_popup         (default: has('menu') && (has('gui_gtk') || has('gui_gtk2') || has('gui_win32')))
     If true, define a popup menu for |tlib#input#List()| and related 
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index cadec3ea..e25ec7b5 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -2,7 +2,7 @@
 " @Created:     2007-04-10.
 " @Last Change: 2014-07-03.
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    753
+" @Revision:    754
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " GetLatestVimScripts: 1863 1 tlib.vim
 " tlib.vim -- Some utility functions
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 112
+let loaded_tlib = 113
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/sources_non_forked/vim-airline/autoload/airline/builder.vim
index d03af12e..5f4e080c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/builder.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/builder.vim
@@ -4,8 +4,7 @@
 let s:prototype = {}
 
 function! s:prototype.split(...)
-  let self._side = 0
-  let self._line .= '%#'.self._curgroup.'#'.(a:0 ? a:1 : '%=')
+  call add(self._sections, ['|', a:0 ? a:1 : '%='])
 endfunction
 
 function! s:prototype.add_section_spaced(group, contents)
@@ -13,21 +12,97 @@ function! s:prototype.add_section_spaced(group, contents)
 endfunction
 
 function! s:prototype.add_section(group, contents)
-  if self._curgroup != ''
-    if self._curgroup == a:group
-      let self._line .= self._side ? self._context.left_alt_sep : self._context.right_alt_sep
-    else
-      call airline#highlighter#add_separator(self._curgroup, a:group, self._side)
-      let self._line .= '%#'.self._curgroup.'_to_'.a:group.'#'
-      let self._line .= self._side ? self._context.left_sep : self._context.right_sep
+  call add(self._sections, [a:group, a:contents])
+endfunction
+
+function! s:prototype.add_raw(text)
+  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
-  endif
+    let x = x - 1
+  endwhile
+  return ''
+endfunction
 
-  if self._curgroup != a:group
-    let self._line .= '%#'.a:group.'#'
-  endif
+function! s:prototype.build()
+  let side = 1
+  let line = ''
+  let i = 0
+  let length = len(self._sections)
+  let split = 0
 
-  if self._context.active
+  while i < length
+    let section = self._sections[i]
+    let group = section[0]
+    let contents = section[1]
+    let prev_group = s:get_prev_group(self._sections, i)
+
+    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
+        let line .= s:get_transitioned_seperator(self, prev_group, group, side)
+        let split = 0
+      else
+        let line .= s:get_seperator(self, prev_group, group, side)
+      endif
+      let line .= s:get_accented_line(self, group, contents)
+    endif
+
+    let i = i + 1
+  endwhile
+
+  if !self._context.active
+    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 has('gui_running')
+    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
@@ -40,28 +115,13 @@ function! s:prototype.add_section(group, contents)
     let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
     let line = substitute(line, '%#__restore__#', '', 'g')
   endif
-
-  let self._line .= line
-  let self._curgroup = a:group
-endfunction
-
-function! s:prototype.add_raw(text)
-  let self._line .= a:text
-endfunction
-
-function! s:prototype.build()
-  if !self._context.active
-    let self._line = substitute(self._line, '%#.\{-}\ze#', '\0_inactive', 'g')
-  endif
-  return self._line
+  return line
 endfunction
 
 function! airline#builder#new(context)
   let builder = copy(s:prototype)
   let builder._context = a:context
-  let builder._side = 1
-  let builder._curgroup = ''
-  let builder._line = ''
+  let builder._sections = []
 
   call extend(builder._context, {
         \ 'left_sep': g:airline_left_sep,
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 1738f626..22a91cfe 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -22,10 +22,10 @@ let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
 let s:filetype_overrides = {
       \ 'nerdtree': [ 'NERD', '' ],
       \ 'gundo': [ 'Gundo', '' ],
-      \ 'diff': [ 'diff', '' ],
       \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
       \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
       \ 'startify': [ 'startify', '' ],
+      \ 'vim-plug': [ 'Plugins', '' ],
       \ }
 
 let s:filetype_regex_overrides = {}
@@ -178,7 +178,7 @@ function! airline#extensions#load()
     call airline#extensions#bufferline#init(s:ext)
   endif
 
-  if get(g:, 'virtualenv_loaded', 0) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
+  if isdirectory($VIRTUAL_ENV) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
     call airline#extensions#virtualenv#init(s:ext)
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index e97cae85..6e82d664 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -107,6 +107,7 @@ function! s:check_in_path()
         if match(root, pattern) >= 0
           let root = substitute(root, pattern, '', '')
         endif
+      endif
     endif
 
     let b:airline_file_in_root = stridx(bufferpath, root) > -1
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
index 11a89220..ef7da681 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -36,6 +36,9 @@ 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
@@ -48,7 +51,7 @@ function! airline#extensions#ctrlp#ctrlp_airline(...)
   endif
   call b.add_section_spaced('CtrlPdark', a:7)
   call b.split()
-  call b.add_raw('%#CtrlPdark#'.a:1.(g:airline_symbols.space))
+  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()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
index 53b000d4..faa1fb68 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -61,9 +61,9 @@ function! airline#extensions#default#apply(builder, context)
   let active = a:context.active
 
   if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
-    call <sid>build_sections(a:builder, a:context, s:layout[0])
+    call s:build_sections(a:builder, a:context, s:layout[0])
   else
-    let text = <sid>get_section(winnr, 'c')
+    let text = s:get_section(winnr, 'c')
     if empty(text)
       let text = ' %f%m '
     endif
@@ -73,7 +73,7 @@ function! airline#extensions#default#apply(builder, context)
   call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
 
   if airline#util#getwinvar(winnr, 'airline_render_right', 1)
-    call <sid>build_sections(a:builder, a:context, s:layout[1])
+    call s:build_sections(a:builder, a:context, s:layout[1])
   endif
 
   return 1
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
index 8efc5275..2be4077e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -25,7 +25,7 @@ function! s:get_text()
   let nr = bufnr('%')
   for buf in split(buffers, '\n')
     if match(buf, '\v^\s*'.nr) > -1
-      if match(buf, '\[Quickfix List\]') > -1
+      if match(buf, '\cQuickfix') > -1
         return g:airline#extensions#quickfix#quickfix_text
       else
         return g:airline#extensions#quickfix#location_text
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index e0111a59..4681a2a4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -1,29 +1,18 @@
 " MIT License. Copyright (c) 2013-2014 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:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 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)
 let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
 let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
 let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
 let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
 let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
-
-let s:builder_context = {
-      \ 'active'        : 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 s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
-  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
-else
-  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
-  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
-endif
-
 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)
 let s:spc = g:airline_symbols.space
@@ -76,9 +65,10 @@ function! s:toggle_on()
     augroup airline_tabline
       autocmd!
       if s:show_buffers == 1
-        autocmd CursorMoved * call <sid>on_cursormove(s:buf_min_count, len(s:get_buffer_list()))
+        autocmd BufEnter * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()))
+        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()) - 1)
       else
-        autocmd TabEnter * call <sid>on_cursormove(s:tab_min_count, tabpagenr('$'))
+        autocmd TabEnter * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
       endif
     augroup END
   endif
@@ -108,7 +98,7 @@ function! airline#extensions#tabline#load_theme(palette)
   call airline#highlighter#exec('airline_tabhid', l:tabhid)
 endfunction
 
-function! s:on_cursormove(min_count, total_count)
+function! s:show_tabline(min_count, total_count)
   if a:total_count >= a:min_count
     if &showtabline != 2
       set showtabline=2
@@ -126,7 +116,7 @@ function! airline#extensions#tabline#get()
     let s:current_tabcnt = curtabcnt
     let s:current_bufnr = -1  " force a refresh...
   endif
-  if s:show_buffers && curtabcnt == 1
+  if s:show_buffers && curtabcnt == 1 || !s:show_tabs
     return s:get_buffers()
   else
     return s:get_tabs()
@@ -148,15 +138,19 @@ function! s:get_buffer_list()
   let cur = bufnr('%')
   for nr in range(1, bufnr('$'))
     if buflisted(nr) && bufexists(nr)
+      let toadd = 1
       for ex in s:excludes
-        if match(bufname(nr), ex)
-          continue
+        if match(bufname(nr), ex) >= 0
+          let toadd = 0
+          break
         endif
       endfor
       if getbufvar(nr, 'current_syntax') == 'qf'
-        continue
+        let toadd = 0
+      endif
+      if toadd
+        call add(buffers, nr)
       endif
-      call add(buffers, nr)
     endif
   endfor
 
@@ -231,7 +225,7 @@ function! s:get_buffers()
   endif
 
   let l:index = 1
-  let b = airline#builder#new(s:builder_context)
+  let b = s:new_builder()
   let tab_bufs = tabpagebuflist(tabpagenr())
   for nr in s:get_visible_buffers()
     if nr < 0
@@ -270,6 +264,7 @@ function! s:get_buffers()
 
   call b.add_section('airline_tabfill', '')
   call b.split()
+  call b.add_section('airline_tabfill', '')
   call b.add_section('airline_tabtype', ' buffers ')
 
   let s:current_bufnr = cur
@@ -306,6 +301,23 @@ function! s:define_buffer_idx_mode_mappings()
   noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
 endfunction
 
+function! s:new_builder()
+  let builder_context = {
+        \ 'active'        : 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! s:get_tabs()
   let curbuf = bufnr('%')
   let curtab = tabpagenr()
@@ -315,7 +327,7 @@ function! s:get_tabs()
     endif
   endif
 
-  let b = airline#builder#new(s:builder_context)
+  let b = s:new_builder()
   for i in range(1, tabpagenr('$'))
     if i == curtab
       let group = 'airline_tabsel'
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 3590fbb5..e96deeb2 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -1,6 +1,8 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+scriptencoding utf-8
+
 let s:skip_symbol = '…'
 
 function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
index f070c472..27f847e3 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -1,7 +1,7 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-if !get(g:, 'virtualenv_loaded', 0)
+if !isdirectory($VIRTUAL_ENV)
   finish
 endif
 
@@ -13,8 +13,13 @@ 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
     call airline#extensions#append_to_section('x',
-          \ s:spc.g:airline_right_alt_sep.s:spc.'%{virtualenv#statusline()}')
+          \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
   endif
 endfunction
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index 86574129..f535e45e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -67,7 +67,7 @@ function! airline#extensions#whitespace#check()
     endif
   endif
   return b:airline_whitespace_check
-endfunction!
+endfunction
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
index b941eae7..f2378ce8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
@@ -60,3 +60,11 @@ 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/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
new file mode 100644
index 00000000..56be7ba0
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
@@ -0,0 +1,59 @@
+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/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index ddc81ce0..7620abe5 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -391,6 +391,9 @@ eclim <https://eclim.org>
 * enable/disable displaying buffers with a single tab. >
   let g:airline#extensions#tabline#show_buffers = 1
 <
+* enable/disable displaying tabs, regardless of number. >
+  let g:airline#extensions#tabline#show_tabs = 1
+<
 * configure filename match rules to exclude from the tabline. >
   let g:airline#extensions#tabline#excludes = []
 <
diff --git a/sources_non_forked/vim-airline/t/builder.vim b/sources_non_forked/vim-airline/t/builder.vim
index 3d1afcda..57feb148 100644
--- a/sources_non_forked/vim-airline/t/builder.vim
+++ b/sources_non_forked/vim-airline/t/builder.vim
@@ -13,9 +13,27 @@ describe 'active builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#>%#NonText#world'
+    Expect stl =~ '%#Normal#hello%#Normal_to_Search#>%#Search#world'
+  end
+
+  it 'should reuse highlight group if background colors match'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=1 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello>world'
+  end
+
+  it 'should switch highlight groups if foreground colors differ'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=2 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello%#Foo1_to_Foo2#>%#Foo2#world'
   end
 
   it 'should split left/right sections'
@@ -27,9 +45,9 @@ describe 'active builder'
   it 'after split, sections use the right separator'
     call s:builder.split()
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#<%#NonText#world'
+    Expect stl =~ 'hello%#Normal_to_Search#<%#Search#world'
   end
 
   it 'should not repeat the same highlight group'
@@ -57,6 +75,14 @@ describe 'active builder'
     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'
@@ -66,9 +92,9 @@ describe 'inactive builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_inactive#world'
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_Search_inactive#>%#Search_inactive#world'
   end
 
   it 'should not render accents'
diff --git a/sources_non_forked/vim-airline/t/extensions_default.vim b/sources_non_forked/vim-airline/t/extensions_default.vim
index b98e8166..d6fc572d 100644
--- a/sources_non_forked/vim-airline/t/extensions_default.vim
+++ b/sources_non_forked/vim-airline/t/extensions_default.vim
@@ -2,6 +2,7 @@ let g:airline_theme = 'dark'
 call airline#init#bootstrap()
 call airline#init#sections()
 source plugin/airline.vim
+call airline#load_theme()
 
 describe 'default'
   before
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index 9da6a304..a91cd712 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -9,9 +9,8 @@ endif
 let g:loaded_commentary = 1
 
 function! s:surroundings() abort
-  return split(substitute(substitute(
-        \ get(b:, 'commentary_format', &commentstring)
-        \ ,'\S\zs%s',' %s','') ,'%s\ze\S', '%s ', ''), '%s', 1)
+  return split(get(b:, 'commentary_format', substitute(substitute(
+        \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1)
 endfunction
 
 function! s:go(type,...) abort
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 8fabd1cc..7ef5a929 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -145,6 +145,13 @@ function! fugitive#extract_git_dir(path) abort
     if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
       return $GIT_DIR
     endif
+    if fugitive#is_git_dir($GIT_DIR)
+      " Ensure that we've cached the worktree
+      call s:configured_tree($GIT_DIR)
+      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)
@@ -178,7 +185,14 @@ function! fugitive#detect(path) abort
     endif
   endif
   if exists('b:git_dir')
-    silent doautocmd User FugitiveBoot
+    if exists('#User#FugitiveBoot')
+      try
+        let [save_mls, &modelines] = [&mls, 0]
+        doautocmd User FugitiveBoot
+      finally
+        let &mls = save_mls
+      endtry
+    endif
     cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
     nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
     let buffer = fugitive#buffer()
@@ -193,7 +207,12 @@ function! fugitive#detect(path) abort
         call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
       endif
     endif
-    silent doautocmd User Fugitive
+    try
+      let [save_mls, &modelines] = [&mls, 0]
+      doautocmd User Fugitive
+    finally
+      let &mls = save_mls
+    endtry
   endif
 endfunction
 
@@ -211,6 +230,8 @@ augroup END
 
 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')))
@@ -234,21 +255,23 @@ function! s:repo_dir(...) dict abort
   return join([self.git_dir]+a:000,'/')
 endfunction
 
-function! s:repo_configured_tree() dict abort
-  if !has_key(self,'_tree')
-    let self._tree = ''
-    if filereadable(self.dir('config'))
-      let config = readfile(self.dir('config'),'',10)
+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 self._tree = matchstr(config[0], '= *\zs.*')
+        let s:worktree_for_dir[a:git_dir] = matchstr(config[0], '= *\zs.*')
+        let s:dir_for_worktree[s:worktree_for_dir[a:git_dir]] = a:git_dir
       endif
     endif
   endif
-  if self._tree =~# '^\.'
-    return simplify(self.dir(self._tree))
+  if s:worktree_for_dir[a:git_dir] =~# '^\.'
+    return simplify(a:git_dir . '/' . s:worktree_for_dir[a:git_dir])
   else
-    return self._tree
+    return s:worktree_for_dir[a:git_dir]
   endif
 endfunction
 
@@ -256,7 +279,7 @@ function! s:repo_tree(...) dict abort
   if self.dir() =~# '/\.git$'
     let dir = self.dir()[0:-6]
   else
-    let dir = self.configured_tree()
+    let dir = s:configured_tree(self.git_dir)
   endif
   if dir ==# ''
     call s:throw('no work tree')
@@ -269,7 +292,7 @@ function! s:repo_bare() dict abort
   if self.dir() =~# '/\.git$'
     return 0
   else
-    return self.configured_tree() ==# ''
+    return s:configured_tree(self.git_dir) ==# ''
   endif
 endfunction
 
@@ -334,7 +357,7 @@ function! s:repo_head(...) dict abort
     return branch
 endfunction
 
-call s:add_methods('repo',['dir','configured_tree','tree','bare','translate','head'])
+call s:add_methods('repo',['dir','tree','bare','translate','head'])
 
 function! s:repo_git_command(...) dict abort
   let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir)
@@ -2274,7 +2297,7 @@ endfunction
 function! s:instaweb_url(opts) abort
   let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
   if output =~# 'http://'
-    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.opts.dir(),':t')
+    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t')
   else
     return ''
   endif
@@ -2495,7 +2518,9 @@ function! s:BufWriteIndexFile() abort
     endif
     if v:shell_error == 0
       setlocal nomodified
-      silent execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      if exists('#BufWritePost')
+        execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      endif
       call fugitive#reload_status()
       return ''
     else
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index 78b0ab5f..17e3ad82 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -33,6 +33,7 @@ disabled/enabled easily.
 * Share your current code to [play.golang.org](http://play.golang.org)
 * On-the-fly type information about the word under the cursor
 * Tagbar support to show tags of the source code in a sidebar with `gotags`
+* Custom vim text objects, such a `a function` or `inner function`
 
 ## Install
 
@@ -53,9 +54,10 @@ and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
 
 Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
 `goimports`, etc..). You can easily install them with the included
-`:GoInstallBinaries`. Those binaries will be automatically downloaded and
-installed to your `$GOBIN` environment (if not set it will use `$GOPATH/bin`).
-It requires `git` and `hg` for fetching the individual Go packages.
+`:GoInstallBinaries` command. Those binaries will be automatically downloaded
+and installed to your `$GOBIN` environment (if not set it will use
+`$GOPATH/bin`).  It requires `git` and `hg` for fetching the individual Go
+packages.
 
 ### Optional
 
@@ -72,13 +74,12 @@ completion (completion by type) install:
 
 ## Usage
 
-All [features](#features) are enabled by default. There are no additional
-settings needed.  Usage and commands are listed in `doc/vim-go.txt`. Just open
-the help page to see all commands:
+Many of the [features](#features) are enabled by default. There are no
+additional settings needed. All usages and commands are listed in
+`doc/vim-go.txt`. Just open the help page to see all commands:
 
     :help vim-go
 
-
 ## Mappings
 
 vim-go has several `<Plug>` mappings which can be used to create custom
@@ -178,56 +179,14 @@ let g:go_bin_path = expand("~/.gotools")
 let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
 ```
 
-## Snippets
-
-Snippets are useful and very powerful. By default ultisnips is
-used, however you can change it to neosnippet with:
-
+By default syntax-highlighting for Functions, Methods and Structs is disabled.
+To change it:
 ```vim
-let g:go_snippet_engine = "neosnippet"
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_structs = 1
 ```
 
-Snippet feature is enabled only if the snippet plugins are installed.  Below are
-some examples snippets and the corresponding trigger keywords, The `|`
-character defines the cursor. Ultisnips has support for multiple cursors
-
-
-`ff` is useful for debugging:
-
-```go
-fmt.Printf(" | %+v\n", |)
-```
-
-`errn` expands to:
-
-```go
-if err != nil {
-    return err
-}
-```
-
-Use `gof` to quickly create a anonymous goroutine :
-
-```go
-go func() {
-    |
-}()
-```
-
-To add `json` tags to a struct field, use `json` trigger:
-
-```
-type foo struct {
-    bar string  `json:"myField"
-           ^ type `json` here, hit tab and type "myField". It will expand to `json:"myField"`
-}
-```
-
-...
-
-And many more! For the full list have a look at the
-[included snippets](https://github.com/fatih/vim-go/blob/master/gosnippets/):
-
 ## Troubleshooting
 
 ### I'm using Fish shell but have some problems using Vim-go
diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim
index 75f67173..dfb5abde 100644
--- a/sources_non_forked/vim-go/autoload/go/cmd.vim
+++ b/sources_non_forked/vim-go/autoload/go/cmd.vim
@@ -3,9 +3,22 @@ if !exists("g:go_jump_to_error")
 endif
 
 function! go#cmd#Run(bang, ...)
+    let goFiles = '"' . join(go#tool#Files(), '" "') . '"'
+
+    if IsWin()
+        exec '!go run ' . goFiles
+        if v:shell_error
+            redraws! | echon "vim-go: [run] " | echohl ErrorMsg | echon "FAILED"| echohl None
+        else
+            redraws! | echon "vim-go: [run] " | echohl Function | echon "SUCCESS"| echohl None
+        endif
+
+        return
+    endif
+
     let default_makeprg = &makeprg
     if !len(a:000)
-        let &makeprg = "go run " . join(go#tool#Files(), ' ')
+        let &makeprg = 'go run ' . goFiles
     else
         let &makeprg = "go run " . expand(a:1)
     endif
@@ -25,8 +38,8 @@ function! go#cmd#Run(bang, ...)
 endfunction
 
 function! go#cmd#Install(...)
-    let pkgs = join(a:000, ' ')
-    let command = 'go install '.pkgs
+    let pkgs = join(a:000, '" "')
+    let command = 'go install "' . pkgs . '"'
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
         call go#tool#ShowErrors(out)
@@ -41,13 +54,13 @@ function! go#cmd#Install(...)
     endif
 endfunction
 
-function! go#cmd#Build(bang)
+function! go#cmd#Build(bang, ...)
     let default_makeprg = &makeprg
-    let gofiles = join(go#tool#Files(), ' ')
+    let gofiles = join(go#tool#Files(), '" "')
     if v:shell_error
         let &makeprg = "go build . errors"
     else
-        let &makeprg = "go build -o /dev/null " . gofiles
+        let &makeprg = "go build -o /dev/null " . join(a:000, ' ') . ' "' . gofiles . '"'
     endif
 
     echon "vim-go: " | echohl Identifier | echon "building ..."| echohl None
@@ -60,7 +73,7 @@ function! go#cmd#Build(bang)
             if g:go_jump_to_error
                 cc 1 "jump to first error if there is any
             endif
-        else 
+        else
             redraws! | echon "vim-go: " | echohl Function | echon "[build] SUCCESS"| echohl None
         endif
     endif
@@ -75,21 +88,22 @@ function! go#cmd#Test(...)
     endif
 
     echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
+    redraw
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
         call go#tool#ShowErrors(out)
+        cwindow
+        let errors = getqflist()
+        if !empty(errors)
+            if g:go_jump_to_error
+                cc 1 "jump to first error if there is any
+            endif
+        endif
+        echon "vim-go: " | echohl ErrorMsg | echon "[test] FAIL" | echohl None
     else
         call setqflist([])
-    endif
-    cwindow
-
-    let errors = getqflist()
-    if !empty(errors)
-        if g:go_jump_to_error
-            cc 1 "jump to first error if there is any
-        endif
-    else
-        redraw | echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
+        cwindow
+        echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
     endif
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim
index d244c5c9..69b2d53c 100644
--- a/sources_non_forked/vim-go/autoload/go/complete.vim
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -43,9 +43,9 @@ fu! s:gocodeCommand(cmd, preargs, args)
         let a:preargs[i] = s:gocodeShellescape(a:preargs[i])
     endfor
 
-    let bin_path = go#tool#BinPath(g:go_gocode_bin) 
-    if empty(bin_path) 
-        return 
+    let bin_path = go#tool#BinPath(g:go_gocode_bin)
+    if empty(bin_path)
+        return
     endif
 
     let result = s:system(printf('%s %s %s %s', bin_path, join(a:preargs), a:cmd, join(a:args)))
@@ -96,7 +96,7 @@ function! go#complete#GetInfo()
 
     " no candidates are found
     if len(out) == 1
-        return
+        return ""
     endif
 
     " only one candiate is found
@@ -119,14 +119,16 @@ function! go#complete#GetInfo()
     if len(filtered) == 1
         return filtered[0]
     endif
+
+    return ""
 endfunction
 
 function! go#complete#Info()
     let result = go#complete#GetInfo()
-    if len(result) > 0
+    if !empty(result)
         echo "vim-go: " | echohl Function | echon result | echohl None
     endif
-endfunction!
+endfunction
 
 fu! go#complete#Complete(findstart, base)
     "findstart = 1 when we need to get the text length
diff --git a/sources_non_forked/vim-go/autoload/go/def.vim b/sources_non_forked/vim-go/autoload/go/def.vim
index ce6de7e6..0be1f024 100644
--- a/sources_non_forked/vim-go/autoload/go/def.vim
+++ b/sources_non_forked/vim-go/autoload/go/def.vim
@@ -13,15 +13,15 @@ function! go#def#Jump(...)
 		let arg = a:1
 	endif
 
-	let bin_path = go#tool#BinPath(g:go_godef_bin) 
-	if empty(bin_path) 
-		return 
+	let bin_path = go#tool#BinPath(g:go_godef_bin)
+	if empty(bin_path)
+		return
 	endif
 
 	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
 
 	" get output of godef
-	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), LineEnding()))
 
 	" jump to it
 	call s:godefJump(out, "")
@@ -31,15 +31,15 @@ endfunction
 function! go#def#JumpMode(mode)
 	let arg = s:getOffset()
 
-	let bin_path = go#tool#BinPath(g:go_godef_bin) 
-	if empty(bin_path) 
-		return 
+	let bin_path = go#tool#BinPath(g:go_godef_bin)
+	if empty(bin_path)
+		return
 	endif
 
 	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
 
 	" get output of godef
-	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), LineEnding()))
 
 	call s:godefJump(out, a:mode)
 endfunction
@@ -51,7 +51,7 @@ function! s:getOffset()
 		let offs = line2byte(pos[0]) + pos[1] - 2
 	else
 		let c = pos[1]
-		let buf = line('.') == 1 ? "" : (join(getline(1, pos[0] - 1), "\n") . "\n")
+		let buf = line('.') == 1 ? "" : (join(getline(1, pos[0] - 1), LineEnding()) . LineEnding())
 		let buf .= c == 1 ? "" : getline(pos[0])[:c-2]
 		let offs = len(iconv(buf, &encoding, "utf-8"))
 	endif
@@ -66,7 +66,7 @@ function! s:godefJump(out, mode)
 	let &errorformat = "%f:%l:%c"
 
 	if a:out =~ 'godef: '
-		let out=substitute(a:out, '\n$', '', '')
+		let out=substitute(a:out, LineEnding() . '$', '', '')
 		echom out
 	else
 		let parts = split(a:out, ':')
@@ -85,7 +85,7 @@ function! s:godefJump(out, mode)
 			let &switchbuf = "usetab"
 
 			if bufloaded(fileName) == 0
-				tab split 
+				tab split
 			endif
 		else
 			if a:mode  == "split"
@@ -96,11 +96,10 @@ function! s:godefJump(out, mode)
 		endif
 
 		" jump to file now
-		ll 1
+		sil ll 1
 		normal zz
 
 		let &switchbuf = old_switchbuf
 	end
 	let &errorformat = old_errorformat
 endfunction
-
diff --git a/sources_non_forked/vim-go/autoload/go/doc.vim b/sources_non_forked/vim-go/autoload/go/doc.vim
index 6c9085c3..9509b652 100644
--- a/sources_non_forked/vim-go/autoload/go/doc.vim
+++ b/sources_non_forked/vim-go/autoload/go/doc.vim
@@ -35,7 +35,7 @@ function! s:godocWord(args)
     if !executable('godoc')
         echohl WarningMsg
         echo "godoc command not found."
-        echo "  install with: go get code.google.com/p/go.tools/cmd/godoc"
+        echo "  install with: go get golang.org/x/tools/cmd/godoc"
         echohl None
         return []
     endif
@@ -51,7 +51,7 @@ function! s:godocWord(args)
         let words = a:args
     endif
 
-    if !len(words) 
+    if !len(words)
         return []
     endif
 
@@ -85,7 +85,7 @@ function! go#doc#OpenBrowser(...)
     call go#tool#OpenBrowser(godoc_url)
 endfunction
 
-function! go#doc#Open(mode, ...)
+function! go#doc#Open(newmode, mode, ...)
     let pkgs = s:godocWord(a:000)
     if empty(pkgs)
         return
@@ -102,10 +102,14 @@ function! go#doc#Open(mode, ...)
         return -1
     endif
 
-    call s:GodocView(a:mode, content)
+    call s:GodocView(a:newmode, a:mode, content)
+
+    if exported_name == ''
+        silent! normal gg
+        return -1
+    endif
 
     " jump to the specified name
-
     if search('^func ' . exported_name . '(')
         silent! normal zt
         return -1
@@ -125,11 +129,11 @@ function! go#doc#Open(mode, ...)
     silent! normal gg
 endfunction
 
-function! s:GodocView(position, content)
+function! s:GodocView(newposition, position, content)
     " reuse existing buffer window if it exists otherwise create a new one
     if !bufexists(s:buf_nr)
-        execute a:position
-        file `="[Godoc]"`
+        execute a:newposition
+        sil file `="[Godoc]"`
         let s:buf_nr = bufnr('%')
     elseif bufwinnr(s:buf_nr) == -1
         execute a:position
@@ -149,9 +153,9 @@ function! s:GodocView(position, content)
     setlocal iskeyword-=-
 
     setlocal modifiable
-    %delete _ 
+    %delete _
     call append(0, split(a:content, "\n"))
-    $delete _ 
+    sil $delete _
     setlocal nomodifiable
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/errcheck.vim b/sources_non_forked/vim-go/autoload/go/errcheck.vim
index 06a79192..e470f22b 100644
--- a/sources_non_forked/vim-go/autoload/go/errcheck.vim
+++ b/sources_non_forked/vim-go/autoload/go/errcheck.vim
@@ -2,13 +2,19 @@ if !exists("g:go_errcheck_bin")
     let g:go_errcheck_bin = "errcheck"
 endif
 
-function! go#errcheck#Run() abort
-    let bin_path = go#tool#BinPath(g:go_errcheck_bin) 
-    if empty(bin_path) 
-        return 
+function! go#errcheck#Run(...) abort
+    if a:0 == 0
+        let package = go#package#ImportPath(expand('%:p:h'))
+    else
+        let package = a:1
+    end
+
+    let bin_path = go#tool#BinPath(g:go_errcheck_bin)
+    if empty(bin_path)
+        return
     endif
 
-    let out = system(bin_path . ' ' . shellescape(expand('%:p:h')))
+    let out = system(bin_path . ' ' . package)
     if v:shell_error
         let errors = []
         let mx = '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)'
@@ -16,7 +22,7 @@ function! go#errcheck#Run() abort
             let tokens = matchlist(line, mx)
 
             if !empty(tokens)
-                call add(errors, {"filename": tokens[1],
+                call add(errors, {"filename": expand(DefaultGoPath() . "/src/" . tokens[1]),
                             \"lnum": tokens[2],
                             \"col": tokens[3],
                             \"text": tokens[4]})
diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim
index ed1417e2..f640b9ff 100644
--- a/sources_non_forked/vim-go/autoload/go/fmt.vim
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -39,6 +39,10 @@ if !exists('g:go_fmt_options')
     let g:go_fmt_options = ''
 endif
 
+if !exists("g:go_fmt_experimental")
+    let g:go_fmt_experimental = 0
+endif
+
 let s:got_fmt_error = 0
 
 "  we have those problems : 
@@ -57,12 +61,15 @@ function! go#fmt#Format(withGoimport)
     let l:tmpname=tempname()
     call writefile(getline(1,'$'), l:tmpname)
 
-    " save our undo file to be restored after we are done. This is needed to
-    " prevent an additional undo jump due to BufWritePre auto command and also
-    " restore 'redo' history because it's getting being destroyed every
-    " BufWritePre
-    let tmpundofile=tempname()
-    exe 'wundo! ' . tmpundofile
+
+    if g:go_fmt_experimental == 1
+        " save our undo file to be restored after we are done. This is needed to
+        " prevent an additional undo jump due to BufWritePre auto command and also
+        " restore 'redo' history because it's getting being destroyed every
+        " BufWritePre
+        let tmpundofile=tempname()
+        exe 'wundo! ' . Tmpundofile
+    endif
 
     " get the command first so we can test it
     let fmt_command = g:go_fmt_command
@@ -128,9 +135,11 @@ function! go#fmt#Format(withGoimport)
         cwindow
     endif
 
-    " restore our undo history
-    silent! exe 'rundo ' . tmpundofile
-    call delete(tmpundofile)
+    if g:go_fmt_experimental == 1
+        " restore our undo history
+        silent! exe 'rundo ' . tmpundofile
+        call delete(tmpundofile)
+    endif
 
     " restore our cursor/windows positions
     call delete(l:tmpname)
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
index 2dc24b98..1fc2e7dc 100644
--- a/sources_non_forked/vim-go/autoload/go/oracle.vim
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -3,8 +3,7 @@
 "
 "  Part of this plugin was taken directly from the oracle repo, however it's
 "  massively changed for a better integration into vim-go. Thanks Alan Donovan
-"  for the first iteration based on quickfix!  - fatih arslan
-"
+"  for the first iteration based on quickfix!  - Fatih Arslan
 "
 
 if !exists("g:go_oracle_bin")
@@ -89,8 +88,6 @@ func! s:RunOracle(mode, selected) range abort
         " unfortunaly oracle outputs a very long stack trace that is not
         " parsable to show the real error. But the main issue is usually the
         " package which doesn't build. 
-        " echo out
-        " redraw | echon 'vim-go: could not run static analyser (does it build?)'
         redraw | echon "vim-go: " | echohl Statement | echon out | echohl None
         return {}
     else
@@ -139,12 +136,12 @@ function! go#oracle#Implements(selected)
     endfor
 
     " open a window and put the result
-    call go#ui#OpenWindow(result)
+    call go#ui#OpenWindow("Implements", result)
 
     " define some buffer related mappings:
     "
     " go to definition when hit enter
-    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition()<CR>
+    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("implements")<CR>
     " close the window when hit ctrl-c
     nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
 endfunction
@@ -182,7 +179,43 @@ endfunction
 " Show possible targets of selected function call
 function! go#oracle#Callees(selected)
     let out = s:RunOracle('callees', a:selected)
-    echo out
+    if empty(out)
+        return
+    endif
+
+    " be sure the callees object exists which contains the position and names
+    " of the callees, before we continue
+    if !has_key(out, "callees")
+        return
+    endif
+
+    " get the callees list
+    if has_key(out.callees, "callees")
+        let callees = out.callees.callees
+    else
+        redraw | echon "vim-go: " | echon "no callees available"| echohl None
+        return
+    endif
+
+    let title = "Call targets:"
+
+    " start to populate our buffer content
+    let result  = [title, ""]
+
+    for calls in callees
+        let line = calls.name . "\t" . calls.pos
+        call add(result, line)
+    endfor
+
+    " open a window and put the result
+    call go#ui#OpenWindow("Callees", result)
+
+    " define some buffer related mappings:
+    "
+    " go to definition when hit enter
+    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("call targets")<CR>
+    " close the window when hit ctrl-c
+    nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
 endfunction
 
 " Show possible callers of selected function
diff --git a/sources_non_forked/vim-go/autoload/go/rename.vim b/sources_non_forked/vim-go/autoload/go/rename.vim
index 9e401e31..5c15d22f 100644
--- a/sources_non_forked/vim-go/autoload/go/rename.vim
+++ b/sources_non_forked/vim-go/autoload/go/rename.vim
@@ -19,9 +19,9 @@ function! go#rename#Rename(...)
         return 
     endif
 
-    let fname = expand('%:p:t')
+    let fname = resolve(expand('%:p:t'))
     let pos = s:getpos(line('.'), col('.'))
-    let cmd = printf('%s -offset %s:#%d -to %s',  bin_path, shellescape(fname), pos, to)
+    let cmd = printf('%s -offset %s -to %s', shellescape(bin_path), shellescape(printf('%s:#%d', fname, pos)), shellescape(to))
 
     let out = go#tool#ExecuteInDir(cmd)
 
diff --git a/sources_non_forked/vim-go/autoload/go/textobj.vim b/sources_non_forked/vim-go/autoload/go/textobj.vim
new file mode 100644
index 00000000..fa985a8e
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/textobj.vim
@@ -0,0 +1,15 @@
+if !exists("g:go_textobj_enabled")
+    let g:go_textobj_enabled = 1
+endif
+
+function! go#textobj#Function(mode)
+  if search('^\s*func .*{$', 'Wce', line('.')) <= 0
+        \ && search('^\s*func .*{$', 'bWce') <= 0
+    return
+  endif
+  if a:mode == 'a'
+    normal! Va{V
+  else " a:mode == 'i'
+    normal! Vi{V
+  endif
+endfunction
diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim
index d5691057..b0b28236 100644
--- a/sources_non_forked/vim-go/autoload/go/tool.vim
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -1,18 +1,15 @@
 function! go#tool#Files()
-    if has ("win32")
-        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\n\"}}{{end}}"'
+    if IsWin()
+        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}"'
     else
-        " let command = "go list -f $'{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}\n{{end}}'"
-
-        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
-
+        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
     endif
     let out = go#tool#ExecuteInDir(command)
     return split(out, '\n')
 endfunction
 
 function! go#tool#Deps()
-    if has ("win32")
+    if IsWin()
         let command = 'go list -f "{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}"'
     else
         let command = "go list -f $'{{range $f := .Deps}}{{$f}}\n{{end}}'"
@@ -23,7 +20,7 @@ endfunction
 
 function! go#tool#Imports()
     let imports = {}
-    if has ("win32")
+    if IsWin()
         let command = 'go list -f "{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}"'
     else
         let command = "go list -f $'{{range $f := .Imports}}{{$f}}\n{{end}}'"
@@ -35,7 +32,7 @@ function! go#tool#Imports()
     endif
 
     for package_path in split(out, '\n')
-        let package_name = fnamemodify(package_path, ":t")
+        let package_name = fnamemodify(package_path, ":t:r")
         let imports[package_name] = package_path
     endfor
 
@@ -45,8 +42,12 @@ endfunction
 function! go#tool#ShowErrors(out)
     let errors = []
     for line in split(a:out, '\n')
+        let fatalerrors = matchlist(line, '^\(fatal error:.*\)$')
         let tokens = matchlist(line, '^\s*\(.\{-}\):\(\d\+\):\s*\(.*\)')
-        if !empty(tokens)
+
+        if !empty(fatalerrors)
+            call add(errors, {"text": fatalerrors[1]})
+        elseif !empty(tokens)
             call add(errors, {"filename" : expand("%:p:h:") . "/" . tokens[1],
                         \"lnum":     tokens[2],
                         \"text":     tokens[3]})
@@ -120,7 +121,7 @@ function! go#tool#BinPath(binpath)
     " append our GOBIN and GOPATH paths and be sure they can be found there...
     " let us search in our GOBIN and GOPATH paths
     let old_path = $PATH
-    let $PATH = $PATH . ":" .go_bin_path
+    let $PATH = $PATH . PathSep() .go_bin_path
 
     if !executable(binpath) 
         echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it."
@@ -140,7 +141,7 @@ endfunction
 function! s:get_browser_command()
     let go_play_browser_command = get(g:, 'go_play_browser_command', '')
     if go_play_browser_command == ''
-        if has('win32') || has('win64')
+        if IsWin()
             let go_play_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
         elseif has('mac') || has('macunix') || has('gui_macvim') || system('uname') =~? '^darwin'
             let go_play_browser_command = 'open %URL%'
diff --git a/sources_non_forked/vim-go/autoload/go/ui.vim b/sources_non_forked/vim-go/autoload/go/ui.vim
index 56ac8c9e..c658141d 100644
--- a/sources_non_forked/vim-go/autoload/go/ui.vim
+++ b/sources_non_forked/vim-go/autoload/go/ui.vim
@@ -1,11 +1,11 @@
 let s:buf_nr = -1
 
 "OpenWindow opens a new scratch window and put's the content into the window
-function! go#ui#OpenWindow(content)
+function! go#ui#OpenWindow(title, content)
     " reuse existing buffer window if it exists otherwise create a new one
     if !bufexists(s:buf_nr)
         execute 'botright new'
-        file `="[Implements]"`
+        file `="[" . a:title . "]"`
         let s:buf_nr = bufnr('%')
     elseif bufwinnr(s:buf_nr) == -1
         execute 'botright new'
@@ -17,9 +17,9 @@ function! go#ui#OpenWindow(content)
 
     " Keep minimum height to 10, if there is more just increase it that it
     " occupies all results
-    let implements_height = 10
-    if len(a:content) < implements_height
-        exe 'resize ' . implements_height
+    let buffer_height = 10
+    if len(a:content) < buffer_height
+        exe 'resize ' . buffer_height
     else
         exe 'resize ' . len(a:content)
     endif
@@ -58,11 +58,11 @@ endfunction
 
 " OpenDefinition parses the current line and jumps to it by openening a new
 " tab
-function! go#ui#OpenDefinition()
+function! go#ui#OpenDefinition(filter)
     let curline = getline('.')
 
-    " don't touch our first line and any blank line
-    if curline =~ "implements" || curline =~ "^$"
+    " don't touch our first line or any blank line
+    if curline =~ a:filter || curline =~ "^$"
         " supress information about calling this function
         echo "" 
         return
diff --git a/sources_non_forked/vim-go/compiler/go.vim b/sources_non_forked/vim-go/compiler/go.vim
index c5ae0bd2..ea339845 100644
--- a/sources_non_forked/vim-go/compiler/go.vim
+++ b/sources_non_forked/vim-go/compiler/go.vim
@@ -15,8 +15,12 @@ endif
 
 let s:save_cpo = &cpo
 set cpo-=C
+if filereadable("makefile") || filereadable("Makefile")
+    CompilerSet makeprg=make
+else
+    CompilerSet makeprg=go\ build
+endif
 
-CompilerSet makeprg=go\ build
 CompilerSet errorformat=
       \%-G#\ %.%#,
       \%-G%.%#panic:\ %m,
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index 1dbd5860..edfcae36 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -17,10 +17,11 @@ CONTENTS                                                          *go-contents*
 	1. Intro........................................|go-intro|
 	2. Install......................................|go-install|
 	3. Commands.....................................|go-commands|
-	4. Settings.....................................|go-settings|
-	5. Mappings.....................................|go-mappings|
-	6. Troubleshooting..............................|go-troubleshooting|
-	7. Credits......................................|go-credits|
+	4. Mappings.....................................|go-mappings|
+	5. Text Objects.................................|go-text-objects|
+	6. Settings.....................................|go-settings|
+	7. Troubleshooting..............................|go-troubleshooting|
+	8. Credits......................................|go-credits|
 
 ===============================================================================
 INTRO                                                                *go-intro*
@@ -49,7 +50,7 @@ easily.
   * Checking with `errcheck` for unchecked errors.
   * Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
   * Share your current code to play.golang.org
-  * Type information about the underlying identifier 
+  * Type information about the underlying identifier
   * Tagbar support to show tags of the source code in a sidebar with `gotags`
 
 ===============================================================================
@@ -134,7 +135,7 @@ COMMANDS                                                          *go-commands*
 
     Filter the current Go buffer through goimports (needs to be installed).
     `goimports` automatically discards/add import path based on the code. Like
-    |GoFmt|, It tries to preserve cursor position and avoids replacing the 
+    |GoFmt|, It tries to preserve cursor position and avoids replacing the
     buffer with stderr output.
 
                                                                      *:GoPlay*
@@ -159,7 +160,7 @@ COMMANDS                                                          *go-commands*
 
     Goto declaration/definition for the given [identifier]. If no argument is
     given, it will jump to the declaration under the cursor. By default the
-    mapping `gd` is enabled to invoke GoDef for the identifier under the cursor. 
+    mapping `gd` is enabled to invoke GoDef for the identifier under the cursor.
     See |g:go_def_mapping_enabled| to disable it.
 
                                                                      *:GoRun*
@@ -167,16 +168,19 @@ COMMANDS                                                          *go-commands*
 
     Build and run your current main package. By default all main files for the
     current file is used. If an argument is passed, 'expand' is used as file
-    selector. For example use `:GoRun %` to select the current file only.  
+    selector. For example use `:GoRun %` to select the current file only.
 
     If [!] is not given the first error is jumped to.
 
                                                                    *:GoBuild*
-:GoBuild[!]
+:GoBuild[!] [options]
 
     Build your package with `go build`. It automatically builds only the files
     that depends on the current file. GoBuild doesn't produce a result file.
-    Use 'make' to create a result file. 
+    Use 'make' to create a result file.
+
+    You may optionally pass any valid go build flags/options. For a full list
+    please see `go help build`.
 
     If [!] is not given the first error is jumped to.
 
@@ -238,8 +242,9 @@ COMMANDS                                                          *go-commands*
 :GoImplements
 
     Show 'implements' relation for a selected package. A list of interfaces
-    for the type under the cursor (or selected package) is shown in a custom
-    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`.
+    for the type that implements an interface under the cursor (or selected
+    package) is shown in a custom window. Hit `<enter>` to jump in a new tab
+    or close it via `<c-c>`.
 
                                                                 *:GoRename*
 :GoRename [to]
@@ -247,6 +252,16 @@ COMMANDS                                                          *go-commands*
     Rename the identifier under the cursor to the desired new name. If no
     argument is given a prompt will ask for the desired identifier.
 
+                                                              *:GoCallees*
+:GoCallees
+
+    Show 'callees' relation for a selected package. A list of call targets
+    for the type under the cursor (or selected package) is shown in a custom
+    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`. For
+    example if called for a interface method call, it will show all call targets
+    that has implemented the method.
+
+
 ===============================================================================
 MAPPINGS                                                        *go-mappings*
 
@@ -353,6 +368,23 @@ Show the interfaces that the type under the cursor implements.
 
 Rename the identifier under the cursor to the desired new name
 
+                                                              *(go-callees)*
+
+Show the call targets for the type under the cursor
+
+===============================================================================
+TEXT OBJECTS                                                 *go-text-objects*
+
+vim-go comes with several custom |text-objects| that can be used to operate
+upon regions of text. vim-go currently defines the following text objects:
+
+                                               *go-v_af* *go-af*
+af			      "a function", select contents from a function definition to the
+               closing bracket.
+
+                                               *go-v_if* *go-if*
+if			      "inside a function", select contents of a function,
+			        excluding the function definition and the closing bracket.
 
 
 ===============================================================================
@@ -410,6 +442,16 @@ fails. By default it's disabled. >
 
   let g:go_fmt_fail_silently = 0
 <
+
+                                                   *'g:go_fmt_experimental'*
+
+Use this option to enable fmt's experimental mode. This experimental mode is
+superior to the current mode as it fully saves the undo history, so undo/redo
+doesn't break. However it's causing problems on some Vim versions. By default
+it's disabled. >
+
+  let g:go_fmt_experimental = 1
+<
                                               *'g:go_doc_keywordprg_enabled'*
 
 Use this option to change the enable GoDoc to run on words under the cursor
@@ -443,7 +485,7 @@ is empty. >
 
 <                                                            *'g:go_bin_path'*
 
-Use this option to change default path for vim-go tools when using 
+Use this option to change default path for vim-go tools when using
 |GoInstallBinaries| and |GoUpdateBinaries|. If not set `$GOBIN` or
 `$GOPATH/bin` is used. >
 
@@ -517,6 +559,12 @@ Highlights struct names. By default it's disabled. >
 
 	let g:go_highlight_structs = 0
 <
+                                                  *'g:go_textobj_enabled'*
+
+Adds custom text objects. By default it's enabled. >
+
+	let g:go_textobj_enabled = 1
+
 ===============================================================================
 TROUBLESHOOTING                                         *go-troubleshooting*
 
diff --git a/sources_non_forked/vim-go/ftplugin/go.vim b/sources_non_forked/vim-go/ftplugin/go.vim
index 548159ad..2ab7f39a 100644
--- a/sources_non_forked/vim-go/ftplugin/go.vim
+++ b/sources_non_forked/vim-go/ftplugin/go.vim
@@ -9,9 +9,7 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-if !exists("g:go_auto_type_info")
-    let g:go_auto_type_info = 0
-endif
+let b:undo_ftplugin = "setl fo< com< cms<"
 
 setlocal formatoptions-=t
 
@@ -22,42 +20,27 @@ setlocal noexpandtab
 
 compiler go
 
-if !exists("g:go_doc_keywordprg_enabled")
-    let g:go_doc_keywordprg_enabled = 1
-endif
-if g:go_doc_keywordprg_enabled
-    " keywordprg doesn't allow to use vim commands, override it
-    nnoremap <buffer> <silent> K :GoDoc<cr> 
-endif
-
-
-if !exists("g:go_def_mapping_enabled")
-    let g:go_def_mapping_enabled = 1
-endif
-if g:go_def_mapping_enabled
-   nnoremap <buffer> <silent> gd :GoDef<cr>
-endif
-
-
-let b:undo_ftplugin = "setl fo< com< cms<"
-
 " Set gocode completion
 setlocal omnifunc=go#complete#Complete
 
-" GoInfo automatic update
-if g:go_auto_type_info != 0
-    setlocal updatetime=300
-    au! CursorHold *.go nested call go#complete#Info()
+if get(g:, "go_doc_keywordprg_enabled", 1)
+    " keywordprg doesn't allow to use vim commands, override it
+    nnoremap <buffer> <silent> K :GoDoc<cr>
 endif
 
-
-" autoload settings
-if !exists('g:go_fmt_autosave')
-    let g:go_fmt_autosave = 1
+if get(g:, "go_def_mapping_enabled", 1)
+   nnoremap <buffer> <silent> gd :GoDef<cr>
 endif
 
-if g:go_fmt_autosave
-    autocmd BufWritePre <buffer> call go#fmt#Format(-1)
+if get(g:, "go_textobj_enabled", 1)
+    onoremap <buffer> af :<c-u>call go#textobj#Function('a')<cr>
+    xnoremap <buffer> af :<c-u>call go#textobj#Function('a')<cr>
+    onoremap <buffer> if :<c-u>call go#textobj#Function('i')<cr>
+    xnoremap <buffer> if :<c-u>call go#textobj#Function('i')<cr>
+endif
+
+if get(g:, "go_auto_type_info", 0)
+    setlocal updatetime=800
 endif
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
index e3b0940c..0403ae9e 100644
--- a/sources_non_forked/vim-go/ftplugin/go/commands.vim
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -17,6 +17,7 @@ nnoremap <silent> <Plug>(go-info) :<C-u>call go#complete#Info()<CR>
 nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', expand('<cword>'))<CR>
 
 nnoremap <silent> <Plug>(go-implements) :<C-u>call go#oracle#Implements(-1)<CR>
+nnoremap <silent> <Plug>(go-callees) :<C-u>call go#oracle#Callees(-1)<CR>
 
 nnoremap <silent> <Plug>(go-rename) :<C-u>call go#rename#Rename()<CR>
 
@@ -25,10 +26,10 @@ nnoremap <silent> <Plug>(go-def-vertical) :<C-u>call go#def#JumpMode("vsplit")<C
 nnoremap <silent> <Plug>(go-def-split) :<C-u>call go#def#JumpMode("split")<CR>
 nnoremap <silent> <Plug>(go-def-tab) :<C-u>call go#def#JumpMode("tab")<CR>
 
-nnoremap <silent> <Plug>(go-doc) :<C-u>call go#doc#Open("leftabove new")<CR>
-nnoremap <silent> <Plug>(go-doc-tab) :<C-u>call go#doc#Open("tabnew")<CR>
-nnoremap <silent> <Plug>(go-doc-vertical) :<C-u>call go#doc#Open("vnew")<CR>
-nnoremap <silent> <Plug>(go-doc-split) :<C-u>call go#doc#Open("split")<CR>
+nnoremap <silent> <Plug>(go-doc) :<C-u>call go#doc#Open("new", "split")<CR>
+nnoremap <silent> <Plug>(go-doc-tab) :<C-u>call go#doc#Open("tabnew", "tabe")<CR>
+nnoremap <silent> <Plug>(go-doc-vertical) :<C-u>call go#doc#Open("vnew", "vsplit")<CR>
+nnoremap <silent> <Plug>(go-doc-split) :<C-u>call go#doc#Open("new", "split")<CR>
 nnoremap <silent> <Plug>(go-doc-browser) :<C-u>call go#doc#OpenBrowser()<CR>
 
 
@@ -37,6 +38,7 @@ command! -nargs=? GoRename call go#rename#Rename(<f-args>)
 
 " oracle
 command! -range=% GoImplements call go#oracle#Implements(<count>)
+command! -range=% GoCallees call go#oracle#Callees(<count>)
 
 " tool
 command! -nargs=0 GoFiles echo go#tool#Files()
@@ -45,7 +47,7 @@ command! -nargs=* GoInfo call go#complete#Info()
 
 " cmd
 command! -nargs=* -bang GoRun call go#cmd#Run(<bang>0,<f-args>)
-command! -nargs=? -bang GoBuild call go#cmd#Build(<bang>0)
+command! -nargs=* -bang GoBuild call go#cmd#Build(<bang>0,<f-args>)
 command! -nargs=* GoInstall call go#cmd#Install(<f-args>)
 command! -nargs=* GoTest call go#cmd#Test(<f-args>)
 command! -nargs=* GoCoverage call go#cmd#Coverage(<f-args>)
@@ -58,7 +60,7 @@ command! -nargs=0 -range=% GoPlay call go#play#Share(<count>, <line1>, <line2>)
 command! -nargs=* -range GoDef :call go#def#Jump(<f-args>)
 
 " -- doc
-command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#doc#Open('leftabove new', <f-args>)
+command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#doc#Open('new', 'split', <f-args>)
 command! -nargs=* -range -complete=customlist,go#package#Complete GoDocBrowser call go#doc#OpenBrowser(<f-args>)
 
 " -- fmt
@@ -74,12 +76,11 @@ command! -nargs=* -complete=customlist,go#package#Complete GoImportAs call go#im
 command! GoLint call go#lint#Run()
 
 " -- errcheck
-command! GoErrCheck call go#errcheck#Run()
+command! -nargs=? -complete=customlist,go#package#Complete GoErrCheck call go#errcheck#Run(<f-args>)
 
 " Disable all commands until they are fully integrated.
 "
 " command! -range=% GoOracleDescribe call go#oracle#Describe(<count>)
-" command! -range=% GoOracleCallees  call go#oracle#Callees(<count>)
 " command! -range=% GoOracleCallers call go#oracle#Callers(<count>)
 " command! -range=% GoOracleCallgraph call go#oracle#Callgraph(<count>)
 " command! -range=% GoOracleCallstack call go#oracle#Callstack(<count>)
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
index cb499b57..07718281 100644
--- a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -2,151 +2,143 @@
 
 priority -10
 
-# when to abbriviate and when not?
-# b doesn't work here, because it ignores whitespace
-# optional local name?
-snippet import "Import declaration" b
+# shorthand variable declaration
+snippet : "v := value"
+${1} := ${0}
+endsnippet
+
+# anonymous function
+snippet anon "fn := func() { ... }"
+${1:fn} := func() {
+	${0}
+}
+endsnippet
+
+# append
+snippet ap "append(slice, value)"
+append(${1:slice}, ${0:value})
+endsnippet
+
+# break
+snippet br "break"
+break
+endsnippet
+
+# channel
+snippet ch "chan Type"
+chan ${0:int}
+endsnippet
+
+# case
+snippet case "case ...:"
+case ${1:value}:
+	${0}
+endsnippet
+
+# constant
+snippet con "const XXX Type = ..."
+const ${1:NAME} ${2:Type} = ${0:0}
+endsnippet
+
+# constants
+snippet cons "const ( ... )"
+const (
+	${1:NAME} ${2:Type} = ${3:value}
+	${0}
+)
+endsnippet
+
+# constants with iota
+snippet iota "const ( ... = iota )"
+const (
+	${1:NAME} ${2:Type} = iota
+	${0}
+)
+endsnippet
+
+# continue
+snippet cn "continue"
+continue
+endsnippet
+
+# default case
+snippet default "default: ..."
+default:
+	${0}
+
+endsnippet
+
+# defer
+snippet df "defer someFunction()"
+defer ${1:func}(${2})
+${0}
+endsnippet
+
+snippet def "defer func() { ... }"
+defer func() {
+	${0}
+}()
+endsnippet
+
+# defer recover
+snippet defr
+defer func() {
+	if err := recover(); err != nil {
+		${0}
+	}
+}()
+endsnippet
+
+# gpl
+snippet gpl
+/*
+* 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/>.
+*
+* Copyright (C) ${1:Author}, `strftime("%Y")`
+*/
+${0}
+endsnippet
+
+# import
+snippet import "import ( ... )"
 import (
 	"${1:package}"
 )
 endsnippet
 
-snippet package "Package declaration" b
-// Package $1 provides ${2:...}
-package ${1:main}
-${0:${VISUAL}}
-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
+# full interface snippet
+snippet interface "interface I { ... }"
 type ${1:Interface} interface {
-	${0:${VISUAL}}
+	${2:/* TODO: add methods */}
 }
 endsnippet
 
-# statements
-snippet for "For loop" b
-for ${1:condition} {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet fori "Integer for loop" b
-for ${1:i} := 0; $1 < ${2:N}; $1++ {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet forr "For range loop" b
-for ${2:name} := range ${1:collection} {
-	${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
-
-snippet select "Select statement" b
-select {
-case${0}
-}
-endsnippet
-
-snippet case "Case clause" b
-case ${1:condition}:
-	${0:${VISUAL}}
-endsnippet
-
-snippet default "Default clause" b
-default:
-	${0:${VISUAL}}
-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 anon "Anonymous Function" !b
-${1:fn} := func() {
-	${2}
-}
-endsnippet
-
-# types and variables
-snippet map "Map type" b
-map[${1:keytype}]${2:valtype}
-endsnippet
-
-snippet : "Short 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
-
-snippet er "Error clause " !b
-if err != nil {
+# if condition
+snippet if "if ... { ... }"
+if ${1:condition} {
 	${0}
 }
 endsnippet
 
+# else snippet
+snippet else
+else {
+	${0}
+}
+endsnippet
+
+# error snippet
 snippet errn "Error return " !b
 if err != nil {
 	return err
@@ -161,55 +153,195 @@ if err != nil {
 ${0}
 endsnippet
 
-snippet errn,, "Error return with three return values" !b
-if err != nil {
-	return ${1:nil}, ${2:nil}, err
-}
-${0}
+snippet json "\`json:key\`"
+\`json:"${1:keyName}"\`
 endsnippet
 
-snippet ok "OK statement" !b
-if !ok {
+# fallthrough
+snippet ft "fallthrough"
+fallthrough
+endsnippet
+
+# for loop
+snippet for "for ... { ... }"
+for ${1} {
+	${0}
+}
+endsnippet
+
+# for integer loop
+snippet fori "for 0..N-1 { ... }"
+for ${1:i} := 0; $1 < ${2:N}; $1++ {
+	${0}
+}
+endsnippet
+
+# for range loop
+snippet forr "for k, v := range items { ... }"
+for ${2:k}, ${3:v} := range ${1} {
+	${0}
+}
+endsnippet
+
+# function
+snippet func "func Function(...) [error] { ... }"
+func ${1:name}(${2:params})${3/(.+)/ /}`!p opening_par(snip, 3)`$3`!p closing_par(snip, 3)` {
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet gof "Anonymous Goroutine" !b
+# Fmt Printf debug
+snippet ff "fmt.Printf(...)"
+fmt.Printf("${1} = %+v\n", $1)
+endsnippet
+
+# Fmt Println debug
+snippet fn "fmt.Println(...)"
+fmt.Println("${1}")
+endsnippet
+
+# log printf
+snippet lf "log.Printf(...)"
+log.Printf("${1} = %+v\n", $1)
+endsnippet
+
+# log println
+snippet ln "log.Println(...)"
+log.Println("${1}")
+endsnippet
+
+# make
+snippet make "make(Type, size)"
+make(${1:[]string}, ${2:0})${0}
+endsnippet
+
+# map
+snippet map "map[Type]Type"
+map[${1:string}]${0:int}
+endsnippet
+
+# main()
+snippet main "func main() { ... }"
+func main() {
+	${0}
+}
+endsnippet
+
+# method
+snippet meth "func (self Type) Method(...) [error] { ... }"
+func (${1:receiver} ${2:type}) ${3:name}(${4:params})${5/(.+)/ /}`!p opening_par(snip, 5)`$5`!p closing_par(snip, 5)` {
+	${0:${VISUAL}}
+}
+endsnippet
+
+# ok
+snippet ok "if !ok { ... }"
+if !ok {
+	${0}
+}
+endsnippet
+
+# package
+snippet package "package ..."
+// Package $1 provides ${2:...}
+package ${1:main}
+${0}
+endsnippet
+
+# panic
+snippet pn "panic()"
+panic("${0:msg}")
+endsnippet
+
+# return
+snippet rt "return"
+return ${0}
+endsnippet
+
+# select
+snippet select "select { case a := <-chan: ... }"
+select {
+case ${1:v1} := <-${2:chan1}
+	${0}
+}
+endsnippet
+
+# struct
+snippet st "type T struct { ... }"
+type ${1:Type} struct {
+${0}
+}
+endsnippet
+
+# switch
+snippet switch "switch x { ... }"
+switch ${1:var} {
+case ${2:value1}:
+	${0}
+}
+endsnippet
+
+# sprintf
+snippet sp "fmt.Sprintf(...)"
+fmt.Sprintf("%${1:s}", ${2:var})
+endsnippet
+
+# goroutine named function
+snippet go "go someFunc(...)"
+go ${1:funcName}(${0})
+endsnippet
+
+# goroutine anonymous function
+snippet gof "go func() { ... }()"
 go func() {
 	${1}
 }()
 endsnippet
 
-snippet def "Anonymous Defer" !b
-defer func() {
-	${1}
-}()
-endsnippet
-
-snippet ff "Fmt Printf debug" !b
-fmt.Printf("${1} %+v\n", $1)
-endsnippet
-
-snippet fn "Fmt Println debug" !b
-fmt.Println("${1}")
-endsnippet
-
-snippet lf "Log Printf debug" !b
-log.Printf("${1} %+v\n", $1)
-endsnippet
-
-snippet ln "Log Println debug" !b
-log.Println("${1}")
-endsnippet
-
-snippet make "make allocation" !b
-make(${1:Type}, ${2:size})${0}
-endsnippet
-
-snippet test "test function" b
+# test function
+snippet test "func TestXYZ(t *testing.T) { ... }"
 func Test${1:Function}(t *testing.T) {
-	${2}
+	${0}
 }
 endsnippet
 
+# variable declaration
+snippet var "var x Type [= ...]"
+var ${1:x} ${2:Type}${3: = ${0:value\}}
+endsnippet
+
+# variables declaration
+snippet vars "var ( ... )"
+var (
+${1:x} ${2:Type}${3: = ${0:value\}}
+)
+endsnippet
+
+global !p
+
+import re
+
+# Automatically wrap return types with parentheses
+
+def return_values(s):
+	# remove everything wrapped in parentheses
+	s = re.sub("\(.*?\)|\([^)]*$", "", s)
+	return len(s.split(","))
+
+def opening_par(snip, pos):
+	if return_values(t[pos]) > 1 and not t[pos].startswith("("):
+		snip.rv = "("
+	else:
+		snip.rv = ""
+
+def closing_par(snip, pos):
+	if return_values(t[pos]) > 1:
+		snip.rv = ")"
+	else:
+		snip.rv = ""
+
+endglobal
+
+
 # vim:ft=snippets:
+
diff --git a/sources_non_forked/vim-go/gosnippets/snippets/go.snip b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
index d4b16c5c..a2d3b89e 100644
--- a/sources_non_forked/vim-go/gosnippets/snippets/go.snip
+++ b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
@@ -1,53 +1,70 @@
 # 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}
-	)
+snippet :
+abbr v := value
+	${1} := ${0}
+# anonymous function
+snippet anon
+abbr fn := func() { ... }
+	${1:fn} := func() {
+		${0}
+	}
 # append
 snippet ap
+abbr append(slice, value)
 	append(${1:slice}, ${0:value})
-# bool
-snippet bl
-	bool
-# byte
-snippet bt
-	byte
 # break
 snippet br
+abbr break
 	break
 # channel
 snippet ch
+abbr chan Type
 	chan ${0:int}
 # case
-snippet cs
+snippet case
+abbr case ...:
 	case ${1:value}:
 		${0}
-# const
-snippet c
-	const ${1:NAME} = ${0:0}
-# constants with iota
-snippet co
+# constant
+snippet con
+abbr const XXX Type = ...
+	const ${1:NAME} ${2:Type} = ${0:0}
+# constants
+snippet cons
+abbr const ( ... )
 	const (
-		${1:NAME1} = iota
-		${0:NAME2}
+		${1:NAME} ${2:Type} = ${3:value}
+		${0}
+	)
+# constants with iota
+snippet iota
+abbr const ( ... = iota )
+	const (
+		${1:NAME} ${2:Type} = iota
+		${0}
 	)
 # continue
 snippet cn
+abbr continue
 	continue
+# default case
+snippet default
+abbr default: ...
+	default:
+		${0}
+
 # defer
 snippet df
-	defer ${0:func}()
+abbr defer someFunction()
+	defer ${1:func}(${2})
+	${0}
+snippet def
+abbr defer func() { ... }
+	defer func() {
+		${0}
+	}()
 # defer recover
-snippet dfr
+snippet defr
 	defer func() {
 		if err := recover(); err != nil {
 			${0}
@@ -73,171 +90,185 @@ snippet gpl
 	 */
 
 	${0}
-# int
-snippet i
-	int
 # import
-snippet im
+snippet import
+abbr import ( ... )
 	import (
 		"${1:package}"
 	)
-# interface
-snippet in
-	interface{}
 # full interface snippet
-snippet inf
-	interface ${1:name} {
-		${2:/* methods */}
+snippet interface
+abbr interface I { ... }
+	type ${1:Interface} interface {
+		${2:/* TODO: add methods */}
 	}
 # if condition
 snippet if
-	if ${1:/* condition */} {
-		${2}
+abbr if ... { ... }
+	if ${1:condition} {
+		${0}
 	}
 # else snippet
-snippet el
+abbr else { ... }
+snippet else
 	else {
-		${1}
+		${0}
 	}
 # error snippet
-snippet ir
+snippet errn
+abbr if err != nil { ... }
 	if err != nil {
 		return err
 	}
+
+# error snippet with two return values
+snippet errn,
+abbr if err != nil { return [...], err }
+	if err != nil {
+		return ${2}$1, err
+	}
 	${0}
-# false
-snippet f
-	false
+
+# json snippet
+snippet json
+abbr \`json:key\`
+	\`json:"${1:keyName}"\`
 # fallthrough
 snippet ft
+abbr fallthrough
 	fallthrough
-# float
-snippet fl
-	float32
-# float32
-snippet f3
-	float32
-# float64
-snippet f6
-	float64
-# if else
-snippet ie
-	if ${1:/* condition */} {
-		${2}
-	} else {
-		${3}
-	}
-	${0}
 # for loop
-snippet fo
-	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4}
+snippet for
+abbr for ... { ... }
+	for ${1} {
+		${0}
+	}
+# for integer loop
+snippet fori
+abbr for 0..N-1 { ... }
+	for ${1:i} := 0; $1 < ${2:N}; $1++ {
+		${0}
 	}
-	${0}
 # for range loop
-snippet fr
-	for ${1:k}, ${2:v} := range ${3} {
-		${4}
+snippet forr
+abbr for k, v := range items { ... }
+	for ${2:k}, ${3:v} := range ${1} {
+		${0}
 	}
-	${0}
-# function simple
-snippet fun
-	func ${1:funcName}(${2}) ${3:error} {
-		${4}
+# function
+snippet func
+abbr func function(...) [error] { ... }
+	func ${1:function}(${2}) ${3:error }{
+		${0}
 	}
-	${0}
-# function on receiver
-snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5}
-	}
-	${0}
 # Fmt Printf debug
 snippet ff
-	fmt.Printf("${1} %+v\n", ${0})
+abbr fmt.Printf(...)
+	fmt.Printf("${1} = %+v\n", $1)
+	${0}
 # Fmt Println debug
 snippet fn
+abbr fmt.Println(...)
 	fmt.Println("${1}")
 # log printf
 snippet lf
-	log.Printf("%${1:s}", ${2:var})
-# log printf
-snippet lp
+abbr log.Printf(...)
+	log.Printf("${1} = %+v\n", $1)
+# log println
+snippet ln
+abbr log.Println(...)
 	log.Println("${1}")
 # make
-snippet mk
-	make(${1:[]string}, ${0:0})
+snippet make
+abbr make(Type, size)
+	make(${1:[]string}, ${2:0})${0}
 # map
-snippet mp
+snippet map
+abbr map[Type]Type
 	map[${1:string}]${0:int}
 # main()
 snippet main
+abbr func main() { ... }
+options head
 	func main() {
-		${1}
+		${0}
 	}
+# method
+snippet meth
+abbr func (self Type) Method(...) [error] { ... }
+regexp /^meth/
+	func (${1:self} ${2:Type}) ${3:Do}(${4}) ${5:error }{
+		${0}
+	}
+# ok
+snippet ok
+abbr if !ok { ... }
+	if !ok {
+		${0}
+	}
+# package
+snippet package
+abbr package ...
+	// Package $1 provides ${2:...}
+	package ${1:main}
 	${0}
-# new
-snippet nw
-	new(${0:type})
 # panic
-snippet pn
-	panic("${0:msg}")
-# print
-snippet pr
-	fmt.Printf("%${1:s}\n", ${2:var})
-# range
-snippet rn
-	range ${0}
+snippet panic
+alias pn
+abbr panic("...")
+	panic("${0}")
 # return
-snippet rt
+snippet return
+alias rt
+abbr return ...
 	return ${0}
-# result
-snippet rs
-	result
 # select
-snippet sl
+snippet select
+abbr select { case a := <-chan: ... }
 	select {
 	case ${1:v1} := <-${2:chan1}
-		${3}
-	case ${4:v2} := <-${5:chan2}
-		${6}
-	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:
+abbr type T struct { ... }
+	type ${1:Type} struct {
 		${0}
 	}
+# switch
+snippet switch
+abbr switch x { ... }
+	switch ${1:var} {
+	case ${2:value1}:
+		${0}
+	}
+# sprintf
 snippet sp
+abbr fmt.Sprintf(...)
 	fmt.Sprintf("%${1:s}", ${2:var})
-# true
-snippet t
-	true
 # goroutine named function
-snippet g
+snippet go
+abbr go someFunc(...)
 	go ${1:funcName}(${0})
 # goroutine anonymous function
-snippet ga
-	go func(${1} ${2:type}) {
-		${3:/* code */}
-	}(${0})
+snippet gof
+abbr go func(...) { ... }(...)
+	go func(${1}) {
+		${3:/* TODO */}
+	}(${2})
 # test function
 snippet test
+abbr func TestXYZ(t *testing.T) { ... }
 	func Test${1:Function}(t *testing.T) {
-		${2}
+		${0}
 	}
+# variable declaration
+snippet var
+abbr var x Type [= ...]
+	var ${1:x} ${2:Type}${3: = ${0:value\}}
+# variables declaration
+snippet vars
+abbr var ( ... )
+	var (
+		${1:x} ${2:Type}${3: = ${0:value\}}
+	)
diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim
index f71a64dd..e460ebdc 100644
--- a/sources_non_forked/vim-go/plugin/go.vim
+++ b/sources_non_forked/vim-go/plugin/go.vim
@@ -7,12 +7,12 @@ let g:go_loaded_install = 1
 " these packages are used by vim-go and can be automatically installed if
 " needed by the user with GoInstallBinaries
 let s:packages = [
-            \ "github.com/nsf/gocode", 
-            \ "code.google.com/p/go.tools/cmd/goimports", 
-            \ "code.google.com/p/rog-go/exp/cmd/godef", 
-            \ "code.google.com/p/go.tools/cmd/oracle", 
-            \ "code.google.com/p/go.tools/cmd/gorename",
-            \ "github.com/golang/lint/golint", 
+            \ "github.com/nsf/gocode",
+            \ "golang.org/x/tools/cmd/goimports",
+            \ "code.google.com/p/rog-go/exp/cmd/godef",
+            \ "golang.org/x/tools/cmd/oracle",
+            \ "golang.org/x/tools/cmd/gorename",
+            \ "github.com/golang/lint/golint",
             \ "github.com/kisielk/errcheck",
             \ "github.com/jstemmer/gotags",
             \ ]
@@ -23,6 +23,49 @@ command! GoErrCheck call go#errcheck#Run()
 command! GoInstallBinaries call s:GoInstallBinaries(-1)
 command! GoUpdateBinaries call s:GoInstallBinaries(1)
 
+" LineEnding returns the correct line ending, based on the current fileformat
+function! LineEnding()
+    if &fileformat == 'dos'
+        return "\r\n"
+    elseif &fileformat == 'mac'
+        return "\r"
+    endif
+
+    return "\n"
+endfunction
+
+" IsWin returns 1 if current OS is Windows or 0 otherwise
+function! IsWin()
+    let win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
+    for w in win
+        if (has(w))
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" PathSep returns the appropriate path separator based on OS.
+function! PathSep()
+    if IsWin()
+        return ";"
+    endif
+
+    return ":"
+endfunction
+
+" DefaultGoPath returns the default GOPATH.
+" If there is only one GOPATH it returns that, otherwise it returns the first one.
+function! DefaultGoPath()
+    let go_paths = split($GOPATH, PathSep())
+
+    if len(go_paths) == 1
+        return $GOPATH
+    endif
+
+    return go_paths[0]
+endfunction
 
 " GetBinPath returns the binary path of installed go tools
 function! GetBinPath()
@@ -35,24 +78,11 @@ function! GetBinPath()
     elseif $GOBIN != ""
         let bin_path = $GOBIN
     elseif $GOPATH != ""
-        " take care of multi element GOPATH's
-        let go_paths = split($GOPATH, ":")
-
-        if len(go_paths) == 1 
-            " one single PATH
-            let bin_path = $GOPATH . '/bin/'
-        else
-            " multiple paths, use the first one
-            let bin_path = go_paths[0]. '/bin/'
-        endif
+        let bin_path = expand(DefaultGoPath() . "/bin/")
     else
         " could not find anything
-        return ""
     endif
 
-    " add trailing slash if there is no one
-    if bin_path[-1:-1] != '/' | let bin_path .= '/' | endif
-
     return bin_path
 endfunction
 
@@ -60,9 +90,9 @@ endfunction
 " packages variable. It uses by default $GOBIN or $GOPATH/bin as the binary
 " target install directory. GoInstallBinaries doesn't install binaries if they
 " exist, to update current binaries pass 1 to the argument.
-function! s:GoInstallBinaries(updateBinaries) 
+function! s:GoInstallBinaries(updateBinaries)
     if $GOPATH == ""
-        echohl Error 
+        echohl Error
         echomsg "vim.go: $GOPATH is not set"
         echohl None
         return
@@ -82,7 +112,17 @@ function! s:GoInstallBinaries(updateBinaries)
     let old_path = $PATH
 
     " vim's executable path is looking in PATH so add our go_bin path to it
-    let $PATH = $PATH . ":" .go_bin_path
+    let $PATH = $PATH . PathSep() .go_bin_path
+
+    " when shellslash is set on MS-* systems, shellescape puts single quotes
+    " around the output string. cmd on Windows does not handle single quotes
+    " correctly. Unsetting shellslash forces shellescape to use double quotes
+    " instead.
+    let resetshellslash = 0
+    if has('win32') && &shellslash
+        let resetshellslash = 1
+        set noshellslash
+    endif
 
     for pkg in s:packages
         let basename = fnamemodify(pkg, ":t")
@@ -94,7 +134,7 @@ function! s:GoInstallBinaries(updateBinaries)
         endif
 
         if !executable(bin) || a:updateBinaries == 1
-            if a:updateBinaries == 1 
+            if a:updateBinaries == 1
                 echo "vim-go: Updating ". basename .". Reinstalling ". pkg . " to folder " . go_bin_path
             else
                 echo "vim-go: ". basename ." not found. Installing ". pkg . " to folder " . go_bin_path
@@ -109,6 +149,9 @@ function! s:GoInstallBinaries(updateBinaries)
 
     " restore back!
     let $PATH = old_path
+    if resetshellslash
+        set shellslash
+    endif
 endfunction
 
 " CheckBinaries checks if the necessary binaries to install the Go tool
@@ -130,5 +173,23 @@ function! s:CheckBinaries()
     endif
 endfunction
 
+" Autocommands
+" ============================================================================
+
+augroup vim-go
+    autocmd!
+
+    " GoInfo automatic update
+    if get(g:, "go_auto_type_info", 0)
+        autocmd CursorHold *.go nested call go#complete#Info()
+    endif
+
+    " code formatting on save
+    if get(g:, "go_fmt_autosave", 1)
+        autocmd BufWritePre *.go call go#fmt#Format(-1)
+    endif
+
+augroup END
+
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim
index 59f72ed7..4ee39a71 100644
--- a/sources_non_forked/vim-go/syntax/go.vim
+++ b/sources_non_forked/vim-go/syntax/go.vim
@@ -10,7 +10,9 @@
 "     let OPTION_NAME = 0
 "   in your ~/.vimrc file to disable particular options. You can also write:
 "     let OPTION_NAME = 1
-"   to enable particular options. At present, all options default to on.
+"   to enable particular options. 
+"   At present, all options default to on, except highlight of:
+"   functions, methods and structs.
 "
 "   - go_highlight_array_whitespace_error
 "     Highlights white space after "[]".
@@ -107,10 +109,10 @@ syn match       goDeclaration       /\<func\>/
 " Predefined functions and values
 syn keyword     goBuiltins          append cap close complex copy delete imag len
 syn keyword     goBuiltins          make new panic print println real recover
-syn keyword     goConstants         iota true false nil
+syn keyword     goBoolean           iota true false nil
 
 hi def link     goBuiltins          Keyword
-hi def link     goConstants         Keyword
+hi def link     goBoolean           Boolean
 
 " Comments; their contents
 syn keyword     goTodo              contained TODO FIXME XXX BUG
@@ -141,9 +143,11 @@ hi def link     goEscapeError       Error
 syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
 syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
 syn region      goRawString         start=+`+ end=+`+
+syn match       goFormatSpecifier   /%[#0\-\ \+\*]*[vTtbcdoqxXUeEfgGsp]/ contained containedin=goString
 
 hi def link     goString            String
 hi def link     goRawString         String
+hi def link 	goFormatSpecifier   goSpecialString
 
 " Characters; their contents
 syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
@@ -199,7 +203,7 @@ endif
 " Extra types commonly seen
 if g:go_highlight_extra_types != 0
   syn match goExtraType /\<bytes\.\(Buffer\)\>/
-  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+  syn match goExtraType /\<io\.\(Reader\|ReadSeeker\|ReadWriter\|ReadCloser\|ReadWriteCloser\|Writer\|WriteCloser\|Seeker\)\>/
   syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
   syn match goExtraType /\<unsafe\.Pointer\>/
 endif
diff --git a/sources_non_forked/vim-multiple-cursors/.gitignore b/sources_non_forked/vim-multiple-cursors/.gitignore
new file mode 100644
index 00000000..0a56e3fc
--- /dev/null
+++ b/sources_non_forked/vim-multiple-cursors/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index 04da4c6b..b9844a5b 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -1,4 +1,10 @@
-# vim-multiple-cursors [![Build Status](https://travis-ci.org/terryma/vim-multiple-cursors.png)](https://travis-ci.org/terryma/vim-multiple-cursors)
+# vim-multiple-cursors [![Build Status](https://travis-ci.org/terryma/vim-multiple-cursors.svg)](https://travis-ci.org/terryma/vim-multiple-cursors)
+
+###Contributors
+- [eapache](https://github.com/eapache)
+- [aschrab](https://github.com/aschrab)
+- [kristijanhusak](https://github.com/kristijanhusak)
+- [faceleg](https://github.com/faceleg)
 
 ## About
 [There](https://github.com/paradigm/vim-multicursor) [have](https://github.com/felixr/vim-multiedit) [been](https://github.com/hlissner/vim-multiedit) [many](https://github.com/adinapoli/vim-markmultiple) [attempts](https://github.com/AndrewRadev/multichange.vim) at bringing Sublime Text's awesome [multiple selection][sublime-multiple-selection] feature into Vim, but none so far have been in my opinion a faithful port that is simplistic to use, yet powerful and intuitive enough for an existing Vim user. [vim-multiple-cursors] is yet another attempt at that.
@@ -20,7 +26,9 @@ To see what keystrokes are used for the above example, see [this issue](https://
 ## Features
 - Live update in Insert mode
 - One key to rule it all! See [Quick Start](#quick-start) on what the key does in different scenarios
-- Works in Normal, Insert, and Visual mode for SINGLE key command
+- Works in Normal, Insert, and Visual mode for any commands (including
+  multi-key commands, assuming you set `g:multicursor_insert_maps` and
+  `g:multicursor_normal_maps`; see Settings below for details)
 
 ## Installation
 Install using [Pathogen], [Vundle], [Neobundle], or your favorite Vim package manager.
@@ -36,7 +44,7 @@ Two additional keys are also mapped:
 - `Ctrl-p` in Visual mode will remove the current virtual cursor and go back to the previous virtual cursor location. This is useful if you are trigger happy with `Ctrl-n` and accidentally went too far.
 - `Ctrl-x` in Visual mode will remove the current virtual cursor and skip to the next virtual cursor location. This is useful if you don't want the current selection to be a candidate to operate on later.
 
-You can also add multiple cursors using a regular expression. The command `MultipleCursorsFind` accepts a range and a pattern, and it will create a virtual cursor at the end of every match within the range. If no range is passed in, then it defaults to the entire buffer.  
+You can also add multiple cursors using a regular expression. The command `MultipleCursorsFind` accepts a range and a pattern, and it will create a virtual cursor at the end of every match within the range. If no range is passed in, then it defaults to the entire buffer.
 
 **NOTE:** If at any time you have lingering cursors on screen, you can press `Ctrl-n` in Normal mode and it will remove all prior cursors before starting a new one.
 
@@ -61,14 +69,21 @@ By default, the 'next' key is also used to enter multicursor mode. If you want t
 let g:multi_cursor_start_key='<F6>'
 ```
 
-**IMPORTANT:** Please note that currently only single keystrokes and special keys can be mapped. This contraint is also the reason why multikey commands such as `ciw` do not work and cause unexpected behavior in Normal mode. This means that a mapping like `<Leader>n` will NOT work correctly. For a list of special keys that are supported, see `help :key-notation`
+Note that when multicursor mode is started, it selects current word without boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in Normal mode (as `*` does) but still have old behaviour up your sleeve, you can do the following:
+```
+let g:multi_cursor_start_key='g<C-n>'
+let g:multi_cursor_start_word_key='<C-n>'
+```
+In this configuration `<C-n>` will start multicursor mode using word boundaries (but only in Normal mode, as it does not make much sense to use it in Visual mode). Old behaviour without word boundaries is still available using `g<C-n>`.
+
+**IMPORTANT:** Please note that currently only single keystrokes and special keys can be mapped. This means that a mapping like `<Leader>n` will NOT work correctly. For a list of special keys that are supported, see `help :key-notation`
 
 **NOTE:** Please make sure to always map something to `g:multi_cursor_quit_key`, otherwise you'll have a tough time quitting from multicursor mode.
 
-**NOTE:** Prior to version 1.3, the recommended way to map the keys is using the expressoin quote syntax in Vim, using something like `"\<C-n>"` or `"\<Esc>"` (see h: expr-quote). After 1.3, the recommended way is to use a raw string like above. If your key mappings don't appear to work, give the new syntax a try.
+**NOTE:** Prior to version 1.3, the recommended way to map the keys is using the expression quote syntax in Vim, using something like `"\<C-n>"` or `"\<Esc>"` (see h: expr-quote). After 1.3, the recommended way is to use a raw string like above. If your key mappings don't appear to work, give the new syntax a try.
 
 ## Setting
-Currently there're two additional global settings one can tweak:
+Currently there're three additional global settings one can tweak:
 ### ```g:multi_cursor_exit_from_visual_mode``` (Default: 1)
 
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
@@ -76,6 +91,54 @@ If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not q
 ### ```g:multi_cursor_exit_from_insert_mode``` (Default: 1)
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Insert_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
 
+### ```g:multi_cursor_insert_maps``` (Default: `{}`)
+Any key in this map (values are ignored) will cause multi-cursor _Insert_ mode
+to pause for `timeoutlen` waiting for map completion just like normal vim.
+Otherwise keys mapped in insert mode are ignored when multiple cursors are
+active. For example, setting it to `{'\':1}` will make insert-mode mappings
+beginning with the default leader key work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys *start*
+mappings.
+
+### ```g:multi_cursor_normal_maps``` (Default: `{}`)
+Any key in this map (values are ignored) will cause multi-cursor _Normal_ mode
+to pause for map completion just like normal vim. Otherwise keys mapped in
+normal mode will "fail to replay" when multiple cursors are active. For example,
+setting it to `{'d':1}` will make normal-mode mappings beginning with `d` (such
+as `dw` to delete a word) work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys *start*
+mappings; setting it to include motion commands like `j` can break things.
+
+### Interactions with other plugins
+
+### ```Multiple_cursors_before/Multiple_cursors_after``` (Default: `nothing`)
+
+Other plugins may trigger on keypresses when in insert mode. These plugins 
+generally provide a means to toggle their active state. These hooks allow
+the user to provide functions in their .vimrc to do this when multiple-cursor-mode 
+is entered.
+
+For example, if you are using [Neocomplete](https://github.com/Shougo/neocomplete.vim),
+add this to your vimrc to prevent conflict:
+
+```
+" Called once right before you start selecting multiple cursors
+function! Multiple_cursors_before()
+  if exists(':NeoCompleteLock')==2
+    exe 'NeoCompleteLock'
+  endif
+endfunction
+
+" Called once only when the multiple selection is canceled (default <Esc>)
+function! Multiple_cursors_after()
+  if exists(':NeoCompleteUnlock')==2
+    exe 'NeoCompleteUnlock'
+  endif
+endfunction
+```
+
+With this locking and unlocking we prevent neocomplete to trigger it's function calls until we are finished with multiple cursors editing.
+
 ### Highlight
 The plugin uses the highlight group `multiple_cursors_cursor` and `multiple_cursors_visual` to highlight the virtual cursors and their visual selections respectively. You can customize them by putting something similar like the following in your vimrc:
 
@@ -86,8 +149,6 @@ highlight link multiple_cursors_visual Visual
 ```
 
 ## Issues
-- Multi key commands like `ciw` do not work at the moment
-- All user input typed before Vim is able to fan out the last operation to all cursors is lost. This is a implementation decision to keep the input perfectly synced in all locations, at the cost of potentially losing user input.
 - Select mode is not implemented
 
 ## Changelog
diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index 7cdae119..4543fce1 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -8,22 +8,23 @@
 " it to work the way we like. '<C-n>' is converted to '\<C-n>' by the end and
 " the global vars are replaced by their new value. This is ok since the mapping
 " using '<C-n>' should already have completed in the plugin file.
-for key in [ 'g:multi_cursor_next_key',
+for s:key in [ 'g:multi_cursor_next_key',
            \ 'g:multi_cursor_prev_key',
            \ 'g:multi_cursor_skip_key',
            \ 'g:multi_cursor_quit_key' ]
-  if exists(key)
+  if exists(s:key)
     " Translate raw strings like "<C-n>" into key code like "\<C-n>"
-    exec 'let temp = '.key
-    if temp =~ '^<.*>$'
-      exec 'let '.key.' = "\'.temp.'"' 
+    exec 'let s:temp = '.s:key
+    if s:temp =~ '^<.*>$'
+      exec 'let '.s:key.' = "\'.s:temp.'"'
     endif
   else
     " If the user didn't define it, initialize it to an empty string so the
     " logic later don't break
-    exec 'let '.key.' = ""'
+    exec 'let '.s:key.' = ""'
   endif
 endfor
+unlet! s:key s:temp
 
 " These keys will not be replicated at every cursor location. Make sure that
 " this assignment happens AFTER the key tweak setting above
@@ -38,6 +39,13 @@ let s:hi_group_cursor = 'multiple_cursors_cursor'
 " The highlight group we use for all the visual selection
 let s:hi_group_visual = 'multiple_cursors_visual'
 
+" Used for preventing multiple calls on before function
+let s:before_function_called = 0
+
+" Used for searching whole words (search pattern is wrapped with \< and \>)
+" Keep old behaviour by default (act like g*)
+let s:use_word_boundary = 0
+
 " Set up highlighting
 if !hlexists(s:hi_group_cursor)
   exec "highlight ".s:hi_group_cursor." term=reverse cterm=reverse gui=reverse"
@@ -50,28 +58,29 @@ endif
 " Internal Mappings
 "===============================================================================
 
-inoremap <silent> <Plug>(i) <C-o>:call <SID>process_user_input()<CR>
-nnoremap <silent> <Plug>(i) :call <SID>process_user_input()<CR>
-xnoremap <silent> <Plug>(i) :<C-u>call <SID>process_user_input()<CR>
+inoremap <silent> <Plug>(multiple-cursors-input) <C-o>:call <SID>process_user_input()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-input) :call <SID>process_user_input()<CR>
+xnoremap <silent> <Plug>(multiple-cursors-input) :<C-u>call <SID>process_user_input()<CR>
 
-inoremap <silent> <Plug>(a) <C-o>:call <SID>apply_user_input_next('i')<CR>
-nnoremap <silent> <Plug>(a) :call <SID>apply_user_input_next('n')<CR>
-xnoremap <silent> <Plug>(a) :<C-u>call <SID>apply_user_input_next('v')<CR>
+inoremap <silent> <Plug>(multiple-cursors-apply) <C-o>:call <SID>apply_user_input_next('i')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-apply) :call <SID>apply_user_input_next('n')<CR>
+xnoremap <silent> <Plug>(multiple-cursors-apply) :<C-u>call <SID>apply_user_input_next('v')<CR>
 
-inoremap <silent> <Plug>(d) <C-o>:call <SID>detect_bad_input()<CR>
-nnoremap <silent> <Plug>(d) :call <SID>detect_bad_input()<CR>
-xnoremap <silent> <Plug>(d) :<C-u>call <SID>detect_bad_input()<CR>
+inoremap <silent> <Plug>(multiple-cursors-detect) <C-o>:call <SID>detect_bad_input()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-detect) :call <SID>detect_bad_input()<CR>
+xnoremap <silent> <Plug>(multiple-cursors-detect) :<C-u>call <SID>detect_bad_input()<CR>
 
-inoremap <silent> <Plug>(w) <C-o>:call <SID>wait_for_user_input('')<CR>
-nnoremap <silent> <Plug>(w) :call <SID>wait_for_user_input('')<CR>
-xnoremap <silent> <Plug>(w) :<C-u>call <SID>wait_for_user_input('')<CR>
+inoremap <silent> <Plug>(multiple-cursors-wait) <C-o>:call <SID>wait_for_user_input('')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-wait) :call <SID>wait_for_user_input('')<CR>
+xnoremap <silent> <Plug>(multiple-cursors-wait) :<C-u>call <SID>wait_for_user_input('')<CR>
 
 " Note that although these mappings are seemingly triggerd from Visual mode,
 " they are in fact triggered from Normal mode. We quit visual mode to allow the
 " virtual highlighting to take over
-nnoremap <silent> <Plug>(p) :<C-u>call multiple_cursors#prev()<CR>
-nnoremap <silent> <Plug>(s) :<C-u>call multiple_cursors#skip()<CR>
-nnoremap <silent> <Plug>(n) :<C-u>call multiple_cursors#new('v')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-prev) :<C-u>call multiple_cursors#prev()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-skip) :<C-u>call multiple_cursors#skip()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-new) :<C-u>call multiple_cursors#new('v', 0)<CR>
+nnoremap <silent> <Plug>(multiple-cursors-new-word) :<C-u>call multiple_cursors#new('v', 1)<CR>
 
 "===============================================================================
 " Public Functions
@@ -95,7 +104,13 @@ endfunction
 " 3. In visual mode, if the visual selection covers a single line, a new cursor
 " is created at the end of the visual selection. Another cursor will be
 " attempted to be created at the next occurrence of the visual selection
-function! multiple_cursors#new(mode)
+function! multiple_cursors#new(mode, word_boundary)
+  " Call before function if exists only once until it is canceled (<Esc>)
+  if exists('*Multiple_cursors_before') && !s:before_function_called
+    exe "call Multiple_cursors_before()"
+    let s:before_function_called = 1
+  endif
+  let s:use_word_boundary = a:word_boundary
   if a:mode ==# 'n'
     " Reset all existing cursors, don't restore view and setting
     call s:cm.reset(0, 0)
@@ -238,6 +253,9 @@ function! s:Cursor.new(position)
   let obj.cursor_hi_id = s:highlight_cursor(a:position)
   let obj.visual_hi_id = 0
   let obj.line_length = col([a:position[0], '$'])
+  if has('folding')
+    silent! execute a:position[0] . "foldopen!"
+  endif
   return obj
 endfunction
 
@@ -328,7 +346,7 @@ function! s:CursorManager.new()
 endfunction
 
 " Clear all cursors and their highlights
-function! s:CursorManager.reset(restore_view, restore_setting) dict
+function! s:CursorManager.reset(restore_view, restore_setting, ...) dict
   if a:restore_view
     " Return the view back to the beginning
     if !empty(self.saved_winview)
@@ -361,6 +379,11 @@ function! s:CursorManager.reset(restore_view, restore_setting) dict
   if a:restore_setting
     call self.restore_user_settings()
   endif
+  " Call after function if exists and only if action is canceled (<Esc>)
+  if exists('*Multiple_cursors_after') && a:0 && s:before_function_called
+    exe "call Multiple_cursors_after()"
+    let s:before_function_called = 0
+  endif
 endfunction
 
 " Returns 0 if it's not managing any cursors at the moment
@@ -435,6 +458,8 @@ function! s:CursorManager.update_current() dict
     call cur.update_visual_selection(s:get_visual_region(s:pos('.')))
   elseif s:from_mode ==# 'v' || s:from_mode ==# 'V'
     call cur.remove_visual_selection()
+  elseif s:from_mode ==# 'i' && s:to_mode ==# 'n' && self.current_index == self.size() - 1
+    normal! `^
   endif
   let vdelta = line('$') - s:saved_linecount
   " If the total number of lines changed in the buffer, we need to potentially
@@ -628,6 +653,12 @@ endfunction
 " visual selection ended
 function! s:exit_visual_mode()
   exec "normal! \<Esc>gv\<Esc>"
+
+  " Call before function if exists only once until it is canceled (<Esc>)
+  if exists('*Multiple_cursors_before') && !s:before_function_called
+    exe "call Multiple_cursors_before()"
+    let s:before_function_called = 1
+  endif
 endfunction
 
 " Visually select input region, where region is an array containing the start
@@ -643,7 +674,7 @@ endfunction
 function! s:select_in_visual_mode(region)
   if a:region[0] == a:region[1]
     normal! v
-  else 
+  else
     call cursor(a:region[1])
     normal! m`
     call cursor(a:region[0])
@@ -660,7 +691,7 @@ endfunction
 function! s:update_visual_markers(region)
   if a:region[0] == a:region[1]
     normal! v
-  else 
+  else
     call cursor(a:region[1])
     normal! m`
     call cursor(a:region[0])
@@ -674,7 +705,11 @@ endfunction
 " Mode change: Normal -> Normal
 " Cursor change: Set to the end of the match
 function! s:find_next(text)
-  let pattern = '\V\C'.substitute(escape(a:text, '\'), '\n', '\\n', 'g')
+  let pattern = substitute(escape(a:text, '\'), '\n', '\\n', 'g')
+  if s:use_word_boundary == 1
+      let pattern = '\<'.pattern.'\>'
+  endif
+  let pattern = '\V\C'.pattern
   call search(pattern)
   let start = s:pos('.')
   call search(pattern, 'ce')
@@ -714,7 +749,7 @@ function! s:highlight_region(region)
       let pattern = s1.'\|'.s2
       " More than two lines
       if (s[1][0] - s[0][0] > 1)
-        let pattern = pattern.'\|\%>'.s[0][0].'l\%<'.s[1][0].'l.*\ze.\_$' 
+        let pattern = pattern.'\|\%>'.s[0][0].'l\%<'.s[1][0].'l.*\ze.\_$'
       endif
     endif
   endif
@@ -725,28 +760,31 @@ endfunction
 function! s:revert_mode(from, to)
   if a:to ==# 'v'
     call s:cm.reapply_visual_selection()
-  endif
-  if a:to ==# 'V'
+  elseif a:to ==# 'V'
     call s:cm.reapply_visual_selection()
     normal! V
-  endif
-  if a:to ==# 'n' && a:from ==# 'i'
+  elseif a:to ==# 'n' && a:from ==# 'i'
     stopinsert
   endif
 endfunction
 
 " Consume all the additional character the user typed between the last
 " getchar() and here, to avoid potential race condition.
-" TODO(terryma): This solves the problem of cursors getting out of sync, but
-" we're potentially losing user input. We COULD replay these characters as
-" well...
+let s:saved_keys = ""
 function! s:feedkeys(keys)
   while 1
     let c = getchar(0)
+    let char_type = type(c)
     " Checking type is important, when strings are compared with integers,
     " strings are always converted to ints, and all strings are equal to 0
-    if type(c) == 0 && c == 0
-      break
+    if char_type == 0
+      if c == 0
+        break
+      else
+        let s:saved_keys .= nr2char(c)
+      endif
+    elseif char_type == 1 " char with more than 8 bits (as string)
+      let s:saved_keys .= c
     endif
   endwhile
   call feedkeys(a:keys)
@@ -770,8 +808,8 @@ function! s:process_user_input()
 
   " Apply the user input. Note that the above could potentially change mode, we
   " use the mapping below to help us determine what the new mode is
-  " Note that it's possible that \<Plug>(a) never gets called, we have a
-  " detection mechanism using \<Plug>(d). See its documentation for more details
+  " Note that it's possible that \<Plug>(multiple-cursors-apply) never gets called, we have a
+  " detection mechanism using \<Plug>(multiple-cursors-detect). See its documentation for more details
 
   " Assume that input is not valid
   let s:valid_input = 0
@@ -781,14 +819,14 @@ function! s:process_user_input()
   " FIXME(terryma): Undo always places the cursor at the beginning of the line.
   " Figure out why.
   if s:from_mode ==# 'i' || s:to_mode ==# 'i'
-    silent! undojoin | call s:feedkeys(s:char."\<Plug>(a)")
+    silent! undojoin | call s:feedkeys(s:char."\<Plug>(multiple-cursors-apply)")
   else
-    call s:feedkeys(s:char."\<Plug>(a)")
+    call s:feedkeys(s:char."\<Plug>(multiple-cursors-apply)")
   endif
-  
+
   " Even when s:char produces invalid input, this method is always called. The
   " 't' here is important
-  call feedkeys("\<Plug>(d)", 't')
+  call feedkeys("\<Plug>(multiple-cursors-detect)", 't')
 endfunction
 
 " This method is always called during fanout, even when a bad user input causes
@@ -797,7 +835,7 @@ endfunction
 function! s:detect_bad_input()
   if !s:valid_input
     " We ignore the bad input and force invoke s:apply_user_input_next
-    call feedkeys("\<Plug>(a)")
+    call feedkeys("\<Plug>(multiple-cursors-apply)")
     let s:bad_input += 1
   endif
 endfunction
@@ -828,10 +866,10 @@ function! s:apply_user_input_next(mode)
       " This is necessary to set the "'<" and "'>" markers properly
       call s:update_visual_markers(s:cm.get_current().visual)
     endif
-    call feedkeys("\<Plug>(w)")
+    call feedkeys("\<Plug>(multiple-cursors-wait)")
   else
     " Continue to next
-    call feedkeys("\<Plug>(i)")
+    call feedkeys("\<Plug>(multiple-cursors-input)")
   endif
 endfunction
 
@@ -873,7 +911,7 @@ endfunction
 " Quits multicursor mode and clears all cursors. Return true if exited
 " successfully.
 function! s:exit()
-  if s:char !=# g:multi_cursor_quit_key
+  if s:last_char() !=# g:multi_cursor_quit_key
     return 0
   endif
   let exit = 0
@@ -887,7 +925,7 @@ function! s:exit()
     let exit = 1
   endif
   if exit
-    call s:cm.reset(1, 1)
+    call s:cm.reset(1, 1, 1)
     return 1
   endif
   return 0
@@ -902,11 +940,15 @@ function! s:handle_special_key(key, mode)
   " increasing the call stack, since feedkeys execute after the current call
   " finishes
   if a:key == g:multi_cursor_next_key
-    call s:feedkeys("\<Plug>(n)")
+    if s:use_word_boundary == 1
+      call s:feedkeys("\<Plug>(multiple-cursors-new-word)")
+    else
+      call s:feedkeys("\<Plug>(multiple-cursors-new)")
+    endif
   elseif a:key == g:multi_cursor_prev_key
-    call s:feedkeys("\<Plug>(p)")
+    call s:feedkeys("\<Plug>(multiple-cursors-prev)")
   elseif a:key == g:multi_cursor_skip_key
-    call s:feedkeys("\<Plug>(s)")
+    call s:feedkeys("\<Plug>(multiple-cursors-skip)")
   endif
 endfunction
 
@@ -941,12 +983,20 @@ function! s:revert_highlight_fix()
   let s:saved_line = 0
 endfunction
 
+let s:retry_keys = ""
 function! s:display_error()
-  if s:bad_input > 0
-    echohl ErrorMsg |
-          \ echo "Key '".s:char."' cannot be replayed at ".
-          \ s:bad_input." cursor location".(s:bad_input == 1 ? '' : 's') |
-          \ echohl Normal
+  if s:bad_input == s:cm.size() && has_key(g:multi_cursor_normal_maps, s:char[0])
+    " we couldn't replay it anywhere but we're told it's the beginning of a
+    " multi-character map like the `d` in `dw`
+    let s:retry_keys = s:char
+  else
+    let s:retry_keys = ""
+    if s:bad_input > 0
+      echohl ErrorMsg |
+            \ echo "Key '".s:char."' cannot be replayed at ".
+            \ s:bad_input." cursor location".(s:bad_input == 1 ? '' : 's') |
+            \ echohl Normal
+    endif
   endif
   let s:bad_input = 0
 endfunction
@@ -982,6 +1032,10 @@ function! s:end_latency_measure()
   let s:skip_latency_measure = 0
 endfunction
 
+function! s:last_char()
+  return s:char[len(s:char)-1]
+endfunction
+
 function! s:wait_for_user_input(mode)
   let s:from_mode = a:mode
   if empty(a:mode)
@@ -1001,7 +1055,38 @@ function! s:wait_for_user_input(mode)
 
   call s:end_latency_measure()
 
-  let s:char = s:get_char()
+  let s:char = s:retry_keys . s:saved_keys
+  if len(s:saved_keys) == 0
+    let s:char .= s:get_char()
+  else
+    let s:saved_keys = ""
+  endif
+
+  if s:from_mode ==# 'i' && has_key(g:multi_cursor_insert_maps, s:last_char())
+    let c = getchar(0)
+    let char_type = type(c)
+    let poll_count = 0
+    while char_type == 0 && c == 0 && poll_count < &timeoutlen
+      sleep 1m
+      let c = getchar(0)
+      let char_type = type(c)
+      let poll_count += 1
+    endwhile
+
+    if char_type == 0 && c != 0
+      let s:char .= nr2char(c)
+    elseif char_type == 1 " char with more than 8 bits (as string)
+      let s:char .= c
+    endif
+  elseif s:from_mode !=# 'i' && s:char[0] ==# ":"
+    call feedkeys(s:char)
+    call s:cm.reset(1, 1)
+    return
+  elseif s:from_mode ==# 'n'
+    while match(s:last_char(), "\\d") == 0
+      let s:char .= s:get_char()
+    endwhile
+  endif
 
   call s:start_latency_measure()
 
@@ -1013,11 +1098,11 @@ function! s:wait_for_user_input(mode)
   endif
 
   " If the key is a special key and we're in the right mode, handle it
-  if index(get(s:special_keys, s:from_mode, []), s:char) != -1
-    call s:handle_special_key(s:char, s:from_mode)
+  if index(get(s:special_keys, s:from_mode, []), s:last_char()) != -1
+    call s:handle_special_key(s:last_char(), s:from_mode)
     call s:skip_latency_measure()
   else
     call s:cm.start_loop()
-    call s:feedkeys("\<Plug>(i)")
+    call s:feedkeys("\<Plug>(multiple-cursors-input)")
   endif
 endfunction
diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
index a1de56e5..7c5237c0 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -108,6 +108,21 @@ mode than for selecting the next location, do like the following: >
     let g:multi_cursor_start_key='<F6>'
 <
 
+*g:multi_cursor_start_word_key*
+When multicursor mode is started, it selects current word without
+boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in
+Normal mode (as `*` does) but still have old behaviour up your sleeve, you can
+do the following: >
+
+    let g:multi_cursor_start_key='g<C-n>'
+    let g:multi_cursor_start_word_key='<C-n>'
+<
+
+In this configuration <C-n> will start multicursor mode using word boundaries
+(but only in Normal mode, as it does not make much sense to use it in Visual
+mode). Old behaviour without word boundaries is still available using
+g<C-n>.
+
 IMPORTANT: Please note that currently only single keystroes and special
 keys can be mapped. This contraint is also the reason why multikey commands
 such as `ciw` do not work and cause unexpected behavior in Normal mode. This
diff --git a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
index d8b83471..9a7be377 100644
--- a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
@@ -33,6 +33,9 @@ let s:settings = {
       \ 'debug_latency': 0,
       \ }
 
+let g:multi_cursor_insert_maps = get(g:, 'multi_cursor_insert_maps', {})
+let g:multi_cursor_normal_maps = get(g:, 'multi_cursor_normal_maps', {})
+
 let s:settings_if_default = {
       \ 'quit_key': '<Esc>',
       \ 'next_key': '<C-n>',
@@ -53,9 +56,17 @@ endif
 " External mappings
 if exists('g:multi_cursor_start_key')
   exec 'nnoremap <silent> '.g:multi_cursor_start_key.
-        \' :call multiple_cursors#new("n")<CR>'
+        \' :call multiple_cursors#new("n", 0)<CR>'
   exec 'xnoremap <silent> '.g:multi_cursor_start_key.
-        \' :<C-u>call multiple_cursors#new("v")<CR>'
+        \' :<C-u>call multiple_cursors#new("v", 0)<CR>'
+endif
+
+if exists('g:multi_cursor_start_word_key')
+  exec 'nnoremap <silent> '.g:multi_cursor_start_word_key.
+        \' :call multiple_cursors#new("n", 1)<CR>'
+  " In Visual mode word boundary is not used
+  exec 'xnoremap <silent> '.g:multi_cursor_start_word_key.
+        \' :<C-u>call multiple_cursors#new("v", 0)<CR>'
 endif
 
 " Commands
diff --git a/sources_non_forked/vim-repeat/autoload/repeat.vim b/sources_non_forked/vim-repeat/autoload/repeat.vim
index 18b12800..6acb48ee 100644
--- a/sources_non_forked/vim-repeat/autoload/repeat.vim
+++ b/sources_non_forked/vim-repeat/autoload/repeat.vim
@@ -55,6 +55,7 @@ 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()
+    autocmd! repeat_custom_motion
     let g:repeat_tick = -1
 endfunction
 
@@ -97,7 +98,7 @@ endfunction
 
 function! repeat#wrap(command,count)
     let preserve = (g:repeat_tick == b:changedtick)
-    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo' ? 'zv' : '')
+    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo\|all' ? 'zv' : '')
     if preserve
         let g:repeat_tick = b:changedtick
     endif
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 15d4c300..38ff530d 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -106,12 +106,13 @@ fun! s:ProcessSnippet(snip)
 	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
 
 	if exists('b:snipmate_content_visual')
-		let visual = b:snipmate_content_visual
+		let visual = substitute(b:snipmate_content_visual, "\n$", '', '')
 		unlet b:snipmate_content_visual
 	else
 		let visual = ''
 	endif
-	let snippet = substitute(snippet,'{VISUAL}', escape(visual,'%\'), 'g')
+	let snippet = substitute(snippet, '\n\(\t\+\).\{-\}\zs{VISUAL}',
+				\ substitute(escape(visual, '%\'), "\n", "\n\\\\1", 'g'), 'g')
 
 	" Evaluate eval (`...`) expressions.
 	" Backquotes prefixed with a backslash "\" are ignored.
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index bc9dd691..46cc3905 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -205,15 +205,17 @@ 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.
 
-* Python - [honza](http://github.com/honza)
-* Javascript - [honza](http://github.com/honza)
-* HTML Django - [honza](http://github.com/honza)
-* Markdown - [honza](http://github.com/honza)
-* Ruby - [taq](http://github.com/taq)
-* PHP - [chrisyue](http://github.com/chrisyue)
-* Scala - [gorodinskiy](https://github.com/gorodinskiy)
-* Falcon - [steveno](https://github.com/steveno)
+* Clojure - [lpil](https://github.com/lpil)
 * Elixir - [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)
+* Rust - [lpil](https://github.com/lpil)
+* Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 License
 -------
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ada.snippets b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
index d33c7778..cc35c2c2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
@@ -11,10 +11,6 @@ def ada_case(word):
 			out = out + word[i]
 	return out
 
-def get_year():
-	import time
-	return time.strftime("%Y")
-
 endglobal
 
 snippet wi "with"
@@ -281,44 +277,4 @@ snippet newline "Ada.Text_IO.New_Line"
 Ada.Text_IO.New_Line(${1:1});$0
 endsnippet
 
-snippet gpl "GPL license header"
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU ${1}General Public License as published by
--- the Free Software Foundation; either version ${2: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 $1General Public License for more details.
---
--- You should have received a copy of the GNU $1General Public License
--- along with this program; if not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${3:Author}, ${4:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
-snippet gplf "GPL file license header"
--- This file is part of ${1:Program-Name}.
--- 
--- $1 is free software: you can redistribute it and/or modify
--- it under the terms of the GNU ${2}General Public License as published by
--- the Free Software Foundation, either version ${3:3} of the License, or
--- (at your option) any later version.
--- 
--- $1 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 $2General Public License for more details.
--- 
--- You should have received a copy of the GNU $2General Public License
--- along with $1. If not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${4:Author}, ${5:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index f816ba40..e33d2c51 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -78,10 +78,12 @@ endglobal
 snippet box "A nice box with the current comment symbol" b
 `!p
 box = make_box(len(t[1]))
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]))
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 
@@ -89,10 +91,12 @@ snippet bbox "A nice box over the full width" b
 `!p
 width = int(vim.eval("&textwidth")) or 71
 box = make_box(len(t[1]), width)
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]), width)
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index ae58c9f2..171f08c8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -44,66 +44,13 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 endsnippet
 
 snippet ft "form_tag"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${5:update}'}${6:, {:${8:class} => '${9: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 end "end (ERB)"
-<% end -%>
-endsnippet
-
-snippet for "for loop (ERB)"
-<% if !${1:list}.blank? %>
-	<% for ${2:item} in ${1} %>
-		$3
-	<% end %>
-<% else %>
-	$4
-<% end %>
-
-endsnippet
-
-snippet ffcb "form_for check_box"
-`!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 ffff "form_for file_field 2"
-`!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 ffhf "form_for hidden_field 2"
-`!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 ffl "form_for label 2"
-`!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 ffpf "form_for password_field 2"
-`!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 ffrb "form_for radio_box 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
 snippet ffs "form_for submit 2"
-`!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 ffta "form_for text_area 2"
-`!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 fftf "form_for text_field 2"
-`!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 fields "fields_for"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-	$0
-`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+`!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)"
@@ -279,10 +226,6 @@ snippet else "else (ERB)"
 	$0
 endsnippet
 
-snippet if "if (ERB)"
-<% if ${1:condition} %>$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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index 079db914..674985c7 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -191,7 +191,7 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 endsnippet
 
 snippet h1 "XHTML <h1>" w
-<h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
+<h1>$0</h1>
 endsnippet
 
 snippet head "XHTML <head>"
@@ -287,22 +287,4 @@ snippet movie "Embed QT movie (movie)" b
 	`!p x(snip)`>
 </object>
 endsnippet
-
-snippet html5 "HTML5 Template"
-<!DOCTYPE html>
-<html>
-<head>
-	<title>${1}</title>
-	<meta charset="utf-8" />
-</head>
-<body>
-	<header>
-		${2}
-	</header>
-	<footer>
-		${4}
-	</footer>
-</body>
-</html>
-endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 5889e059..6c177bc1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -52,27 +52,18 @@ function ${1:function_name}(${2:argument}) {
 }
 endsnippet
 
+snippet vf "Function assigned to var"
+${1:var }${2:function_name} = function $2(${3}) {
+	${VISUAL}$0
+};
+endsnippet
+
 snippet iife "Immediately-Invoked Function Expression (iife)"
 (function (${1:argument}) {
 	${VISUAL}$0
 }(${2:$1}));
 endsnippet
 
-snippet ife "if ___ else"
-if (${1:condition}) {
-	${2://code}
-}
-else {
-	${3://code}
-}
-endsnippet
-
-snippet if "if"
-if (${1:condition}) {
-	${VISUAL}$0
-}
-endsnippet
-
 snippet timeout "setTimeout function"
 setTimeout(function() {
 	${VISUAL}$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
index 61b52293..91b59316 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
@@ -19,49 +19,59 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+controller('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aconts "angular controller with scope" i
-controller('${1:name}', ['$scope', function($scope) {
+controller('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet adir "angular directive" i
-directive('${1:name}', ['${2:param_annotation}', function(${3:param}) {
-	$0
+directive('${1}', [${2}function(${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:name}', ['$scope', function($scope) {
-	$0
+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}', ['${2:param_annotation}', function(${3:param}) {
+factory('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet afacts "angular factory with scope" i
-factory('${1:name}', ['$scope', function($scope) {
+factory('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aserv "angular service" i
-service('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+service('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aservs "angular service" i
-service('${1:name}', ['$scope', function($scope) {
+service('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
new file mode 100644
index 00000000..9f817a8d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
@@ -0,0 +1,260 @@
+#resource controller
+snippet l_rsc "Laravel resource controller" b
+/*!
+ * \class       ${1:`!v expand('%:t:r')`}
+ *
+ * \author      ${2:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+class $1 {
+    public function index() {
+        ${3}
+    }
+    
+    public function create() {
+        ${4}
+    }
+    
+    public function store($id) {
+        ${5}
+    }
+    
+    public function show($id) {
+        ${6}
+    }
+    
+    public function edit($id) {
+        ${7}
+    }
+    
+    public function update($id) {
+        ${8}
+    }
+    
+    public function destroy($id) {
+        ${9}
+    }
+}
+endsnippet
+
+#service service provider
+snippet l_ssp "Laravel service provider for service" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Support\ServiceProvider;
+
+class $2 extends ServiceProvider {
+    
+    public function register() {
+        $this->app->bind('${4}Service', function ($app) {
+            return new ${5}(
+                $app->make('Repositories\\${6}Interface')
+            );
+        });
+    }
+}
+endsnippet
+
+#repository service provider
+snippet l_rsp "Laravel service provider for repository" b
+/*!
+ * \namespace   ${2:Repositories\\${1:}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $2;
+
+use Entities\\$1;
+use $2\\$1Repository;
+use Illuminate\Support\ServiceProvider;
+
+class $3 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
+/*!
+ * \namespace   ${1:Entities}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $2 extends \Eloquent {
+    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+    public $timestamps = '${5:false}';
+
+    protected $hidden  = array(${6});
+
+    protected $guarded = array(${7:'id'});
+}
+endsnippet
+
+#abstract repository
+snippet l_ar "Laravel abstract Repository" b
+/*!
+ * \namespace   ${1:Repositories}
+ * \class       ${2:`!v expand('%:t:r')`}
+ * \implements  ${3:BaseRepositoryInterface}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class $2 implements $3 {
+    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);
+    }
+}
+endsnippet
+
+#repository
+snippet l_r "Laravel Repository" b
+/*!
+ * \namespace   ${1:Repositories\\${2}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ * \implements  ${4:BaseRepositoryInterface}
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $3 extends \\$1 implements $4 {
+    ${6}
+}
+endsnippet
+
+#service
+snippet l_s "Laravel Service" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use ${4:Repositories\\${5:Interface}};
+
+class $2 {
+    protected $${6:repo};
+    
+    /*!
+     * \fn      __construct
+     */
+    public function __construct($5 $repo) {
+        $this->$6 = $repo;
+    }
+}
+endsnippet
+
+#facade
+snippet l_f "Laravel Facade" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use \Illuminate\Support\Facades\Facade;
+
+class $2 extends Facade {
+    /*!
+     * \fn          getFacadeAccessor
+     *
+     * \return      string
+     */
+    protected static function getFacadeAccessor() { return '${5:${4}Service}'; }
+}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
index 1a310a19..e928bb1e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
@@ -30,3 +30,9 @@ expects($this->${1:once}())
 	->with($this->equalTo(${3})${4})
 	->will($this->returnValue(${5}));
 endsnippet
+
+snippet testcmt "phpunit comment with group" b
+/**
+* @group ${1}
+*/
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
index 09a114f6..6114cfaf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
@@ -5,267 +5,135 @@ snippet "^#!" "#!/usr/bin/env ruby" r
 $0
 endsnippet
 
-
 snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 # encoding: UTF-8
 $0
 endsnippet
 
-
-
-snippet If "<command> if <expression>"
-${1:command} if ${0:expression}
-endsnippet
-
-
-
-snippet Unless "<command> unless <expression>"
-${1:command} unless ${0:expression}
-endsnippet
-
-
-
-snippet if "if <condition> ... end"
-if ${1:condition}
-	${2:# TODO}
-end
-endsnippet
-
-
-
-snippet ife "if <condition> ... else ... end"
-if ${1:condition}
-	${2:# TODO}
-else
-	${3:# TODO}
-end
-endsnippet
-
-
-
-snippet ifee "if <condition> ... elseif <condition> ... else ... end"
-if ${1:condition}
-	${2:# TODO}
-elsif ${3:condition}
-	${4:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unless "unless <condition> ... end"
-unless ${1:condition}
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unlesse "unless <condition> ... else ... end"
-unless ${1:condition}
-	${2:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
-unless ${1:condition}
-	${2:# TODO}
-elsif ${3:condition}
-	${4:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
 snippet "\b(de)?f" "def <name>..." r
-def ${1:function_name}${2: ${3:*args}}
-	${0:# TODO}
+def ${1:function_name}${2:(${3:*args})}
+	$0
 end
 endsnippet
 
-
-
 snippet defi "def initialize ..."
-def initialize${1: ${2:*args}}
-	${0:# TODO}
+def initialize${1:(${2:*args})}
+	$0
 end
 endsnippet
 
-
-
 snippet defr "def <name> ... rescue ..."
-def ${1:function_name}${2: ${3:*args}}
-	${4:# TODO}
+def ${1:function_name}${2:(${3:*args})}
+	$4
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+(${1:from}..${2:to}).each { |${3:i}| $0 }
 endsnippet
 
-
-
-snippet for "(<from>..<to>).each do |<i>| <block> end"
-(${1:from}..${2:to}).each do |${3:i}|
-	${0:# TODO}
-end
-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}| ${3:# TODO} }
+`!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:# TODO}
+	$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}| ${3:# TODO} }
+`!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:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+`!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:# TODO}
+	$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}| ${3:# TODO} }
+`!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:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+`!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:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+`!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:# TODO}
+	$0
 end
 endsnippet
 
-
-
-snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+snippet "(\S+)\.ea" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each { |${1:e}| $0 }
 endsnippet
 
-
-
-snippet each "<elements>.each do |<element>| <block> end"
-${1:elements}.each do |${2:${1/s$//}}|
-	${0:# TODO}
+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:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
-${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
+${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('$@')
@@ -275,11 +143,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $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('$@')
@@ -290,12 +156,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$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('$@')
@@ -305,11 +169,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $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('$@')
@@ -320,12 +182,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$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('$@')
@@ -335,11 +195,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $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('$@')
@@ -350,13 +208,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
-
 snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
 `!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -366,11 +221,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3:# TODO} }$0
+`},${2:i}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
 `!p snip.rv=match.group(1)`.each_with_index do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -381,128 +234,94 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0:# TODO}
+	$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}| ${3:# TODO} }
+`!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:# TODO}
+	$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 do "do |<key>| ... end" i
 do |${1:args}|
 	$0
 end
 endsnippet
 
-
-
 snippet Do "do ... end" i
 do
 	$0
 end
 endsnippet
 
-
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet Until "begin ... end until <expression>"
 begin
-	${0:# TODO}
+	$0
 end until ${1:expression}
 endsnippet
 
-
-
 snippet while "while <expression> ... end"
 while ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet While "begin ... end while <expression>"
 begin
-	${0:# TODO}
+	$0
 end while ${1:expression}
 endsnippet
 
-
-
 snippet "\b(r|attr)" "attr_reader :<attr_names>" r
 attr_reader :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(w|attr)" "attr_writer :<attr_names>" r
 attr_writer :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(rw|attr)" "attr_accessor :<attr_names>" r
 attr_accessor :${0:attr_names}
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... end"
 begin
-	${1:# TODO}
+	$1
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... else ... ensure ... end"
 begin
 	${1:# Raise exception}
@@ -517,8 +336,6 @@ ensure
 end
 endsnippet
 
-
-
 snippet rescue
 rescue Exception => e
 	puts e.message
@@ -526,8 +343,6 @@ rescue Exception => e
 	${0:# Rescue}
 endsnippet
 
-
-
 snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
 case ${1:variable}
 when ${2:expression}
@@ -535,32 +350,24 @@ $0
 end
 endsnippet
 
-
-
 snippet alias "alias :<new_name> :<old_name>"
 alias :${1:new_name} :${2:old_name}
 endsnippet
 
-
-
 snippet class "class <class_name> def initialize ... end end"
 class ${1:class_name}
-	def initialize ${2:*args}
+	def initialize(${2:*args})
 		$0
 	end
 end
 endsnippet
 
-
-
 snippet module "module"
 module ${1:module_name}
 	$0
 end
 endsnippet
 
-
-
 snippet ###
 =begin
 	$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index 82a1abb8..ddb948f2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -10,43 +10,6 @@ fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 }
 endsnippet
 
-snippet test "Test function" b
-#[test]
-fn ${1:test_function_name}() {
-	${VISUAL}${0}
-}
-endsnippet
-
-
-snippet bench "Bench function" b
-#[bench]
-fn ${1:bench_function_name}(b: &mut test::Bencher) {
-	b.iter(|| {
-		${VISUAL}${0}
-	})
-}
-endsnippet
-
-snippet new "A new function" b
-pub fn new(${2}) -> ${1:Name} {
-	${VISUAL}${0}return $1 { ${3} };
-}
-endsnippet
-
-snippet main "The main function" b
-pub fn main() {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet let "A let statement" b
-let ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
-snippet lmut "let mut = .." b
-let mut ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
 snippet pri "print!(..)" b
 print!("${1}"${2/..*/, /}${2});
 endsnippet
@@ -67,130 +30,22 @@ macro_rules! ${1:name} (
 )
 endsnippet
 
-snippet ec "extern crate ..." b
-extern crate ${1:sync};
-endsnippet
-
-snippet ecl "...extern crate log;" b
-#![feature(phase)]
-#[phase(plugin, link)] extern crate log;
-endsnippet
-
 snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet crate "Create header information" b
-// 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}"]
-endsnippet
-
-snippet allow "#[allow(..)]" b
-#[allow(${1:unused_variable})]
-endsnippet
-
-snippet feat "#![feature(..)]" b
-#![feature(${1:macro_rules})]
-endsnippet
-
-snippet der "#[deriving(..)]" b
-#[deriving(${1:Show})]
-endsnippet
-
-snippet attr "#[..]" b
-#[${1:inline}]
-endsnippet
-
-snippet opt "Option<..>"
-Option<${1:int}>
-endsnippet
-
-snippet res "Result<.., ..>"
-Result<${1:int}, ${2:()}>
-endsnippet
-
-snippet if "if .. (if)" b
-if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet el "else .. (el)"
-else {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet eli "else if .. (eli)"
-else if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ife "if .. else (ife)"
-if ${1} {
-	${2}
-} else {
-	${3}
-}
-endsnippet
-
-snippet mat "match"
-match ${1} {
-	${2} => ${3},
-}
-endsnippet
-
-snippet loop "loop {}" b
-loop {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet while "while .. {}" b
-while ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
 snippet for "for .. in .." b
-for ${1:i} in ${2:range(0u, 10)} {
+for ${1:i} in ${2:${3:0us}..${4:10}} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet spawn "spawn(proc() { .. });" b
-spawn(proc() {
-	${VISUAL}${0}
-});
-endsnippet
-
-snippet chan "A channel" b
-let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
-endsnippet
-
-snippet duplex "Duplex stream" b
-let (${1:from_child}, ${2:to_child}) = sync::duplex();
-endsnippet
-
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
-snippet fixme "FIXME comment"
-// FIXME: ${1}
-endsnippet
-
 snippet st "Struct" b
 struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 	${VISUAL}${0}
@@ -211,42 +66,4 @@ impl $1 {
 }
 endsnippet
 
-snippet enum "An enum" b
-enum ${1:Name} {
-	${VISUAL}${0},
-}
-endsnippet
-
-snippet type "A type" b
-type ${1:NewName} = ${VISUAL}${0};
-endsnippet
-
-snippet imp "An impl" b
-impl ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet drop "Drop implementation" b
-impl Drop for ${1:Name} {
-	fn drop(&mut self) {
-		${VISUAL}${0}
-	}
-}
-endsnippet
-
-snippet trait "Trait definition" b
-trait ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ss "A static string."
-static ${1}: &'static str = "${VISUAL}${0}";
-endsnippet
-
-snippet stat "A static variable."
-static ${1}: ${2:uint} = ${VISUAL}${0};
-endsnippet
-
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index 406948c4..4c7e44b4 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -14,6 +14,17 @@ $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
diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index 85616018..b556554c 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -15,7 +15,7 @@ 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 (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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
@@ -33,7 +33,7 @@ snippet GPL2
 	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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
@@ -51,7 +51,7 @@ snippet LGPL2
 	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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
@@ -69,7 +69,7 @@ snippet GPL3
 	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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
@@ -87,7 +87,7 @@ snippet LGPL3
 	${0}
 snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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
@@ -102,10 +102,19 @@ snippet AGPL3
 	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 (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -135,7 +144,7 @@ snippet BSD2
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -163,7 +172,7 @@ snippet BSD3
 	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -194,7 +203,7 @@ snippet BSD4
 	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (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"),
@@ -217,7 +226,7 @@ snippet MIT
 	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${2:copyright holder}
+	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.
@@ -233,21 +242,20 @@ snippet APACHE
 
 	${0}
 snippet BEERWARE
-	${2:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${3:copyright holder}
+	${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):
-	${1:`g:snips_author`} wrote this file. As long as you retain this notice you
+	$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:copyright holder}
+	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
@@ -257,3 +265,11 @@ snippet WTFPL
 	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}
diff --git a/sources_non_forked/vim-snippets/snippets/actionscript.snippets b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
index 6b1d8ebe..b7aa7cb3 100644
--- a/sources_non_forked/vim-snippets/snippets/actionscript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
@@ -75,10 +75,6 @@ snippet do
 	do {
 		${0}
 	} while (${1:cond})
-snippet wh
-	while ${1:cond}{
-		${0}
-	}
 snippet for enumerate names
 	for (${1:var} in ${2:object}){
 		${0}
diff --git a/sources_non_forked/vim-snippets/snippets/ada.snippets b/sources_non_forked/vim-snippets/snippets/ada.snippets
index ce377b99..1039946f 100644
--- a/sources_non_forked/vim-snippets/snippets/ada.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ada.snippets
@@ -215,41 +215,3 @@ snippet getl Ada.Text_IO.Get_Line
 snippet newline Ada.Text_IO.New_Line
 	Ada.Text_IO.New_Line(${1:1});${0}
 
-snippet gpl GPL license header
-	-- This program is free software; you can redistribute it and/or modify
-	-- it under the terms of the GNU ${1}General Public License as published by
-	-- the Free Software Foundation; either version ${2: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 $1General Public License for more details.
-	--
-	-- You should have received a copy of the GNU $1General Public License
-	-- along with this program; if not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${3:Author}, ${4:`strftime("%Y")`}
-
-	${0}
-
-snippet gplf GPL file license header
-	-- This file is part of ${1:Program-Name}.
-	--
-	-- $1 is free software: you can redistribute it and/or modify
-	-- it under the terms of the GNU ${2}General Public License as published by
-	-- the Free Software Foundation, either version ${3:3} of the License, or
-	-- (at your option) any later version.
-	-- 
-	-- $1 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 $2General Public License for more details.
-	-- 
-	-- You should have received a copy of the GNU $2General Public License
-	-- along with $1. If not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${4:Author}, ${5:`strftime("%Y")`}
-
-	${0}
-
diff --git a/sources_non_forked/vim-snippets/snippets/awk.snippets b/sources_non_forked/vim-snippets/snippets/awk.snippets
new file mode 100644
index 00000000..32e56f2f
--- /dev/null
+++ b/sources_non_forked/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}
+	}
+
+snippet ife if ... else ...
+	if (${1}) {
+		${2}
+	} 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/sources_non_forked/vim-snippets/snippets/clojure.snippets b/sources_non_forked/vim-snippets/snippets/clojure.snippets
index 6fd653fc..152f896e 100644
--- a/sources_non_forked/vim-snippets/snippets/clojure.snippets
+++ b/sources_non_forked/vim-snippets/snippets/clojure.snippets
@@ -1,76 +1,73 @@
 snippet comm
 	(comment
-	  ${0}
-	  )
+		${0})
 snippet condp
 	(condp ${1:pred} ${2:expr}
-	  ${0})
+		${0})
 snippet def
 	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-	  ${0})
+		${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})
+		${0})
 snippet defp
 	(defprotocol ${1:name}
-	  ${0})
+		${0})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
-	  ${3:protocol}
-	  ${0})
+		${3:protocol}
+		${0})
 snippet deft
 	(deftest ${1:name}
-	    (is (= ${2:assertion})))
-	  ${0})
+		(is (= ${0:assertion})))
 snippet is
 	(is (= ${1} ${0}))
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
-	  ${3:Protocol}
-	  ${0})
+		${3:Protocol}
+		${0})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-	  ${0})
+		${0})
 snippet fn
 	(fn [${1:arg-list}] ${0})
 snippet if
 	(if ${1:test-expr}
-	  ${2:then-expr}
-	  ${0:else-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}}}
+		& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
 		${0})
 snippet letfn
-	(letfn [(${1:name) [${2:args}]
-	          ${0})])
+	(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})
+		${0})
 snippet ns
-	(ns ${1:name}
-	  ${0})
+	(ns ${0:name})
 snippet dotimes
 	(dotimes [_ 10]
-	  (time
-	    (dotimes [_ ${1:times}]
-	      ${0})))
+		(time
+			(dotimes [_ ${1:times}]
+				${0})))
 snippet pmethod
 	(${1:name} [${2:this} ${0:args}])
 snippet refer
diff --git a/sources_non_forked/vim-snippets/snippets/codeigniter.snippets b/sources_non_forked/vim-snippets/snippets/codeigniter.snippets
new file mode 100644
index 00000000..7adf1e95
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/codeigniter.snippets
@@ -0,0 +1,218 @@
+# 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 create(data) {{{
+		/**
+		 * create
+		 *
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function create($data)
+		{
+			if($this->db->insert($table, $data))
+				return true;
+			else
+				return false;
+		}
+		// }}}
+
+		// public read(id) {{{
+		/**
+		 * read
+		 *
+		 * @param int $id
+		 * @access public
+		 * @return boolean
+		 */
+		public function read($id)
+		{
+			return $this->db->get_where($table, array('id', $id))->result();
+		}
+		// }}}
+
+		// public update(id,data) {{{
+		/**
+		 * update
+		 *
+		 * @param int $id
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function update($id, $data)
+		{
+			if($this->db->update($table, $data, array('id' => $id)))
+				return true;
+			else
+				return false;
+		}
+		// }}}
+
+		// public delete(id) {{{
+		/**
+		 * delete
+		 *
+		 * @param mixed $id (int o array of int)
+		 * @access public
+		 * @return boolean
+		 */
+		public function delete($id)
+		{
+			if(is_array($id))
+			{
+				$this->db->trans_start();
+				foreach($id as $elem)
+					$this->db->delete($table, array('id' => $elem));
+				$this->db->trans_complete();
+			}
+			else
+			{
+				if($this->db->delete($table, array('id' => $id)))
+					return true;
+				else
+					return false;
+			}
+		}
+		// }}}
+
+		// public listRows(limit=null,offset=0) {{{
+		/**
+		 * listRows
+		 *
+		 * @param int $limit
+		 * @param int $offset
+		 * @access public
+		 * @return boolean
+		 */
+		public function listRows($limit = null, $offset = 0)
+		{
+			if(!is_null($limit))
+				$this->db->limit($limit, $offset);
+			return $this->db->get($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/sources_non_forked/vim-snippets/snippets/fortran.snippets b/sources_non_forked/vim-snippets/snippets/fortran.snippets
new file mode 100644
index 00000000..c9ab0602
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/fortran.snippets
@@ -0,0 +1,93 @@
+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
+# 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}, allocatable, dimension(${2::}) :: $0
+snippet intent
+	${1:type}, intent(inout) :: $0
+# Array
+snippet /
+	(/ $1 /) ${2:,&} $0
+snippet if
+	if (${1:condition}) then
+		$2
+	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}
+		$4
+	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 read
+	read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet write
+	write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet open
+	open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0
+snippet close
+	close ( unit = ${1:fp} ) $0
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index 8623eda2..af76e724 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -148,8 +148,8 @@ snippet fun
 	${0}
 # function on receiver
 snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5}
+	func (${1:receiver} ${2:type}) ${3:funcName}(${4}) ${5:error} {
+		${6}
 	}
 	${0}
 # log printf
@@ -173,6 +173,9 @@ snippet main
 # new
 snippet nw
 	new(${0:type})
+# package
+snippet pa
+	package ${1:main}
 # panic
 snippet pn
 	panic("${0:msg}")
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index 4fecc998..633c9aaf 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -2,6 +2,8 @@ snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet haddock
 	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet inline
+	{-# INLINE ${0:name} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 7cb33dde..dcc28e74 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -462,8 +462,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:link}
 		</head>
@@ -475,8 +475,8 @@ snippet html5l
 	<!DOCTYPE html>
 	<html lang="${1:es}">
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${3:link}
 		</head>
@@ -702,6 +702,10 @@ 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
diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/sources_non_forked/vim-snippets/snippets/markdown.snippets
index fd2f2971..d3667d05 100644
--- a/sources_non_forked/vim-snippets/snippets/markdown.snippets
+++ b/sources_non_forked/vim-snippets/snippets/markdown.snippets
@@ -2,26 +2,75 @@
 
 # Includes octopress (http://octopress.org/) snippets
 
-snippet [
-	[${1:text}](http://${2:address} "${0:title}")
-snippet [*
-	[${1:link}](${2:`@*`} "${3:title}")
+# 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} "${0:title}"
+	[${1:id}]: http://${2:url}
+
 snippet [:*
-	[${1:id}]: ${2:`@*`} "${0:title}"
+	[${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} "${0:title}")
+	![${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} "${0:title}"
-snippet ![:*
-	![${1:id}]: ${2:`@*`} "${0:title}"
+	![${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(".") - 1)) - strlen(getline('.')))`
 
@@ -46,15 +95,16 @@ snippet blockquote-link
 	${0:quote}
 	{% endblockquote %}
 
-snippet bt-codeblock-short
-	```
-	${0:code_snippet}
-	```
+snippet ```
+	\`\`\`
+	${1:code}
+	\`\`\`
 
-snippet bt-codeblock-full
-	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${0:code_snippet}
-	```
+# Language.
+snippet ```l
+	\`\`\`${1:language}
+	${2:code}
+	\`\`\`
 
 snippet codeblock-short
 	{% codeblock %}
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index c221f466..77d74e4d 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -129,9 +129,16 @@ snippet pdb
 # ipython debugger (ipdb)
 snippet ipdb
 	import ipdb; ipdb.set_trace()
+# embed ipython itself
+snippet iem
+	import IPython; IPython.embed()
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# python_prompt_toolkit
+snippet ppt
+	from prompt_toolkit.contrib.repl import embed
+	embed(globals(), locals(), vi_mode=${1:default=False}, history_filename=${2:default=None})
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()
@@ -208,3 +215,9 @@ 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/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 7097c6d6..c4bcc43d 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -73,10 +73,32 @@ snippet ife
 snippet eif
 	elsif ${1:condition}
 		${0}
+snippet ifee
+	if ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
 snippet unless
 	unless ${1:condition}
 		${0}
 	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}
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index f135eb58..195f254a 100644
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -4,11 +4,7 @@
 
 # Functions
 snippet fn
-	fn ${1:function_name}(${2}) {
-		${0}
-	}
-snippet fn-
-	fn ${1:function_name}(${2}) -> ${3} {
+	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
 snippet test
@@ -16,6 +12,13 @@ snippet 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
 	pub fn new(${2}) -> ${1:Name} {
 		${0}return $1 { ${3} };
@@ -25,7 +28,9 @@ snippet main
 		${0}
 	}
 snippet let
-	let ${1:name}${3} = ${2};
+	let ${1:name: type} = ${2};
+snippet let
+	let mut ${1:name: type} = ${2};
 snippet pln
 	println!("${1}");
 snippet pln,
@@ -52,25 +57,48 @@ snippet allow
 	#[allow(${1:unused_variable})]
 snippet feat
 	#![feature(${1:macro_rules})]
+snippet der "#[deriving(..)]" b
+	#[deriving(${1:Show})]
+snippet attr "#[..]" b
+	#[${1:inline}]
+
 # Common types
 snippet opt
 	Option<${1:int}>
 snippet res
 	Result<${1:~str}, ${2:()}>
 snippet if
-	if ${1:/* condition */} {
+	if ${1} {
+		${0}
+	}
+snippet ife
+	if ${1} {
+		${2}
+	} else {
+		${0}
+	}
+snippet el
+	else {
+		${0}
+	}
+snippet eli
+	else if ${1} {
 		${0}
 	}
 snippet mat
 	match ${1} {
 		${2} => ${3},
 	}
+snippet loop "loop {}" b
+	loop {
+		${0}
+	}
 snippet while
 	while ${1:condition} {
 		${0}
 	}
 snippet for
-	for ${1:i} in ${2:range(0u, 10)} {
+	for ${1:i} in ${2:0u..10} {
 		${0}
 	}
 snippet spawn
@@ -83,12 +111,19 @@ snippet duplex
 	let (${1:from_child}, ${2:to_child}) = sync::duplex();
 # TODO commenting
 snippet todo
-	// [TODO]: ${1:Description}
+	// [TODO]: ${0:Description}
+snippet fixme "FIXME comment"
+	// FIXME: $0
+
 # Struct
 snippet st
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
+snippet stn
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
 
 	impl $1 {
 		pub fn new(${2}) -> $1 {
@@ -97,9 +132,11 @@ snippet st
 			};
 		}
 	}
+snippet typ
+	type ${1:NewName} = $0;
 # Enum
 snippet enum
-	enum ${1:enum_name} {
+	enum ${1:Name} {
 		${0},
 	}
 # Impl
@@ -122,4 +159,4 @@ snippet trait
 snippet ss
 	static ${1}: &'static str = "${0}";
 snippet stat
-	static ${1}: ${2:uint} = ${0};
+	static ${1}: ${2:usize} = ${0};
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index f824ee28..003081ef 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -298,19 +298,25 @@ snippet scalatest
 	${0:import org.scalatest.FunSuite}
 #assert
 snippet assert
-	assert(${1:a}==${0:b})
+	assert(${1:a} === ${0:b})
 #ensuring(p 296)
 snippet ensuring
 	ifel ensuring(${1:a}==${0:b})
 #expect
 snippet expect
-	expect(${0:what}) {
+	expect(${1:what}) {
+		${0}
+	}
 #intercept
 snippet intercept
-	intercept[${0:IllegalArgumentException}] {
+	intercept[${1:IllegalArgumentException}] {
+		${0}
+	}
 #test
 snippet test
-	test("${0:description}") {
+	test("${1:description}") {
+		${0}
+	}
 #suite
 snippet suite
 	class ${0:name} extends Suite {
diff --git a/sources_non_forked/vim-snippets/snippets/scss.snippets b/sources_non_forked/vim-snippets/snippets/scss.snippets
index 6daee776..9a208cab 100644
--- a/sources_non_forked/vim-snippets/snippets/scss.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scss.snippets
@@ -18,8 +18,14 @@ snippet if
 	@if ${1:condition} {
 		${0}
 	}
-snippet else
-	@else ${1:condition} {
+snippet ife
+	@if ${1:condition} {
+		${2}
+	} @else {
+		${0}
+	}
+snippet eif
+	@else if ${1:condition} {
 		${0}
 	}
 snippet for
diff --git a/sources_non_forked/vim-snippets/snippets/stylus.snippets b/sources_non_forked/vim-snippets/snippets/stylus.snippets
index 4a305702..d03d1781 100644
--- a/sources_non_forked/vim-snippets/snippets/stylus.snippets
+++ b/sources_non_forked/vim-snippets/snippets/stylus.snippets
@@ -1,993 +1,993 @@
 snippet !
-    !important
+		!important
 snippet bdi:m+
-    -moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
-    -moz-border-image ${0}
+		-moz-border-image ${0}
 snippet bdrz:m
-    -moz-border-radius ${0}
+		-moz-border-radius ${0}
 snippet bxsh:m+
-  -moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:m
-    -moz-box-shadow ${0}
+		-moz-box-shadow ${0}
 snippet bdi:w+
-    -webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:w
-    -webkit-border-image ${0}
+		-webkit-border-image ${0}
 snippet bdrz:w
-    -webkit-border-radius ${0}
+		-webkit-border-radius ${0}
 snippet bxsh:w+
-    -webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:w
-    -webkit-box-shadow ${0}
+		-webkit-box-shadow ${0}
 snippet @f
-    @font-face ${0}
+		@font-face ${0}
 snippet @i
-    @import '${0}'
+		@import '${0}'
 snippet @r
-    @require '${0}'
+		@require '${0}'
 snippet @m
-    @media ${1:screen}
+		@media ${1:screen}
 snippet @msmw
-    @media screen and (min-width: ${0}px)
+		@media screen and (min-width: ${0}px)
 snippet @ext
-    @extend .${1}
-    ${0}
+		@extend .${1}
+		${0}
 snippet bg+
-    background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+		background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
 snippet bga
-    background-attachment ${0}
+		background-attachment ${0}
 snippet bga:f
-    background-attachment fixed
+		background-attachment fixed
 snippet bga:s
-    background-attachment scroll
+		background-attachment scroll
 snippet bgbk
-    background-break ${0}
+		background-break ${0}
 snippet bgbk:bb
-    background-break bounding-box
+		background-break bounding-box
 snippet bgbk:c
-    background-break continuous
+		background-break continuous
 snippet bgbk:eb
-    background-break each-box
+		background-break each-box
 snippet bgcp
-    background-clip ${0}
+		background-clip ${0}
 snippet bgcp:bb
-    background-clip border-box
+		background-clip border-box
 snippet bgcp:cb
-    background-clip content-box
+		background-clip content-box
 snippet bgcp:nc
-    background-clip no-clip
+		background-clip no-clip
 snippet bgcp:pb
-    background-clip padding-box
+		background-clip padding-box
 snippet bgc
-    background-color ${0}
+		background-color ${0}
 snippet bgc:t
-    background-color transparent
+		background-color transparent
 snippet bgi
-    background-image url(${0})
+		background-image url(${0})
 snippet bgi:n
-    background-image none
+		background-image none
 snippet bgo
-    background-origin ${0}
+		background-origin ${0}
 snippet bgo:bb
-    background-origin border-box
+		background-origin border-box
 snippet bgo:cb
-    background-origin content-box
+		background-origin content-box
 snippet bgo:pb
-    background-origin padding-box
+		background-origin padding-box
 snippet bgpx
-    background-position-x ${0}
+		background-position-x ${0}
 snippet bgpy
-    background-position-y ${0}
+		background-position-y ${0}
 snippet bgp
-    background-position ${1:0} ${0:0}
+		background-position ${1:0} ${0:0}
 snippet bgr
-    background-repeat ${0}
+		background-repeat ${0}
 snippet bgr:n
-    background-repeat no-repeat
+		background-repeat no-repeat
 snippet bgr:x
-    background-repeat repeat-x
+		background-repeat repeat-x
 snippet bgr:y
-    background-repeat repeat-y
+		background-repeat repeat-y
 snippet bgr:r
-    background-repeat repeat
+		background-repeat repeat
 snippet bgz
-    background-size ${0}
+		background-size ${0}
 snippet bgz:a
-    background-size auto
+		background-size auto
 snippet bgz:ct
-    background-size contain
+		background-size contain
 snippet bgz:cv
-    background-size cover
+		background-size cover
 snippet bg
-    background ${0}
+		background ${0}
 snippet bg:ie
-    filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+		filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
 snippet bg:n
-    background none
+		background none
 snippet bd+
-    border ${1:1px} ${2:solid} ${0}
+		border ${1:1px} ${2:solid} ${0}
 snippet bdb+
-    border-bottom ${1:1px} ${2:solid} ${0}
+		border-bottom ${1:1px} ${2:solid} ${0}
 snippet bdbc
-    border-bottom-color ${0}
+		border-bottom-color ${0}
 snippet bdbi
-    border-bottom-image url(${0})
+		border-bottom-image url(${0})
 snippet bdbi:n
-    border-bottom-image none
+		border-bottom-image none
 snippet bdbli
-    border-bottom-left-image url(${0})
+		border-bottom-left-image url(${0})
 snippet bdbli:c
-    border-bottom-left-image continue
+		border-bottom-left-image continue
 snippet bdbli:n
-    border-bottom-left-image none
+		border-bottom-left-image none
 snippet bdblrz
-    border-bottom-left-radius ${0}
+		border-bottom-left-radius ${0}
 snippet bdbri
-    border-bottom-right-image url(${0})
+		border-bottom-right-image url(${0})
 snippet bdbri:c
-    border-bottom-right-image continue
+		border-bottom-right-image continue
 snippet bdbri:n
-    border-bottom-right-image none
+		border-bottom-right-image none
 snippet bdbrrz
-    border-bottom-right-radius ${0}
+		border-bottom-right-radius ${0}
 snippet bdbs
-    border-bottom-style ${0}
+		border-bottom-style ${0}
 snippet bdbs:n
-    border-bottom-style none
+		border-bottom-style none
 snippet bdbw
-    border-bottom-width ${0}
+		border-bottom-width ${0}
 snippet bdb
-    border-bottom ${0}
+		border-bottom ${0}
 snippet bdb:n
-    border-bottom none
+		border-bottom none
 snippet bdbk
-    border-break ${0}
+		border-break ${0}
 snippet bdbk:c
-    border-break close
+		border-break close
 snippet bdcl
-    border-collapse ${0}
+		border-collapse ${0}
 snippet bdcl:c
-    border-collapse collapse
+		border-collapse collapse
 snippet bdcl:s
-    border-collapse separate
+		border-collapse separate
 snippet bdc
-    border-color ${0}
+		border-color ${0}
 snippet bdci
-    border-corner-image url(${0})
+		border-corner-image url(${0})
 snippet bdci:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdci:n
-    border-corner-image none
+		border-corner-image none
 snippet bdf
-    border-fit ${0}
+		border-fit ${0}
 snippet bdf:c
-    border-fit clip
+		border-fit clip
 snippet bdf:of
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:ow
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:r
-    border-fit repeat
+		border-fit repeat
 snippet bdf:sc
-    border-fit scale
+		border-fit scale
 snippet bdf:sp
-    border-fit space
+		border-fit space
 snippet bdf:st
-    border-fit stretch
+		border-fit stretch
 snippet bdi
-    border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:n
-    border-image none
+		border-image none
 snippet bdl+
-    border-left ${1:1px} ${2:solid} ${0}
+		border-left ${1:1px} ${2:solid} ${0}
 snippet bdlc
-    border-left-color ${0}
+		border-left-color ${0}
 snippet bdli
-    border-left-image url(${0})
+		border-left-image url(${0})
 snippet bdli:n
-    border-left-image none
+		border-left-image none
 snippet bdls
-    border-left-style ${0}
+		border-left-style ${0}
 snippet bdls:n
-    border-left-style none
+		border-left-style none
 snippet bdlw
-    border-left-width ${0}
+		border-left-width ${0}
 snippet bdl
-    border-left ${0}
+		border-left ${0}
 snippet bdl:n
-    border-left none
+		border-left none
 snippet bdlt
-    border-length ${0}
+		border-length ${0}
 snippet bdlt:a
-    border-length auto
+		border-length auto
 snippet bdrz
-    border-radius ${0}
+		border-radius ${0}
 snippet bdr+
-    border-right ${1:1px} ${2:solid} ${0}
+		border-right ${1:1px} ${2:solid} ${0}
 snippet bdrc
-    border-right-color ${0}
+		border-right-color ${0}
 snippet bdri
-    border-right-image url(${0})
+		border-right-image url(${0})
 snippet bdri:n
-    border-right-image none
+		border-right-image none
 snippet bdrs
-    border-right-style ${0}
+		border-right-style ${0}
 snippet bdrs:n
-    border-right-style none
+		border-right-style none
 snippet bdrw
-    border-right-width ${0}
+		border-right-width ${0}
 snippet bdr
-    border-right ${0}
+		border-right ${0}
 snippet bdr:n
-    border-right none
+		border-right none
 snippet bdsp
-    border-spacing ${0}
+		border-spacing ${0}
 snippet bds
-    border-style ${0}
+		border-style ${0}
 snippet bds:ds
-    border-style dashed
+		border-style dashed
 snippet bds:dtds
-    border-style dot-dash
+		border-style dot-dash
 snippet bds:dtdtds
-    border-style dot-dot-dash
+		border-style dot-dot-dash
 snippet bds:dt
-    border-style dotted
+		border-style dotted
 snippet bds:db
-    border-style double
+		border-style double
 snippet bds:g
-    border-style groove
+		border-style groove
 snippet bds:h
-    border-style hidden
+		border-style hidden
 snippet bds:i
-    border-style inset
+		border-style inset
 snippet bds:n
-    border-style none
+		border-style none
 snippet bds:o
-    border-style outset
+		border-style outset
 snippet bds:r
-    border-style ridge
+		border-style ridge
 snippet bds:s
-    border-style solid
+		border-style solid
 snippet bds:w
-    border-style wave
+		border-style wave
 snippet bdt+
-    border-top ${1:1px} ${2:solid} ${0}
+		border-top ${1:1px} ${2:solid} ${0}
 snippet bdtc
-    border-top-color ${0}
+		border-top-color ${0}
 snippet bdti
-    border-top-image url(${0})
+		border-top-image url(${0})
 snippet bdti:n
-    border-top-image none
+		border-top-image none
 snippet bdtli
-    border-top-left-image url(${0})
+		border-top-left-image url(${0})
 snippet bdtli:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdtli:n
-    border-corner-image none
+		border-corner-image none
 snippet bdtlrz
-    border-top-left-radius ${0}
+		border-top-left-radius ${0}
 snippet bdtri
-    border-top-right-image url(${0})
+		border-top-right-image url(${0})
 snippet bdtri:c
-    border-top-right-image continue
+		border-top-right-image continue
 snippet bdtri:n
-    border-top-right-image none
+		border-top-right-image none
 snippet bdtrrz
-    border-top-right-radius ${0}
+		border-top-right-radius ${0}
 snippet bdts
-    border-top-style ${0}
+		border-top-style ${0}
 snippet bdts:n
-    border-top-style none
+		border-top-style none
 snippet bdtw
-    border-top-width ${0}
+		border-top-width ${0}
 snippet bdt
-    border-top ${0}
+		border-top ${0}
 snippet bdt:n
-    border-top none
+		border-top none
 snippet bdw
-    border-width ${0}
+		border-width ${0}
 snippet bd
-    border ${0}
+		border ${0}
 snippet bd:n
-    border none
+		border none
 snippet b
-    bottom ${0}
+		bottom ${0}
 snippet b:a
-    bottom auto
+		bottom auto
 snippet bxsh+
-    box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh
-    box-shadow ${0}
+		box-shadow ${0}
 snippet bxsh:n
-    box-shadow none
+		box-shadow none
 snippet bxz
-    box-sizing ${0}
+		box-sizing ${0}
 snippet bxz:bb
-    box-sizing border-box
+		box-sizing border-box
 snippet bxz:cb
-    box-sizing content-box
+		box-sizing content-box
 snippet cps
-    caption-side ${0}
+		caption-side ${0}
 snippet cps:b
-    caption-side bottom
+		caption-side bottom
 snippet cps:t
-    caption-side top
+		caption-side top
 snippet cl
-    clear ${0}
+		clear ${0}
 snippet cl:b
-    clear both
+		clear both
 snippet cl:l
-    clear left
+		clear left
 snippet cl:n
-    clear none
+		clear none
 snippet cl:r
-    clear right
+		clear right
 snippet cp
-    clip ${0}
+		clip ${0}
 snippet cp:a
-    clip auto
+		clip auto
 snippet cp:r
-    clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+		clip rect(${1:0} ${2:0} ${3:0} ${0:0})
 snippet c
-    color ${0}
+		color ${0}
 snippet ct
-    content ${0}
+		content ${0}
 snippet ct:a
-    content attr(${0})
+		content attr(${0})
 snippet ct:cq
-    content close-quote
+		content close-quote
 snippet ct:c
-    content counter(${0})
+		content counter(${0})
 snippet ct:cs
-    content counters(${0})
+		content counters(${0})
 snippet ct:ncq
-    content no-close-quote
+		content no-close-quote
 snippet ct:noq
-    content no-open-quote
+		content no-open-quote
 snippet ct:n
-    content normal
+		content normal
 snippet ct:oq
-    content open-quote
+		content open-quote
 snippet coi
-    counter-increment ${0}
+		counter-increment ${0}
 snippet cor
-    counter-reset ${0}
+		counter-reset ${0}
 snippet cur
-    cursor ${0}
+		cursor ${0}
 snippet cur:a
-    cursor auto
+		cursor auto
 snippet cur:c
-    cursor crosshair
+		cursor crosshair
 snippet cur:d
-    cursor default
+		cursor default
 snippet cur:ha
-    cursor hand
+		cursor hand
 snippet cur:he
-    cursor help
+		cursor help
 snippet cur:m
-    cursor move
+		cursor move
 snippet cur:p
-    cursor pointer
+		cursor pointer
 snippet cur:t
-    cursor text
+		cursor text
 snippet d
-    display ${0}
+		display ${0}
 snippet d:mib
-    display -moz-inline-box
+		display -moz-inline-box
 snippet d:mis
-    display -moz-inline-stack
+		display -moz-inline-stack
 snippet d:b
-    display block
+		display block
 snippet d:cp
-    display compact
+		display compact
 snippet d:ib
-    display inline-block
+		display inline-block
 snippet d:itb
-    display inline-table
+		display inline-table
 snippet d:i
-    display inline
+		display inline
 snippet d:li
-    display list-item
+		display list-item
 snippet d:n
-    display none
+		display none
 snippet d:ri
-    display run-in
+		display run-in
 snippet d:tbcp
-    display table-caption
+		display table-caption
 snippet d:tbc
-    display table-cell
+		display table-cell
 snippet d:tbclg
-    display table-column-group
+		display table-column-group
 snippet d:tbcl
-    display table-column
+		display table-column
 snippet d:tbfg
-    display table-footer-group
+		display table-footer-group
 snippet d:tbhg
-    display table-header-group
+		display table-header-group
 snippet d:tbrg
-    display table-row-group
+		display table-row-group
 snippet d:tbr
-    display table-row
+		display table-row
 snippet d:tb
-    display table
+		display table
 snippet ec
-    empty-cells ${0}
+		empty-cells ${0}
 snippet ec:h
-    empty-cells hide
+		empty-cells hide
 snippet ec:s
-    empty-cells show
+		empty-cells show
 snippet exp
-    expression()
+		expression()
 snippet fl
-    float ${0}
+		float ${0}
 snippet fl:l
-    float left
+		float left
 snippet fl:n
-    float none
+		float none
 snippet fl:r
-    float right
+		float right
 snippet f+
-    font ${1:1em} ${2:Arial},${0:sans-serif}
+		font ${1:1em} ${2:Arial},${0:sans-serif}
 snippet fef
-    font-effect ${0}
+		font-effect ${0}
 snippet fef:eb
-    font-effect emboss
+		font-effect emboss
 snippet fef:eg
-    font-effect engrave
+		font-effect engrave
 snippet fef:n
-    font-effect none
+		font-effect none
 snippet fef:o
-    font-effect outline
+		font-effect outline
 snippet femp
-    font-emphasize-position ${0}
+		font-emphasize-position ${0}
 snippet femp:a
-    font-emphasize-position after
+		font-emphasize-position after
 snippet femp:b
-    font-emphasize-position before
+		font-emphasize-position before
 snippet fems
-    font-emphasize-style ${0}
+		font-emphasize-style ${0}
 snippet fems:ac
-    font-emphasize-style accent
+		font-emphasize-style accent
 snippet fems:c
-    font-emphasize-style circle
+		font-emphasize-style circle
 snippet fems:ds
-    font-emphasize-style disc
+		font-emphasize-style disc
 snippet fems:dt
-    font-emphasize-style dot
+		font-emphasize-style dot
 snippet fems:n
-    font-emphasize-style none
+		font-emphasize-style none
 snippet fem
-    font-emphasize ${0}
+		font-emphasize ${0}
 snippet ff
-    font-family ${0}
+		font-family ${0}
 snippet ff:c
-    font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+		font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
 snippet ff:f
-    font-family ${0:Capitals,Impact},fantasy
+		font-family ${0:Capitals,Impact},fantasy
 snippet ff:m
-    font-family ${0:Monaco,'Courier New'},monospace
+		font-family ${0:Monaco,'Courier New'},monospace
 snippet ff:ss
-    font-family ${0:Helvetica,Arial},sans-serif
+		font-family ${0:Helvetica,Arial},sans-serif
 snippet ff:s
-    font-family ${0:Georgia,'Times New Roman'},serif
+		font-family ${0:Georgia,'Times New Roman'},serif
 snippet fza
-    font-size-adjust ${0}
+		font-size-adjust ${0}
 snippet fza:n
-    font-size-adjust none
+		font-size-adjust none
 snippet fz
-    font-size ${0}
+		font-size ${0}
 snippet fsm
-    font-smooth ${0}
+		font-smooth ${0}
 snippet fsm:aw
-    font-smooth always
+		font-smooth always
 snippet fsm:a
-    font-smooth auto
+		font-smooth auto
 snippet fsm:n
-    font-smooth never
+		font-smooth never
 snippet fst
-    font-stretch ${0}
+		font-stretch ${0}
 snippet fst:c
-    font-stretch condensed
+		font-stretch condensed
 snippet fst:e
-    font-stretch expanded
+		font-stretch expanded
 snippet fst:ec
-    font-stretch extra-condensed
+		font-stretch extra-condensed
 snippet fst:ee
-    font-stretch extra-expanded
+		font-stretch extra-expanded
 snippet fst:n
-    font-stretch normal
+		font-stretch normal
 snippet fst:sc
-    font-stretch semi-condensed
+		font-stretch semi-condensed
 snippet fst:se
-    font-stretch semi-expanded
+		font-stretch semi-expanded
 snippet fst:uc
-    font-stretch ultra-condensed
+		font-stretch ultra-condensed
 snippet fst:ue
-    font-stretch ultra-expanded
+		font-stretch ultra-expanded
 snippet fs
-    font-style ${0}
+		font-style ${0}
 snippet fs:i
-    font-style italic
+		font-style italic
 snippet fs:n
-    font-style normal
+		font-style normal
 snippet fs:o
-    font-style oblique
+		font-style oblique
 snippet fv
-    font-variant ${0}
+		font-variant ${0}
 snippet fv:n
-    font-variant normal
+		font-variant normal
 snippet fv:sc
-    font-variant small-caps
+		font-variant small-caps
 snippet fw
-    font-weight ${0}
+		font-weight ${0}
 snippet fw:b
-    font-weight bold
+		font-weight bold
 snippet fw:br
-    font-weight bolder
+		font-weight bolder
 snippet fw:lr
-    font-weight lighter
+		font-weight lighter
 snippet fw:n
-    font-weight normal
+		font-weight normal
 snippet f
-    font ${0}
+		font ${0}
 snippet h
-    height ${0}
+		height ${0}
 snippet h:a
-    height auto
+		height auto
 snippet l
-    left ${0}
+		left ${0}
 snippet l:a
-    left auto
+		left auto
 snippet lts
-    letter-spacing ${0}
+		letter-spacing ${0}
 snippet lh
-    line-height ${0}
+		line-height ${0}
 snippet lisi
-    list-style-image url(${0})
+		list-style-image url(${0})
 snippet lisi:n
-    list-style-image none
+		list-style-image none
 snippet lisp
-    list-style-position ${0}
+		list-style-position ${0}
 snippet lisp:i
-    list-style-position inside
+		list-style-position inside
 snippet lisp:o
-    list-style-position outside
+		list-style-position outside
 snippet list
-    list-style-type ${0}
+		list-style-type ${0}
 snippet list:c
-    list-style-type circle
+		list-style-type circle
 snippet list:dclz
-    list-style-type decimal-leading-zero
+		list-style-type decimal-leading-zero
 snippet list:dc
-    list-style-type decimal
+		list-style-type decimal
 snippet list:d
-    list-style-type disc
+		list-style-type disc
 snippet list:lr
-    list-style-type lower-roman
+		list-style-type lower-roman
 snippet list:n
-    list-style-type none
+		list-style-type none
 snippet list:s
-    list-style-type square
+		list-style-type square
 snippet list:ur
-    list-style-type upper-roman
+		list-style-type upper-roman
 snippet lis
-    list-style ${0}
+		list-style ${0}
 snippet lis:n
-    list-style none
+		list-style none
 snippet mb
-    margin-bottom ${0}
+		margin-bottom ${0}
 snippet mb:a
-    margin-bottom auto
+		margin-bottom auto
 snippet ml
-    margin-left ${0}
+		margin-left ${0}
 snippet ml:a
-    margin-left auto
+		margin-left auto
 snippet mr
-    margin-right ${0}
+		margin-right ${0}
 snippet mr:a
-    margin-right auto
+		margin-right auto
 snippet mt
-    margin-top ${0}
+		margin-top ${0}
 snippet mt:a
-    margin-top auto
+		margin-top auto
 snippet m
-    margin ${0}
+		margin ${0}
 snippet m:4
-    margin ${1:0} ${2:0} ${3:0} ${0:0}
+		margin ${1:0} ${2:0} ${3:0} ${0:0}
 snippet m:3
-    margin ${1:0} ${2:0} ${0:0}
+		margin ${1:0} ${2:0} ${0:0}
 snippet m:2
-    margin ${1:0} ${0:0}
+		margin ${1:0} ${0:0}
 snippet m:0
-    margin 0
+		margin 0
 snippet m:a
-    margin auto
+		margin auto
 snippet mah
-    max-height ${0}
+		max-height ${0}
 snippet mah:n
-    max-height none
+		max-height none
 snippet maw
-    max-width ${0}
+		max-width ${0}
 snippet maw:n
-    max-width none
+		max-width none
 snippet mih
-    min-height ${0}
+		min-height ${0}
 snippet miw
-    min-width ${0}
+		min-width ${0}
 snippet op
-    opacity ${0}
+		opacity ${0}
 snippet op:ie
-    filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+		filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
 snippet op:ms
-    -ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+		-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
 snippet orp
-    orphans ${0}
+		orphans ${0}
 snippet o+
-    outline ${1:1px} ${2:solid} ${0}
+		outline ${1:1px} ${2:solid} ${0}
 snippet oc
-    outline-color ${0}
+		outline-color ${0}
 snippet oc:i
-    outline-color invert
+		outline-color invert
 snippet oo
-    outline-offset ${0}
+		outline-offset ${0}
 snippet os
-    outline-style ${0}
+		outline-style ${0}
 snippet ow
-    outline-width ${0}
+		outline-width ${0}
 snippet o
-    outline ${0}
+		outline ${0}
 snippet o:n
-    outline none
+		outline none
 snippet ovs
-    overflow-style ${0}
+		overflow-style ${0}
 snippet ovs:a
-    overflow-style auto
+		overflow-style auto
 snippet ovs:mq
-    overflow-style marquee
+		overflow-style marquee
 snippet ovs:mv
-    overflow-style move
+		overflow-style move
 snippet ovs:p
-    overflow-style panner
+		overflow-style panner
 snippet ovs:s
-    overflow-style scrollbar
+		overflow-style scrollbar
 snippet ovx
-    overflow-x ${0}
+		overflow-x ${0}
 snippet ovx:a
-    overflow-x auto
+		overflow-x auto
 snippet ovx:h
-    overflow-x hidden
+		overflow-x hidden
 snippet ovx:s
-    overflow-x scroll
+		overflow-x scroll
 snippet ovx:v
-    overflow-x visible
+		overflow-x visible
 snippet ovy
-    overflow-y ${0}
+		overflow-y ${0}
 snippet ovy:a
-    overflow-y auto
+		overflow-y auto
 snippet ovy:h
-    overflow-y hidden
+		overflow-y hidden
 snippet ovy:s
-    overflow-y scroll
+		overflow-y scroll
 snippet ovy:v
-    overflow-y visible
+		overflow-y visible
 snippet ov
-    overflow ${0}
+		overflow ${0}
 snippet ov:a
-    overflow auto
+		overflow auto
 snippet ov:h
-    overflow hidden
+		overflow hidden
 snippet ov:s
-    overflow scroll
+		overflow scroll
 snippet ov:v
-    overflow visible
+		overflow visible
 snippet pb
-    padding-bottom ${0}
+		padding-bottom ${0}
 snippet pl
-    padding-left ${0}
+		padding-left ${0}
 snippet pr
-    padding-right ${0}
+		padding-right ${0}
 snippet pt
-    padding-top ${0}
+		padding-top ${0}
 snippet p
-    padding ${0}
+		padding ${0}
 snippet p:4
-    padding ${1:0} ${2:0} ${3:0} ${0:0}
+		padding ${1:0} ${2:0} ${3:0} ${0:0}
 snippet p:3
-    padding ${1:0} ${2:0} ${0:0}
+		padding ${1:0} ${2:0} ${0:0}
 snippet p:2
-    padding ${1:0} ${0:0}
+		padding ${1:0} ${0:0}
 snippet p:0
-    padding 0
+		padding 0
 snippet pgba
-    page-break-after ${0}
+		page-break-after ${0}
 snippet pgba:aw
-    page-break-after always
+		page-break-after always
 snippet pgba:a
-    page-break-after auto
+		page-break-after auto
 snippet pgba:l
-    page-break-after left
+		page-break-after left
 snippet pgba:r
-    page-break-after right
+		page-break-after right
 snippet pgbb
-    page-break-before ${0}
+		page-break-before ${0}
 snippet pgbb:aw
-    page-break-before always
+		page-break-before always
 snippet pgbb:a
-    page-break-before auto
+		page-break-before auto
 snippet pgbb:l
-    page-break-before left
+		page-break-before left
 snippet pgbb:r
-    page-break-before right
+		page-break-before right
 snippet pgbi
-    page-break-inside ${0}
+		page-break-inside ${0}
 snippet pgbi:a
-    page-break-inside auto
+		page-break-inside auto
 snippet pgbi:av
-    page-break-inside avoid
+		page-break-inside avoid
 snippet pos
-    position ${0}
+		position ${0}
 snippet pos:a
-    position absolute
+		position absolute
 snippet pos:f
-    position fixed
+		position fixed
 snippet pos:r
-    position relative
+		position relative
 snippet pos:s
-    position static
+		position static
 snippet q
-    quotes ${0}
+		quotes ${0}
 snippet q:en
-    quotes '\201C' '\201D' '\2018' '\2019'
+		quotes '\201C' '\201D' '\2018' '\2019'
 snippet q:n
-    quotes none
+		quotes none
 snippet q:ru
-    quotes '\00AB' '\00BB' '\201E' '\201C'
+		quotes '\00AB' '\00BB' '\201E' '\201C'
 snippet rz
-    resize ${0}
+		resize ${0}
 snippet rz:b
-    resize both
+		resize both
 snippet rz:h
-    resize horizontal
+		resize horizontal
 snippet rz:n
-    resize none
+		resize none
 snippet rz:v
-    resize vertical
+		resize vertical
 snippet r
-    right ${0}
+		right ${0}
 snippet r:a
-    right auto
+		right auto
 snippet tbl
-    table-layout ${0}
+		table-layout ${0}
 snippet tbl:a
-    table-layout auto
+		table-layout auto
 snippet tbl:f
-    table-layout fixed
+		table-layout fixed
 snippet tal
-    text-align-last ${0}
+		text-align-last ${0}
 snippet tal:a
-    text-align-last auto
+		text-align-last auto
 snippet tal:c
-    text-align-last center
+		text-align-last center
 snippet tal:l
-    text-align-last left
+		text-align-last left
 snippet tal:r
-    text-align-last right
+		text-align-last right
 snippet ta
-    text-align ${0}
+		text-align ${0}
 snippet ta:c
-    text-align center
+		text-align center
 snippet ta:l
-    text-align left
+		text-align left
 snippet ta:r
-    text-align right
+		text-align right
 snippet td
-    text-decoration ${0}
+		text-decoration ${0}
 snippet td:l
-    text-decoration line-through
+		text-decoration line-through
 snippet td:n
-    text-decoration none
+		text-decoration none
 snippet td:o
-    text-decoration overline
+		text-decoration overline
 snippet td:u
-    text-decoration underline
+		text-decoration underline
 snippet te
-    text-emphasis ${0}
+		text-emphasis ${0}
 snippet te:ac
-    text-emphasis accent
+		text-emphasis accent
 snippet te:a
-    text-emphasis after
+		text-emphasis after
 snippet te:b
-    text-emphasis before
+		text-emphasis before
 snippet te:c
-    text-emphasis circle
+		text-emphasis circle
 snippet te:ds
-    text-emphasis disc
+		text-emphasis disc
 snippet te:dt
-    text-emphasis dot
+		text-emphasis dot
 snippet te:n
-    text-emphasis none
+		text-emphasis none
 snippet th
-    text-height ${0}
+		text-height ${0}
 snippet th:a
-    text-height auto
+		text-height auto
 snippet th:f
-    text-height font-size
+		text-height font-size
 snippet th:m
-    text-height max-size
+		text-height max-size
 snippet th:t
-    text-height text-size
+		text-height text-size
 snippet ti
-    text-indent ${0}
+		text-indent ${0}
 snippet ti:-
-    text-indent -9999px
+		text-indent -9999px
 snippet tj
-    text-justify ${0}
+		text-justify ${0}
 snippet tj:a
-    text-justify auto
+		text-justify auto
 snippet tj:d
-    text-justify distribute
+		text-justify distribute
 snippet tj:ic
-    text-justify inter-cluster
+		text-justify inter-cluster
 snippet tj:ii
-    text-justify inter-ideograph
+		text-justify inter-ideograph
 snippet tj:iw
-    text-justify inter-word
+		text-justify inter-word
 snippet tj:k
-    text-justify kashida
+		text-justify kashida
 snippet tj:t
-    text-justify tibetan
+		text-justify tibetan
 snippet to+
-    text-outline ${1:0} ${2:0} ${0}
+		text-outline ${1:0} ${2:0} ${0}
 snippet to
-    text-outline ${0}
+		text-outline ${0}
 snippet to:n
-    text-outline none
+		text-outline none
 snippet tr
-    text-replace ${0}
+		text-replace ${0}
 snippet tr:n
-    text-replace none
+		text-replace none
 snippet tsh+
-    text-shadow ${1:0} ${2:0} ${3:0} ${0}
+		text-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet tsh
-    text-shadow ${0}
+		text-shadow ${0}
 snippet tsh:n
-    text-shadow none
+		text-shadow none
 snippet tt
-    text-transform ${0}
+		text-transform ${0}
 snippet tt:c
-    text-transform capitalize
+		text-transform capitalize
 snippet tt:l
-    text-transform lowercase
+		text-transform lowercase
 snippet tt:n
-    text-transform none
+		text-transform none
 snippet tt:u
-    text-transform uppercase
+		text-transform uppercase
 snippet tw
-    text-wrap ${0}
+		text-wrap ${0}
 snippet tw:no
-    text-wrap none
+		text-wrap none
 snippet tw:n
-    text-wrap normal
+		text-wrap normal
 snippet tw:s
-    text-wrap suppress
+		text-wrap suppress
 snippet tw:u
-    text-wrap unrestricted
+		text-wrap unrestricted
 snippet t
-    top ${0}
+		top ${0}
 snippet t:a
-    top auto
+		top auto
 snippet va
-    vertical-align ${0}
+		vertical-align ${0}
 snippet va:bl
-    vertical-align baseline
+		vertical-align baseline
 snippet va:b
-    vertical-align bottom
+		vertical-align bottom
 snippet va:m
-    vertical-align middle
+		vertical-align middle
 snippet va:sub
-    vertical-align sub
+		vertical-align sub
 snippet va:sup
-    vertical-align super
+		vertical-align super
 snippet va:tb
-    vertical-align text-bottom
+		vertical-align text-bottom
 snippet va:tt
-    vertical-align text-top
+		vertical-align text-top
 snippet va:t
-    vertical-align top
+		vertical-align top
 snippet v
-    visibility ${0}
+		visibility ${0}
 snippet v:c
-    visibility collapse
+		visibility collapse
 snippet v:h
-    visibility hidden
+		visibility hidden
 snippet v:v
-    visibility visible
+		visibility visible
 snippet whsc
-    white-space-collapse ${0}
+		white-space-collapse ${0}
 snippet whsc:ba
-    white-space-collapse break-all
+		white-space-collapse break-all
 snippet whsc:bs
-    white-space-collapse break-strict
+		white-space-collapse break-strict
 snippet whsc:k
-    white-space-collapse keep-all
+		white-space-collapse keep-all
 snippet whsc:l
-    white-space-collapse loose
+		white-space-collapse loose
 snippet whsc:n
-    white-space-collapse normal
+		white-space-collapse normal
 snippet whs
-    white-space ${0}
+		white-space ${0}
 snippet whs:n
-    white-space normal
+		white-space normal
 snippet whs:nw
-    white-space nowrap
+		white-space nowrap
 snippet whs:pl
-    white-space pre-line
+		white-space pre-line
 snippet whs:pw
-    white-space pre-wrap
+		white-space pre-wrap
 snippet whs:p
-    white-space pre
+		white-space pre
 snippet wid
-    widows ${0}
+		widows ${0}
 snippet w
-    width ${0}
+		width ${0}
 snippet w:a
-    width auto
+		width auto
 snippet wob
-    word-break ${0}
+		word-break ${0}
 snippet wob:ba
-    word-break break-all
+		word-break break-all
 snippet wob:bs
-    word-break break-strict
+		word-break break-strict
 snippet wob:k
-    word-break keep-all
+		word-break keep-all
 snippet wob:l
-    word-break loose
+		word-break loose
 snippet wob:n
-    word-break normal
+		word-break normal
 snippet wos
-    word-spacing ${0}
+		word-spacing ${0}
 snippet wow
-    word-wrap ${0}
+		word-wrap ${0}
 snippet wow:no
-    word-wrap none
+		word-wrap none
 snippet wow:n
-    word-wrap normal
+		word-wrap normal
 snippet wow:s
-    word-wrap suppress
+		word-wrap suppress
 snippet wow:u
-    word-wrap unrestricted
+		word-wrap unrestricted
 snippet z
-    z-index ${0}
+		z-index ${0}
 snippet z:a
-    z-index auto
+		z-index auto
 snippet zoo
-    zoom 1
+		zoom 1
 snippet :h
-    :hover
+		:hover
 snippet :fc
-    :first-child
+		:first-child
 snippet :lc
-    :last-child
+		:last-child
 snippet :nc
-    :nth-child(${0})
+		:nth-child(${0})
 snippet :nlc
-    :nth-last-child(${0})
+		:nth-last-child(${0})
 snippet :oc
-    :only-child
+		:only-child
 snippet :a
-    :after
+		:after
 snippet :b
-    :before
+		:before
 snippet ::a
-    ::after
+		::after
 snippet ::b
-    ::before
+		::before
 snippet if
-    if ${0}
+		if ${0}
 snippet mix
-    ${1}(${0})
+		${1}(${0})
 snippet for
-    for ${1:i} in ${0}
+		for ${1:i} in ${0}
 snippet keyf
-    @keyframes ${0}
+		@keyframes ${0}

From a4b458701942cd1b9ef10aea1d4c437e5b3db975 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Wed, 4 Feb 2015 10:43:54 +0000
Subject: [PATCH 57/61] Updated plugins

---
 sources_non_forked/goyo.vim/autoload/goyo.vim | 383 ++++++++++
 sources_non_forked/goyo.vim/plugin/goyo.vim   | 363 +---------
 .../plugin/open_file_under_cursor.vim         |  15 +-
 sources_non_forked/syntastic/README.markdown  |   8 +-
 .../syntastic/autoload/syntastic/util.vim     |   6 -
 .../syntastic/plugin/syntastic.vim            |   2 +-
 .../syntastic/plugin/syntastic/checker.vim    |  21 +
 .../syntastic/plugin/syntastic/registry.vim   |   1 +
 .../syntastic/plugin/syntastic/signs.vim      |   8 +-
 .../syntax_checkers/coffee/coffee.vim         |   5 +-
 .../syntax_checkers/coffee/coffeelint.vim     |   4 +-
 .../syntastic/syntax_checkers/eruby/ruby.vim  |   6 +-
 .../syntax_checkers/haskell/ghc-mod.vim       |   2 +-
 .../syntastic/syntax_checkers/html/jshint.vim |   6 +-
 .../syntastic/syntax_checkers/java/javac.vim  |   2 +-
 .../syntax_checkers/javascript/eslint.vim     |   6 +-
 .../syntax_checkers/javascript/jshint.vim     |  10 +-
 .../syntax_checkers/javascript/jsxhint.vim    |   2 +-
 .../syntax_checkers/puppet/puppet.vim         |  14 +-
 .../syntax_checkers/puppet/puppetlint.vim     |   5 +-
 .../syntax_checkers/python/pep257.vim         |   4 +-
 .../syntax_checkers/python/prospector.vim     |   6 +-
 .../syntax_checkers/python/pylint.vim         |   3 +-
 .../syntax_checkers/python/python.vim         |   6 +-
 .../syntastic/syntax_checkers/ruby/reek.vim   |   6 +-
 .../syntax_checkers/ruby/rubocop.vim          |   6 +-
 .../syntax_checkers/ruby/rubylint.vim         |   4 +-
 .../syntax_checkers/scss/scss_lint.vim        |   6 +-
 .../syntastic/syntax_checkers/slim/slimrb.vim |   3 +-
 .../syntastic/syntax_checkers/swift/xcrun.vim |  48 ++
 .../syntastic/syntax_checkers/yaml/jsyaml.vim |   4 +-
 .../vim-airline/autoload/airline.vim          |   3 +
 .../vim-airline/autoload/airline/init.vim     |   2 +-
 .../vim-airline/doc/airline.txt               |   5 +
 sources_non_forked/vim-airline/t/init.vim     |   2 +-
 .../vim-fugitive/plugin/fugitive.vim          |   4 +-
 sources_non_forked/vim-go/README.md           |  27 +-
 .../vim-go/autoload/go/complete.vim           |   7 +-
 .../vim-go/autoload/go/errcheck.vim           |  15 +-
 sources_non_forked/vim-go/autoload/go/fmt.vim |   9 +-
 .../vim-go/autoload/go/tool.vim               |   3 +-
 .../vim-go/autoload/go/vimproc.vim            |  21 +
 sources_non_forked/vim-go/doc/vim-go.txt      |   6 +
 .../vim-go/gosnippets/UltiSnips/go.snippets   |   8 +-
 sources_non_forked/vim-go/plugin/go.vim       |   7 +-
 sources_non_forked/vim-go/syntax/go.vim       |  19 +
 .../vim-multiple-cursors/README.md            |   2 +-
 .../autoload/multiple_cursors.vim             |  20 +-
 .../doc/multiple_cursors.txt                  |   2 +-
 .../vim-repeat/autoload/repeat.vim            |  14 +-
 sources_non_forked/vim-snipmate/README.md     |  19 +
 .../vim-snipmate/autoload/snipMate.vim        | 658 ++++++------------
 .../autoload/snipmate/jumping.vim             | 205 ++++++
 .../vim-snipmate/autoload/snipmate/legacy.vim | 129 ++++
 .../vim-snipmate/autoload/snipmate/parse.vim  | 220 ++++++
 .../vim-snipmate/autoload/snipmate/util.vim   |  10 +
 .../vim-snipmate/doc/snipMate.txt             | 214 ++++--
 .../vim-snipmate/plugin/snipMate.vim          |  10 +-
 sources_non_forked/vim-snipmate/t/jumping.vim | 175 +++++
 sources_non_forked/vim-snipmate/t/parser.vim  | 116 +++
 sources_non_forked/vim-snipmate/t/tests.sh    |  20 +
 .../vim-snippets/UltiSnips/erlang.snippets    |  52 +-
 .../UltiSnips/html_minimal.snippets           |   2 +-
 .../vim-snippets/UltiSnips/php.snippets       |  36 +-
 .../UltiSnips/php_laravel.snippets            |  27 +-
 .../vim-snippets/snippets/_.snippets          |  12 -
 .../vim-snippets/snippets/markdown.snippets   |   2 +
 .../vim-snippets/snippets/puppet.snippets     | 121 ++--
 .../vim-snippets/snippets/python.snippets     |   3 +
 .../vim-surround/doc/surround.txt             |   5 +-
 .../vim-surround/plugin/surround.vim          |  11 +-
 71 files changed, 2076 insertions(+), 1112 deletions(-)
 create mode 100644 sources_non_forked/goyo.vim/autoload/goyo.vim
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim
 create mode 100644 sources_non_forked/vim-go/autoload/go/vimproc.vim
 create mode 100644 sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
 create mode 100644 sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
 create mode 100644 sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
 create mode 100644 sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
 create mode 100644 sources_non_forked/vim-snipmate/t/jumping.vim
 create mode 100644 sources_non_forked/vim-snipmate/t/parser.vim
 create mode 100644 sources_non_forked/vim-snipmate/t/tests.sh

diff --git a/sources_non_forked/goyo.vim/autoload/goyo.vim b/sources_non_forked/goyo.vim/autoload/goyo.vim
new file mode 100644
index 00000000..e4a904f7
--- /dev/null
+++ b/sources_non_forked/goyo.vim/autoload/goyo.vim
@@ -0,0 +1,383 @@
+" Copyright (c) 2015 Junegunn Choi
+"
+" MIT License
+"
+" Permission is hereby granted, free of charge, to any person obtaining
+" a copy of this software and associated documentation files (the
+" "Software"), to deal in the Software without restriction, including
+" without limitation the rights to use, copy, modify, merge, publish,
+" distribute, sublicense, and/or sell copies of the Software, and to
+" permit persons to whom the Software is furnished to do so, subject to
+" the following conditions:
+"
+" The above copyright notice and this permission notice shall be
+" included in all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! s:get_color(group, attr)
+  return synIDattr(synIDtrans(hlID(a:group)), a:attr)
+endfunction
+
+function! s:set_color(group, attr, color)
+  let gui = has('gui_running')
+  execute printf("hi %s %s%s=%s", a:group, gui ? 'gui' : 'cterm', a:attr, a:color)
+endfunction
+
+function! s:blank(repel)
+  if bufwinnr(t:goyo_pads.r) <= bufwinnr(t:goyo_pads.l) + 1
+    \ || bufwinnr(t:goyo_pads.b) <= bufwinnr(t:goyo_pads.t) + 3
+    call s:goyo_off()
+  endif
+  execute 'wincmd' a:repel
+endfunction
+
+function! s:init_pad(command)
+  execute a:command
+
+  setlocal buftype=nofile bufhidden=wipe nomodifiable nobuflisted noswapfile
+      \ nonu nocursorline nocursorcolumn winfixwidth winfixheight statusline=\ 
+  if exists('&rnu')
+    setlocal nornu
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+  let bufnr = winbufnr(0)
+
+  execute winnr('#') . 'wincmd w'
+  return bufnr
+endfunction
+
+function! s:setup_pad(bufnr, vert, size, repel)
+  let win = bufwinnr(a:bufnr)
+  execute win . 'wincmd w'
+  execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
+  augroup goyop
+    execute 'autocmd WinEnter,CursorMoved <buffer> nested call s:blank("'.a:repel.'")'
+    autocmd WinLeave <buffer> call s:hide_statusline()
+  augroup END
+
+  " To hide scrollbars of pad windows in GVim
+  let diff = winheight(0) - line('$') - (has('gui_running') ? 2 : 0)
+  if diff > 0
+    setlocal modifiable
+    call append(0, map(range(1, diff), '""'))
+    normal! gg
+    setlocal nomodifiable
+  endif
+  execute winnr('#') . 'wincmd w'
+endfunction
+
+function! s:hmargin()
+  let nwidth = max([len(string(line('$'))) + 1, &numberwidth])
+  let width  = t:goyo_width + (&number ? nwidth : 0)
+  return (&columns - width)
+endfunction
+
+function! s:resize_pads()
+  let t:goyo_width         = max([2, t:goyo_width])
+  let t:goyo_margin_top    = min([max([2, t:goyo_margin_top]),    &lines / 2 - 1])
+  let t:goyo_margin_bottom = min([max([2, t:goyo_margin_bottom]), &lines / 2 - 1])
+
+  let hmargin = s:hmargin()
+
+  augroup goyop
+    autocmd!
+  augroup END
+  call s:setup_pad(t:goyo_pads.t, 0, t:goyo_margin_top - 1, 'j')
+  call s:setup_pad(t:goyo_pads.b, 0, t:goyo_margin_bottom - 2, 'k')
+  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1, 'l')
+  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1, 'h')
+
+  let t:goyo_width = winwidth(0)
+endfunction
+
+function! s:tranquilize()
+  let bg = s:get_color('Normal', 'bg')
+  for grp in ['NonText', 'FoldColumn', 'ColorColumn', 'VertSplit',
+            \ 'StatusLine', 'StatusLineNC', 'SignColumn']
+    " -1 on Vim / '' on GVim
+    if bg == -1 || empty(bg)
+      call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
+      call s:set_color(grp, 'bg', 'NONE')
+    else
+      call s:set_color(grp, 'fg', bg)
+      call s:set_color(grp, 'bg', bg)
+    endif
+    call s:set_color(grp, '', 'NONE')
+  endfor
+endfunction
+
+function! s:hide_statusline()
+  let &l:statusline = repeat(' ', winwidth(0))
+endfunction
+
+function! s:hide_linenr()
+  if !get(g:, 'goyo_linenr', 0)
+    setlocal nonu
+    if exists('&rnu')
+      setlocal nornu
+    endif
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+endfunction
+
+function! s:maps_nop()
+  let mapped = filter(['R', 'H', 'J', 'K', 'L', '|', '_'],
+                    \ "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <c-w>'.escape(c, '|').' <nop>'
+  endfor
+  return mapped
+endfunction
+
+function! s:maps_resize()
+  let commands = {
+  \ '=': ':<c-u>let [t:goyo_width, t:goyo_margin_top, t:goyo_margin_bottom] = t:goyo_initial_dim <bar> call <sid>resize_pads()<cr>',
+  \ '>': ':<c-u>let t:goyo_width = winwidth(0) + 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '<': ':<c-u>let t:goyo_width = winwidth(0) - 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '+': ':<c-u>let t:goyo_margin_top -= v:count1 <bar> let t:goyo_margin_bottom -= v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '-': ':<c-u>let t:goyo_margin_top += v:count1 <bar> let t:goyo_margin_bottom += v:count1 <bar> call <sid>resize_pads()<cr>'
+  \ }
+  let mapped = filter(keys(commands), "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <silent> <c-w>'.c.' '.commands[c]
+  endfor
+  return mapped
+endfunction
+
+function! s:goyo_on(width)
+  let s:orig_tab = tabpagenr()
+
+  " New tab
+  tab split
+
+  let t:goyo_master = winbufnr(0)
+  let t:goyo_width  = a:width
+  let t:goyo_margin_top = get(g:, 'goyo_margin_top', 4)
+  let t:goyo_margin_bottom = get(g:, 'goyo_margin_bottom', 4)
+  let t:goyo_initial_dim = [t:goyo_width, t:goyo_margin_top, t:goyo_margin_bottom]
+  let t:goyo_pads = {}
+  let t:goyo_revert =
+    \ { 'laststatus':     &laststatus,
+    \   'showtabline':    &showtabline,
+    \   'fillchars':      &fillchars,
+    \   'winminwidth':    &winminwidth,
+    \   'winwidth':       &winwidth,
+    \   'winminheight':   &winminheight,
+    \   'winheight':      &winheight,
+    \   'ruler':          &ruler,
+    \   'sidescroll':     &sidescroll,
+    \   'sidescrolloff':  &sidescrolloff
+    \ }
+  let t:goyo_maps = extend(s:maps_nop(), s:maps_resize())
+  if has('gui_running')
+    let t:goyo_revert.guioptions = &guioptions
+  endif
+
+  " vim-gitgutter
+  let t:goyo_disabled_gitgutter = get(g:, 'gitgutter_enabled', 0)
+  if t:goyo_disabled_gitgutter
+    silent! GitGutterDisable
+  endif
+
+  " vim-signify
+  let t:goyo_disabled_signify = exists('b:sy') && b:sy.active
+  if t:goyo_disabled_signify
+    SignifyToggle
+  endif
+
+  " vim-airline
+  let t:goyo_disabled_airline = exists("#airline")
+  if t:goyo_disabled_airline
+    AirlineToggle
+  endif
+
+  " vim-powerline
+  let t:goyo_disabled_powerline = exists("#PowerlineMain")
+  if t:goyo_disabled_powerline
+    augroup PowerlineMain
+      autocmd!
+    augroup END
+    augroup! PowerlineMain
+  endif
+
+  " lightline.vim
+  let t:goyo_disabled_lightline = exists('#LightLine')
+  if t:goyo_disabled_lightline
+    silent! call lightline#disable()
+  endif
+
+  call s:hide_linenr()
+  " Global options
+  let &winheight = max([&winminheight, 1])
+  set winminheight=1
+  set winheight=1
+  set winminwidth=1 winwidth=1
+  set laststatus=0
+  set showtabline=0
+  set noruler
+  set fillchars+=vert:\ 
+  set fillchars+=stl:.
+  set fillchars+=stlnc:\ 
+  set sidescroll=1
+  set sidescrolloff=0
+
+  " Hide left-hand scrollbars
+  if has('gui_running')
+    set guioptions-=l
+    set guioptions-=L
+  endif
+
+  let t:goyo_pads.l = s:init_pad('vertical topleft new')
+  let t:goyo_pads.r = s:init_pad('vertical botright new')
+  let t:goyo_pads.t = s:init_pad('topleft new')
+  let t:goyo_pads.b = s:init_pad('botright new')
+
+  call s:resize_pads()
+  call s:tranquilize()
+
+  augroup goyo
+    autocmd!
+    autocmd TabLeave    *        call s:goyo_off()
+    autocmd VimResized  *        call s:resize_pads()
+    autocmd ColorScheme *        call s:tranquilize()
+    autocmd BufWinEnter *        call s:hide_linenr() | call s:hide_statusline()
+    autocmd WinEnter,WinLeave *  call s:hide_statusline()
+  augroup END
+
+  call s:hide_statusline()
+  if exists('g:goyo_callbacks[0]')
+    call g:goyo_callbacks[0]()
+  endif
+  silent! doautocmd User GoyoEnter
+endfunction
+
+function! s:goyo_off()
+  if !exists('#goyo')
+    return
+  endif
+
+  " Oops, not this tab
+  if !exists('t:goyo_revert')
+    return
+  endif
+
+  " Clear auto commands
+  augroup goyo
+    autocmd!
+  augroup END
+  augroup! goyo
+  augroup goyop
+    autocmd!
+  augroup END
+  augroup! goyop
+
+  for c in t:goyo_maps
+    execute 'nunmap <c-w>'.escape(c, '|')
+  endfor
+
+  let goyo_revert             = t:goyo_revert
+  let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
+  let goyo_disabled_signify   = t:goyo_disabled_signify
+  let goyo_disabled_airline   = t:goyo_disabled_airline
+  let goyo_disabled_powerline = t:goyo_disabled_powerline
+  let goyo_disabled_lightline = t:goyo_disabled_lightline
+  let goyo_orig_buffer        = t:goyo_master
+  let [line, col]             = [line('.'), col('.')]
+
+  if tabpagenr() == 1
+    tabnew
+    normal! gt
+    bd
+  endif
+  tabclose
+  execute 'normal! '.s:orig_tab.'gt'
+  if winbufnr(0) == goyo_orig_buffer
+    " Doesn't work if window closed with `q`
+    execute printf('normal! %dG%d|', line, col)
+  endif
+
+  let wmw = remove(goyo_revert, 'winminwidth')
+  let ww  = remove(goyo_revert, 'winwidth')
+  let &winwidth     = ww
+  let &winminwidth  = wmw
+  let wmh = remove(goyo_revert, 'winminheight')
+  let wh  = remove(goyo_revert, 'winheight')
+  let &winheight    = max([wmh, 1])
+  let &winminheight = wmh
+  let &winheight    = wh
+
+  for [k, v] in items(goyo_revert)
+    execute printf("let &%s = %s", k, string(v))
+  endfor
+  execute 'colo '. get(g:, 'colors_name', 'default')
+
+  if goyo_disabled_gitgutter
+    silent! GitGutterEnable
+  endif
+
+  if goyo_disabled_signify
+    silent! if !b:sy.active
+      SignifyToggle
+    endif
+  endif
+
+  if goyo_disabled_airline && !exists("#airline")
+    AirlineToggle
+    silent! AirlineRefresh
+  endif
+
+  if goyo_disabled_powerline && !exists("#PowerlineMain")
+    doautocmd PowerlineStartup VimEnter
+    silent! PowerlineReloadColorscheme
+  endif
+
+  if goyo_disabled_lightline
+    silent! call lightline#enable()
+  endif
+
+  if exists('#Powerline')
+    doautocmd Powerline ColorScheme
+  endif
+
+  if exists('g:goyo_callbacks[1]')
+    call g:goyo_callbacks[1]()
+  endif
+  silent! doautocmd User GoyoLeave
+endfunction
+
+function! goyo#execute(bang, ...)
+  let width = a:0 > 0 ? a:1 : get(g:, 'goyo_width', 80)
+
+  if a:bang
+    if exists('#goyo')
+      call s:goyo_off()
+    endif
+  else
+    if exists('#goyo') == 0
+      call s:goyo_on(width)
+    elseif a:0 > 0
+      let t:goyo_width = width
+      call s:resize_pads()
+    else
+      call s:goyo_off()
+    end
+  end
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index 7c43f4ef..76e9ad36 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -1,4 +1,4 @@
-" Copyright (c) 2014 Junegunn Choi
+" Copyright (c) 2015 Junegunn Choi
 "
 " MIT License
 "
@@ -21,363 +21,4 @@
 " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-let s:cpo_save = &cpo
-set cpo&vim
-
-function! s:get_color(group, attr)
-  return synIDattr(synIDtrans(hlID(a:group)), a:attr)
-endfunction
-
-function! s:set_color(group, attr, color)
-  let gui = has('gui_running')
-  execute printf("hi %s %s%s=%s", a:group, gui ? 'gui' : 'cterm', a:attr, a:color)
-endfunction
-
-function! s:blank(repel)
-  if bufwinnr(t:goyo_pads.r) <= bufwinnr(t:goyo_pads.l) + 1
-    \ || bufwinnr(t:goyo_pads.b) <= bufwinnr(t:goyo_pads.t) + 3
-    call s:goyo_off()
-  endif
-  execute 'wincmd' a:repel
-endfunction
-
-function! s:init_pad(command)
-  execute a:command
-
-  setlocal buftype=nofile bufhidden=wipe nomodifiable nobuflisted noswapfile
-      \ nonu nocursorline nocursorcolumn winfixwidth winfixheight statusline=\ 
-  if exists('&rnu')
-    setlocal nornu
-  endif
-  if exists('&colorcolumn')
-    setlocal colorcolumn=
-  endif
-  let bufnr = winbufnr(0)
-
-  execute winnr('#') . 'wincmd w'
-  return bufnr
-endfunction
-
-function! s:setup_pad(bufnr, vert, size, repel)
-  let win = bufwinnr(a:bufnr)
-  execute win . 'wincmd w'
-  execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
-  augroup goyop
-    execute 'autocmd WinEnter,CursorMoved <buffer> nested call s:blank("'.a:repel.'")'
-    autocmd WinLeave <buffer> call s:hide_statusline()
-  augroup END
-
-  " To hide scrollbars of pad windows in GVim
-  let diff = winheight(0) - line('$') - (has('gui_running') ? 2 : 0)
-  if diff > 0
-    setlocal modifiable
-    call append(0, map(range(1, diff), '""'))
-    normal! gg
-    setlocal nomodifiable
-  endif
-  execute winnr('#') . 'wincmd w'
-endfunction
-
-function! s:hmargin()
-  let nwidth = max([len(string(line('$'))) + 1, &numberwidth])
-  let width  = t:goyo_width + (&number ? nwidth : 0)
-  return (&columns - width)
-endfunction
-
-function! s:resize_pads()
-  let t:goyo_width         = max([2, t:goyo_width])
-  let t:goyo_margin_top    = min([max([2, t:goyo_margin_top]),    &lines / 2 - 1])
-  let t:goyo_margin_bottom = min([max([2, t:goyo_margin_bottom]), &lines / 2 - 1])
-
-  let hmargin = s:hmargin()
-
-  augroup goyop
-    autocmd!
-  augroup END
-  call s:setup_pad(t:goyo_pads.t, 0, t:goyo_margin_top - 1, 'j')
-  call s:setup_pad(t:goyo_pads.b, 0, t:goyo_margin_bottom - 2, 'k')
-  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1, 'l')
-  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1, 'h')
-
-  let t:goyo_width = winwidth(0)
-endfunction
-
-function! s:tranquilize()
-  let bg = s:get_color('Normal', 'bg')
-  for grp in ['NonText', 'FoldColumn', 'ColorColumn', 'VertSplit',
-            \ 'StatusLine', 'StatusLineNC', 'SignColumn']
-    " -1 on Vim / '' on GVim
-    if bg == -1 || empty(bg)
-      call s:set_color(grp, 'fg', get(g:, 'goyo_bg', 'black'))
-      call s:set_color(grp, 'bg', 'NONE')
-    else
-      call s:set_color(grp, 'fg', bg)
-      call s:set_color(grp, 'bg', bg)
-    endif
-    call s:set_color(grp, '', 'NONE')
-  endfor
-endfunction
-
-function! s:hide_statusline()
-  let &l:statusline = repeat(' ', winwidth(0))
-endfunction
-
-function! s:hide_linenr()
-  if !get(g:, 'goyo_linenr', 0)
-    setlocal nonu
-    if exists('&rnu')
-      setlocal nornu
-    endif
-  endif
-  if exists('&colorcolumn')
-    setlocal colorcolumn=
-  endif
-endfunction
-
-function! s:maps_nop()
-  let mapped = filter(['R', 'H', 'J', 'K', 'L', '|', '_', '='],
-                    \ "empty(maparg(\"\<c-w>\".v:val, 'n'))")
-  for c in mapped
-    execute 'nnoremap <c-w>'.escape(c, '|').' <nop>'
-  endfor
-  return mapped
-endfunction
-
-function! s:maps_resize()
-  let commands = {
-  \ '>': ':<c-u>let t:goyo_width = winwidth(0) + 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
-  \ '<': ':<c-u>let t:goyo_width = winwidth(0) - 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
-  \ '+': ':<c-u>let t:goyo_margin_top -= v:count1 <bar> let t:goyo_margin_bottom -= v:count1 <bar> call <sid>resize_pads()<cr>',
-  \ '-': ':<c-u>let t:goyo_margin_top += v:count1 <bar> let t:goyo_margin_bottom += v:count1 <bar> call <sid>resize_pads()<cr>'
-  \ }
-  let mapped = filter(keys(commands), "empty(maparg(\"\<c-w>\".v:val, 'n'))")
-  for c in mapped
-    execute 'nnoremap <silent> <c-w>'.c.' '.commands[c]
-  endfor
-  return mapped
-endfunction
-
-function! s:goyo_on(width)
-  let s:orig_tab = tabpagenr()
-
-  " New tab
-  tab split
-
-  let t:goyo_master = winbufnr(0)
-  let t:goyo_width  = a:width
-  let t:goyo_margin_top = get(g:, 'goyo_margin_top', 4)
-  let t:goyo_margin_bottom = get(g:, 'goyo_margin_bottom', 4)
-  let t:goyo_pads = {}
-  let t:goyo_revert =
-    \ { 'laststatus':     &laststatus,
-    \   'showtabline':    &showtabline,
-    \   'fillchars':      &fillchars,
-    \   'winminwidth':    &winminwidth,
-    \   'winwidth':       &winwidth,
-    \   'winminheight':   &winminheight,
-    \   'winheight':      &winheight,
-    \   'ruler':          &ruler,
-    \   'sidescroll':     &sidescroll,
-    \   'sidescrolloff':  &sidescrolloff
-    \ }
-  let t:goyo_maps = extend(s:maps_nop(), s:maps_resize())
-  if has('gui_running')
-    let t:goyo_revert.guioptions = &guioptions
-  endif
-
-  " vim-gitgutter
-  let t:goyo_disabled_gitgutter = get(g:, 'gitgutter_enabled', 0)
-  if t:goyo_disabled_gitgutter
-    silent! GitGutterDisable
-  endif
-
-  " vim-signify
-  let t:goyo_disabled_signify = exists('b:sy') && b:sy.active
-  if t:goyo_disabled_signify
-    SignifyToggle
-  endif
-
-  " vim-airline
-  let t:goyo_disabled_airline = exists("#airline")
-  if t:goyo_disabled_airline
-    AirlineToggle
-  endif
-
-  " vim-powerline
-  let t:goyo_disabled_powerline = exists("#PowerlineMain")
-  if t:goyo_disabled_powerline
-    augroup PowerlineMain
-      autocmd!
-    augroup END
-    augroup! PowerlineMain
-  endif
-
-  " lightline.vim
-  let t:goyo_disabled_lightline = exists('#LightLine')
-  if t:goyo_disabled_lightline
-    silent! call lightline#disable()
-  endif
-
-  call s:hide_linenr()
-  " Global options
-  let &winheight = max([&winminheight, 1])
-  set winminheight=1
-  set winheight=1
-  set winminwidth=1 winwidth=1
-  set laststatus=0
-  set showtabline=0
-  set noruler
-  set fillchars+=vert:\ 
-  set fillchars+=stl:.
-  set fillchars+=stlnc:\ 
-  set sidescroll=1
-  set sidescrolloff=0
-
-  " Hide left-hand scrollbars
-  if has('gui_running')
-    set guioptions-=l
-    set guioptions-=L
-  endif
-
-  let t:goyo_pads.l = s:init_pad('vertical topleft new')
-  let t:goyo_pads.r = s:init_pad('vertical botright new')
-  let t:goyo_pads.t = s:init_pad('topleft new')
-  let t:goyo_pads.b = s:init_pad('botright new')
-
-  call s:resize_pads()
-  call s:tranquilize()
-
-  augroup goyo
-    autocmd!
-    autocmd TabLeave    *        call s:goyo_off()
-    autocmd VimResized  *        call s:resize_pads()
-    autocmd ColorScheme *        call s:tranquilize()
-    autocmd BufWinEnter *        call s:hide_linenr() | call s:hide_statusline()
-    autocmd WinEnter,WinLeave *  call s:hide_statusline()
-  augroup END
-
-  call s:hide_statusline()
-  if exists('g:goyo_callbacks[0]')
-    call g:goyo_callbacks[0]()
-  endif
-  silent! doautocmd User GoyoEnter
-endfunction
-
-function! s:goyo_off()
-  if !exists('#goyo')
-    return
-  endif
-
-  " Oops, not this tab
-  if !exists('t:goyo_revert')
-    return
-  endif
-
-  " Clear auto commands
-  augroup goyo
-    autocmd!
-  augroup END
-  augroup! goyo
-  augroup goyop
-    autocmd!
-  augroup END
-  augroup! goyop
-
-  for c in t:goyo_maps
-    execute 'nunmap <c-w>'.escape(c, '|')
-  endfor
-
-  let goyo_revert             = t:goyo_revert
-  let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
-  let goyo_disabled_signify   = t:goyo_disabled_signify
-  let goyo_disabled_airline   = t:goyo_disabled_airline
-  let goyo_disabled_powerline = t:goyo_disabled_powerline
-  let goyo_disabled_lightline = t:goyo_disabled_lightline
-  let goyo_orig_buffer        = t:goyo_master
-  let [line, col]             = [line('.'), col('.')]
-
-  if tabpagenr() == 1
-    tabnew
-    normal! gt
-    bd
-  endif
-  tabclose
-  execute 'normal! '.s:orig_tab.'gt'
-  if winbufnr(0) == goyo_orig_buffer
-    " Doesn't work if window closed with `q`
-    execute printf('normal! %dG%d|', line, col)
-  endif
-
-  let wmw = remove(goyo_revert, 'winminwidth')
-  let ww  = remove(goyo_revert, 'winwidth')
-  let &winwidth     = ww
-  let &winminwidth  = wmw
-  let wmh = remove(goyo_revert, 'winminheight')
-  let wh  = remove(goyo_revert, 'winheight')
-  let &winheight    = max([wmh, 1])
-  let &winminheight = wmh
-  let &winheight    = wh
-
-  for [k, v] in items(goyo_revert)
-    execute printf("let &%s = %s", k, string(v))
-  endfor
-  execute 'colo '. get(g:, 'colors_name', 'default')
-
-  if goyo_disabled_gitgutter
-    silent! GitGutterEnable
-  endif
-
-  if goyo_disabled_signify
-    silent! if !b:sy.active
-      SignifyToggle
-    endif
-  endif
-
-  if goyo_disabled_airline && !exists("#airline")
-    AirlineToggle
-    silent! AirlineRefresh
-  endif
-
-  if goyo_disabled_powerline && !exists("#PowerlineMain")
-    doautocmd PowerlineStartup VimEnter
-    silent! PowerlineReloadColorscheme
-  endif
-
-  if goyo_disabled_lightline
-    silent! call lightline#enable()
-  endif
-
-  if exists('#Powerline')
-    doautocmd Powerline ColorScheme
-  endif
-
-  if exists('g:goyo_callbacks[1]')
-    call g:goyo_callbacks[1]()
-  endif
-  silent! doautocmd User GoyoLeave
-endfunction
-
-function! s:goyo(bang, ...)
-  let width = a:0 > 0 ? a:1 : get(g:, 'goyo_width', 80)
-
-  if a:bang
-    if exists('#goyo')
-      call s:goyo_off()
-    endif
-  else
-    if exists('#goyo') == 0
-      call s:goyo_on(width)
-    elseif a:0 > 0
-      let t:goyo_width = width
-      call s:resize_pads()
-    else
-      call s:goyo_off()
-    end
-  end
-endfunction
-
-command! -nargs=? -bar -bang Goyo call s:goyo('<bang>' == '!', <args>)
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
+command! -nargs=? -bar -bang Goyo call goyo#execute(<bang>0, <args>)
diff --git a/sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim b/sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim
index 7d35c91d..107babc4 100644
--- a/sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim
+++ b/sources_non_forked/open_file_under_cursor.vim/plugin/open_file_under_cursor.vim
@@ -12,7 +12,20 @@ function! GotoFile(w)
         let pos = ""
         let fname = curword
     endif
-    " Open new window if requested
+ 
+    " check exists file.
+    if filereadable(fname)
+        let fullname = fname
+    else
+        " try find file with prefix by working directory
+        let fullname = getcwd() . '/' . fname
+        if ! filereadable(fullname)
+            " the last try, using current directory based on file opened.
+            let fullname = expand('%:h') . '/' . fname
+        endif
+    endif
+
+   " Open new window if requested
     if a:w == "new"
         new
     endif
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 4d03421e..f8cf88b7 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -59,10 +59,10 @@ Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo,
 LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM, Objective-C,
 Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
 iOS property lists, Puppet, Python, R, Racket, Relax NG, reStructuredText, RPM
-spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
-Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
-and zsh.  See the [wiki][3] for details about the corresponding supported
-checkers.
+spec, Ruby, SASS/SCSS, Scala, Slim, Swift, Tcl, TeX, Texinfo, Twig, TypeScript,
+Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page
+templates, and zsh.  See the [wiki][3] for details about the corresponding
+supported checkers.
 
 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
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index f6ef7009..a87e2e25 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -121,12 +121,6 @@ function! syntastic#util#parseVersion(version) " {{{2
     return map(split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.'), 'str2nr(v:val)')
 endfunction " }}}2
 
-" Run 'command' in a shell and parse output as a version string.
-" Returns an array of version components.
-function! syntastic#util#getVersion(command) " {{{2
-    return syntastic#util#parseVersion(system(a:command))
-endfunction " }}}2
-
 " Verify that the 'installed' version is at least the 'required' version.
 "
 " 'installed' and 'required' must be arrays. If they have different lengths,
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 3ab7c094..d72bf1ad 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.5.0-148'
+let g:_SYNTASTIC_VERSION = '3.6.0-14'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 9211e02a..d8a611e9 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -77,6 +77,27 @@ function! g:SyntasticChecker.getLocList() " {{{2
     return g:SyntasticLoclist.New(self.getLocListRaw())
 endfunction " }}}2
 
+function! g:SyntasticChecker.getVersion(...) " {{{2
+    if !exists('self._version')
+        let command = a:0 ? a:1 : self.getExecEscaped() . ' --version'
+        let version_output = system(command)
+        call self.log('getVersion: ' . string(command) . ': ' .
+            \ string(split(version_output, "\n", 1)) .
+            \ (v:shell_error ? ' (exit code ' . v:shell_error . ')' : '') )
+        call self.setVersion(syntastic#util#parseVersion(version_output))
+    endif
+    return get(self, '_version', [])
+endfunction " }}}2
+
+function! g:SyntasticChecker.setVersion(version) " {{{2
+    if len(a:version)
+        let self._version = copy(a:version)
+        call self.log(self.getExec() . ' version =', a:version)
+    else
+        call syntastic#log#error("checker " . self._filetype . "/" . self._name . ": can't parse version string (abnormal termination?)")
+    endif
+endfunction " }}}2
+
 function! g:SyntasticChecker.log(msg, ...) " {{{2
     let leader = self._filetype . '/' . self._name . ': '
     if a:0 > 0
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index be597c56..9db8ee96 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -74,6 +74,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'sh':          ['sh', 'shellcheck'],
         \ 'slim':        ['slimrb'],
         \ 'spec':        ['rpmlint'],
+        \ 'swift':       ['xcrun'],
         \ 'tcl':         ['nagelfar'],
         \ 'tex':         ['lacheck', 'chktex'],
         \ 'texinfo':     ['makeinfo'],
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index e1616af0..db801a77 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -71,13 +71,13 @@ function! g:SyntasticSignsNotifier._setup() " {{{2
         endif
 
         " define the signs used to display syntax and style errors/warns
-        exe 'sign define SyntasticError text=' . g:syntastic_error_symbol .
+        execute 'sign define SyntasticError text=' . g:syntastic_error_symbol .
             \ ' texthl=SyntasticErrorSign linehl=SyntasticErrorLine'
-        exe 'sign define SyntasticWarning text=' . g:syntastic_warning_symbol .
+        execute 'sign define SyntasticWarning text=' . g:syntastic_warning_symbol .
             \ ' texthl=SyntasticWarningSign linehl=SyntasticWarningLine'
-        exe 'sign define SyntasticStyleError text=' . g:syntastic_style_error_symbol .
+        execute 'sign define SyntasticStyleError text=' . g:syntastic_style_error_symbol .
             \ ' texthl=SyntasticStyleErrorSign linehl=SyntasticStyleErrorLine'
-        exe 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
+        execute 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
             \ ' texthl=SyntasticStyleWarningSign linehl=SyntasticStyleWarningLine'
     endif
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
index a1e1a450..3ed2aa84 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
@@ -25,10 +25,7 @@ function! SyntaxCheckers_coffee_coffee_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
-    call self.log(self.getExec() . ' version = ', ver)
-
+    let ver = self.getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
     return syntastic#util#versionIsAtLeast(ver, [1, 6, 2])
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index 53e8c5c6..027f0703 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -20,9 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
     if !exists('s:coffeelint_new')
-        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-        call self.log(self.getExec() . ' version =', ver)
-        let s:coffeelint_new = syntastic#util#versionIsAtLeast(ver, [1, 4])
+        let s:coffeelint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 4])
     endif
     let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 012242ed..3ac00f1f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -27,10 +27,14 @@ function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
+    if !exists('s:ruby_new')
+        let s:ruby_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 9])
+    endif
+
     let fname = "'" . escape(expand('%', 1), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
-    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped(). ' --version'), [1, 9])
+    if s:ruby_new
         let enc = &fileencoding != '' ? &fileencoding : &encoding
         let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
     else
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index ebc208e3..01845628 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -41,7 +41,7 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
         " need either a Vim that can handle NULs in system() output, or a
         " ghc-mod that has the "--boundary" option.
         let parsed_ver = syntastic#util#parseVersion(ver[0])
-        call self.log(self.getExec() . ' version =', parsed_ver)
+        call self.setVersion(parsed_ver)
         let s:ghc_mod_new = syntastic#util#versionIsAtLeast(parsed_ver, [2, 1, 2])
     else
         call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index fa163791..a7af7580 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -22,11 +22,7 @@ function! SyntaxCheckers_html_jshint_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [2, 4])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
 endfunction
 
 function! SyntaxCheckers_html_jshint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 03ff2193..1029fe02 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -204,7 +204,7 @@ endfunction " }}}2
 
 function! s:LoadConfigFile() " {{{2
     if filereadable(expand(g:syntastic_java_javac_config_file, 1))
-        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
+        execute 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
     endif
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index d66e8b85..aaba7c9f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -25,11 +25,7 @@ function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [0, 1])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index 63d9bab8..492aa694 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -27,20 +27,16 @@ function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
         return 0
     endif
 
-    let s:jshint_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', s:jshint_version)
+    let ver = self.getVersion()
+    let s:jshint_new = syntastic#util#versionIsAtLeast(ver, [1, 1])
 
-    return syntastic#util#versionIsAtLeast(s:jshint_version, [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)")
 
-    if !exists('s:jshint_new')
-        let s:jshint_new = syntastic#util#versionIsAtLeast(s:jshint_version, [1, 1])
-    endif
-
     let makeprg = self.makeprgBuild({ 'args_after': (s:jshint_new ? '--verbose ' : '') })
 
     let errorformat = s:jshint_new ?
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 89677dde..99c0d931 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -24,7 +24,7 @@ function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
     endif
 
     let ver = syntastic#util#parseVersion(jsxhint_version)
-    call self.log(self.getExec() . ' version =', ver)
+    call self.setVersion(ver)
 
     return syntastic#util#versionIsAtLeast(ver, [0, 4, 1])
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
index 5cec0357..caf1386e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -19,18 +19,12 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_puppet_puppet_GetLocList() dict
-    if !exists('s:puppet_version')
-        let s:puppet_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
-        call self.log(self.getExec() . ' version =', s:puppet_version)
+    if !exists('s:puppet_new')
+        let s:puppet_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 7, 0])
     endif
 
-    if syntastic#util#versionIsAtLeast(s:puppet_version, [2,7,0])
-        let args = 'parser validate --color=false'
-    else
-        let args = '--color=false --parseonly'
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_before': args })
+    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,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index 55148782..e06a1a43 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -24,10 +24,7 @@ function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
     if !executable('puppet') || !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
-    call self.log(self.getExec() . ' version =', ver)
-
+    let ver = self.getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
     return syntastic#util#versionIsAtLeast(ver, [0, 1, 10])
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 374cabe3..64f5b05e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -13,9 +13,7 @@ set cpo&vim
 
 function! SyntaxCheckers_python_pep257_GetLocList() dict
     if !exists('s:pep257_new')
-        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-        call self.log(self.getExec() . ' version =', ver)
-        let s:pep257_new = syntastic#util#versionIsAtLeast(ver, [0, 3])
+        let s:pep257_new = syntastic#util#versionIsAtLeast(self.getVersion(), [0, 3])
     endif
 
     let makeprg = self.makeprgBuild({})
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
index df6d22b1..4f451012 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
@@ -26,11 +26,7 @@ function! SyntaxCheckers_python_prospector_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [0, 7])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 7])
 endfunction
 
 function! SyntaxCheckers_python_prospector_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 65436b44..4e489b73 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -35,8 +35,7 @@ function! SyntaxCheckers_python_pylint_IsAvailable() dict
         let pylint_version = filter( split(system(self.getExecEscaped() . ' --version'), '\m, \=\|\n'),
             \ 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
         let ver = syntastic#util#parseVersion(substitute(pylint_version, '\v^\S+\s+', '', ''))
-
-        call self.log(self.getExec() . ' version =', ver)
+        call self.setVersion(ver)
 
         let s:pylint_new = syntastic#util#versionIsAtLeast(ver, [1])
     catch /\m^Vim\%((\a\+)\)\=:E684/
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index 6d0c11e6..a58957aa 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -28,11 +28,7 @@ function! SyntaxCheckers_python_python_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [2, 6])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6])
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
index becc23d6..5f289af1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
@@ -22,11 +22,7 @@ function! SyntaxCheckers_ruby_reek_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [1, 3, 0])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [1, 3, 0])
 endfunction
 
 function! SyntaxCheckers_ruby_reek_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
index 23bc1ff3..28d7157c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -22,11 +22,7 @@ function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [0, 12, 0])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 12, 0])
 endfunction
 
 function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index e0387df6..093571d0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -21,9 +21,7 @@ set cpo&vim
 
 function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
     if !exists('s:rubylint_new')
-        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-        call self.log(self.getExec() . ' version =', ver)
-        let s:rubylint_new = syntastic#util#versionIsAtLeast(ver, [2])
+        let s:rubylint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
     endif
     let makeprg = self.makeprgBuild({ 'args': (s:rubylint_new ? '' : 'analyze ') . '--presenter=syntastic' })
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index ab19f27f..39881194 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -21,11 +21,7 @@ function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-
-    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-    call self.log(self.getExec() . ' version =', ver)
-
-    return syntastic#util#versionIsAtLeast(ver, [0, 12])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 12])
 endfunction
 
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 8fb05c84..685efa55 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -20,8 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_slim_slimrb_GetLocList() dict
     if !exists('s:slimrb_new')
-        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull())
-        call self.log(self.getExec() . ' version =', ver)
+        let ver = self.getVersion(self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull())
         let s:slimrb_new = syntastic#util#versionIsAtLeast(ver, [1, 3, 1])
     endif
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim b/sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim
new file mode 100644
index 00000000..8cf5a987
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        xcrun.vim
+"Description: swift syntax checker - using xcrun
+"Maintainer:  Tom Fogg <tom@canobe.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists("g:loaded_syntastic_swift_xcrun_checker")
+    finish
+endif
+let g:loaded_syntastic_xcrun_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_swift_xcrun_GetLocList() dict
+
+    let makeprg = self.makeprgBuild({ 'args_after': 'swift' })
+
+    let errorformat=
+        \ '%f:%l:%c:{%*[^}]}: %trror: %m,'.
+        \ '%f:%l:%c:{%*[^}]}: fatal %trror: %m,'.
+        \ '%f:%l:%c:{%*[^}]}: %tarning: %m,'.
+        \ '%f:%l:%c: %trror: %m,'.
+        \ '%f:%l:%c: fatal %trror: %m,'.
+        \ '%f:%l:%c: %tarning: %m,'.
+        \ '%f:%l: %trror: %m,'.
+        \ '%f:%l: fatal %trror: %m,'.
+        \ '%f:%l: %tarning: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'swift',
+    \ 'name': 'xcrun'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
index 82ca3946..4a6cdd48 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -20,9 +20,7 @@ set cpo&vim
 
 function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
     if !exists('s:js_yaml_new')
-        let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
-        call self.log(self.getExec() . ' version =', ver)
-        let s:js_yaml_new = syntastic#util#versionIsAtLeast(ver, [2])
+        let s:js_yaml_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
     endif
 
     let makeprg = self.makeprgBuild({ 'args_after': (s:js_yaml_new ? '' : '--compact') })
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index 81cf3b5f..61df8511 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -89,6 +89,9 @@ endfunction
 
 function! airline#update_statusline()
   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)
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index 021b3b28..a990e78b 100644
--- a/sources_non_forked/vim-airline/autoload/airline/init.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -105,7 +105,7 @@ function! airline#init#sections()
     let g:airline_section_y = airline#section#create_right(['ffenc'])
   endif
   if !exists('g:airline_section_z')
-    let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3c '])
+    let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3v '])
   endif
   if !exists('g:airline_section_warning')
     let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 7620abe5..2dc62b87 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -126,6 +126,11 @@ values):
   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
+<
+
 ==============================================================================
 COMMANDS                                                  *airline-commands*
 
diff --git a/sources_non_forked/vim-airline/t/init.vim b/sources_non_forked/vim-airline/t/init.vim
index 86efe582..d1a2abb8 100644
--- a/sources_non_forked/vim-airline/t/init.vim
+++ b/sources_non_forked/vim-airline/t/init.vim
@@ -44,7 +44,7 @@ describe 'init sections'
   it 'section z should be line numbers'
     Expect g:airline_section_z =~ '%3p%%'
     Expect g:airline_section_z =~ '%4l'
-    Expect g:airline_section_z =~ '%3c'
+    Expect g:airline_section_z =~ '%3v'
   end
 
   it 'should not redefine sections already defined'
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 7ef5a929..65e6665e 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -1,6 +1,6 @@
 " fugitive.vim - A Git wrapper so awesome, it should be illegal
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.1
+" Version:      2.2
 " GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
 
 if exists('g:loaded_fugitive') || &cp
@@ -1759,7 +1759,7 @@ function! s:Diff(vert,...) abort
     let winnr = winnr()
     if getwinvar('#', '&diff')
       wincmd p
-      call feedkeys("\<C-W>p", 'n')
+      call feedkeys(winnr."\<C-W>w", 'n')
     endif
     return ''
   catch /^fugitive:/
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index 17e3ad82..d0b0dfd9 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -189,6 +189,22 @@ let g:go_highlight_structs = 1
 
 ## Troubleshooting
 
+### Command not found
+
+If trying to use `:GoDef`,  `:GoInfo` and get a `command not found`, check that you have the binaries installed by using: `:GoInstallBinaries`
+
+Before opening vim, check your current `$PATH`:
+
+	echo $PATH
+	
+after opening vim, run `:echo $PATH`, the output must be your current `$PATH` + `$PATH/bin` (the location where `:GoInstallBinaries` installed the binaries
+
+If problem persists and you are using maybe 'csh' or other shell, try adding this to your .vimrc:
+
+    set shell=/bin/sh
+   
+
+
 ### I'm using Fish shell but have some problems using Vim-go
 
 First environment variables in Fish are applied differently, it should be like:
@@ -202,13 +218,12 @@ too). To overcome this problem change the default shell by adding the following
 into your .vimrc (on the top of the file):
 
 	if $SHELL =~ 'fish'
-	  set shell='/bin/bash'
+	  set shell='/bin/sh'
 	endif
 
 or
 
-	set shell='/bin/bash'
-
+	set shell='/bin/sh'
 
 ## Why another plugin?
 
@@ -221,6 +236,12 @@ months under heavy go development environment.
 
 Give it a try. I hope you like it. Feel free to contribute to the project.
 
+## Donations
+
+Vim-go is an open source project and I'm working on it on my free times. I'm spending a lot of time and thoughts to make it stable, fixing bugs, adding new features, etc... If you like vim-go and find it helpful, you might give me a gift from some of the books (kindle) I have in my wish list: 
+
+[Amazon.com Fatih's Wish List](http://amzn.com/w/3RUTKZC0U30P6). Thanks!
+
 ## Credits
 
 * Go Authors for official vim plugins
diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim
index 69b2d53c..227c4cbd 100644
--- a/sources_non_forked/vim-go/autoload/go/complete.vim
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -19,7 +19,12 @@ fu! s:gocodeCurrentBuffer()
     return file
 endf
 
-let s:vim_system = get(g:, 'gocomplete#system_function', 'system')
+
+if go#vimproc#has_vimproc()
+    let s:vim_system = get(g:, 'gocomplete#system_function', 'vimproc#system2')
+else
+    let s:vim_system = get(g:, 'gocomplete#system_function', 'system')
+endif
 
 fu! s:system(str, ...)
     return call(s:vim_system, [a:str] + a:000)
diff --git a/sources_non_forked/vim-go/autoload/go/errcheck.vim b/sources_non_forked/vim-go/autoload/go/errcheck.vim
index e470f22b..0927667b 100644
--- a/sources_non_forked/vim-go/autoload/go/errcheck.vim
+++ b/sources_non_forked/vim-go/autoload/go/errcheck.vim
@@ -5,6 +5,10 @@ endif
 function! go#errcheck#Run(...) abort
     if a:0 == 0
         let package = go#package#ImportPath(expand('%:p:h'))
+        if package == -1
+            echohl Error | echomsg "vim-go: package is not inside GOPATH src" | echohl None
+            return
+        endif
     else
         let package = a:1
     end
@@ -14,6 +18,7 @@ function! go#errcheck#Run(...) abort
         return
     endif
 
+    echon "vim-go: " | echohl Identifier | echon "errcheck analysing ..." | echohl None
     let out = system(bin_path . ' ' . package)
     if v:shell_error
         let errors = []
@@ -28,15 +33,21 @@ function! go#errcheck#Run(...) abort
                             \"text": tokens[4]})
             endif
         endfor
+
         if empty(errors)
-            % | " Couldn't detect error format, output errors
+            echohl Error | echomsg "GoErrCheck returned error" | echohl None
+            echo out
         endif
+
         if !empty(errors)
+            redraw | echo
             call setqflist(errors, 'r')
         endif
-        echohl Error | echomsg "GoErrCheck returned error" | echohl None
     else
         call setqflist([])
     endif
+
     cwindow
 endfunction
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim
index f640b9ff..1a1be17e 100644
--- a/sources_non_forked/vim-go/autoload/go/fmt.vim
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -74,8 +74,15 @@ function! go#fmt#Format(withGoimport)
     " get the command first so we can test it
     let fmt_command = g:go_fmt_command
     if a:withGoimport  == 1 
+        let fmt_command  = g:go_goimports_bin
+    endif
+
+    " if it's something else than gofmt, we need to check the existing of that
+    " binary. For example if it's goimports, let us check if it's installed,
+    " if not the user get's a warning via go#tool#BinPath()
+    if fmt_command != "gofmt"
         " check if the user has installed goimports
-        let bin_path = go#tool#BinPath(g:go_goimports_bin) 
+        let bin_path = go#tool#BinPath(fmt_command) 
         if empty(bin_path) 
             return 
         endif
diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim
index b0b28236..db165e40 100644
--- a/sources_non_forked/vim-go/autoload/go/tool.vim
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -32,7 +32,8 @@ function! go#tool#Imports()
     endif
 
     for package_path in split(out, '\n')
-        let package_name = fnamemodify(package_path, ":t:r")
+        let cmd = "go list -f {{.Name}} " . package_path
+        let package_name = substitute(go#tool#ExecuteInDir(cmd), '\n$', '', '')
         let imports[package_name] = package_path
     endfor
 
diff --git a/sources_non_forked/vim-go/autoload/go/vimproc.vim b/sources_non_forked/vim-go/autoload/go/vimproc.vim
new file mode 100644
index 00000000..6a6aeca3
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/vimproc.vim
@@ -0,0 +1,21 @@
+"Check if has vimproc
+function! go#vimproc#has_vimproc()
+    if !exists('g:go#use_vimproc')
+        if IsWin()
+            try
+                call vimproc#version()
+                let exists_vimproc = 1
+            catch
+                let exists_vimproc = 0
+            endtry
+        else
+            let exists_vimproc = 0
+        endif
+
+        let g:go#use_vimproc = exists_vimproc
+    endif
+
+    return g:go#use_vimproc
+endfunction
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index edfcae36..779b9aff 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -558,6 +558,12 @@ Highlights method names. By default it's disabled. >
 Highlights struct names. By default it's disabled. >
 
 	let g:go_highlight_structs = 0
+<
+                                        *'g:go_highlight_build_constraints'*
+
+Highlights build constraints. By default it's disabled. >
+
+	let g:go_highlight_build_constraints = 0
 <
                                                   *'g:go_textobj_enabled'*
 
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
index 07718281..fe46c7c2 100644
--- a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -10,8 +10,9 @@ endsnippet
 # anonymous function
 snippet anon "fn := func() { ... }"
 ${1:fn} := func() {
-	${0}
+	${2:${VISUAL}}
 }
+${0}
 endsnippet
 
 # append
@@ -192,7 +193,7 @@ endsnippet
 
 # Fmt Printf debug
 snippet ff "fmt.Printf(...)"
-fmt.Printf("${1} = %+v\n", $1)
+fmt.Printf("${1:${VISUAL}} = %+v\n", $1)
 endsnippet
 
 # Fmt Println debug
@@ -294,8 +295,9 @@ endsnippet
 # goroutine anonymous function
 snippet gof "go func() { ... }()"
 go func() {
-	${1}
+	${1:${VISUAL}}
 }()
+${0}
 endsnippet
 
 # test function
diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim
index e460ebdc..5467ac60 100644
--- a/sources_non_forked/vim-go/plugin/go.vim
+++ b/sources_non_forked/vim-go/plugin/go.vim
@@ -9,7 +9,7 @@ let g:go_loaded_install = 1
 let s:packages = [
             \ "github.com/nsf/gocode",
             \ "golang.org/x/tools/cmd/goimports",
-            \ "code.google.com/p/rog-go/exp/cmd/godef",
+            \ "github.com/rogpeppe/godef",
             \ "golang.org/x/tools/cmd/oracle",
             \ "golang.org/x/tools/cmd/gorename",
             \ "github.com/golang/lint/golint",
@@ -166,11 +166,6 @@ function! s:CheckBinaries()
         echohl Error | echomsg "vim-go: git executable not found." | echohl None
         return -1
     endif
-
-    if !executable('hg')
-        echohl Error | echomsg "vim.go: hg (mercurial) executable not found." | echohl None
-        return -1
-    endif
 endfunction
 
 " Autocommands
diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim
index 4ee39a71..7b0fbaf5 100644
--- a/sources_non_forked/vim-go/syntax/go.vim
+++ b/sources_non_forked/vim-go/syntax/go.vim
@@ -67,6 +67,10 @@ if !exists("g:go_highlight_structs")
 	let g:go_highlight_structs = 0
 endif
 
+if !exists("g:go_highlight_build_constraints")
+    let g:go_highlight_build_constraints = 0
+endif
+
 syn case match
 
 syn keyword     goDirective         package import
@@ -270,6 +274,21 @@ endif
 hi def link     goStruct						Function
 hi def link     goStructDef         Function
 
+" Build Constraints
+if g:go_highlight_build_constraints != 0
+    syn keyword goBuildOs           contained ignore cgo android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows 
+    syn keyword goBuildArch         contained 386 amd64 amd64p32 arm
+    syn match   goBuildDirective    display contained "+build"
+    syn region  goBuildComment      start="//\s*+build" end="$" contains=goBuildDirective,goBuildOs,goBuildArch
+    syn region  goBuildComment      start="/\*\s*+build" end="\*/" contains=goBuildDirective,goBuildOs,goBuildArch
+endif
+
+hi def link     goBuildComment      Comment
+hi def link     goBuildOs           Type
+hi def link     goBuildArch         Type
+hi def link     goBuildDirective    PreProc
+
+
 " Search backwards for a global declaration to start processing the syntax.
 "syn sync match goSync grouphere NONE /^\(const\|var\|type\|func\)\>/
 
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index b9844a5b..ea10d46c 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -69,7 +69,7 @@ By default, the 'next' key is also used to enter multicursor mode. If you want t
 let g:multi_cursor_start_key='<F6>'
 ```
 
-Note that when multicursor mode is started, it selects current word without boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in Normal mode (as `*` does) but still have old behaviour up your sleeve, you can do the following:
+Note that when multicursor mode is started, it selects current word without boundaries, i.e. it behaves like `g*`. If you want to use word boundaries in Normal mode (as `*` does) but still have old behaviour up your sleeve, you can do the following:
 ```
 let g:multi_cursor_start_key='g<C-n>'
 let g:multi_cursor_start_word_key='<C-n>'
diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index 4543fce1..fe86d4e2 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -236,6 +236,14 @@ function! multiple_cursors#find(start, end, pattern)
     return
   else
     echohl Normal | echo 'Added '.s:cm.size().' cursor'.(s:cm.size()>1?'s':'') | echohl None
+
+    " If we've created any cursors, we need to call the before function, end
+    " function will be called via normal routes
+    if exists('*Multiple_cursors_before') && !s:before_function_called
+      exe "call Multiple_cursors_before()"
+      let s:before_function_called = 1
+    endif
+
     call s:wait_for_user_input('v')
   endif
 endfunction
@@ -458,8 +466,8 @@ function! s:CursorManager.update_current() dict
     call cur.update_visual_selection(s:get_visual_region(s:pos('.')))
   elseif s:from_mode ==# 'v' || s:from_mode ==# 'V'
     call cur.remove_visual_selection()
-  elseif s:from_mode ==# 'i' && s:to_mode ==# 'n' && self.current_index == self.size() - 1
-    normal! `^
+  elseif s:from_mode ==# 'i' && s:to_mode ==# 'n' && self.current_index != self.size() - 1
+    normal! h
   endif
   let vdelta = line('$') - s:saved_linecount
   " If the total number of lines changed in the buffer, we need to potentially
@@ -985,7 +993,9 @@ endfunction
 
 let s:retry_keys = ""
 function! s:display_error()
-  if s:bad_input == s:cm.size() && has_key(g:multi_cursor_normal_maps, s:char[0])
+  if s:bad_input == s:cm.size()
+        \ && s:from_mode ==# 'n'
+        \ && has_key(g:multi_cursor_normal_maps, s:char[0])
     " we couldn't replay it anywhere but we're told it's the beginning of a
     " multi-character map like the `d` in `dw`
     let s:retry_keys = s:char
@@ -1037,14 +1047,14 @@ function! s:last_char()
 endfunction
 
 function! s:wait_for_user_input(mode)
+  call s:display_error()
+
   let s:from_mode = a:mode
   if empty(a:mode)
     let s:from_mode = s:to_mode
   endif
   let s:to_mode = ''
 
-  call s:display_error()
-
   " Right before redraw, apply the highlighting bug fix
   call s:apply_highlight_fix()
 
diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
index 7c5237c0..26ca5a93 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -110,7 +110,7 @@ mode than for selecting the next location, do like the following: >
 
 *g:multi_cursor_start_word_key*
 When multicursor mode is started, it selects current word without
-boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in
+boundaries, i.e. it behaves like `g*`. If you want to use word boundaries in
 Normal mode (as `*` does) but still have old behaviour up your sleeve, you can
 do the following: >
 
diff --git a/sources_non_forked/vim-repeat/autoload/repeat.vim b/sources_non_forked/vim-repeat/autoload/repeat.vim
index 6acb48ee..cb5e8953 100644
--- a/sources_non_forked/vim-repeat/autoload/repeat.vim
+++ b/sources_non_forked/vim-repeat/autoload/repeat.vim
@@ -89,10 +89,18 @@ function! repeat#run(count)
         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)
+        if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
+            exe 'norm ' . r . cnt . s
+        else
+            call feedkeys(r . cnt, 'ni')
+            call feedkeys(s, 'i')
+        endif
     else
-        call feedkeys((a:count ? a:count : '') . '.', 'n')
+        if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
+            exe 'norm! '.(a:count ? a:count : '') . '.'
+        else
+            call feedkeys((a:count ? a:count : '') . '.', 'ni')
+        endif
     endif
 endfunction
 
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 86d881a5..5d9d1d64 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -81,6 +81,23 @@ does `:SnipMateLoadScope rails` when editing a Rails project for example.
 * Fix the use of the visual map at the end of a line
 * Add `:SnipMateLoadScope` command and buffer-local scope aliases
 * Load `<scope>_*.snippets` files
+* Indent visual placeholder expansions and remove extraneous lines ([#177][177]
+  and [#178][178])
+
+* The nested branch has been merged
+    * A new snippet parser has been added. The g:snipmate.version as well as
+      version lines in snippet files determines which is used
+    * The new parser supports tab stops placed within placeholders,
+      substitutions, non-consecutive stop numbers, and fewer ambiguities
+    * The stop jumping code has been updated
+    * Tests have been added for the jumping code and the new parser
+
+* The override branch has been merged
+    * The g:snipMate.override option is added. When enabled, if two snippets
+      share the same name, the later-loaded one is kept and the other discarded
+    * Override behavior can be enabled on a per-snippet basis with a bang (!) in
+      the snippet file
+    * Otherwise, SnipMate tries to preserve all snippets loaded
 
 ### 0.87 - 2014-01-04 ###
 
@@ -106,3 +123,5 @@ does `:SnipMateLoadScope rails` when editing a Rails project for example.
 [vundle]: https://github.com/gmarik/vundle
 
 [143]: https://github.com/garbas/vim-snipmate/issues/143
+[177]: https://github.com/garbas/vim-snipmate/issues/177
+[178]: https://github.com/garbas/vim-snipmate/issues/178
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 38ff530d..9196ae4d 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -9,35 +9,39 @@ catch /.*/
 	echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.md'
 endtry
 
-" match $ which doesn't follow a \
-let s:d = nr2char(31)
-
 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
 
-let s:state_proto = {}
 let s:cache = {}
 
-fun! s:state_proto.remove()
-	unlet! b:snip_state
-	" Remove all buffer-local autocommands in the snipmate_changes group
-	au! snipmate_changes * <buffer>
-endf
-
-fun! snipMate#expandSnip(snip, col)
-	let lnum = line('.') | let col = a:col
-
-	let snippet = s:ProcessSnippet(a:snip)
-	" Avoid error if eval evaluates to nothing
-	if snippet == '' | return '' | endif
-
-	" Expand snippet onto current position with the tab stops removed
-	let snipLines = split(substitute(snippet, ''.s:d .'\d\+\|'.s:d .'{\d\+.\{-}}', '', 'g'), "\n", 1)
-
+function! snipMate#expandSnip(snip, version, col)
+	let lnum = line('.')
+	let col = a:col
 	let line = getline(lnum)
+	let indent = match(line, '\S\|$') + 1
+	let b:snip_state = snipmate#jumping#state()
+
+	if a:version == 1
+		let [snippet, b:snip_state.stops] = snipmate#parse#snippet(a:snip)
+		" Build stop/mirror info
+		let b:snip_state.stop_count = s:build_stops(snippet, b:snip_state.stops, lnum, col, indent)
+		let snipLines = snipMate#sniplist_str(snippet, b:snip_state.stops)
+	else
+		let snippet = snipmate#legacy#process_snippet(a:snip)
+		let [b:snip_state.stops, b:snip_state.stop_count] = snipmate#legacy#build_stops(snippet, lnum, col - indent, indent)
+		let snipLines = split(substitute(snippet, printf('%s\d\+\|%s{\d\+.\{-}}',
+					\ g:snipmate#legacy#sigil, g:snipmate#legacy#sigil), '', 'g'), "\n", 1)
+	endif
+
+	" Abort if the snippet is empty
+	if empty(snippet)
+		return ''
+	endif
+
+	" Expand snippet onto current position
 	let afterCursor = strpart(line, col - 1)
 	" Keep text after the cursor
 	if afterCursor != "\t" && afterCursor != ' '
@@ -52,336 +56,143 @@ fun! snipMate#expandSnip(snip, col)
 	endif
 
 	" Insert snippet with proper indentation
-	let indent = match(line, '\S\|$') + 1
 	call setline(lnum, line . snipLines[0])
 	call append(lnum, map(snipLines[1:], "empty(v:val) ? v:val : '" . strpart(line, 0, indent - 1) . "' . v:val"))
 
 	" Open any folds snippet expands into
-	if &fen | sil! exe lnum.','.(lnum + len(snipLines) - 1).'foldopen' | endif
-
-	let b:snip_state = copy(s:state_proto)
-	let [b:snip_state.stops, b:snip_state.stop_count] = s:BuildTabStops(snippet, lnum, col - indent, indent)
-
-	if b:snip_state.stop_count
-		aug snipmate_changes
-			au CursorMoved,CursorMovedI <buffer> if exists('b:snip_state') |
-						\     call b:snip_state.update_changes() |
-						\ else |
-						\     silent! au! snipmate_changes * <buffer> |
-						\ endif
-		aug END
-		call b:snip_state.set_stop(0)
-		let ret = b:snip_state.select_word()
-
-		if b:snip_state.stop_count == 1
-			call b:snip_state.remove()
-		endif
-
-		return ret
-	else
-		unlet b:snip_state
-		" Place cursor at end of snippet if no tab stop is given
-		let newlines = len(snipLines) - 1
-		call cursor(lnum + newlines, indent + len(snipLines[-1]) - len(afterCursor)
-					\ + (newlines ? 0: col - 1))
+	if &foldenable
+		silent! exec lnum . ',' . (lnum + len(snipLines) - 1) . 'foldopen'
 	endif
-	return ''
-endf
 
-" Update state information to correspond to the given tab stop
-function! s:state_proto.set_stop(stop)
-	let self.stop_no   = a:stop
-	let self.cur_stop  = self.stops[self.stop_no]
-	let self.end_col   = self.cur_stop[1] + self.cur_stop[2]
-	let self.start_col = self.cur_stop[1]
-	call cursor(self.cur_stop[0], self.cur_stop[1])
-	let self.prev_len  = col('$')
-	let self.has_vars  = exists('self.cur_stop[3]')
-	let self.old_vars  = self.has_vars ? deepcopy(self.cur_stop[3]) : []
+	aug snipmate_changes
+		au CursorMoved,CursorMovedI <buffer> if exists('b:snip_state') |
+					\     call b:snip_state.update_changes() |
+					\ else |
+					\     silent! au! snipmate_changes * <buffer> |
+					\ endif
+	aug END
+
+	let b:snip_state.stop_no = 0
+	return b:snip_state.set_stop(0)
 endfunction
 
-" Prepare snippet to be processed by s:BuildTabStops
-fun! s:ProcessSnippet(snip)
-	let snippet = a:snip
-	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
+function! snipMate#placeholder_str(num, stops)
+	return snipMate#sniplist_str(a:stops[a:num].placeholder, a:stops)[0]
+endfunction
 
-	if exists('b:snipmate_content_visual')
-		let visual = substitute(b:snipmate_content_visual, "\n$", '', '')
-		unlet b:snipmate_content_visual
-	else
-		let visual = ''
-	endif
-	let snippet = substitute(snippet, '\n\(\t\+\).\{-\}\zs{VISUAL}',
-				\ substitute(escape(visual, '%\'), "\n", "\n\\\\1", 'g'), 'g')
+function! snipMate#sniplist_str(snippet, stops)
+	let lines = ['']
+	let pos = 0
+	let add_to = 1
+	let seen_stops = []
 
-	" Evaluate eval (`...`) expressions.
-	" Backquotes prefixed with a backslash "\" are ignored.
-	" And backslash can be escaped by doubling it.
-	" Using a loop here instead of a regex fixes a bug with nested "\=".
-	if stridx(snippet, '`') != -1
-		let new = []
-		let snip = split(snippet, esc_bslash . '`', 1)
-		let isexp = 0
-		for i in snip
-			if isexp
-				call add(new, substitute(eval(i), "\n\\%$", '', ''))
+	while pos < len(a:snippet)
+		let item = a:snippet[pos]
+
+		if type(item) == type('')
+			if add_to
+				let lines[-1] .= item
 			else
-				call add(new, i)
+				call add(lines, item)
 			endif
-			let isexp = !isexp
-		endfor
-		let snippet = join(new, '')
-		let snippet = substitute(snippet, "\r", "\n", 'g')
-		let snippet = substitute(snippet, '\\`', "`", 'g')
-	endif
-
-	" Place all text after a colon in a tab stop after the tab stop
-	" (e.g. "${#:foo}" becomes "${:foo}foo").
-	" This helps tell the position of the tab stops later.
-	let snippet = substitute(snippet, esc_bslash . '\$\({\d\+:\(.\{-}\)}\|{\d\+}\)', s:d . '\1\2', 'g')
-	let snippet = substitute(snippet, esc_bslash . '\$\(\d\+\)', s:d . '\1', 'g')
-	let snippet = substitute(snippet, esc_bslash . '\\\$', '$', 'g')
-	let snippet = substitute(snippet, '\\\\', "\\", 'g')
-
-	" Update the a:snip so that all the $# become the text after
-	" the colon in their associated ${#}.
-	" (e.g. "${1:foo}" turns all "$1"'s into "foo")
-	let i = 1
-	while snippet =~ s:d.'{'.i
-		let s = matchstr(snippet, s:d.'{'.i.':\zs.\{-}\ze}')
-		if s != ''
-			let snippet = substitute(snippet, s:d.i, s.'&', 'g')
+			let add_to = 0
+		elseif type(item) == type([])
+			let lines[-1] .= snipMate#placeholder_str(item[0], a:stops)
+			let add_to = 1
 		endif
-		let i += 1
-	endw
 
-	" Add ${0} tab stop if found
-	if snippet =~ s:d . '{0'
-		let snippet = substitute(snippet, s:d.'{0', s:d . '{' . i, '')
-		let s = matchstr(snippet, s:d.'{'.i.':\zs.\{-}\ze}')
-		if s != ''
-			let snippet = substitute(snippet, s:d.'0', s:d . i, 'g')
-			let snippet = substitute(snippet, s:d.i, s.'&', 'g')
-		endif
-	else
-		let snippet .= s:d . '{'.i.'}'
-	endif
+		let pos += 1
+		unlet item " avoid E706
+	endwhile
 
-	if &et " Expand tabs to spaces if 'expandtab' is set.
-		return substitute(snippet, '\t', repeat(' ', (&sts > 0) ? &sts : &sw), 'g')
-	endif
-	return snippet
-endf
-
-" Counts occurences of haystack in needle
-fun! s:Count(haystack, needle)
-	let counter = 0
-	let index = stridx(a:haystack, a:needle)
-	while index != -1
-		let index = stridx(a:haystack, a:needle, index+1)
-		let counter += 1
-	endw
-	return counter
-endf
-
-" Builds a list of a list of each tab stop in the snippet containing:
-" 1.) The tab stop's line number.
-" 2.) The tab stop's column number
-"     (by getting the length of the string between the last "\n" and the
-"     tab stop).
-" 3.) The length of the text after the colon for the current tab stop
-"     (e.g. "${1:foo}" would return 3).
-" 4.) If the "${#:}" construct is given, another list containing all
-"     the matches of "$#", to be replaced with the placeholder. This list is
-"     composed the same way as the parent; the first item is the line number,
-"     and the second is the column.
-fun! s:BuildTabStops(snip, lnum, col, indent)
-	let snipPos = []
-	let i = 1
-	let withoutVars = substitute(a:snip, s:d . '\d\+', '', 'g')
-	while a:snip =~ s:d.'{'.i
-		let beforeTabStop = matchstr(withoutVars, '^.*\ze'.s:d .'{'.i.'\D')
-		let withoutOthers = substitute(withoutVars, ''.s:d .'{\('.i.'\D\)\@!\d\+.\{-}}', '', 'g')
-
-		let j = i - 1
-		call add(snipPos, [0, 0, 0])
-		let snipPos[j][0] = a:lnum + s:Count(beforeTabStop, "\n")
-		let snipPos[j][1] = a:indent + len(matchstr(withoutOthers, '.*\(\n\|^\)\zs.*\ze'.s:d .'{'.i.'\D'))
-		if snipPos[j][0] == a:lnum | let snipPos[j][1] += a:col | endif
-
-		" Get all $# matches in another list, if ${#:name} is given
-		if withoutVars =~ ''.s:d .'{'.i.':'
-			let snipPos[j][2] = len(matchstr(withoutVars, ''.s:d .'{'.i.':\zs.\{-}\ze}'))
-			let dots = repeat('.', snipPos[j][2])
-			call add(snipPos[j], [])
-			let withoutOthers = substitute(a:snip, ''.s:d .'{\d\+.\{-}}\|'.s:d .''.i.'\@!\d\+', '', 'g')
-			while match(withoutOthers, ''.s:d .''.i.'\(\D\|$\)') != -1
-				let beforeMark = matchstr(withoutOthers, '^.\{-}\ze'.dots.''.s:d .''.i.'\(\D\|$\)')
-				call add(snipPos[j][3], [0, 0])
-				let snipPos[j][3][-1][0] = a:lnum + s:Count(beforeMark, "\n")
-				let snipPos[j][3][-1][1] = a:indent + (snipPos[j][3][-1][0] > a:lnum
-				                           \ ? len(matchstr(beforeMark, '.*\n\zs.*'))
-				                           \ : a:col + len(beforeMark))
-				let withoutOthers = substitute(withoutOthers, ''.s:d .''.i.'\ze\(\D\|$\)', '', '')
-			endw
-		endif
-		let i += 1
-	endw
-	return [snipPos, i - 1]
-endf
-
-function! s:state_proto.jump_stop(backwards)
-	" Update changes just in case
-	" This seems to be only needed because insert completion does not trigger
-	" the CursorMovedI event
-	call self.update_changes()
-
-	" Update stop and var locations
-	call self.update_stops()
-
-	" Store the changed col/length of the current stop
-	let self.cur_stop[1] = self.start_col
-	let self.cur_stop[2] = self.end_col - self.start_col
-
-	let self.stop_no += a:backwards ? -1 : 1
-	" Loop over the snippet when going backwards from the beginning
-	if self.stop_no < 0 | let self.stop_no = self.stop_count - 1 | endif
-
-	call self.set_stop(self.stop_no)
-	let ret = self.select_word()
-	if self.stop_no == self.stop_count - 1
-		call self.remove()
-	endif
-	return ret
+	return lines
 endfunction
 
-" Updates tab stops/vars
-function! s:state_proto.update_stops()
-	let changeLen = self.end_col - self.cur_stop[2] - self.start_col
-	" Update tab stops in snippet if text has been added via "$#"
-	" (e.g., in "${1:foo}bar$1${2}").
-	if changeLen != 0
-		let curLine = line('.')
+function! s:build_stops(snippet, stops, lnum, col, indent)
+	let stops = a:stops
+	let line  = a:lnum
+	let col   = a:col
 
-		for pos in self.stops
-			if pos == self.cur_stop | continue | endif
-			let changed = pos[0] == curLine && pos[1] > self.cur_stop[1]
-			let changedVars = 0
-			let endPlaceholder = pos[2] - 1 + pos[1]
-			" Subtract changeLen from each tab stop that was after any of
-			" the current tab stop's placeholders.
-			for [lnum, col] in self.old_vars
-				if lnum > pos[0] | break | endif
-				if pos[0] == lnum
-					if pos[1] > col || (pos[2] == -1 && pos[1] == col)
-						let changed += 1
-					elseif col < endPlaceholder
-						let changedVars += 1
-					endif
+	for [id, dict] in items(stops)
+		for i in dict.instances
+			if len(i) > 1 && type(i[1]) != type({})
+				if !has_key(dict, 'placeholder')
+					let dict.placeholder = i[1:]
+				else
+					unlet i[1:]
 				endif
-			endfor
-			let pos[1] += changeLen * changed
-			" Parse variables within placeholders, e.g., "${1:foo} ${2:$1bar}"
-			let pos[2] += changeLen * changedVars
-
-			" Do the same to any placeholders in the other tab stops.
-			if exists('pos[3]')
-				for nPos in pos[3]
-					let changed = nPos[0] == curLine && nPos[1] > self.start_col
-					if changed && nPos[1] < self.start_col + self.cur_stop[2]
-						call remove(pos, index(pos, nPos))
-						continue
-					endif
-					for [lnum, col] in self.old_vars
-						if lnum > nPos[0] | break | endif
-						if nPos[0] == lnum && nPos[1] > col
-							let changed += 1
-						endif
-					endfor
-					let nPos[1] += changeLen * changed
-				endfor
 			endif
 		endfor
-	endif
-endfunction
-
-" Select the placeholder for the current tab stop
-function! s:state_proto.select_word()
-	let len = self.cur_stop[2]
-	if !len | return '' | endif
-	let l = col('.') != 1 ? 'l' : ''
-	if &sel == 'exclusive'
-		return "\<esc>".l.'v'.len."l\<c-g>"
-	endif
-	return len == 1 ? "\<esc>".l.'gh' : "\<esc>".l.'v'.(len - 1)."l\<c-g>"
-endfunction
-
-" Update the snippet as text is typed. The self.update_vars() function does
-" the actual work.
-" If the cursor moves outside of a placeholder, call self.remove()
-function! s:state_proto.update_changes()
-	let change_len = col('$') - self.prev_len
-	let self.end_col += change_len
-
-	let col = col('.')
-	if mode() == 'i'
-		if line('.') != self.cur_stop[0]
-					\ || col < self.start_col || col > self.end_col
-			call self.remove()
-		elseif self.has_vars
-			call self.update_vars(change_len)
+		if !has_key(dict, 'placeholder')
+			let dict.placeholder = []
+			let j = 0
+			while len(dict.instances[j]) > 1
+				let j += 1
+			endwhile
+			call add(dict.instances[j], '')
 		endif
-	endif
-
-	let self.prev_len = col('$')
-endfunction
-
-" Actually update the vars for any changed text
-function! s:state_proto.update_vars(change)
-	let newWordLen = self.end_col - self.start_col
-	let newWord = strpart(getline('.'), self.start_col - 1, newWordLen)
-	let changeLen = a:change
-	let curLine = line('.')
-	let curCol = col('.')
-	let oldStartSnip = self.start_col
-	let updateTabStops = changeLen != 0
-	let i = 0
-
-	for [lnum, col] in self.cur_stop[3]
-		if updateTabStops
-			let start = self.start_col
-			if lnum == curLine && col <= start
-				let self.start_col += changeLen
-				let self.end_col += changeLen
-			endif
-			for nPos in self.cur_stop[3][(i):]
-				" This list is in ascending order, so quit if we've gone too far.
-				if nPos[0] > lnum | break | endif
-				if nPos[0] == lnum && nPos[1] > col
-					let nPos[1] += changeLen
-				endif
-			endfor
-			if lnum == curLine && col > start
-				let col += changeLen
-				let self.cur_stop[3][i][1] = col
-			endif
-			let i += 1
-		endif
-
-		" Split the line into three parts: the mirror, what's before it, and
-		" what's after it. Then combine them using the new mirror string.
-		" Subtract one to go from column index to byte index
-		let theline = getline(lnum)
-		let update  = strpart(theline, 0, col - 1)
-		let update .= newWord
-		let update .= strpart(theline, col + self.end_col - self.start_col - a:change - 1)
-		call setline(lnum, update)
+		unlet dict.instances
 	endfor
 
-	" Reposition the cursor in case a var updates on the same line but before
-	" the current tabstop
-	if oldStartSnip != self.start_col || mode() == 'i'
-		call cursor(0, curCol + self.start_col - oldStartSnip)
+	let [line, col] = s:build_loc_info(a:snippet, stops, line, col, a:indent)
+
+	" add zero tabstop if it doesn't exist and then link it to the highest stop
+	" number
+	let stops[0] = get(stops, 0,
+				\ { 'placeholder' : [], 'line' : line, 'col' : col })
+	let stop_count = max(keys(stops)) + 2
+	let stops[stop_count - 1] = stops[0]
+
+	return stop_count
+endfunction
+
+function! s:build_loc_info(snippet, stops, line, col, indent)
+	let stops   = a:stops
+	let line    = a:line
+	let col     = a:col
+	let pos     = 0
+	let in_text = 0
+
+	while pos < len(a:snippet)
+		let item = a:snippet[pos]
+
+		if type(item) == type('')
+			if in_text
+				let line += 1
+				let col = a:indent
+			endif
+			let col += len(item)
+			let in_text = 1
+		elseif type(item) == type([])
+			let id = item[0]
+			if len(item) > 1 && type(item[1]) != type({})
+				let stops[id].line = line
+				let stops[id].col = col
+				let [line, col] = s:build_loc_info(item[1:], stops, line, col, a:indent)
+			else
+				call s:add_mirror(stops, id, line, col, item)
+				let col += len(snipMate#placeholder_str(id, stops))
+			endif
+			let in_text = 0
+		endif
+
+		let pos += 1
+		unlet item " avoid E706
+	endwhile
+
+	return [line, col]
+endfunction
+
+function! s:add_mirror(stops, id, line, col, item)
+	let stops = a:stops
+	let item = a:item
+	let stops[a:id].mirrors = get(stops[a:id], 'mirrors', [])
+	let mirror = get(a:item, 1, {})
+	let mirror.line = a:line
+	let mirror.col = a:col
+	call add(stops[a:id].mirrors, mirror)
+	if len(item) == 1
+		call add(item, mirror)
 	endif
 endfunction
 
@@ -396,6 +207,7 @@ fun! snipMate#ReadSnippetsFile(file)
 	if !filereadable(a:file) | return [result, new_scopes] | endif
 	let inSnip = 0
 	let line_no = 0
+	let snipversion = get(g:snipMate, 'snippet_version', 0)
 	for line in readfile(a:file) + ["\n"]
 		let line_no += 1
 
@@ -403,13 +215,15 @@ fun! snipMate#ReadSnippetsFile(file)
 			let content .= strpart(line, 1)."\n"
 			continue
 		elseif inSnip
-			call add(result, [trigger, name == '' ? 'default' : name, content[:-2]])
+			call add(result, [trigger, name,
+						\     content[:-2], bang, snipversion])
 			let inSnip = 0
 		endif
 
 		if line[:6] == 'snippet'
 			let inSnip = 1
-			let trigger = strpart(line, 8)
+			let bang = (line[7] == '!')
+			let trigger = strpart(line, 8 + bang)
 			let name = ''
 			let space = stridx(trigger, ' ') + 1
 			if space " Process multi snip
@@ -424,6 +238,8 @@ fun! snipMate#ReadSnippetsFile(file)
 		elseif line[:6] == 'extends'
 			call extend(new_scopes, map(split(strpart(line, 8)),
 						\ "substitute(v:val, ',*$', '', '')"))
+		elseif line[:6] == 'version'
+			let snipversion = +strpart(line, 8)
 		endif
 	endfor
 	return [result, new_scopes]
@@ -464,80 +280,40 @@ fun! s:AddScopeAliases(list)
   return keys(did)
 endf
 
-if v:version < 704 || has('win32')
-	function! s:Glob(path, expr)
-		let res = []
-		for p in split(a:path, ',')
-			let h = split(fnamemodify(a:expr, ':h'), '/')[0]
-			if isdirectory(p . '/' . h)
-				call extend(res, split(glob(p . '/' . a:expr), "\n"))
-			endif
-		endfor
-		return filter(res, 'filereadable(v:val)')
-	endfunction
-else
-	function! s:Glob(path, expr)
-		return split(globpath(a:path, a:expr), "\n")
-	endfunction
-endif
+au SourceCmd *.snippet,*.snippets call s:source_snippet()
 
-" returns dict of
-" { path: { 'type': one of 'snippet' 'snippets',
-"           'exists': 1 or 0
-"           " for single snippet files:
-"           'name': name of snippet
-"           'trigger': trigger of snippet
-"         }
-" }
-" use mustExist = 1 to return existing files only
-"
-"     mustExist = 0 is used by OpenSnippetFiles
-function! snipMate#GetSnippetFiles(mustExist, scopes, trigger)
-	let paths = join(funcref#Call(g:snipMate.snippet_dirs), ',')
-	let result = {}
-	let scopes = s:AddScopeAliases(a:scopes)
-	let trigger = escape(a:trigger, "*[]?{}`'$")
-
-	" collect existing files
-	for scope in scopes
-
-		for f in s:Glob(paths, 'snippets/' . scope . '.snippets') +
-					\ s:Glob(paths, 'snippets/' . scope . '_*.snippets') +
-					\ s:Glob(paths, 'snippets/' . scope . '/*.snippets')
-			let result[f] = { 'exists' : 1, 'type' : 'snippets',
-						\ 'name_prefix' : fnamemodify(f, ':t:r') }
-		endfor
-
-		" We check for trigger* in the next two loops. In the case of an exact
-		" match, that'll be handled in snipMate#GetSnippetsForWordBelowCursor.
-		for f in s:Glob(paths, 'snippets/' . scope . '/' . trigger . '*.snippet')
-			let result[f] = {'exists': 1, 'type': 'snippet', 'name': 'default',
-						\ 'trigger': fnamemodify(f, ':t:r'), 'name_prefix' : scope }
-		endfor
-
-		for f in s:Glob(paths, 'snippets/' . scope . '/' . trigger . '*/*.snippet')
-			let result[f] = {'exists': 1, 'type': 'snippet', 'name' : fnamemodify(f, ':t:r'),
-						\ 'trigger': fnamemodify(f, ':h:t'), 'name_prefix' : scope }
-		endfor
-
-		if !a:mustExist
-			for p in split(paths, ',')
-				let p .= '/snippets/' . scope . '.snippets'
-				let result[p] = get(result, p, {'exists': 0, 'type': 'snippets'})
-			endfor
-		endif
-
-	endfor
-	return result
+function! s:info_from_filename(file)
+	let parts = split(fnamemodify(a:file, ':r'), '/')
+	let snipidx = len(parts) - index(reverse(copy(parts)), 'snippets') - 1
+	let rtp_prefix = join(parts[(snipidx -
+				\ (parts[snipidx - 1] == 'after' ? 3 : 2)):snipidx - 1], '/')
+	let trigger = get(parts, snipidx + 2, '')
+	let desc = get(parts, snipidx + 3, get(g:snipMate, 'override', 0) ?
+				\ '' : fnamemodify(a:file, ':t'))
+	return [rtp_prefix, trigger, desc]
 endfunction
 
-" should be moved to utils or such?
-function! snipMate#SetByPath(dict, trigger, path, snippet) abort
-	let d = a:dict
-	if !has_key(d, a:trigger)
-		let d[a:trigger] = {}
+function! s:source_snippet()
+	let file = expand('<afile>:p')
+	let [rtp_prefix, trigger, desc] = s:info_from_filename(file)
+	let new_snips = []
+	if fnamemodify(file, ':e') == 'snippet'
+		call add(new_snips, [trigger, desc, join(readfile(file), "\n"), 0,
+					\ get(g:snipMate, 'snippet_version', 0)])
+	else
+		let [snippets, extends] = s:CachedSnips(file)
+		let new_snips = deepcopy(snippets)
+		call extend(s:lookup_state.extends, extends)
 	endif
-	let d[a:trigger][a:path] = a:snippet
+	for snip in new_snips
+		if get(g:snipMate, 'override', 0)
+			let snip[1] = join([s:lookup_state.scope, snip[1]])
+		else
+			let snip[1] = join([s:lookup_state.scope, rtp_prefix,
+						\ empty(snip[1]) ? desc : snip[1]])
+		endif
+	endfor
+	call extend(s:lookup_state.snips, new_snips)
 endfunction
 
 function! s:CachedSnips(file)
@@ -551,31 +327,50 @@ function! s:CachedSnips(file)
 	return s:cache[a:file].contents
 endfunction
 
+function! s:snippet_filenames(scope, trigger)
+	let mid = ['', '_*', '/*']
+	return join(map(extend(mid, map(filter(copy(mid), 'v:key != 1'),
+				\ "'/' . a:trigger . '*' . v:val")),
+				\ "'snippets/' . a:scope . v:val . '.snippet'"
+				\ . ". (v:key < 3 ? 's' : '')"))
+endfunction
+
+function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion)
+	let d = a:dict
+	if !has_key(d, a:trigger) || a:bang
+		let d[a:trigger] = {}
+	endif
+	let d[a:trigger][a:path] = [a:snippet, a:snipversion]
+endfunction
+
 " default triggers based on paths
 function! snipMate#DefaultPool(scopes, trigger, result)
-	let extra_scopes = []
-	for [f,opts] in items(snipMate#GetSnippetFiles(1, a:scopes, a:trigger))
-		let opts.name_prefix = matchstr(f, '\v/\zs.{-}\ze/snippets') . ' ' . opts.name_prefix
-		if opts.type == 'snippets'
-			let [snippets, new_scopes] = s:CachedSnips(f)
-			call extend(extra_scopes, new_scopes)
-			for [trigger, name, contents] in snippets
-				if trigger =~ '\V\^' . escape(a:trigger, '\')
-					call snipMate#SetByPath(a:result, trigger,
-								\ opts.name_prefix . ' ' . name, contents)
-				endif
-			endfor
-		elseif opts.type == 'snippet'
-			call snipMate#SetByPath(a:result, opts.trigger,
-						\ opts.name_prefix . ' ' . opts.name, readfile(f))
-		else
-			throw "unexpected"
+	let scopes = s:AddScopeAliases(a:scopes)
+	let scopes_done = []
+	let rtp_save = &rtp
+	let &rtp = join(g:snipMate.snippet_dirs, ',')
+	let s:lookup_state = {}
+	let s:lookup_state.snips = []
+
+	while !empty(scopes)
+		let scope = remove(scopes, 0)
+		let s:lookup_state.scope = scope
+		let s:lookup_state.extends = []
+
+		exec 'runtime!' s:snippet_filenames(scope, escape(a:trigger, "*[]?{}`'$|#%"))
+
+		call add(scopes_done, scope)
+		call extend(scopes, s:lookup_state.extends)
+		call filter(scopes, 'index(scopes_done, v:val) == -1')
+	endwhile
+
+	for [trigger, desc, contents, bang, snipversion] in s:lookup_state.snips
+		if trigger =~ '\V\^' . escape(a:trigger, '\')
+			call snipMate#SetByPath(a:result, trigger, desc, contents, bang, snipversion)
 		endif
 	endfor
 
-	if !empty(extra_scopes)
-		call snipMate#DefaultPool(extra_scopes, a:trigger, a:result)
-	endif
+	let &rtp = rtp_save
 endfunction
 
 " return a dict of snippets found in runtimepath matching trigger
@@ -659,8 +454,15 @@ endf
 fun! snipMate#GetSnippetsForWordBelowCursor(word, exact)
 	" Setup lookups: '1.2.3' becomes [1.2.3] + [3, 2.3]
 	let parts = split(a:word, '\W\zs')
-	if len(parts) > 2
-		let parts = parts[-2:] " max 2 additional items, this might become a setting
+	" Since '\W\zs' results in splitting *after* a non-keyword character, the
+	" first \W stays connected to whatever's before it, so split it off
+	if len(parts) > 1 && len(parts[0]) > 1
+		let parts = [ parts[0][:-2], strpart(parts[0], len(parts[0]) - 1) ]
+					\ + parts[1:]
+	endif
+	" Only look at the last few possibilities. Too many can be slow.
+	if len(parts) > 5
+		let parts = parts[-5:]
 	endif
 	let lookups = [a:word]
 	let lookup = ''
@@ -671,11 +473,6 @@ fun! snipMate#GetSnippetsForWordBelowCursor(word, exact)
 		endif
 	endfor
 
-	" allow matching '.'
-	if a:word =~ '\.$'
-		call add(lookups, '.')
-	endif
-
 	" Remove empty lookup entries, but only if there are other nonempty lookups
 	if len(lookups) > 1
 		call filter(lookups, 'v:val != ""')
@@ -795,19 +592,12 @@ function! snipMate#TriggerSnippet(...)
 		let snippet = ''
 	else
 		let [trigger, snippetD] = list[0]
-
-		let s = s:ChooseSnippet(snippetD)
-		if type(s) == type([])
-			let snippet = join(s, "\n")
-		else
-			let snippet = s
-		end
-
+		let snippet = s:ChooseSnippet(snippetD)
 		" Before expanding snippet, create new undo point |i_CTRL-G|
 		let &undolevels = &undolevels
 		let col = col('.') - len(trigger)
 		sil exe 's/\V'.escape(trigger, '/\.').'\%#//'
-		return snipMate#expandSnip(snippet, col)
+		return snipMate#expandSnip(snippet[0], snippet[1], col)
 	endif
 
 	" should allow other plugins to register hooks instead (duplicate code)
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
new file mode 100644
index 00000000..1bce416e
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
@@ -0,0 +1,205 @@
+function! s:sfile()
+	return expand('<sfile>')
+endfunction
+
+let s:state_proto = {}
+
+function! snipmate#jumping#state()
+	return copy(s:state_proto)
+endfunction
+
+function! s:listize_mirror(mirrors)
+	return map(copy(a:mirrors), '[v:val.line, v:val.col]')
+endfunction
+
+" Removes snippet state info
+function! s:state_remove() dict
+	" Remove all autocmds in group snipmate_changes in the current buffer
+	unlet! b:snip_state
+	silent! au! snipmate_changes * <buffer>
+endfunction
+
+function! s:state_find_next_stop(backwards) dict
+	let self.stop_no += a:backwards? -1 : 1
+	while !has_key(self.stops, self.stop_no)
+		if self.stop_no == self.stop_count
+			let self.stop_no = 0
+		endif
+		if self.stop_no <= 0 && a:backwards
+			let self.stop_no = self.stop_count - 1
+		endif
+		let self.stop_no += a:backwards? -1 : 1
+	endwhile
+endfunction
+
+" Update state information to correspond to the given tab stop
+function! s:state_set_stop(backwards) dict
+	call self.find_next_stop(a:backwards)
+	let self.cur_stop    = self.stops[self.stop_no]
+	let self.stop_len = (type(self.cur_stop.placeholder) == type(0))
+				\ ? self.cur_stop.placeholder
+				\ : len(snipMate#placeholder_str(self.stop_no, self.stops))
+	let self.start_col   = self.cur_stop.col
+	let self.end_col     = self.start_col + self.stop_len
+	let self.mirrors     = get(self.cur_stop, 'mirrors', [])
+	let self.old_mirrors = deepcopy(self.mirrors)
+	call cursor(self.cur_stop.line, self.cur_stop.col)
+	let self.prev_len    = col('$')
+	let self.changed = 0
+	let ret = self.select_word()
+	if (self.stop_no == 0 || self.stop_no == self.stop_count - 1) && !a:backwards
+		call self.remove()
+	endif
+	return ret
+endfunction
+
+" Jump to the next/previous tab stop
+function! s:state_jump_stop(backwards) dict
+	" Update changes just in case
+	" This seems to be only needed because insert completion does not trigger
+	" the CursorMovedI event
+	call self.update_changes()
+
+	" Store placeholder/location changes
+	let self.cur_stop.col = self.start_col
+	if self.changed
+		call self.remove_nested()
+		unlet! self.cur_stop.placeholder " avoid type error for old parsing version
+		let self.cur_stop.placeholder = [strpart(getline('.'),
+					\ self.start_col - 1, self.end_col - self.start_col)]
+	endif
+
+	return self.set_stop(a:backwards)
+endfunction
+
+function! s:state_remove_nested(...) dict
+	let id = a:0 ? a:1 : self.stop_no
+	if type(self.stops[id].placeholder) == type([])
+		for i in self.stops[id].placeholder
+			if type(i) == type([])
+				if type(i[1]) != type({})
+					call self.remove_nested(i[0])
+					call remove(self.stops, i[0])
+				else
+					call filter(self.stops[i[0]].mirrors, 'v:val isnot i[1]')
+				endif
+			endif
+			unlet i " Avoid E706
+		endfor
+	endif
+endfunction
+
+" Select the placeholder for the current tab stop
+function! s:state_select_word() dict
+	let len = self.stop_len
+	if !len | return '' | endif
+	let l = col('.') != 1 ? 'l' : ''
+	if &sel == 'exclusive'
+		return "\<esc>".l.'v'.len."l\<c-g>"
+	endif
+	return len == 1 ? "\<esc>".l.'gh' : "\<esc>".l.'v'.(len - 1)."l\<c-g>"
+endfunction
+
+" Update the snippet as text is typed. The self.update_mirrors() function does
+" the actual work.
+" If the cursor moves outside of a placeholder, call self.remove()
+function! s:state_update_changes() dict
+	let change_len = col('$') - self.prev_len
+	let self.changed = self.changed || change_len != 0
+	let self.end_col += change_len
+	let col = col('.')
+
+	if line('.') != self.cur_stop.line || col < self.start_col || col > self.end_col
+		return self.remove()
+	endif
+
+	call self.update(self.cur_stop, change_len)
+	if !empty(self.mirrors)
+		call self.update_mirrors(change_len)
+	endif
+
+	let self.prev_len = col('$')
+endfunction
+
+" Actually update the mirrors for any changed text
+function! s:state_update_mirrors(change) dict
+	let newWordLen = self.end_col - self.start_col
+	let newWord = strpart(getline('.'), self.start_col - 1, newWordLen)
+	let changeLen = a:change
+	let curLine = line('.')
+	let curCol = col('.')
+	let oldStartSnip = self.start_col
+	let i = 0
+
+	for mirror in self.mirrors
+		for stop in values(filter(copy(self.stops), 'v:key != 0'))
+			if type(stop.placeholder) == type(0)
+				if mirror.line == stop.line && mirror.col > stop.col
+							\ && mirror.col < stop.col + stop.placeholder
+					let stop.placeholder += changeLen
+				endif
+			endif
+		endfor
+
+		call self.update(mirror, changeLen)
+		" Split the line into three parts: the mirror, what's before it, and
+		" what's after it. Then combine them using the new mirror string.
+		" Subtract one to go from column index to byte index
+		let theline = getline(mirror.line)
+		let update  = strpart(theline, 0, mirror.col - 1)
+		let update .= substitute(newWord, get(mirror, 'pat', ''), get(mirror, 'sub', ''), get(mirror, 'flags', ''))
+		let update .= strpart(theline, mirror.col + self.end_col - self.start_col - a:change - 1)
+		call setline(mirror.line, update)
+	endfor
+
+	" Reposition the cursor in case a var updates on the same line but before
+	" the current tabstop
+	if oldStartSnip != self.start_col || mode() == 'i'
+		call cursor(0, curCol + self.start_col - oldStartSnip)
+	endif
+endfunction
+
+function! s:state_find_update_objects(item) dict
+	let item = a:item
+	let item.update_objects = []
+
+	" Filter the zeroth stop because it's duplicated as the last
+	for stop in values(filter(copy(self.stops), 'v:key != 0'))
+		if stop.line == item.line && stop.col > item.col
+			call add(item.update_objects, stop)
+		endif
+
+		for mirror in get(stop, 'mirrors', [])
+			if mirror.line == item.line && mirror.col > item.col
+				call add(item.update_objects, mirror)
+			endif
+		endfor
+	endfor
+
+	return item.update_objects
+endfunction
+
+function! s:state_update(item, change_len) dict
+	let item = a:item
+	if exists('item.update_objects')
+		let to_update = item.update_objects
+	else
+		let to_update = self.find_update_objects(a:item)
+		let item.update_objects = to_update
+	endif
+
+	for obj in to_update
+		let obj.col += a:change_len
+		if obj is self.cur_stop
+			let self.start_col += a:change_len
+			let self.end_col += a:change_len
+		endif
+	endfor
+endfunction
+
+call extend(s:state_proto, snipmate#util#add_methods(s:sfile(), 'state',
+			\ [ 'remove', 'set_stop', 'jump_stop', 'remove_nested',
+			\ 'select_word', 'update_changes', 'update_mirrors',
+			\ 'find_next_stop', 'find_update_objects', 'update' ]), 'error')
+
+" vim:noet:sw=4:ts=4:ft=vim
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
new file mode 100644
index 00000000..53eb0cbd
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
@@ -0,0 +1,129 @@
+let s:sigil = nr2char(31)
+let snipmate#legacy#sigil = s:sigil
+
+" Prepare snippet to be processed by s:BuildTabStops
+function! snipmate#legacy#process_snippet(snip)
+	let snippet = a:snip
+	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
+
+	if exists('b:snipmate_visual')
+		let visual = substitute(b:snipmate_visual, "\n$", '', '')
+		unlet b:snipmate_visual
+	else
+		let visual = ''
+	endif
+	let snippet = substitute(snippet, '\n\(\t\+\).\{-\}\zs{VISUAL}',
+				\ substitute(escape(visual, '%\'), "\n", "\n\\\\1", 'g'), 'g')
+
+	" Evaluate eval (`...`) expressions.
+	" Backquotes prefixed with a backslash "\" are ignored.
+	" And backslash can be escaped by doubling it.
+	" Using a loop here instead of a regex fixes a bug with nested "\=".
+	if stridx(snippet, '`') != -1
+		let new = []
+		let snip = split(snippet, esc_bslash . '`', 1)
+		let isexp = 0
+		for i in snip
+			if isexp
+				call add(new, substitute(eval(i), "\n\\%$", '', ''))
+			else
+				call add(new, i)
+			endif
+			let isexp = !isexp
+		endfor
+		let snippet = join(new, '')
+		let snippet = substitute(snippet, "\r", "\n", 'g')
+		let snippet = substitute(snippet, '\\`', "`", 'g')
+	endif
+
+	" Place all text after a colon in a tab stop after the tab stop
+	" (e.g. "${#:foo}" becomes "${:foo}foo").
+	" This helps tell the position of the tab stops later.
+	let snippet = substitute(snippet, esc_bslash . '\$\({\d\+:\(.\{-}\)}\|{\d\+}\)', s:sigil . '\1\2', 'g')
+	let snippet = substitute(snippet, esc_bslash . '\$\(\d\+\)', s:sigil . '\1', 'g')
+	let snippet = substitute(snippet, esc_bslash . '\\\$', '$', 'g')
+	let snippet = substitute(snippet, '\\\\', "\\", 'g')
+
+	" Update the a:snip so that all the $# become the text after
+	" the colon in their associated ${#}.
+	" (e.g. "${1:foo}" turns all "$1"'s into "foo")
+	let i = 0
+	if snippet !~ s:sigil . '{0'
+		let snippet .= s:sigil . '{0}'
+	endif
+	while snippet =~ s:sigil.'{'.i
+		let s = matchstr(snippet, s:sigil . '{' . i . ':\zs.\{-}\ze}')
+		if s != ''
+			let snippet = substitute(snippet, s:sigil . i, s.'&', 'g')
+		endif
+		let i += 1
+	endw
+
+	if &et " Expand tabs to spaces if 'expandtab' is set.
+		return substitute(snippet, '\t', repeat(' ', (&sts > 0) ? &sts : &sw), 'g')
+	endif
+	return snippet
+endfunction
+
+" Builds a list of a list of each tab stop in the snippet containing:
+" 1.) The tab stop's line number.
+" 2.) The tab stop's column number
+"     (by getting the length of the string between the last "\n" and the
+"     tab stop).
+" 3.) The length of the text after the colon for the current tab stop
+"     (e.g. "${1:foo}" would return 3).
+" 4.) If the "${#:}" construct is given, another list containing all
+"     the matches of "$#", to be replaced with the placeholder. This list is
+"     composed the same way as the parent; the first item is the line number,
+"     and the second is the column.
+function! snipmate#legacy#build_stops(snip, lnum, col, indent)
+	let stops = {}
+	let i = 0
+	let withoutVars = substitute(a:snip, s:sigil . '\d\+', '', 'g')
+	while a:snip =~ s:sigil . '{' . i
+		let beforeTabStop = matchstr(withoutVars, '^.*\ze'.s:sigil .'{'.i.'\D')
+		let withoutOthers = substitute(withoutVars, ''.s:sigil .'{\('.i.'\D\)\@!\d\+.\{-}}', '', 'g')
+
+		let stops[i] = {}
+		let stops[i].line = a:lnum + s:count(beforeTabStop, "\n")
+		let stops[i].col = a:indent + len(matchstr(withoutOthers, '.*\(\n\|^\)\zs.*\ze'.s:sigil .'{'.i.'\D'))
+                let stops[i].placeholder = 0
+                let stops[i].mirrors = []
+		if stops[i].line == a:lnum
+			let stops[i].col += a:col
+		endif
+
+		" Get all $# matches in another list, if ${#:name} is given
+		if withoutVars =~ printf('%s{%d:', s:sigil, i)
+			let stops[i].placeholder = len(matchstr(withoutVars, ''.s:sigil .'{'.i.':\zs.\{-}\ze}'))
+			let withoutOthers = substitute(a:snip, ''.s:sigil .'{\d\+.\{-}}\|'.s:sigil .''.i.'\@!\d\+', '', 'g')
+
+			while match(withoutOthers, ''.s:sigil .''.i.'\(\D\|$\)') != -1
+				let stops[i].mirrors = get(stops[i], 'mirrors', [])
+				let beforeMark = matchstr(withoutOthers,
+							\ printf('^.\{-}\ze%s%s%d\(\D\|$\)',
+							\ repeat('.', stops[i].placeholder), s:sigil, i))
+				let line = a:lnum + s:count(beforeMark, "\n")
+				let col = a:indent + (line > a:lnum
+				                           \ ? len(matchstr(beforeMark, '.*\n\zs.*'))
+				                           \ : a:col + len(beforeMark))
+				call add(stops[i].mirrors, { 'line' : line, 'col' : col })
+				let withoutOthers = substitute(withoutOthers, ''.s:sigil .''.i.'\ze\(\D\|$\)', '', '')
+			endw
+		endif
+		let i += 1
+	endw
+	let stops[i] = stops[0]
+	return [stops, i + 1]
+endfunction
+
+" Counts occurences of haystack in needle
+function! s:count(haystack, needle)
+	let counter = 0
+	let index = stridx(a:haystack, a:needle)
+	while index != -1
+		let index = stridx(a:haystack, a:needle, index+1)
+		let counter += 1
+	endw
+	return counter
+endfunction
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
new file mode 100644
index 00000000..1408ddd3
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
@@ -0,0 +1,220 @@
+" Snippet definition parsing code
+
+function! s:sfile()
+    return expand('<sfile>')
+endfunction
+
+let s:parser_proto = {}
+
+function! s:new_parser(text)
+    let ret = copy(s:parser_proto)
+    let ret.input = a:text
+    let ret.len = strlen(ret.input)
+    let ret.pos = -1
+    let ret.indent = 0
+    let ret.value = []
+    let ret.vars = {}
+    call ret.advance()
+    return ret
+endfunction
+
+function! s:parser_advance(...) dict
+    let self.pos += a:0 ? a:1 : 1
+    let self.next = self.input[self.pos]
+endfunction
+
+function! s:parser_same(tok) dict
+    if self.next == a:tok
+        call self.advance()
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+function! s:parser_id() dict
+    if self.input[(self.pos):(self.pos+5)] == 'VISUAL'
+        call self.advance(6)
+        return 'VISUAL'
+    elseif self.next =~ '\d'
+        let end = matchend(self.input, '\d\+', self.pos)
+        let res = strpart(self.input, self.pos, end - self.pos)
+        call self.advance(end - self.pos)
+        return +res " force conversion to Number
+    endif
+    return -1
+endfunction
+
+function! s:parser_add_var(var) dict
+    let id = a:var[0]
+    if !has_key(self.vars, id)
+        let self.vars[id] = { 'instances' : [] }
+    endif
+    call add(self.vars[id].instances, a:var)
+endfunction
+
+function! s:parser_var() dict
+    let ret = []
+    if self.same('{')
+        let id = self.id()
+        if id >= 0
+            call add(ret, id)
+            call extend(ret, self.varend())
+        endif
+    else
+        let id = self.id()
+        if id >= 0
+            call add(ret, id)
+        endif
+    endif
+    return ret
+endfunction
+
+function! s:parser_varend() dict
+    let ret = []
+    if self.same(':')
+        call extend(ret, self.placeholder())
+    elseif self.same('/')
+        call add(ret, self.subst())
+    endif
+    call self.same('}')
+    return ret
+endfunction
+
+function! s:parser_placeholder() dict
+    return self.parse('}')
+endfunction
+
+function! s:parser_subst() dict
+    let ret = {}
+    let ret.pat = join(self.text('/', 1))
+    if self.same('/')
+        let ret.sub = join(self.text('/}'))
+    endif
+    if self.same('/')
+        let ret.flags = join(self.text('}', 1))
+    endif
+    return ret
+endfunction
+
+function! s:parser_expr() dict
+    let str = join(self.text('`', 1))
+    let ret = eval(str)
+    call self.same('`')
+    return type(ret) == type('') ? ret : string(ret)
+endfunction
+
+function! s:parser_text(...) dict
+    let res = []
+    let val = ''
+    if a:0 == 2 && a:2
+        let till = '\V' . escape(a:1, '\')
+    else
+        let till = '[`$' . (a:0 ? a:1 : '') . ']'
+    endif
+
+    while self.pos < self.len
+        if self.same('\')
+            if self.next != "\n"
+                let val .= self.next
+            endif
+            call self.advance()
+        elseif self.next =~# till
+            break
+        elseif self.next == "\n"
+            call add(res, val)
+            let val = ''
+            let self.indent = 0
+            call self.advance()
+        elseif self.next == "\t"
+            let self.indent += 1
+            let val .= s:indent(1)
+            call self.advance()
+        else
+            let val .= self.next
+            call self.advance()
+        endif
+    endwhile
+
+    call add(res, val)
+    return res
+endfunction
+
+function! s:parser_parse(...) dict
+    let ret = a:0 ? [] : self.value
+    while self.pos < self.len
+        if self.same('$')
+            let var = self.var()
+            if !empty(var)
+                if var[0] is# 'VISUAL'
+                    let add_to = s:visual_placeholder(var, self.indent)
+                    if !empty(ret) && type(ret[-1]) == type('')
+                        let ret[-1] .= add_to[0]
+                    else
+                        call add(ret, add_to[0])
+                    endif
+                    call extend(ret, add_to[1:-1])
+                elseif var[0] >= 0
+                    call add(ret, var)
+                    call self.add_var(var)
+                endif
+            endif
+        elseif self.same('`')
+            let add_to = self.expr()
+            if !empty(ret) && type(ret[-1]) == type('')
+                let ret[-1] .= add_to
+            else
+                call add(ret, add_to)
+            endif
+        else
+            let text = a:0 ? self.text(a:1) : self.text()
+            if exists('add_to')
+                let ret[-1] .= text[0]
+                call remove(text, 0)
+                unlet add_to
+            endif
+            call extend(ret, text)
+        endif
+        if a:0 && self.next == a:1
+            break
+        endif
+    endwhile
+    return ret
+endfunction
+
+call extend(s:parser_proto, snipmate#util#add_methods(s:sfile(), 'parser',
+            \ [ 'advance', 'same', 'id', 'add_var', 'var', 'varend',
+            \ 'placeholder', 'subst', 'expr', 'text', 'parse' ]), 'error')
+
+function! s:indent(count)
+    if &expandtab
+        let shift = repeat(' ', (&sts > 0) ? &sts : &sw)
+    else
+        let shift = "\t"
+    endif
+    return repeat(shift, a:count)
+endfunction
+
+function! s:visual_placeholder(var, indent)
+    let arg = get(a:var, 1, {})
+    if type(arg) == type({})
+        let pat = get(arg, 'pat', '')
+        let sub = get(arg, 'sub', '')
+        let flags = get(arg, 'flags', '')
+        let content = split(substitute(get(b:, 'snipmate_visual', ''), pat, sub, flags), "\n", 1)
+    else
+        let content = split(get(b:, 'snipmate_visual', arg), "\n", 1)
+    endif
+
+    let indent = s:indent(a:indent)
+    call map(content, '(v:key != 0) ? indent . v:val : v:val')
+
+    return content
+endfunction
+
+function! snipmate#parse#snippet(text)
+    let parser = s:new_parser(a:text)
+    call parser.parse()
+    unlet! b:snipmate_visual
+    return [parser.value, parser.vars]
+endfunction
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
new file mode 100644
index 00000000..654c0ae3
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
@@ -0,0 +1,10 @@
+" The next function was based on s:function and s:add_methods in fugitive
+" <https://github.com/tpope/vim-fugitive/blob/master/plugin/fugitive.vim>
+function! snipmate#util#add_methods(sfile, namespace, methods)
+	let dict = {}
+	for name in a:methods
+		let dict[name] = function(join([matchstr(a:sfile, '<SNR>\d\+'),
+                    \ a:namespace, name], '_'))
+	endfor
+	return dict
+endfunction
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index aa49586a..d8d310c9 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -6,7 +6,9 @@ Last Change: December 27, 2009
 1. Description                        |SnipMate-description|
 2. Usage                              |SnipMate-usage|
 3. Interface and Settings             |SnipMate-interface| |SnipMate-settings|
-4. Snippet syntax                     |SnipMate-syntax|
+4. Snippets                           |SnipMate-snippets|
+  - Snippet files                     |SnipMate-snippet-files|
+  - Snippet syntax                    |SnipMate-syntax|
 5. Snippet sources                    |SnipMate-snippet-sources|
 6. Disadvantages to TextMate          |SnipMate-disadvantages|
 7. Contact                            |SnipMate-contact|
@@ -140,6 +142,24 @@ g:snipMate.no_default_aliases
                                 the user or someone else will still be in
                                 effect.
 
+g:snipMate.snippet_version
+                                The snippet parser version to use. The
+                                possible values are:
+                                    0   Use the older parser
+                                    1   Use the newer parser
+                                If unset, SnipMate defaults to version 0. The
+                                value of this option is also used for all
+                                .snippet files.
+
+g:snipMate.override
+                                As detailed below, when two snippets with the
+                                same name and description are loaded, both are
+                                kept and differentiated by the location of the
+                                file they were in. When this option is enabled
+                                (set to 1), the snippet originating in the
+                                last loaded file is kept, similar to how Vim
+                                maps and other settings work.
+
 g:snipMate['no_match_completion_feedkeys_chars']
                                 A string inserted when no match for a trigger
                                 is found. By default a tab is inserted
@@ -152,7 +172,7 @@ Mappings~
 
 The mappings SnipMate uses can be customized with the |:map| commands. For
 example, to change the key that triggers snippets and moves to the next
-tabstop, >
+tab stop, >
 
         :imap <C-J> <Plug>snipMateNextOrTrigger
         :smap <C-J> <Plug>snipMateNextOrTrigger
@@ -186,12 +206,17 @@ Additionally, <CR> is mapped in visual mode in .snippets files for retabbing
 snippets.
 
 ==============================================================================
-SYNTAX                                      *snippet-syntax* *SnipMate-syntax*
+SNIPPETS                                                   *SnipMate-snippets*
+
+                                                      *SnipMate-snippet-files*
+Snippet Files ~
+
+Note: SnipMate does not ship with any snippets.
 
 SnipMate looks inside of each entry of 'rtp' (or |SnipMate-snippet-sources|)
 for a directory named /snippets/. Based on the 'filetype' and 'syntax'
-settings (taking into account the dotted syntax), the following files are read
-for snippets: >
+settings (dotted filetypes are parsed), the following files are read for
+snippets: >
 
     .../snippets/<scope>.snippets
     .../snippets/<scope>_<name>.snippets
@@ -199,7 +224,7 @@ for snippets: >
     .../snippets/<scope>/<trigger>.snippet
     .../snippets/<scope>/<trigger>/<description>.snippet
 
-where <scope> is an entry in 'filetype' or 'syntax', <name> is an arbitrary
+where <scope> is a scope or 'filetype' or 'syntax', <name> is an arbitrary
 name, <trigger> is the trigger for a snippet, and <description> is
 a description used for |SnipMate-multisnip|.
 
@@ -215,14 +240,25 @@ looks something like: >
         more expanded text
 
 <                                                         *SnipMate-multisnip*
-The description is optional. If it is left out and a second snippet inside the
-same .snippets file uses the same trigger, the second one will overwrite the
-first. Otherwise multisnip is used.
+The description is optional. If it is left out, the description "default" is
+used. When two snippets in the same scope have the same name and the same
+description, SnipMate will try to preserve both. The g:snipMate.override
+option disables this, in favor of keeping the last-loaded snippet. This can be
+overridden on a per-snippet basis by defining the snippet with a bang (!): >
+
+    snippet! trigger optional description
+        expanded text
+        more expanded text
 
 Note: Hard tabs in the expansion text are required. When the snippet is
 expanded in the text and 'expandtab' is set, each tab will be replaced with
 spaces based on 'softtabstop' if nonzero or 'shiftwidth' otherwise.
 
+Which version parser the snippets in a file should be used with can be
+specified with a version line, e.g.: >
+
+    version 1
+
 Comments can be made in .snippets files by starting a line with a # character.
 However these can't be used inside of snippet definitions: >
 
@@ -243,74 +279,100 @@ directive, for example: >
 
 will tell SnipMate to also read html, javascript, and css snippets.
 
+SNIPPET SYNTAX                             *snippet-syntax* *SnipMate-syntax*
+
+Anywhere in a snippet, a backslash escapes the character following it,
+regardless of whether that character is special or not. That is, '\a' will
+always result in an 'a' in the output. A single backslash can be output by
+using '\\'.
+
                                                           *SnipMate-tabstops*
 Tab stops~
 
-A tab stop, specified by ${#} where # is a number, tells SnipMate where to
-position the cursor next. The special tab stop ${0} denotes the last cursor
-position; in its absence, the cursor is placed at the end of the snippet.
+When triggering a snippet, SnipMate will by default jump to the very end of
+the snippet text. This can be changed through the use of tab stops: $1, $2,
+and so on. After expansion, SnipMate will jump to the first tab stop. From
+then on, the <Plug>snipMateNextOrTrigger map will jump to the next higher
+numbered tabs top.
 
-For example, to place the cursor first on the id of a <div> tag, allow
-the user to press <tab> to go to the middle of it, and finally end after
-</div>: >
+However, SnipMate will always stop at the zero tab stop $0. Once it jumps to
+the zero tab stop, snippet expansion is finished. If the zero tab stop is not
+present in a definition, it will be put at the end.
+
+In the case of an ambiguity, for example if a stop occurs just before a literal
+number, braces may be placed around the stop number to resolve it: ${3}79 is
+the third tab stop followed by the string "79".
+
+Note: In the version 0 snippet parser, the braces are mandatory.
+
+For example, to place the cursor first on the id of a <div> tag, then on
+its class, and finally end editing its contents: >
 
     snippet div
-        <div id="${1}">
-            ${2}
+        <div id="$1" class="$2">
+            $0
         </div>
 
-<                                   *SnipMate-placeholders* *SnipMate-mirrors*
-Placeholders and Mirrors~
+<                                                      *SnipMate-placeholders*
+In addition to being simply a location, each tab stop contains a placeholder,
+or some default text. The placeholder can be specified for every tab stop
+(including the zero tab stop) with a colon after the stop ID, as in
+${1:default text}. The braces are required only when specifying a placeholder.
+Once a tab stop with a placeholder is reached, the placeholder will be
+selected in |Select-mode|. For example, >
 
-Placeholder text can be supplied using "${#:text}", where # is the number of
-the tab stop. This text then can be copied throughout the snippet using "$#",
-given # is the same number as used before. So, to make a C for loop: >
+    snippet div
+        <div id="${1:id}" class="${2:class}">
+            $0
+        </div>
+
+Finally, placeholders can contain mirrors and evaluations (detailed below) and
+even entire other tab stops. If the placeholder is edited, then these nested
+tab stops are removed and skipped entirely. For example, >
+
+    snippet div
+        <div${1: id="${2:id}"}${3: class="${4:class}"}>
+            $0
+        </div>
+
+When expanded, this snippet selects the entirety of the id attribute. If this
+stop is edited, then the second tab stop is removed and the third tab stop
+becomes the next one. If the first tab stop is left unedited, then SnipMate
+jumps to the second tab stop. This allows the user to use a single div snippet
+that can be used for instances where the id or class attributes are desired
+and those where they are not.
+
+                                                            *SnipMate-mirrors*
+Mirrors~
+
+A mirror is simply a copy of a tab stop's text, updated as the tab stop is
+edited. These look like a tab stop without a placeholder; $1 for example. In
+the event that no placeholder is specified for a certain tab stop--say $1--the
+first instance becomes the tab stop and the rest become mirrors.
+
+Additionally substitutions similar to |:substitute| can be performed. For
+instance ${1/foo/bar/g} will replace all instances of "foo" in the $1 mirror
+with "bar". This uses |substitute()| behind the scenes.
+
+Note: Just like with tab stops, braces can be used to avoid ambiguities: ${1}2
+is a mirror of the first tab stop followed by a 2. Version 0 of the snippet
+parser offers no way to resolve such ambiguities.
+
+As an example, >
 
     snippet for
-        for (${2:i}=0; $2 < ${1:count}; $2++) {
-            ${4}
+        for ($1 = ${2:start}; ${1:i} < ${3:end}; $1${4:++}) {
+            ${0:/* code */}
         }
 
-This will cause "count" to first be selected and change if the user starts
-typing. When <tab> is pressed, the "i" in ${2}'s position will be selected;
-all $2 variables will default to "i" and automatically be updated if the user
-starts typing.
+<                                                              *SnipMate-eval*
+Expression Evaluation~
 
-NOTE: "$#" syntax is used only for mirrors, not for tab stops as in TextMate.
-
-Mirrors can also be used inside of placeholders. For instance: >
-
- snippet opt
-        <option value="${1:option}">${2:$1}</option>
-
-Will, as usual, cause "option" to first be selected and update all the $1
-variables if the user starts typing. Since one of these variables is inside of
-${2}, this text will then be used as a placeholder for the next tab stop,
-allowing the user to change it if he wishes.
-
-To copy a value throughout a snippet without supplying default text, simply
-use the "${#:}" construct without the text, e.g.: >
-
- snippet foo
-        ${1:}bar$1
-
-<                                                            *SnipMate-visual*
-There is a special placeholder called {VISUAL}. If you visually select text,
-then press <Tab> Vim switches to insert mode. The next snippet you'll expand
-will replace {VISUAL} by the text which was selected previously.
-
-                                                               *SnipMate-eval*
-Interpolated Vim Script~
-
-Snippets can also contain Vim script commands that are executed (via |eval()|)
-when the snippet is inserted. Commands are given inside backticks (`...`); for
-TextMates's functionality, use the |system()| function. E.g.: >
+Snippets can contain Vim script expressions that are evaluated as the snippet
+is expanded. Expressions are specified inside backticks: >
 
  snippet date
-        `system("date +%Y-%m-%d")`
-
-will insert the current date, assuming you are on a Unix system. Note that you
-can also (and should) use |strftime()| for this example.
+        `strftime("%Y-%m-%d")`
 
 Filename([{expr}] [, {defaultText}])                     *SnipMate-Filename()*
 
@@ -336,6 +398,26 @@ empty string if it hasn't. The second returns the filename if it's been named,
 and "name" if it hasn't. The third returns the filename followed by "_foo" if
 it has been named, and an empty string if it hasn't.
 
+                                                             *SnipMate-visual*
+The VISUAL Stop~
+
+While tab stops have numeric IDs, a special one exists with the ID 'VISUAL'.
+When a snippet is expanded, if any text had been grabbed with the
+snipMateVisual mapping (see |SnipMate-mappings|), all instances of the VISUAL
+stop will be replaced with it. Both transformations as well as a default
+placeholder can be used with the VISUAL stop.
+
+Note: Both $VISUAL and ${VISUAL} are valid in version 1 of the snippet parser.
+In version 0, only {VISUAL} is valid (without the $), and neither
+transformations nor a default placeholder can be used.
+
+Example: >
+
+    snippet div
+        <div>
+            ${0:${VISUAL:<!-- content -->}}
+        </div>
+
 ==============================================================================
 SNIPPET SOURCES                                     *SnipMate-snippet-sources*
 
@@ -398,19 +480,13 @@ See |SnipMate-syntax| for more details about all possible relative locations
 to 'rtp' can be found in.
 
 ==============================================================================
-DISADVANTAGES                                         *SnipMate-disadvantages*
+KNOWN ISSUES                                         *SnipMate-known-issues*
 
 SnipMate.vim currently has the following disadvantages to TextMate's snippets:
-    - Nested placeholders are not currently possible. E.g.: >
-        '<div${1: id="${2:some_id}}">${3}</div>'
-<     In TextMate this would first highlight ' id="some_id"', and if
-      you hit delete it would automatically skip ${2} and go to ${3}
-      on the next <tab>, but if you didn't delete it it would highlight
-      "some_id" first. You cannot do this in SnipMate.vim.
-    - Regex cannot be performed on variables, such as "${1/.*/\U&}"
     - Placeholders cannot span multiple lines.
     - Activating snippets in different scopes of the same file is
       not possible.
+    - Vim formatting with fo=t or fo=a can mess up SnipMate.
 
 Perhaps some of these features will be added in a later release.
 
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 72f7ebc1..5c1b48fc 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -91,9 +91,11 @@ let g:snipMate['get_snippets'] = get(g:snipMate, 'get_snippets', funcref#Functio
 
 " List of paths where snippets/ dirs are located, or a function returning such
 " a list
-let g:snipMate['snippet_dirs'] = get(g:snipMate, 'snippet_dirs', funcref#Function('return split(&runtimepath,",")'))
-if type(g:snipMate['snippet_dirs']) == type([])
-	call map(g:snipMate['snippet_dirs'], 'expand(v:val)')
+let g:snipMate['snippet_dirs'] = get(g:snipMate, 'snippet_dirs', split(&rtp, ','))
+if type(g:snipMate['snippet_dirs']) != type([])
+	echohl WarningMsg
+	echom "g:snipMate['snippet_dirs'] must be a List"
+	echohl None
 endif
 
 " _ is default scope added always
@@ -107,7 +109,7 @@ function! s:grab_visual()
 	let a_save = @a
 	try
 		normal! gv"ay
-		let b:snipmate_content_visual = @a
+		let b:snipmate_visual = @a
 	finally
 		let @a = a_save
 	endtry
diff --git a/sources_non_forked/vim-snipmate/t/jumping.vim b/sources_non_forked/vim-snipmate/t/jumping.vim
new file mode 100644
index 00000000..7bc22b3b
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/t/jumping.vim
@@ -0,0 +1,175 @@
+function! Setup(snip)
+    return snipMate#expandSnip(join(a:snip, "\n"), 1)
+endfunction
+
+function! s:to_be_file(expected)
+    return a:expected == getline(1,'$')
+endfunction
+
+function! s:to_be_in(item, list)
+    return !empty(filter(copy(a:list), 'v:val is a:item'))
+endfunction
+
+call vspec#customize_matcher('to_be_file', function('s:to_be_file'))
+call vspec#customize_matcher('to_be_in', function('s:to_be_in'))
+
+describe 'snippet state'
+
+    before
+        enew
+        let b:snip_state = snipmate#jumping#state()
+    end
+
+    after
+        bwipeout!
+    end
+
+    describe '.remove()'
+
+        it 'removes the state object'
+            Expect exists('b:snip_state') to_be_true
+            call b:snip_state.remove()
+            Expect exists('b:snip_state') to_be_false
+        end
+
+        it 'removes snippet related autocommands'
+            function! ReadAutocmds()
+                redir => autocmds
+                0verbose au snipmate_changes * <buffer>
+                redir END
+                return split(autocmds, "\n")
+            endfunction
+            aug snipmate_changes
+                au CursorMoved,CursorMovedI <buffer> echo 'event'
+            aug END
+
+            Expect len(ReadAutocmds()) > 1
+            call b:snip_state.remove()
+            Expect len(ReadAutocmds()) == 1
+        end
+
+    end
+
+    describe '.find_next_stop()'
+
+        it 'increments/decrements the stop_no'
+            let b:snip_state.stops = { 1 : {}, 2 : {} }
+            let b:snip_state.stop_no = 1
+            let b:snip_state.stop_count = 4
+
+            call b:snip_state.find_next_stop(0)
+            Expect b:snip_state.stop_no == 2
+            call b:snip_state.find_next_stop(1)
+            Expect b:snip_state.stop_no == 1
+        end
+
+        it 'continues iterating if the next/previous stop does not exist'
+            let b:snip_state.stops = { 3 : {} }
+            let b:snip_state.stop_count = 6
+            let b:snip_state.stop_no = 1
+            call b:snip_state.find_next_stop(0)
+            Expect b:snip_state.stop_no == 3
+            let b:snip_state.stop_no = 5
+            call b:snip_state.find_next_stop(1)
+            Expect b:snip_state.stop_no == 3
+        end
+
+        it 'does something at the ends'
+            "
+        end
+
+    end
+
+    describe '.remove_nested()'
+
+        it 'removes nested mirrors and only nested mirrors'
+            let mirror = { 'line' : 0 }
+            let b:snip_state.stops = { 1 : { 'placeholder' : [[2, mirror]] },
+                                    \  2 : { 'mirrors' : [mirror, {}] } }
+
+            call b:snip_state.remove_nested(1)
+            Expect len(b:snip_state.stops[2].mirrors) == 1
+            Expect b:snip_state.stops[2].mirrors[0] isnot mirror
+        end
+
+        it 'removes nested stops'
+            let stop = [2, 'abc']
+            let b:snip_state.stops = { 1 : { 'placeholder' : [stop] },
+                                    \  2 : { 'placeholder' : stop[1:1] } }
+
+            call b:snip_state.remove_nested(1)
+            Expect len(b:snip_state.stops) == 1
+            Expect keys(b:snip_state.stops) == ['1']
+        end
+
+    end
+
+    describe '.find_update_objects()'
+
+        it 'finds mirrors/stops on the same line and after cur_stop'
+            let b:snip_state.stops = {
+                        \ 1 : { 'line' : 1, 'col' : 5,
+                            \ 'placeholder' : ['x'] },
+                        \ 2 : { 'line' : 1, 'col' : 7,
+                            \ 'mirrors' : [{ 'line' : 1, 'col' : 7  }] }
+                        \ }
+            let stop = b:snip_state.stops[1]
+
+            call b:snip_state.find_update_objects(stop)
+            for obj in stop.update_objects
+                Expect obj to_be_in [ b:snip_state.stops[2],
+                            \ b:snip_state.stops[2].mirrors[0] ]
+            endfor
+        end
+
+        it 'finds mirrors/stops on the same line and after cur_stop mirrors'
+            let b:snip_state.stops = {
+                        \ 1 : { 'line' : 1, 'col' : 5,
+                            \ 'mirrors' : [{ 'line' : 2, 'col' : 5 }],
+                            \ 'placeholder' : ['x'] },
+                        \ 2 : { 'line' : 2, 'col' : 7,
+                            \ 'mirrors' : [{ 'line' : 2, 'col' : 7  }] }
+                        \ }
+            let stop = b:snip_state.stops[1]
+
+            call b:snip_state.find_update_objects(stop)
+            for obj in stop.update_objects
+                Expect obj to_be_in [ b:snip_state.stops[2],
+                            \ b:snip_state.stops[2].mirrors[0] ]
+            endfor
+        end
+
+        it 'ignores mirrors/stops on other lines'
+            let b:snip_state.stops = {
+                        \ 1 : { 'line' : 2, 'col' : 5,
+                            \ 'placeholder' : ['x'] },
+                        \ 2 : { 'line' : 1, 'col' : 7,
+                            \ 'mirrors' : [{ 'line' : 1, 'col' : 7  }] },
+                        \ 3 : { 'line' : 3, 'col' : 7,
+                            \ 'mirrors' : [{ 'line' : 3, 'col' : 7  }] }
+                        \ }
+            let stop = b:snip_state.stops[1]
+
+            call b:snip_state.find_update_objects(stop)
+            Expect empty(stop.update_objects) to_be_true
+        end
+
+        it 'ignores mirrors/stops on the same line but before cur_stop/mirrors'
+            let b:snip_state.stops = {
+                        \ 1 : { 'line' : 1, 'col' : 5,
+                            \ 'mirrors' : [{ 'line' : 2, 'col' : 5 }],
+                            \ 'placeholder' : ['x'] },
+                        \ 2 : { 'line' : 1, 'col' : 1,
+                            \ 'mirrors' : [{ 'line' : 2, 'col' : 1  }] },
+                        \ 3 : { 'line' : 2, 'col' : 3,
+                            \ 'mirrors' : [{ 'line' : 1, 'col' : 3  }] },
+                        \ }
+            let stop = b:snip_state.stops[1]
+
+            call b:snip_state.find_update_objects(stop)
+            Expect empty(stop.update_objects) to_be_true
+        end
+
+    end
+
+end
diff --git a/sources_non_forked/vim-snipmate/t/parser.vim b/sources_non_forked/vim-snipmate/t/parser.vim
new file mode 100644
index 00000000..053bad8a
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/t/parser.vim
@@ -0,0 +1,116 @@
+describe 'snippet parser'
+
+    before
+        function! Parse(snippet, ...)
+            let [snip, stops] = snipmate#parse#snippet(a:snippet)
+            return a:0 ? [snip, stops] : snip
+        endfunction
+        let b:snipmate_visual = 'testvisual'
+    end
+
+    it 'parses numeric $id and ${id} vars as [id] lists'
+        let expect = [[1234567890]]
+        Expect Parse('$1234567890') == expect
+        Expect Parse('${1234567890}') == expect
+    end
+
+    it 'disregards $ or ${ followed by a non-id'
+        Expect Parse('$x1') == ['x1']
+        Expect Parse('${x}1') == ['x}1']
+        Expect Parse('$VISUA1') == ['VISUA1']
+        Expect Parse('${VISUA}1') == ['VISUA}1']
+    end
+
+    it 'gathers references to each instance of each stop id'
+        let [snip, b:stops] = Parse('x$1x${2:x$1x}x$1x${1/a/b}x$VISUALx', 1)
+        function! InstanceFound(list)
+            return !empty(filter(copy(b:stops[a:list[0]].instances),
+                        \ 'v:val is a:list'))
+        endfunction
+        function! CheckList(list)
+            for item in a:list
+                if type(item) == type([])
+                    Expect InstanceFound(item) to_be_true
+                    call CheckList(item)
+                endif
+                unlet item " E732
+            endfor
+        endfunction
+        call CheckList(snip)
+    end
+
+    it 'parses mirror substitutions ${n/pat/sub} as [n, {...}]'
+        let expect = [[1, { 'pat' : 'abc', 'sub' : 'def' }]]
+        Expect Parse('${1/abc/def}') == expect
+        let expect[0][1].flags = ''
+        Expect Parse('${1/abc/def/}') == expect
+        let expect[0][1].flags = 'g'
+        Expect Parse('${1/abc/def/g}') == expect
+    end
+
+    it 'parses vars with placeholders as [id, placeholder] lists'
+        Expect Parse('${1:abc}') == [[1, 'abc']]
+    end
+
+    it 'evaluates backtick expressions'
+        Expect Parse('`fnamemodify("x.y", ":r")`') == ['x']
+    end
+
+    it 'parses placeholders for vars and other specials'
+        let text = 'a `fnamemodify("x.y", ":r")` ${2:(${3/a/b})}'
+        let expect = ['a x ', [2, '(', [3, { 'pat' : 'a', 'sub' : 'b' }], ')']]
+        Expect Parse(text) == expect
+        Expect Parse(printf('${1:%s}', text)) == [[1] + expect]
+    end
+
+    it 'converts tabs according to &et, &sts, &sw'
+        " &noet -> leave tabs alone
+        setl noet
+        Expect Parse("abc\tdef\n\t\tghi") == ["abc\tdef", "\t\tghi"]
+
+        " &et -> &sts or &sw
+        setl et sts=2 sw=3
+        Expect Parse("abc\tdef\n\t\tghi") == ["abc  def", "    ghi"]
+
+        setl et sts=0 sw=3
+        Expect Parse("abc\tdef\n\t\tghi") == ["abc   def", "      ghi"]
+
+        setl et sts=-1 sw=3
+        Expect Parse("abc\tdef\n\t\tghi") == ["abc   def", "      ghi"]
+    end
+
+    it 'parses backslashes as escaping the next character or joining lines'
+        Expect Parse('x\x') == ['xx']
+        Expect Parse('x\\x') == ['x\x']
+        Expect Parse("x\\\nx") == ['xx']
+        Expect Parse('x\$1') == ['x$1']
+        Expect Parse('${1:\}}') == [[1, '}']]
+        Expect Parse('${1/\//\}}') == [[1, { 'pat' : '/', 'sub' : '}' }]]
+        Expect Parse('`fnamemodify("\`.x", ":r")`') == ['`']
+        Expect Parse('\`x\`') == ['`x`']
+    end
+
+    it 'splits text at newlines'
+        Expect Parse("x\nx") == ['x', 'x']
+    end
+
+    it 'joins evaluated expressions to surrounding text on the same line'
+        let g:foo = 'bar'
+        Expect Parse("x`g:foo`x") == ['xbarx']
+        Expect Parse("x`g:foo`\nx") == ['xbar', 'x']
+        Expect Parse("x\n`g:foo`x") == ['x', 'barx']
+    end
+
+    it 'adds empty strings before/after vars if at the start/end of a line'
+        Expect Parse("x$1\nx") == ['x', [1], '', 'x']
+        Expect Parse("x\n$1x") == ['x', '', [1], 'x']
+    end
+
+    it 'expands $VISUAL placeholders with any indents'
+        Expect Parse("x$VISUALx") == ['xtestvisualx']
+        let b:snipmate_visual = "  foo\nbar\n  baz"
+        setl noet
+        Expect Parse("\tx\n\t$VISUAL\nx") == ["\tx", "\t  foo", "\tbar", "\t  baz", "x"]
+    end
+
+end
diff --git a/sources_non_forked/vim-snipmate/t/tests.sh b/sources_non_forked/vim-snipmate/t/tests.sh
new file mode 100644
index 00000000..c1da250f
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/t/tests.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+tmp="$(mktemp || tmpfile)"
+vim -Es $tmp <<- EOF
+    source ~/.vimrc
+    %delete _
+    call append(0, split(&rtp, ','))
+    delete _
+    wq
+EOF
+
+rtp="$(grep -iE 'vspec|snipmate|tlib|mw-utils' < $tmp | grep -v after)"
+vspec="$(grep -iE 'vspec' < $tmp | grep -v after)"
+test_files="${*:-parser jumping}"
+
+for test in $test_files; do
+    $vspec/bin/vspec $rtp ${test%%.vim}.vim
+done
+
+rm $tmp
diff --git a/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets b/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
index e27fbefa..f317685c 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/erlang.snippets
@@ -5,12 +5,12 @@
 priority -50
 
 snippet pat "Case:Receive:Try Clause"
-${1:pattern}${2: when ${3:guard}} ->;
+${1:pattern}${2: when ${3:guard}} ->
 	${4:body}
 endsnippet
 
-snippet beh "Behaviour Directive"
--behaviour (${1:behaviour}).
+snippet beh "Behaviour Directive" b
+-behaviour(${1:behaviour}).
 endsnippet
 
 snippet case "Case Expression"
@@ -20,12 +20,12 @@ case ${1:expression} of
 end
 endsnippet
 
-snippet def "Define Directive"
--define (${1:macro}${2: (${3:param})}, ${4:body}).
+snippet def "Define Directive" b
+-define(${1:macro}${2: (${3:param})}, ${4:body}).
 endsnippet
 
-snippet exp "Export Directive"
--export ([${1:function}/${2:arity}]).
+snippet exp "Export Directive" b
+-export([${1:function}/${2:arity}]).
 endsnippet
 
 snippet fun "Fun Expression"
@@ -36,7 +36,7 @@ end
 endsnippet
 
 snippet fu "Function"
-${1:function} (${2:param})${3: when ${4:guard}} ->
+${1:function}(${2:param})${3: when ${4:guard}} ->
 	${5:body}
 endsnippet
 
@@ -47,24 +47,24 @@ if
 end
 endsnippet
 
-snippet ifdef "Ifdef Directive"
--ifdef (${1:macro}).
+snippet ifdef "Ifdef Directive" b
+-ifdef(${1:macro}).
 endsnippet
 
-snippet ifndef "Ifndef Directive"
--ifndef (${1:macro}).
+snippet ifndef "Ifndef Directive" b
+-ifndef(${1:macro}).
 endsnippet
 
-snippet imp "Import Directive"
--import (${1:module}, [${2:function}/${3:arity}]).
+snippet imp "Import Directive" b
+-import(${1:module}, [${2:function}/${3:arity}]).
 endsnippet
 
-snippet inc "Include Directive"
--include ("${1:file}").
+snippet inc "Include Directive" b
+-include("${1:file}").
 endsnippet
 
-snippet mod "Module Directive"
--module (${1:`!p snip.rv = snip.basename or "module"`}).
+snippet mod "Module Directive" b
+-module(${1:`!p snip.rv = snip.basename or "module"`}).
 endsnippet
 
 snippet rcv "Receive Expression"
@@ -77,8 +77,8 @@ ${6:after
 end
 endsnippet
 
-snippet rec "Record Directive"
--record (${1:record}, {${2:field}${3: = ${4:value}}}).
+snippet rec "Record Directive" b
+-record(${1:record}, {${2:field}${3: = ${4:value}}}).
 endsnippet
 
 snippet try "Try Expression"
@@ -93,8 +93,16 @@ ${13:after
 end
 endsnippet
 
-snippet undef "Undef Directive"
--undef (${1:macro}).
+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/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
index 48ff4b72..6867e866 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
@@ -17,7 +17,7 @@ snippet label_and_input
 endsnippet
 
 snippet input
-<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}}/>${7}
+<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}"}/>${7}
 endsnippet
 
 snippet submit
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index def2116b..366346a6 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -102,44 +102,54 @@ var_export(${1});${2}
 endsnippet
 
 snippet getter "PHP Class Getter" b
-/*
+/**
  * Getter for $1
+ *
+ * ${2:return string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->$1;$2
+    return $this->$1;$3
 }
-$4
+$0
 endsnippet
 
 snippet setter "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/}($$1)
+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;$3
-	${4:return $this;}
+    $this->$1 = $$1;$5
+    ${6:return $this;}
 }
 $0
 endsnippet
 
 snippet gs "PHP Class Getter Setter" b
-/*
+/**
  * Getter for $1
+ *
+ * return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->$1;$2
+    return $this->$1;$3
 }
 
-/*
+/**
  * Setter for $1
+ *
+ * @param $2 $$1
+ * @return ${4:`!p snip.rv=snip.basename`}
  */
-public function set${1/\w+\s*/\u$0/}($$1)
+public function set${1/\w+\s*/\u$0/}(${5:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-	$this->$1 = $$1;$3
-	${4:return $this;}
+    $this->$1 = $$1;$6
+    ${7:return $this;}
 }
 $0
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
index 9f817a8d..30f3f369 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
@@ -7,33 +7,30 @@ snippet l_rsc "Laravel resource controller" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-class $1 {
-    public function index() {
-        ${3}
-    }
-    
-    public function create() {
+class $1 extends ${3: BaseController} {
+    function __construct() {
         ${4}
     }
     
+    public function index() {
+    }
+    
+    public function create() {
+    }
+    
     public function store($id) {
-        ${5}
     }
     
     public function show($id) {
-        ${6}
     }
     
     public function edit($id) {
-        ${7}
     }
     
     public function update($id) {
-        ${8}
     }
     
     public function destroy($id) {
-        ${9}
     }
 }
 endsnippet
@@ -117,7 +114,7 @@ namespace $1;
 class $2 extends \Eloquent {
     protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
 
-    public $timestamps = '${5:false}';
+    public $timestamps = ${5:false};
 
     protected $hidden  = array(${6});
 
@@ -196,7 +193,7 @@ snippet l_r "Laravel Repository" b
 /*!
  * \namespace   ${1:Repositories\\${2}}
  * \class       ${3:`!v expand('%:t:r')`}
- * \implements  ${4:BaseRepositoryInterface}
+ * \implements  ${4:$3RepositoryInterface}
  *
  * \author      ${5:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
@@ -204,8 +201,8 @@ snippet l_r "Laravel Repository" b
 
 namespace $1;
 
-class $3 extends \\$1 implements $4 {
-    ${6}
+class $3 extends \\${6} implements $4 {
+    ${7}
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index b556554c..ff52c0a5 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -29,7 +29,6 @@ snippet GPL2
 
 	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.}
@@ -47,7 +46,6 @@ snippet LGPL2
 
 	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.}
@@ -65,7 +63,6 @@ snippet GPL3
 
 	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.}
@@ -83,7 +80,6 @@ snippet LGPL3
 
 	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.}
@@ -101,7 +97,6 @@ snippet AGPL3
 
 	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
@@ -140,7 +135,6 @@ snippet BSD2
 	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 expressedor implied, of $2.
-
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
@@ -168,7 +162,6 @@ snippet BSD3
 	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}
@@ -199,7 +192,6 @@ snippet BSD4
 	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}
@@ -222,7 +214,6 @@ snippet MIT
 	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}
@@ -239,7 +230,6 @@ snippet APACHE
 	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}
@@ -249,7 +239,6 @@ snippet BEERWARE
 	$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
@@ -271,5 +260,4 @@ 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}
diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/sources_non_forked/vim-snippets/snippets/markdown.snippets
index d3667d05..d258aa8b 100644
--- a/sources_non_forked/vim-snippets/snippets/markdown.snippets
+++ b/sources_non_forked/vim-snippets/snippets/markdown.snippets
@@ -75,6 +75,8 @@ snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
 	${0}
+snippet -
+	-   ${0}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index a4fdf19f..8b0a4109 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -90,7 +90,7 @@ snippet class
 		${0}
 	}
 snippet node
-	node '${1:`vim_snippets#Filename('', 'fqdn')`}' {
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
 		${0}
 	}
 snippet case
@@ -107,13 +107,21 @@ 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}
+		"${1}"	=> ${0}
 	  }
 #
 # blocks etc and general syntax sugar
@@ -122,98 +130,98 @@ snippet [
 snippet >
 	${1}	=> ${0}
 snippet p:
-	'puppet://puppet/${1:module name}/${0:file name}'
+	"puppet://puppet/${1:module name}/${0:file name}"
 #
 # Functions
 snippet alert
-	alert('${1:message}')
+	alert("${1:message}")
 snippet crit
-	crit('${1:message}')
+	crit("${1:message}")
 snippet debug
-	debug('${1:message}')
+	debug("${1:message}")
 snippet defined
-	defined(${1:Resource}['${2:name}'])
+	defined(${1:Resource}["${2:name}"])
 snippet emerg
-	emerg('${1:message}')
+	emerg("${1:message}")
 snippet extlookup Simple extlookup
-	extlookup('${1:variable}')
+	extlookup("${1:variable}")
 snippet extlookup Extlookup with defaults
-	extlookup('${1:variable}', '${2:default}')
+	extlookup("${1:variable}", "${2:default}")
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup('${1:variable}', '${2:default}', '${3:data source}')
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
 snippet fail
-	fail('${1:message}')
+	fail("${1:message}")
 snippet info
-	info('${1:message}')
+	info("${1:message}")
 snippet inline_template
-	inline_template('<%= ${1} %>')
+	inline_template("<%= ${1} %>")
 snippet notice
-	notice('${1:message}')
+	notice("${1:message}")
 snippet realize
 	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, '${3:replacement}')
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
 snippet inc
 	include ${1:classname}
 snippet split
-	split(${1:hay stack}, '${2:patten}')
+	split(${1:hay stack}, "${2:patten}")
 snippet versioncmp
-	versioncmp('${1:version}', '${2:version}')
+	versioncmp("${1:version}", "${2:version}")
 snippet warning
-	warning('${1:message}')
+	warning("${1:message}")
 #
 # Types
 snippet cron
-	cron { '${1:name}':
-		command => '${2}',
-		user    => '${3:root}',
+	cron { "${1:name}":
+		command => "${2}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet exec
-	exec { '${1:name}':
-		command => '${2:$1}',
-		user    => '${3:root}',
+	exec { "${1:name}":
+		command => "${2:$1}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet user
-	user { '${1:user}':
+	user { "${1:user}":
 		ensure      => present,
-		comment     => '${2:$1}',
+		comment     => "${2:$1}",
 		managehome  => true,
-		home        => '${0:/home/$1}',
+		home        => "${0:/home/$1}",
 	}
 
 snippet group
-	group { '${1:group}':
+	group { "${1:group}":
 		ensure => ${0:present},
 	}
 
 snippet host
-	host { '${1:hostname}':
+	host { "${1:hostname}":
 		ip => ${0:127.0.0.1},
 	}
 
 snippet mailalias
-	mailalias { '${1:localpart}':
-		recipient => '${0:recipient}',
+	mailalias { "${1:localpart}":
+		recipient => "${0:recipient}",
 	}
 
 snippet mount
-	mount { '${1:destination path}':
+	mount { "${1:destination path}":
 		ensure	=> ${2:mounted},
-		device	=> '${0:device name or path}',
+		device	=> "${0:device name or path}",
 	}
 
 snippet package
-	package { '${1:package name}':
+	package { "${1:package name}":
 		ensure	=> ${0:present},
 	}
 
 snippet yumrepo
-	yumrepo { '${1:repo name}':
-		Descr   => '${2:$1}',
+	yumrepo { "${1:repo name}":
+		Descr   => "${2:$1}",
 		enabled => ${0:1},
 	}
 
@@ -223,22 +231,39 @@ snippet define
 	}
 
 snippet service
-	service { '${1: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}'], ],
+		require   => [ Package["${2:package}"], File["${3:file}"], ],
+		subscribe => [ File["${4:configfile1}"], File["${5:configfile2}"], Package["${6:package}"], ],
 	}
 
 snippet file
-	file { '${1:filename}' :
+	file { "${1:filename}" :
 		ensure  => ${2:present},
-		owner   => '${3:root}',
-		group   => '${4:root}',
-		mode    => '${5:0644}',
-		source  => 'puppet:///modules/${6:module}/${7:source}',
-		content => template('/etc/puppet/templates/${8:template}'),
-		alias   => '${9:alias}',
-		require => [ Package['${10:package}'], File['${11:file}'], ],
+		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/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index 77d74e4d..3fa72b07 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -135,6 +135,9 @@ snippet iem
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# remote python debugger (rpdb)
+snippet rpdb
+	import rpdb; rpdb.set_trace()
 # python_prompt_toolkit
 snippet ppt
 	from prompt_toolkit.contrib.repl import embed
diff --git a/sources_non_forked/vim-surround/doc/surround.txt b/sources_non_forked/vim-surround/doc/surround.txt
index 30a642ae..41943e7c 100644
--- a/sources_non_forked/vim-surround/doc/surround.txt
+++ b/sources_non_forked/vim-surround/doc/surround.txt
@@ -39,8 +39,9 @@ easiest to understand with some examples:
   <div>Yo!*</div>           dst         Yo!
 
 Change surroundings is *cs* .  It takes two arguments, a target like with
-|ds|, and a replacement.  Details about the second argument can be found
-below in |surround-replacements|.  Once again, examples are in order.
+|ds|, and a replacement.  *cS* changes surroundings, placing the surrounded
+text on its own line(s) like |yS|.  Details about the second argument can be
+found below in |surround-replacements|.  Once again, examples are in order.
 
   Old text                  Command     New text ~
   "Hello *world!"           cs"'        'Hello world!'
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index 148a5c9a..e283ed22 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -441,7 +441,8 @@ function! s:dosurround(...) " {{{1
   endif
   call setreg('"',keeper,regtype)
   if newchar != ""
-    call s:wrapreg('"',newchar)
+    let special = a:0 > 2 ? a:3 : 0
+    call s:wrapreg('"',newchar, special)
   endif
   silent exe 'norm! ""'.pcmd.'`['
   if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
@@ -456,11 +457,11 @@ function! s:dosurround(...) " {{{1
   if newchar == ""
     silent! call repeat#set("\<Plug>Dsurround".char,scount)
   else
-    silent! call repeat#set("\<Plug>Csurround".char.newchar.s:input,scount)
+    silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:inpur,scount)
   endif
 endfunction " }}}1
 
-function! s:changesurround() " {{{1
+function! s:changesurround(...) " {{{1
   let a = s:inputtarget()
   if a == ""
     return s:beep()
@@ -469,7 +470,7 @@ function! s:changesurround() " {{{1
   if b == ""
     return s:beep()
   endif
-  call s:dosurround(a,b)
+  call s:dosurround(a,b,a:0 && a:1)
 endfunction " }}}1
 
 function! s:opfunc(type,...) " {{{1
@@ -558,6 +559,7 @@ endfunction " }}}1
 nnoremap <silent> <Plug>SurroundRepeat .
 nnoremap <silent> <Plug>Dsurround  :<C-U>call <SID>dosurround(<SID>inputtarget())<CR>
 nnoremap <silent> <Plug>Csurround  :<C-U>call <SID>changesurround()<CR>
+nnoremap <silent> <Plug>CSurround  :<C-U>call <SID>changesurround(1)<CR>
 nnoremap <silent> <Plug>Yssurround :<C-U>call <SID>opfunc(v:count1)<CR>
 nnoremap <silent> <Plug>YSsurround :<C-U>call <SID>opfunc2(v:count1)<CR>
 " <C-U> discards the numerical argument but there's not much we can do with it
@@ -571,6 +573,7 @@ inoremap <silent> <Plug>ISurround  <C-R>=<SID>insert(1)<CR>
 if !exists("g:surround_no_mappings") || ! g:surround_no_mappings
   nmap ds  <Plug>Dsurround
   nmap cs  <Plug>Csurround
+  nmap cS  <Plug>CSurround
   nmap ys  <Plug>Ysurround
   nmap yS  <Plug>YSurround
   nmap yss <Plug>Yssurround

From 00f043f0de96e0b1447892c0bff63eed317a67c8 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Fri, 13 Feb 2015 00:19:27 +0000
Subject: [PATCH 58/61] Updated vim plugins. Nerd tree is on the right by
 default

---
 .../syntastic/plugin/syntastic.vim            |   2 +-
 .../syntax_checkers/python/prospector.vim     |   1 -
 .../syntastic/syntax_checkers/xml/xmllint.vim |   4 +-
 sources_non_forked/vim-airline/README.md      |   1 +
 .../autoload/airline/extensions/tabline.vim   |  23 ++-
 .../vim-fugitive/plugin/fugitive.vim          |   6 +-
 sources_non_forked/vim-go/indent/go.vim       |   9 +-
 .../vim-multiple-cursors/README.md            |   1 +
 .../autoload/multiple_cursors.vim             |  51 +++++
 .../spec/multiple_cursors_spec.rb             | 191 ++++++++++++++++++
 .../vim-multiple-cursors/spec/spec_helper.rb  |   2 +-
 .../vim-snipmate/after/plugin/snipMate.vim    |   2 +-
 .../vim-snipmate/autoload/snipMate.vim        |  61 +++---
 .../autoload/snipMate_python_demo.vim         |   6 +-
 .../autoload/snipmate/jumping.vim             |  26 +--
 .../vim-snipmate/autoload/snipmate/legacy.vim |   6 +-
 .../vim-snipmate/autoload/snipmate/parse.vim  |  32 +--
 .../vim-snipmate/autoload/snipmate/util.vim   |   2 +-
 .../ftplugin/html_snip_helper.vim             |   2 +-
 .../vim-snipmate/plugin/snipMate.vim          |   4 +-
 sources_non_forked/vim-snipmate/t/jumping.vim |   6 +-
 .../vim-snippets/UltiSnips/all.snippets       |   4 +-
 .../vim-snippets/UltiSnips/php.snippets       |  48 +++--
 .../vim-surround/plugin/surround.vim          |   4 +-
 vimrcs/plugins_config.vim                     |   1 +
 25 files changed, 386 insertions(+), 109 deletions(-)

diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index d72bf1ad..c6ab15d8 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-14'
+let g:_SYNTASTIC_VERSION = '3.6.0-16'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
index 4f451012..871a81b4 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
@@ -31,7 +31,6 @@ endfunction
 
 function! SyntaxCheckers_python_prospector_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args': '--external-config merge',
         \ 'args_after': '--messages-only --absolute-paths --die-on-tool-error --zero-exit --output-format json' })
 
     let errorformat = '%f:%l:%c: %m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
index 108abed7..9a7027f0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
@@ -23,7 +23,9 @@ set cpo&vim
 " and http://www.xmlsoft.org/catalog.html for more information.
 
 function! SyntaxCheckers_xml_xmllint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--xinclude --noout --postvalid' })
+    let makeprg = self.makeprgBuild({
+        \ 'args': '--xinclude --postvalid',
+        \ 'args_after': '--noout' })
 
     let errorformat=
         \ '%E%f:%l: error : %m,' .
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index eaf1a47e..fafd4116 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -118,6 +118,7 @@ This plugin follows the standard runtime path structure, and as such it can be i
 
 *  [Pathogen][11]
   *  `git clone https://github.com/bling/vim-airline ~/.vim/bundle/vim-airline`
+  *  Remember to run `:Helptags` to generate help tags
 *  [NeoBundle][12]
   *  `NeoBundle 'bling/vim-airline'`
 *  [Vundle][13]
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 4681a2a4..978eacdc 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -59,19 +59,22 @@ function! s:toggle_on()
   let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
 
   set tabline=%!airline#extensions#tabline#get()
-  if s:buf_min_count <= 0 && s:tab_min_count <= 1
-    set showtabline=2
-  else
-    augroup airline_tabline
-      autocmd!
+  augroup airline_tabline
+    autocmd!
+    " Invalidate cache.
+    autocmd BufAdd,BufUnload * unlet! s:current_buffer_list
+
+    if s:buf_min_count <= 0 && s:tab_min_count <= 1
+      set showtabline=2
+    else
       if s:show_buffers == 1
         autocmd BufEnter * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()))
         autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()) - 1)
       else
         autocmd TabEnter * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
       endif
-    augroup END
-  endif
+    endif
+  augroup END
 endfunction
 
 function! airline#extensions#tabline#load_theme(palette)
@@ -130,10 +133,14 @@ function! airline#extensions#tabline#title(n)
 endfunction
 
 function! airline#extensions#tabline#get_buffer_name(nr)
-  return airline#extensions#tabline#{s:formatter}#format(a:nr, get(s:, 'current_buffer_list', s:get_buffer_list()))
+  return airline#extensions#tabline#{s:formatter}#format(a:nr, s:get_buffer_list())
 endfunction
 
 function! s:get_buffer_list()
+  if exists('s:current_buffer_list')
+    return s:current_buffer_list
+  endif
+
   let buffers = []
   let cur = bufnr('%')
   for nr in range(1, bufnr('$'))
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 65e6665e..b61e49c0 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -2225,7 +2225,11 @@ function! s:Browse(bang,line1,count,...) abort
     elseif exists(':Browse') == 2
       return 'echomsg '.string(url).'|Browse '.url
     else
-      return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)'
+      if has("patch-7.4.567")
+        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'
diff --git a/sources_non_forked/vim-go/indent/go.vim b/sources_non_forked/vim-go/indent/go.vim
index faf4d79e..660aa506 100644
--- a/sources_non_forked/vim-go/indent/go.vim
+++ b/sources_non_forked/vim-go/indent/go.vim
@@ -37,20 +37,21 @@ function! GoIndent(lnum)
   let previ = indent(prevlnum)
 
   let ind = previ
+  let s:shiftwidth = shiftwidth()
 
   if prevl =~ '[({]\s*$'
     " previous line opened a block
-    let ind += &sw
+    let ind += s:shiftwidth
   endif
   if prevl =~# '^\s*\(case .*\|default\):$'
     " previous line is part of a switch statement
-    let ind += &sw
+    let ind += s:shiftwidth
   endif
   " TODO: handle if the previous line is a label.
 
   if thisl =~ '^\s*[)}]'
     " this line closed a block
-    let ind -= &sw
+    let ind -= s:shiftwidth
   endif
 
   " Colons are tricky.
@@ -58,7 +59,7 @@ function! GoIndent(lnum)
   " We ignore trying to deal with jump labels because (a) they're rare, and
   " (b) they're hard to disambiguate from a composite literal key.
   if thisl =~# '^\s*\(case .*\|default\):$'
-    let ind -= &sw
+    let ind -= s:shiftwidth
   endif
 
   return ind
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index ea10d46c..5a425e9e 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -32,6 +32,7 @@ To see what keystrokes are used for the above example, see [this issue](https://
 
 ## Installation
 Install using [Pathogen], [Vundle], [Neobundle], or your favorite Vim package manager.
+Requires vim 7.4 or later for full functionality.
 
 ## Quick Start
 Out of the box, all you need to know is a single key `Ctrl-n`. Pressing the key in Normal mode highlights the current word under the cursor in Visual mode and places a virtual cursor at the end of it. Pressing it again finds the next ocurrence and places another virtual cursor at the end of the visual selection. If you select multiple lines in Visual mode, pressing the key puts a virtual cursor at every line and leaves you in Normal mode.
diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index fe86d4e2..ab529b39 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -54,6 +54,11 @@ if !hlexists(s:hi_group_visual)
   exec "highlight link ".s:hi_group_visual." Visual"
 endif
 
+" Temporary buffer that is used for individual paste buffer save/restore
+" operations
+let s:paste_buffer_temporary_text = ''
+let s:paste_buffer_temporary_type = ''
+
 "===============================================================================
 " Internal Mappings
 "===============================================================================
@@ -258,6 +263,9 @@ function! s:Cursor.new(position)
   let obj = copy(self)
   let obj.position = copy(a:position)
   let obj.visual = []
+  " Stores text that was yanked after any commands in Normal or Visual mode
+  let obj.paste_buffer_text = getreg('"')
+  let obj.paste_buffer_type = getregtype('"')
   let obj.cursor_hi_id = s:highlight_cursor(a:position)
   let obj.visual_hi_id = 0
   let obj.line_length = col([a:position[0], '$'])
@@ -325,6 +333,17 @@ function! s:Cursor.remove_visual_selection() dict
   let self.visual_hi_id = 0
 endfunction
 
+" Restore unnamed register from paste buffer
+function! s:Cursor.restore_unnamed_register() dict
+  call setreg('"', self.paste_buffer_text, self.paste_buffer_type)
+endfunction
+
+" Save contents of the unnamed register into paste buffer
+function! s:Cursor.save_unnamed_register() dict
+  let self.paste_buffer_text = getreg('"')
+  let self.paste_buffer_type = getregtype('"')
+endfunction
+
 "===============================================================================
 " CursorManager class
 "===============================================================================
@@ -345,6 +364,7 @@ function! s:CursorManager.new()
         \ 'cursorline': &cursorline,
         \ 'lazyredraw': &lazyredraw,
         \ 'paste': &paste,
+        \ 'clipboard': &clipboard,
         \ }
   " We save the window view when multicursor mode is entered
   let obj.saved_winview = []
@@ -465,9 +485,17 @@ function! s:CursorManager.update_current() dict
     exec "normal! gv\<Esc>"
     call cur.update_visual_selection(s:get_visual_region(s:pos('.')))
   elseif s:from_mode ==# 'v' || s:from_mode ==# 'V'
+    " Save contents of unnamed register after each operation in Visual mode.
+    " This should be executed after user input is processed, when unnamed
+    " register already contains the text.
+    call cur.save_unnamed_register()
+
     call cur.remove_visual_selection()
   elseif s:from_mode ==# 'i' && s:to_mode ==# 'n' && self.current_index != self.size() - 1
     normal! h
+  elseif s:from_mode ==# 'n'
+    " Save contents of unnamed register after each operation in Normal mode.
+    call cur.save_unnamed_register()
   endif
   let vdelta = line('$') - s:saved_linecount
   " If the total number of lines changed in the buffer, we need to potentially
@@ -551,19 +579,28 @@ endfunction
 " cursors on screen
 " paste mode needs to be switched off since it turns off a bunch of features
 " that's critical for the plugin to function
+" clipboard should not have unnamed and unnamedplus otherwise plugin cannot
+" reliably use unnamed register ('"')
 function! s:CursorManager.initialize() dict
   let self.saved_settings['virtualedit'] = &virtualedit
   let self.saved_settings['cursorline'] = &cursorline
   let self.saved_settings['lazyredraw'] = &lazyredraw
   let self.saved_settings['paste'] = &paste
+  let self.saved_settings['clipboard'] = &clipboard
   let &virtualedit = "onemore"
   let &cursorline = 0
   let &lazyredraw = 1
   let &paste = 0
+  set clipboard-=unnamed clipboard-=unnamedplus
   " We could have already saved the view from multiple_cursors#find
   if !self.start_from_find
     let self.saved_winview = winsaveview()
   endif
+
+  " Save contents and type of unnamed register upon entering multicursor mode
+  " to restore it later when leaving mode
+  let s:paste_buffer_temporary_text = getreg('"')
+  let s:paste_buffer_temporary_type = getregtype('"')
 endfunction
 
 " Restore user settings.
@@ -573,7 +610,15 @@ function! s:CursorManager.restore_user_settings() dict
     let &cursorline = self.saved_settings['cursorline']
     let &lazyredraw = self.saved_settings['lazyredraw']
     let &paste = self.saved_settings['paste']
+    let &clipboard = self.saved_settings['clipboard']
   endif
+
+  " Restore original contents and type of unnamed register. This method is
+  " called from reset, which calls us only when restore_setting argument is
+  " true, which happens only when we leave multicursor mode. This should be
+  " symmetrical to saving of unnamed register upon the start of multicursor
+  " mode.
+  call setreg('"', s:paste_buffer_temporary_text, s:paste_buffer_temporary_type)
 endfunction
 
 " Reselect the current cursor's region in visual mode
@@ -814,6 +859,12 @@ function! s:process_user_input()
   call s:cm.get_current().update_line_length()
   let s:saved_linecount = line('$')
 
+  " Restore unnamed register only in Normal mode. This should happen before user
+  " input is processed.
+  if s:from_mode ==# 'n' || s:from_mode ==# 'v' || s:from_mode ==# 'V'
+    call s:cm.get_current().restore_unnamed_register()
+  endif
+
   " Apply the user input. Note that the above could potentially change mode, we
   " use the mapping below to help us determine what the new mode is
   " Note that it's possible that \<Plug>(multiple-cursors-apply) never gets called, we have a
diff --git a/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb b/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
index 1e8fc89c..e95e21fa 100644
--- a/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
+++ b/sources_non_forked/vim-multiple-cursors/spec/multiple_cursors_spec.rb
@@ -12,6 +12,7 @@ def get_file_content()
 end
 
 def before(string)
+  options.each { |x| vim.command(x) }
   set_file_content(string)
 end
 
@@ -29,8 +30,198 @@ def type(string)
   end
 end
 
+describe "Multiple Cursors op pending & exit from insert|visual mode" do
+  let(:filename) { 'test.txt' }
+  let(:options) { ['let g:multi_cursor_normal_maps = {"d": 1, "c": 1}',
+                   'let g:multi_cursor_exit_from_insert_mode = 0',
+                   'let g:multi_cursor_exit_from_visual_mode = 0'] }
+
+  specify "#paste from unnamed register to 3 cursors" do
+    before <<-EOF
+      yankme
+      a b c
+      a b c
+      a b c
+    EOF
+
+    type 'yiwj<C-n><C-n><C-n>vwwp<Esc>'
+
+    after <<-EOF
+      yankme
+      a b cyankme
+      a b cyankme
+      a b cyankme
+    EOF
+  end
+
+  specify "#paste buffer normal caw then p" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwcaw<Esc>bP<Esc>'
+
+    after <<-EOF
+      jan hello world
+      feb hello world
+      mar hello world
+    EOF
+  end
+
+  specify "#paste buffer normal C then ABC then p" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwCABC <Esc>p<Esc>'
+
+    after <<-EOF
+      hello ABC jan world
+      hello ABC feb world
+      hello ABC mar world
+    EOF
+  end
+
+  specify "#paste buffer normal daw then P" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwdawbP<Esc>'
+
+    after <<-EOF
+      jan hello world
+      feb hello world
+      mar hello world
+    EOF
+  end
+
+  specify "#paste buffer normal D then P" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwwhDbhP<Esc>'
+
+    after <<-EOF
+      hello world jan
+      hello world feb
+      hello world mar
+    EOF
+  end
+
+  specify "#paste buffer normal s then p" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vws1<Esc>p<Esc>'
+
+    after <<-EOF
+      hello 1jan world
+      hello 1feb world
+      hello 1mar world
+    EOF
+  end
+
+end
+
 describe "Multiple Cursors" do
   let(:filename) { 'test.txt' }
+  let(:options) { [] }
+
+  specify "#paste buffer normal x then p" do
+    before <<-EOF
+      jan
+      feb
+      mar
+    EOF
+
+    type '<C-v>jj<C-n>xp<Esc>'
+
+    after <<-EOF
+      ajn
+      efb
+      amr
+    EOF
+  end
+
+  specify "#paste buffer visual y then p" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwvelywhp<Esc>'
+
+    after <<-EOF
+      hello jan jan world
+      hello feb feb world
+      hello mar mar world
+    EOF
+  end
+
+  specify "#paste buffer initial visual y then P" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type 'wywb<C-n><C-n><C-n>p<Esc>'
+
+    after <<-EOF
+      jan  jan world
+      jan  feb world
+      jan  mar world
+    EOF
+  end
+
+  specify "#paste buffer visual y then P" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwvely^P<Esc>'
+
+    after <<-EOF
+      jan hello jan world
+      feb hello feb world
+      mar hello mar world
+    EOF
+  end
+
+  specify "#paste buffer visual Y then P" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>vwvY^P<Esc>'
+
+    after <<-EOF
+      hello jan world
+      hello jan world
+      hello feb world
+      hello feb world
+      hello mar world
+      hello mar world
+    EOF
+  end
 
   specify "#multiline replacement" do
     before <<-EOF
diff --git a/sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb b/sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb
index d5a4233c..4e0ad99d 100644
--- a/sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb
+++ b/sources_non_forked/vim-multiple-cursors/spec/spec_helper.rb
@@ -5,7 +5,7 @@ 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).
-  config.reuse_server = true
+  config.reuse_server = false
 
   # Decide how to start a Vim instance. In this block, an instance should be
   # spawned and set up with anything project-specific.
diff --git a/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
index d7379c22..3d6bac70 100644
--- a/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/after/plugin/snipMate.vim
@@ -5,7 +5,7 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! s:map_if_not_mapped(lhs, rhs, mode)
+function! s:map_if_not_mapped(lhs, rhs, mode) abort
     let l:unique = s:overwrite ? '' : ' <unique>'
     if !hasmapto(a:rhs, a:mode)
 	silent! exe a:mode . 'map' . l:unique a:lhs a:rhs
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 9196ae4d..ceff8b92 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -9,7 +9,7 @@ catch /.*/
 	echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.md'
 endtry
 
-fun! Filename(...)
+fun! Filename(...) abort
 	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')
@@ -17,7 +17,7 @@ endf
 
 let s:cache = {}
 
-function! snipMate#expandSnip(snip, version, col)
+function! snipMate#expandSnip(snip, version, col) abort
 	let lnum = line('.')
 	let col = a:col
 	let line = getline(lnum)
@@ -76,11 +76,11 @@ function! snipMate#expandSnip(snip, version, col)
 	return b:snip_state.set_stop(0)
 endfunction
 
-function! snipMate#placeholder_str(num, stops)
+function! snipMate#placeholder_str(num, stops) abort
 	return snipMate#sniplist_str(a:stops[a:num].placeholder, a:stops)[0]
 endfunction
 
-function! snipMate#sniplist_str(snippet, stops)
+function! snipMate#sniplist_str(snippet, stops) abort
 	let lines = ['']
 	let pos = 0
 	let add_to = 1
@@ -108,7 +108,7 @@ function! snipMate#sniplist_str(snippet, stops)
 	return lines
 endfunction
 
-function! s:build_stops(snippet, stops, lnum, col, indent)
+function! s:build_stops(snippet, stops, lnum, col, indent) abort
 	let stops = a:stops
 	let line  = a:lnum
 	let col   = a:col
@@ -146,7 +146,7 @@ function! s:build_stops(snippet, stops, lnum, col, indent)
 	return stop_count
 endfunction
 
-function! s:build_loc_info(snippet, stops, line, col, indent)
+function! s:build_loc_info(snippet, stops, line, col, indent) abort
 	let stops   = a:stops
 	let line    = a:line
 	let col     = a:col
@@ -183,7 +183,7 @@ function! s:build_loc_info(snippet, stops, line, col, indent)
 	return [line, col]
 endfunction
 
-function! s:add_mirror(stops, id, line, col, item)
+function! s:add_mirror(stops, id, line, col, item) abort
 	let stops = a:stops
 	let item = a:item
 	let stops[a:id].mirrors = get(stops[a:id], 'mirrors', [])
@@ -201,7 +201,7 @@ endfunction
 " ['triggername', 'name', 'contents']
 " if triggername is not set 'default' is assumed
 " TODO: better error checking
-fun! snipMate#ReadSnippetsFile(file)
+fun! snipMate#ReadSnippetsFile(file) abort
 	let result = []
 	let new_scopes = []
 	if !filereadable(a:file) | return [result, new_scopes] | endif
@@ -245,7 +245,7 @@ fun! snipMate#ReadSnippetsFile(file)
 	return [result, new_scopes]
 endf
 
-function! s:GetScopes()
+function! s:GetScopes() abort
 	let ret = exists('b:snipMate.scope_aliases') ? copy(b:snipMate.scope_aliases) : {}
 	let global = get(g:snipMate, 'scope_aliases', {})
 	for alias in keys(global)
@@ -262,7 +262,7 @@ endfunction
 " adds scope aliases to list.
 " returns new list
 " the aliases of aliases are added recursively
-fun! s:AddScopeAliases(list)
+fun! s:AddScopeAliases(list) abort
   let did = {}
   let scope_aliases = s:GetScopes()
   let new = a:list
@@ -282,7 +282,7 @@ endf
 
 au SourceCmd *.snippet,*.snippets call s:source_snippet()
 
-function! s:info_from_filename(file)
+function! s:info_from_filename(file) abort
 	let parts = split(fnamemodify(a:file, ':r'), '/')
 	let snipidx = len(parts) - index(reverse(copy(parts)), 'snippets') - 1
 	let rtp_prefix = join(parts[(snipidx -
@@ -293,7 +293,7 @@ function! s:info_from_filename(file)
 	return [rtp_prefix, trigger, desc]
 endfunction
 
-function! s:source_snippet()
+function! s:source_snippet() abort
 	let file = expand('<afile>:p')
 	let [rtp_prefix, trigger, desc] = s:info_from_filename(file)
 	let new_snips = []
@@ -316,7 +316,7 @@ function! s:source_snippet()
 	call extend(s:lookup_state.snips, new_snips)
 endfunction
 
-function! s:CachedSnips(file)
+function! s:CachedSnips(file) abort
 	let mtime = getftime(a:file)
 	if has_key(s:cache, a:file) && s:cache[a:file].mtime >= mtime
 		return s:cache[a:file].contents
@@ -327,15 +327,14 @@ function! s:CachedSnips(file)
 	return s:cache[a:file].contents
 endfunction
 
-function! s:snippet_filenames(scope, trigger)
+function! s:snippet_filenames(scope, trigger) abort
 	let mid = ['', '_*', '/*']
-	return join(map(extend(mid, map(filter(copy(mid), 'v:key != 1'),
-				\ "'/' . a:trigger . '*' . v:val")),
-				\ "'snippets/' . a:scope . v:val . '.snippet'"
+	let mid += map(copy(mid[1:]), "'/' . a:trigger . '*' . v:val")
+	return join(map(mid, "'snippets/' . a:scope . v:val . '.snippet'"
 				\ . ". (v:key < 3 ? 's' : '')"))
 endfunction
 
-function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion)
+function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion) abort
 	let d = a:dict
 	if !has_key(d, a:trigger) || a:bang
 		let d[a:trigger] = {}
@@ -344,7 +343,7 @@ function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion)
 endfunction
 
 " default triggers based on paths
-function! snipMate#DefaultPool(scopes, trigger, result)
+function! snipMate#DefaultPool(scopes, trigger, result) abort
 	let scopes = s:AddScopeAliases(a:scopes)
 	let scopes_done = []
 	let rtp_save = &rtp
@@ -377,7 +376,7 @@ endfunction
 " scopes: list of scopes. usually this is the filetype. eg ['c','cpp']
 " trigger may contain glob patterns. Thus use '*' to get all triggers
 "
-fun! snipMate#GetSnippets(scopes, trigger)
+fun! snipMate#GetSnippets(scopes, trigger) abort
 	let result = {}
 
 	for F in values(g:snipMateSources)
@@ -389,7 +388,7 @@ endf
 " adds leading tab
 " and replaces leading spaces by tabs
 " see ftplugin/snippet.vim
-fun! snipMate#RetabSnip() range
+fun! snipMate#RetabSnip() range abort
   let leadingTab = expand('%:e') == 'snippets'
 
   let lines = getline(a:firstline, a:lastline)
@@ -424,7 +423,7 @@ fun! snipMate#RetabSnip() range
   endfor
 endf
 
-fun! snipMate#OpenSnippetFiles()
+fun! snipMate#OpenSnippetFiles() abort
   let dict = snipMate#GetSnippetFiles(0, snipMate#ScopesByFile(), '*')
   " sort by files wether they exist - put existing files first
   let exists = []
@@ -445,13 +444,13 @@ fun! snipMate#OpenSnippetFiles()
   endfor
 endf
 
-fun! snipMate#ScopesByFile()
+fun! snipMate#ScopesByFile() abort
 	" duplicates are removed in AddScopeAliases
 	return filter(funcref#Call(g:snipMate.get_scopes), "v:val != ''")
 endf
 
 " used by both: completion and insert snippet
-fun! snipMate#GetSnippetsForWordBelowCursor(word, exact)
+fun! snipMate#GetSnippetsForWordBelowCursor(word, exact) abort
 	" Setup lookups: '1.2.3' becomes [1.2.3] + [3, 2.3]
 	let parts = split(a:word, '\W\zs')
 	" Since '\W\zs' results in splitting *after* a non-keyword character, the
@@ -499,7 +498,7 @@ endf
 
 " snippets: dict containing snippets by name
 " usually this is just {'default' : snippet_contents }
-fun! s:ChooseSnippet(snippets)
+fun! s:ChooseSnippet(snippets) abort
 	let snippet = []
 	let keys = keys(a:snippets)
 	let i = 1
@@ -521,22 +520,22 @@ fun! s:ChooseSnippet(snippets)
 	return funcref#Call(a:snippets[keys(a:snippets)[idx]])
 endf
 
-fun! snipMate#WordBelowCursor()
+fun! snipMate#WordBelowCursor() abort
 	return matchstr(getline('.'), '\S\+\%' . col('.') . 'c')
 endf
 
-fun! snipMate#GetSnippetsForWordBelowCursorForComplete(word)
+fun! snipMate#GetSnippetsForWordBelowCursorForComplete(word) abort
 	let snippets = map(snipMate#GetSnippetsForWordBelowCursor(a:word, 0), 'v:val[0]')
 	return filter(snippets, 'v:val =~# "\\V\\^' . escape(a:word, '"\') . '"')
 endf
 
-fun! snipMate#CanBeTriggered()
+fun! snipMate#CanBeTriggered() abort
 	let word    = snipMate#WordBelowCursor()
 	let matches = snipMate#GetSnippetsForWordBelowCursorForComplete(word)
 	return len(matches) > 0
 endf
 
-fun! snipMate#ShowAvailableSnips()
+fun! snipMate#ShowAvailableSnips() abort
 	let col     = col('.')
 	let word    = snipMate#WordBelowCursor()
 	let matches = snipMate#GetSnippetsForWordBelowCursorForComplete(word)
@@ -552,7 +551,7 @@ fun! snipMate#ShowAvailableSnips()
 endf
 
 " Pass an argument to force snippet expansion instead of triggering or jumping
-function! snipMate#TriggerSnippet(...)
+function! snipMate#TriggerSnippet(...) abort
 	if exists('g:SuperTabMappingForward')
 		if g:SuperTabMappingForward == "<tab>"
 			let SuperTabPlug = maparg('<Plug>SuperTabForward', 'i')
@@ -610,7 +609,7 @@ function! snipMate#TriggerSnippet(...)
 	  \ : "\<c-r>=snipMate#ShowAvailableSnips()\<cr>"
 endfunction
 
-fun! snipMate#BackwardsSnippet()
+fun! snipMate#BackwardsSnippet() abort
 	if exists('b:snip_state') | return b:snip_state.jump_stop(1) | endif
 
 	if exists('g:SuperTabMappingForward')
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim b/sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim
index 33d0f28c..de495d27 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate_python_demo.vim
@@ -9,7 +9,7 @@
 " will create a snippet on the fly which looks like this:
 " abc(${1:a}, ${2:b}, ${3:c=None})
 
-fun! snipMate_python_demo#Activate()
+fun! snipMate_python_demo#Activate() abort
   if !exists('g:snipMateSources')
     let g:snipMateSources = {}
   endif
@@ -17,7 +17,7 @@ fun! snipMate_python_demo#Activate()
   let g:snipMateSources['python'] = funcref#Function('snipMate_python_demo#FunctionsFromCurrentFileAndTags')
 endf
 
-fun! s:Add(dict, line, source, trigger)
+fun! s:Add(dict, line, source, trigger) abort
   let matched = matchlist(a:line,'def\s\+\([^( \t]\+\)[ \t]*(\([^)]*\)')
   if len(matched) > 2
     let name = matched[1]
@@ -34,7 +34,7 @@ fun! s:Add(dict, line, source, trigger)
     let sd[a:source] = name.'('.join(args,', ').')'
   endif
 endf
-fun! snipMate_python_demo#FunctionsFromCurrentFileAndTags(scopes, trigger, result)
+fun! snipMate_python_demo#FunctionsFromCurrentFileAndTags(scopes, trigger, result) abort
   " getting all might be too much
   if a:trigger == '*' | return | endif
   if index(a:scopes, 'python') < 0 | return | endif
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
index 1bce416e..25db9614 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/jumping.vim
@@ -1,25 +1,25 @@
-function! s:sfile()
+function! s:sfile() abort
 	return expand('<sfile>')
 endfunction
 
 let s:state_proto = {}
 
-function! snipmate#jumping#state()
+function! snipmate#jumping#state() abort
 	return copy(s:state_proto)
 endfunction
 
-function! s:listize_mirror(mirrors)
+function! s:listize_mirror(mirrors) abort
 	return map(copy(a:mirrors), '[v:val.line, v:val.col]')
 endfunction
 
 " Removes snippet state info
-function! s:state_remove() dict
+function! s:state_remove() dict abort
 	" Remove all autocmds in group snipmate_changes in the current buffer
 	unlet! b:snip_state
 	silent! au! snipmate_changes * <buffer>
 endfunction
 
-function! s:state_find_next_stop(backwards) dict
+function! s:state_find_next_stop(backwards) dict abort
 	let self.stop_no += a:backwards? -1 : 1
 	while !has_key(self.stops, self.stop_no)
 		if self.stop_no == self.stop_count
@@ -33,7 +33,7 @@ function! s:state_find_next_stop(backwards) dict
 endfunction
 
 " Update state information to correspond to the given tab stop
-function! s:state_set_stop(backwards) dict
+function! s:state_set_stop(backwards) dict abort
 	call self.find_next_stop(a:backwards)
 	let self.cur_stop    = self.stops[self.stop_no]
 	let self.stop_len = (type(self.cur_stop.placeholder) == type(0))
@@ -54,7 +54,7 @@ function! s:state_set_stop(backwards) dict
 endfunction
 
 " Jump to the next/previous tab stop
-function! s:state_jump_stop(backwards) dict
+function! s:state_jump_stop(backwards) dict abort
 	" Update changes just in case
 	" This seems to be only needed because insert completion does not trigger
 	" the CursorMovedI event
@@ -72,7 +72,7 @@ function! s:state_jump_stop(backwards) dict
 	return self.set_stop(a:backwards)
 endfunction
 
-function! s:state_remove_nested(...) dict
+function! s:state_remove_nested(...) dict abort
 	let id = a:0 ? a:1 : self.stop_no
 	if type(self.stops[id].placeholder) == type([])
 		for i in self.stops[id].placeholder
@@ -90,7 +90,7 @@ function! s:state_remove_nested(...) dict
 endfunction
 
 " Select the placeholder for the current tab stop
-function! s:state_select_word() dict
+function! s:state_select_word() dict abort
 	let len = self.stop_len
 	if !len | return '' | endif
 	let l = col('.') != 1 ? 'l' : ''
@@ -103,7 +103,7 @@ endfunction
 " Update the snippet as text is typed. The self.update_mirrors() function does
 " the actual work.
 " If the cursor moves outside of a placeholder, call self.remove()
-function! s:state_update_changes() dict
+function! s:state_update_changes() dict abort
 	let change_len = col('$') - self.prev_len
 	let self.changed = self.changed || change_len != 0
 	let self.end_col += change_len
@@ -122,7 +122,7 @@ function! s:state_update_changes() dict
 endfunction
 
 " Actually update the mirrors for any changed text
-function! s:state_update_mirrors(change) dict
+function! s:state_update_mirrors(change) dict abort
 	let newWordLen = self.end_col - self.start_col
 	let newWord = strpart(getline('.'), self.start_col - 1, newWordLen)
 	let changeLen = a:change
@@ -159,7 +159,7 @@ function! s:state_update_mirrors(change) dict
 	endif
 endfunction
 
-function! s:state_find_update_objects(item) dict
+function! s:state_find_update_objects(item) dict abort
 	let item = a:item
 	let item.update_objects = []
 
@@ -179,7 +179,7 @@ function! s:state_find_update_objects(item) dict
 	return item.update_objects
 endfunction
 
-function! s:state_update(item, change_len) dict
+function! s:state_update(item, change_len) dict abort
 	let item = a:item
 	if exists('item.update_objects')
 		let to_update = item.update_objects
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
index 53eb0cbd..6d4563a3 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
@@ -2,7 +2,7 @@ let s:sigil = nr2char(31)
 let snipmate#legacy#sigil = s:sigil
 
 " Prepare snippet to be processed by s:BuildTabStops
-function! snipmate#legacy#process_snippet(snip)
+function! snipmate#legacy#process_snippet(snip) abort
 	let snippet = a:snip
 	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
 
@@ -76,7 +76,7 @@ endfunction
 "     the matches of "$#", to be replaced with the placeholder. This list is
 "     composed the same way as the parent; the first item is the line number,
 "     and the second is the column.
-function! snipmate#legacy#build_stops(snip, lnum, col, indent)
+function! snipmate#legacy#build_stops(snip, lnum, col, indent) abort
 	let stops = {}
 	let i = 0
 	let withoutVars = substitute(a:snip, s:sigil . '\d\+', '', 'g')
@@ -118,7 +118,7 @@ function! snipmate#legacy#build_stops(snip, lnum, col, indent)
 endfunction
 
 " Counts occurences of haystack in needle
-function! s:count(haystack, needle)
+function! s:count(haystack, needle) abort
 	let counter = 0
 	let index = stridx(a:haystack, a:needle)
 	while index != -1
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
index 1408ddd3..4ebdf30e 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
@@ -1,12 +1,12 @@
 " Snippet definition parsing code
 
-function! s:sfile()
+function! s:sfile() abort
     return expand('<sfile>')
 endfunction
 
 let s:parser_proto = {}
 
-function! s:new_parser(text)
+function! s:new_parser(text) abort
     let ret = copy(s:parser_proto)
     let ret.input = a:text
     let ret.len = strlen(ret.input)
@@ -18,12 +18,12 @@ function! s:new_parser(text)
     return ret
 endfunction
 
-function! s:parser_advance(...) dict
+function! s:parser_advance(...) dict abort
     let self.pos += a:0 ? a:1 : 1
     let self.next = self.input[self.pos]
 endfunction
 
-function! s:parser_same(tok) dict
+function! s:parser_same(tok) dict abort
     if self.next == a:tok
         call self.advance()
         return 1
@@ -32,7 +32,7 @@ function! s:parser_same(tok) dict
     endif
 endfunction
 
-function! s:parser_id() dict
+function! s:parser_id() dict abort
     if self.input[(self.pos):(self.pos+5)] == 'VISUAL'
         call self.advance(6)
         return 'VISUAL'
@@ -45,7 +45,7 @@ function! s:parser_id() dict
     return -1
 endfunction
 
-function! s:parser_add_var(var) dict
+function! s:parser_add_var(var) dict abort
     let id = a:var[0]
     if !has_key(self.vars, id)
         let self.vars[id] = { 'instances' : [] }
@@ -53,7 +53,7 @@ function! s:parser_add_var(var) dict
     call add(self.vars[id].instances, a:var)
 endfunction
 
-function! s:parser_var() dict
+function! s:parser_var() dict abort
     let ret = []
     if self.same('{')
         let id = self.id()
@@ -70,7 +70,7 @@ function! s:parser_var() dict
     return ret
 endfunction
 
-function! s:parser_varend() dict
+function! s:parser_varend() dict abort
     let ret = []
     if self.same(':')
         call extend(ret, self.placeholder())
@@ -81,11 +81,11 @@ function! s:parser_varend() dict
     return ret
 endfunction
 
-function! s:parser_placeholder() dict
+function! s:parser_placeholder() dict abort
     return self.parse('}')
 endfunction
 
-function! s:parser_subst() dict
+function! s:parser_subst() dict abort
     let ret = {}
     let ret.pat = join(self.text('/', 1))
     if self.same('/')
@@ -97,14 +97,14 @@ function! s:parser_subst() dict
     return ret
 endfunction
 
-function! s:parser_expr() dict
+function! s:parser_expr() dict abort
     let str = join(self.text('`', 1))
     let ret = eval(str)
     call self.same('`')
     return type(ret) == type('') ? ret : string(ret)
 endfunction
 
-function! s:parser_text(...) dict
+function! s:parser_text(...) dict abort
     let res = []
     let val = ''
     if a:0 == 2 && a:2
@@ -140,7 +140,7 @@ function! s:parser_text(...) dict
     return res
 endfunction
 
-function! s:parser_parse(...) dict
+function! s:parser_parse(...) dict abort
     let ret = a:0 ? [] : self.value
     while self.pos < self.len
         if self.same('$')
@@ -186,7 +186,7 @@ call extend(s:parser_proto, snipmate#util#add_methods(s:sfile(), 'parser',
             \ [ 'advance', 'same', 'id', 'add_var', 'var', 'varend',
             \ 'placeholder', 'subst', 'expr', 'text', 'parse' ]), 'error')
 
-function! s:indent(count)
+function! s:indent(count) abort
     if &expandtab
         let shift = repeat(' ', (&sts > 0) ? &sts : &sw)
     else
@@ -195,7 +195,7 @@ function! s:indent(count)
     return repeat(shift, a:count)
 endfunction
 
-function! s:visual_placeholder(var, indent)
+function! s:visual_placeholder(var, indent) abort
     let arg = get(a:var, 1, {})
     if type(arg) == type({})
         let pat = get(arg, 'pat', '')
@@ -212,7 +212,7 @@ function! s:visual_placeholder(var, indent)
     return content
 endfunction
 
-function! snipmate#parse#snippet(text)
+function! snipmate#parse#snippet(text) abort
     let parser = s:new_parser(a:text)
     call parser.parse()
     unlet! b:snipmate_visual
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
index 654c0ae3..5ba21cc2 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/util.vim
@@ -1,6 +1,6 @@
 " The next function was based on s:function and s:add_methods in fugitive
 " <https://github.com/tpope/vim-fugitive/blob/master/plugin/fugitive.vim>
-function! snipmate#util#add_methods(sfile, namespace, methods)
+function! snipmate#util#add_methods(sfile, namespace, methods) abort
 	let dict = {}
 	for name in a:methods
 		let dict[name] = function(join([matchstr(a:sfile, '<SNR>\d\+'),
diff --git a/sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim b/sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim
index 2e545707..4d523922 100644
--- a/sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim
+++ b/sources_non_forked/vim-snipmate/ftplugin/html_snip_helper.vim
@@ -5,6 +5,6 @@ endif
 let s:did_snip_helper = 1
 
 " Automatically closes tag if in xhtml
-fun! Close()
+fun! Close() abort
 	return stridx(&ft, 'xhtml') == -1 ? '' : ' /'
 endf
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index 5c1b48fc..c82e43a0 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -105,7 +105,7 @@ let g:snipMate['get_scopes'] = get(g:snipMate, 'get_scopes', funcref#Function('r
 
 " Modified from Luc Hermitte's function on StackOverflow
 " <http://stackoverflow.com/a/1534347>
-function! s:grab_visual()
+function! s:grab_visual() abort
 	let a_save = @a
 	try
 		normal! gv"ay
@@ -116,7 +116,7 @@ function! s:grab_visual()
 endfunction
 
 " TODO: Allow specifying an arbitrary snippets file
-function! s:load_scopes(bang, ...)
+function! s:load_scopes(bang, ...) abort
 	let gb = a:bang ? g: : b:
 	let gb.snipMate = get(gb, 'snipMate', {})
 	let gb.snipMate.scope_aliases = get(gb.snipMate, 'scope_aliases', {})
diff --git a/sources_non_forked/vim-snipmate/t/jumping.vim b/sources_non_forked/vim-snipmate/t/jumping.vim
index 7bc22b3b..1c3ab0d3 100644
--- a/sources_non_forked/vim-snipmate/t/jumping.vim
+++ b/sources_non_forked/vim-snipmate/t/jumping.vim
@@ -1,12 +1,12 @@
-function! Setup(snip)
+function! Setup(snip) abort
     return snipMate#expandSnip(join(a:snip, "\n"), 1)
 endfunction
 
-function! s:to_be_file(expected)
+function! s:to_be_file(expected) abort
     return a:expected == getline(1,'$')
 endfunction
 
-function! s:to_be_in(item, list)
+function! s:to_be_in(item, list) abort
     return !empty(filter(copy(a:list), 'v:val is a:item'))
 endfunction
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index e33d2c51..75783785 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -29,7 +29,7 @@ def _parse_comments(s):
 			if len(flags) == 0:
 				rv.append((text, text, text, ""))
 			# parse 3-part comment, but ignore those with O flag
-			elif flags[0] == 's' and 'O' not in flags:
+			elif 's' in flags and 'O' not in flags:
 				ctriple = []
 				indent = ""
 
@@ -47,7 +47,7 @@ def _parse_comments(s):
 				ctriple.append(indent)
 
 				rv.append(ctriple)
-			elif flags[0] == 'b':
+			elif 'b' in flags:
 				if len(text) == 1:
 					rv.insert(0, (text,text,text, ""))
 	except StopIteration:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index 366346a6..cd9c55b9 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -261,36 +261,56 @@ if (${1:/* condition */}) {
 $0
 endsnippet
 
+snippet ns "namespace declaration" b
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+endsnippet
+
 snippet class "Class declaration template" b
+<?php
+
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+
 /**
- * Class ${2:`!p snip.rv=snip.fn.split('.')[0]`}
- * @author ${3:`!v g:snips_author`}
+ * Class ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
  */
-$1class $2
+class $1
 {
-	public function ${4:__construct}(${5:$options})
-	{
-		${6:// code}
-	}
 }
 $0
 endsnippet
 
-snippet interface "interface declaration template" b
+snippet interface "Interface declaration template" b
+<?php
+
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+
 /**
- * Interface ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * Interface ${1:`!p snip.rv=snip.basename`}
  * @author ${2:`!v g:snips_author`}
  */
 interface $1
 {
-	public function ${3:__construct}(${4:$options})
-	{
-		${5:// code}
-	}
+›   public function ${3:someFunction}();$4                                                                                                              
 }
-$0
 endsnippet
 
+
 snippet construct "__construct()" b
 /**
  * @param $2mixed ${1/, /\n     * \@param mixed /g}
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index e283ed22..44fd3c93 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -1,6 +1,6 @@
 " surround.vim - Surroundings
 " Author:       Tim Pope <http://tpo.pe/>
-" Version:      2.0
+" Version:      2.1
 " GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim
 
 if exists("g:loaded_surround") || &cp || v:version < 700
@@ -457,7 +457,7 @@ function! s:dosurround(...) " {{{1
   if newchar == ""
     silent! call repeat#set("\<Plug>Dsurround".char,scount)
   else
-    silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:inpur,scount)
+    silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount)
   endif
 endfunction " }}}1
 
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index fc0072bd..dd385672 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -76,6 +76,7 @@ set grepprg=/bin/grep\ -nH
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Nerd Tree
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:NERDTreeWinPos = "right"
 map <leader>nn :NERDTreeToggle<cr>
 map <leader>nb :NERDTreeFromBookmark 
 map <leader>nf :NERDTreeFind<cr>

From d195ccb777951d53b02c7f5251693bb9a3738916 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Tue, 24 Feb 2015 10:45:22 +0000
Subject: [PATCH 59/61] Updated vim plugins

---
 sources_non_forked/ack.vim/README.md          | 187 ++++++-----
 sources_non_forked/ack.vim/autoload/ack.vim   | 303 ++++++++++-------
 sources_non_forked/ack.vim/doc/ack.txt        |  14 +-
 .../ack.vim/doc/ack_quick_help.txt            |   2 +-
 sources_non_forked/ack.vim/plugin/ack.vim     |  12 +-
 sources_non_forked/goyo.vim/autoload/goyo.vim |  25 +-
 sources_non_forked/syntastic/README.markdown  |  70 ++--
 .../syntastic/autoload/syntastic/c.vim        |  26 +-
 .../syntastic/autoload/syntastic/log.vim      |  28 +-
 .../autoload/syntastic/postprocess.vim        |  10 +-
 .../autoload/syntastic/preprocess.vim         | 126 +++++--
 .../syntastic/autoload/syntastic/util.vim     |  56 ++--
 .../syntastic/plugin/syntastic.vim            |  81 ++---
 .../plugin/syntastic/autoloclist.vim          |   6 +-
 .../syntastic/plugin/syntastic/balloons.vim   |  10 +-
 .../syntastic/plugin/syntastic/checker.vim    |  59 ++--
 .../syntastic/plugin/syntastic/cursor.vim     |  14 +-
 .../plugin/syntastic/highlighting.vim         |  12 +-
 .../syntastic/plugin/syntastic/loclist.vim    |  66 ++--
 .../syntastic/plugin/syntastic/modemap.vim    |  22 +-
 .../syntastic/plugin/syntastic/notifiers.vim  |   8 +-
 .../syntastic/plugin/syntastic/registry.vim   |  28 +-
 .../syntastic/plugin/syntastic/signs.vim      |  14 +-
 .../syntastic/syntax_checkers/java/javac.vim  |  29 +-
 .../syntax_checkers/javascript/standard.vim   |  47 +++
 .../syntax_checkers/json/jsonval.vim          |   2 +-
 .../syntastic/syntax_checkers/nasm/nasm.vim   |   2 +-
 .../syntax_checkers/ocaml/camlp4o.vim         |   2 +-
 .../syntax_checkers/python/flake8.vim         |   2 +-
 .../syntastic/syntax_checkers/r/lint.vim      |   2 +-
 .../syntastic/syntax_checkers/ruby/reek.vim   |   5 +-
 .../syntax_checkers/ruby/rubylint.vim         |   4 +-
 .../syntastic/syntax_checkers/slim/slimrb.vim |   8 +-
 .../{swift/xcrun.vim => sml/smlnj.vim}        |  41 ++-
 .../syntastic/syntax_checkers/vim/vint.vim    |  55 ++++
 sources_non_forked/vim-airline/LICENSE        |   2 +-
 sources_non_forked/vim-airline/README.md      |   2 +-
 .../vim-airline/autoload/airline.vim          |   2 +-
 .../vim-airline/autoload/airline/builder.vim  |   4 +-
 .../vim-airline/autoload/airline/debug.vim    |   2 +-
 .../autoload/airline/deprecation.vim          |   2 +-
 .../autoload/airline/extensions.vim           |   2 +-
 .../autoload/airline/extensions/branch.vim    |   2 +-
 .../airline/extensions/bufferline.vim         |   2 +-
 .../autoload/airline/extensions/commandt.vim  |   2 +-
 .../autoload/airline/extensions/csv.vim       |   2 +-
 .../autoload/airline/extensions/ctrlp.vim     |   2 +-
 .../autoload/airline/extensions/default.vim   |   2 +-
 .../autoload/airline/extensions/eclim.vim     |   2 +-
 .../autoload/airline/extensions/example.vim   |   2 +-
 .../autoload/airline/extensions/hunks.vim     |   2 +-
 .../autoload/airline/extensions/netrw.vim     |   2 +-
 .../autoload/airline/extensions/nrrwrgn.vim   |   2 +-
 .../airline/extensions/promptline.vim         |   2 +-
 .../autoload/airline/extensions/quickfix.vim  |   2 +-
 .../autoload/airline/extensions/syntastic.vim |   2 +-
 .../autoload/airline/extensions/tabline.vim   | 308 +-----------------
 .../airline/extensions/tabline/autoshow.vim   |  51 +++
 .../airline/extensions/tabline/buffers.vim    | 185 +++++++++++
 .../airline/extensions/tabline/buflist.vim    |  38 +++
 .../tabline/{ => formatters}/default.vim      |   8 +-
 .../tabline/{ => formatters}/unique_tail.vim  |   8 +-
 .../{ => formatters}/unique_tail_improved.vim |  10 +-
 .../airline/extensions/tabline/tabs.vim       |  80 +++++
 .../autoload/airline/extensions/tagbar.vim    |   2 +-
 .../autoload/airline/extensions/tmuxline.vim  |   2 +-
 .../autoload/airline/extensions/undotree.vim  |   2 +-
 .../autoload/airline/extensions/unite.vim     |   2 +-
 .../airline/extensions/virtualenv.vim         |   2 +-
 .../airline/extensions/whitespace.vim         |   2 +-
 .../autoload/airline/highlighter.vim          |  10 +-
 .../vim-airline/autoload/airline/init.vim     |   2 +-
 .../vim-airline/autoload/airline/parts.vim    |   2 +-
 .../vim-airline/autoload/airline/section.vim  |   2 +-
 .../vim-airline/autoload/airline/themes.vim   |   2 +-
 .../autoload/airline/themes/badwolf.vim       |   2 +-
 .../autoload/airline/themes/base16.vim        |   8 +-
 .../vim-airline/autoload/airline/util.vim     |   2 +-
 .../vim-airline/doc/airline.txt               |  36 +-
 .../vim-airline/plugin/airline.vim            |  38 +--
 .../vim-fugitive/plugin/fugitive.vim          |  11 +-
 sources_non_forked/vim-go/README.md           |  32 +-
 sources_non_forked/vim-go/autoload/go/fmt.vim |   2 +-
 .../vim-go/autoload/go/oracle.vim             | 190 ++++-------
 .../vim-go/autoload/webapi/json.vim           | 135 --------
 sources_non_forked/vim-go/doc/vim-go.txt      | 124 ++++++-
 .../vim-go/ftplugin/go/commands.vim           |  26 +-
 .../vim-go/gosnippets/UltiSnips/go.snippets   |  39 ++-
 .../vim-go/gosnippets/snippets/go.snip        |  32 ++
 sources_non_forked/vim-go/indent/go.vim       |  80 +++--
 .../vim-multiple-cursors/README.md            |   9 +-
 .../doc/multiple_cursors.txt                  |  26 +-
 .../vim-repeat/autoload/repeat.vim            |  15 +-
 .../vim-snipmate/Contributors.md              |   1 +
 sources_non_forked/vim-snipmate/README.md     |   4 +-
 .../vim-snipmate/autoload/snipMate.vim        |   8 +-
 sources_non_forked/vim-snippets/README.md     |   2 -
 .../vim-snippets/UltiSnips/elixir.snippets    | 168 ----------
 .../vim-snippets/UltiSnips/php.snippets       |  10 +-
 .../vim-snippets/snippets/elixir.snippets     |  24 +-
 .../snippets/javascript/javascript.snippets   |   4 +-
 .../vim-surround/doc/surround.txt             |   7 +-
 .../vim-surround/plugin/surround.vim          |  30 +-
 vimrcs/plugins_config.vim                     |   2 +
 104 files changed, 1743 insertions(+), 1464 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
 rename sources_non_forked/syntastic/syntax_checkers/{swift/xcrun.vim => sml/smlnj.vim} (50%)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/vim/vint.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buflist.vim
 rename sources_non_forked/vim-airline/autoload/airline/extensions/tabline/{ => formatters}/default.vim (75%)
 rename sources_non_forked/vim-airline/autoload/airline/extensions/tabline/{ => formatters}/unique_tail.vim (56%)
 rename sources_non_forked/vim-airline/autoload/airline/extensions/tabline/{ => formatters}/unique_tail_improved.vim (85%)
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
 delete mode 100644 sources_non_forked/vim-go/autoload/webapi/json.vim
 delete mode 100644 sources_non_forked/vim-snippets/UltiSnips/elixir.snippets

diff --git a/sources_non_forked/ack.vim/README.md b/sources_non_forked/ack.vim/README.md
index 008fb3dd..59f00f1d 100644
--- a/sources_non_forked/ack.vim/README.md
+++ b/sources_non_forked/ack.vim/README.md
@@ -1,131 +1,148 @@
 # ack.vim
 
-This plugin is a front for the Perl module
-[App::Ack](http://search.cpan.org/~petdance/ack/ack).  Ack can be used as a
-replacement for 99% of the uses of _grep_.  This plugin will allow you to run
-ack from vim, and shows the results in a split window.
+Run your favorite search tool from Vim, with an enhanced results list.
+
+This plugin was designed as a Vim frontend for the Perl module [App::Ack]. Ack
+can be used as a replacement for 99% of the uses of _grep_. The plugin allows
+you to run ack from vim, and shows the results in a split window.
+
+But here's a little secret for the Vim-seasoned: it's just a light wrapper for
+Vim's [grepprg] and the [quickfix] window for match results. This makes it easy
+to integrate with your own Vim configuration and use existing knowledge of core
+features. It also means the plugin is flexible to use with other search tools.
+
+[App::Ack]: http://search.cpan.org/~petdance/ack/ack
+[grepprg]: http://vimdoc.sourceforge.net/htmldoc/options.html#'grepprg'
+[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
 
 ## Installation
 
 ### Ack
 
-You will need the ack(>= 2.0), of course, to install it follow the
-[manual](http://beyondgrep.com/install/)
+You will need ack (>= 2.0), of course. To install it follow the
+[manual](http://beyondgrep.com/install/).
 
 ### The Plugin
 
-To install it is recommended to use one of the popular package managers for Vim,
-rather than installing by drag and drop all required files into your `.vim` folder.
-
-#### Manual (not recommended)
-
-Just
-[download](https://github.com/mileszs/ack.vim/archive/kb-improve-readme.zip) the
-plugin and put it in your `~/.vim/`(or `%PROGRAMFILES%/Vim/vimfiles` on windows)
+It is recommended to use one of the popular plugin managers for Vim. There are
+many and you probably already have a preferred one, but a few examples for your
+copy-and-paste convenience:
 
 #### Vundle
 
-    Bundle 'mileszs/ack.vim'
+    Plugin 'mileszs/ack.vim'
 
 #### NeoBundle
 
     NeoBundle 'mileszs/ack.vim'
 
+#### Manual (not recommended)
+
+[Download][releases] the plugin and extract it in `~/.vim/` (or
+`%PROGRAMFILES%/Vim/vimfiles` on Windows).
+
+[zipball]: https://github.com/mileszs/ack.vim/archive/master.zip
+
 ## Usage
 
     :Ack [options] {pattern} [{directories}]
 
-Search recursively in {directory} (which defaults to the current directory) for
-the {pattern}.
+Search recursively in `{directories}` (which defaults to the current directory)
+for the `{pattern}`.
 
-Files containing the search term will be listed in the split window, along with
-the line number of the occurrence, once for each occurrence.  [Enter] on a line
-in this window will open the file, and place the cursor on the matching line.
+Files containing the search term will be listed in the quickfix window, along
+with the line number of the occurrence, once for each occurrence. `<Enter>` on
+a line in this window will open the file, and place the cursor on the matching
+line.
 
-Just like where you use :grep, :grepadd, :lgrep, and :lgrepadd, you can use
-`:Ack`, `:AckAdd`, `:LAck`, and `:LAckAdd` respectively.
-(See `doc/ack.txt`, or install and `:h Ack` for more information.)
+Just like where you use `:grep`, `:grepadd`, `:lgrep`, and :`lgrepadd`, you can
+use `:Ack`, `:AckAdd`, `:LAck`, and `:LAckAdd` respectively. (See `:help Ack`
+after installing, or [`doc/ack.txt`][doc] in the repo, for more information.)
 
-For more ack options see
-[ack documentation](http://beyondgrep.com/documentation/)
+For more ack help see [ack documentation](http://beyondgrep.com/documentation/).
+
+[doc]: https://github.com/mileszs/ack.vim/blob/master/doc/ack.txt
 
 ### Keyboard Shortcuts
 
-In the quickfix window, you can use:
+The quickfix results window is augmented with these convenience mappings:
 
-    o    to open (same as enter)
-    O    to open and close quickfix window
-    go   to preview file (open but maintain focus on ack.vim results)
+    ?    a quick summary of these keys, repeat to close
+    o    to open (same as Enter)
+    O    to open and close the quickfix window
+    go   to preview file, open but maintain focus on ack.vim results
     t    to open in new tab
-    T    to open in new tab silently
+    T    to open in new tab without moving to it
     h    to open in horizontal split
-    H    to open in horizontal split silently
+    H    to open in horizontal split, keeping focus on the results
     v    to open in vertical split
-    gv   to open in vertical split silently
+    gv   to open in vertical split, keeping focus on the results
     q    to close the quickfix window
 
-This Vim plugin is derived (and by derived, I mean copied, essentially) from
-Antoine Imbert's blog post
-[Ack and Vim Integration](http://blog.ant0ine.com/typepad/2007/03/ack-and-vim-integration.html)
-(in particular, the function at the bottom of the post).  I added a help file that
-provides just enough reference to get you going.  I also highly recommend you
-check out the docs for the Perl script 'ack', for obvious reasons:
-[ack - grep-like text finder](http://beyondgrep.com/).
-
 ### Gotchas
 
-Some characters have special meaning, and need to be escaped your search
-pattern. For instance, '#'. You have to escape it like this `:Ack '\\\#define
-foo'` to search for '#define foo'. (From blueyed in issue #5.)
+Some characters have special meaning, and need to be escaped in your search
+pattern. For instance, `#`. You need to escape it with `:Ack '\\\#define
+foo'` to search for '#define foo'. See [issue #5].
+
+[issue #5]: https://github.com/mileszs/ack.vim/issues/5
+
+## Possibly FAQ
+
+#### Can I use `ag` ([The Silver Searcher]) with this?
+
+Absolutely, and probably other tools if their output is similar or you can
+write a pattern match for it--just set `g:ackprg`. If you like, you can fall
+back to Ack in case you use your vimrc on a system without Ag available:
+
+```vim
+if executable('ag')
+  let g:ackprg = 'ag --vimgrep'
+endif
+```
+
+Since Ack is quite portable you might check a copy of it into your dotfiles
+repository in `~/bin` so you'll nearly always have it available.
+
+#### What's the difference from ag.vim?
+
+Well... not a lot really.
+
+Present maintainer, yours truly, [kind of wishes they never forked][sadface],
+contributes to both, and wouldn't mind seeing them merged again. ag.vim got a
+nice code clean-up (which ack.vim is now hopefully getting), and ack.vim picked
+up a few features that haven't made their way to ag.vim, like `:AckWindow`,
+optional background search execution with [vim-dispatch], and auto-previewing.
+
+[The Silver Searcher]: https://github.com/ggreer/the_silver_searcher
+[sadface]: https://github.com/mileszs/ack.vim/commit/d97090fb502d40229e6976dfec0e06636ba227d5#commitcomment-5771145
 
 ## Changelog
 
-### 1.0
+Please see [the Github releases page][releases].
 
-* Remove support to ack 1.x
-* Start to use a Changelog
-* Use `autoload` directory to define functions, instead of `plugin`.
-* Add option to auto fold the results(`g:ack_autofold_results`)
-* Improve documentation, list all options and shortcuts
-* Improve highlight option to work when passes directories or use quotes.
-* Add g:ack_mapping
-* Add g:ack_default_options
-* Add a help toggle `?`(like NERDTree)
+### 1.0.9 (unreleased)
 
-### 1.0.1
+* Fix location list and layout of quickfix when using Dispatch (#154)
+* Fix the quick help overlay clobbering the list mappings
+* Fix `:AckFile` when using Dispatch
+* Restore original `'makeprg'` and `'errorformat'` when using Dispatch
+* Internal refactoring and clean-up
 
-* Fixes #124. Bug with `g:ack_autofold_results`
+## Credits
 
-### 1.0.2
+This plugin is derived from Antoine Imbert's blog post [Ack and Vim
+Integration][] (in particular, the function in the update to the post). [Miles
+Sterrett][mileszs] packaged it up as a plugin and documented it in Vim's help
+format, and since then [many contributors][contributors] have submitted
+enhancements and fixes.
 
-* Add compatibility with [vim-dispatch](https://github.com/tpope/vim-dispatch)
+And of course, where would we be without [Ack]. And, you know, Vim.
 
-### 1.0.3
+[Ack and Vim Integration]: http://blog.ant0ine.com/typepad/2007/03/ack-and-vim-integration.html
+[mileszs]: https://github.com/mileszs
+[contributors]: https://github.com/mileszs/ack.vim/graphs/contributors
+[Ack]: http://beyondgrep.com/
 
-* Fixes #127. Use `&l:hlsearch` instead of `v:hlsearch` to keep compatibility
-with versions that does not have this variable.
-
-### 1.0.4
-
-* Fixes #128. Always apply mappings, even when using vim-dispatch.
-
-### 1.0.5
-
-* Fixes #128. Fixes the `errorformat` for ack when using vim-dispatch.
-* Do not use vim-dispatch by default. To use vim-dispath must set
-`g:ack_use_dispatch`
-
-### 1.0.6
-
-* Fixes highlight function to work when user passes options. Ex.: Ack -i test
-  Thank's @mannih. (#131, #134)
-
-### 1.0.7
-
-* Fixes highlight function to work when passes more than one option, or options
-with double dashes(--option) Thank's to @MiguelLatorre and @mannih
-
-### 1.0.8
-
-* Fixes (again) highlight, now using negative look behind.
-* Change mappings `o` and `O` to behave as documented
+[vim-dispatch]: https://github.com/tpope/vim-dispatch
+[releases]: https://github.com/mileszs/ack.vim/releases
diff --git a/sources_non_forked/ack.vim/autoload/ack.vim b/sources_non_forked/ack.vim/autoload/ack.vim
index fae73b1f..fd6e54ca 100644
--- a/sources_non_forked/ack.vim/autoload/ack.vim
+++ b/sources_non_forked/ack.vim/autoload/ack.vim
@@ -1,6 +1,30 @@
-function! ack#Ack(cmd, args)
+if exists('g:ack_use_dispatch')
+  if g:ack_use_dispatch && !exists(':Dispatch')
+    call s:Warn('Dispatch not loaded! Falling back to g:ack_use_dispatch = 0.')
+    let g:ack_use_dispatch = 0
+  endif
+else
+  let g:ack_use_dispatch = 0
+end
+
+"-----------------------------------------------------------------------------
+" Public API
+"-----------------------------------------------------------------------------
+
+function! ack#Ack(cmd, args) "{{{
+  call s:Init(a:cmd)
   redraw
-  echo "Searching ..."
+
+  " Local values that we'll temporarily set as options when searching
+  let l:grepprg = g:ackprg
+  let l:grepformat = '%f:%l:%c:%m,%f:%l:%m'  " Include column number
+
+  " Strip some options that are meaningless for path search and set match
+  " format accordingly.
+  if s:SearchingFilepaths()
+    let l:grepprg = substitute(l:grepprg, '-H\|--column', '', 'g')
+    let l:grepformat = '%f'
+  endif
 
   " If no pattern is provided, search for the word under the cursor
   if empty(a:args)
@@ -8,89 +32,129 @@ function! ack#Ack(cmd, args)
   else
     let l:grepargs = a:args . join(a:000, ' ')
   end
-  echom l:grepargs
-  let l:ackprg_run = g:ackprg
 
-  " Format, used to manage column jump
-  if a:cmd =~# '-g$'
-    let g:ackformat="%f"
-    let l:ackprg_run = substitute(l:ackprg_run, '-H\|--column', '', 'g')
+  " NOTE: we escape special chars, but not everything using shellescape to
+  "       allow for passing arguments etc
+  let l:escaped_args = escape(l:grepargs, '|#%')
+
+  echo "Searching ..."
+
+  if g:ack_use_dispatch
+    call s:SearchWithDispatch(l:grepprg, l:escaped_args, l:grepformat)
   else
-    let g:ackformat="%f:%l:%c:%m,%f:%l:%m"
+    call s:SearchWithGrep(a:cmd, l:grepprg, l:escaped_args, l:grepformat)
   endif
 
-  let grepprg_bak = &grepprg
-  let grepformat_bak = &grepformat
-  let &grepprg=l:ackprg_run
-  let &grepformat=g:ackformat
+  " Dispatch has no callback mechanism currently, we just have to display the
+  " list window early and wait for it to populate :-/
+  call ack#ShowResults()
+  call s:Highlight(l:grepargs)
+endfunction "}}}
 
-  try
-    " NOTE: we escape special chars, but not everything using shellescape to
-    "       allow for passing arguments etc
-    if g:ack_use_dispatch
-      let &l:errorformat = g:ackformat
-      let &l:makeprg=g:ackprg." " . escape(l:grepargs, '|#%')
-      Make
-    else
-      silent execute a:cmd . " " . escape(l:grepargs, '|#%')
-    endif
+function! ack#AckFromSearch(cmd, args) "{{{
+  let search = getreg('/')
+  " translate vim regular expression to perl regular expression.
+  let search = substitute(search, '\(\\<\|\\>\)', '\\b', 'g')
+  call ack#Ack(a:cmd, '"' . search . '" ' . a:args)
+endfunction "}}}
 
-  finally
-    let &grepprg=grepprg_bak
-    let &grepformat=grepformat_bak
-  endtry
+function! ack#AckHelp(cmd, args) "{{{
+  let args = a:args . ' ' . s:GetDocLocations()
+  call ack#Ack(a:cmd, args)
+endfunction "}}}
 
-  if a:cmd =~# '^l'
-    let s:handler = g:ack_lhandler
-    let s:apply_mappings = g:ack_apply_lmappings
-    let s:close_cmd = ':lclose<CR>'
-  else
-    let s:handler = g:ack_qhandler
-    let s:apply_mappings = g:ack_apply_qmappings
-    let s:close_cmd = ':cclose<CR>'
-  endif
+function! ack#AckWindow(cmd, args) "{{{
+  let files = tabpagebuflist()
 
-  if !g:ack_use_dispatch
-    call ack#show_results()
-  else
-    copen
-  endif
-  call <SID>apply_maps()
-  call <SID>highlight(l:grepargs)
+  " remove duplicated filenames (files appearing in more than one window)
+  let files = filter(copy(sort(files)), 'index(files,v:val,v:key+1)==-1')
+  call map(files, "bufname(v:val)")
 
+  " remove unnamed buffers as quickfix (empty strings before shellescape)
+  call filter(files, 'v:val != ""')
+
+  " expand to full path (avoid problems with cd/lcd in au QuickFixCmdPre)
+  let files = map(files, "shellescape(fnamemodify(v:val, ':p'))")
+  let args = a:args . ' ' . join(files)
+
+  call ack#Ack(a:cmd, args)
+endfunction "}}}
+
+function! ack#ShowResults() "{{{
+  let l:handler = s:UsingLocList() ? g:ack_lhandler : g:ack_qhandler
+  execute l:handler
+  call s:ApplyMappings()
   redraw!
-endfunction
+endfunction "}}}
 
-function! ack#show_results()
-  execute s:handler
-endfunction
+"-----------------------------------------------------------------------------
+" Private API
+"-----------------------------------------------------------------------------
 
-function! s:apply_maps()
-  let g:ack_mappings.q = s:close_cmd
-
-  execute "nnoremap <buffer> <silent> ? :call ack#quick_help()<CR>"
-
-  if s:apply_mappings && &ft == "qf"
-    if g:ack_autoclose
-      for key_map in items(g:ack_mappings)
-        execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1) . s:close_cmd)
-      endfor
-      execute "nnoremap <buffer> <silent> <CR> <CR>" . s:close_cmd
-    else
-      for key_map in items(g:ack_mappings)
-        execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1))
-      endfor
-    endif
-
-    if exists("g:ackpreview") " if auto preview in on, remap j and k keys
-      execute "nnoremap <buffer> <silent> j j<CR><C-W><C-W>"
-      execute "nnoremap <buffer> <silent> k k<CR><C-W><C-W>"
-    endif
+function! s:ApplyMappings() "{{{
+  if !s:UsingListMappings() || &filetype != 'qf'
+    return
   endif
-endfunction
 
-function! ack#quick_help()
-  execute "edit " . globpath(&rtp, "doc/ack_quick_help.txt")
+  let l:wintype = s:UsingLocList() ? 'l' : 'c'
+  let l:closemap = ':' . l:wintype . 'close<CR>'
+  let g:ack_mappings.q = l:closemap
+
+  nnoremap <buffer> <silent> ? :call <SID>QuickHelp()<CR>
+
+  if g:ack_autoclose
+    " We just map the 'go' and 'gv' mappings to close on autoclose, wtf?
+    for key_map in items(g:ack_mappings)
+      execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1) . l:closemap)
+    endfor
+
+    execute "nnoremap <buffer> <silent> <CR> <CR>" . l:closemap
+  else
+    for key_map in items(g:ack_mappings)
+      execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1))
+    endfor
+  endif
+
+  if exists("g:ackpreview") " if auto preview in on, remap j and k keys
+    nnoremap <buffer> <silent> j j<CR><C-W><C-W>
+    nnoremap <buffer> <silent> k k<CR><C-W><C-W>
+  endif
+endfunction "}}}
+
+function! s:GetDocLocations() "{{{
+  let dp = ''
+  for p in split(&rtp, ',')
+    let p = p . '/doc/'
+    if isdirectory(p)
+      let dp = p . '*.txt ' . dp
+    endif
+  endfor
+
+  return dp
+endfunction "}}}
+
+function! s:Highlight(args) "{{{
+  if !g:ackhighlight
+    return
+  endif
+
+  let @/ = matchstr(a:args, "\\v(-)\@<!(\<)\@<=\\w+|['\"]\\zs.{-}\\ze['\"]")
+  call feedkeys(":let &hlsearch=1 \| echo \<CR>", "n")
+endfunction "}}}
+
+" Initialize state for an :Ack* or :LAck* search
+function! s:Init(cmd) "{{{
+  let s:searching_filepaths = (a:cmd =~# '-g$') ? 1 : 0
+  let s:using_loclist       = (a:cmd =~# '^l') ? 1 : 0
+
+  if g:ack_use_dispatch && s:using_loclist
+    call s:Warn('Dispatch does not support location lists! Proceeding with quickfix...')
+    let s:using_loclist = 0
+  endif
+endfunction "}}}
+
+function! s:QuickHelp() "{{{
+  execute 'edit' globpath(&rtp, 'doc/ack_quick_help.txt')
 
   silent normal gg
   setlocal buftype=nofile
@@ -104,51 +168,68 @@ function! ack#quick_help()
   setlocal nowrap
   setlocal foldlevel=20
   setlocal foldmethod=diff
-  nnoremap <buffer> <silent> ? :q!<CR>:call ack#show_results()<CR>
-endfunction
 
-function! s:highlight(args)
-  if !g:ackhighlight
-    return
+  nnoremap <buffer> <silent> ? :q!<CR>:call ack#ShowResults()<CR>
+endfunction "}}}
+
+function! s:SearchWithDispatch(grepprg, grepargs, grepformat) "{{{
+  let l:makeprg_bak     = &l:makeprg
+  let l:errorformat_bak = &l:errorformat
+
+  " We don't execute a :grep command for Dispatch, so add -g here instead
+  if s:SearchingFilepaths()
+    let l:grepprg = a:grepprg . ' -g'
+  else
+    let l:grepprg = a:grepprg
   endif
 
-  let @/ = matchstr(a:args, "\\v(-)\@<!(\<)\@<=\\w+|['\"]\\zs.{-}\\ze['\"]")
-  call feedkeys(":let &l:hlsearch=1 \| echo \<CR>", "n")
-endfunction
+  try
+    let &l:makeprg     = l:grepprg . ' ' . a:grepargs
+    let &l:errorformat = a:grepformat
 
-function! ack#AckFromSearch(cmd, args)
-  let search = getreg('/')
-  " translate vim regular expression to perl regular expression.
-  let search = substitute(search, '\(\\<\|\\>\)', '\\b', 'g')
-  call ack#Ack(a:cmd, '"' . search . '" ' . a:args)
-endfunction
+    Make
+  finally
+    let &l:makeprg     = l:makeprg_bak
+    let &l:errorformat = l:errorformat_bak
+  endtry
+endfunction "}}}
 
-function! s:GetDocLocations()
-  let dp = ''
-  for p in split(&rtp, ',')
-    let p = p . '/doc/'
-    if isdirectory(p)
-      let dp = p . '*.txt ' . dp
-    endif
-  endfor
+function! s:SearchWithGrep(grepcmd, grepprg, grepargs, grepformat) "{{{
+  let l:grepprg_bak    = &l:grepprg
+  let l:grepformat_bak = &grepformat
 
-  return dp
-endfunction
+  try
+    let &l:grepprg  = a:grepprg
+    let &grepformat = a:grepformat
 
-function! ack#AckHelp(cmd, args)
-  let args = a:args . ' ' . s:GetDocLocations()
-  call ack#Ack(a:cmd, args)
-endfunction
+    silent execute a:grepcmd a:grepargs
+  finally
+    let &l:grepprg  = l:grepprg_bak
+    let &grepformat = l:grepformat_bak
+  endtry
+endfunction "}}}
 
-function! ack#AckWindow(cmd, args)
-  let files = tabpagebuflist()
-  " remove duplicated filenames (files appearing in more than one window)
-  let files = filter(copy(sort(files)), 'index(files,v:val,v:key+1)==-1')
-  call map(files, "bufname(v:val)")
-  " remove unnamed buffers as quickfix (empty strings before shellescape)
-  call filter(files, 'v:val != ""')
-  " expand to full path (avoid problems with cd/lcd in au QuickFixCmdPre)
-  let files = map(files, "shellescape(fnamemodify(v:val, ':p'))")
-  let args = a:args . ' ' . join(files)
-  call ack#Ack(a:cmd, args)
-endfunction
+" Are we finding matching files, not lines? (the -g option -- :AckFile)
+function! s:SearchingFilepaths() "{{{
+  return get(s:, 'searching_filepaths', 0)
+endfunction "}}}
+
+" Predicate for whether mappings are enabled for list type of current search.
+function! s:UsingListMappings() "{{{
+  if s:UsingLocList()
+    return g:ack_apply_lmappings
+  else
+    return g:ack_apply_qmappings
+  endif
+endfunction "}}}
+
+" Were we invoked with a :LAck command?
+function! s:UsingLocList() "{{{
+  return get(s:, 'using_loclist', 0)
+endfunction "}}}
+
+function! s:Warn(msg) "{{{
+  echohl WarningMsg | echomsg 'Ack: ' . a:msg | echohl None
+endf "}}}
+
+" vim:set et sw=2 ts=2 tw=78 fdm=marker
diff --git a/sources_non_forked/ack.vim/doc/ack.txt b/sources_non_forked/ack.vim/doc/ack.txt
index 6b1be331..71d74548 100644
--- a/sources_non_forked/ack.vim/doc/ack.txt
+++ b/sources_non_forked/ack.vim/doc/ack.txt
@@ -68,7 +68,12 @@ with the line number of the occurrence, once for each occurrence.  <Enter> on
 a line in this window will open the file, and place the cursor on the matching
 line.
 
-See http://betterthangrep.com/ for more information.
+Note that if you are using Dispatch.vim with |g:ack_use_dispatch|, location
+lists are not supported, because Dispatch does not support them at this time.
+`:LAck` versions of commands above will give a warning and proceed to use the
+quickfix list instead.
+
+See http://beyondgrep.com/ for more information on searching with ack.
 
 
 ==============================================================================
@@ -208,7 +213,12 @@ Example:
 g:ack_use_dispatch
 Default: 0
 
-Use this option to use vim-dispatch to search the results in background
+Use this option to use vim-dispatch to run searches in the background, with a
+variety of execution backends for different systems.
+
+Due to limitations in Dispatch at this time, location lists are unsupported
+and result windows will appear before results are ready. Still, these may be
+acceptable tradeoffs for very large projects where searches are slow.
 
 Example:
 >
diff --git a/sources_non_forked/ack.vim/doc/ack_quick_help.txt b/sources_non_forked/ack.vim/doc/ack_quick_help.txt
index 5c52f6cb..bcdf5160 100644
--- a/sources_non_forked/ack.vim/doc/ack_quick_help.txt
+++ b/sources_non_forked/ack.vim/doc/ack_quick_help.txt
@@ -1,6 +1,6 @@
 ====  ack.vim quick help ===============
 
-  *?:*  Show this help
+  *?:*  Show/quit this help
   *t:*  Open in a new tab
   *T:*  Open in a new tab silently
   *o:*  Open
diff --git a/sources_non_forked/ack.vim/plugin/ack.vim b/sources_non_forked/ack.vim/plugin/ack.vim
index 6d6c55bc..2cc48036 100644
--- a/sources_non_forked/ack.vim/plugin/ack.vim
+++ b/sources_non_forked/ack.vim/plugin/ack.vim
@@ -1,3 +1,7 @@
+if exists('g:loaded_ack')
+  finish
+endif
+
 if !exists("g:ack_default_options")
   let g:ack_default_options = " -s -H --nocolor --nogroup --column"
 endif
@@ -22,10 +26,6 @@ if !exists("g:ack_apply_lmappings")
   let g:ack_apply_lmappings = !exists("g:ack_lhandler")
 endif
 
-if !exists("g:ack_use_dispatch")
-  let g:ack_use_dispatch = 0
-end
-
 let s:ack_mappings = {
       \ "t": "<C-W><CR><C-W>T",
       \ "T": "<C-W><CR><C-W>TgT<C-W>j",
@@ -73,3 +73,7 @@ command! -bang -nargs=* -complete=help AckHelp       call ack#AckHelp('grep<bang
 command! -bang -nargs=* -complete=help LAckHelp      call ack#AckHelp('lgrep<bang>', <q-args>)
 command! -bang -nargs=* -complete=help AckWindow     call ack#AckWindow('grep<bang>', <q-args>)
 command! -bang -nargs=* -complete=help LAckWindow    call ack#AckWindow('lgrep<bang>', <q-args>)
+
+let g:loaded_ack = 1
+
+" vim:set et sw=2 ts=2 tw=78 fdm=marker
diff --git a/sources_non_forked/goyo.vim/autoload/goyo.vim b/sources_non_forked/goyo.vim/autoload/goyo.vim
index e4a904f7..b790e893 100644
--- a/sources_non_forked/goyo.vim/autoload/goyo.vim
+++ b/sources_non_forked/goyo.vim/autoload/goyo.vim
@@ -160,6 +160,18 @@ endfunction
 
 function! s:goyo_on(width)
   let s:orig_tab = tabpagenr()
+  let settings =
+    \ { 'laststatus':    &laststatus,
+    \   'showtabline':   &showtabline,
+    \   'fillchars':     &fillchars,
+    \   'winminwidth':   &winminwidth,
+    \   'winwidth':      &winwidth,
+    \   'winminheight':  &winminheight,
+    \   'winheight':     &winheight,
+    \   'ruler':         &ruler,
+    \   'sidescroll':    &sidescroll,
+    \   'sidescrolloff': &sidescrolloff
+    \ }
 
   " New tab
   tab split
@@ -170,18 +182,7 @@ function! s:goyo_on(width)
   let t:goyo_margin_bottom = get(g:, 'goyo_margin_bottom', 4)
   let t:goyo_initial_dim = [t:goyo_width, t:goyo_margin_top, t:goyo_margin_bottom]
   let t:goyo_pads = {}
-  let t:goyo_revert =
-    \ { 'laststatus':     &laststatus,
-    \   'showtabline':    &showtabline,
-    \   'fillchars':      &fillchars,
-    \   'winminwidth':    &winminwidth,
-    \   'winwidth':       &winwidth,
-    \   'winminheight':   &winminheight,
-    \   'winheight':      &winheight,
-    \   'ruler':          &ruler,
-    \   'sidescroll':     &sidescroll,
-    \   'sidescrolloff':  &sidescrolloff
-    \ }
+  let t:goyo_revert = settings
   let t:goyo_maps = extend(s:maps_nop(), s:maps_resize())
   if has('gui_running')
     let t:goyo_revert.guioptions = &guioptions
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index f8cf88b7..73c09c66 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -29,14 +29,15 @@
 4.3. [Are there any local checkers for HTML5 that I can use with syntastic?](#faqhtml5)  
 4.4. [The `perl` checker has stopped working...](#faqperl)  
 4.5. [What happened to the `rustc` checker?](#faqrust)  
-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 pass additional arguments to a checker?](#faqargs)  
-4.8. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
-4.9. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
-4.10. [I have enabled multiple checkers for the current filetype.  How can I display all of the errors from all of the checkers together?](#faqaggregate)  
-4.11. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
-4.12. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
+4.6. [What happened to the `xcrun` checker?](#faqxcrun)  
+4.7. [I run a checker and the location list is not updated...](#faqloclist)  
+4.7. [I run`:lopen` or `:lwindow` and the error window is empty...](#faqloclist)  
+4.8. [How can I pass additional arguments to a checker?](#faqargs)  
+4.9. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
+4.10. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
+4.11. [I have enabled multiple checkers for the current filetype.  How can I display all of the errors from all of the checkers together?](#faqaggregate)  
+4.12. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
+4.13. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
 5. [Resources](#otherresources)  
 
 - - -
@@ -51,7 +52,7 @@ 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, syntax checking plugins exist for ActionScript,
+At the time of this writing, syntastic has checking plugins for ActionScript,
 Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
 Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
 Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell,
@@ -59,11 +60,15 @@ Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo,
 LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM, Objective-C,
 Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
 iOS property lists, Puppet, Python, R, Racket, Relax NG, reStructuredText, RPM
-spec, Ruby, SASS/SCSS, Scala, Slim, Swift, Tcl, TeX, Texinfo, Twig, TypeScript,
+spec, Ruby, SASS/SCSS, Scala, Slim, SML, Tcl, TeX, Texinfo, Twig, TypeScript,
 Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page
 templates, and zsh.  See the [wiki][3] for details about the corresponding
 supported checkers.
 
+A number of third-party Vim plugins also provide checkers for syntastic,
+for example: [omnisharp-vim][25], [rust.vim][12], [syntastic-extras][26],
+[syntastic-more][27], and [vim-swift][24].
+
 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.
@@ -183,10 +188,18 @@ supported, look at the [wiki][3]. 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)).
+
 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
-create an issue - or better yet, create a pull request.
+post an [issue][4] - or better yet, create a pull request.
 
 <a name="faqpython3"></a>
 
@@ -236,14 +249,21 @@ let g:syntastic_enable_perl_checker = 1
 
 __4.5. Q. What happened to the `rustc` checker?__
 
-A. It has been included in the [Rust compiler package][12].  If you have
-a recent version of the Rust compiler, the checker should be picked up
-automatically by syntastic.
+A. It is now part of the [rust.vim][12] plugin.  If you install this plugin the
+checker should be picked up automatically by syntastic.
+
+<a name="faqxcrun"></a>
+
+__4.6. 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][24] plugin.  If you
+install this plugin the checker should be picked up automatically by syntastic.
 
 <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...__
+__4.7. Q. I run a checker and the location list is not updated...__  
+__4.7. 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
@@ -255,7 +275,7 @@ let g:syntastic_always_populate_loc_list = 1
 
 <a name="faqargs"></a>
 
-__4.7. Q. How can I pass additional arguments to a checker?__
+__4.8. Q. How can I pass additional arguments to a checker?__
 
 A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
 that do can be configured using global variables. The general form of the
@@ -271,7 +291,7 @@ See `:help syntastic-checker-options` for more information.
 
 <a name="faqcheckers"></a>
 
-__4.8. Q. Syntastic supports several checkers for my filetype - how do I tell it
+__4.9. Q. Syntastic supports several checkers for my filetype - how do I tell it
 which one(s) to use?__
 
 A. Stick a line like this in your `vimrc`:
@@ -312,7 +332,7 @@ filetype of the current file is `php`).
 
 <a name="faqstyle"></a>
 
-__4.9. Q. What is the difference between syntax checkers and style checkers?__
+__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
@@ -342,7 +362,7 @@ See `:help syntastic_quiet_messages` for details.
 
 <a name="faqaggregate"></a>
 
-__4.10. Q. I have enabled multiple checkers for the current filetype.  How can I
+__4.11. Q. I have enabled multiple checkers for the current filetype.  How can I
 display all of the errors from all of the checkers together?__
 
 A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
@@ -354,7 +374,7 @@ See `:help syntastic-aggregating-errors` for more details.
 
 <a name="faqlnext"></a>
 
-__4.11. Q. How can I jump between the different errors without using the location
+__4.12. 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
@@ -366,7 +386,7 @@ mappings (among other things).
 
 <a name="faqbdelete"></a>
 
-__4.12. Q. The error window is closed automatically when I :quit the current buffer
+__4.13. 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
@@ -404,7 +424,7 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [9]: http://valloric.github.io/YouCompleteMe/
 [10]: http://perldoc.perl.org/perlrun.html#*-c*
 [11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
-[12]: https://github.com/rust-lang/rust/
+[12]: https://github.com/rust-lang/rust.vim
 [13]: http://www.vim.org/
 [14]: https://github.com/Shougo/neobundle.vim
 [15]: https://github.com/MarcWeber/vim-addon-manager
@@ -416,6 +436,10 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [21]: https://github.com/validator/validator/releases/latest
 [22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
 [23]: http://validator.github.io/validator/#standalone
+[24]: https://github.com/kballard/vim-swift
+[25]: https://github.com/OmniSharp/omnisharp-vim
+[26]: https://github.com/myint/syntastic-extras
+[27]: https://github.com/roktas/syntastic-more
 
 <!--
 vim:tw=79:sw=4:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 44279d1f..91cf46de 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -10,14 +10,14 @@ set cpo&vim
 
 " convenience function to determine the 'null device' parameter
 " based on the current operating system
-function! syntastic#c#NullOutput() " {{{2
+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) " {{{2
+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
@@ -69,7 +69,7 @@ function! syntastic#c#ReadConfig(file) " {{{2
 endfunction " }}}2
 
 " GetLocList() for C-like compilers
-function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
+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$/
@@ -96,7 +96,7 @@ endfunction " }}}2
 " Private functions {{{1
 
 " initialize c/cpp syntax checker handlers
-function! s:_init() " {{{2
+function! s:_init() abort " {{{2
     let s:handlers = []
     let s:cflags = {}
 
@@ -118,7 +118,7 @@ function! s:_init() " {{{2
 endfunction " }}}2
 
 " register a handler dictionary object
-function! s:_registerHandler(regex, function, args) " {{{2
+function! s:_registerHandler(regex, function, args) abort " {{{2
     let handler = {}
     let handler["regex"] = a:regex
     let handler["func"] = function(a:function)
@@ -129,7 +129,7 @@ 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, ...) " {{{2
+function! s:_checkPackage(name, ...) abort " {{{2
     if executable('pkg-config')
         if !has_key(s:cflags, a:name)
             for pkg in a:000
@@ -150,7 +150,7 @@ function! s:_checkPackage(name, ...) " {{{2
 endfunction " }}}2
 
 " try to find PHP includes with 'php-config'
-function! s:_checkPhp() " {{{2
+function! s:_checkPhp() abort " {{{2
     if executable('php-config')
         if !has_key(s:cflags, 'php')
             let s:cflags['php'] = system('php-config --includes')
@@ -162,7 +162,7 @@ function! s:_checkPhp() " {{{2
 endfunction " }}}2
 
 " try to find the python headers with distutils
-function! s:_checkPython() " {{{2
+function! s:_checkPython() abort " {{{2
     if executable('python')
         if !has_key(s:cflags, 'python')
             let s:cflags['python'] = system('python -c ''from distutils import ' .
@@ -176,7 +176,7 @@ function! s:_checkPython() " {{{2
 endfunction " }}}2
 
 " try to find the ruby headers with 'rbconfig'
-function! s:_checkRuby() " {{{2
+function! s:_checkRuby() abort " {{{2
     if executable('ruby')
         if !has_key(s:cflags, 'ruby')
             let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
@@ -194,7 +194,7 @@ endfunction " }}}2
 " Utilities {{{1
 
 " resolve checker-related user variables
-function! s:_get_checker_var(scope, filetype, subchecker, name, default) " {{{2
+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}
@@ -206,7 +206,7 @@ function! s:_get_checker_var(scope, filetype, subchecker, name, default) " {{{2
 endfunction " }}}2
 
 " resolve user CFLAGS
-function! s:_get_cflags(ft, ck, opts) " {{{2
+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)
@@ -253,7 +253,7 @@ 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) " {{{2
+function! s:_get_include_dirs(filetype) abort " {{{2
     let include_dirs = []
 
     if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
@@ -271,7 +271,7 @@ endfunction " }}}2
 
 " search the first 100 lines for include statements that are
 " given in the handlers dictionary
-function! s:_search_headers() " {{{2
+function! s:_search_headers() abort " {{{2
     let includes = ''
     let files = []
     let found = []
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index 8573a2fc..e774c2cc 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -10,24 +10,24 @@ let s:one_time_notices_issued = []
 
 " Public functions {{{1
 
-function! syntastic#log#info(msg) " {{{2
+function! syntastic#log#info(msg) abort " {{{2
     echomsg "syntastic: info: " . a:msg
 endfunction " }}}2
 
-function! syntastic#log#warn(msg) " {{{2
+function! syntastic#log#warn(msg) abort " {{{2
     echohl WarningMsg
     echomsg "syntastic: warning: " . a:msg
     echohl None
 endfunction " }}}2
 
-function! syntastic#log#error(msg) " {{{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) " {{{2
+function! syntastic#log#oneTimeWarn(msg) abort " {{{2
     if index(s:one_time_notices_issued, a:msg) >= 0
         return
     endif
@@ -37,7 +37,7 @@ function! syntastic#log#oneTimeWarn(msg) " {{{2
 endfunction " }}}2
 
 " @vimlint(EVL102, 1, l:OLD_VAR)
-function! syntastic#log#deprecationWarn(old, new, ...) " {{{2
+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 '
 
@@ -60,7 +60,7 @@ function! syntastic#log#deprecationWarn(old, new, ...) " {{{2
 endfunction " }}}2
 " @vimlint(EVL102, 0, l:OLD_VAR)
 
-function! syntastic#log#debug(level, msg, ...) " {{{2
+function! syntastic#log#debug(level, msg, ...) abort " {{{2
     if !s:_isDebugEnabled(a:level)
         return
     endif
@@ -80,7 +80,7 @@ function! syntastic#log#debug(level, msg, ...) " {{{2
     call s:_logRedirect(0)
 endfunction " }}}2
 
-function! syntastic#log#debugShowOptions(level, names) " {{{2
+function! syntastic#log#debugShowOptions(level, names) abort " {{{2
     if !s:_isDebugEnabled(a:level)
         return
     endif
@@ -96,7 +96,7 @@ function! syntastic#log#debugShowOptions(level, names) " {{{2
     call s:_logRedirect(0)
 endfunction " }}}2
 
-function! syntastic#log#debugShowVariables(level, names) " {{{2
+function! syntastic#log#debugShowVariables(level, names) abort " {{{2
     if !s:_isDebugEnabled(a:level)
         return
     endif
@@ -115,7 +115,7 @@ function! syntastic#log#debugShowVariables(level, names) " {{{2
     call s:_logRedirect(0)
 endfunction " }}}2
 
-function! syntastic#log#debugDump(level) " {{{2
+function! syntastic#log#debugDump(level) abort " {{{2
     if !s:_isDebugEnabled(a:level)
         return
     endif
@@ -127,11 +127,11 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! s:_isDebugEnabled_smart(level) " {{{2
+function! s:_isDebugEnabled_smart(level) abort " {{{2
     return and(g:syntastic_debug, a:level)
 endfunction " }}}2
 
-function! s:_isDebugEnabled_dumb(level) " {{{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
@@ -139,7 +139,7 @@ endfunction " }}}2
 let s:_isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
 lockvar s:_isDebugEnabled
 
-function! s:_logRedirect(on) " {{{2
+function! s:_logRedirect(on) abort " {{{2
     if exists("g:syntastic_debug_file")
         if a:on
             try
@@ -158,11 +158,11 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:_log_timestamp() " {{{2
+function! s:_log_timestamp() abort " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
 endfunction " }}}2
 
-function! s:_format_variable(name) " {{{2
+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})))
diff --git a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
index 80fd7cf4..f5847611 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/postprocess.vim
@@ -9,7 +9,7 @@ set cpo&vim
 " Public functions {{{1
 
 " merge consecutive blanks
-function! syntastic#postprocess#compressWhitespace(errors) " {{{2
+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')
@@ -22,7 +22,7 @@ function! syntastic#postprocess#compressWhitespace(errors) " {{{2
 endfunction " }}}2
 
 " remove spurious CR under Cygwin
-function! syntastic#postprocess#cygwinRemoveCR(errors) " {{{2
+function! syntastic#postprocess#cygwinRemoveCR(errors) abort " {{{2
     if has('win32unix')
         for e in a:errors
             let e['text'] = substitute(e['text'], '\r', '', 'g')
@@ -33,7 +33,7 @@ function! syntastic#postprocess#cygwinRemoveCR(errors) " {{{2
 endfunction " }}}2
 
 " decode XML entities
-function! syntastic#postprocess#decodeXMLEntities(errors) " {{{2
+function! syntastic#postprocess#decodeXMLEntities(errors) abort " {{{2
     for e in a:errors
         let e['text'] = syntastic#util#decodeXMLEntities(e['text'])
     endfor
@@ -42,13 +42,13 @@ function! syntastic#postprocess#decodeXMLEntities(errors) " {{{2
 endfunction " }}}2
 
 " filter out errors referencing other files
-function! syntastic#postprocess#filterForeignErrors(errors) " {{{2
+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) " {{{2
+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 = {}
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 85d59818..af54a862 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -8,7 +8,7 @@ set cpo&vim
 
 " Public functions {{{1
 
-function! syntastic#preprocess#cabal(errors) " {{{2
+function! syntastic#preprocess#cabal(errors) abort " {{{2
     let out = []
     let star = 0
     for err in a:errors
@@ -28,7 +28,7 @@ function! syntastic#preprocess#cabal(errors) " {{{2
     return out
 endfunction " }}}2
 
-function! syntastic#preprocess#checkstyle(errors) " {{{2
+function! syntastic#preprocess#checkstyle(errors) abort " {{{2
     let out = []
     let fname = expand('%', 1)
     for err in a:errors
@@ -55,14 +55,14 @@ function! syntastic#preprocess#checkstyle(errors) " {{{2
     return out
 endfunction " }}}2
 
-function! syntastic#preprocess#cppcheck(errors) " {{{2
+function! syntastic#preprocess#cppcheck(errors) abort " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
 endfunction " }}}2
 
 " @vimlint(EVL102, 1, l:true)
 " @vimlint(EVL102, 1, l:false)
 " @vimlint(EVL102, 1, l:null)
-function! syntastic#preprocess#flow(errors) " {{{2
+function! syntastic#preprocess#flow(errors) abort " {{{2
     " JSON artifacts
     let true = 1
     let false = 0
@@ -123,11 +123,11 @@ endfunction " }}}2
 " @vimlint(EVL102, 0, l:false)
 " @vimlint(EVL102, 0, l:null)
 
-function! syntastic#preprocess#killEmpty(errors) " {{{2
+function! syntastic#preprocess#killEmpty(errors) abort " {{{2
     return filter(copy(a:errors), 'v:val != ""')
 endfunction " }}}2
 
-function! syntastic#preprocess#perl(errors) " {{{2
+function! syntastic#preprocess#perl(errors) abort " {{{2
     let out = []
 
     for e in a:errors
@@ -143,7 +143,7 @@ endfunction " }}}2
 " @vimlint(EVL102, 1, l:true)
 " @vimlint(EVL102, 1, l:false)
 " @vimlint(EVL102, 1, l:null)
-function! syntastic#preprocess#prospector(errors) " {{{2
+function! syntastic#preprocess#prospector(errors) abort " {{{2
     " JSON artifacts
     let true = 1
     let false = 0
@@ -158,36 +158,38 @@ function! syntastic#preprocess#prospector(errors) " {{{2
     endtry
 
     let out = []
-    if type(errs) == type({}) && has_key(errs, 'messages') && type(errs['messages']) == type([])
-        for e in errs['messages']
-            if type(e) == type({})
-                try
-                    if e['source'] ==# 'pylint'
-                        let e['location']['character'] += 1
-                    endif
+    if type(errs) == type({}) && has_key(errs, 'messages')
+        if type(errs['messages']) == type([])
+            for e in errs['messages']
+                if type(e) == type({})
+                    try
+                        if e['source'] ==# 'pylint'
+                            let e['location']['character'] += 1
+                        endif
 
-                    let msg =
-                        \ e['location']['path'] . ':' .
-                        \ e['location']['line'] . ':' .
-                        \ e['location']['character'] . ': ' .
-                        \ e['code'] . ' ' .
-                        \ e['message'] . ' ' .
-                        \ '[' . e['source'] . ']'
+                        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 add(out, msg)
+                    catch /\m^Vim\%((\a\+)\)\=:E716/
+                        call syntastic#log#warn('checker python/prospector: unknown error format')
+                        let out = []
+                        break
+                    endtry
+                else
                     call syntastic#log#warn('checker python/prospector: unknown error format')
                     let out = []
                     break
-                endtry
-            else
-                call syntastic#log#warn('checker python/prospector: unknown error format')
-                let out = []
-                break
-            endif
-        endfor
-    else
-        call syntastic#log#warn('checker python/prospector: unknown error format')
+                endif
+            endfor
+        else
+            call syntastic#log#warn('checker python/prospector: unknown error format')
+        endif
     endif
 
     return out
@@ -196,7 +198,7 @@ endfunction " }}}2
 " @vimlint(EVL102, 0, l:false)
 " @vimlint(EVL102, 0, l:null)
 
-function! syntastic#preprocess#rparse(errors) " {{{2
+function! syntastic#preprocess#rparse(errors) abort " {{{2
     let errlist = copy(a:errors)
 
     " remove uninteresting lines and handle continuations
@@ -205,7 +207,7 @@ function! syntastic#preprocess#rparse(errors) " {{{2
         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\) '
+        elseif errlist[i] !~# '\m^\(Lint:\|Lint checking:\|Error in\) '
             call remove(errlist, i)
         else
             let i += 1
@@ -235,11 +237,11 @@ function! syntastic#preprocess#rparse(errors) " {{{2
     return out
 endfunction " }}}2
 
-function! syntastic#preprocess#tslint(errors) " {{{2
+function! syntastic#preprocess#tslint(errors) abort " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
 endfunction " }}}2
 
-function! syntastic#preprocess#validator(errors) " {{{2
+function! syntastic#preprocess#validator(errors) abort " {{{2
     let out = []
     for e in a:errors
         let parts = matchlist(e, '\v^"([^"]+)"(.+)')
@@ -254,6 +256,58 @@ function! syntastic#preprocess#validator(errors) " {{{2
     return out
 endfunction " }}}2
 
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! syntastic#preprocess#vint(errors) abort " {{{2
+    " JSON artifacts
+    let true = 1
+    let false = 0
+    let null = ''
+
+    " A hat tip to Marc Weber for this trick
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    try
+        let errs = eval(join(a:errors, ''))
+    catch
+        let errs = []
+    endtry
+
+    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: unknown error format')
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker vim/vint: unknown error format')
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker vim/vint: unknown error format')
+    endif
+
+    return out
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
+
 " }}}1
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index a87e2e25..397e7f15 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -8,11 +8,11 @@ set cpo&vim
 
 " Public functions {{{1
 
-function! syntastic#util#isRunningWindows() " {{{2
+function! syntastic#util#isRunningWindows() abort " {{{2
     return has('win16') || has('win32') || has('win64')
 endfunction " }}}2
 
-function! syntastic#util#DevNull() " {{{2
+function! syntastic#util#DevNull() abort " {{{2
     if syntastic#util#isRunningWindows()
         return 'NUL'
     endif
@@ -24,8 +24,12 @@ function! syntastic#util#Slash() abort " {{{2
     return (!exists("+shellslash") || &shellslash) ? '/' : '\'
 endfunction " }}}2
 
+function! syntastic#util#CygwinPath(path) abort " {{{2
+    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
+endfunction " }}}2
+
 " Create a temporary directory
-function! syntastic#util#tmpdir() " {{{2
+function! syntastic#util#tmpdir() abort " {{{2
     let tempdir = ''
 
     if (has('unix') || has('mac')) && executable('mktemp')
@@ -41,7 +45,7 @@ function! syntastic#util#tmpdir() " {{{2
         if has('win32') || has('win64')
             let tempdir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-' . getpid()
         elseif has('win32unix')
-            let tempdir = s:CygwinPath('/tmp/vim-syntastic-'  . getpid())
+            let tempdir = syntastic#util#CygwinPath('/tmp/vim-syntastic-'  . getpid())
         elseif $TMPDIR != ''
             let tempdir = $TMPDIR . '/vim-syntastic-' . getpid()
         else
@@ -60,7 +64,7 @@ function! syntastic#util#tmpdir() " {{{2
 endfunction " }}}2
 
 " Recursively remove a directory
-function! syntastic#util#rmrf(what) " {{{2
+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
@@ -94,7 +98,7 @@ endfunction " }}}2
 "returns
 "
 "{'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
-function! syntastic#util#parseShebang() " {{{2
+function! syntastic#util#parseShebang() abort " {{{2
     for lnum in range(1, 5)
         let line = getline(lnum)
         if line =~ '^#!'
@@ -109,7 +113,7 @@ function! syntastic#util#parseShebang() " {{{2
 endfunction " }}}2
 
 " Get the value of a variable.  Allow local variables to override global ones.
-function! syntastic#util#var(name, ...) " {{{2
+function! syntastic#util#var(name, ...) abort " {{{2
     return
         \ exists('b:syntastic_' . a:name) ? b:syntastic_{a:name} :
         \ exists('g:syntastic_' . a:name) ? g:syntastic_{a:name} :
@@ -117,7 +121,7 @@ function! syntastic#util#var(name, ...) " {{{2
 endfunction " }}}2
 
 " Parse a version string.  Return an array of version components.
-function! syntastic#util#parseVersion(version) " {{{2
+function! syntastic#util#parseVersion(version) abort " {{{2
     return map(split(matchstr( a:version, '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.'), 'str2nr(v:val)')
 endfunction " }}}2
 
@@ -127,13 +131,13 @@ endfunction " }}}2
 " 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) " {{{2
+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) " {{{2
+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))
@@ -150,7 +154,7 @@ endfunction " }}}2
 let s:_width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
 lockvar s:_width
 
-function! syntastic#util#screenWidth(str, tabstop) " {{{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]
@@ -161,7 +165,7 @@ function! syntastic#util#screenWidth(str, tabstop) " {{{2
 endfunction " }}}2
 
 "print as much of a:msg as possible without "Press Enter" prompt appearing
-function! syntastic#util#wideMsg(msg) " {{{2
+function! syntastic#util#wideMsg(msg) abort " {{{2
     let old_ruler = &ruler
     let old_showcmd = &showcmd
 
@@ -185,7 +189,7 @@ function! syntastic#util#wideMsg(msg) " {{{2
 endfunction " }}}2
 
 " Check whether a buffer is loaded, listed, and not hidden
-function! syntastic#util#bufIsActive(buffer) " {{{2
+function! syntastic#util#bufIsActive(buffer) abort " {{{2
     " convert to number, or hell breaks loose
     let buf = str2nr(a:buffer)
 
@@ -205,7 +209,7 @@ 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#findInParent(what, where) " {{{2
+function! syntastic#util#findInParent(what, where) abort " {{{2
     let here = fnamemodify(a:where, ':p')
 
     let root = syntastic#util#Slash()
@@ -237,7 +241,7 @@ function! syntastic#util#findInParent(what, where) " {{{2
 endfunction " }}}2
 
 " Returns unique elements in a list
-function! syntastic#util#unique(list) " {{{2
+function! syntastic#util#unique(list) abort " {{{2
     let seen = {}
     let uniques = []
     for e in a:list
@@ -250,17 +254,17 @@ function! syntastic#util#unique(list) " {{{2
 endfunction " }}}2
 
 " A less noisy shellescape()
-function! syntastic#util#shescape(string) " {{{2
-    return a:string =~ '\m^[A-Za-z0-9_/.-]\+$' ? a:string : shellescape(a:string)
+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, ...) " {{{2
+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) " {{{2
+function! syntastic#util#argsescape(opt) abort " {{{2
     if type(a:opt) == type('') && a:opt != ''
         return [a:opt]
     elseif type(a:opt) == type([])
@@ -271,7 +275,7 @@ function! syntastic#util#argsescape(opt) " {{{2
 endfunction " }}}2
 
 " decode XML entities
-function! syntastic#util#decodeXMLEntities(string) " {{{2
+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')
@@ -281,7 +285,7 @@ function! syntastic#util#decodeXMLEntities(string) " {{{2
     return str
 endfunction " }}}2
 
-function! syntastic#util#redraw(full) " {{{2
+function! syntastic#util#redraw(full) abort " {{{2
     if a:full
         redraw!
     else
@@ -289,7 +293,7 @@ function! syntastic#util#redraw(full) " {{{2
     endif
 endfunction " }}}2
 
-function! syntastic#util#dictFilter(errors, filter) " {{{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
@@ -303,7 +307,7 @@ endfunction " }}}2
 " Return a [high, low] list of integers, representing the time
 " (hopefully high resolution) since program start
 " TODO: This assumes reltime() returns a list of integers.
-function! syntastic#util#stamp() " {{{2
+function! syntastic#util#stamp() abort " {{{2
     return reltime(g:_SYNTASTIC_START)
 endfunction " }}}2
 
@@ -311,7 +315,7 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! s:_translateFilter(filters) " {{{2
+function! s:_translateFilter(filters) abort " {{{2
     let conditions = []
     for k in keys(a:filters)
         if type(a:filters[k]) == type([])
@@ -327,7 +331,7 @@ function! s:_translateFilter(filters) " {{{2
     return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
 endfunction " }}}2
 
-function! s:_translateElement(key, term) " {{{2
+function! s:_translateElement(key, term) abort " {{{2
     let fkey = a:key
     if fkey[0] == '!'
         let fkey = fkey[1:]
@@ -365,7 +369,7 @@ function! s:_translateElement(key, term) " {{{2
     return ret
 endfunction " }}}2
 
-function! s:_rmrf(what) " {{{2
+function! s:_rmrf(what) abort " {{{2
     if !exists('s:rmdir')
         let s:rmdir = syntastic#util#shescape(get(g:, 'netrw_localrmdir', 'rmdir'))
     endif
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index c6ab15d8..0a2593d0 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-16'
+let g:_SYNTASTIC_VERSION = '3.6.0-44'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
@@ -42,15 +42,21 @@ endfor
 let s:_running_windows = syntastic#util#isRunningWindows()
 lockvar s:_running_windows
 
-if !s:_running_windows && executable('uname')
+if s:_running_windows
+    let g:_SYNTASTIC_UNAME = 'Windows'
+elseif executable('uname')
     try
-        let s:_uname = system('uname')
+        let g:_SYNTASTIC_UNAME = split(system('uname'), "\n")[0]
     catch /\m^Vim\%((\a\+)\)\=:E484/
         call syntastic#log#error("your shell " . &shell . " can't handle traditional UNIX syntax for redirections")
         finish
+    catch /\m^Vim\%((\a\+)\)\=:E684/
+        let g:_SYNTASTIC_UNAME = 'Unknown'
     endtry
-    lockvar s:_uname
+else
+    let g:_SYNTASTIC_UNAME = 'Unknown'
 endif
+lockvar g:_SYNTASTIC_UNAME
 
 " }}}1
 
@@ -152,7 +158,7 @@ let s:modemap = g:SyntasticModeMap.Instance()
 " @vimlint(EVL103, 1, a:cursorPos)
 " @vimlint(EVL103, 1, a:cmdLine)
 " @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) " {{{2
+function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) abort " {{{2
     let checker_names = []
     for ft in s:_resolve_filetypes([])
         call extend(checker_names, s:registry.getNamesOfAvailableCheckers(ft))
@@ -167,7 +173,7 @@ endfunction " }}}2
 " @vimlint(EVL103, 1, a:cursorPos)
 " @vimlint(EVL103, 1, a:cmdLine)
 " @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteFiletypes(argLead, cmdLine, cursorPos) " {{{2
+function! s:CompleteFiletypes(argLead, cmdLine, cursorPos) abort " {{{2
     return join(s:registry.getKnownFiletypes(), "\n")
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:cursorPos)
@@ -185,34 +191,34 @@ command! SyntasticSetLoclist call SyntasticSetLoclist()
 
 " Public API {{{1
 
-function! SyntasticCheck(...) " {{{2
+function! SyntasticCheck(...) abort " {{{2
     call s:UpdateErrors(0, a:000)
     call syntastic#util#redraw(g:syntastic_full_redraws)
 endfunction " }}}2
 
-function! SyntasticInfo(...) " {{{2
+function! SyntasticInfo(...) abort " {{{2
     call s:modemap.modeInfo(a:000)
     call s:registry.echoInfoFor(s:_resolve_filetypes(a:000))
     call s:_explain_skip(a:000)
 endfunction " }}}2
 
-function! SyntasticErrors() " {{{2
+function! SyntasticErrors() abort " {{{2
     call g:SyntasticLoclist.current().show()
 endfunction " }}}2
 
-function! SyntasticReset() " {{{2
+function! SyntasticReset() abort " {{{2
     call s:ClearCache()
     call s:notifiers.refresh(g:SyntasticLoclist.New([]))
 endfunction " }}}2
 
-function! SyntasticToggleMode() " {{{2
+function! SyntasticToggleMode() abort " {{{2
     call s:modemap.toggleMode()
     call s:ClearCache()
     call s:notifiers.refresh(g:SyntasticLoclist.New([]))
     call s:modemap.echoMode()
 endfunction " }}}2
 
-function! SyntasticSetLoclist() " {{{2
+function! SyntasticSetLoclist() abort " {{{2
     call g:SyntasticLoclist.current().setloclist()
 endfunction " }}}2
 
@@ -233,7 +239,7 @@ if v:version > 703 || (v:version == 703 && has('patch544'))
     augroup END
 endif
 
-function! s:BufReadPostHook() " {{{2
+function! s:BufReadPostHook() abort " {{{2
     if g:syntastic_check_on_open
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
             \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
@@ -241,19 +247,19 @@ function! s:BufReadPostHook() " {{{2
     endif
 endfunction " }}}2
 
-function! s:BufWritePostHook() " {{{2
+function! s:BufWritePostHook() abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     call s:UpdateErrors(1, [])
 endfunction " }}}2
 
-function! s:BufEnterHook() " {{{2
+function! s:BufEnterHook() abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufEnter, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))) .
         \ ', &buftype = ' . string(&buftype))
     if &buftype == ''
         call s:notifiers.refresh(g:SyntasticLoclist.current())
-    elseif &buftype == 'quickfix'
+    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
@@ -266,7 +272,7 @@ function! s:BufEnterHook() " {{{2
     endif
 endfunction " }}}2
 
-function! s:QuitPreHook() " {{{2
+function! s:QuitPreHook() abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
@@ -280,7 +286,7 @@ endfunction " }}}2
 " Main {{{1
 
 "refresh and redraw all the error info for this buf when saving or reading
-function! s:UpdateErrors(auto_invoked, checker_names) " {{{2
+function! s:UpdateErrors(auto_invoked, checker_names) abort " {{{2
     call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
     call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS)
     call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
@@ -336,13 +342,13 @@ function! s:UpdateErrors(auto_invoked, checker_names) " {{{2
 endfunction " }}}2
 
 "clear the loc list for the buffer
-function! s:ClearCache() " {{{2
+function! s:ClearCache() abort " {{{2
     call s:notifiers.reset(g:SyntasticLoclist.current())
     call b:syntastic_loclist.destroy()
 endfunction " }}}2
 
 "detect and cache all syntax errors in this buffer
-function! s:CacheErrors(checker_names) " {{{2
+function! s:CacheErrors(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()
@@ -351,7 +357,8 @@ function! s:CacheErrors(checker_names) " {{{2
     if !s:_skip_file()
         " debug logging {{{3
         call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . getcwd())
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$PATH = ' . string($PATH))
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd()))
         " }}}3
 
         let filetypes = s:_resolve_filetypes([])
@@ -452,7 +459,7 @@ endfunction " }}}2
 "   '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) " {{{2
+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
@@ -479,8 +486,8 @@ function! SyntasticMake(options) " {{{2
     if has_key(a:options, 'env') && len(a:options['env'])
         for key in keys(a:options['env'])
             if key =~? '\m^[a-z_]\+$'
-                exec 'let env_save[' . string(key) . '] = $' . key
-                exec 'let $' . key . ' = ' . string(a:options['env'][key])
+                execute 'let env_save[' . string(key) . '] = $' . key
+                execute 'let $' . key . ' = ' . string(a:options['env'][key])
             endif
         endfor
     endif
@@ -495,7 +502,7 @@ function! SyntasticMake(options) " {{{2
     let $LC_MESSAGES = old_lc_messages
     if len(env_save)
         for key in keys(env_save)
-            exec 'let $' . key . ' = ' . string(env_save[key])
+            execute 'let $' . key . ' = ' . string(env_save[key])
         endfor
     endif
     " }}}3
@@ -543,7 +550,7 @@ function! SyntasticMake(options) " {{{2
     let &shellredir = old_shellredir
     " }}}3
 
-    if !s:_running_windows && (s:_os_name() =~ "FreeBSD" || s:_os_name() =~ "OpenBSD")
+    if !s:_running_windows && (s:_os_name() =~? "FreeBSD" || s:_os_name() =~? "OpenBSD")
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
@@ -582,7 +589,7 @@ endfunction " }}}2
 "g:syntastic_stl_format
 "
 "return '' if no errors are cached for the buffer
-function! SyntasticStatuslineFlag() " {{{2
+function! SyntasticStatuslineFlag() abort " {{{2
     return g:SyntasticLoclist.current().getStatuslineFlag()
 endfunction " }}}2
 
@@ -590,12 +597,12 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:_resolve_filetypes(filetypes) " {{{2
+function! s:_resolve_filetypes(filetypes) abort " {{{2
     let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
 endfunction " }}}2
 
-function! s:_ignore_file(filename) " {{{2
+function! s:_ignore_file(filename) abort " {{{2
     let fname = fnamemodify(a:filename, ':p')
     for pattern in g:syntastic_ignore_files
         if fname =~# pattern
@@ -606,7 +613,7 @@ function! s:_ignore_file(filename) " {{{2
 endfunction " }}}2
 
 " Skip running in special buffers
-function! s:_skip_file() " {{{2
+function! s:_skip_file() abort " {{{2
     let fname = expand('%', 1)
     let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype != '') ||
         \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
@@ -618,7 +625,7 @@ function! s:_skip_file() " {{{2
 endfunction " }}}2
 
 " Explain why checks will be skipped for the current file
-function! s:_explain_skip(filetypes) " {{{2
+function! s:_explain_skip(filetypes) abort " {{{2
     if empty(a:filetypes) && s:_skip_file()
         let why = []
         let fname = expand('%', 1)
@@ -647,7 +654,7 @@ function! s:_explain_skip(filetypes) " {{{2
 endfunction " }}}2
 
 " Take a list of errors and add default values to them from a:options
-function! s:_add_to_errors(errors, options) " {{{2
+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])
@@ -662,7 +669,7 @@ endfunction " }}}2
 " XXX: Is this still needed?
 " The script changes &shellredir to stop the screen
 " flicking when shelling out to syntax checkers.
-function! s:_bash_hack() " {{{2
+function! s:_bash_hack() abort " {{{2
     if g:syntastic_bash_hack
         if !exists('s:shell_is_bash')
             let s:shell_is_bash =
@@ -677,12 +684,8 @@ function! s:_bash_hack() " {{{2
     endif
 endfunction " }}}2
 
-function! s:_os_name() " {{{2
-    if !exists('s:_uname')
-        let s:_uname = system('uname')
-        lockvar s:_uname
-    endif
-    return s:_uname
+function! s:_os_name() abort " {{{2
+    return g:_SYNTASTIC_UNAME
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
index efda8952..501b8396 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
@@ -7,17 +7,17 @@ let g:SyntasticAutoloclistNotifier = {}
 
 " Public methods {{{1
 "
-function! g:SyntasticAutoloclistNotifier.New() " {{{2
+function! g:SyntasticAutoloclistNotifier.New() abort " {{{2
     let newObj = copy(self)
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticAutoloclistNotifier.refresh(loclist) " {{{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) " {{{2
+function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: toggle')
     if !a:loclist.isEmpty()
         if syntastic#util#var('auto_loc_list') == 1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index 7ba575f4..e72433ca 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -11,17 +11,17 @@ let g:SyntasticBalloonsNotifier = {}
 
 " Public methods {{{1
 
-function! g:SyntasticBalloonsNotifier.New() " {{{2
+function! g:SyntasticBalloonsNotifier.New() abort " {{{2
     let newObj = copy(self)
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticBalloonsNotifier.enabled() " {{{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) " {{{2
+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()
@@ -33,7 +33,7 @@ endfunction " }}}2
 
 " Reset the error balloons
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
+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')
@@ -47,7 +47,7 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! SyntasticBalloonsExprNotifier() " {{{2
+function! SyntasticBalloonsExprNotifier() abort " {{{2
     if !exists('b:syntastic_private_balloons')
         return ''
     endif
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index d8a611e9..a1e062a4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -7,7 +7,7 @@ let g:SyntasticChecker = {}
 
 " Public methods {{{1
 
-function! g:SyntasticChecker.New(args) " {{{2
+function! g:SyntasticChecker.New(args) abort " {{{2
     let newObj = copy(self)
 
     let newObj._filetype = a:args['filetype']
@@ -40,25 +40,43 @@ function! g:SyntasticChecker.New(args) " {{{2
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticChecker.getFiletype() " {{{2
+function! g:SyntasticChecker.getFiletype() abort " {{{2
     return self._filetype
 endfunction " }}}2
 
-function! g:SyntasticChecker.getName() " {{{2
+function! g:SyntasticChecker.getName() abort " {{{2
     return self._name
 endfunction " }}}2
 
-function! g:SyntasticChecker.getExec() " {{{2
-    return
+" 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() dict " {{{2
+    let user_exec =
         \ expand( exists('b:syntastic_' . self._name . '_exec') ? b:syntastic_{self._name}_exec :
-        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec), 1 )
+        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec'), 1 )
+
+    if user_exec != '' && user_exec !=# self._exec
+        let self._exec = user_exec
+        if has_key(self, '_available')
+            " we have a new _exec on the block, it has to be validated
+            call remove(self, '_available')
+        endif
+    endif
 endfunction " }}}2
 
-function! g:SyntasticChecker.getExecEscaped() " {{{2
-    return syntastic#util#shescape(self.getExec())
+function! g:SyntasticChecker.getExec() abort " {{{2
+    return self._exec
 endfunction " }}}2
 
-function! g:SyntasticChecker.getLocListRaw() " {{{2
+function! g:SyntasticChecker.getExecEscaped() abort " {{{2
+    return syntastic#util#shescape(self._exec)
+endfunction " }}}2
+
+function! g:SyntasticChecker.getLocListRaw() abort " {{{2
     let name = self._filetype . '/' . self._name
     try
         let list = self._locListFunc()
@@ -73,11 +91,11 @@ function! g:SyntasticChecker.getLocListRaw() " {{{2
     return list
 endfunction " }}}2
 
-function! g:SyntasticChecker.getLocList() " {{{2
+function! g:SyntasticChecker.getLocList() abort " {{{2
     return g:SyntasticLoclist.New(self.getLocListRaw())
 endfunction " }}}2
 
-function! g:SyntasticChecker.getVersion(...) " {{{2
+function! g:SyntasticChecker.getVersion(...) abort " {{{2
     if !exists('self._version')
         let command = a:0 ? a:1 : self.getExecEscaped() . ' --version'
         let version_output = system(command)
@@ -89,7 +107,7 @@ function! g:SyntasticChecker.getVersion(...) " {{{2
     return get(self, '_version', [])
 endfunction " }}}2
 
-function! g:SyntasticChecker.setVersion(version) " {{{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)
@@ -98,7 +116,7 @@ function! g:SyntasticChecker.setVersion(version) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticChecker.log(msg, ...) " {{{2
+function! g:SyntasticChecker.log(msg, ...) abort " {{{2
     let leader = self._filetype . '/' . self._name . ': '
     if a:0 > 0
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg, a:1)
@@ -107,7 +125,7 @@ function! g:SyntasticChecker.log(msg, ...) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
+function! g:SyntasticChecker.makeprgBuild(opts) abort " {{{2
     let basename = self._filetype . '_' . self._name . '_'
 
     let parts = []
@@ -120,20 +138,21 @@ function! g:SyntasticChecker.makeprgBuild(opts) " {{{2
     return join(parts)
 endfunction " }}}2
 
-function! g:SyntasticChecker.isAvailable() " {{{2
+function! g:SyntasticChecker.isAvailable() abort " {{{2
+    call self.syncExec()
     if !has_key(self, '_available')
         let self._available = self._isAvailableFunc()
     endif
     return self._available
 endfunction " }}}2
 
-function! g:SyntasticChecker.wantSort() " {{{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) " {{{2
+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
@@ -143,7 +162,7 @@ endfunction " }}}2
 
 " Private methods {{{1
 
-function! g:SyntasticChecker._quietMessages(errors) " {{{2
+function! g:SyntasticChecker._quietMessages(errors) abort " {{{2
     " wildcard quiet_messages
     let quiet_filters = copy(syntastic#util#var('quiet_messages', {}))
     if type(quiet_filters) != type({})
@@ -168,7 +187,7 @@ function! g:SyntasticChecker._quietMessages(errors) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
+function! g:SyntasticChecker._populateHighlightRegexes(errors) abort " {{{2
     if has_key(self, '_highlightRegexFunc')
         for e in a:errors
             if e['valid']
@@ -181,7 +200,7 @@ function! g:SyntasticChecker._populateHighlightRegexes(errors) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticChecker._getOpt(opts, basename, name, default) " {{{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) )) )
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index c81cf827..2ec192e2 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -7,16 +7,16 @@ let g:SyntasticCursorNotifier = {}
 
 " Public methods {{{1
 
-function! g:SyntasticCursorNotifier.New() " {{{2
+function! g:SyntasticCursorNotifier.New() abort " {{{2
     let newObj = copy(self)
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticCursorNotifier.enabled() " {{{2
+function! g:SyntasticCursorNotifier.enabled() abort " {{{2
     return syntastic#util#var('echo_current_error')
 endfunction " }}}2
 
-function! g:SyntasticCursorNotifier.refresh(loclist) " {{{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('')))
@@ -28,7 +28,7 @@ function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
 endfunction " }}}2
 
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
+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
@@ -40,7 +40,7 @@ endfunction " }}}2
 
 " Private functions {{{1
 
-function! SyntasticRefreshCursor() " {{{2
+function! SyntasticRefreshCursor() abort " {{{2
     if !exists('b:syntastic_private_messages') || empty(b:syntastic_private_messages)
         " file not checked
         return
@@ -93,7 +93,7 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:_is_same_index(line, old_line, column, idx, messages) " {{{2
+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
@@ -113,7 +113,7 @@ function! s:_is_same_index(line, old_line, column, idx, messages) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_find_index(column, messages) " {{{2
+function! s:_find_index(column, messages) abort " {{{2
     let max = len(a:messages) - 1
     if max == 0
         return 0
diff --git a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
index 0f027b17..2b192473 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/highlighting.vim
@@ -13,7 +13,7 @@ let s:setup_done = 0
 
 " Public methods {{{1
 
-function! g:SyntasticHighlightingNotifier.New() " {{{2
+function! g:SyntasticHighlightingNotifier.New() abort " {{{2
     let newObj = copy(self)
 
     if !s:setup_done
@@ -25,12 +25,12 @@ function! g:SyntasticHighlightingNotifier.New() " {{{2
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticHighlightingNotifier.enabled() " {{{2
+function! g:SyntasticHighlightingNotifier.enabled() abort " {{{2
     return s:has_highlighting && syntastic#util#var('enable_highlighting')
 endfunction " }}}2
 
 " Sets error highlights in the cuirrent window
-function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
+function! g:SyntasticHighlightingNotifier.refresh(loclist) abort " {{{2
     if self.enabled()
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: refresh')
         call self._reset()
@@ -61,7 +61,7 @@ endfunction " }}}2
 
 " Remove all error highlights from the window
 " @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticHighlightingNotifier.reset(loclist) " {{{2
+function! g:SyntasticHighlightingNotifier.reset(loclist) abort " {{{2
     if s:has_highlighting
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: reset')
         call self._reset()
@@ -74,7 +74,7 @@ endfunction " }}}2
 " Private methods {{{1
 
 " One time setup: define our own highlighting
-function! g:SyntasticHighlightingNotifier._setup() " {{{2
+function! g:SyntasticHighlightingNotifier._setup() abort " {{{2
     if s:has_highlighting
         if !hlexists('SyntasticError')
             highlight link SyntasticError SpellBad
@@ -91,7 +91,7 @@ function! g:SyntasticHighlightingNotifier._setup() " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticHighlightingNotifier._reset() " {{{2
+function! g:SyntasticHighlightingNotifier._reset() abort " {{{2
     for match in getmatches()
         if stridx(match['group'], 'Syntastic') == 0
             call matchdelete(match['id'])
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index ced93578..8bc8e353 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -7,7 +7,7 @@ let g:SyntasticLoclist = {}
 
 " Public methods {{{1
 
-function! g:SyntasticLoclist.New(rawLoclist) " {{{2
+function! g:SyntasticLoclist.New(rawLoclist) abort " {{{2
     let newObj = copy(self)
 
     let llist = filter(copy(a:rawLoclist), 'v:val["valid"] == 1')
@@ -27,20 +27,20 @@ function! g:SyntasticLoclist.New(rawLoclist) " {{{2
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticLoclist.current() " {{{2
+function! g:SyntasticLoclist.current() abort " {{{2
     if !exists("b:syntastic_loclist") || empty(b:syntastic_loclist)
         let b:syntastic_loclist = g:SyntasticLoclist.New([])
     endif
     return b:syntastic_loclist
 endfunction " }}}2
 
-function! g:SyntasticLoclist.extend(other) " {{{2
+function! g:SyntasticLoclist.extend(other) abort " {{{2
     let list = self.copyRaw()
     call extend(list, a:other.copyRaw())
     return g:SyntasticLoclist.New(list)
 endfunction " }}}2
 
-function! g:SyntasticLoclist.sort() " {{{2
+function! g:SyntasticLoclist.sort() abort " {{{2
     if !self._sorted
         for e in self._rawLoclist
             call s:_set_screen_column(e)
@@ -52,11 +52,11 @@ function! g:SyntasticLoclist.sort() " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticLoclist.isEmpty() " {{{2
+function! g:SyntasticLoclist.isEmpty() abort " {{{2
     return empty(self._rawLoclist)
 endfunction " }}}2
 
-function! g:SyntasticLoclist.isNewerThan(stamp) " {{{2
+function! g:SyntasticLoclist.isNewerThan(stamp) abort " {{{2
     if !exists("self._stamp")
         let self._stamp = []
         return 0
@@ -64,23 +64,23 @@ function! g:SyntasticLoclist.isNewerThan(stamp) " {{{2
     return syntastic#util#compareLexi(self._stamp, a:stamp) > 0
 endfunction " }}}2
 
-function! g:SyntasticLoclist.copyRaw() " {{{2
+function! g:SyntasticLoclist.copyRaw() abort " {{{2
     return copy(self._rawLoclist)
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getRaw() " {{{2
+function! g:SyntasticLoclist.getRaw() abort " {{{2
     return self._rawLoclist
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getBuffers() " {{{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() " {{{2
+function! g:SyntasticLoclist.getCursorColumns() abort " {{{2
     return self._columns
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
+function! g:SyntasticLoclist.getStatuslineFlag() abort " {{{2
     if !exists("self._stl_format")
         let self._stl_format = ''
     endif
@@ -133,7 +133,7 @@ function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     return self._stl_flag
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getFirstError(...) " {{{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
@@ -148,23 +148,23 @@ function! g:SyntasticLoclist.getFirstError(...) " {{{2
     return 0
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getName() " {{{2
+function! g:SyntasticLoclist.getName() abort " {{{2
     return len(self._name)
 endfunction " }}}2
 
-function! g:SyntasticLoclist.setName(name) " {{{2
+function! g:SyntasticLoclist.setName(name) abort " {{{2
     let self._name = a:name
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getOwner() " {{{2
+function! g:SyntasticLoclist.getOwner() abort " {{{2
     return self._owner
 endfunction " }}}2
 
-function! g:SyntasticLoclist.setOwner(buffer) " {{{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() " {{{2
+function! g:SyntasticLoclist.deploy() abort " {{{2
     call self.setOwner(bufnr(''))
     let self._stamp = syntastic#util#stamp()
     for buf in self.getBuffers()
@@ -172,19 +172,19 @@ function! g:SyntasticLoclist.deploy() " {{{2
     endfor
 endfunction " }}}2
 
-function! g:SyntasticLoclist.destroy() " {{{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) " {{{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() " {{{2
+function! g:SyntasticLoclist.balloons() abort " {{{2
     if !exists("self._cachedBalloons")
         let sep = has("balloon_multiline") ? "\n" : ' | '
 
@@ -207,14 +207,14 @@ function! g:SyntasticLoclist.balloons() " {{{2
     return get(self._cachedBalloons, bufnr(''), {})
 endfunction " }}}2
 
-function! g:SyntasticLoclist.errors() " {{{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() " {{{2
+function! g:SyntasticLoclist.warnings() abort " {{{2
     if !exists("self._cachedWarnings")
         let self._cachedWarnings = self.filter({'type': "W"})
     endif
@@ -223,12 +223,12 @@ 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() " {{{2
+function! g:SyntasticLoclist.hasErrorsOrWarningsToDisplay() abort " {{{2
     return !self.isEmpty()
 endfunction " }}}2
 
 " cache used by EchoCurrentError()
-function! g:SyntasticLoclist.messages(buf) " {{{2
+function! g:SyntasticLoclist.messages(buf) abort " {{{2
     if !exists("self._cachedMessages")
         let self._cachedMessages = {}
 
@@ -280,14 +280,14 @@ endfunction " }}}2
 "would return all errors for buffer 10.
 "
 "Note that all comparisons are done with ==?
-function! g:SyntasticLoclist.filter(filters) " {{{2
+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() " {{{2
+function! g:SyntasticLoclist.setloclist() abort " {{{2
     if !exists('w:syntastic_loclist_set')
         let w:syntastic_loclist_set = 0
     endif
@@ -298,7 +298,7 @@ function! g:SyntasticLoclist.setloclist() " {{{2
 endfunction " }}}2
 
 "display the cached errors for this buf in the location list
-function! g:SyntasticLoclist.show() " {{{2
+function! g:SyntasticLoclist.show() abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: show')
     call self.setloclist()
 
@@ -333,7 +333,7 @@ endfunction " }}}2
 
 " Public functions {{{1
 
-function! SyntasticLoclistHide() " {{{2
+function! SyntasticLoclistHide() abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
     silent! lclose
 endfunction " }}}2
@@ -342,11 +342,11 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:_translate(key, val) " {{{2
+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) " {{{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
@@ -363,7 +363,7 @@ function! s:_set_screen_column(item) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_remove_shadowed_items(errors) " {{{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
@@ -395,7 +395,7 @@ function! s:_remove_shadowed_items(errors) " {{{2
     endwhile
 endfunction " }}}2
 
-function! s:_compare_error_items_by_columns(a, b) " {{{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']
@@ -413,7 +413,7 @@ function! s:_compare_error_items_by_columns(a, b) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_compare_error_items_by_lines(a, b) " {{{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']
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index 4b54a268..becd15f2 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -7,7 +7,7 @@ let g:SyntasticModeMap = {}
 
 " Public methods {{{1
 
-function! g:SyntasticModeMap.Instance() " {{{2
+function! g:SyntasticModeMap.Instance() abort " {{{2
     if !exists('s:SyntasticModeMapInstance')
         let s:SyntasticModeMapInstance = copy(self)
         call s:SyntasticModeMapInstance.synch()
@@ -16,7 +16,7 @@ function! g:SyntasticModeMap.Instance() " {{{2
     return s:SyntasticModeMapInstance
 endfunction " }}}2
 
-function! g:SyntasticModeMap.synch() " {{{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', []))
@@ -28,7 +28,7 @@ function! g:SyntasticModeMap.synch() " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticModeMap.allowsAutoChecking(filetype) " {{{2
+function! g:SyntasticModeMap.allowsAutoChecking(filetype) abort " {{{2
     let fts = split(a:filetype, '\m\.')
 
     if self.isPassive()
@@ -38,7 +38,7 @@ function! g:SyntasticModeMap.allowsAutoChecking(filetype) " {{{2
     endif
 endfunction " }}}2
 
-function! g:SyntasticModeMap.doAutoChecking() " {{{2
+function! g:SyntasticModeMap.doAutoChecking() abort " {{{2
     let local_mode = get(b:, 'syntastic_mode', '')
     if local_mode ==# 'active' || local_mode ==# 'passive'
         return local_mode ==# 'active'
@@ -47,11 +47,11 @@ function! g:SyntasticModeMap.doAutoChecking() " {{{2
     return self.allowsAutoChecking(&filetype)
 endfunction " }}}2
 
-function! g:SyntasticModeMap.isPassive() " {{{2
+function! g:SyntasticModeMap.isPassive() abort " {{{2
     return self._mode ==# 'passive'
 endfunction " }}}2
 
-function! g:SyntasticModeMap.toggleMode() " {{{2
+function! g:SyntasticModeMap.toggleMode() abort " {{{2
     call self.synch()
 
     if self._mode ==# 'active'
@@ -67,12 +67,12 @@ function! g:SyntasticModeMap.toggleMode() " {{{2
     let g:syntastic_mode_map['mode'] = self._mode
 endfunction " }}}2
 
-function! g:SyntasticModeMap.echoMode() " {{{2
+function! g:SyntasticModeMap.echoMode() abort " {{{2
     echo "Syntastic: " . self._mode . " mode enabled"
 endfunction " }}}2
 
-function! g:SyntasticModeMap.modeInfo(filetypes) " {{{2
-    echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION
+function! g:SyntasticModeMap.modeInfo(filetypes) abort " {{{2
+    echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION . ' (Vim ' . v:version . ', ' . g:_SYNTASTIC_UNAME . ')'
     let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     echomsg 'Info for filetype: ' . type
 
@@ -104,11 +104,11 @@ endfunction " }}}2
 
 " Private methods {{{1
 
-function! g:SyntasticModeMap._isOneFiletypeActive(filetypes) " {{{2
+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) " {{{2
+function! g:SyntasticModeMap._noFiletypesArePassive(filetypes) abort " {{{2
     return empty(filter(copy(a:filetypes), 'index(self._passiveFiletypes, v:val) != -1'))
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 7f933a17..0d098232 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -13,7 +13,7 @@ lockvar! s:_PERSISTENT_NOTIFIERS
 
 " Public methods {{{1
 
-function! g:SyntasticNotifiers.Instance() " {{{2
+function! g:SyntasticNotifiers.Instance() abort " {{{2
     if !exists('s:SyntasticNotifiersInstance')
         let s:SyntasticNotifiersInstance = copy(self)
         call s:SyntasticNotifiersInstance._initNotifiers()
@@ -22,7 +22,7 @@ function! g:SyntasticNotifiers.Instance() " {{{2
     return s:SyntasticNotifiersInstance
 endfunction " }}}2
 
-function! g:SyntasticNotifiers.refresh(loclist) " {{{2
+function! g:SyntasticNotifiers.refresh(loclist) abort " {{{2
     if !a:loclist.isEmpty() && !a:loclist.isNewerThan([])
         " loclist not fully constructed yet
         return
@@ -48,7 +48,7 @@ function! g:SyntasticNotifiers.refresh(loclist) " {{{2
     endfor
 endfunction " }}}2
 
-function! g:SyntasticNotifiers.reset(loclist) " {{{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', '')
@@ -71,7 +71,7 @@ endfunction " }}}2
 
 " Private methods {{{1
 
-function! g:SyntasticNotifiers._initNotifiers() " {{{2
+function! g:SyntasticNotifiers._initNotifiers() abort " {{{2
     let self._notifier = {}
     for type in s:_NOTIFIER_TYPES
         let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 9db8ee96..a9ae21e0 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -73,8 +73,8 @@ let s:_DEFAULT_CHECKERS = {
         \ 'scss':        ['sass', 'scss_lint'],
         \ 'sh':          ['sh', 'shellcheck'],
         \ 'slim':        ['slimrb'],
+        \ 'sml':         ['smlnj'],
         \ 'spec':        ['rpmlint'],
-        \ 'swift':       ['xcrun'],
         \ 'tcl':         ['nagelfar'],
         \ 'tex':         ['lacheck', 'chktex'],
         \ 'texinfo':     ['makeinfo'],
@@ -137,7 +137,7 @@ let g:SyntasticRegistry = {}
 " parameters, all private methods take normalized filetypes.  Public methods
 " are thus supposed to normalize filetypes before calling private methods.
 
-function! g:SyntasticRegistry.Instance() " {{{2
+function! g:SyntasticRegistry.Instance() abort " {{{2
     if !exists('s:SyntasticRegistryInstance')
         let s:SyntasticRegistryInstance = copy(self)
         let s:SyntasticRegistryInstance._checkerMap = {}
@@ -146,7 +146,7 @@ function! g:SyntasticRegistry.Instance() " {{{2
     return s:SyntasticRegistryInstance
 endfunction " }}}2
 
-function! g:SyntasticRegistry.CreateAndRegisterChecker(args) " {{{2
+function! g:SyntasticRegistry.CreateAndRegisterChecker(args) abort " {{{2
     let checker = g:SyntasticChecker.New(a:args)
     let registry = g:SyntasticRegistry.Instance()
     call registry._registerChecker(checker)
@@ -156,7 +156,7 @@ endfunction " }}}2
 " 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) " {{{2
+function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) abort " {{{2
     let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
 
@@ -179,11 +179,11 @@ endfunction " }}}2
 
 " Same as getCheckers(), but keep only the checkers available.  This runs the
 " corresponding IsAvailable() functions for all checkers.
-function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) " {{{2
+function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) abort " {{{2
     return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
 endfunction " }}}2
 
-function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
+function! g:SyntasticRegistry.getKnownFiletypes() abort " {{{2
     let types = keys(s:_DEFAULT_CHECKERS)
 
     call extend(types, keys(s:_DEFAULT_FILETYPE_MAP))
@@ -199,13 +199,13 @@ function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
     return syntastic#util#unique(types)
 endfunction " }}}2
 
-function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
+function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) abort " {{{2
     let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
     return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
 endfunction " }}}2
 
-function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
+function! g:SyntasticRegistry.echoInfoFor(ftalias_list) abort " {{{2
     let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normalise_filetype(v:val)' ))
     if len(ft_list) != 1
         let available = []
@@ -274,11 +274,11 @@ function! g:SyntasticRegistry._registerChecker(checker) abort " {{{2
     let self._checkerMap[ft][name] = a:checker
 endfunction " }}}2
 
-function! g:SyntasticRegistry._filterCheckersByName(checkers_map, list) " {{{2
+function! g:SyntasticRegistry._filterCheckersByName(checkers_map, list) abort " {{{2
     return filter( map(copy(a:list), 'get(a:checkers_map, v:val, {})'), '!empty(v:val)' )
 endfunction " }}}2
 
-function! g:SyntasticRegistry._loadCheckersFor(filetype) " {{{2
+function! g:SyntasticRegistry._loadCheckersFor(filetype) abort " {{{2
     if has_key(self._checkerMap, a:filetype)
         return
     endif
@@ -291,7 +291,7 @@ function! g:SyntasticRegistry._loadCheckersFor(filetype) " {{{2
 endfunction " }}}2
 
 " Check for obsolete variable g:syntastic_<filetype>_checker
-function! g:SyntasticRegistry._checkDeprecation(filetype) " {{{2
+function! g:SyntasticRegistry._checkDeprecation(filetype) abort " {{{2
     if exists('g:syntastic_' . a:filetype . '_checker') && !exists('g:syntastic_' . a:filetype . '_checkers')
         let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
         call syntastic#log#oneTimeWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
@@ -304,14 +304,14 @@ endfunction " }}}2
 
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:_normalise_filetype(ftalias) " {{{2
+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) " {{{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'
@@ -321,7 +321,7 @@ function! s:_disabled_by_eclim(filetype) " {{{2
     return 0
 endfunction " }}}2
 
-function! s:_disabled_by_ycm(filetype) " {{{2
+function! s:_disabled_by_ycm(filetype) abort " {{{2
     return index(s:_YCM_TYPES, a:filetype) >= 0
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index db801a77..4a9c4801 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -19,7 +19,7 @@ let s:setup_done = 0
 
 " Public methods {{{1
 
-function! g:SyntasticSignsNotifier.New() " {{{2
+function! g:SyntasticSignsNotifier.New() abort " {{{2
     let newObj = copy(self)
 
     if !s:setup_done
@@ -31,11 +31,11 @@ function! g:SyntasticSignsNotifier.New() " {{{2
     return newObj
 endfunction " }}}2
 
-function! g:SyntasticSignsNotifier.enabled() " {{{2
+function! g:SyntasticSignsNotifier.enabled() abort " {{{2
     return has('signs') && syntastic#util#var('enable_signs')
 endfunction " }}}2
 
-function! g:SyntasticSignsNotifier.refresh(loclist) " {{{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()
@@ -49,7 +49,7 @@ endfunction " }}}2
 " Private methods {{{1
 
 " One time setup: define our own sign types and highlighting
-function! g:SyntasticSignsNotifier._setup() " {{{2
+function! g:SyntasticSignsNotifier._setup() abort " {{{2
     if has('signs')
         if !hlexists('SyntasticErrorSign')
             highlight link SyntasticErrorSign error
@@ -83,7 +83,7 @@ function! g:SyntasticSignsNotifier._setup() " {{{2
 endfunction " }}}2
 
 " Place signs by all syntax errors in the buffer
-function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
+function! g:SyntasticSignsNotifier._signErrors(loclist) abort " {{{2
     let loclist = a:loclist
     if !loclist.isEmpty()
 
@@ -116,7 +116,7 @@ function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
 endfunction " }}}2
 
 " Remove the signs with the given ids from this buffer
-function! g:SyntasticSignsNotifier._removeSigns(ids) " {{{2
+function! g:SyntasticSignsNotifier._removeSigns(ids) abort " {{{2
     if has('signs')
         for s in reverse(copy(a:ids))
             execute "sign unplace " . s
@@ -126,7 +126,7 @@ function! g:SyntasticSignsNotifier._removeSigns(ids) " {{{2
 endfunction " }}}2
 
 " Get all the ids of the SyntaxError signs in the buffer
-function! g:SyntasticSignsNotifier._bufSignIds() " {{{2
+function! g:SyntasticSignsNotifier._bufSignIds() abort " {{{2
     if !exists("b:syntastic_private_sign_ids")
         let b:syntastic_private_sign_ids = []
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 1029fe02..24b1b447 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -146,7 +146,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
     let fname = expand('%:p:h', 1) . syntastic#util#Slash() . expand ('%:t', 1)
 
     if has('win32unix')
-        let fname = s:CygwinPath(fname)
+        let fname = syntastic#util#CygwinPath(fname)
     endif
 
     let makeprg = self.makeprgBuild({
@@ -155,9 +155,9 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
 
     " 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,'.
-        \ '%A%f:%l:\ %m,'.
+        \ '%E%f:%l: error: %m,'.
+        \ '%W%f:%l: warning: %m,'.
+        \ '%A%f:%l: %m,'.
         \ '%+Z%p^,'.
         \ '%+C%.%#,'.
         \ '%-G%.%#'
@@ -179,10 +179,6 @@ endfunction " }}}1
 
 " Utilities {{{1
 
-function! s:CygwinPath(path) " {{{2
-    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
-endfunction " }}}2
-
 function! s:RemoveCarriageReturn(line) " {{{2
     return substitute(a:line, "\r", '', 'g')
 endfunction " }}}2
@@ -360,13 +356,14 @@ function! s:GetMavenClasspath() " {{{2
 
             let mvn_properties = s:GetMavenProperties()
 
-            let output_dir = 'target/classes'
+            let sep = syntastic#util#Slash()
+            let output_dir = join(['target', 'classes'], sep)
             if has_key(mvn_properties, 'project.build.outputDirectory')
                 let output_dir = mvn_properties['project.build.outputDirectory']
             endif
             let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
 
-            let test_output_dir = 'target/test-classes'
+            let test_output_dir = join(['target', 'test-classes'], sep)
             if has_key(mvn_properties, 'project.build.testOutputDirectory')
                 let test_output_dir = mvn_properties['project.build.testOutputDirectory']
             endif
@@ -388,21 +385,23 @@ function! s:MavenOutputDirectory() " {{{2
         if has_key(mvn_properties, 'project.properties.build.dir')
             let output_dir = mvn_properties['project.properties.build.dir']
         endif
-        if stridx(expand('%:p:h', 1), 'src.main.java') >= 0
-            let output_dir .= '/target/classes'
+
+        let sep = syntastic#util#Slash()
+        if stridx(expand('%:p:h', 1), join(['src', 'main', 'java'], sep)) >= 0
+            let output_dir = join ([output_dir, 'target', 'classes'], sep)
             if has_key(mvn_properties, 'project.build.outputDirectory')
                 let output_dir = mvn_properties['project.build.outputDirectory']
             endif
         endif
-        if stridx(expand('%:p:h', 1), 'src.test.java') >= 0
-            let output_dir .= '/target/test-classes'
+        if stridx(expand('%:p:h', 1), join(['src', 'test', 'java'], sep)) >= 0
+            let output_dir = join([output_dir, 'target', 'test-classes'], sep)
             if has_key(mvn_properties, 'project.build.testOutputDirectory')
                 let output_dir = mvn_properties['project.build.testOutputDirectory']
             endif
         endif
 
         if has('win32unix')
-            let output_dir = s:CygwinPath(output_dir)
+            let output_dir = syntastic#util#CygwinPath(output_dir)
         endif
         return output_dir
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
new file mode 100644
index 00000000..a1f26b6d
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"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
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_standard_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return 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/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
index 55858ca7..8aed331e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
@@ -22,7 +22,7 @@ function! SyntaxCheckers_json_jsonval_GetLocList() dict
     let makeprg = self.makeprgBuild({})
 
     let errorformat =
-        \ '%E%f:\ %m\ at\ line\ %l,' .
+        \ '%E%f: %m at line %l,' .
         \ '%-G%.%#'
 
     return SyntasticMake({
diff --git a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
index 4262d285..a2a46e69 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
@@ -21,7 +21,7 @@ set cpo&vim
 function! SyntaxCheckers_nasm_nasm_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args_after': '-X gnu -f elf' .
-        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . '/') .
+        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . syntastic#util#Slash()) .
         \       ' ' . syntastic#c#NullOutput() })
 
     let errorformat = '%f:%l: %t%*[^:]: %m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
index 8a0ee2f6..a169139b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -46,7 +46,7 @@ endfunction " }}}1
 
 function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
     let makeprg = s:GetMakeprg()
-    if makeprg == ""
+    if makeprg == ''
         return []
     endif
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
index fc7c8e59..3ecee1dd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -44,7 +44,7 @@ function! SyntaxCheckers_python_flake8_GetLocList() dict
             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'
+            if e['type'] ==? 'E' && e['nr'] !~# '\m^9'
                 let e['subtype'] = 'Style'
             endif
             call remove(e, 'nr')
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index 5e8eec58..7c02b31e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -62,7 +62,7 @@ function! SyntaxCheckers_r_lint_GetLocList() dict
         \ 'returns': [0] })
 
     for e in loclist
-        if e['type'] == 'F'
+        if e['type'] ==? 'F'
             " parse error
             let e['type'] = 'E'
             call remove(e, 'subtype')
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
index 5f289af1..8572318d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
@@ -26,7 +26,7 @@ function! SyntaxCheckers_ruby_reek_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_ruby_reek_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --quiet --line-number --single-line' })
+    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --line-number --single-line' })
 
     let errorformat =
         \ '%E%.%#: Racc::ParseError: %f:%l :: %m,' .
@@ -34,7 +34,8 @@ function! SyntaxCheckers_ruby_reek_GetLocList() dict
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2] })
 
     for e in loclist
         if e['type'] ==? 'W'
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index 093571d0..a0282f28 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -23,7 +23,9 @@ 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 ') . '--presenter=syntastic' })
+    let makeprg = self.makeprgBuild({
+        \ 'args': (s:rubylint_new ? '' : 'analyze '),
+        \ 'args_after': '--presenter=syntastic' })
 
     let errorformat = '%f:%t:%l:%c: %m'
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 685efa55..57912ea4 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -28,14 +28,14 @@ function! SyntaxCheckers_slim_slimrb_GetLocList() dict
 
     if s:slimrb_new
         let errorformat =
-            \ '%C\ %#%f\, Line %l\, Column %c,'.
-            \ '%-G\ %.%#,'.
+            \ '%C %#%f\, Line %l\, Column %c,'.
+            \ '%-G %.%#,'.
             \ '%ESlim::Parser::SyntaxError: %m,'.
             \ '%+C%.%#'
     else
         let errorformat =
-            \ '%C\ %#%f\, Line %l,'.
-            \ '%-G\ %.%#,'.
+            \ '%C %#%f\, Line %l,'.
+            \ '%-G %.%#,'.
             \ '%ESlim::Parser::SyntaxError: %m,'.
             \ '%+C%.%#'
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim b/sources_non_forked/syntastic/syntax_checkers/sml/smlnj.vim
similarity index 50%
rename from sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim
rename to sources_non_forked/syntastic/syntax_checkers/sml/smlnj.vim
index 8cf5a987..0c749a4a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/swift/xcrun.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sml/smlnj.vim
@@ -1,46 +1,45 @@
 "============================================================================
-"File:        xcrun.vim
-"Description: swift syntax checker - using xcrun
-"Maintainer:  Tom Fogg <tom@canobe.com>
+"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_swift_xcrun_checker")
+if exists("g:loaded_syntastic_sml_smlnj_checker")
     finish
 endif
-let g:loaded_syntastic_xcrun_checker = 1
+let g:loaded_syntastic_sml_smlnj_checker = 1
 
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_swift_xcrun_GetLocList() dict
+function! SyntaxCheckers_sml_smlnj_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
 
-    let makeprg = self.makeprgBuild({ 'args_after': 'swift' })
-
-    let errorformat=
-        \ '%f:%l:%c:{%*[^}]}: %trror: %m,'.
-        \ '%f:%l:%c:{%*[^}]}: fatal %trror: %m,'.
-        \ '%f:%l:%c:{%*[^}]}: %tarning: %m,'.
-        \ '%f:%l:%c: %trror: %m,'.
-        \ '%f:%l:%c: fatal %trror: %m,'.
-        \ '%f:%l:%c: %tarning: %m,'.
-        \ '%f:%l: %trror: %m,'.
-        \ '%f:%l: fatal %trror: %m,'.
-        \ '%f:%l: %tarning: %m,' .
+    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 })
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'returns': [0, 1] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'swift',
-    \ 'name': 'xcrun'})
+    \ 'filetype': 'sml',
+    \ 'name': 'smlnj',
+    \ 'exec': 'sml'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vint.vim
new file mode 100644
index 00000000..6f442db3
--- /dev/null
+++ b/sources_non_forked/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/sources_non_forked/vim-airline/LICENSE b/sources_non_forked/vim-airline/LICENSE
index 9a5a8b73..49ba02fc 100644
--- a/sources_non_forked/vim-airline/LICENSE
+++ b/sources_non_forked/vim-airline/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2013-2014 Bailey Ling
+Copyright (C) 2013-2015 Bailey Ling
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index fafd4116..ea649fc3 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -178,7 +178,7 @@ Contributions and pull requests are welcome.  Please take note of the following
 
 # License
 
-MIT License. Copyright (c) 2013-2014 Bailey Ling.
+MIT License. Copyright (c) 2013-2015 Bailey Ling.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index 61df8511..1a4e54af 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/sources_non_forked/vim-airline/autoload/airline/builder.vim
index 5f4e080c..ee4bbb79 100644
--- a/sources_non_forked/vim-airline/autoload/airline/builder.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/builder.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:prototype = {}
@@ -77,7 +77,7 @@ function! s:should_change_group(group1, group2)
   endif
   let color1 = airline#highlighter#get_highlight(a:group1)
   let color2 = airline#highlighter#get_highlight(a:group2)
-  if has('gui_running')
+  if has('gui_running') || (has("termtruecolor") && &guicolors == 1)
     return color1[1] != color2[1] || color1[0] != color2[0]
   else
     return color1[3] != color2[3] || color1[2] != color2[2]
diff --git a/sources_non_forked/vim-airline/autoload/airline/debug.vim b/sources_non_forked/vim-airline/autoload/airline/debug.vim
index 28424a65..fb195df1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/debug.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/debug.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#debug#profile1()
diff --git a/sources_non_forked/vim-airline/autoload/airline/deprecation.vim b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
index cf7e7872..7669549e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/deprecation.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#deprecation#check()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 22a91cfe..4f6848f6 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:ext = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 6e82d664..6decaf16 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:has_fugitive = exists('*fugitive#head')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
index 6dc97fe7..f2727c39 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/bufferline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists('*bufferline#get_status_string')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
index e549f27b..8fce75db 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/commandt.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'command_t_loaded', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
index 2c296ab3..f2689dde 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/csv.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_csv', 0) && !exists(':Table')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
index ef7da681..c81fc9c9 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_ctrlp', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
index faa1fb68..51f1c0a2 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
index e2f6531f..9380447f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/eclim.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':ProjectCreate')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
index 4a1932d8..5bf21775 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/example.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " we don't actually want this loaded :P
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
index 968fd66f..7982d505 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/hunks.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0) && !get(g:, 'loaded_changes', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
index debb0888..728dfddd 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/netrw.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':NetrwSettings')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
index 338f6e05..64a7fee8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/nrrwrgn.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_nrrw_rgn', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
index 50b9708f..98513a67 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/promptline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':PromptlineSnapshot')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
index 2be4077e..b358329d 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
index f7179af8..92584813 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/syntastic.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':SyntasticCheck')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 978eacdc..1b186d2f 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -1,36 +1,9 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 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:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
-let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 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)
-let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
-let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
-let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
-let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
-let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
-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)
-let s:spc = g:airline_symbols.space
-
-let s:number_map = &encoding == 'utf-8'
-      \ ? {
-      \ '0': '⁰',
-      \ '1': '¹',
-      \ '2': '²',
-      \ '3': '³',
-      \ '4': '⁴',
-      \ '5': '⁵',
-      \ '6': '⁶',
-      \ '7': '⁷',
-      \ '8': '⁸',
-      \ '9': '⁹'
-      \ }
-      \ : {}
 
 function! airline#extensions#tabline#init(ext)
   if has('gui_running')
@@ -39,42 +12,23 @@ function! airline#extensions#tabline#init(ext)
 
   autocmd User AirlineToggledOn call s:toggle_on()
   autocmd User AirlineToggledOff call s:toggle_off()
-  autocmd BufDelete * let s:current_bufnr = -1
 
   call s:toggle_on()
   call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
-  if s:buffer_idx_mode
-    call s:define_buffer_idx_mode_mappings()
-  endif
 endfunction
 
 function! s:toggle_off()
-  if exists('s:original_tabline')
-    let &tabline = s:original_tabline
-    let &showtabline = s:original_showtabline
-  endif
+  call airline#extensions#tabline#autoshow#off()
+  call airline#extensions#tabline#tabs#off()
+  call airline#extensions#tabline#buffers#off()
 endfunction
 
 function! s:toggle_on()
-  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
+  call airline#extensions#tabline#autoshow#on()
+  call airline#extensions#tabline#tabs#on()
+  call airline#extensions#tabline#buffers#on()
 
   set tabline=%!airline#extensions#tabline#get()
-  augroup airline_tabline
-    autocmd!
-    " Invalidate cache.
-    autocmd BufAdd,BufUnload * unlet! s:current_buffer_list
-
-    if s:buf_min_count <= 0 && s:tab_min_count <= 1
-      set showtabline=2
-    else
-      if s:show_buffers == 1
-        autocmd BufEnter * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()))
-        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()) - 1)
-      else
-        autocmd TabEnter * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
-      endif
-    endif
-  augroup END
 endfunction
 
 function! airline#extensions#tabline#load_theme(palette)
@@ -101,28 +55,19 @@ function! airline#extensions#tabline#load_theme(palette)
   call airline#highlighter#exec('airline_tabhid', l:tabhid)
 endfunction
 
-function! s:show_tabline(min_count, total_count)
-  if a:total_count >= a:min_count
-    if &showtabline != 2
-      set showtabline=2
-    endif
-  else
-    if &showtabline != 0
-      set showtabline=0
-    endif
-  endif
-endfunction
-
+let s:current_tabcnt = -1
 function! airline#extensions#tabline#get()
   let curtabcnt = tabpagenr('$')
   if curtabcnt != s:current_tabcnt
     let s:current_tabcnt = curtabcnt
-    let s:current_bufnr = -1  " force a refresh...
+    call airline#extensions#tabline#tabs#invalidate()
+    call airline#extensions#tabline#buffers#invalidate()
   endif
+
   if s:show_buffers && curtabcnt == 1 || !s:show_tabs
-    return s:get_buffers()
+    return airline#extensions#tabline#buffers#get()
   else
-    return s:get_tabs()
+    return airline#extensions#tabline#tabs#get()
   endif
 endfunction
 
@@ -133,182 +78,10 @@ function! airline#extensions#tabline#title(n)
 endfunction
 
 function! airline#extensions#tabline#get_buffer_name(nr)
-  return airline#extensions#tabline#{s:formatter}#format(a:nr, s:get_buffer_list())
+  return airline#extensions#tabline#formatters#{s:formatter}#format(a:nr, airline#extensions#tabline#buflist#list())
 endfunction
 
-function! s:get_buffer_list()
-  if exists('s:current_buffer_list')
-    return s:current_buffer_list
-  endif
-
-  let buffers = []
-  let cur = bufnr('%')
-  for nr in range(1, bufnr('$'))
-    if buflisted(nr) && bufexists(nr)
-      let toadd = 1
-      for ex in s:excludes
-        if match(bufname(nr), ex) >= 0
-          let toadd = 0
-          break
-        endif
-      endfor
-      if getbufvar(nr, 'current_syntax') == 'qf'
-        let toadd = 0
-      endif
-      if toadd
-        call add(buffers, nr)
-      endif
-    endif
-  endfor
-
-  let s:current_buffer_list = buffers
-  return buffers
-endfunction
-
-function! s:get_visible_buffers()
-  let buffers = s:get_buffer_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 g:current_visible_buffers = buffers
-  return buffers
-endfunction
-
-let s:current_bufnr = -1
-let s:current_tabnr = -1
-let s:current_tabcnt = -1
-let s:current_tabline = ''
-let s:current_modified = 0
-function! s:get_buffers()
-  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 = s: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
-
-    if cur == nr
-      if g:airline_detect_modified && getbufvar(nr, '&modified')
-        let group = 'airline_tabmod'
-      else
-        let group = 'airline_tabsel'
-      endif
-      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
-    else
-      if g:airline_detect_modified && getbufvar(nr, '&modified')
-        let group = 'airline_tabmod_unsel'
-      elseif index(tab_bufs, nr) > -1
-        let group = 'airline_tab'
-      else
-        let group = 'airline_tabhid'
-      endif
-    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
-  endfor
-
-  call b.add_section('airline_tabfill', '')
-  call b.split()
-  call b.add_section('airline_tabfill', '')
-  call b.add_section('airline_tabtype', ' buffers ')
-
-  let s:current_bufnr = cur
-  let s:current_tabline = b.build()
-  return s:current_tabline
-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 g:current_visible_buffers[0] == -1
-    let idx = idx + 1
-  endif
-
-  let buf = get(g:current_visible_buffers, idx, 0)
-  if buf != 0
-    exec 'b!' . buf
-  endif
-endfunction
-
-function! s:define_buffer_idx_mode_mappings()
-  noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
-  noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
-  noremap <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
-  noremap <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
-  noremap <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
-  noremap <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
-  noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
-  noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
-  noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
-endfunction
-
-function! s:new_builder()
+function! airline#extensions#tabline#new_builder()
   let builder_context = {
         \ 'active'        : 1,
         \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
@@ -324,54 +97,3 @@ function! s:new_builder()
 
   return airline#builder#new(builder_context)
 endfunction
-
-function! s:get_tabs()
-  let curbuf = bufnr('%')
-  let curtab = tabpagenr()
-  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 = s: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 .= ' %{len(tabpagebuflist('.i.'))}'
-      else
-        let val .= (g:airline_symbols.space).i
-      endif
-    endif
-    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
-  endfor
-
-  call b.add_raw('%T')
-  call b.add_section('airline_tabfill', '')
-  call b.split()
-  if s:show_close_button
-    call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
-  endif
-  if s:show_tab_type
-    call b.add_section('airline_tabtype', ' tabs ')
-  endif
-
-  let s:current_bufnr = curbuf
-  let s:current_tabnr = curtab
-  let s:current_tabline = b.build()
-  return s:current_tabline
-endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
new file mode 100644
index 00000000..1bd7899b
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
@@ -0,0 +1,51 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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
+      set showtabline=2
+    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 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
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
new file mode 100644
index 00000000..728b7ad0
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
@@ -0,0 +1,185 @@
+" MIT License. Copyright (c) 2013-2015 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: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 = &encoding == 'utf-8'
+      \ ? {
+      \ '0': '⁰',
+      \ '1': '¹',
+      \ '2': '²',
+      \ '3': '³',
+      \ '4': '⁴',
+      \ '5': '⁵',
+      \ '6': '⁶',
+      \ '7': '⁷',
+      \ '8': '⁸',
+      \ '9': '⁹'
+      \ }
+      \ : {}
+
+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()
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#buffers#invalidate()
+  let s:current_bufnr = -1
+endfunction
+
+function! airline#extensions#tabline#buffers#get()
+  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
+
+    if cur == nr
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod'
+      else
+        let group = 'airline_tabsel'
+      endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod_unsel'
+      elseif index(tab_bufs, nr) > -1
+        let group = 'airline_tab'
+      else
+        let group = 'airline_tabhid'
+      endif
+    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
+  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('airline_tabtype', ' buffers ')
+  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
+
+if s:buffer_idx_mode
+  noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
+  noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
+  noremap <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
+  noremap <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
+  noremap <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
+  noremap <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
+  noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
+  noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
+  noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
+endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buflist.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buflist.vim
new file mode 100644
index 00000000..95873ba6
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buflist.vim
@@ -0,0 +1,38 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+
+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 buffers = []
+  let cur = bufnr('%')
+  for nr in range(1, bufnr('$'))
+    if buflisted(nr) && bufexists(nr)
+      let toadd = 1
+      for ex in s:excludes
+        if match(bufname(nr), ex) >= 0
+          let toadd = 0
+          break
+        endif
+      endfor
+      if getbufvar(nr, 'current_syntax') == 'qf'
+        let toadd = 0
+      endif
+      if toadd
+        call add(buffers, nr)
+      endif
+    endif
+  endfor
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
similarity index 75%
rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
rename to sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
index 4f1ed40e..7e369ac4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
@@ -7,7 +7,7 @@ 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#default#format(bufnr, buffers)
+function! airline#extensions#tabline#formatters#default#format(bufnr, buffers)
   let _ = ''
 
   let name = bufname(a:bufnr)
@@ -21,10 +21,10 @@ function! airline#extensions#tabline#default#format(bufnr, buffers)
     endif
   endif
 
-  return airline#extensions#tabline#default#wrap_name(a:bufnr, _)
+  return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, _)
 endfunction
 
-function! airline#extensions#tabline#default#wrap_name(bufnr, buffer_name)
+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')
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
similarity index 56%
rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
rename to sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
index e4a790d9..22a720e0 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
@@ -1,7 +1,7 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-function! airline#extensions#tabline#unique_tail#format(bufnr, buffers)
+function! airline#extensions#tabline#formatters#unique_tail#format(bufnr, buffers)
   let duplicates = {}
   let tails = {}
   let map = {}
@@ -15,12 +15,12 @@ function! airline#extensions#tabline#unique_tail#format(bufnr, buffers)
         let duplicates[nr] = nr
       endif
       let tails[tail] = 1
-      let map[nr] = airline#extensions#tabline#default#wrap_name(nr, tail)
+      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#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+    let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
   endfor
 
   return map[a:bufnr]
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
similarity index 85%
rename from sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
rename to sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
index e96deeb2..f4f3a8dc 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
@@ -1,13 +1,13 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 scriptencoding utf-8
 
 let s:skip_symbol = '…'
 
-function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
+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#default#format(a:bufnr, a:buffers)
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
   endif
 
   let curbuf_tail = fnamemodify(bufname(a:bufnr), ':t')
@@ -84,8 +84,8 @@ function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
       call insert(buf_name, s:skip_symbol)
     endif
 
-    return airline#extensions#tabline#default#wrap_name(a:bufnr, join(buf_name, '/'))
+    return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, join(buf_name, '/'))
   else
-    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
   endif
 endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
new file mode 100644
index 00000000..6892d08b
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
@@ -0,0 +1,80 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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: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:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
+
+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()
+  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 .= ' %{len(tabpagebuflist('.i.'))}'
+      else
+        let val .= (g:airline_symbols.space).i
+      endif
+    endif
+    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+
+  call b.add_raw('%T')
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  if s:show_close_button
+    call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  endif
+  if s:show_tab_type
+    call b.add_section('airline_tabtype', ' tabs ')
+  endif
+
+  let s:current_bufnr = curbuf
+  let s:current_tabnr = curtab
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
index 56919a85..9e5b65d1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':TagbarToggle')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
index 363709bc..db747023 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tmuxline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':Tmuxline')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
index f577ffd8..532f1df0 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/undotree.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !exists(':UndotreeToggle')
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
index d230b6fb..d1ff2b79 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/unite.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !get(g:, 'loaded_unite', 0)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
index 27f847e3..af47f029 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if !isdirectory($VIRTUAL_ENV)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index f535e45e..f7b63b21 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
index 17a6cf51..c1542fac 100644
--- a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
@@ -16,13 +16,13 @@ endfunction
 
 function! s:get_syn(group, what)
   " need to pass in mode, known to break on 7.3.547
-  let mode = has('gui_running') ? 'gui' : 'cterm'
+  let mode = has('gui_running') || (has("termtruecolor") && &guicolors == 1) ? 'gui' : 'cterm'
   let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
   if empty(color) || color == -1
     let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
   endif
   if empty(color) || color == -1
-    if has('gui_running')
+    if has('gui_running') || (has("termtruecolor") && &guicolors == 1)
       let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
     else
       let color = a:what ==# 'fg' ? 0 : 1
@@ -34,7 +34,7 @@ endfunction
 function! s:get_array(fg, bg, opts)
   let fg = a:fg
   let bg = a:bg
-  return has('gui_running')
+  return has('gui_running') || (has("termtruecolor") && &guicolors == 1)
         \ ? [ fg, bg, '', '', join(a:opts, ',') ]
         \ : [ '', '', fg, bg, join(a:opts, ',') ]
 endfunction
@@ -42,7 +42,7 @@ 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 = has('gui_running')
+  let reverse = has('gui_running') || (has("termtruecolor") && &guicolors == 1)
         \ ? synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'gui')
         \ : synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'cterm')
         \|| synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'term')
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index a990e78b..7b1c989c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/init.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/init.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! s:check_defined(variable, default)
diff --git a/sources_non_forked/vim-airline/autoload/airline/parts.vim b/sources_non_forked/vim-airline/autoload/airline/parts.vim
index b0356b1d..08af4d3c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/parts.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/parts.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:parts = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/section.vim b/sources_non_forked/vim-airline/autoload/airline/section.vim
index 06d930f4..4ab7b268 100644
--- a/sources_non_forked/vim-airline/autoload/airline/section.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/section.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes.vim b/sources_non_forked/vim-airline/autoload/airline/themes.vim
index 07e03241..9387954e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " generates a dictionary which defines the colors for each highlight group
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim b/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim
index 41a25d1f..e2b90063 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/badwolf.vim
@@ -15,7 +15,7 @@ let s:V4 = [ '#c7915b' , 173 ]                   " coffee
 let s:PA = [ '#f4cf86' , 222 ]                   " dirtyblonde
 let s:RE = [ '#ff9eb8' , 211 ]                   " dress
 
-let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+let s:IA = [ s:N3[1] , s:N2[1] , s:N3[3] , s:N2[3] , '' ]
 
 let g:airline#themes#badwolf#palette = {}
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim b/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
index 469435e9..509857e1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/base16.vim
@@ -69,7 +69,7 @@ else
           \ }
 
     let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
-    let s:N2 = airline#themes#get_highlight('Visual')
+    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)
 
@@ -78,19 +78,19 @@ else
           \ 'statusline': [ group[0], '', group[2], '', '' ]
           \ }
 
-    let s:I1 = airline#themes#get_highlight2(['DiffAdded', 'bg'], ['DiffAdded', 'fg'], 'bold')
+    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(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
+    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(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
+    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)
diff --git a/sources_non_forked/vim-airline/autoload/airline/util.vim b/sources_non_forked/vim-airline/autoload/airline/util.vim
index a04bd0bf..10aac5cb 100644
--- a/sources_non_forked/vim-airline/autoload/airline/util.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/util.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 2dc62b87..7449c39c 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -14,16 +14,17 @@ CONTENTS                                                  *airline-contents*
    03. Name ................................................. |airline-name|
    04. Configuration ............................... |airline-configuration|
    05. Commands ......................................... |airline-commands|
-   06. Customization ............................... |airline-customization|
-   07. Extensions ..................................... |airline-extensions|
-   08. Advanced Customization ............. |airline-advanced-customization|
-   09. Funcrefs ......................................... |airline-funcrefs|
-   10. Pipeline ......................................... |airline-pipeline|
-   11. Writing Extensions ..................... |airline-writing-extensions|
-   12. Writing Themes ..................................... |airline-themes|
-   13. Troubleshooting ........................... |airline-troubleshooting|
-   14. Contributions ............................... |airline-contributions|
-   15. License ........................................... |airline-license|
+   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*
@@ -146,6 +147,17 @@ COMMANDS                                                  *airline-commands*
 :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
+|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*
 
@@ -616,7 +628,7 @@ define a section like this: >
     let g:airline_section_b = airline#section#create_left(['ffenc','file'])
     let g:airline_section_c = airline#section#create(['%{getcwd()}'])
   endfunction
-  autocmd VimEnter * call AirlineInit()
+  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
@@ -795,7 +807,7 @@ Contributions and pull requests are welcome.
 ==============================================================================
 LICENSE                                                    *airline-license*
 
-MIT License.  Copyright © 2013-2014 Bailey Ling.
+MIT License.  Copyright © 2013-2015 Bailey Ling.
 
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/sources_non_forked/vim-airline/plugin/airline.vim
index d53c4929..98400529 100644
--- a/sources_non_forked/vim-airline/plugin/airline.vim
+++ b/sources_non_forked/vim-airline/plugin/airline.vim
@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
@@ -6,36 +6,30 @@ if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
 endif
 let g:loaded_airline = 1
 
-" autocmd VimEnter * call airline#deprecation#check()
-
-let s:airline_initialized = 0
 let s:airline_theme_defined = 0
 function! s:init()
-  if !s:airline_initialized
-    let s:airline_initialized = 1
+  call airline#init#bootstrap()
+  call airline#extensions#load()
+  call airline#init#sections()
 
-    call airline#init#bootstrap()
-    call airline#extensions#load()
-    call airline#init#sections()
-
-    let s:airline_theme_defined = exists('g:airline_theme')
-    if s:airline_theme_defined || !airline#switch_matching_theme()
-      let g:airline_theme = get(g:, 'airline_theme', 'dark')
-      call airline#switch_theme(g:airline_theme)
-    endif
+  let s:airline_theme_defined = exists('g:airline_theme')
+  if s:airline_theme_defined || !airline#switch_matching_theme()
+    let g:airline_theme = get(g:, 'airline_theme', 'dark')
+    call airline#switch_theme(g:airline_theme)
   endif
+
+  silent doautocmd User AirlineAfterInit
+  call s:airline_toggle()
 endfunction
 
 function! s:on_window_changed()
   if pumvisible()
     return
   endif
-  call <sid>init()
   call airline#update_statusline()
 endfunction
 
 function! s:on_colorscheme_changed()
-  call <sid>init()
   if !s:airline_theme_defined
     if airline#switch_matching_theme()
       return
@@ -81,11 +75,8 @@ function! s:airline_toggle()
             \ | call airline#load_theme()
     augroup END
 
+    call <sid>on_window_changed()
     silent doautocmd User AirlineToggledOn
-
-    if s:airline_initialized
-      call <sid>on_window_changed()
-    endif
   endif
 endfunction
 
@@ -93,6 +84,7 @@ 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)
@@ -100,10 +92,12 @@ function! s:airline_theme(...)
     echo g:airline_theme
   endif
 endfunction
+
 command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
 command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
 command! AirlineToggle call <sid>airline_toggle()
 command! AirlineRefresh call airline#load_theme() | call airline#update_statusline()
 
-call <sid>airline_toggle()
+autocmd VimEnter * call airline#deprecation#check()
+autocmd VimEnter * call s:init()
 
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index b61e49c0..790b2771 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -193,8 +193,10 @@ function! fugitive#detect(path) abort
         let &mls = save_mls
       endtry
     endif
-    cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
-    nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
+    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'), '^\.%(,|$)', ''))
@@ -2225,7 +2227,10 @@ function! s:Browse(bang,line1,count,...) abort
     elseif exists(':Browse') == 2
       return 'echomsg '.string(url).'|Browse '.url
     else
-      if has("patch-7.4.567")
+      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)'
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index d0b0dfd9..8ab472bb 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -37,26 +37,28 @@ disabled/enabled easily.
 
 ## Install
 
-First of all, do not use it with other Go plugins. If you use pathogen, just
-clone it into your bundle directory:
+Vim-go follows the standard runtime path structure, so I highly recommend to use
+a common and well known plugin manager to install vim-go. Do not use vim-go with
+other Go plugins. For Pathogen just clone the repo, for other plugin managers
+add the appropriate lines and execute the plugin's install command.
 
-```bash
-$ cd ~/.vim/bundle
-$ git clone https://github.com/fatih/vim-go.git
-```
+*  [Pathogen](https://github.com/tpope/vim-pathogen)
+  * `git clone https://github.com/fatih/vim-go.git ~/.vim/bundle/vim-go`
+*  [vim-plug](https://github.com/junegunn/vim-plug)
+  * `Plug 'fatih/vim-go'`
+*  [NeoBundle](https://github.com/Shougo/neobundle.vim)
+  * `NeoBundle 'fatih/vim-go'`
+*  [Vundle](https://github.com/gmarik/vundle)
+  * `Plugin 'fatih/vim-go'`
+*  Manual
+  *  Copy all of the files into your `~/.vim` directory
 
-For Vundle add this line to your vimrc:
-
-```vimrc
-Plugin 'fatih/vim-go'
-```
-and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
 
 Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
 `goimports`, etc..). You can easily install them with the included
-`:GoInstallBinaries` command. Those binaries will be automatically downloaded
-and installed to your `$GOBIN` environment (if not set it will use
-`$GOPATH/bin`).  It requires `git` and `hg` for fetching the individual Go
+`:GoInstallBinaries` command. If you invoke it, all necessary binaries will be
+automatically downloaded and installed to your `$GOBIN` environment (if not set
+it will use `$GOPATH/bin`).  It requires `git` for fetching the individual Go
 packages.
 
 ### Optional
diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim
index 1a1be17e..888492d7 100644
--- a/sources_non_forked/vim-go/autoload/go/fmt.vim
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -68,7 +68,7 @@ function! go#fmt#Format(withGoimport)
         " restore 'redo' history because it's getting being destroyed every
         " BufWritePre
         let tmpundofile=tempname()
-        exe 'wundo! ' . Tmpundofile
+        exe 'wundo! ' . tmpundofile
     endif
 
     " get the command first so we can test it
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
index 1fc2e7dc..30517b26 100644
--- a/sources_non_forked/vim-go/autoload/go/oracle.vim
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -10,16 +10,20 @@ if !exists("g:go_oracle_bin")
     let g:go_oracle_bin = "oracle"
 endif
 
+" Parses (via regex) Oracle's 'plain' format output and puts them into a
+" quickfix list.
 func! s:qflist(output)
     let qflist = []
     " Parse GNU-style 'file:line.col-line.col: message' format.
     let mx = '^\(\a:[\\/][^:]\+\|[^:]\+\):\(\d\+\):\(\d\+\):\(.*\)$'
     for line in split(a:output, "\n")
         let ml = matchlist(line, mx)
+
         " Ignore non-match lines or warnings
         if ml == [] || ml[4] =~ '^ warning:'
             continue
         endif
+
         let item = {
                     \  'filename': ml[1],
                     \  'text': ml[4],
@@ -36,6 +40,31 @@ func! s:qflist(output)
     cwindow
 endfun
 
+" This uses Vim's errorformat to parse the output from Oracle's 'plain output
+" and put it into quickfix list. I believe using errorformat is much more
+" easier to use. If we need more power we can always switch back to parse it
+" via regex.
+func! s:qflistSecond(output)
+    " backup users errorformat, will be restored once we are finished
+	let old_errorformat = &errorformat
+
+    " match two possible styles of errorformats:
+    "
+    "   'file:line.col-line2.col2: message'
+    "   'file:line:col: message'
+    "
+    " We discard line2 and col2 for the first errorformat, because it's not
+    " useful and quickfix only has the ability to show one line and column
+    " number
+	let &errorformat = "%f:%l.%c-%.%#:\ %m,%f:%l:%c:\ %m"
+
+    " create the quickfix list and open it
+    cgetexpr split(a:output, "\n")
+    cwindow
+
+	let &errorformat = old_errorformat
+endfun
+
 func! s:getpos(l, c)
     if &encoding != 'utf-8'
         let buf = a:l == 1 ? '' : (join(getline(1, a:l-1), "\n") . "\n")
@@ -50,16 +79,21 @@ func! s:RunOracle(mode, selected) range abort
     let dname = expand('%:p:h')
     let pkg = go#package#ImportPath(dname)
 
-    if exists('g:go_oracle_scope_file')
-        " let the user defines the scope
-        let sname = shellescape(get(g:, 'go_oracle_scope_file'))
+    if exists('g:go_oracle_scope')
+        " let the user defines the scope, must be a space separated string,
+        " example: 'fmt math net/http'
+        let unescaped_scopes = split(get(g:, 'go_oracle_scope'))
+        let scopes = []
+        for unescaped_scope in unescaped_scopes
+          call add(scopes, shellescape(unescaped_scope))
+        endfor
     elseif exists('g:go_oracle_include_tests') && pkg != -1
         " give import path so it includes all _test.go files too
-        let sname = shellescape(pkg)
+        let scopes = [shellescape(pkg)]
     else
         " best usable way, only pass the package itself, without the test
         " files
-        let sname = join(go#tool#Files(), ' ')
+        let scopes = go#tool#Files()
     endif
 
     "return with a warning if the bin doesn't exist
@@ -71,16 +105,24 @@ func! s:RunOracle(mode, selected) range abort
     if a:selected != -1
         let pos1 = s:getpos(line("'<"), col("'<"))
         let pos2 = s:getpos(line("'>"), col("'>"))
-        let cmd = printf('%s -format json -pos=%s:#%d,#%d %s %s',
+        let cmd = printf('%s -format plain -pos=%s:#%d,#%d %s',
                     \  bin_path,
-                    \  shellescape(fname), pos1, pos2, a:mode, sname)
+                    \  shellescape(fname), pos1, pos2, a:mode)
     else
         let pos = s:getpos(line('.'), col('.'))
-        let cmd = printf('%s -format json -pos=%s:#%d %s %s',
+        let cmd = printf('%s -format plain -pos=%s:#%d %s',
                     \  bin_path,
-                    \  shellescape(fname), pos, a:mode, sname)
+                    \  shellescape(fname), pos, a:mode)
     endif
 
+    " now append each scope to the end as Oracle's scope parameter. It can be
+    " a packages or go files, dependent on the User's own choice. For more
+    " info check Oracle's User Manual section about scopes:
+    " https://docs.google.com/document/d/1SLk36YRjjMgKqe490mSRzOPYEDe0Y_WQNRv-EiFYUyw/view#heading=h.nwso96pj07q8
+    for scope in scopes
+      let cmd .= ' ' . scope
+    endfor
+
     echon "vim-go: " | echohl Identifier | echon "analysing ..." | echohl None
 
     let out = system(cmd)
@@ -89,169 +131,65 @@ func! s:RunOracle(mode, selected) range abort
         " parsable to show the real error. But the main issue is usually the
         " package which doesn't build. 
         redraw | echon "vim-go: " | echohl Statement | echon out | echohl None
-        return {}
+        return ""
     else
-        let json_decoded = webapi#json#decode(out)
-        return json_decoded
-    endif
+
+    return out
 endfun
 
 
 " Show 'implements' relation for selected package
 function! go#oracle#Implements(selected)
     let out = s:RunOracle('implements', a:selected)
-    if empty(out)
-        return
-    endif
-
-    " be sure they exists before we retrieve them from the map
-    if !has_key(out, "implements")
-        return
-    endif
-
-    if has_key(out.implements, "from")
-        let interfaces = out.implements.from
-    elseif has_key(out.implements, "fromptr")
-        let interfaces = out.implements.fromptr
-    else
-        redraw | echon "vim-go: " | echon "does not satisfy any interface"| echohl None
-        return
-    endif
-
-    " get the type name from the type under the cursor
-    let typeName = out.implements.type.name
-
-    " prepare the title
-    let title = typeName . " implements:"
-
-    " start to populate our buffer content
-    let result  = [title, ""]
-
-    for interface in interfaces
-        " don't add runtime interfaces
-        if interface.name !~ '^runtime'
-            let line = interface.name . "\t" . interface.pos
-            call add(result, line)
-        endif
-    endfor
-
-    " open a window and put the result
-    call go#ui#OpenWindow("Implements", result)
-
-    " define some buffer related mappings:
-    "
-    " go to definition when hit enter
-    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("implements")<CR>
-    " close the window when hit ctrl-c
-    nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
+    call s:qflistSecond(out)
 endfunction
 
 " Describe selected syntax: definition, methods, etc
 function! go#oracle#Describe(selected)
     let out = s:RunOracle('describe', a:selected)
-    if empty(out)
-        return
-    endif
-
-    echo out
-    return
-
-    let detail = out["describe"]["detail"]
-    let desc = out["describe"]["desc"]
-
-    echo '# detail: '. detail
-    " package, constant, variable, type, function or statement labe
-    if detail == "package"
-        echo desc
-        return
-    endif
-
-    if detail == "value"
-        echo desc
-        echo out["describe"]["value"]
-        return
-    endif
-
-    " the rest needs to be implemented
-    echo desc
+    call s:qflistSecond(out)
 endfunction
 
 " Show possible targets of selected function call
 function! go#oracle#Callees(selected)
     let out = s:RunOracle('callees', a:selected)
-    if empty(out)
-        return
-    endif
-
-    " be sure the callees object exists which contains the position and names
-    " of the callees, before we continue
-    if !has_key(out, "callees")
-        return
-    endif
-
-    " get the callees list
-    if has_key(out.callees, "callees")
-        let callees = out.callees.callees
-    else
-        redraw | echon "vim-go: " | echon "no callees available"| echohl None
-        return
-    endif
-
-    let title = "Call targets:"
-
-    " start to populate our buffer content
-    let result  = [title, ""]
-
-    for calls in callees
-        let line = calls.name . "\t" . calls.pos
-        call add(result, line)
-    endfor
-
-    " open a window and put the result
-    call go#ui#OpenWindow("Callees", result)
-
-    " define some buffer related mappings:
-    "
-    " go to definition when hit enter
-    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("call targets")<CR>
-    " close the window when hit ctrl-c
-    nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
+    call s:qflistSecond(out)
 endfunction
 
 " Show possible callers of selected function
 function! go#oracle#Callers(selected)
     let out = s:RunOracle('callers', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " Show the callgraph of the current program.
 function! go#oracle#Callgraph(selected)
     let out = s:RunOracle('callgraph', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " Show path from callgraph root to selected function
 function! go#oracle#Callstack(selected)
     let out = s:RunOracle('callstack', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " Show free variables of selection
 function! go#oracle#Freevars(selected)
     let out = s:RunOracle('freevars', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " Show send/receive corresponding to selected channel op
-function! go#oracle#Peers(selected)
+function! go#oracle#ChannelPeers(selected)
     let out = s:RunOracle('peers', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " Show all refs to entity denoted by selected identifier
 function! go#oracle#Referrers(selected)
     let out = s:RunOracle('referrers', a:selected)
-    echo out
+    call s:qflistSecond(out)
 endfunction
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/webapi/json.vim b/sources_non_forked/vim-go/autoload/webapi/json.vim
deleted file mode 100644
index 5d6e7ba0..00000000
--- a/sources_non_forked/vim-go/autoload/webapi/json.vim
+++ /dev/null
@@ -1,135 +0,0 @@
-" json
-" Last Change: 2012-03-08
-" Maintainer:   Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" License:      This file is placed in the public domain.
-" Reference:
-"
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! webapi#json#null()
-  return 0
-endfunction
-
-function! webapi#json#true()
-  return 1
-endfunction
-
-function! webapi#json#false()
-  return 0
-endfunction
-
-function! s:nr2byte(nr)
-  if a:nr < 0x80
-    return nr2char(a:nr)
-  elseif a:nr < 0x800
-    return nr2char(a:nr/64+192).nr2char(a:nr%64+128)
-  else
-    return nr2char(a:nr/4096%16+224).nr2char(a:nr/64%64+128).nr2char(a:nr%64+128)
-  endif
-endfunction
-
-function! s:nr2enc_char(charcode)
-  if &encoding == 'utf-8'
-    return nr2char(a:charcode)
-  endif
-  let char = s:nr2byte(a:charcode)
-  if strlen(char) > 1
-    let char = strtrans(iconv(char, 'utf-8', &encoding))
-  endif
-  return char
-endfunction
-
-function! s:fixup(val, tmp)
-  if type(a:val) == 0
-    return a:val
-  elseif type(a:val) == 1
-    if a:val == a:tmp.'null'
-      return function('webapi#json#null')
-    elseif a:val == a:tmp.'true'
-      return function('webapi#json#true')
-    elseif a:val == a:tmp.'false'
-      return function('webapi#json#false')
-    endif
-    return a:val
-  elseif type(a:val) == 2
-    return a:val
-  elseif type(a:val) == 3
-    return map(a:val, 's:fixup(v:val, a:tmp)')
-  elseif type(a:val) == 4
-    return map(a:val, 's:fixup(v:val, a:tmp)')
-  else
-    return string(a:val)
-  endif
-endfunction
-
-function! webapi#json#decode(json)
-  let json = iconv(a:json, "utf-8", &encoding)
-  if get(g:, 'webapi#json#parse_strict', 1) == 1 && substitute(substitute(substitute(
-    \ json,
-    \ '\\\%(["\\/bfnrt]\|u[0-9a-fA-F]\{4}\)', '\@', 'g'),
-    \ '"[^\"\\\n\r]*\"\|true\|false\|null\|-\?\d\+'
-    \ . '\%(\.\d*\)\?\%([eE][+\-]\{-}\d\+\)\?', ']', 'g'),
-    \ '\%(^\|:\|,\)\%(\s*\[\)\+', '', 'g') !~ '^[\],:{} \t\n]*$'
-    throw json
-  endif
-  let json = substitute(json, '\n', '', 'g')
-  let json = substitute(json, '\\u34;', '\\"', 'g')
-  if v:version >= 703 && has('patch780')
-    let json = substitute(json, '\\u\(\x\x\x\x\)', '\=iconv(nr2char(str2nr(submatch(1), 16), 1), "utf-8", &encoding)', 'g')
-  else
-    let json = substitute(json, '\\u\(\x\x\x\x\)', '\=s:nr2enc_char("0x".submatch(1))', 'g')
-  endif
-  if get(g:, 'webapi#json#allow_nil', 0) != 0
-    let tmp = '__WEBAPI_JSON__'
-    while 1
-      if stridx(json, tmp) == -1
-        break
-      endif
-      let tmp .= '_'
-    endwhile
-    let [null,true,false] = [
-    \ tmp.'null',
-    \ tmp.'true',
-    \ tmp.'false']
-    sandbox let ret = eval(json)
-    call s:fixup(ret, tmp)
-  else
-    let [null,true,false] = [0,1,0]
-    sandbox let ret = eval(json)
-  endif
-  return ret
-endfunction
-
-function! webapi#json#encode(val)
-  if type(a:val) == 0
-    return a:val
-  elseif type(a:val) == 1
-    let json = '"' . escape(a:val, '\"') . '"'
-    let json = substitute(json, "\r", '\\r', 'g')
-    let json = substitute(json, "\n", '\\n', 'g')
-    let json = substitute(json, "\t", '\\t', 'g')
-    let json = substitute(json, '\([[:cntrl:]]\)', '\=printf("\x%02d", char2nr(submatch(1)))', 'g')
-    return iconv(json, &encoding, "utf-8")
-  elseif type(a:val) == 2
-    let s = string(a:val)
-    if s == "function('webapi#json#null')"
-      return 'null'
-    elseif s == "function('webapi#json#true')"
-      return 'true'
-    elseif s == "function('webapi#json#false')"
-      return 'false'
-    endif
-  elseif type(a:val) == 3
-    return '[' . join(map(copy(a:val), 'webapi#json#encode(v:val)'), ',') . ']'
-  elseif type(a:val) == 4
-    return '{' . join(map(keys(a:val), 'webapi#json#encode(v:val).":".webapi#json#encode(a:val[v:val])'), ',') . '}'
-  else
-    return string(a:val)
-  endif
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim:set et:
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index 779b9aff..ac77a32c 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -243,9 +243,7 @@ COMMANDS                                                          *go-commands*
 
     Show 'implements' relation for a selected package. A list of interfaces
     for the type that implements an interface under the cursor (or selected
-    package) is shown in a custom window. Hit `<enter>` to jump in a new tab
-    or close it via `<c-c>`.
-
+    package) is shown quickfix list. 
                                                                 *:GoRename*
 :GoRename [to]
 
@@ -255,11 +253,73 @@ COMMANDS                                                          *go-commands*
                                                               *:GoCallees*
 :GoCallees
 
-    Show 'callees' relation for a selected package. A list of call targets
-    for the type under the cursor (or selected package) is shown in a custom
-    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`. For
-    example if called for a interface method call, it will show all call targets
-    that has implemented the method.
+    Show 'callees' relation for a selected package. A list of possible call
+    targets for the type under the cursor (or selected package) is shown in a
+    quickfix list.
+
+                                                              *:GoCallers*
+:GoCallers
+
+    Show 'callers' relation for a selected function. A list of possible
+    callers for the selected function under the cursor is shown in a quickfix
+    list.
+
+                                                              *:GoDescribe*
+:GoDescribe
+
+    Shows various properties of the selected syntax: its syntactic kind, its
+    type (for an expression), its value (for a constant expression), its size,
+    alignment, method set and interfaces (for a type), its declaration (for an
+    identifier), etc. Almost any piece of syntax may be described, and the
+    oracle will try to print all the useful information it can.
+
+                                                              *:GoCallgraph*
+:GoCallgraph
+
+    Shows the 'callgraph' for the entire program. For more info about the
+    indentation checkout the Oracle User Manual:
+    golang.org/s/oracle-user-manual 
+
+                                                              *:GoCallstack*
+:GoCallstack
+
+    Shows 'callstack' relation for the selected function. An arbitrary path
+    from the root of the callgrap to the selected function is showed in a
+    quickfix list. This may be useful to understand how the function is
+    reached in a given program. 
+
+                                                              *:GoFreevars*
+:GoFreevars
+
+    Enumerates the free variables of the selection. “Free variables” is a
+    technical term meaning the set of variables that are referenced but not
+    defined within the selection, or loosely speaking, its inputs. 
+
+    This information is useful if you’re considering whether to refactor the
+    selection into a function of its own, as the free variables would be the
+    necessary parameters of that function.  It’s also useful when you want to
+    understand what the inputs are to a complex block of code even if you
+    don’t plan to change it.
+
+                                                            *:GoChannelPeers*
+:GoChannelPeers
+
+    Shows the set of possible sends/receives on the channel operand of the
+    selected send or receive operation; the selection must be a <- token. 
+
+    For example, visually select a channel operand in the form of: 
+
+      "done <- true" 
+
+    and call |GoChannelPeers| on it. It will show where it was allocated, and
+    the sending and receiving endings.
+
+                                                              *:GoReferrers*
+:GoReferrers
+
+    The referrers query shows the set of identifiers that refer to the same
+    object as does the selected identifier, within any package in the analysis
+    scope.
 
 
 ===============================================================================
@@ -271,8 +331,9 @@ mapping for the `(go-run)`: >
 
   au FileType go nmap <leader>r <Plug>(go-run)
 
-As always one is free to create more advanced mappings or functions based
-with |go-commands|. Available <Plug> keys are:
+As always one is free to create more advanced mappings or functions based with
+|go-commands|. For more information please check out the mappings command
+documentation in the |go-commands| section. Available <Plug> keys are:
 
                                                                   *(go-run)*
 
@@ -372,6 +433,36 @@ Rename the identifier under the cursor to the desired new name
 
 Show the call targets for the type under the cursor
 
+                                                              *(go-callers)*
+
+Show possible callers of selected function
+
+                                                             *(go-describe)*
+
+Describe selected syntax: definition, methods, etc
+
+
+                                                            *(go-callgraph)*
+
+Show the callgraph of the current program.
+
+                                                            *(go-callstack)*
+
+Show path from callgraph root to selected function
+
+                                                             *(go-freevars)*
+
+Show free variables of selection
+
+                                                          *(go-channelpeers)*
+
+Show send/receive corresponding to selected channel op
+
+                                                            *(go-referrers)*
+
+Show all refs to entity denoted by selected identifier
+
+
 ===============================================================================
 TEXT OBJECTS                                                 *go-text-objects*
 
@@ -387,6 +478,7 @@ if			      "inside a function", select contents of a function,
 			        excluding the function definition and the closing bracket.
 
 
+
 ===============================================================================
 SETTINGS                                                        *go-settings*
 
@@ -499,6 +591,18 @@ is used. Use "neosnippet" for neosnippet.vim: >
   let g:go_snippet_engine = "ultisnips"
 <
 
+                                                      *'g:go_oracle_scope'*
+
+Use this option to define the scope of the analysis to be passed for Oracle
+related commands, such as |GoImplements|, |GoCallers|, etc..  By default it's
+not set, so only the current packages go files are passed as scope. For more
+info please have look at Oracle's User Manual:
+https://docs.google.com/document/d/1SLk36YRjjMgKqe490mSRzOPYEDe0Y_WQNRv-EiFYUyw/view#heading=h.nwso96pj07q8
+>
+
+  let g:go_oracle_scope = ''
+<
+
                                       *'g:go_highlight_array_whitespace_error'*
 
 Highlights white space after "[]". >
diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
index 0403ae9e..526bf99d 100644
--- a/sources_non_forked/vim-go/ftplugin/go/commands.vim
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -18,6 +18,13 @@ nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', exp
 
 nnoremap <silent> <Plug>(go-implements) :<C-u>call go#oracle#Implements(-1)<CR>
 nnoremap <silent> <Plug>(go-callees) :<C-u>call go#oracle#Callees(-1)<CR>
+nnoremap <silent> <Plug>(go-callers) :<C-u>call go#oracle#Callers(-1)<CR>
+nnoremap <silent> <Plug>(go-describe) :<C-u>call go#oracle#Describe(-1)<CR>
+nnoremap <silent> <Plug>(go-callgraph) :<C-u>call go#oracle#Callgraph(-1)<CR>
+nnoremap <silent> <Plug>(go-callstack) :<C-u>call go#oracle#Callstack(-1)<CR>
+nnoremap <silent> <Plug>(go-freevars) :<C-u>call go#oracle#Freevars(-1)<CR>
+nnoremap <silent> <Plug>(go-channelpeers) :<C-u>call go#oracle#ChannelPeers(-1)<CR>
+nnoremap <silent> <Plug>(go-referrers) :<C-u>call go#oracle#Referrers(-1)<CR>
 
 nnoremap <silent> <Plug>(go-rename) :<C-u>call go#rename#Rename()<CR>
 
@@ -39,6 +46,13 @@ command! -nargs=? GoRename call go#rename#Rename(<f-args>)
 " oracle
 command! -range=% GoImplements call go#oracle#Implements(<count>)
 command! -range=% GoCallees call go#oracle#Callees(<count>)
+command! -range=% GoDescribe call go#oracle#Describe(<count>)
+command! -range=% GoCallers call go#oracle#Callers(<count>)
+command! -range=% GoCallgraph call go#oracle#Callgraph(<count>)
+command! -range=% GoCallstack call go#oracle#Callstack(<count>)
+command! -range=% GoFreevars call go#oracle#Freevars(<count>)
+command! -range=% GoChannelPeers call go#oracle#ChannelPeers(<count>)
+command! -range=% GoReferrers call go#oracle#Referrers(<count>)
 
 " tool
 command! -nargs=0 GoFiles echo go#tool#Files()
@@ -78,16 +92,4 @@ command! GoLint call go#lint#Run()
 " -- errcheck
 command! -nargs=? -complete=customlist,go#package#Complete GoErrCheck call go#errcheck#Run(<f-args>)
 
-" Disable all commands until they are fully integrated.
-"
-" command! -range=% GoOracleDescribe call go#oracle#Describe(<count>)
-" command! -range=% GoOracleCallers call go#oracle#Callers(<count>)
-" command! -range=% GoOracleCallgraph call go#oracle#Callgraph(<count>)
-" command! -range=% GoOracleCallstack call go#oracle#Callstack(<count>)
-" command! -range=% GoOracleFreevars call go#oracle#Freevars(<count>)
-" command! -range=% GoOraclePeers call go#oracle#Peers(<count>)
-" command! -range=% GoOracleReferrers call go#oracle#Referrers(<count>)
-
 " vim:ts=4:sw=4:et
-"
-
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
index fe46c7c2..f5e31ed6 100644
--- a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -20,6 +20,11 @@ snippet ap "append(slice, value)"
 append(${1:slice}, ${0:value})
 endsnippet
 
+# append assignment
+snippet ap= "a = append(a, value)"
+${1:slice} = append($1, ${0:value})
+endsnippet
+
 # break
 snippet br "break"
 break
@@ -147,6 +152,14 @@ if err != nil {
 ${0}
 endsnippet
 
+# error snippet
+snippet errt "Error test fatal " !b
+if err != nil {
+	t.Fatal(err)
+}
+${0}
+endsnippet
+
 snippet errn, "Error return with two return values" !b
 if err != nil {
 	return ${1:nil}, err
@@ -307,6 +320,30 @@ func Test${1:Function}(t *testing.T) {
 }
 endsnippet
 
+# quick test server
+snippet tsrv "httptest.NewServer"
+ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintln(w, ${1:`response`})
+}))
+defer ts.Close()
+
+${0:someUrl} = ts.URL
+endsnippet
+
+# test error handling
+snippet ter "if err != nil { t.Errorf(...) }"
+if err != nil {
+	t.Errorf("${0:message}")
+}
+endsnippet
+
+# test fatal error
+snippet terf "if err != nil { t.Fatalf(...) }"
+if err != nil {
+	t.Fatalf("${0:message}")
+}
+endsnippet
+
 # variable declaration
 snippet var "var x Type [= ...]"
 var ${1:x} ${2:Type}${3: = ${0:value\}}
@@ -344,6 +381,4 @@ def closing_par(snip, pos):
 
 endglobal
 
-
 # vim:ft=snippets:
-
diff --git a/sources_non_forked/vim-go/gosnippets/snippets/go.snip b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
index a2d3b89e..dad7ced8 100644
--- a/sources_non_forked/vim-go/gosnippets/snippets/go.snip
+++ b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
@@ -12,6 +12,10 @@ abbr fn := func() { ... }
 snippet ap
 abbr append(slice, value)
 	append(${1:slice}, ${0:value})
+# append assign
+snippet ap=
+abbr slice = append(slice, value)
+  ${1:slice} = append($1, ${0:value})
 # break
 snippet br
 abbr break
@@ -120,6 +124,12 @@ abbr if err != nil { ... }
 	if err != nil {
 		return err
 	}
+# error snippet in TestFunc
+snippet errt
+abbr if err != nil { ... }
+	if err != nil {
+		t.Fatal(err)
+	}
 
 # error snippet with two return values
 snippet errn,
@@ -262,6 +272,28 @@ abbr func TestXYZ(t *testing.T) { ... }
 	func Test${1:Function}(t *testing.T) {
 		${0}
 	}
+# test server
+snippet tsrv
+abbr ts := httptest.NewServer(...)
+  ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+    fmt.Fprintln(w, ${1:`response`})
+  }))
+  defer ts.Close()
+
+  //Use testing server url (type string) somewhere
+  ${0:someUrl} = ts.URL
+# test error
+snippet ter
+abbr if err != nil { t.Errorf(...) }
+  if err != nil {
+    t.Errorf("${1}")
+  }
+# test fatal error
+snippet terf
+abbr if err != nil { t.Fatalf(...) }
+  if err != nil {
+    t.Fatalf("${1}")
+  }
 # variable declaration
 snippet var
 abbr var x Type [= ...]
diff --git a/sources_non_forked/vim-go/indent/go.vim b/sources_non_forked/vim-go/indent/go.vim
index 660aa506..a3fa2b7a 100644
--- a/sources_non_forked/vim-go/indent/go.vim
+++ b/sources_non_forked/vim-go/indent/go.vim
@@ -9,7 +9,7 @@
 " - general line splits (line ends in an operator)
 
 if exists("b:did_indent")
-    finish
+	finish
 endif
 let b:did_indent = 1
 
@@ -21,46 +21,58 @@ setlocal indentexpr=GoIndent(v:lnum)
 setlocal indentkeys+=<:>,0=},0=)
 
 if exists("*GoIndent")
-  finish
+	finish
+endif
+
+" use shiftwidth function only if it's available
+if exists('*shiftwidth')
+	func s:sw()
+		return shiftwidth()
+	endfunc
+else
+	func s:sw()
+		return &sw
+	endfunc
 endif
 
 function! GoIndent(lnum)
-  let prevlnum = prevnonblank(a:lnum-1)
-  if prevlnum == 0
-    " top of file
-    return 0
-  endif
+	let prevlnum = prevnonblank(a:lnum-1)
+	if prevlnum == 0
+		" top of file
+		return 0
+	endif
 
-  " grab the previous and current line, stripping comments.
-  let prevl = substitute(getline(prevlnum), '//.*$', '', '')
-  let thisl = substitute(getline(a:lnum), '//.*$', '', '')
-  let previ = indent(prevlnum)
+	" grab the previous and current line, stripping comments.
+	let prevl = substitute(getline(prevlnum), '//.*$', '', '')
+	let thisl = substitute(getline(a:lnum), '//.*$', '', '')
+	let previ = indent(prevlnum)
 
-  let ind = previ
-  let s:shiftwidth = shiftwidth()
+	let ind = previ
 
-  if prevl =~ '[({]\s*$'
-    " previous line opened a block
-    let ind += s:shiftwidth
-  endif
-  if prevl =~# '^\s*\(case .*\|default\):$'
-    " previous line is part of a switch statement
-    let ind += s:shiftwidth
-  endif
-  " TODO: handle if the previous line is a label.
+	if prevl =~ '[({]\s*$'
+		" previous line opened a block
+		let ind += s:sw()
+	endif
+	if prevl =~# '^\s*\(case .*\|default\):$'
+		" previous line is part of a switch statement
+		let ind += s:sw()
+	endif
+	" TODO: handle if the previous line is a label.
 
-  if thisl =~ '^\s*[)}]'
-    " this line closed a block
-    let ind -= s:shiftwidth
-  endif
+	if thisl =~ '^\s*[)}]'
+		" this line closed a block
+		let ind -= s:sw()
+	endif
 
-  " Colons are tricky.
-  " We want to outdent if it's part of a switch ("case foo:" or "default:").
-  " We ignore trying to deal with jump labels because (a) they're rare, and
-  " (b) they're hard to disambiguate from a composite literal key.
-  if thisl =~# '^\s*\(case .*\|default\):$'
-    let ind -= s:shiftwidth
-  endif
+	" Colons are tricky.
+	" We want to outdent if it's part of a switch ("case foo:" or "default:").
+	" We ignore trying to deal with jump labels because (a) they're rare, and
+	" (b) they're hard to disambiguate from a composite literal key.
+	if thisl =~# '^\s*\(case .*\|default\):$'
+		let ind -= s:sw()
+	endif
 
-  return ind
+	return ind
 endfunction
+
+" vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index 5a425e9e..30c6fdfe 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -84,9 +84,9 @@ In this configuration `<C-n>` will start multicursor mode using word boundaries
 **NOTE:** Prior to version 1.3, the recommended way to map the keys is using the expression quote syntax in Vim, using something like `"\<C-n>"` or `"\<Esc>"` (see h: expr-quote). After 1.3, the recommended way is to use a raw string like above. If your key mappings don't appear to work, give the new syntax a try.
 
 ## Setting
-Currently there're three additional global settings one can tweak:
-### ```g:multi_cursor_exit_from_visual_mode``` (Default: 1)
+Currently there are four additional global settings one can tweak:
 
+### ```g:multi_cursor_exit_from_visual_mode``` (Default: 1)
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
 
 ### ```g:multi_cursor_exit_from_insert_mode``` (Default: 1)
@@ -158,8 +158,11 @@ See [CHANGELOG.md](CHANGELOG.md)
 ## Contributing
 As one can see, there're still many issues to be resolved, patches and suggestions are always welcome! A list of open feature requests can be found [here](../../issues?labels=enhancement&state=open).
 
+Running the test suite requires ruby and rake as well as vim of course. On Mac
+OS, [MacVim](https://code.google.com/p/macvim/) is known to work.
+
 ## Credit
-Obviously inspired by Sublime Text's [multiple selection][sublime-multiple-selection] feature, also encouraged by Emac's [multiple cursors][emacs-multiple-cursors] implemetation by Magnar Sveen
+Obviously inspired by Sublime Text's [multiple selection][sublime-multiple-selection] feature, also encouraged by Emac's [multiple cursors][emacs-multiple-cursors] implementation by Magnar Sveen
 
 [vim-multiple-cursors]:http://github.com/terryma/vim-multiple-cursors
 [sublime-multiple-selection]:http://www.sublimetext.com/docs/2/multiple_selection_with_the_keyboard.html
diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
index 26ca5a93..a509b50b 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -141,9 +141,9 @@ try.
 ==============================================================================
 4. Global Options                            *multiple-cursors-global-options* 
 
-Currently there're two additional global settings one can tweak:
+Currently there are four additional global settings one can tweak:
 
-*g:multi_cursor_exit_from_visual_mode* (Defaut: 1)
+*g:multi_cursor_exit_from_visual_mode* (Default: 1)
 
 If set to 0, then pressing |g:multi_cursor_quit_key| in Visual mode will not
 quit and delete all existing cursors. This is useful if you want to press
@@ -157,6 +157,27 @@ quit and delete all existing cursors. This is useful if you want to press
 Escape and go back to Normal mode, and still be able to operate on all the
 cursors.
 
+*g:multi_cursor_insert_maps* (Default: `{}`)
+
+Any key in this map (values are ignored) will cause multi-cursor _Insert_ mode
+to pause for `timeoutlen` waiting for map completion just like normal vim.
+Otherwise keys mapped in insert mode are ignored when multiple cursors are
+active. For example, setting it to `{'\':1}` will make insert-mode mappings
+beginning with the default leader key work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys _start_
+mappings.
+
+*g:multi_cursor_normal_maps* (Default: `{}`)
+
+Any key in this map (values are ignored) will cause multi-cursor _Normal_ mode
+to pause for map completion just like normal vim. Otherwise keys mapped in
+normal mode will "fail to replay" when multiple cursors are active. For example,
+setting it to `{'d':1}` will make normal-mode mappings beginning with `d` (such
+as `dw` to delete a word) work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys _start_
+mappings; setting it to include motion commands like `j` can break things.
+
+
 The plugin uses the highlight group `multiple_cursors_cursor` and
 `multiple_cursors_visual` to highlight the virtual cursors and their visual
 selections respectively. You can customize them by putting something similar
@@ -165,6 +186,7 @@ like the following in your vimrc: >
     " Default highlighting (see help :highlight and help :highlight-link)
     highlight multiple_cursors_cursor term=reverse cterm=reverse gui=reverse
     highlight link multiple_cursors_visual Visual
+
 <
 
 ==============================================================================
diff --git a/sources_non_forked/vim-repeat/autoload/repeat.vim b/sources_non_forked/vim-repeat/autoload/repeat.vim
index cb5e8953..142f1b83 100644
--- a/sources_non_forked/vim-repeat/autoload/repeat.vim
+++ b/sources_non_forked/vim-repeat/autoload/repeat.vim
@@ -112,12 +112,17 @@ function! repeat#wrap(command,count)
     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>
+nnoremap <silent> <Plug>(RepeatDot)      :<C-U>call repeat#run(v:count)<CR>
+nnoremap <silent> <Plug>(RepeatUndo)     :<C-U>call repeat#wrap('u',v:count)<CR>
+nnoremap <silent> <Plug>(RepeatUndoLine) :<C-U>call repeat#wrap('U',v:count)<CR>
+nnoremap <silent> <Plug>(RepeatRedo)     :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
+
+if !hasmapto('<Plug>(RepeatDot)', 'n')  | nmap . <Plug>(RepeatDot)| endif
+if !hasmapto('<Plug>(RepeatUndo)', 'n') | nmap u <Plug>(RepeatUndo)| endif
+if maparg('U','n') ==# '' && !hasmapto('<Plug>(RepeatUndoLine)', 'n')
+    nmap U <Plug>(RepeatUndoLine)
 endif
-nnoremap <silent> <C-R> :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
+if !hasmapto('<Plug>(RepeatRedo)', 'n') | nmap <C-R> <Plug>(RepeatRedo)| endif
 
 augroup repeatPlugin
     autocmd!
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index 536fe8bf..c5d2b74c 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -42,4 +42,5 @@ additional contributions from:
 * [steveno](https://github.com/steveno)
 * [taq](https://github.com/taq)
 * [thisgeek](https://github.com/thisgeek)
+* [trusktr](https://github.com/trusktr)
 * [Xandaros](https://github.com/Xandaros)
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 5d9d1d64..423f1458 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -19,7 +19,9 @@ Garbas][garbas], [Marc Weber][marcweber], and [Adnan Zafar][ajzafar].
 
 We recommend one of the following methods for installing SnipMate and its
 dependencies. SnipMate depends on [vim-addon-mw-utils][mw-utils] and
-[tlib][tlib]. Since SnipMate does not ship with any snippets, we suggest
+[tlib][tlib].
+
+> **NOTE:** SnipMate does not ship with any snippets out of the box. We suggest
 looking at the [vim-snippets][vim-snippets] repository.
 
 * Using [VAM][vam], add `vim-snippets` to the list of packages to be installed.
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index ceff8b92..7db38b7d 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -329,9 +329,9 @@ endfunction
 
 function! s:snippet_filenames(scope, trigger) abort
 	let mid = ['', '_*', '/*']
-	let mid += map(copy(mid[1:]), "'/' . a:trigger . '*' . v:val")
-	return join(map(mid, "'snippets/' . a:scope . v:val . '.snippet'"
-				\ . ". (v:key < 3 ? 's' : '')"))
+	let mid += map(copy(mid), "'/' . a:trigger . '*' . v:val")
+	call map(mid, "'snippets/' . a:scope . v:val . '.snippet'")
+	return join(map(mid[:2], 'v:val . "s"') + mid[3:])
 endfunction
 
 function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion) abort
@@ -455,7 +455,7 @@ fun! snipMate#GetSnippetsForWordBelowCursor(word, exact) abort
 	let parts = split(a:word, '\W\zs')
 	" Since '\W\zs' results in splitting *after* a non-keyword character, the
 	" first \W stays connected to whatever's before it, so split it off
-	if len(parts) > 1 && len(parts[0]) > 1
+	if !empty(parts) && parts[0] =~ '\W$'
 		let parts = [ parts[0][:-2], strpart(parts[0], len(parts[0]) - 1) ]
 					\ + parts[1:]
 	endif
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index 46cc3905..1d391594 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -205,7 +205,6 @@ 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.
 
-* Clojure - [lpil](https://github.com/lpil)
 * Elixir - [iurifq](https://github.com/iurifq)
 * Falcon - [steveno](https://github.com/steveno)
 * HTML Django - [honza](http://github.com/honza)
@@ -214,7 +213,6 @@ This list is kept up-to-date on a best effort basis.
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
-* Rust - [lpil](https://github.com/lpil)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 License
diff --git a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets b/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
deleted file mode 100644
index 1f53edfb..00000000
--- a/sources_non_forked/vim-snippets/UltiSnips/elixir.snippets
+++ /dev/null
@@ -1,168 +0,0 @@
-priority -50
-
-snippet do
-do
-	${1}
-end
-endsnippet
-
-snippet if "if .. do .. end"
-if ${1:condition} do
-	${2:expression}
-end
-endsnippet
-
-snippet if "if .. do: .."
-if ${1:condition}, do: ${2:expression}
-endsnippet
-
-snippet ife "if .. do .. else .. end"
-if ${1:condition} do
-	${2:expression}
-else
-	${3:expression}
-end
-endsnippet
-
-snippet ife "if .. do: .. else:"
-if ${1:condition}, do: ${2}, else: ${3}
-endsnippet
-
-snippet unless "unless .. do .. end"
-unless ${1} do
-	${2}
-end
-endsnippet
-
-snippet unless "unless .. do: .."
-unless ${1:condition}, do: ${2}
-endsnippet
-
-snippet unlesse "unless .. do .. else .. end"
-unless ${1:condition} do
-	${2}
-else
-	${3}
-end
-endsnippet
-
-snippet unlesse "unless .. do: .. else:"
-unless ${1:condition}, do: ${2}, else: ${3}
-endsnippet
-
-snippet cond
-"cond do"
-${1} ->
-	${2}
-end
-endsnippet
-
-snippet case
-case ${1} do
-${2} ->
-	${3}
-end
-endsnippet
-
-snippet def
-def ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defin "def function(n), do: n"
-def ${1:name},  do: ${2}
-endsnippet
-
-snippet defg
-def ${1:name} when ${2:guard-condition} do
-	${3}
-end
-endsnippet
-
-snippet defim
-defimpl ${1:protocol_name}, for: ${2:data_type} do
-	${3}
-end
-endsnippet
-
-snippet defma
-defmacro ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defmo
-defmodule ${1:module_name} do
-	${2}
-end
-endsnippet
-
-snippet defp
-defp ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defpr
-defprotocol ${1:name}, [${2:function}]
-endsnippet
-
-snippet defr
-defrecord ${1:record_name}, ${2:fields}
-endsnippet
-
-snippet doc
-@doc """
-${1}
-"""
-endsnippet
-
-snippet fn
-fn(${1:args}) -> ${2} end
-endsnippet
-
-snippet fun
-function do
-	${1}
-end
-endsnippet
-
-snippet mdoc
-@moduledoc """
-${1}
-"""
-endsnippet
-
-snippet rec
-receive do
-${1} ->
-	${2}
-end
-endsnippet
-
-snippet req
-require ${1:module_name}
-endsnippet
-
-snippet imp
-import ${1:module_name}
-endsnippet
-
-snippet ali "alias old-module to shorthand"
-alias ${1:module_name}
-endsnippet
-
-snippet test
-test "${1:test_name}" do
-	${2}
-end
-endsnippet
-
-snippet try "try .. rescue .. end"
-try do
-	${1}
-rescue
-	${2} -> ${3}
-end
-endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php.snippets b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
index cd9c55b9..83de38cd 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php.snippets
@@ -111,7 +111,6 @@ public function get${1/\w+\s*/\u$0/}()
 {
     return $this->$1;$3
 }
-$0
 endsnippet
 
 snippet setter "PHP Class Setter" b
@@ -266,7 +265,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 endsnippet
 
@@ -277,7 +276,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 
 /**
@@ -287,7 +286,6 @@ if m:
 class $1
 {
 }
-$0
 endsnippet
 
 snippet interface "Interface declaration template" b
@@ -297,7 +295,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 
 /**
@@ -306,7 +304,7 @@ if m:
  */
 interface $1
 {
-›   public function ${3:someFunction}();$4                                                                                                              
+	public function ${3:someFunction}();$4                                                                                                              
 }
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index 077cf031..4f1afd91 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -6,7 +6,7 @@ snippet if if .. do .. end
 	if ${1} do
 		${0}
 	end
-snippet if if .. do: ..
+snippet if: if .. do: ..
 	if ${1:condition}, do: ${0}
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
@@ -14,13 +14,13 @@ snippet ife if .. do .. else .. end
 	else
 		${0}
 	end
-snippet ife if .. do: .. else:
+snippet ife: if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${0}
 snippet unless unless .. do .. end
 	unless ${1} do
 		${0}
 	end
-snippet unless unless .. do: ..
+snippet unless: unless .. do: ..
 	unless ${1:condition}, do: ${0}
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
@@ -28,7 +28,7 @@ snippet unlesse unless .. do .. else .. end
 	else
 		${0}
 	end
-snippet unlesse unless .. do: .. else:
+snippet unlesse: unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
 snippet cond
 	cond do
@@ -46,6 +46,13 @@ snippet def
 	def ${1:name} do
 		${0}
 	end
+snippet defd
+	@doc """
+	${1:doc string}
+	"""
+	def ${2:name} do
+		${0}
+	end
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
 		${0}
@@ -71,7 +78,7 @@ snippet doc
 	${0}
 	"""
 snippet fn
-	fn(${1:args}) -> ${0} end
+	fn ${1:args} -> ${0} end
 snippet fun
 	function do
 		${0}
@@ -95,9 +102,16 @@ snippet test
 	test "${1:test_name}" do
 		${0}
 	end
+snippet testa
+	test "${1:test_name}", %{${2:arg: arg}} do
+		${0}
+	end
 snippet try try .. rescue .. end
 	try do
 		${1}
 	rescue
 		${2} -> ${0}
 	end
+snippet pry
+	require IEx; IEx.pry
+	$0
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index 5012a43a..fa8123d5 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -112,8 +112,8 @@ snippet fori
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${0}
-	}${3:,}
+		${3}
+	},
 # hasOwnProperty
 snippet has
 	hasOwnProperty(${0})
diff --git a/sources_non_forked/vim-surround/doc/surround.txt b/sources_non_forked/vim-surround/doc/surround.txt
index 41943e7c..674b6a93 100644
--- a/sources_non_forked/vim-surround/doc/surround.txt
+++ b/sources_non_forked/vim-surround/doc/surround.txt
@@ -130,9 +130,10 @@ code blocks in C-style languages, <C-}> (which is really <C-]>) adds braces on
 lines separate from the content.
 
 If t or < is used, Vim prompts for an HTML/XML tag to insert.  You may specify
-attributes here and they will be stripped from the closing tag.  End your
-input by pressing <CR> or >.  If <C-T> is used, the tags will appear on lines
-by themselves.
+attributes here and they will be stripped from the closing tag. If replacing a
+tag, its attributes are kept in the new tag. End your input with > to discard
+the those attributes. If <C-T> is used, the tags will appear on lines by
+themselves.
 
 If s is used, a leading but not trailing space is added.  This is useful for
 removing parentheses from a function call with csbs.
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index 44fd3c93..34d20aa8 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -124,13 +124,12 @@ function! s:process(string)
   return s
 endfunction
 
-function! s:wrap(string,char,type,...)
+function! s:wrap(string,char,type,removed,special)
   let keeper = a:string
   let newchar = a:char
   let s:input = ""
   let type = a:type
   let linemode = type ==# 'V' ? 1 : 0
-  let special = a:0 ? a:1 : 0
   let before = ""
   let after  = ""
   if type ==# "V"
@@ -171,7 +170,7 @@ function! s:wrap(string,char,type,...)
     if !maparg(">","c")
       let dounmapb = 1
       " Hide from AsNeeded
-      exe "cn"."oremap > <CR>"
+      exe "cn"."oremap > ><CR>"
     endif
     let default = ""
     if newchar ==# "T"
@@ -181,18 +180,24 @@ function! s:wrap(string,char,type,...)
       let default = matchstr(s:lastdel,'<\zs.\{-\}\ze>')
     endif
     let tag = input("<",default)
-    echo "<".substitute(tag,'>*$','>','')
     if dounmapb
       silent! cunmap >
     endif
     let s:input = tag
     if tag != ""
+      let keepAttributes = ( match(tag, ">$") == -1 )
       let tag = substitute(tag,'>*$','','')
+      let attributes = ""
+      if keepAttributes
+        let attributes = matchstr(a:removed, '<[^ \t\n]\+\zs\_.\{-\}\ze>')
+      endif
       let s:input = tag . '>'
-      let before = '<'.tag.'>'
       if tag =~ '/$'
+        let tag = substitute(tag, '/$', '', '')
+        let before = '<'.tag.attributes.' />'
         let after = ''
       else
+        let before = '<'.tag.attributes.'>'
         let after  = '</'.substitute(tag,' .*','','').'>'
       endif
       if newchar == "\<C-T>" || newchar == ","
@@ -246,7 +251,7 @@ function! s:wrap(string,char,type,...)
     let after  = ''
   endif
   let after  = substitute(after ,'\n','\n'.initspaces,'g')
-  if type ==# 'V' || (special && type ==# "v")
+  if type ==# 'V' || (a:special && type ==# "v")
     let before = substitute(before,' \+$','','')
     let after  = substitute(after ,'^ \+','','')
     if after !~ '^\n'
@@ -259,7 +264,7 @@ function! s:wrap(string,char,type,...)
     endif
     if before !~ '\n\s*$'
       let before .= "\n"
-      if special
+      if a:special
         let before .= "\t"
       endif
     endif
@@ -289,11 +294,10 @@ function! s:wrap(string,char,type,...)
   return keeper
 endfunction
 
-function! s:wrapreg(reg,char,...)
+function! s:wrapreg(reg,char,removed,special)
   let orig = getreg(a:reg)
   let type = substitute(getregtype(a:reg),'\d\+$','','')
-  let special = a:0 ? a:1 : 0
-  let new = s:wrap(orig,a:char,type,special)
+  let new = s:wrap(orig,a:char,type,a:removed,a:special)
   call setreg(a:reg,new,type)
 endfunction
 " }}}1
@@ -314,7 +318,7 @@ function! s:insert(...) " {{{1
   set clipboard-=unnamed clipboard-=unnamedplus
   let reg_save = @@
   call setreg('"',"\r",'v')
-  call s:wrapreg('"',char,linemode)
+  call s:wrapreg('"',char,"",linemode)
   " If line mode is used and the surrounding consists solely of a suffix,
   " remove the initial newline.  This fits a use case of mine but is a
   " little inconsistent.  Is there anyone that would prefer the simpler
@@ -442,7 +446,7 @@ function! s:dosurround(...) " {{{1
   call setreg('"',keeper,regtype)
   if newchar != ""
     let special = a:0 > 2 ? a:3 : 0
-    call s:wrapreg('"',newchar, special)
+    call s:wrapreg('"',newchar,removed,special)
   endif
   silent exe 'norm! ""'.pcmd.'`['
   if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
@@ -518,7 +522,7 @@ function! s:opfunc(type,...) " {{{1
     let keeper = substitute(keeper,'\_s\@<!\s*$','','')
   endif
   call setreg(reg,keeper,type)
-  call s:wrapreg(reg,char,a:0 && a:1)
+  call s:wrapreg(reg,char,"",a:0 && a:1)
   if type ==# "v" && a:type !=# "v" && append != ""
     call setreg(reg,append,"ac")
   endif
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index dd385672..41876803 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -77,6 +77,8 @@ set grepprg=/bin/grep\ -nH
 " => Nerd Tree
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let g:NERDTreeWinPos = "right"
+let NERDTreeIgnore = ['\.pyc$']
+let g:NERDTreeWinSize=35
 map <leader>nn :NERDTreeToggle<cr>
 map <leader>nb :NERDTreeFromBookmark 
 map <leader>nf :NERDTreeFind<cr>

From 2cb073a57dc85e016c168432ea69cbb87c660c00 Mon Sep 17 00:00:00 2001
From: amix <amix@amix.dk>
Date: Sat, 14 Mar 2015 20:02:10 +0000
Subject: [PATCH 60/61] Updated plugins

---
 sources_non_forked/syntastic/README.markdown  |  52 +++--
 .../syntastic/autoload/syntastic/c.vim        |   8 +-
 .../syntastic/autoload/syntastic/util.vim     |  27 ++-
 .../syntastic/doc/syntastic.txt               | 197 ++++++++++--------
 .../syntastic/plugin/syntastic.vim            |  44 +---
 .../syntastic/plugin/syntastic/checker.vim    |  12 +-
 .../syntastic/plugin/syntastic/registry.vim   | 175 ++++++++--------
 .../apiblueprint/snowcrash.vim                |  66 ++++++
 .../syntastic/syntax_checkers/bro/bro.vim     |   2 +-
 .../syntax_checkers/elixir/elixir.vim         |   4 +-
 .../syntax_checkers/haskell/ghc-mod.vim       |   4 +-
 .../syntax_checkers/java/checkstyle.vim       |   2 +-
 .../syntastic/syntax_checkers/java/javac.vim  |   6 +-
 .../syntax_checkers/javascript/flow.vim       |   2 +-
 .../syntax_checkers/javascript/jsxhint.vim    |   2 +-
 .../syntax_checkers/ocaml/camlp4o.vim         |  20 +-
 .../syntastic/syntax_checkers/perl/perl.vim   |   2 +-
 .../syntax_checkers/python/pylint.vim         |   2 +-
 .../syntastic/syntax_checkers/r/lint.vim      |   2 +-
 .../syntastic/syntax_checkers/r/svtools.vim   |   2 +-
 .../syntastic/syntax_checkers/ruby/jruby.vim  |   4 +-
 .../syntax_checkers/ruby/macruby.vim          |   4 +-
 .../syntastic/syntax_checkers/ruby/mri.vim    |   4 +-
 .../syntastic/syntax_checkers/vim/vimlint.vim |   2 +-
 .../syntastic/syntax_checkers/yaml/yamlxs.vim |   2 +-
 sources_non_forked/vim-airline/README.md      |   8 +-
 .../vim-airline/autoload/airline.vim          |   2 +-
 .../autoload/airline/extensions.vim           |  11 +
 .../autoload/airline/extensions/branch.vim    |  17 ++
 .../autoload/airline/extensions/ctrlspace.vim |  18 ++
 .../autoload/airline/extensions/tabline.vim   |  21 +-
 .../airline/extensions/tabline/buffers.vim    |  10 +
 .../tabline/formatters/unique_tail.vim        |   7 +-
 .../airline/extensions/tabline/tabs.vim       |   6 +-
 .../autoload/airline/highlighter.vim          |   3 +-
 .../autoload/airline/themes/durant.vim        |   3 +
 .../autoload/airline/themes/hybridline.vim    |  34 +++
 .../vim-airline/doc/airline.txt               |  48 ++++-
 .../vim-airline/plugin/airline.vim            |  23 +-
 sources_non_forked/vim-airline/t/airline.vim  |   4 +-
 sources_non_forked/vim-airline/t/commands.vim |   4 +-
 .../vim-airline/t/extensions_default.vim      |  14 +-
 sources_non_forked/vim-go/README.md           |  12 +-
 sources_non_forked/vim-go/autoload/go/cmd.vim |  29 ++-
 .../vim-go/autoload/go/complete.vim           |   9 +
 .../vim-go/autoload/go/oracle.vim             |  23 +-
 .../vim-go/autoload/go/tool.vim               |  14 +-
 sources_non_forked/vim-go/doc/vim-go.txt      |  66 ++++--
 .../vim-go/ftplugin/go/commands.vim           |   6 +-
 .../vim-go/gosnippets/UltiSnips/go.snippets   |  55 +++--
 .../vim-go/gosnippets/snippets/go.snip        |  18 ++
 sources_non_forked/vim-repeat/README.markdown |   1 +
 .../vim-snipmate/Contributors.md              |   1 +
 sources_non_forked/vim-snipmate/README.md     |  36 +++-
 .../vim-snipmate/autoload/snipMate.vim        | 109 ++++------
 .../vim-snipmate/ftplugin/snippet.vim         |   8 -
 .../vim-snipmate/ftplugin/snippets.vim        |  21 +-
 .../vim-snipmate/indent/snippets.vim          |  32 +++
 .../vim-snipmate/plugin/snipMate.vim          |  11 +-
 .../vim-snipmate/syntax/snippets.vim          |   6 +-
 .../vim-snippets/UltiSnips/eelixir.snippets   |   3 +
 .../vim-snippets/UltiSnips/eruby.snippets     |   4 +-
 .../vim-snippets/UltiSnips/go.snippets        |  13 ++
 .../vim-snippets/UltiSnips/html.snippets      |  12 +-
 .../UltiSnips/html_minimal.snippets           |   2 +-
 .../vim-snippets/UltiSnips/rust.snippets      |  43 +++-
 .../vim-snippets/snippets/eelixir.snippets    |   6 +
 .../vim-snippets/snippets/elixir.snippets     |  10 +-
 .../vim-snippets/snippets/html.snippets       |   4 +
 .../snippets/javascript/javascript.snippets   |   9 +
 .../vim-snippets/snippets/rails.snippets      |   8 +-
 .../vim-snippets/snippets/rust.snippets       | 150 +++++++------
 .../vim-snippets/snippets/sh.snippets         |  22 +-
 73 files changed, 1098 insertions(+), 525 deletions(-)
 create mode 100644 sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/extensions/ctrlspace.vim
 create mode 100644 sources_non_forked/vim-airline/autoload/airline/themes/hybridline.vim
 delete mode 100644 sources_non_forked/vim-snipmate/ftplugin/snippet.vim
 create mode 100644 sources_non_forked/vim-snipmate/indent/snippets.vim
 create mode 100644 sources_non_forked/vim-snippets/UltiSnips/eelixir.snippets
 create mode 100644 sources_non_forked/vim-snippets/snippets/eelixir.snippets

diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 73c09c66..6c6fab4f 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -53,17 +53,17 @@ 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 ActionScript,
-Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
-Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
-Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell,
-Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo,
-LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM, Objective-C,
-Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
-iOS property lists, Puppet, Python, R, Racket, Relax NG, reStructuredText, RPM
-spec, Ruby, SASS/SCSS, Scala, Slim, SML, Tcl, TeX, Texinfo, Twig, TypeScript,
-Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page
-templates, and zsh.  See the [wiki][3] for details about the corresponding
-supported checkers.
+Ada, API Blueprint, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell,
+C, C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D,
+Dart, DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL,
+Go, Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX,
+LESS, Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB,
+NASM, Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
+Object, OS X and iOS property lists, Puppet, Python, R, Racket, Relax NG,
+reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Tcl, TeX,
+Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC,
+YAML, z80, Zope page templates, and zsh.  See the [wiki][3] for details about
+the corresponding supported checkers.
 
 A number of third-party Vim plugins also provide checkers for syntastic,
 for example: [omnisharp-vim][25], [rust.vim][12], [syntastic-extras][26],
@@ -196,10 +196,24 @@ 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)).
 
-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][4] - or better yet, create a pull request.
+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][4] - or better yet, create a pull request.
 
 <a name="faqpython3"></a>
 
@@ -217,8 +231,10 @@ __4.3. Q. Are there any local checkers for HTML5 that I can use with syntastic?_
 
 [HTML Tidy][18] has a fork named [HTML Tidy for HTML5][19].  It's a drop
 in replacement, and syntastic can use it without changes.  Just install it
-somewhere and point `g:syntastic_html_tidy_exec` to its executable.
-
+somewhere and point `g:syntastic_html_tidy_exec` to its executable:
+```vim
+let g:syntastic_html_tidy_exec = 'tidy5'
+```
 Alternatively, you can install [vnu.jar][21] from the [validator.nu][20]
 project and run it as a [HTTP server][23]:
 ```sh
@@ -431,7 +447,7 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [16]: https://github.com/junegunn/vim-plug/
 [17]: https://github.com/gmarik/Vundle.vim
 [18]: http://tidy.sourceforge.net/
-[19]: http://w3c.github.io/tidy-html5/
+[19]: http://www.htacg.org/tidy-html5/
 [20]: http://about.validator.nu/
 [21]: https://github.com/validator/validator/releases/latest
 [22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 91cf46de..aa3f81c0 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -133,7 +133,7 @@ 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 = system('pkg-config --cflags ' . pkg)
+                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'
@@ -153,7 +153,7 @@ endfunction " }}}2
 function! s:_checkPhp() abort " {{{2
     if executable('php-config')
         if !has_key(s:cflags, 'php')
-            let s:cflags['php'] = system('php-config --includes')
+            let s:cflags['php'] = syntastic#util#system('php-config --includes')
             let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
         endif
         return s:cflags['php']
@@ -165,7 +165,7 @@ endfunction " }}}2
 function! s:_checkPython() abort " {{{2
     if executable('python')
         if !has_key(s:cflags, 'python')
-            let s:cflags['python'] = system('python -c ''from distutils import ' .
+            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']
@@ -179,7 +179,7 @@ endfunction " }}}2
 function! s:_checkRuby() abort " {{{2
     if executable('ruby')
         if !has_key(s:cflags, 'ruby')
-            let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
+            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']
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index 397e7f15..5642181d 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -25,7 +25,26 @@ function! syntastic#util#Slash() abort " {{{2
 endfunction " }}}2
 
 function! syntastic#util#CygwinPath(path) abort " {{{2
-    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
+    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 out = system(a:command)
+
+    let $LC_ALL = old_lc_all
+    let $LC_MESSAGES = old_lc_messages
+
+    let &shell = old_shell
+
+    return out
 endfunction " }}}2
 
 " Create a temporary directory
@@ -35,7 +54,7 @@ function! syntastic#util#tmpdir() abort " {{{2
     if (has('unix') || has('mac')) && executable('mktemp')
         " TODO: option "-t" to mktemp(1) is not portable
         let tmp = $TMPDIR != '' ? $TMPDIR : $TMP != '' ? $TMP : '/tmp'
-        let out = split(system('mktemp -q -d ' . tmp . '/vim-syntastic-' . getpid() . '-XXXXXXXX'), "\n")
+        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
@@ -79,7 +98,7 @@ function! syntastic#util#rmrf(what) abort " {{{2
         endif
 
         if s:rmrf != ''
-            silent! call system(s:rmrf . ' ' . syntastic#util#shescape(a:what))
+            silent! call syntastic#util#system(s:rmrf . ' ' . syntastic#util#shescape(a:what))
         else
             call s:_rmrf(a:what)
         endif
@@ -382,7 +401,7 @@ function! s:_rmrf(what) abort " {{{2
         for f in split(globpath(a:what, '*', 1), "\n")
             call s:_rmrf(f)
         endfor
-        silent! call system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
+        silent! call syntastic#util#system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
     else
         silent! call delete(a:what)
     endif
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index 423bd7d9..2be33ea7 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -39,16 +39,19 @@ CONTENTS                                                  *syntastic-contents*
     6.Notes........................................|syntastic-notes|
         6.1.Handling of composite filetypes........|syntastic-composite|
         6.2.Editing files over network.............|syntastic-netrw|
-        6.3.Interaction with python-mode...........|syntastic-pymode|
-        6.4.Interaction with YouCompleteMe.........|syntastic-ycm|
-        6.5.Interaction with the fish shell........|syntastic-fish|
-        6.6.Interaction with PowerShell............|syntastic-powershell|
-        6.7.Using syntastic with the fizsh shell...|syntastic-fizsh|
-        6.8.Interaction with Eclim.................|syntastic-eclim|
-        6.9.Interaction with vim-virtualenv........|syntastic-vim-virtualenv|
-        6.10.Interaction with vim-auto-save........|syntastic-vim-auto-save|
-    7.About........................................|syntastic-about|
-    8.License......................................|syntastic-license|
+        6.3.The 'shellslash' option................|syntastic-shellslash|
+    7.Compatibility with other software............|syntastic-compatibility|
+        7.1.The csh and tcsh shells................|syntastic-csh|
+        7.2.Eclim..................................|syntastic-eclim|
+        7.3.The fish shell.........................|syntastic-fish|
+        7.4.The fizsh shell........................|syntastic-fizsh|
+        7.5.The PowerShell shell...................|syntastic-powershell|
+        7.6.python-mode............................|syntastic-pymode|
+        7.7.vim-auto-save..........................|syntastic-vim-auto-save|
+        7.8.vim-virtualenv.........................|syntastic-vim-virtualenv|
+        7.9.YouCompleteMe..........................|syntastic-ycm|
+    8.About........................................|syntastic-about|
+    9.License......................................|syntastic-license|
 
 
 ==============================================================================
@@ -602,6 +605,20 @@ 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'*
+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_debug'*
 Default: 0
 Set this to the sum of one or more of the following flags to enable
@@ -782,64 +799,32 @@ of operation.  It can only check files that can be accessed directly by local
 checkers, without any translation or conversion.
 
 ------------------------------------------------------------------------------
-6.3 Interaction with python-mode                            *syntastic-pymode*
+6.3 The 'shellslash' option                             *syntastic-shellslash*
 
-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_write| to 0. E.g.: >
-    let g:pymode_lint_write = 0
+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 |g: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.
+
+==============================================================================
+7. Compatibility with other software                 *syntastic-compatibility*
+
+------------------------------------------------------------------------------
+7.1 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 |g:syntastic_shell| to a Bourne-compatible shell,
+such as "zsh", "bash", "ksh", or even the original Bourne "sh": >
+    let g:syntastic_shell = "/bin/sh"
 <
 ------------------------------------------------------------------------------
-6.4 Interaction with YouCompleteMe                             *syntastic-ycm*
+7.2. Eclim                                                   *syntastic-eclim*
 
-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 |ycm_show_diagnostics_ui| to 0. E.g.: >
-    let g:ycm_show_diagnostics_ui = 0
-<
-------------------------------------------------------------------------------
-6.5 Interaction with 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 don't need to change your login
-shell to address this problem, but you do have to point Vim's 'shell' to a more
-traditional shell, such as "zsh", "bash", "ksh", or even the original Bourne
-"sh": >
-    set shell=bash
-<
-------------------------------------------------------------------------------
-6.6. Interaction with PowerShell                        *syntastic-powershell*
-
-At the time of this writing, syntastic is not compatible with using 'Windows
-PowerShell' (http://technet.microsoft.com/en-us/library/bb978526.aspx) 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': >
-    set shell=cmd.exe
-<
-------------------------------------------------------------------------------
-6.7. Using syntastic with 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: >
-    set shell=zsh
-<
-------------------------------------------------------------------------------
-6.8. Interaction with Eclim                                  *syntastic-eclim*
-
-Syntastic can be used together with 'Eclim' (see http://eclim.org/). However,
+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: >
@@ -850,28 +835,76 @@ run Eclim's validation for others. Please consult Eclim's documentation for
 details.
 
 ------------------------------------------------------------------------------
-6.9. Interaction with vim-virtualenv                *syntastic-vim-virtualenv*
+7.3 The fish shell                                            *syntastic-fish*
 
-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'.
+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 |g: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.4. 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.5. The PowerShell shell                               *syntastic-powershell*
+
+At the time of this writing, syntastic is not compatible with using "Windows
+PowerShell" (http://technet.microsoft.com/en-us/library/bb978526.aspx) 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": >
+    set shell=cmd.exe
+<
+------------------------------------------------------------------------------
+7.6 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_write| to 0. E.g.: >
+    let g:pymode_lint_write = 0
+<
+------------------------------------------------------------------------------
+7.7. 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.
 
 ------------------------------------------------------------------------------
-6.10. Interaction with vim-auto-save                 *syntastic-vim-auto-save*
+7.8. vim-virtualenv                                 *syntastic-vim-virtualenv*
 
-At the time of this writing, syntastic checks in active mode are not triggered
-by 'vim-auto-save' (see https://github.com/907th/vim-auto-save). The reason is
-a limitation in 'vim-auto-save', namely a missing flag to an 'autocmd' (see
-|autocmd-nested|). Fortunately it's pretty easy to achieve a similar effect
-without 'vim-auto-save'': >
-    augroup syntastic
-        autocmd CursorHold * nested update
-    augroup END
-    set updatetime=200
+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.9 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 |ycm_show_diagnostics_ui| to 0. E.g.: >
+    let g:ycm_show_diagnostics_ui = 0
 <
 ==============================================================================
-7. About                                                     *syntastic-about*
+8. About                                                     *syntastic-about*
 
 The core maintainers of syntastic are:
     Martin Grenfell (GitHub: scrooloose)
@@ -883,9 +916,9 @@ Find the latest version of syntastic at:
     http://github.com/scrooloose/syntastic
 
 ==============================================================================
-8. License                                                 *syntastic-license*
+9. License                                                 *syntastic-license*
 
-Syntastic is released under the wtfpl.
+Syntastic is released under the WTFPL.
 See http://sam.zoy.org/wtfpl/COPYING.
 
  vim:tw=78:sw=4:ft=help:norl:
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 0a2593d0..84af7ac9 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-44'
+let g:_SYNTASTIC_VERSION = '3.6.0-57'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
@@ -42,13 +42,17 @@ 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(system('uname'), "\n")[0]
+        let g:_SYNTASTIC_UNAME = split(syntastic#util#system('uname'), "\n")[0]
     catch /\m^Vim\%((\a\+)\)\=:E484/
-        call syntastic#log#error("your shell " . &shell . " can't handle traditional UNIX syntax for redirections")
+        call syntastic#log#error("your shell " .  syntastic#util#var('shell') . " can't handle traditional UNIX syntax for redirections")
         finish
     catch /\m^Vim\%((\a\+)\)\=:E684/
         let g:_SYNTASTIC_UNAME = 'Unknown'
@@ -67,7 +71,6 @@ let g:_SYNTASTIC_DEFAULTS = {
         \ 'always_populate_loc_list': 0,
         \ 'auto_jump':                0,
         \ 'auto_loc_list':            2,
-        \ 'bash_hack':                0,
         \ 'check_on_open':            0,
         \ 'check_on_wq':              1,
         \ 'cursor_columns':           1,
@@ -77,7 +80,7 @@ let g:_SYNTASTIC_DEFAULTS = {
         \ 'enable_highlighting':      1,
         \ 'enable_signs':             1,
         \ 'error_symbol':             '>>',
-        \ 'exit_checks':              !(s:_running_windows && &shell =~? '\m\<cmd\.exe$'),
+        \ '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,
@@ -86,6 +89,7 @@ let g:_SYNTASTIC_DEFAULTS = {
         \ 'loc_list_height':          10,
         \ 'quiet_messages':           {},
         \ 'reuse_loc_lists':          0,
+        \ 'shell':                    &shell,
         \ 'sort_aggregated_errors':   1,
         \ 'stl_format':               '[Syntax: line:%F (%t)]',
         \ 'style_error_symbol':       'S>',
@@ -463,16 +467,11 @@ 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_shellredir = &shellredir
     let old_local_errorformat = &l:errorformat
     let old_errorformat = &errorformat
     let old_cwd = getcwd()
-    let old_lc_messages = $LC_MESSAGES
-    let old_lc_all = $LC_ALL
     " }}}3
 
-    call s:_bash_hack()
-
     if has_key(a:options, 'errorformat')
         let &errorformat = a:options['errorformat']
     endif
@@ -491,15 +490,11 @@ function! SyntasticMake(options) abort " {{{2
             endif
         endfor
     endif
-    let $LC_MESSAGES = 'C'
-    let $LC_ALL = ''
     " }}}3
 
-    let err_lines = split(system(a:options['makeprg']), "\n", 1)
+    let err_lines = split(syntastic#util#system(a:options['makeprg']), "\n", 1)
 
     " restore environment variables {{{3
-    let $LC_ALL = old_lc_all
-    let $LC_MESSAGES = old_lc_messages
     if len(env_save)
         for key in keys(env_save)
             execute 'let $' . key . ' = ' . string(env_save[key])
@@ -547,7 +542,6 @@ function! SyntasticMake(options) abort " {{{2
     " restore options {{{3
     let &errorformat = old_errorformat
     let &l:errorformat = old_local_errorformat
-    let &shellredir = old_shellredir
     " }}}3
 
     if !s:_running_windows && (s:_os_name() =~? "FreeBSD" || s:_os_name() =~? "OpenBSD")
@@ -666,24 +660,6 @@ function! s:_add_to_errors(errors, options) abort " {{{2
     return a:errors
 endfunction " }}}2
 
-" XXX: Is this still needed?
-" The script changes &shellredir to stop the screen
-" flicking when shelling out to syntax checkers.
-function! s:_bash_hack() abort " {{{2
-    if g:syntastic_bash_hack
-        if !exists('s:shell_is_bash')
-            let s:shell_is_bash =
-                \ !s:_running_windows &&
-                \ (s:_os_name() !~# "FreeBSD") && (s:_os_name() !~# "OpenBSD") &&
-                \ &shell =~# '\m\<bash$'
-        endif
-
-        if s:shell_is_bash
-            let &shellredir = '&>'
-        endif
-    endif
-endfunction " }}}2
-
 function! s:_os_name() abort " {{{2
     return g:_SYNTASTIC_UNAME
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index a1e062a4..69babde4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -80,10 +80,16 @@ function! g:SyntasticChecker.getLocListRaw() abort " {{{2
     let name = self._filetype . '/' . self._name
     try
         let list = self._locListFunc()
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
+        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 = []
-        call syntastic#log#error('checker ' . name . ' returned abnormal status ' . v:shell_error)
+        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)
@@ -98,7 +104,7 @@ endfunction " }}}2
 function! g:SyntasticChecker.getVersion(...) abort " {{{2
     if !exists('self._version')
         let command = a:0 ? a:1 : self.getExecEscaped() . ' --version'
-        let version_output = system(command)
+        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 . ')' : '') )
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index a9ae21e0..9d008671 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -6,93 +6,94 @@ let g:loaded_syntastic_registry = 1
 " Initialisation {{{1
 
 let s:_DEFAULT_CHECKERS = {
-        \ 'actionscript':['mxmlc'],
-        \ 'ada':         ['gcc'],
-        \ 'applescript': ['osacompile'],
-        \ 'asciidoc':    ['asciidoc'],
-        \ 'asm':         ['gcc'],
-        \ 'bro':         ['bro'],
-        \ 'bemhtml':     ['bemhtmllint'],
-        \ 'c':           ['gcc'],
-        \ 'cabal':       ['cabal'],
-        \ 'chef':        ['foodcritic'],
-        \ 'co':          ['coco'],
-        \ 'cobol':       ['cobc'],
-        \ 'coffee':      ['coffee', 'coffeelint'],
-        \ 'coq':         ['coqtop'],
-        \ 'cpp':         ['gcc'],
-        \ 'cs':          ['mcs'],
-        \ 'css':         ['csslint'],
-        \ 'cucumber':    ['cucumber'],
-        \ 'cuda':        ['nvcc'],
-        \ 'd':           ['dmd'],
-        \ 'dart':        ['dartanalyzer'],
-        \ 'docbk':       ['xmllint'],
-        \ 'dustjs':      ['swiffer'],
-        \ 'elixir':      [],
-        \ 'erlang':      ['escript'],
-        \ 'eruby':       ['ruby'],
-        \ 'fortran':     ['gfortran'],
-        \ 'glsl':        ['cgc'],
-        \ 'go':          ['go'],
-        \ 'haml':        ['haml'],
-        \ 'handlebars':  ['handlebars'],
-        \ 'haskell':     ['ghc_mod', 'hdevtools', 'hlint'],
-        \ 'haxe':        ['haxe'],
-        \ 'hss':         ['hss'],
-        \ 'html':        ['tidy'],
-        \ 'java':        ['javac'],
-        \ 'javascript':  ['jshint', 'jslint'],
-        \ 'json':        ['jsonlint', 'jsonval'],
-        \ 'less':        ['lessc'],
-        \ 'lex':         ['flex'],
-        \ 'limbo':       ['limbo'],
-        \ 'lisp':        ['clisp'],
-        \ 'llvm':        ['llvm'],
-        \ 'lua':         ['luac'],
-        \ 'markdown':    ['mdl'],
-        \ 'matlab':      ['mlint'],
-        \ 'nasm':        ['nasm'],
-        \ 'nroff':       ['mandoc'],
-        \ 'objc':        ['gcc'],
-        \ 'objcpp':      ['gcc'],
-        \ 'ocaml':       ['camlp4o'],
-        \ 'perl':        ['perlcritic'],
-        \ 'php':         ['php', 'phpcs', 'phpmd'],
-        \ 'po':          ['msgfmt'],
-        \ 'pod':         ['podchecker'],
-        \ 'puppet':      ['puppet', 'puppetlint'],
-        \ 'python':      ['python', 'flake8', 'pylint'],
-        \ 'r':           [],
-        \ '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'],
-        \ 'tcl':         ['nagelfar'],
-        \ 'tex':         ['lacheck', 'chktex'],
-        \ 'texinfo':     ['makeinfo'],
-        \ 'text':        [],
-        \ 'twig':        ['twiglint'],
-        \ 'typescript':  ['tsc'],
-        \ 'vala':        ['valac'],
-        \ 'verilog':     ['verilator'],
-        \ 'vhdl':        ['ghdl'],
-        \ 'vim':         ['vimlint'],
-        \ 'xhtml':       ['tidy'],
-        \ 'xml':         ['xmllint'],
-        \ 'xslt':        ['xmllint'],
-        \ 'yacc':        ['bison'],
-        \ 'yaml':        ['jsyaml'],
-        \ 'z80':         ['z80syntaxchecker'],
-        \ 'zpt':         ['zptlint'],
-        \ 'zsh':         ['zsh', 'shellcheck'],
+        \ 'actionscript':  ['mxmlc'],
+        \ 'ada':           ['gcc'],
+        \ 'apiblueprint':  ['snowcrash'],
+        \ 'applescript':   ['osacompile'],
+        \ 'asciidoc':      ['asciidoc'],
+        \ 'asm':           ['gcc'],
+        \ 'bro':           ['bro'],
+        \ 'bemhtml':       ['bemhtmllint'],
+        \ 'c':             ['gcc'],
+        \ 'cabal':         ['cabal'],
+        \ 'chef':          ['foodcritic'],
+        \ 'co':            ['coco'],
+        \ 'cobol':         ['cobc'],
+        \ 'coffee':        ['coffee', 'coffeelint'],
+        \ 'coq':           ['coqtop'],
+        \ 'cpp':           ['gcc'],
+        \ 'cs':            ['mcs'],
+        \ 'css':           ['csslint'],
+        \ 'cucumber':      ['cucumber'],
+        \ 'cuda':          ['nvcc'],
+        \ 'd':             ['dmd'],
+        \ 'dart':          ['dartanalyzer'],
+        \ 'docbk':         ['xmllint'],
+        \ 'dustjs':        ['swiffer'],
+        \ 'elixir':        [],
+        \ 'erlang':        ['escript'],
+        \ 'eruby':         ['ruby'],
+        \ 'fortran':       ['gfortran'],
+        \ 'glsl':          ['cgc'],
+        \ 'go':            ['go'],
+        \ 'haml':          ['haml'],
+        \ 'handlebars':    ['handlebars'],
+        \ 'haskell':       ['ghc_mod', 'hdevtools', 'hlint'],
+        \ 'haxe':          ['haxe'],
+        \ 'hss':           ['hss'],
+        \ 'html':          ['tidy'],
+        \ 'java':          ['javac'],
+        \ 'javascript':    ['jshint', 'jslint'],
+        \ 'json':          ['jsonlint', 'jsonval'],
+        \ 'less':          ['lessc'],
+        \ 'lex':           ['flex'],
+        \ 'limbo':         ['limbo'],
+        \ 'lisp':          ['clisp'],
+        \ 'llvm':          ['llvm'],
+        \ 'lua':           ['luac'],
+        \ 'markdown':      ['mdl'],
+        \ 'matlab':        ['mlint'],
+        \ 'nasm':          ['nasm'],
+        \ 'nroff':         ['mandoc'],
+        \ 'objc':          ['gcc'],
+        \ 'objcpp':        ['gcc'],
+        \ 'ocaml':         ['camlp4o'],
+        \ 'perl':          ['perlcritic'],
+        \ 'php':           ['php', 'phpcs', 'phpmd'],
+        \ 'po':            ['msgfmt'],
+        \ 'pod':           ['podchecker'],
+        \ 'puppet':        ['puppet', 'puppetlint'],
+        \ 'python':        ['python', 'flake8', 'pylint'],
+        \ 'r':             [],
+        \ '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'],
+        \ 'tcl':           ['nagelfar'],
+        \ 'tex':           ['lacheck', 'chktex'],
+        \ 'texinfo':       ['makeinfo'],
+        \ 'text':          [],
+        \ 'twig':          ['twiglint'],
+        \ 'typescript':    ['tsc'],
+        \ 'vala':          ['valac'],
+        \ 'verilog':       ['verilator'],
+        \ 'vhdl':          ['ghdl'],
+        \ 'vim':           ['vimlint'],
+        \ 'xhtml':         ['tidy'],
+        \ 'xml':           ['xmllint'],
+        \ 'xslt':          ['xmllint'],
+        \ 'yacc':          ['bison'],
+        \ 'yaml':          ['jsyaml'],
+        \ 'z80':           ['z80syntaxchecker'],
+        \ 'zpt':           ['zptlint'],
+        \ 'zsh':           ['zsh', 'shellcheck'],
     \ }
 lockvar! s:_DEFAULT_CHECKERS
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim b/sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim
new file mode 100644
index 00000000..638e3528
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"File:        snowcrash.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_snowcrash_checker")
+    finish
+endif
+let g:loaded_syntastic_apiblueprint_snowcrash_checker = 1
+
+if !exists('g:syntastic_apiblueprint_snowcrash_sort')
+    let g:syntastic_apiblueprint_snowcrash_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_apiblueprint_snowcrash_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] })
+
+    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': 'snowcrash'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
index 410304be..3b21988d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -28,7 +28,7 @@ function! SyntaxCheckers_bro_bro_IsAvailable() dict
         return 0
     endif
 
-    if system(self.getExecEscaped() . ' --help') !~# '--parse-only'
+    if syntastic#util#system(self.getExecEscaped() . ' --help') !~# '--parse-only'
         call self.log('unknown option "--parse-only"')
         return 0
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index c77e7594..d39929c7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -44,7 +44,9 @@ function! SyntaxCheckers_elixir_elixir_GetLocList() dict
 
     let make_options['makeprg'] = self.makeprgBuild({ 'exe': compile_command })
 
-    let make_options['errorformat'] = '** %*[^\ ] %f:%l: %m'
+    let make_options['errorformat'] =
+        \ '%E** %*[^\ ] %f:%l: %m,' .
+        \ '%W%f:%l: warning: %m'
 
     return SyntasticMake(make_options)
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index 01845628..fd881fe3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -30,10 +30,10 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
     " know the version in order to know how to find out the version. :)
 
     " Try "ghc-mod version".
-    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m\sversion''')
+    let ver = filter(split(syntastic#util#system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m\sversion''')
     if !len(ver)
         " That didn't work.  Try "ghc-mod" alone.
-        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m\sversion''')
+        let ver = filter(split(syntastic#util#system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m\sversion''')
     endif
 
     if len(ver)
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 8afa5179..9e89920b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -46,7 +46,7 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
     let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
 
     if has('win32unix')
-        let fname = substitute(system('cygpath -m ' . fname), '\m\%x00', '', 'g')
+        let fname = substitute(syntastic#util#system('cygpath -m ' . fname), '\m\%x00', '', 'g')
     endif
 
     let makeprg = self.makeprgBuild({
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 24b1b447..bfc966d5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -129,7 +129,7 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
 
     " load custom classpath {{{2
     if g:syntastic_java_javac_custom_classpath_command != ''
-        let lines = system(g:syntastic_java_javac_custom_classpath_command)
+        let lines = syntastic#util#system(g:syntastic_java_javac_custom_classpath_command)
         if syntastic#util#isRunningWindows() || has('win32unix')
             let lines = substitute(lines, "\r\n", "\n", 'g')
         endif
@@ -306,7 +306,7 @@ function! s:GetMavenProperties() " {{{2
                 \ ' -f ' . syntastic#util#shescape(pom) .
                 \ ' ' . g:syntastic_java_maven_options
             let mvn_is_managed_tag = 1
-            let mvn_settings_output = split(system(mvn_cmd . ' help:effective-pom'), "\n")
+            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*$')
@@ -340,7 +340,7 @@ function! s:GetMavenClasspath() " {{{2
             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(system(mvn_cmd . ' dependency:build-classpath'), "\n")
+            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
index 2fc2cc46..5f85b484 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
@@ -23,7 +23,7 @@ set cpo&vim
 
 function! SyntaxCheckers_javascript_flow_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': 'check',
+        \ 'exe': self.getExecEscaped() . ' check',
         \ 'args_after': '--show-all-errors --json' })
 
     let errorformat =
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 99c0d931..bd16858f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -18,7 +18,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
-    let jsxhint_version = system(self.getExecEscaped() . ' --version')
+    let jsxhint_version = syntastic#util#system(self.getExecEscaped() . ' --version')
     if v:shell_error || (jsxhint_version !~# '\m^JSXHint\>')
         return 0
     endif
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
index a169139b..5f060e56 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -51,17 +51,31 @@ function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
     endif
 
     let errorformat =
-        \ '%AFile "%f"\, line %l\, characters %c-%*\d:,'.
+        \ '%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 %n: %m,'.
+        \ '%C%tarning %*\d: %m,'.
         \ '%C%m,'.
         \ '%-G+%.%#'
 
-    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr("")} })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['nr'] = 0
+        endif
+    endfor
+
+    return loclist
 endfunction " }}}1
 
 " Utilities {{{1
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index e0d8f159..1501ce60 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -46,7 +46,7 @@ function! SyntaxCheckers_perl_perl_IsAvailable() dict
 
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call syntastic#util#system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 4e489b73..c87b06bd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_python_pylint_IsAvailable() dict
         " On new-ish Fedora it's "python3-pylint 1.2.0".
         " Have you guys considered switching to creative writing yet? ;)
 
-        let pylint_version = filter( split(system(self.getExecEscaped() . ' --version'), '\m, \=\|\n'),
+        let pylint_version = filter( split(syntastic#util#system(self.getExecEscaped() . ' --version'), '\m, \=\|\n'),
             \ 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
         let ver = syntastic#util#parseVersion(substitute(pylint_version, '\v^\S+\s+', '', ''))
         call self.setVersion(ver)
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index 7c02b31e..3a6bbd61 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -38,7 +38,7 @@ function! SyntaxCheckers_r_lint_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-    call system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(lint)'))
+    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(lint)'))
     return v:shell_error == 0
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
index 388cbbf4..9b92aae0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
@@ -41,7 +41,7 @@ function! SyntaxCheckers_r_svtools_IsAvailable() dict
     if !executable(self.getExec())
         return 0
     endif
-    call system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(svTools)'))
+    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(svTools)'))
     return v:shell_error == 0
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
index fbf5b7fa..bb36843a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -20,8 +20,8 @@ set cpo&vim
 
 function! SyntaxCheckers_ruby_jruby_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'args': (syntastic#util#isRunningWindows() ? '-T1' : ''),
-        \ 'args_after': '-W1 -c' })
+        \ 'args': (syntastic#util#isRunningWindows() ? '-T1 -W1' : '-W1'),
+        \ 'args_after': '-c' })
 
     let errorformat =
         \ '%-GSyntax OK for %f,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
index f357e370..6a64fff2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -18,7 +18,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_macruby_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-W1 -c' })
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-W1',
+        \ 'args_after': '-c' })
 
     let errorformat =
         \ '%-GSyntax OK,'.
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index 8945ea3e..83c519bf 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -36,7 +36,9 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-w -T1 -c' })
+    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
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 58037e80..5182dc64 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -97,7 +97,7 @@ endfunction " }}}2
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vim',
     \ 'name': 'vimlint',
-    \ 'exec': 'vim' })
+    \ 'exec': '' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index d5582dbd..f2876773 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -29,7 +29,7 @@ function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
 
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call syntastic#util#system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index ea649fc3..46e69e39 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -7,7 +7,7 @@ Lean &amp; mean status/tabline for vim that's light as air.
 # 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], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35].
+*  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], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35], [taboo.vim][37], [ctrlspace][38] 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; have a look at the [screenshots][14] in the wiki.
@@ -151,10 +151,12 @@ 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.
+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].
@@ -219,3 +221,5 @@ MIT License. Copyright (c) 2013-2015 Bailey Ling.
 [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
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index 1a4e54af..a2ad27e1 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -46,6 +46,7 @@ function! airline#load_theme()
 
   call airline#highlighter#load_theme()
   call airline#extensions#load_theme()
+  call airline#update_statusline()
 endfunction
 
 function! airline#switch_theme(name)
@@ -62,7 +63,6 @@ function! airline#switch_theme(name)
   endtry
 
   let w:airline_lastmode = ''
-  call airline#update_statusline()
   call airline#load_theme()
 
   " this is required to prevent clobbering the startup info message, i don't know why...
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 4f6848f6..ce83c09b 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -121,6 +121,13 @@ function! airline#extensions#load()
   " 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
+      call airline#extensions#{ext}#init(s:ext)
+    endfor
+    return
+  endif
+
   call airline#extensions#quickfix#init(s:ext)
 
   if get(g:, 'loaded_unite', 0)
@@ -139,6 +146,10 @@ function! airline#extensions#load()
     call airline#extensions#ctrlp#init(s:ext)
   endif
 
+  if get(g:, 'ctrlspace_loaded', 0)
+    call airline#extensions#ctrlspace#init(s:ext)
+  endif
+
   if get(g:, 'command_t_loaded', 0)
     call airline#extensions#commandt#init(s:ext)
   endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index 6decaf16..7ad46508 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -9,6 +9,21 @@ if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
   finish
 endif
 
+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 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:get_git_branch(path)
   if has_key(s:git_dirs, a:path)
@@ -72,6 +87,8 @@ function! airline#extensions#branch#head()
     let b:airline_head = ''
   endif
 
+  let b:airline_head = s:format_name(b:airline_head)
+
   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
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlspace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlspace.vim
new file mode 100644
index 00000000..3a29efd0
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlspace.vim
@@ -0,0 +1,18 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+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_a', s:padding . g:ctrlspace_symbols.cs . s:padding)
+  call b.add_section('airline_b', s:padding . ctrlspace#statusline_mode_segment(s:padding))
+  call b.split()
+  call b.add_section('airline_x', s:spc . ctrlspace#statusline_tab_segment() . s:spc)
+  return b.build()
+endfunction
+
+function! airline#extensions#ctrlspace#init(ext)
+  let g:ctrlspace_statusline_function = 'airline#extensions#ctrlspace#statusline()'
+endfunction
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index 1b186d2f..41350cc6 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -5,6 +5,12 @@ 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:taboo = get(g:, 'airline#extensions#taboo#enabled', 1) && get(g:, 'loaded_taboo', 0)
+if s:taboo
+  let g:taboo_tabline = 0
+endif
+
+
 function! airline#extensions#tabline#init(ext)
   if has('gui_running')
     set guioptions-=e
@@ -72,9 +78,18 @@ function! airline#extensions#tabline#get()
 endfunction
 
 function! airline#extensions#tabline#title(n)
-  let buflist = tabpagebuflist(a:n)
-  let winnr = tabpagewinnr(a:n)
-  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+  let title = ''
+  if s:taboo
+    let title = TabooTabTitle(a:n)
+  endif
+
+  if empty(title)
+    let buflist = tabpagebuflist(a:n)
+    let winnr = tabpagewinnr(a:n)
+    return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+  endif
+
+  return title
 endfunction
 
 function! airline#extensions#tabline#get_buffer_name(nr)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
index 728b7ad0..4f14a9ba 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/buffers.vim
@@ -172,6 +172,14 @@ function! s:select_tab(buf_index)
   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
+
 if s:buffer_idx_mode
   noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
   noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
@@ -182,4 +190,6 @@ if s:buffer_idx_mode
   noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
   noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
   noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
+  noremap <unique> <Plug>AirlineSelectPrevTab :<C-u>call <SID>jump_to_tab(-v:count1)<CR>
+  noremap <unique> <Plug>AirlineSelectNextTab :<C-u>call <SID>jump_to_tab(v:count1)<CR>
 endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
index 22a720e0..32a58675 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
@@ -23,5 +23,10 @@ function! airline#extensions#tabline#formatters#unique_tail#format(bufnr, buffer
     let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
   endfor
 
-  return map[a:bufnr]
+  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/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
index 6892d08b..77f3760c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/tabs.vim
@@ -55,9 +55,11 @@ function! airline#extensions#tabline#tabs#get()
     let val = '%('
     if s:show_tab_nr
       if s:tab_nr_type == 0
-        let val .= ' %{len(tabpagebuflist('.i.'))}'
-      else
+        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.')} %)')
diff --git a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
index c1542fac..0d3dce9b 100644
--- a/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/highlighter.vim
@@ -1,7 +1,8 @@
 " MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
+let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running') && (empty($CONEMUBUILD) || &term !=? 'xterm')
+
 let s:separators = {}
 let s:accents = {}
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
index 56be7ba0..cb844d4e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
@@ -1,3 +1,6 @@
+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 ]
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/hybridline.vim b/sources_non_forked/vim-airline/autoload/airline/themes/hybridline.vim
new file mode 100644
index 00000000..84729c13
--- /dev/null
+++ b/sources_non_forked/vim-airline/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/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 7449c39c..9507d041 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -242,6 +242,15 @@ cost.  You can disable the check with the following flag. >
   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
@@ -296,13 +305,27 @@ vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
 <
 * change the text for when no branch is detected >
   let g:airline#extensions#branch#empty_message = ''
-
+<
 * 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' show 'foo'
+  let g:airline#extensions#branch#format = 1
+
+  " 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>
 
@@ -414,9 +437,10 @@ eclim <https://eclim.org>
 * configure filename match rules to exclude from the tabline. >
   let g:airline#extensions#tabline#excludes = []
 <
-* configure how numbers are calculated in tab mode. >
+* 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
@@ -538,19 +562,19 @@ promptline <https://github.com/edkolev/promptline.vim>
   let airline#extensions#promptline#color_template = 'visual'
   let airline#extensions#promptline#color_template = 'replace'
 <
--------------------------------------                    *airline-nrrwrgn*
+-------------------------------------                      *airline-nrrwrgn*
 NrrwRgn <https://github.com/chrisbra/NrrwRgn>
 
 * enable/disable NrrwRgn integration >
   let g:airline#extensions#nrrwrgn#enabled = 1
 
--------------------------------------                        *airline-capslock*
+-------------------------------------                     *airline-capslock*
 vim-capslock <https://github.com/tpope/vim-capslock>
 
 * enable/disable vim-capslock integration >
   let g:airline#extensions#capslock#enabled = 1
 
--------------------------------------                       *airline-windowswap*
+-------------------------------------                   *airline-windowswap*
 vim-windowswap <https://github.com/wesQ3/vim-windowswap>
 
 * enable/disable vim-windowswap integration >
@@ -559,6 +583,18 @@ vim-windowswap <https://github.com/wesQ3/vim-windowswap>
 * set marked window indicator string >
   let g:airline#extensions#windowswap#indicator_text = 'WS'
 <
+-------------------------------------                        *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
+<
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
 
diff --git a/sources_non_forked/vim-airline/plugin/airline.vim b/sources_non_forked/vim-airline/plugin/airline.vim
index 98400529..56670474 100644
--- a/sources_non_forked/vim-airline/plugin/airline.vim
+++ b/sources_non_forked/vim-airline/plugin/airline.vim
@@ -6,9 +6,14 @@ if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
 endif
 let g:loaded_airline = 1
 
+let s:airline_initialized = 0
 let s:airline_theme_defined = 0
 function! s:init()
-  call airline#init#bootstrap()
+  if s:airline_initialized
+    return
+  endif
+  let s:airline_initialized = 1
+
   call airline#extensions#load()
   call airline#init#sections()
 
@@ -19,17 +24,18 @@ function! s:init()
   endif
 
   silent doautocmd User AirlineAfterInit
-  call s:airline_toggle()
 endfunction
 
 function! s:on_window_changed()
   if pumvisible()
     return
   endif
+  call s:init()
   call airline#update_statusline()
 endfunction
 
 function! s:on_colorscheme_changed()
+  call s:init()
   if !s:airline_theme_defined
     if airline#switch_matching_theme()
       return
@@ -75,7 +81,10 @@ function! s:airline_toggle()
             \ | call airline#load_theme()
     augroup END
 
-    call <sid>on_window_changed()
+    if s:airline_initialized
+      call s:on_window_changed()
+    endif
+
     silent doautocmd User AirlineToggledOn
   endif
 endfunction
@@ -95,9 +104,11 @@ endfunction
 
 command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
 command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
-command! AirlineToggle call <sid>airline_toggle()
+command! AirlineToggle call s:airline_toggle()
 command! AirlineRefresh call airline#load_theme() | call airline#update_statusline()
 
-autocmd VimEnter * call airline#deprecation#check()
-autocmd VimEnter * call s:init()
+call airline#init#bootstrap()
+call s:airline_toggle()
+
+autocmd VimEnter * call airline#deprecation#check()
 
diff --git a/sources_non_forked/vim-airline/t/airline.vim b/sources_non_forked/vim-airline/t/airline.vim
index 78ab6d7c..6e66aecc 100644
--- a/sources_non_forked/vim-airline/t/airline.vim
+++ b/sources_non_forked/vim-airline/t/airline.vim
@@ -1,7 +1,7 @@
 let g:airline_theme = 'dark'
-call airline#init#bootstrap()
-call airline#init#sections()
+
 source plugin/airline.vim
+doautocmd VimEnter
 
 function! MyFuncref(...)
   call a:1.add_raw('hello world')
diff --git a/sources_non_forked/vim-airline/t/commands.vim b/sources_non_forked/vim-airline/t/commands.vim
index b56b881d..4e23d5dd 100644
--- a/sources_non_forked/vim-airline/t/commands.vim
+++ b/sources_non_forked/vim-airline/t/commands.vim
@@ -1,7 +1,5 @@
-call airline#init#bootstrap()
-call airline#init#sections()
-
 source plugin/airline.vim
+doautocmd VimEnter
 
 describe 'commands'
   it 'should toggle off and on'
diff --git a/sources_non_forked/vim-airline/t/extensions_default.vim b/sources_non_forked/vim-airline/t/extensions_default.vim
index d6fc572d..e60d651a 100644
--- a/sources_non_forked/vim-airline/t/extensions_default.vim
+++ b/sources_non_forked/vim-airline/t/extensions_default.vim
@@ -1,8 +1,10 @@
-let g:airline_theme = 'dark'
-call airline#init#bootstrap()
-call airline#init#sections()
+let g:airline#extensions#default#layout = [
+      \ [ 'c', 'a', 'b', 'warning' ],
+      \ [ 'x', 'z', 'y' ]
+      \ ]
+
 source plugin/airline.vim
-call airline#load_theme()
+doautocmd VimEnter
 
 describe 'default'
   before
@@ -10,10 +12,6 @@ describe 'default'
   end
 
   it 'should use the layout'
-    let g:airline#extensions#default#layout = [
-          \ [ 'c', 'a', 'b', 'warning' ],
-          \ [ 'x', 'z', 'y' ]
-          \ ]
     call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
     let stl = s:builder.build()
     Expect stl =~ 'airline_c_to_airline_a'
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index 8ab472bb..96cd12b0 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -88,7 +88,7 @@ vim-go has several `<Plug>` mappings which can be used to create custom
 mappings. Below are some examples you might find useful:
 
 Show a list of interfaces which is implemented by the type under your cursor
-with `<leader>s` 
+with `<leader>s`
 
 ```vim
 au FileType go nmap <Leader>s <Plug>(go-implements)
@@ -187,6 +187,8 @@ To change it:
 let g:go_highlight_functions = 1
 let g:go_highlight_methods = 1
 let g:go_highlight_structs = 1
+let g:go_highlight_operators = 1
+let g:go_highlight_build_constraints = 1
 ```
 
 ## Troubleshooting
@@ -198,13 +200,13 @@ If trying to use `:GoDef`,  `:GoInfo` and get a `command not found`, check that
 Before opening vim, check your current `$PATH`:
 
 	echo $PATH
-	
-after opening vim, run `:echo $PATH`, the output must be your current `$PATH` + `$PATH/bin` (the location where `:GoInstallBinaries` installed the binaries
+
+after opening vim, run `:echo $PATH`, the output must be your current `$PATH` + `$GOPATH/bin` (the location where `:GoInstallBinaries` installed the binaries
 
 If problem persists and you are using maybe 'csh' or other shell, try adding this to your .vimrc:
 
     set shell=/bin/sh
-   
+
 
 
 ### I'm using Fish shell but have some problems using Vim-go
@@ -240,7 +242,7 @@ Give it a try. I hope you like it. Feel free to contribute to the project.
 
 ## Donations
 
-Vim-go is an open source project and I'm working on it on my free times. I'm spending a lot of time and thoughts to make it stable, fixing bugs, adding new features, etc... If you like vim-go and find it helpful, you might give me a gift from some of the books (kindle) I have in my wish list: 
+Vim-go is an open source project and I'm working on it on my free times. I'm spending a lot of time and thoughts to make it stable, fixing bugs, adding new features, etc... If you like vim-go and find it helpful, you might give me a gift from some of the books (kindle) I have in my wish list:
 
 [Amazon.com Fatih's Wish List](http://amzn.com/w/3RUTKZC0U30P6). Thanks!
 
diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim
index dfb5abde..4f94fcf6 100644
--- a/sources_non_forked/vim-go/autoload/go/cmd.vim
+++ b/sources_non_forked/vim-go/autoload/go/cmd.vim
@@ -81,13 +81,25 @@ function! go#cmd#Build(bang, ...)
     let &makeprg = default_makeprg
 endfunction
 
-function! go#cmd#Test(...)
-    let command = "go test ."
-    if len(a:000)
-        let command = "go test " . expand(a:1)
+function! go#cmd#Test(compile, ...)
+    let command = "go test "
+
+    " don't run the test, only compile it. Useful to capture and fix errors or
+    " to create a test binary.
+    if a:compile
+        let command .= "-c"
+    endif
+
+    if len(a:000)
+        let command .= expand(a:1)
+    endif
+
+    if a:compile
+        echon "vim-go: " | echohl Identifier | echon "compiling tests ..." | echohl None
+    else
+        echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
     endif
 
-    echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
     redraw
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
@@ -103,7 +115,12 @@ function! go#cmd#Test(...)
     else
         call setqflist([])
         cwindow
-        echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
+
+        if a:compile
+            echon "vim-go: " | echohl Function | echon "[test] SUCCESS" | echohl None
+        else
+            echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
+        endif
     endif
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim
index 227c4cbd..a1894ce7 100644
--- a/sources_non_forked/vim-go/autoload/go/complete.vim
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -135,6 +135,11 @@ function! go#complete#Info()
     endif
 endfunction
 
+function! s:trim_bracket(val)
+    let a:val.word = substitute(a:val.word, '[(){}\[\]]\+$', '', '')
+    return a:val
+endfunction
+
 fu! go#complete#Complete(findstart, base)
     "findstart = 1 when we need to get the text length
     if a:findstart == 1
@@ -142,6 +147,10 @@ fu! go#complete#Complete(findstart, base)
         return col('.') - g:gocomplete_completions[0] - 1
         "findstart = 0 when we need to return the list of completions
     else
+        let s = getline(".")[col('.') - 1]
+        if s =~ '[(){}\{\}]'
+            return map(copy(g:gocomplete_completions[1]), 's:trim_bracket(v:val)')
+        endif
         return g:gocomplete_completions[1]
     endif
 endf
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
index 30517b26..8ef0b7c7 100644
--- a/sources_non_forked/vim-go/autoload/go/oracle.vim
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -56,7 +56,7 @@ func! s:qflistSecond(output)
     " We discard line2 and col2 for the first errorformat, because it's not
     " useful and quickfix only has the ability to show one line and column
     " number
-	let &errorformat = "%f:%l.%c-%.%#:\ %m,%f:%l:%c:\ %m"
+	let &errorformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m"
 
     " create the quickfix list and open it
     cgetexpr split(a:output, "\n")
@@ -189,6 +189,27 @@ endfunction
 " Show all refs to entity denoted by selected identifier
 function! go#oracle#Referrers(selected)
     let out = s:RunOracle('referrers', a:selected)
+
+    " append line contents from Go source file for some messages:
+    " '...: referenced here'
+    " '...: reference to NAME'
+    let lines = split(out, "\n")
+    let extlines = []
+    for line in lines
+        if line =~# '\v: referenced here$|: reference to [^ :]*$'
+            let parts = split(line, ':')
+            " Note: we count -3 from end, to support additional comma in
+            " Windows-style C:\... paths
+            let filename = join(parts[0:-3], ':')
+            let linenum = parts[-2]
+            let extline = line . ': ' . readfile(filename, '', linenum)[linenum-1]
+            call add(extlines, extline)
+        else
+            call add(extlines, line)
+        endif
+    endfor
+    let out = join(extlines, "\n")
+
     call s:qflistSecond(out)
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim
index db165e40..b34973c8 100644
--- a/sources_non_forked/vim-go/autoload/go/tool.vim
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -124,17 +124,21 @@ function! go#tool#BinPath(binpath)
     let old_path = $PATH
     let $PATH = $PATH . PathSep() .go_bin_path
 
-    if !executable(binpath) 
+    if !executable(basename)
         echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it."
+        " restore back!
+        let $PATH = old_path
         return ""
     endif
 
-    " restore back!
-    if go_bin_path
-        let $PATH = old_path
+    let $PATH = old_path
+
+    let sep = '/'
+    if IsWin()
+        let sep = '\'
     endif
 
-    return go_bin_path . '/' . basename
+    return go_bin_path . sep . basename
 endfunction
 
 " following two functions are from: https://github.com/mattn/gist-vim 
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index ac77a32c..4e99d953 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -38,10 +38,13 @@ easily.
   * Better `gofmt` on save, keeps cursor position and doesn't break your undo
     history
   * Go to symbol/declaration with `godef`
+  * Look up documentation with `godoc` inside Vim or open it in browser.
   * Automatically import packages via `goimports`
   * Compile and `go build` your package, install it with `go install`
   * `go run` quickly your current file/files
   * Run `go test` and see any errors in quickfix window
+  * Create a coverage profile and display annotated source code in browser to
+    see which functions are covered.
   * Lint your code with `golint`
   * Run your code trough `go vet` to catch static errors.
   * Advanced source analysis tool with `oracle`
@@ -50,30 +53,49 @@ easily.
   * Checking with `errcheck` for unchecked errors.
   * Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
   * Share your current code to play.golang.org
-  * Type information about the underlying identifier
+  * On-the-fly type information about the word under the cursor
   * Tagbar support to show tags of the source code in a sidebar with `gotags`
+  * Custom vim text objects, such a `a function` or `inner function`
 
 ===============================================================================
 INSTALL                                                           *go-install*
 
-If you use pathogen, just clone it into your bundle directory: >
+Vim-go follows the standard runtime path structure, so I highly recommend to use
+a common and well known plugin manager to install vim-go. Do not use vim-go with
+other Go plugins. For Pathogen just clone the repo, for other plugin managers
+add the appropriate lines and execute the plugin's install command.
 
-	$ cd ~/.vim/bundle
-	$ git clone https://github.com/fatih/vim-go.git
+*  https://github.com/tpope/vim-pathogen >
+
+    git clone https://github.com/fatih/vim-go.git ~/.vim/bundle/vim-go
 <
 
-For Vundle add this line to your vimrc:
->
-  Plugin 'fatih/vim-go'
+*  https://github.com/junegunn/vim-plug >
+  
+    Plug 'fatih/vim-go'
+
+<
+*  https://github.com/Shougo/neobundle.vim >
+  
+    NeoBundle 'fatih/vim-go'
 <
-and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
 
+*  https://github.com/gmarik/vundle >
 
-Please be sure all necessary binares are installed (such as `gocode`, `godef`,
+    Plugin 'fatih/vim-go'
+
+<
+*  Manual >
+  
+    Copy all of the files into your `~/.vim` directory
+<
+
+Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
 `goimports`, etc..). You can easily install them with the included
-|GoInstallBinaries|. Those binaries will be automatically downloaded and
-installed to your `$GOBIN` environment (if not set it will use `$GOPATH/bin`).
-It requires `git` and `hg` for fetching the individual Go packages.
+|GoInstallBinaries| command. If you invoke it, all necessary binaries will be
+automatically downloaded and installed to your `$GOBIN` environment (if not set
+it will use `$GOPATH/bin`).  It requires `git` for fetching the individual Go
+packages.
 
 * Autocompletion is enabled by default via `<C-x><C-o>`, to get real-time
 completion (completion by type) install:
@@ -199,9 +221,18 @@ COMMANDS                                                          *go-commands*
                                                                     *:GoTest*
 :GoTest [expand]
 
-    Test your _test.go files via in your current directory. Errors are
+    Run the tests on your _test.go files via in your current directory. Errors
+    are populated in quickfix window.  If an argument is passed, 'expand' is
+    used as file selector (useful for cases like `:GoTest ./...`).
+
+                                                              *:GoTestCompile*
+:GoTestCompile [expand]
+
+    Compile your _test.go files via in your current directory. Errors are
     populated in quickfix window.  If an argument is passed, 'expand' is used
-    as file selector (useful for cases like `:GoTest ./...`).
+    as file selector (useful for cases like `:GoTest ./...`). Useful to not
+    run the tests and capture/fix errors before running the tests or to
+    create test binary.
 
                                                                 *:GoCoverage*
 :GoCoverage
@@ -359,6 +390,10 @@ Calls `go install` for the current package
 
 Calls `go test` for the current package
 
+                                                          *(go-test-compile)*
+
+Calls `go test -c` for the current package
+
                                                              *(go-coverage)*
 
 Calls `go test -coverprofile-temp.out` for the current package
@@ -699,7 +734,8 @@ or
 	set shell='/bin/sh'
 >
 
-I'm seeing weirds errors during the startup~
+I'm seeing weirds errors during installation of binaries with
+GoInstallBinaries:
 
 If you see errors like this:
 >
diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
index 526bf99d..20e58388 100644
--- a/sources_non_forked/vim-go/ftplugin/go/commands.vim
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -8,7 +8,8 @@ let g:go_loaded_commands = 1
 nnoremap <silent> <Plug>(go-run) :<C-u>call go#cmd#Run(expand('%'))<CR>
 nnoremap <silent> <Plug>(go-build) :<C-u>call go#cmd#Build('')<CR>
 nnoremap <silent> <Plug>(go-install) :<C-u>call go#cmd#Install()<CR>
-nnoremap <silent> <Plug>(go-test) :<C-u>call go#cmd#Test('')<CR>
+nnoremap <silent> <Plug>(go-test) :<C-u>call go#cmd#Test(0, '')<CR>
+nnoremap <silent> <Plug>(go-test-compile) :<C-u>call go#cmd#Test(1, '')<CR>
 nnoremap <silent> <Plug>(go-coverage) :<C-u>call go#cmd#Coverage('')<CR>
 nnoremap <silent> <Plug>(go-vet) :<C-u>call go#cmd#Vet()<CR>
 nnoremap <silent> <Plug>(go-files) :<C-u>call go#tool#Files()<CR>
@@ -63,7 +64,8 @@ command! -nargs=* GoInfo call go#complete#Info()
 command! -nargs=* -bang GoRun call go#cmd#Run(<bang>0,<f-args>)
 command! -nargs=* -bang GoBuild call go#cmd#Build(<bang>0,<f-args>)
 command! -nargs=* GoInstall call go#cmd#Install(<f-args>)
-command! -nargs=* GoTest call go#cmd#Test(<f-args>)
+command! -nargs=* GoTest call go#cmd#Test(0, <f-args>)
+command! -nargs=* GoTestCompile call go#cmd#Test(1, <f-args>)
 command! -nargs=* GoCoverage call go#cmd#Coverage(<f-args>)
 command! -nargs=0 GoVet call go#cmd#Vet()
 
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
index f5e31ed6..d08d72eb 100644
--- a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -38,7 +38,7 @@ endsnippet
 # case
 snippet case "case ...:"
 case ${1:value}:
-	${0}
+	${0:${VISUAL}}
 endsnippet
 
 # constant
@@ -70,8 +70,7 @@ endsnippet
 # default case
 snippet default "default: ..."
 default:
-	${0}
-
+	${0:${VISUAL}}
 endsnippet
 
 # defer
@@ -82,7 +81,7 @@ endsnippet
 
 snippet def "defer func() { ... }"
 defer func() {
-	${0}
+	${0:${VISUAL}}
 }()
 endsnippet
 
@@ -90,7 +89,7 @@ endsnippet
 snippet defr
 defer func() {
 	if err := recover(); err != nil {
-		${0}
+		${0:${VISUAL}}
 	}
 }()
 endsnippet
@@ -133,14 +132,14 @@ endsnippet
 # if condition
 snippet if "if ... { ... }"
 if ${1:condition} {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
 # else snippet
 snippet else
 else {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -167,6 +166,14 @@ if err != nil {
 ${0}
 endsnippet
 
+snippet errh "Error handle and return" !b
+if err != nil {
+	${1}
+	return
+}
+${0}
+endsnippet
+
 snippet json "\`json:key\`"
 \`json:"${1:keyName}"\`
 endsnippet
@@ -179,21 +186,21 @@ endsnippet
 # for loop
 snippet for "for ... { ... }"
 for ${1} {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
 # for integer loop
 snippet fori "for 0..N-1 { ... }"
 for ${1:i} := 0; $1 < ${2:N}; $1++ {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
 # for range loop
 snippet forr "for k, v := range items { ... }"
 for ${2:k}, ${3:v} := range ${1} {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -211,17 +218,17 @@ endsnippet
 
 # Fmt Println debug
 snippet fn "fmt.Println(...)"
-fmt.Println("${1}")
+fmt.Println("${1:${VISUAL}}")
 endsnippet
 
 # log printf
 snippet lf "log.Printf(...)"
-log.Printf("${1} = %+v\n", $1)
+log.Printf("${1:${VISUAL}} = %+v\n", $1)
 endsnippet
 
 # log println
 snippet ln "log.Println(...)"
-log.Println("${1}")
+log.Println("${1:${VISUAL}}")
 endsnippet
 
 # make
@@ -237,7 +244,7 @@ endsnippet
 # main()
 snippet main "func main() { ... }"
 func main() {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -251,7 +258,7 @@ endsnippet
 # ok
 snippet ok "if !ok { ... }"
 if !ok {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -269,7 +276,7 @@ endsnippet
 
 # return
 snippet rt "return"
-return ${0}
+return ${0:${VISUAL}}
 endsnippet
 
 # select
@@ -316,7 +323,7 @@ endsnippet
 # test function
 snippet test "func TestXYZ(t *testing.T) { ... }"
 func Test${1:Function}(t *testing.T) {
-	${0}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -346,16 +353,26 @@ endsnippet
 
 # variable declaration
 snippet var "var x Type [= ...]"
-var ${1:x} ${2:Type}${3: = ${0:value\}}
+var ${1:x} ${2:Type}${3: = ${0:value}}
 endsnippet
 
 # variables declaration
 snippet vars "var ( ... )"
 var (
-${1:x} ${2:Type}${3: = ${0:value\}}
+	${1:x} ${2:Type}${3: = ${0:value}}
 )
 endsnippet
 
+# equals fails the test if exp is not equal to act.
+snippet eq "equals: test two identifiers with DeepEqual"
+if !reflect.DeepEqual(${1:expected}, ${2:actual}) {
+	_, file, line, _ := runtime.Caller(0)
+	fmt.Printf("%s:%d:\n\n\texp: %#v\n\n\tgot: %#v\n\n", filepath.Base(file), line, $1, $2)
+	t.FailNow()
+}
+endsnippet
+
+
 global !p
 
 import re
diff --git a/sources_non_forked/vim-go/gosnippets/snippets/go.snip b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
index dad7ced8..f7f23363 100644
--- a/sources_non_forked/vim-go/gosnippets/snippets/go.snip
+++ b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
@@ -139,6 +139,16 @@ abbr if err != nil { return [...], err }
 	}
 	${0}
 
+
+# error snippet handle and return
+snippet errh
+abbr if err != nil { return }
+	if err != nil {
+		${1}
+		return
+	}
+	${0}
+
 # json snippet
 snippet json
 abbr \`json:key\`
@@ -304,3 +314,11 @@ abbr var ( ... )
 	var (
 		${1:x} ${2:Type}${3: = ${0:value\}}
 	)
+# equals fails the test if exp is not equal to act.
+snippet eq
+abbr equals: test two identifiers with DeepEqual
+  if !reflect.DeepEqual(${1:expected}, ${2:actual}) {
+  	_, file, line, _ := runtime.Caller(0)
+  	fmt.Printf("%s:%d:\n\n\texp: %#v\n\n\tgot: %#v\n\n", filepath.Base(file), line, $1, $2)
+  	t.FailNow()
+  }
diff --git a/sources_non_forked/vim-repeat/README.markdown b/sources_non_forked/vim-repeat/README.markdown
index d9141317..994e984b 100644
--- a/sources_non_forked/vim-repeat/README.markdown
+++ b/sources_non_forked/vim-repeat/README.markdown
@@ -14,6 +14,7 @@ The following plugins support repeat.vim:
 * [abolish.vim](https://github.com/tpope/vim-abolish)
 * [unimpaired.vim](https://github.com/tpope/vim-unimpaired)
 * [commentary.vim](https://github.com/tpope/vim-commentary)
+* [vim-easyclip](https://github.com/svermeulen/vim-easyclip)
 
 Adding support to a plugin is generally as simple as the following
 command at the end of your map functions.
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index c5d2b74c..7e445697 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -29,6 +29,7 @@ additional contributions from:
 * [lpil](https://github.com/lpil)
 * [marutanm](https://github.com/marutanm)
 * [MicahElliott](https://github.com/MicahElliott)
+* [mikeastock](https://github.com/mikeastock)
 * [muffinresearch](https://github.com/muffinresearch)
 * [pielgrzym](https://github.com/pielgrzym)
 * [pose](https://github.com/pose)
diff --git a/sources_non_forked/vim-snipmate/README.md b/sources_non_forked/vim-snipmate/README.md
index 423f1458..6aad008a 100644
--- a/sources_non_forked/vim-snipmate/README.md
+++ b/sources_non_forked/vim-snipmate/README.md
@@ -37,17 +37,43 @@ looking at the [vim-snippets][vim-snippets] repository.
         % git clone https://github.com/honza/vim-snippets.git
 
 * Using [Vundle][vundle], add the following to your `vimrc` then run
-  `:BundleInstall`
+  `:PluginInstall`
 
-        Bundle "MarcWeber/vim-addon-mw-utils"
-        Bundle "tomtom/tlib_vim"
-        Bundle "garbas/vim-snipmate"
+        Plugin "MarcWeber/vim-addon-mw-utils"
+        Plugin "tomtom/tlib_vim"
+        Plugin "garbas/vim-snipmate"
 
         " Optional:
-        Bundle "honza/vim-snippets"
+        Plugin "honza/vim-snippets"
 
 ## FAQ ##
 
+> SnipMate doesn't work / My snippets aren't triggering
+
+Try all of the following:
+
+* Check that SnipMate is loaded. This can be done by looking for
+  `<Plug>snipMateTrigger` and similar maps in the output of `:imap`.
+  Additionally make sure either `<Plug>snipMateTrigger` or
+  `<Plug>snipMateNextOrTrigger` is mapped to the key you expect.
+
+* Check that the snippets file you mean to use exists, and that it contains the
+  snippet you're trying to expand.
+
+* Check that your snippets file is located inside a `foo/snippets` directory,
+  where `foo` is a path listed in your `runtimepath`.
+
+* Check that your snippets file is in scope by either the filetype matching the
+  path of the snippet file or the scope explicitly loaded.
+
+* Check if any snippets from your snippets file are available. This can be done
+  with the "show available snips` map, by default bound to `<C-R><Tab>` in
+  insert mode.
+
+If all of the above check out, please open an issue stating your Vim version,
+a sample snippet, and a description of exactly what happens when you try to
+trigger a snippet.
+
 > How does SnipMate determine which snippets to load? How can I separate, for
 > example, my Rails snippets from my Ruby snippets?
 
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 7db38b7d..9cc50d8d 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -331,7 +331,7 @@ function! s:snippet_filenames(scope, trigger) abort
 	let mid = ['', '_*', '/*']
 	let mid += map(copy(mid), "'/' . a:trigger . '*' . v:val")
 	call map(mid, "'snippets/' . a:scope . v:val . '.snippet'")
-	return join(map(mid[:2], 'v:val . "s"') + mid[3:])
+	return map(mid[:2], 'v:val . "s"') + mid[3:]
 endfunction
 
 function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion) abort
@@ -342,12 +342,27 @@ function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion) ab
 	let d[a:trigger][a:path] = [a:snippet, a:snipversion]
 endfunction
 
+if v:version < 704 || has('win32')
+	function! s:Glob(path, expr)
+		let res = []
+		for p in split(a:path, ',')
+			let h = split(fnamemodify(a:expr, ':h'), '/')[0]
+			if isdirectory(p . '/' . h)
+				call extend(res, split(glob(p . '/' . a:expr), "\n"))
+			endif
+		endfor
+		return filter(res, 'filereadable(v:val)')
+	endfunction
+else
+	function! s:Glob(path, expr)
+		return split(globpath(a:path, a:expr), "\n")
+	endfunction
+endif
+
 " default triggers based on paths
 function! snipMate#DefaultPool(scopes, trigger, result) abort
 	let scopes = s:AddScopeAliases(a:scopes)
 	let scopes_done = []
-	let rtp_save = &rtp
-	let &rtp = join(g:snipMate.snippet_dirs, ',')
 	let s:lookup_state = {}
 	let s:lookup_state.snips = []
 
@@ -356,7 +371,13 @@ function! snipMate#DefaultPool(scopes, trigger, result) abort
 		let s:lookup_state.scope = scope
 		let s:lookup_state.extends = []
 
-		exec 'runtime!' s:snippet_filenames(scope, escape(a:trigger, "*[]?{}`'$|#%"))
+		for expr in s:snippet_filenames(scope, escape(a:trigger, "*[]?{}`'$|#%"))
+			for path in g:snipMate.snippet_dirs
+				for file in s:Glob(path, expr)
+					source `=file`
+				endfor
+			endfor
+		endfor
 
 		call add(scopes_done, scope)
 		call extend(scopes, s:lookup_state.extends)
@@ -368,8 +389,6 @@ function! snipMate#DefaultPool(scopes, trigger, result) abort
 			call snipMate#SetByPath(a:result, trigger, desc, contents, bang, snipversion)
 		endif
 	endfor
-
-	let &rtp = rtp_save
 endfunction
 
 " return a dict of snippets found in runtimepath matching trigger
@@ -385,64 +404,28 @@ fun! snipMate#GetSnippets(scopes, trigger) abort
 	return result
 endf
 
-" adds leading tab
-" and replaces leading spaces by tabs
-" see ftplugin/snippet.vim
-fun! snipMate#RetabSnip() range abort
-  let leadingTab = expand('%:e') == 'snippets'
-
-  let lines = getline(a:firstline, a:lastline)
-
-  " remove leading "\t"
-  let allIndented = 1
-  for l in lines
-	if l[0] != '\t' | let allIndented = 0 | endif
-  endfor
-
-  " retab
-  if allIndented
-	call map(lines, 'v:val[1:]')
-  endif
-
-  let leadingSp = filter(map(copy(lines),'matchstr(v:val,"^\\s*") '),'v:val !=""')
-  if !empty(leadingSp)
-	" lines containing leading spaces found
-	let smallestInd =  len(sort(leadingSp)[-1])
-	let ind = input('retab, spaces per tab: ', smallestInd)
-	for i in range(0, len(lines)-1)
-	  let ml = matchlist(lines[i], '^\(\s*\)\(.*\)')
-	  let lines[i] = repeat("\t", len(ml[1]) / ind)
-				 \ . repeat( " ", len(ml[1]) % ind)
-				 \ . ml[2]
+function! snipMate#OpenSnippetFiles() abort
+	let files = []
+	let scopes_done = []
+	let exists = []
+	let notexists = []
+	for scope in s:AddScopeAliases(snipMate#ScopesByFile())
+		let files += split(s:snippet_filenames(scope, ''))
 	endfor
-  endif
-  " readd tab
-  let tab = leadingTab ? "\t" : ""
-  for i in range(0,len(lines)-1)
-	call setline(a:firstline + i, tab.lines[i])
-  endfor
-endf
-
-fun! snipMate#OpenSnippetFiles() abort
-  let dict = snipMate#GetSnippetFiles(0, snipMate#ScopesByFile(), '*')
-  " sort by files wether they exist - put existing files first
-  let exists = []
-  let notExists = []
-  for [file, v] in items(dict)
-	let v['file'] = file
-	if v['exists']
-	  call add(exists, v)
-	else
-	  call add(notExists, v)
-	endif
-  endfor
-  let all = exists + notExists
-  let show = map(copy(all),'(v:val["exists"] ? "exists:" : "does not exist yet:")." ".v:val["file"]')
-  let select = tlib#input#List('mi', 'select files to be opened in splits', show)
-  for idx in select
-	exec 'sp '.all[idx - 1]['file']
-  endfor
-endf
+	call filter(files, "v:val !~# '\\*'")
+	for path in split(g:snipMate.snippet_dirs, ',')
+		let fullpaths = map(copy(files), 'printf("%s/%s", path, v:val)')
+		let exists += filter(copy(fullpaths), 'filereadable(v:val)')
+		let notexists += map(filter(copy(fullpaths),
+					\ 'v:val =~# "\.snippets" && !filereadable(v:val)'),
+					\       '"does not exist: " . v:val')
+	endfor
+	let all = exists + notexists
+	let select = tlib#input#List('mi', 'select files to be opened in splits', all)
+	for idx in select
+		exec 'sp' all[idx - 1]
+	endfor
+endfunction
 
 fun! snipMate#ScopesByFile() abort
 	" duplicates are removed in AddScopeAliases
diff --git a/sources_non_forked/vim-snipmate/ftplugin/snippet.vim b/sources_non_forked/vim-snipmate/ftplugin/snippet.vim
deleted file mode 100644
index 242aa865..00000000
--- a/sources_non_forked/vim-snipmate/ftplugin/snippet.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-command! -buffer -range=% RetabSnip <line1>,<line2>call snipMate#RetabSnip()
-vnoremap <buffer> <cr> :RetabSnip<cr>
-
-if !exists('g:snippet_no_indentation_settings')
-  setlocal sw=4
-  setlocal tabstop=4
-  setlocal noexpandtab
-endif
diff --git a/sources_non_forked/vim-snipmate/ftplugin/snippets.vim b/sources_non_forked/vim-snipmate/ftplugin/snippets.vim
index e0c6826b..dde00e4c 100644
--- a/sources_non_forked/vim-snipmate/ftplugin/snippets.vim
+++ b/sources_non_forked/vim-snipmate/ftplugin/snippets.vim
@@ -1 +1,20 @@
-runtime! ftplugin/snippet.vim
+" Vim filetype plugin for SnipMate snippets (.snippets and .snippet files)
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl et< sts< cms< fdm< fde<"
+
+" Use hard tabs
+setlocal noexpandtab softtabstop=0
+
+setlocal foldmethod=expr foldexpr=getline(v:lnum)!~'^\\t\\\\|^$'?'>1':1
+
+setlocal commentstring=#\ %s
+setlocal nospell
+
+command! -buffer -range=% RetabSnip
+            \ echom "This command is deprecated. Use :retab and = instead. Doing that now."
+            \ | <line1>,<line2>retab! | <line1>,<line2>normal =
diff --git a/sources_non_forked/vim-snipmate/indent/snippets.vim b/sources_non_forked/vim-snipmate/indent/snippets.vim
new file mode 100644
index 00000000..0d28f329
--- /dev/null
+++ b/sources_non_forked/vim-snipmate/indent/snippets.vim
@@ -0,0 +1,32 @@
+" Simple indent support for SnipMate snippets files
+
+if exists('b:did_indent')
+    finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal indentkeys=!^F,o,O,=snippet,=version,=extends
+setlocal indentexpr=GetSnippetIndent()
+
+if exists("*GetSnippetIndent")
+    finish
+endif
+
+function! GetSnippetIndent()
+    let line = getline(v:lnum)
+    let prev_lnum = v:lnum - 1
+    let prev_line = prev_lnum != 0 ? getline(prev_lnum) : ""
+
+    if line =~# '\v^(snippet|extends|version) '
+        return 0
+    elseif indent(v:lnum) > 0
+        return indent(v:lnum)
+    elseif prev_line =~# '^snippet '
+        return &sw
+    elseif indent(prev_lnum) > 0
+        return indent(prev_lnum)
+    endif
+
+    return 0
+endfunction
diff --git a/sources_non_forked/vim-snipmate/plugin/snipMate.vim b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
index c82e43a0..42ab3df7 100644
--- a/sources_non_forked/vim-snipmate/plugin/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/plugin/snipMate.vim
@@ -28,11 +28,12 @@ if (!exists('g:snipMateSources'))
   let g:snipMateSources['default'] = funcref#Function('snipMate#DefaultPool')
 endif
 
-au BufRead,BufNewFile *.snippet set ft=snippet
-au FileType snippet setl noet nospell
-
-au BufRead,BufNewFile *.snippets set ft=snippets
-au FileType snippets setl noet nospell fdm=expr fde=getline(v:lnum)!~'^\\t\\\\|^$'?'>1':1
+au BufRead,BufNewFile *.snippet,*.snippets setlocal filetype=snippets
+au FileType snippets if expand('<afile>:e') =~# 'snippet$'
+				\ | setlocal syntax=snippet
+			\ | else
+				\ | setlocal syntax=snippets
+			\ | endif
 
 inoremap <silent> <Plug>snipMateNextOrTrigger  <C-R>=snipMate#TriggerSnippet()<CR>
 snoremap <silent> <Plug>snipMateNextOrTrigger  <Esc>a<C-R>=snipMate#TriggerSnippet()<CR>
diff --git a/sources_non_forked/vim-snipmate/syntax/snippets.vim b/sources_non_forked/vim-snipmate/syntax/snippets.vim
index f9859cf0..63bda4e3 100644
--- a/sources_non_forked/vim-snipmate/syntax/snippets.vim
+++ b/sources_non_forked/vim-snipmate/syntax/snippets.vim
@@ -7,10 +7,10 @@ syn match snipEscape '\\\\\|\\`'
 syn match snipCommand '\%(\\\@<!\%(\\\\\)*\)\@<=`.\{-}\%(\\\@<!\%(\\\\\)*\)\@<=`'
 syn match snippet '^snippet.*' contains=multiSnipText,snipKeyword
 syn match snippet '^extends.*' contains=snipKeyword
-syn match snippet '^guard\s\+.*' contains=multiSnipText,snipKeyword
+syn match snippet '^version.*' contains=snipKeyword
 syn match multiSnipText '\S\+ \zs.*' contained
-syn match snipKeyword '^(snippet|extends)'me=s+8 contained
-syn match snipError "^[^#se\t].*$"
+syn match snipKeyword '^(snippet|extends|version)'me=s+8 contained
+syn match snipError "^[^#vse\t].*$"
 
 hi link snippet       Identifier
 hi link snipComment   Comment
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eelixir.snippets b/sources_non_forked/vim-snippets/UltiSnips/eelixir.snippets
new file mode 100644
index 00000000..a9c5a29a
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/eelixir.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index 171f08c8..b626cc4a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -79,8 +79,8 @@ snippet f. "f.password_field"
 `!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_box"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+snippet f. "f.radio_button"
+`!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"
diff --git a/sources_non_forked/vim-snippets/UltiSnips/go.snippets b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
index efd15892..780ee29b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/go.snippets
@@ -111,6 +111,12 @@ func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
 }
 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}
@@ -135,3 +141,10 @@ snippet json "JSON field"
 endsnippet
 
 # vim:ft=snippets:
+
+# error handling
+snippet err "Basic error handling" b
+if err != nil {
+	log.${1:Fatal}(err)
+}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index 674985c7..3986e116 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -160,14 +160,18 @@ snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
-snippet body "XHTML <body>"
-<body id="${1:`!p
-snip.rv = snip.fn and 'Hallo' or 'Nothin'
-`}"${2: onload="$3"}>
+snippet body "<body>"
+<body>
 	$0
 </body>
 endsnippet
 
+snippet div "<div>" w
+<div>
+	$0
+</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
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
index 6867e866..e7ca5e06 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html_minimal.snippets
@@ -29,5 +29,5 @@ snippet textarea
 endsnippet
 
 snippet img
-	<img src="$1"${2: alt="$3"}/>
+<img src="$1"${2: alt="$3"}/>
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index ddb948f2..a27d6faf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -4,12 +4,34 @@
 
 priority -50
 
-snippet fn "A function, optionally with arguments and return type." b
+snippet let "let variable declaration" b
+let ${1:name}${2:: ${3:type}} = ${4};
+endsnippet
+
+snippet letm "let mut variable declaration" b
+let mut ${1:name}${2:: ${3:type}} = ${4};
+endsnippet
+
+snippet fn "A function, optionally with arguments and return type."
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 	${VISUAL}${0}
 }
 endsnippet
 
+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 pri "print!(..)" b
 print!("${1}"${2/..*/, /}${2});
 endsnippet
@@ -30,7 +52,7 @@ macro_rules! ${1:name} (
 )
 endsnippet
 
-snippet mod	 "A module" b
+snippet mod "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
 }
@@ -52,18 +74,27 @@ struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 }
 endsnippet
 
+# TODO: fancy dynamic field mirroring like Python slotclass
 snippet stn "Struct with new constructor." b
 pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	${3}
+	fd${0}
 }
 
 impl $1 {
 	pub fn new(${2}) -> $1 {
-		${4}return $1 {
-			${5}
-		};
+		$1 { ${3} };
 	}
 }
 endsnippet
 
+snippet fd "Struct field definition" w
+${1:name}: ${2:Type},
+endsnippet
+
+snippet impl "Struct/Trait implementation" b
+impl ${1:Type/Trait}${2: for ${3:Type}} {
+	${0}
+}
+endsnippet
+
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/snippets/eelixir.snippets b/sources_non_forked/vim-snippets/snippets/eelixir.snippets
new file mode 100644
index 00000000..17855b41
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/eelixir.snippets
@@ -0,0 +1,6 @@
+snippet %
+	<% ${0} %>
+snippet =
+	<%= ${1} %>
+snippet end
+	<% end %>
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index 4f1afd91..8fc710ca 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -32,13 +32,13 @@ snippet unlesse: unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
 snippet cond
 	cond do
-	${1} ->
-		${0}
+		${1} ->
+			${0}
 	end
 snippet case
 	case ${1} do
-	${2} ->
-		${0}
+		${2} ->
+			${0}
 	end
 snippet df
 	def ${1:name}, do: ${2}
@@ -114,4 +114,4 @@ snippet try try .. rescue .. end
 	end
 snippet pry
 	require IEx; IEx.pry
-	$0
+	${0}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index dcc28e74..89438b41 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -592,6 +592,10 @@ 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}
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index fa8123d5..4113e9e6 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -15,6 +15,11 @@ snippet f
 	function(${1}) {
 		${0}
 	}
+# Anonymous Function assigned to variable
+snippet vaf
+	var ${1:function_name} = function(${2}) {
+		${0}
+	};
 # Function assigned to variable
 snippet vf
 	var ${1:function_name} = function $1(${2}) {
@@ -252,6 +257,10 @@ snippet cdir
 
 # Misc
 
+# 'use strict';
+snippet us
+	'use strict';
+
 # setTimeout function
 snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});
diff --git a/sources_non_forked/vim-snippets/snippets/rails.snippets b/sources_non_forked/vim-snippets/snippets/rails.snippets
index 3a72bfde..6018621d 100644
--- a/sources_non_forked/vim-snippets/snippets/rails.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rails.snippets
@@ -36,7 +36,7 @@ snippet crw
 	cattr_accessor :${0:attr_names}
 snippet defcreate
 	def create
-		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
+		@${1:model_class_name} = ${2:ModelClassName}.new($1_params)
 
 		respond_to do |format|
 			if @$1.save
@@ -95,7 +95,7 @@ snippet defupdate
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
 		respond_to do |format|
-			if @$1.update_attributes(params[:$1])
+			if @$1.update($1_params)
 				flash[:notice] = '$2 was successfully updated.'
 				format.html { redirect_to(@$1) }
 				format.xml  { head :ok }
@@ -105,6 +105,10 @@ snippet defupdate
 			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
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index 195f254a..77e51329 100644
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -3,11 +3,11 @@
 #################
 
 # Functions
-snippet fn
+snippet fn "Function definition"
 	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
-snippet test
+snippet test "Unit test function"
 	#[test]
 	fn ${1:test_function_name}() {
 		${0}
@@ -19,32 +19,51 @@ snippet bench "Bench function" b
 			${0}
 		})
 	}
-snippet new
+snippet new "Constructor function"
 	pub fn new(${2}) -> ${1:Name} {
-		${0}return $1 { ${3} };
+		$1 { ${3} };
 	}
-snippet main
+snippet main "Main function"
 	pub fn main() {
 		${0}
 	}
-snippet let
-	let ${1:name: type} = ${2};
-snippet let
-	let mut ${1:name: type} = ${2};
-snippet pln
+snippet let "let variable declaration"
+	let ${1:name}${2:: ${3:type}} = ${4};
+snippet letm "let mut variable declaration"
+	let mut ${1:name}${2:: ${3:type}} = ${4};
+snippet pln "println!"
 	println!("${1}");
-snippet pln,
+snippet pln, "println! with format param"
 	println!("${1}", ${2});
-snippet ec
+# Modules
+snippet ec "extern crate"
 	extern crate ${1:sync};
-snippet ecl
-	#![feature(phase)]
-	#[phase(plugin, link)] extern crate log;
+snippet ecl "extern crate log"
+	#[macro_use]
+	extern crate log;
 snippet mod
 	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	} /* $1 */
-snippet crate
+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
@@ -53,110 +72,107 @@ snippet crate
 	#![comment = "${4:Comment.}"]
 	// Specify the output type
 	#![crate_type = "${5:lib}"]
-snippet allow
-	#[allow(${1:unused_variable})]
-snippet feat
-	#![feature(${1:macro_rules})]
-snippet der "#[deriving(..)]" b
-	#[deriving(${1:Show})]
-snippet attr "#[..]" b
-	#[${1:inline}]
-
 # Common types
-snippet opt
-	Option<${1:int}>
-snippet res
+snippet opt "Option<T>"
+	Option<${1:i32}>
+snippet res "Result<T, E>"
 	Result<${1:~str}, ${2:()}>
+# Control structures
 snippet if
 	if ${1} {
 		${0}
 	}
-snippet ife
+snippet ife "if / else"
 	if ${1} {
 		${2}
 	} else {
 		${0}
 	}
-snippet el
+snippet el "else"
 	else {
 		${0}
 	}
-snippet eli
+snippet eli "else if"
 	else if ${1} {
 		${0}
 	}
-snippet mat
+snippet mat "match pattern"
 	match ${1} {
-		${2} => ${3},
+		${2} => ${3}
 	}
+snippet case "Case clause of pattern match"
+	${1:_} => ${2:expression}
 snippet loop "loop {}" b
 	loop {
 		${0}
 	}
-snippet while
+snippet while "while loop"
 	while ${1:condition} {
 		${0}
 	}
-snippet for
+snippet for "for ... in ... loop"
 	for ${1:i} in ${2:0u..10} {
 		${0}
 	}
-snippet spawn
-	spawn(proc() {
-		${0}
-	});
-snippet chan
-	let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
-snippet duplex
-	let (${1:from_child}, ${2:to_child}) = sync::duplex();
 # TODO commenting
-snippet todo
+snippet todo "TODO comment"
 	// [TODO]: ${0:Description}
 snippet fixme "FIXME comment"
 	// FIXME: $0
-
 # Struct
-snippet st
+snippet st "Struct definition"
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
-snippet stn
-	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+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}) -> $1 {
-			${4}return $1 {
-				${5}
-			};
+			$1 { ${3} };
 		}
 	}
-snippet typ
-	type ${1:NewName} = $0;
-# Enum
-snippet enum
+snippet type "Type alias"
+	type ${1:NewName} = $2;
+snippet enum "enum definition"
 	enum ${1:Name} {
-		${0},
+		${2},
 	}
-# Impl
-snippet imp
-	impl ${1:Name} {
+# Traits
+snippet trait "Trait definition"
+	trait ${1:Name} {
 		${0}
 	}
-snippet drop
+snippet drop "Drop trait implementation (destructor)"
 	impl Drop for ${1:Name} {
 		fn drop(&mut self) {
 			${0}
 		}
 	}
-# Traits
-snippet trait
-	trait ${1:Name} {
-		${0}
-	}
 # Statics
-snippet ss
+snippet ss "static string declaration"
 	static ${1}: &'static str = "${0}";
-snippet stat
+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/sources_non_forked/vim-snippets/snippets/sh.snippets b/sources_non_forked/vim-snippets/snippets/sh.snippets
index c9c6ebc3..4d2c62b8 100644
--- a/sources_non_forked/vim-snippets/snippets/sh.snippets
+++ b/sources_non_forked/vim-snippets/snippets/sh.snippets
@@ -1,5 +1,8 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
+	#!/usr/bin/env sh
+	
+snippet bash
 	#!/usr/bin/env bash
 
 snippet if
@@ -51,15 +54,12 @@ snippet getopt
 	#===============================================================================
 	function usage ()
 	{
-			cat <<- EOT
+		echo "Usage :  $${0:0} [options] [--]
 
-	  Usage :  $${0:0} [options] [--]
+	    Options:
+	    -h|help       Display this message
+	    -v|version    Display script version"
 
-	  Options:
-	  -h|help       Display this message
-	  -v|version    Display script version
-
-			EOT
 	}    # ----------  end of function usage  ----------
 
 	#-----------------------------------------------------------------------
@@ -74,7 +74,7 @@ snippet getopt
 
 		v|version  )  echo "$${0:0} -- Version $__ScriptVersion"; exit 0   ;;
 
-		\? )  echo -e "\n  Option does not exist : $OPTARG\n"
+		* )  echo -e "\n  Option does not exist : $OPTARG\n"
 			  usage; exit 1   ;;
 
 	  esac    # --- end of case ---
@@ -82,11 +82,13 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
-snippet fun
+
+snippet fun-sh
 	${1:function_name}() {
 		${0:#function_body}
 	}
-snippet ffun
+
+snippet fun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}

From 095230d65d87976a16208c415866532ef315651e Mon Sep 17 00:00:00 2001
From: Amir Salihefendic <amix@amix.dk>
Date: Tue, 24 Mar 2015 16:53:58 +0000
Subject: [PATCH 61/61] Update README.md

---
 README.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 170de2f0..afd30e18 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,6 @@ There are two versions:
 
 I would of course recommend using the awesome version.
 
-
-## How to install the Basic version?
-The basic version is basically just one file and no plugins. You can check out [basic.vim](https://github.com/amix/vimrc/blob/master/vimrcs/basic.vim).
-
-This is useful to install on remote servers where you don't need many plugins and you don't do many edits.
-
-	git clone git://github.com/amix/vimrc.git ~/.vim_runtime
-	sh ~/.vim_runtime/install_basic_vimrc.sh
-
-
 ## How to install the Awesome version?
 The awesome version includes a lot of great plugins, configurations and color schemes that make Vim a lot better. To install it simply do following:
 
@@ -29,6 +19,15 @@ The taglist.vim plugin will require ctags (http://ctags.sourceforge.net) (Debian
 
 I also recommend using [Source Code Pro font from Adobe](http://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1960) (it's free and awesome font for writing and programming). The Awesome vimrc is already setup to try to use it
 
+## How to install the Basic version?
+The basic version is basically just one file and no plugins. You can check out [basic.vim](https://github.com/amix/vimrc/blob/master/vimrcs/basic.vim).
+
+This is useful to install on remote servers where you don't need many plugins and you don't do many edits.
+
+	git clone git://github.com/amix/vimrc.git ~/.vim_runtime
+	sh ~/.vim_runtime/install_basic_vimrc.sh
+
+
 ## How to install on Windows?
 
 Use [msysgit](http://msysgit.github.com/) to checkout the repository and run the installation instructions above. No special instructions needed ;-)