diff --git a/sources_non_forked/ack.vim/autoload/ack.vim b/sources_non_forked/ack.vim/autoload/ack.vim
index 12237e4e..814c533b 100644
--- a/sources_non_forked/ack.vim/autoload/ack.vim
+++ b/sources_non_forked/ack.vim/autoload/ack.vim
@@ -5,7 +5,7 @@ if exists('g:ack_use_dispatch')
   endif
 else
   let g:ack_use_dispatch = 0
-end
+endif
 
 "-----------------------------------------------------------------------------
 " Public API
diff --git a/sources_non_forked/ag.vim/README.md b/sources_non_forked/ag.vim/README.md
index c0e92cbe..21ea504b 100644
--- a/sources_non_forked/ag.vim/README.md
+++ b/sources_non_forked/ag.vim/README.md
@@ -21,13 +21,13 @@ Vim has various ways of installing plugins, the standard way is in [the document
   cd ~/.vim/bundle && git clone https://github.com/rking/ag.vim ag && echo "set runtimepath^=~/.vim/bundle/ag" >> ~/.vimrc
   ```
 
-  Then open vim and rum `:helptags ~/.vim/bundle/ag/doc`.
+  Then open vim and run `:helptags ~/.vim/bundle/ag/doc`.
 
 ### Configuration ###
 
 You can specify a custom ag name and path in your .vimrc like so:
 
-    let g:agprg="<custom-ag-path-goes-here> --vimgrep"
+    let g:ag_prg="<custom-ag-path-goes-here> --vimgrep"
 
 You can configure ag.vim to always start searching from your project root
 instead of the cwd
diff --git a/sources_non_forked/ag.vim/autoload/ag.vim b/sources_non_forked/ag.vim/autoload/ag.vim
index 6703396b..432ef444 100644
--- a/sources_non_forked/ag.vim/autoload/ag.vim
+++ b/sources_non_forked/ag.vim/autoload/ag.vim
@@ -1,17 +1,26 @@
 " NOTE: You must, of course, install ag / the_silver_searcher
 
-" FIXME: Delete deprecated options below on or after 15-7 (6 months from when they were changed) {{{
+" FIXME: Delete deprecated options below on or after 2016-4 (6 months from when the deprecation warning was added) {{{
 
 if exists("g:agprg")
   let g:ag_prg = g:agprg
+  echohl WarningMsg
+  call input('g:agprg is deprecated and will be removed. Please use g:ag_prg')
+  echohl None
 endif
 
 if exists("g:aghighlight")
   let g:ag_highlight = g:aghighlight
+  echohl WarningMsg
+  call input('g:aghighlight is deprecated and will be removed. Please use g:ag_highlight')
+  echohl None
 endif
 
 if exists("g:agformat")
   let g:ag_format = g:agformat
+  echohl WarningMsg
+  call input('g:agformat is deprecated and will be removed. Please use g:ag_format')
+  echohl None
 endif
 
 " }}} FIXME: Delete the deprecated options above on or after 15-7 (6 months from when they were changed)
@@ -79,6 +88,11 @@ function! ag#Ag(cmd, args)
     let l:grepargs = a:args . join(a:000, ' ')
   end
 
+  if empty(l:grepargs)
+    echo "Usage: ':Ag {pattern}' (or just :Ag to search for the word under the cursor). See ':help :Ag' for more information."
+    return
+  endif
+
   " Format, used to manage column jump
   if a:cmd =~# '-g$'
     let s:ag_format_backup=g:ag_format
@@ -169,8 +183,12 @@ function! ag#Ag(cmd, args)
         echom "ag.vim keys: q=quit <cr>/e/t/h/v=enter/edit/tab/split/vsplit go/T/H/gv=preview versions of same"
       endif
     endif
-  else
+  else " Close the split window automatically:
+    cclose
+    lclose
+    echohl WarningMsg
     echom 'No matches for "'.a:args.'"'
+    echohl None
   endif
 endfunction
 
diff --git a/sources_non_forked/ctrlp.vim/readme.md b/sources_non_forked/ctrlp.vim/readme.md
index bcd07c7f..d495fffb 100644
--- a/sources_non_forked/ctrlp.vim/readme.md
+++ b/sources_non_forked/ctrlp.vim/readme.md
@@ -1,3 +1,6 @@
+#**This project is unmaintained** 
+**You should use [this fork](https://github.com/ctrlpvim/ctrlp.vim) instead.**
+
 # ctrlp.vim
 Full path fuzzy __file__, __buffer__, __mru__, __tag__, __...__ finder for Vim.
 
diff --git a/sources_non_forked/goyo.vim/autoload/goyo.vim b/sources_non_forked/goyo.vim/autoload/goyo.vim
index 9d3d1eb5..e66c5c14 100644
--- a/sources_non_forked/goyo.vim/autoload/goyo.vim
+++ b/sources_non_forked/goyo.vim/autoload/goyo.vim
@@ -269,7 +269,9 @@ function! s:goyo_on(dim)
   if exists('g:goyo_callbacks[0]')
     call g:goyo_callbacks[0]()
   endif
-  silent! doautocmd User GoyoEnter
+  if exists('#User#GoyoEnter')
+    doautocmd User GoyoEnter
+  endif
 endfunction
 
 function! s:goyo_off()
@@ -344,6 +346,9 @@ function! s:goyo_off()
 
   if goyo_disabled_airline && !exists("#airline")
     AirlineToggle
+    " For some reason, Airline requires two refreshes to avoid display
+    " artifacts
+    silent! AirlineRefresh
     silent! AirlineRefresh
   endif
 
@@ -363,7 +368,9 @@ function! s:goyo_off()
   if exists('g:goyo_callbacks[1]')
     call g:goyo_callbacks[1]()
   endif
-  silent! doautocmd User GoyoLeave
+  if exists('#User#GoyoLeave')
+    doautocmd User GoyoLeave
+  endif
 endfunction
 
 function! s:relsz(expr, limit)
@@ -414,6 +421,10 @@ function! goyo#execute(bang, dim)
     if exists('#goyo') == 0
       call s:goyo_on(a:dim)
     elseif !empty(a:dim)
+      if winnr('$') < 5
+        call s:goyo_off()
+        return goyo#execute(a:bang, a:dim)
+      endif
       let dim = s:parse_arg(a:dim)
       if !empty(dim)
         let t:goyo_dim = dim
diff --git a/sources_non_forked/nerdtree/CHANGELOG b/sources_non_forked/nerdtree/CHANGELOG
new file mode 100644
index 00000000..2e08dd2a
--- /dev/null
+++ b/sources_non_forked/nerdtree/CHANGELOG
@@ -0,0 +1,153 @@
+Next
+    - Rename "primary" and "secondary" trees to "tab" and "window" trees.
+    - Move a bunch of buffer level variables into the NERDTree and UI classes.
+    - Display cascading dirs on one line to save vertical/horizontal space (@matt-gardner: brainstorming/testing)
+    - Remove the old style UI - Remove 'NERDTreeDirArrows' option.
+    - On windows default to + and ~ for expand/collapse directory symbols.
+    - Lots more refactoring. Move a bunch of b: level vars into b:NERDTree and friends.
+
+5.0.0
+    - Refactor the code significantly:
+        * Break the classes out into their own files.
+        * Make the majority of the code OO - previously large parts were
+          effectively a tangle of "global" methods.
+    - Add an API to assign flags to nodes. This allows VCS plugins like
+      https://github.com/Xuyuanp/nerdtree-git-plugin to exist. Thanks to
+      Xuyuanp for helping design/test/build said API.
+    - add 'scope' argument to the key map API see :help NERDTreeAddKeyMap()
+    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
+    - add support for custom path filters. See :help NERDTreeAddPathFilter()
+    - add path listener API. See :help NERDTreePathListenerAPI.
+    - expand the fs menu functionality to list file properties (PhilRunninger,
+      apbarrero, JESii)
+    - make bookmarks work with `~` home shortcuts (hiberabyss)
+    - show OSX specific fsmenu options in regular vim on mac (evindor)
+    - make dir arrow icons configurable (PickRelated)
+    - optimise node sorting performance when opening large dirs (vtsang)
+    - make the root note render prettier by truncating it at a path slash (gcmt)
+    - remove NERDChristmasTree option - its always christmas now
+    - add "cascade" open and closing for dirs containing only another single
+      dir. See :help NERDTreeCascadeOpenSingleChildDir (pendulm)
+
+    Many other fixes, doc updates and contributions from:
+    actionshrimp
+    SchDen
+    egalpin
+    cperl82 - many small fixes
+    toiffel
+    WoLpH
+    handcraftedbits
+    devmanhinton
+    xiaodili
+    zhangoose
+    gastropoda
+    mixvin
+    alvan
+    lucascaton
+    kelaban
+    shanesmith
+    staeff
+    pendulm
+    stephenprater
+    franksort
+    agrussellknives
+    AndrewRadev
+    Twinside
+
+4.2.0
+    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
+      instead of the old +~| chars to define the tree structure (sickill)
+    - shift the syntax highlighting out into its own syntax file (gnap)
+    - add some mac specific options to the filesystem menu - for macvim
+      only (andersonfreitas)
+    - Add NERDTreeMinimalUI option to remove some non functional parts of the
+      nerdtree ui (camthompson)
+    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
+      new behaviour (benjamingeiger)
+    - if no name is given to :Bookmark, make it default to the name of the
+      target file/dir (minyoung)
+    - use 'file' completion when doing copying, create, and move
+      operations (EvanDotPro)
+    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
+      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
+
+4.1.0
+    features:
+    - NERDTreeFind to reveal the node for the current buffer in the tree,
+      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
+      Doug McInnes) into the script.
+    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
+      Ritter and Rémi Prévost.
+    - truncate the root node if wider than the tree window. Thanks to Victor
+      Gonzalez.
+
+    bugfixes:
+    - really fix window state restoring
+    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
+      jfilip1024, and Chris Chambers
+
+4.0.0
+    - add a new programmable menu system (see :help NERDTreeMenu).
+    - add new APIs to add menus/menu-items to the menu system as well as
+      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
+    - removed the old API functions
+    - added a mapping to maximize/restore the size of nerd tree window, thanks
+      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
+
+    - fix a bug where secondary nerd trees (netrw hijacked trees) and
+      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
+    - fix a bug where the script ignored directories whose name ended in a dot,
+      thanks to Aggelos Orfanakos for the patch.
+    - fix a bug when using the x mapping on the tree root, thanks to Bryan
+      Venteicher for the patch.
+    - fix a bug where the cursor position/window size of the nerd tree buffer
+      wasnt being stored on closing the window, thanks to Richard Hart.
+    - fix a bug where NERDTreeMirror would mirror the wrong tree
+
+3.1.1
+    - fix a bug where a non-listed no-name buffer was getting created every
+      time the tree windows was created, thanks to Derek Wyatt and owen1
+    - make <CR> behave the same as the 'o' mapping
+    - some helptag fixes in the doc, thanks strull
+    - fix a bug when using :set nohidden and opening a file where the previous
+      buf was modified. Thanks iElectric
+    - other minor fixes
+
+3.1.0
+    New features:
+    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
+      NERDTree-gs
+    - make the statusline for the nerd tree window default to something
+      hopefully more useful. See :help 'NERDTreeStatusline'
+    Bugfixes:
+    - make the hijack netrw functionality work when vim is started with "vim
+      <some dir>" (thanks to Alf Mikula for the patch).
+    - fix a bug where the CWD wasnt being changed for some operations even when
+      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
+    - add -bar to all the nerd tree :commands so they can chain with other
+      :commands (thanks to tpope)
+    - fix bugs when ignorecase was set (thanks to nach)
+    - fix a bug with the relative path code (thanks to nach)
+    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
+
+
+3.0.1
+    Bugfixes:
+    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
+      was not set
+    - fix a bug where :NERDTree <path> would fail if <path> was relative and
+      didnt start with a ./ or ../  Thanks to James Kanze.
+    - make the q mapping work with secondary (:e <dir>  style) trees,
+      thanks to jamessan
+    - fix a bunch of small bugs with secondary trees
+
+    More insane refactoring.
+
+3.0.0
+    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
+      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
+    - allow sharing of trees across tabs, see :help :NERDTreeMirror
+    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
+    - change the '<tab>' mapping to 'i'
+    - change the 'H' mapping to 'I'
+    - lots of refactoring
diff --git a/sources_non_forked/nerdtree/LICENCE b/sources_non_forked/nerdtree/LICENCE
new file mode 100644
index 00000000..8b1a9d81
--- /dev/null
+++ b/sources_non_forked/nerdtree/LICENCE
@@ -0,0 +1,13 @@
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                   Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/sources_non_forked/nerdtree/README.markdown b/sources_non_forked/nerdtree/README.markdown
index 0317e624..f4ca8607 100644
--- a/sources_non_forked/nerdtree/README.markdown
+++ b/sources_non_forked/nerdtree/README.markdown
@@ -55,7 +55,7 @@ The following features and functionality are provided by the NERD tree:
 Installation
 ------------
 
-[pathogen.vim](https://github.com/tpope/vim-pathogen) is the recommended way to install nerdtree.
+####[pathogen.vim](https://github.com/tpope/vim-pathogen)
 
     cd ~/.vim/bundle
     git clone https://github.com/scrooloose/nerdtree.git
@@ -63,6 +63,12 @@ Installation
 Then reload vim, run `:Helptags`, and check out `:help NERD_tree.txt`.
 
 
+####[apt-vim](https://github.com/egalpin/apt-vim)
+
+    apt-vim install -y https://github.com/scrooloose/nerdtree.git
+
+
+
 Faq
 ---
 
@@ -85,11 +91,13 @@ Stick this in your vimrc: `autocmd vimenter * NERDTree`
 
 > How can I open a NERDTree automatically when vim starts up if no files were specified?
 
-Stick this in your vimrc
+Stick this in your vimrc:
 
     autocmd StdinReadPre * let s:std_in=1
     autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
+Note: Now start vim with plain `vim`, not `vim .`
+
 > How can I map a specific key or shortcut to open NERDTree?
 
 Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want):
@@ -100,8 +108,15 @@ Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever ke
 
 Stick this in your vimrc:
 
-    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
 
 > Can I have different highlighting for different file extensions?
 
 See here: https://github.com/scrooloose/nerdtree/issues/433#issuecomment-92590696
+
+> How can I change default arrows?
+
+Use these variables in your vimrc. Note that below are default arrow symbols
+
+    let g:NERDTreeDirArrowExpandable = '▸'
+    let g:NERDTreeDirArrowCollapsible = '▾'
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree.vim b/sources_non_forked/nerdtree/autoload/nerdtree.vim
index 37d7d105..3ad2a031 100644
--- a/sources_non_forked/nerdtree/autoload/nerdtree.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree.vim
@@ -4,17 +4,17 @@ endif
 let g:loaded_nerdtree_autoload = 1
 
 function! nerdtree#version()
-    return '4.2.0'
+    return '5.0.0'
 endfunction
 
 " SECTION: General Functions {{{1
 "============================================================
 
 "FUNCTION: nerdtree#checkForBrowse(dir) {{{2
-"inits a secondary nerd tree in the current buffer if appropriate
+"inits a window tree in the current buffer if appropriate
 function! nerdtree#checkForBrowse(dir)
     if a:dir != '' && isdirectory(a:dir)
-        call g:NERDTreeCreator.CreateSecondary(a:dir)
+        call g:NERDTreeCreator.CreateWindowTree(a:dir)
     endif
 endfunction
 
@@ -94,7 +94,7 @@ endfunction
 
 " FUNCTION: nerdtree#postSourceActions() {{{2
 function! nerdtree#postSourceActions()
-    call g:NERDTreeBookmark.CacheBookmarks(0)
+    call g:NERDTreeBookmark.CacheBookmarks(1)
     call nerdtree#ui_glue#createDefaultBindings()
 
     "load all nerdtree plugins
diff --git a/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
index 1f922df1..05f03c96 100644
--- a/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
+++ b/sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
@@ -105,7 +105,7 @@ 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'} : {})
+    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p'} : {})
 endfunction
 
 " FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
@@ -140,9 +140,7 @@ 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)
+    call b:NERDTree.changeRoot(a:node)
 endfunction
 
 " FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
@@ -157,7 +155,7 @@ function! nerdtree#ui_glue#chRootCwd()
     if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
        return
     endif
-    call s:chRoot(g:NERDTreeDirNode.New(cwd))
+    call s:chRoot(g:NERDTreeDirNode.New(cwd, b:NERDTree))
 endfunction
 
 " FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
@@ -173,6 +171,7 @@ function! nerdtree#ui_glue#clearBookmarks(bookmarks)
             call bookmark.delete()
         endfor
     endif
+    call b:NERDTree.root.refresh()
     call b:NERDTree.render()
 endfunction
 
@@ -208,8 +207,8 @@ endfunction
 " FUNCTION: s:closeTreeWindow() {{{1
 " close the tree window
 function! s:closeTreeWindow()
-    if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1
-        exec "buffer " . b:NERDTreePreviousBuf
+    if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() != -1
+        exec "buffer " . b:NERDTree.previousBuf()
     else
         if winnr("$") > 1
             call g:NERDTree.Close()
@@ -227,6 +226,7 @@ function! s:deleteBookmark(bm)
     if  nr2char(getchar()) ==# 'y'
         try
             call a:bm.delete()
+            call b:NERDTree.root.refresh()
             call b:NERDTree.render()
             redraw
         catch /^NERDTree/
@@ -241,7 +241,7 @@ endfunction
 " FUNCTION: s:displayHelp() {{{1
 " toggles the help display
 function! s:displayHelp()
-    let b:treeShowHelp = b:treeShowHelp ? 0 : 1
+    call b:NERDTree.ui.toggleHelp()
     call b:NERDTree.render()
     call b:NERDTree.ui.centerView()
 endfunction
@@ -269,27 +269,29 @@ function! s:findAndRevealPath()
         endtry
 
         if p.isUnder(cwd)
-            call g:NERDTreeCreator.CreatePrimary(cwd.str())
+            call g:NERDTreeCreator.CreateTabTree(cwd.str())
         else
-            call g:NERDTreeCreator.CreatePrimary(p.getParent().str())
+            call g:NERDTreeCreator.CreateTabTree(p.getParent().str())
         endif
     else
         if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
             if !g:NERDTree.IsOpen()
-                call g:NERDTreeCreator.TogglePrimary('')
+                call g:NERDTreeCreator.ToggleTabTree('')
             else
                 call g:NERDTree.CursorToTreeWin()
             endif
-            let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-            call s:chRoot(g:NERDTreeDirNode.New(p.getParent()))
+            call b:NERDTree.setShowHidden(g:NERDTreeShowHidden)
+            call s:chRoot(g:NERDTreeDirNode.New(p.getParent(), b:NERDTree))
         else
             if !g:NERDTree.IsOpen()
-                call g:NERDTreeCreator.TogglePrimary("")
+                call g:NERDTreeCreator.ToggleTabTree("")
             endif
         endif
     endif
     call g:NERDTree.CursorToTreeWin()
-    call b:NERDTreeRoot.reveal(p)
+    let node = b:NERDTree.root.reveal(p)
+    call b:NERDTree.render()
+    call node.putCursorHere(1,0)
 
     if p.isUnixHiddenFile()
         let g:NERDTreeShowHidden = showhidden
@@ -312,7 +314,7 @@ function! s:handleLeftClick()
         endfor
 
         if currentNode.path.isDirectory
-            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~▾▸] \?$'
+            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \?$'
                 call currentNode.activate()
                 return
             endif
@@ -409,7 +411,7 @@ endfunction
 " FUNCTION: s:jumpToRoot() {{{1
 " moves the cursor to the root node
 function! s:jumpToRoot()
-    call b:NERDTreeRoot.putCursorHere(1, 0)
+    call b:NERDTree.root.putCursorHere(1, 0)
     call b:NERDTree.ui.centerView()
 endfunction
 
@@ -442,13 +444,13 @@ endfunction
 " 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)
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
         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)
+        let targetNode = g:NERDTreeFileNode.New(bookmark.path, b:NERDTree)
     endtry
     if targetNode.path.isDirectory
         call targetNode.openExplorer()
@@ -510,7 +512,7 @@ endfunction
 " 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)
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
         call targetNode.putCursorHere(0, 1)
     catch /^NERDTree.BookmarkNotFoundError/
         call nerdtree#echo("Bookmark isnt cached under the current root")
@@ -522,7 +524,7 @@ endfunction
 " 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.root.refresh()
     call b:NERDTree.render()
     redraw
     call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
@@ -545,10 +547,10 @@ 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=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreateTabTree('<args>')
+    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.ToggleTabTree('<args>')
     command! -n=0 -bar NERDTreeClose :call g:NERDTree.Close()
-    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
+    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreateTabTree('<args>')
     command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
     command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
     command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
@@ -602,28 +604,28 @@ endfunction
 "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'})
+    let cwd = b:NERDTree.root.path.str({'format': 'UI'})
     if cwd ==# "/" || cwd =~# '^[^/]..$'
         call nerdtree#echo("already at top dir")
     else
         if !a:keepState
-            call b:NERDTreeRoot.close()
+            call b:NERDTree.root.close()
         endif
 
-        let oldRoot = b:NERDTreeRoot
+        let oldRoot = b:NERDTree.root
 
-        if empty(b:NERDTreeRoot.parent)
-            let path = b:NERDTreeRoot.path.getParent()
-            let newRoot = g:NERDTreeDirNode.New(path)
+        if empty(b:NERDTree.root.parent)
+            let path = b:NERDTree.root.path.getParent()
+            let newRoot = g:NERDTreeDirNode.New(path, b:NERDTree)
             call newRoot.open()
-            call newRoot.transplantChild(b:NERDTreeRoot)
-            let b:NERDTreeRoot = newRoot
+            call newRoot.transplantChild(b:NERDTree.root)
+            let b:NERDTree.root = newRoot
         else
-            let b:NERDTreeRoot = b:NERDTreeRoot.parent
+            let b:NERDTree.root = b:NERDTree.root.parent
         endif
 
         if g:NERDTreeChDirMode ==# 2
-            call b:NERDTreeRoot.path.changeToDir()
+            call b:NERDTree.root.path.changeToDir()
         endif
 
         call b:NERDTree.render()
diff --git a/sources_non_forked/nerdtree/doc/NERD_tree.txt b/sources_non_forked/nerdtree/doc/NERD_tree.txt
index cfc8ed9b..1ad8e181 100644
--- a/sources_non_forked/nerdtree/doc/NERD_tree.txt
+++ b/sources_non_forked/nerdtree/doc/NERD_tree.txt
@@ -37,9 +37,7 @@ CONTENTS                                                   *NERDTree-contents*
         4.3.Menu API..........................|NERDTreeAddPathFilter()|
         4.4.Path Listener API.................|NERDTreePathListenerAPI|
     5.About...................................|NERDTreeAbout|
-    6.Changelog...............................|NERDTreeChangelog|
-    7.Credits.................................|NERDTreeCredits|
-    8.License.................................|NERDTreeLicense|
+    6.License.................................|NERDTreeLicense|
 
 ==============================================================================
 1. Intro                                                            *NERDTree*
@@ -673,9 +671,6 @@ NERD tree. These options should be set in your vimrc.
 |'NERDTreeMinimalUI'|           Disables display of the 'Bookmarks' label and 
                                 'Press ? for help' text.
 
-|'NERDTreeDirArrows'|           Tells the NERD tree to use arrows instead of
-                                + ~ chars when displaying directories.
-
 |'NERDTreeCascadeOpenSingleChildDir'|
                                 Cascade open while selected directory has only
                                 one child that also is a directory.
@@ -778,13 +773,13 @@ Default: 1.
 If set to 1, doing a >
     :edit <some directory>
 <
-will open up a "secondary" NERD tree instead of a netrw in the target window.
+will open up a window level NERD tree instead of a netrw in the target window.
 
-Secondary NERD trees behaves slightly different from a regular trees in the
+Window level trees behaves slightly different from a regular trees in the
 following respects:
     1. 'o' will open the selected file in the same window as the tree,
        replacing it.
-    2. you can have as many secondary tree as you want in the same tab.
+    2. you can have one tree per window - instead of per tab.
 
 ------------------------------------------------------------------------------
                                                             *'NERDTreeIgnore'*
@@ -947,7 +942,7 @@ Other examples: >
 ------------------------------------------------------------------------------
                                                         *'NERDTreeStatusline'*
 Values: Any valid statusline setting.
-Default: %{b:NERDTreeRoot.path.strForOS(0)}
+Default: %{b:NERDTree.root.path.strForOS(0)}
 
 Tells the script what to use as the |'statusline'| setting for NERD tree
 windows.
@@ -988,19 +983,6 @@ of the following lines to set this option: >
     let NERDTreeMinimalUI=1
 <
 
-------------------------------------------------------------------------------
-                                                           *'NERDTreeDirArrows'*
-Values: 0 or 1
-Default: 0.
-
-This option is used to change the default look of directory nodes displayed in
-the tree. When set to 0 it shows old-school bars (|), + and ~ chars. If set to
-1 it shows right and down arrows.  Use one of the follow lines to set this
-option: >
-    let NERDTreeDirArrows=0
-    let NERDTreeDirArrows=1
-<
-
 ------------------------------------------------------------------------------
                                           *'NERDTreeCascadeOpenSingleChildDir'*
 Values: 0 or 1
@@ -1205,7 +1187,7 @@ Use this API if you want to run a callback for events on Path objects. E.G >
         "This function will be called whenever a Path object is created.
 
         "a:event is an object that contains a bunch of relevant info -
-        "including the path in question. See lib/event.vim for details.
+        "including the path in question. See lib/nerdtree/event.vim for details.
     endfunction
 <
 Current events supported:
@@ -1235,187 +1217,8 @@ The latest stable versions can be found at
 The latest dev versions are on github
     http://github.com/scrooloose/nerdtree
 
-
 ==============================================================================
-6. Changelog                                               *NERDTreeChangelog*
-
-Next
-    - add 'scope' argument to the key map API
-    - add NERDTreeCustomIgnoreFilter hook - needs doc
-    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
-    - add support for custom path filters. See :help NERDTreeAddPathFilter()
-    - add path listener API. See :help NERDTreePathListenerAPI.
-
-4.2.0
-    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
-      instead of the old +~| chars to define the tree structure (sickill)
-    - shift the syntax highlighting out into its own syntax file (gnap)
-    - add some mac specific options to the filesystem menu - for macvim
-      only (andersonfreitas)
-    - Add NERDTreeMinimalUI option to remove some non functional parts of the
-      nerdtree ui (camthompson)
-    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
-      new behaviour (benjamingeiger)
-    - if no name is given to :Bookmark, make it default to the name of the
-      target file/dir (minyoung)
-    - use 'file' completion when doing copying, create, and move
-      operations (EvanDotPro)
-    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
-      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
-
-4.1.0
-    features:
-    - NERDTreeFind to reveal the node for the current buffer in the tree,
-      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
-      Doug McInnes) into the script.
-    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
-      Ritter and Rémi Prévost.
-    - truncate the root node if wider than the tree window. Thanks to Victor
-      Gonzalez.
-
-    bugfixes:
-    - really fix window state restoring
-    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
-      jfilip1024, and Chris Chambers
-
-4.0.0
-    - add a new programmable menu system (see :help NERDTreeMenu).
-    - add new APIs to add menus/menu-items to the menu system as well as
-      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
-    - removed the old API functions
-    - added a mapping to maximize/restore the size of nerd tree window, thanks
-      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
-
-    - fix a bug where secondary nerd trees (netrw hijacked trees) and
-      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
-    - fix a bug where the script ignored directories whose name ended in a dot,
-      thanks to Aggelos Orfanakos for the patch.
-    - fix a bug when using the x mapping on the tree root, thanks to Bryan
-      Venteicher for the patch.
-    - fix a bug where the cursor position/window size of the nerd tree buffer
-      wasnt being stored on closing the window, thanks to Richard Hart.
-    - fix a bug where NERDTreeMirror would mirror the wrong tree
-
-3.1.1
-    - fix a bug where a non-listed no-name buffer was getting created every
-      time the tree windows was created, thanks to Derek Wyatt and owen1
-    - make <CR> behave the same as the 'o' mapping
-    - some helptag fixes in the doc, thanks strull
-    - fix a bug when using :set nohidden and opening a file where the previous
-      buf was modified. Thanks iElectric
-    - other minor fixes
-
-3.1.0
-    New features:
-    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
-      NERDTree-gs
-    - make the statusline for the nerd tree window default to something
-      hopefully more useful. See :help 'NERDTreeStatusline'
-    Bugfixes:
-    - make the hijack netrw functionality work when vim is started with "vim
-      <some dir>" (thanks to Alf Mikula for the patch).
-    - fix a bug where the CWD wasnt being changed for some operations even when
-      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
-    - add -bar to all the nerd tree :commands so they can chain with other
-      :commands (thanks to tpope)
-    - fix bugs when ignorecase was set (thanks to nach)
-    - fix a bug with the relative path code (thanks to nach)
-    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
-
-
-3.0.1
-    Bugfixes:
-    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
-      was not set
-    - fix a bug where :NERDTree <path> would fail if <path> was relative and
-      didnt start with a ./ or ../  Thanks to James Kanze.
-    - make the q mapping work with secondary (:e <dir>  style) trees,
-      thanks to jamessan
-    - fix a bunch of small bugs with secondary trees
-
-    More insane refactoring.
-
-3.0.0
-    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
-      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
-    - allow sharing of trees across tabs, see :help :NERDTreeMirror
-    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
-    - change the '<tab>' mapping to 'i'
-    - change the 'H' mapping to 'I'
-    - lots of refactoring
-
-==============================================================================
-7. Credits                                                   *NERDTreeCredits*
-
-Thanks to the following people for testing, bug reports, ideas etc. Without
-you I probably would have got bored of the hacking the NERD tree and
-just downloaded pr0n instead.
-
-    Tim Carey-Smith (halorgium)
-    Vigil
-    Nick Brettell
-    Thomas Scott Urban
-    Terrance Cohen
-    Yegappan Lakshmanan
-    Jason Mills
-    Michael Geddes (frogonwheels)
-    Yu Jun
-    Michael Madsen
-    AOYAMA Shotaro
-    Zhang Weiwu
-    Niels Aan de Brugh
-    Olivier Yiptong
-    Zhang Shuhan
-    Cory Echols
-    Piotr Czachur
-    Yuan Jiang
-    Matan Nassau
-    Maxim Kim
-    Charlton Wang
-    Matt Wozniski (godlygeek)
-    knekk
-    Sean Chou
-    Ryan Penn
-    Simon Peter Nicholls
-    Michael Foobar
-    Tomasz Chomiuk
-    Denis Pokataev
-    Tim Pope (tpope)
-    James Kanze
-    James Vega (jamessan)
-    Frederic Chanal (nach)
-    Alf Mikula
-    Lucas S. Buchala
-    Curtis Harvey
-    Guillaume Duranceau
-    Richard Hart (hates)
-    Doug McInnes
-    Stefan Ritter
-    Rémi Prévost
-    Victor Gonzalez
-    Stephan Baumeister
-    Ricky
-    jfilip1024
-    Chris Chambers
-    Vitaly Bogdanov
-    Patrick O'Loughlin (paddyoloughlin)
-    Cam Thompson (camthompson)
-    Marcin Kulik (sickill)
-    Steve DeWald (sdewald)
-    Ivan Necas (iNecas)
-    George Ang (gnap)
-    Evan Coury (EvanDotPro)
-    Andrew Radev (AndrewRadev)
-    Matt Gauger (mathias)
-    Scott Stevenson (scottstvnsn)
-    Anderson Freitas (andersonfreitas)
-    Kamil K. Lemański (kml)
-    Yehuda Katz (wycats)
-    Min-Young Wu (minyoung)
-    Benjamin Geiger (benjamingeiger)
-
-==============================================================================
-8. License                                                   *NERDTreeLicense*
+6. License                                                   *NERDTreeLicense*
 
 The NERD tree is released under the wtfpl.
 See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
index 8a94b256..81242605 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
@@ -3,9 +3,9 @@
 let s:Bookmark = {}
 let g:NERDTreeBookmark = s:Bookmark
 
-" FUNCTION: Bookmark.activate() {{{1
-function! s:Bookmark.activate(...)
-    call self.open(a:0 ? a:1 : {})
+" FUNCTION: Bookmark.activate(nerdtree) {{{1
+function! s:Bookmark.activate(nerdtree, ...)
+    call self.open(a:nerdtree, a:0 ? a:1 : {})
 endfunction
 
 " FUNCTION: Bookmark.AddBookmark(name, path) {{{1
@@ -87,6 +87,7 @@ function! s:Bookmark.CacheBookmarks(silent)
 
                 let name = substitute(i, '^\(.\{-}\) .*$', '\1', '')
                 let path = substitute(i, '^.\{-} \(.*\)$', '\1', '')
+                let path = fnamemodify(path, ':p')
 
                 try
                     let bookmark = s:Bookmark.New(name, g:NERDTreePath.New(path))
@@ -127,26 +128,18 @@ endfunction
 " Delete this bookmark. If the node for this bookmark is under the current
 " root, then recache bookmarks for its Path object
 function! s:Bookmark.delete()
-    let node = {}
-    try
-        let node = self.getNode(1)
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-    endtry
     call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self))
-    if !empty(node)
-        call node.path.cacheDisplayString()
-    endif
     call s:Bookmark.Write()
 endfunction
 
-" FUNCTION: Bookmark.getNode(searchFromAbsoluteRoot) {{{1
+" FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1
 " Gets the treenode for this bookmark
 "
 " Args:
 " searchFromAbsoluteRoot: specifies whether we should search from the current
 " tree root, or the highest cached node
-function! s:Bookmark.getNode(searchFromAbsoluteRoot)
-    let searchRoot = a:searchFromAbsoluteRoot ? g:NERDTreeDirNode.AbsoluteTreeRoot() : b:NERDTreeRoot
+function! s:Bookmark.getNode(nerdtree, searchFromAbsoluteRoot)
+    let searchRoot = a:searchFromAbsoluteRoot ? a:nerdtree.root.AbsoluteTreeRoot() : a:nerdtree.root
     let targetNode = searchRoot.findNode(self.path)
     if empty(targetNode)
         throw "NERDTree.BookmarkedNodeNotFoundError: no node was found for bookmark: " . self.name
@@ -154,12 +147,12 @@ function! s:Bookmark.getNode(searchFromAbsoluteRoot)
     return targetNode
 endfunction
 
-" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot) {{{1
+" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1
 " Class method that finds the bookmark with the given name and returns the
 " treenode for it.
-function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot)
+function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree)
     let bookmark = s:Bookmark.BookmarkFor(a:name)
-    return bookmark.getNode(a:searchFromAbsoluteRoot)
+    return bookmark.getNode(nerdtree, a:searchFromAbsoluteRoot)
 endfunction
 
 " FUNCTION: Bookmark.GetSelected() {{{1
@@ -209,8 +202,11 @@ function! s:Bookmark.New(name, path)
     return newBookmark
 endfunction
 
-" FUNCTION: Bookmark.open([options]) {{{1
+" FUNCTION: Bookmark.open(nerdtree, [options]) {{{1
 "Args:
+"
+"nerdtree: the tree to load open the bookmark in
+"
 "A dictionary containing the following keys (all optional):
 "  'where': Specifies whether the node should be opened in new split/tab or in
 "           the previous window. Can be either 'v' (vertical split), 'h'
@@ -219,11 +215,11 @@ endfunction
 "  'keepopen': dont close the tree window
 "  'stay': open the file, but keep the cursor in the tree win
 "
-function! s:Bookmark.open(...)
+function! s:Bookmark.open(nerdtree, ...)
     let opts = a:0 ? a:1 : {}
 
     if self.path.isDirectory && !has_key(opts, 'where')
-        call self.toRoot()
+        call self.toRoot(a:nerdtree)
     else
         let opener = g:NERDTreeOpener.New(self.path, opts)
         call opener.open(self)
@@ -265,26 +261,24 @@ function! s:Bookmark.str()
     return '>' . self.name . ' ' . pathStr
 endfunction
 
-" FUNCTION: Bookmark.toRoot() {{{1
+" FUNCTION: Bookmark.toRoot(nerdtree) {{{1
 " Make the node for this bookmark the new tree root
-function! s:Bookmark.toRoot()
+function! s:Bookmark.toRoot(nerdtree)
     if self.validate()
         try
-            let targetNode = self.getNode(1)
+            let targetNode = self.getNode(a:nerdtree, 1)
         catch /^NERDTree.BookmarkedNodeNotFoundError/
-            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path)
+            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path, a:nerdtree)
         endtry
-        call targetNode.makeRoot()
-        call b:NERDTree.render()
-        call targetNode.putCursorHere(0, 0)
+        call a:nerdtree.changeRoot(targetNode)
     endif
 endfunction
 
-" FUNCTION: Bookmark.ToRoot(name) {{{1
+" FUNCTION: Bookmark.ToRoot(name, nerdtree) {{{1
 " Make the node for this bookmark the new tree root
-function! s:Bookmark.ToRoot(name)
+function! s:Bookmark.ToRoot(name, nerdtree)
     let bookmark = s:Bookmark.BookmarkFor(a:name)
-    call bookmark.toRoot()
+    call bookmark.toRoot(a:nerdtree)
 endfunction
 
 " FUNCTION: Bookmark.validate() {{{1
@@ -293,7 +287,6 @@ function! s:Bookmark.validate()
         return 1
     else
         call s:Bookmark.CacheBookmarks(1)
-        call b:NERDTree.render()
         call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.")
         return 0
     endif
@@ -304,7 +297,7 @@ endfunction
 function! s:Bookmark.Write()
     let bookmarkStrings = []
     for i in s:Bookmark.Bookmarks()
-        call add(bookmarkStrings, i.name . ' ' . i.path.str())
+        call add(bookmarkStrings, i.name . ' ' . fnamemodify(i.path.str(), ':~'))
     endfor
 
     "add a blank line before the invalid ones
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
index 2d6a5c2e..9775d31c 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/creator.vim
@@ -1,5 +1,5 @@
 "CLASS: Creator
-"Creates primary/secondary/mirror nerdtree windows. Sets up all the window and
+"Creates tab/window/mirror nerdtree windows. Sets up all the window and
 "buffer options and key mappings etc.
 "============================================================
 let s:Creator = {}
@@ -16,7 +16,7 @@ function! s:Creator._bindMappings()
     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 -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>', b:NERDTree)
     command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
     command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
     command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
@@ -32,22 +32,26 @@ function! s:Creator.BufNamePrefix()
     return 'NERD_tree_'
 endfunction
 
-"FUNCTION: s:Creator.CreatePrimary(a:name) {{{1
-function! s:Creator.CreatePrimary(name)
+"FUNCTION: s:Creator.CreateTabTree(a:name) {{{1
+function! s:Creator.CreateTabTree(name)
     let creator = s:Creator.New()
-    call creator.createPrimary(a:name)
+    call creator.createTabTree(a:name)
 endfunction
 
-"FUNCTION: s:Creator.createPrimary(a:name) {{{1
+"FUNCTION: s:Creator.createTabTree(a:name) {{{1
 "name: the name of a bookmark or a directory
-function! s:Creator.createPrimary(name)
+function! s:Creator.createTabTree(name)
     let path = self._pathForString(a:name)
-    
+
     "abort if exception was thrown (bookmark/dir doesn't exist)
     if empty(path)
         return
     endif
 
+    if path == {}
+        return
+    endif
+
     "if instructed to, then change the vim CWD to the dir the NERDTree is
     "inited in
     if g:NERDTreeChDirMode != 0
@@ -58,32 +62,26 @@ function! s:Creator.createPrimary(name)
         if g:NERDTree.IsOpen()
             call g:NERDTree.Close()
         endif
-        unlet t:NERDTreeBufName
+
+        call self._removeTreeBufForTab()
     endif
 
     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
-
+    call self._createNERDTree(path, "tab")
     call b:NERDTree.render()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
+    call b:NERDTree.root.putCursorHere(0, 0)
 
     call self._broadcastInitEvent()
 endfunction
 
-"FUNCTION: s:Creator.CreateSecondary(dir) {{{1
-function! s:Creator.CreateSecondary(dir)
+"FUNCTION: s:Creator.CreateWindowTree(dir) {{{1
+function! s:Creator.CreateWindowTree(dir)
     let creator = s:Creator.New()
-    call creator.createSecondary(a:dir)
+    call creator.createWindowTree(a:dir)
 endfunction
 
-"FUNCTION: s:Creator.createSecondary(dir) {{{1
-function! s:Creator.createSecondary(dir)
+"FUNCTION: s:Creator.createWindowTree(dir) {{{1
+function! s:Creator.createWindowTree(dir)
     try
         let path = g:NERDTreePath.New(a:dir)
     catch /^NERDTree.InvalidArgumentsError/
@@ -96,14 +94,13 @@ function! s:Creator.createSecondary(dir)
 
     let previousBuf = expand("#")
 
-    "we need a unique name for each secondary tree buffer to ensure they are
+    "we need a unique name for each window tree buffer to ensure they are
     "all independent
     exec "silent edit " . self._nextBufferName()
 
-    let b:NERDTreePreviousBuf = bufnr(previousBuf)
-    call self._createNERDTree(path)
+    call self._createNERDTree(path, "window")
+    let b:NERDTree._previousBuf = bufnr(previousBuf)
     call self._setCommonBufOptions()
-    let b:NERDTreeType = "secondary"
 
     call b:NERDTree.render()
 
@@ -111,8 +108,8 @@ function! s:Creator.createSecondary(dir)
 endfunction
 
 " FUNCTION: s:Creator._createNERDTree(path) {{{1
-function! s:Creator._createNERDTree(path)
-    let b:NERDTree = g:NERDTree.New(a:path)
+function! s:Creator._createNERDTree(path, type)
+    let b:NERDTree = g:NERDTree.New(a:path, a:type)
     "TODO: This is kept for compatability only since many things use
     "b:NERDTreeRoot instead of the new NERDTree.root
     "Remove this one day
@@ -145,7 +142,7 @@ function! s:Creator.createMirror()
     let i = 0
     while i < len(treeBufNames)
         let bufName = treeBufNames[i]
-        let treeRoot = getbufvar(bufName, "NERDTreeRoot")
+        let treeRoot = getbufvar(bufName, "NERDTree").root
         let options[i+1 . '. ' . treeRoot.path.str() . '  (buf name: ' . bufName . ')'] = bufName
         let i = i + 1
     endwhile
@@ -201,6 +198,15 @@ function! s:Creator._createTreeWin()
     call self._setCommonBufOptions()
 endfunction
 
+"FUNCTION: s:Creator._isBufHidden(nr) {{{1
+function! s:Creator._isBufHidden(nr)
+    redir => bufs
+    silent ls!
+    redir END
+
+    return bufs =~ a:nr . '..h'
+endfunction
+
 "FUNCTION: s:Creator.New() {{{1
 function! s:Creator.New()
     let newCreator = copy(self)
@@ -245,7 +251,7 @@ function! s:Creator._pathForString(str)
             let path = g:NERDTreePath.New(dir)
         catch /^NERDTree.InvalidArgumentsError/
             call nerdtree#echo("No bookmark or directory found for: " . a:str)
-            return
+            return {}
         endtry
     endif
     if !path.isDirectory
@@ -255,6 +261,23 @@ function! s:Creator._pathForString(str)
     return path
 endfunction
 
+" Function: s:Creator._removeTreeBufForTab()   {{{1
+function! s:Creator._removeTreeBufForTab()
+    let buf = bufnr(t:NERDTreeBufName)
+
+    "if &hidden is not set then it will already be gone
+    if buf != -1
+
+        "nerdtree buf may be mirrored/displayed elsewhere
+        if self._isBufHidden(buf)
+            exec "bwipeout " . buf
+        endif
+
+    endif
+
+    unlet t:NERDTreeBufName
+endfunction
+
 "FUNCTION: s:Creator._setCommonBufOptions() {{{1
 function! s:Creator._setCommonBufOptions()
     "throwaway buffer options
@@ -283,12 +306,6 @@ function! s:Creator._setCommonBufOptions()
     endif
 
     call self._setupStatusline()
-
-    let b:treeShowHelp = 0
-    let b:NERDTreeIgnoreEnabled = 1
-    let b:NERDTreeShowFiles = g:NERDTreeShowFiles
-    let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-    let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
     call self._bindMappings()
     setlocal filetype=nerdtree
 endfunction
@@ -318,20 +335,20 @@ function! s:Creator._tabpagevar(tabnr, var)
     return v
 endfunction
 
-"FUNCTION: s:Creator.TogglePrimary(dir) {{{1
-function! s:Creator.TogglePrimary(dir)
+"FUNCTION: s:Creator.ToggleTabTree(dir) {{{1
+function! s:Creator.ToggleTabTree(dir)
     let creator = s:Creator.New()
-    call creator.togglePrimary(a:dir)
+    call creator.toggleTabTree(a:dir)
 endfunction
 
-"FUNCTION: s:Creator.togglePrimary(dir) {{{1
+"FUNCTION: s:Creator.toggleTabTree(dir) {{{1
 "Toggles the NERD tree. I.e the NERD tree is open, it is closed, if it is
 "closed it is restored or initialized (if it doesnt exist)
 "
 "Args:
 "dir: the full path for the root node (is only used if the NERD tree is being
 "initialized.
-function! s:Creator.togglePrimary(dir)
+function! s:Creator.toggleTabTree(dir)
     if g:NERDTree.ExistsForTab()
         if !g:NERDTree.IsOpen()
             call self._createTreeWin()
@@ -343,7 +360,7 @@ function! s:Creator.togglePrimary(dir)
             call g:NERDTree.Close()
         endif
     else
-        call self.createPrimary(a:dir)
+        call self.createTabTree(a:dir)
     endif
 endfunction
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim b/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
index 55f3dd75..73a30f7a 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/nerdtree.vim
@@ -8,8 +8,30 @@ function! s:NERDTree.AddPathFilter(callback)
     call add(s:NERDTree.PathFilters(), a:callback)
 endfunction
 
+"FUNCTION: s:NERDTree.changeRoot(node) {{{1
+function! s:NERDTree.changeRoot(node)
+    if a:node.path.isDirectory
+        let self.root = a:node
+    else
+        call a:node.cacheParent()
+        let self.root = a:node.parent
+    endif
+
+    call self.root.open()
+
+    "change dir to the dir of the new root if instructed to
+    if g:NERDTreeChDirMode ==# 2
+        exec "cd " . self.root.path.str({'format': 'Edit'})
+    endif
+
+    call self.render()
+    call self.root.putCursorHere(0, 0)
+
+    silent doautocmd User NERDTreeNewRoot
+endfunction
+
 "FUNCTION: s:NERDTree.Close() {{{1
-"Closes the primary NERD tree window for this tab
+"Closes the tab tree window for this tab
 function! s:NERDTree.Close()
     if !s:NERDTree.IsOpen()
         return
@@ -43,7 +65,7 @@ endfunction
 "FUNCTION: s:NERDTree.CursorToBookmarkTable(){{{1
 "Places the cursor at the top of the bookmarks table
 function! s:NERDTree.CursorToBookmarkTable()
-    if !b:NERDTreeShowBookmarks
+    if !b:NERDTree.ui.getShowBookmarks()
         throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active"
     endif
 
@@ -73,13 +95,18 @@ endfunction
 " Function: s:NERDTree.ExistsForBuffer()   {{{1
 " Returns 1 if a nerd tree root exists in the current buffer
 function! s:NERDTree.ExistsForBuf()
-    return exists("b:NERDTreeRoot")
+    return exists("b:NERDTree")
 endfunction
 
 " Function: s:NERDTree.ExistsForTab()   {{{1
 " Returns 1 if a nerd tree root exists in the current tab
 function! s:NERDTree.ExistsForTab()
-    return exists("t:NERDTreeBufName")
+    if !exists("t:NERDTreeBufName")
+        return
+    end
+
+    "check b:NERDTree is still there and hasn't been e.g. :bdeleted
+    return !empty(getbufvar(bufnr(t:NERDTreeBufName), 'NERDTree'))
 endfunction
 
 function! s:NERDTree.ForCurrentBuf()
@@ -90,14 +117,29 @@ function! s:NERDTree.ForCurrentBuf()
     endif
 endfunction
 
+"FUNCTION: s:NERDTree.ForCurrentTab() {{{1
+function! s:NERDTree.ForCurrentTab()
+    if !s:NERDTree.ExistsForTab()
+        return
+    endif
+
+    let bufnr = bufnr(t:NERDTreeBufName)
+    return getbufvar(bufnr, "NERDTree")
+endfunction
+
+"FUNCTION: s:NERDTree.getRoot() {{{1
+function! s:NERDTree.getRoot()
+    return self.root
+endfunction
+
 "FUNCTION: s:NERDTree.GetWinNum() {{{1
 "gets the nerd tree window number for this tab
 function! s:NERDTree.GetWinNum()
     if exists("t:NERDTreeBufName")
         return bufwinnr(t:NERDTreeBufName)
-    else
-        return -1
     endif
+
+    return -1
 endfunction
 
 "FUNCTION: s:NERDTree.IsOpen() {{{1
@@ -105,6 +147,16 @@ function! s:NERDTree.IsOpen()
     return s:NERDTree.GetWinNum() != -1
 endfunction
 
+"FUNCTION: s:NERDTree.isTabTree() {{{1
+function! s:NERDTree.isTabTree()
+    return self._type == "tab"
+endfunction
+
+"FUNCTION: s:NERDTree.isWinTree() {{{1
+function! s:NERDTree.isWinTree()
+    return self._type == "window"
+endfunction
+
 "FUNCTION: s:NERDTree.MustBeOpen() {{{1
 function! s:NERDTree.MustBeOpen()
     if !s:NERDTree.IsOpen()
@@ -113,11 +165,11 @@ function! s:NERDTree.MustBeOpen()
 endfunction
 
 "FUNCTION: s:NERDTree.New() {{{1
-function! s:NERDTree.New(path)
+function! s:NERDTree.New(path, type)
     let newObj = copy(self)
     let newObj.ui = g:NERDTreeUI.New(newObj)
-    let newObj.root = g:NERDTreeDirNode.New(a:path)
-
+    let newObj.root = g:NERDTreeDirNode.New(a:path, newObj)
+    let newObj._type = a:type
     return newObj
 endfunction
 
@@ -129,6 +181,10 @@ function! s:NERDTree.PathFilters()
     return s:NERDTree._PathFilters
 endfunction
 
+"FUNCTION: s:NERDTree.previousBuf() {{{1
+function! s:NERDTree.previousBuf()
+    return self._previousBuf
+endfunction
 
 "FUNCTION: s:NERDTree.render() {{{1
 "A convenience function - since this is called often
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
index b445f8ad..00041b85 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/notifier.vim
@@ -11,8 +11,8 @@ function! s:Notifier.AddListener(event, funcname)
     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)
+function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
+    let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
 
     for listener in s:Notifier.GetListenersForEvent(a:event)
         call {listener}(event)
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/opener.vim b/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
index 3a6b3924..00947cdb 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/opener.vim
@@ -64,7 +64,7 @@ endfunction
 
 "FUNCTION: Opener._gotoTargetWin() {{{1
 function! s:Opener._gotoTargetWin()
-    if b:NERDTreeType ==# "secondary"
+    if b:NERDTree.isWinTree()
         if self._where == 'v'
             vsplit
         elseif self._where == 'h'
@@ -149,7 +149,7 @@ function! s:Opener.New(path, opts)
 
     let newObj._keepopen = nerdtree#has_opt(a:opts, 'keepopen')
     let newObj._where = has_key(a:opts, 'where') ? a:opts['where'] : ''
-    let newObj._treetype = b:NERDTreeType
+    let newObj._nerdtree = b:NERDTree
     call newObj._saveCursorPos()
 
     return newObj
@@ -247,34 +247,25 @@ function! s:Opener._openFile()
     endif
 
     call self._gotoTargetWin()
-
-    if self._treetype ==# "secondary"
-        call self._path.edit()
-    else
-        call self._path.edit()
-
-
-        if self._stay
-            call self._restoreCursorPos()
-        endif
+    call self._path.edit()
+    if self._stay
+        call self._restoreCursorPos()
     endif
 endfunction
 
 "FUNCTION: Opener._openDirectory(node) {{{1
 function! s:Opener._openDirectory(node)
-    if self._treetype ==# "secondary"
+    if self._nerdtree.isWinTree()
         call self._gotoTargetWin()
-        call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
+        call g:NERDTreeCreator.CreateWindow(a:node.path.str())
     else
         call self._gotoTargetWin()
         if empty(self._where)
-            call a:node.makeRoot()
-            call b:NERDTree.render()
-            call a:node.putCursorHere(0, 0)
+            call b:NERDTree.changeRoot(a:node)
         elseif self._where == 't'
-            call g:NERDTreeCreator.CreatePrimary(a:node.path.str())
+            call g:NERDTreeCreator.CreateTabTree(a:node.path.str())
         else
-            call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
+            call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
         endif
     endif
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index 2af07ddb..df18505f 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -40,9 +40,7 @@ endfunction
 
 "FUNCTION: Path.cacheDisplayString() {{{1
 function! s:Path.cacheDisplayString() abort
-    let self.cachedDisplayString = self.flagSet.renderToString()
-
-    let self.cachedDisplayString .= self.getLastPathComponent(1)
+    let self.cachedDisplayString = self.getLastPathComponent(1)
 
     if self.isExecutable
         let self.cachedDisplayString = self.cachedDisplayString . '*'
@@ -406,11 +404,11 @@ function! s:Path.isUnixHiddenPath()
     endif
 endfunction
 
-"FUNCTION: Path.ignore() {{{1
+"FUNCTION: Path.ignore(nerdtree) {{{1
 "returns true if this path should be ignored
-function! s:Path.ignore()
+function! s:Path.ignore(nerdtree)
     "filter out the user specified paths to ignore
-    if b:NERDTreeIgnoreEnabled
+    if a:nerdtree.ui.isIgnoreFilterEnabled()
         for i in g:NERDTreeIgnore
             if self._ignorePatternMatches(i)
                 return 1
@@ -418,18 +416,18 @@ function! s:Path.ignore()
         endfor
 
         for callback in g:NERDTree.PathFilters()
-            if {callback}({'path': self, 'nerdtree': b:NERDTree})
+            if {callback}({'path': self, 'nerdtree': a:nerdtree})
                 return 1
             endif
         endfor
     endif
 
     "dont show hidden files unless instructed to
-    if b:NERDTreeShowHidden ==# 0 && self.isUnixHiddenFile()
+    if !a:nerdtree.ui.getShowHidden() && self.isUnixHiddenFile()
         return 1
     endif
 
-    if b:NERDTreeShowFiles ==# 0 && self.isDirectory ==# 0
+    if a:nerdtree.ui.getShowFiles() ==# 0 && self.isDirectory ==# 0
         return 1
     endif
 
@@ -455,10 +453,22 @@ function! s:Path._ignorePatternMatches(pattern)
     return self.getLastPathComponent(0) =~# pat
 endfunction
 
-"FUNCTION: Path.isUnder(path) {{{1
-"return 1 if this path is somewhere under the given path in the filesystem.
+"FUNCTION: Path.isAncestor(path) {{{1
+"return 1 if this path is somewhere above the given path in the filesystem.
 "
 "a:path should be a dir
+function! s:Path.isAncestor(path)
+    if !self.isDirectory
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(that, this) == 0
+endfunction
+
+"FUNCTION: Path.isUnder(path) {{{1
+"return 1 if this path is somewhere under the given path in the filesystem.
 function! s:Path.isUnder(path)
     if a:path.isDirectory == 0
         return 0
@@ -572,16 +582,16 @@ function! s:Path.readInfoFromDisk(fullpath)
     endif
 endfunction
 
-"FUNCTION: Path.refresh() {{{1
-function! s:Path.refresh()
+"FUNCTION: Path.refresh(nerdtree) {{{1
+function! s:Path.refresh(nerdtree)
     call self.readInfoFromDisk(self.str())
-    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, {})
+    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, a:nerdtree, {})
     call self.cacheDisplayString()
 endfunction
 
-"FUNCTION: Path.refreshFlags() {{{1
-function! s:Path.refreshFlags()
-    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, {})
+"FUNCTION: Path.refreshFlags(nerdtree) {{{1
+function! s:Path.refreshFlags(nerdtree)
+    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, a:nerdtree, {})
     call self.cacheDisplayString()
 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 765982df..48e9bda3 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/tree_dir_node.vim
@@ -9,7 +9,7 @@ let g:NERDTreeDirNode = s:TreeDirNode
 "FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{1
 "class method that returns the highest cached ancestor of the current root
 function! s:TreeDirNode.AbsoluteTreeRoot()
-    let currentNode = b:NERDTreeRoot
+    let currentNode = b:NERDTree.root
     while currentNode.parent != {}
         let currentNode = currentNode.parent
     endwhile
@@ -21,7 +21,7 @@ unlet s:TreeDirNode.activate
 function! s:TreeDirNode.activate(...)
     let opts = a:0 ? a:1 : {}
     call self.toggleOpen(opts)
-    call b:NERDTree.render()
+    call self.getNerdtree().render()
     call self.putCursorHere(0, 0)
 endfunction
 
@@ -68,11 +68,27 @@ endfunction
 "Returns:
 "the newly created node
 function! s:TreeDirNode.createChild(path, inOrder)
-    let newTreeNode = g:NERDTreeFileNode.New(a:path)
+    let newTreeNode = g:NERDTreeFileNode.New(a:path, self.getNerdtree())
     call self.addChild(newTreeNode, a:inOrder)
     return newTreeNode
 endfunction
 
+"FUNCTION: TreeDirNode.displayString() {{{1
+unlet s:TreeDirNode.displayString
+function! s:TreeDirNode.displayString()
+    let cascade = self.getCascade()
+    let rv = ""
+    for node in cascade
+        let rv = rv . node.path.displayString()
+    endfor
+
+    let sym = cascade[-1].isOpen ? g:NERDTreeDirArrowCollapsible : g:NERDTreeDirArrowExpandable
+
+    let flags = cascade[-1].path.flagSet.renderToString()
+
+    return sym . ' ' . flags . rv
+endfunction
+
 "FUNCTION: TreeDirNode.findNode(path) {{{1
 "Will find one of the children (recursively) that has the given path
 "
@@ -98,6 +114,33 @@ function! s:TreeDirNode.findNode(path)
     return {}
 endfunction
 
+"FUNCTION: TreeDirNode.getCascade() {{{1
+"Return an array of dir nodes (starting from self) that can be cascade opened.
+function! s:TreeDirNode.getCascade()
+
+    let rv = [self]
+    let node = self
+
+    while 1
+        let vc = node.getVisibleChildren()
+        if len(vc) != 1
+            break
+        endif
+
+        let visChild = vc[0]
+
+        "TODO: optimize
+        if !visChild.path.isDirectory
+            break
+        endif
+
+        call add(rv, visChild)
+        let node = visChild
+    endwhile
+
+    return rv
+endfunction
+
 "FUNCTION: TreeDirNode.getChildCount() {{{1
 "Returns the number of children this node has
 function! s:TreeDirNode.getChildCount()
@@ -171,6 +214,12 @@ function! s:TreeDirNode.getChildIndex(path)
     return -1
 endfunction
 
+"FUNCTION: TreeDirNode.getDirChildren() {{{1
+"Get all children that are directories
+function! s:TreeDirNode.getDirChildren()
+    return filter(self.children, 'v:val.path.isDirectory == 1')
+endfunction
+
 "FUNCTION: TreeDirNode.GetSelected() {{{1
 "Returns the current node if it is a dir node, or else returns the current
 "nodes parent
@@ -199,7 +248,7 @@ endfunction
 function! s:TreeDirNode.getVisibleChildren()
     let toReturn = []
     for i in self.children
-        if i.path.ignore() ==# 0
+        if i.path.ignore(self.getNerdtree()) ==# 0
             call add(toReturn, i)
         endif
     endfor
@@ -212,6 +261,13 @@ function! s:TreeDirNode.hasVisibleChildren()
     return self.getVisibleChildCount() != 0
 endfunction
 
+"FUNCTION: TreeDirNode.isCascadable() {{{1
+"true if this dir has only one visible child - which is also a dir
+function! s:TreeDirNode.isCascadable()
+    let c = self.getVisibleChildren()
+    return len(c) == 1 && c[0].path.isDirectory
+endfunction
+
 "FUNCTION: TreeDirNode._initChildren() {{{1
 "Removes all childen from this node and re-reads them
 "
@@ -244,19 +300,15 @@ function! s:TreeDirNode._initChildren(silent)
     for i in files
 
         "filter out the .. and . directories
-        "Note: we must match .. AND ../ cos sometimes the globpath returns
+        "Note: we must match .. AND ../ since sometimes the globpath returns
         "../ for path with strange chars (eg $)
-"        if i !~# '\/\.\.\/\?$' && i !~# '\/\.\/\?$'
-"
-        " Regular expression is too expensive. Use simply string comparison
-        " instead
-        if i[len(i)-3:2] != ".." && i[len(i)-2:2] != ".." && 
+        if i[len(i)-3:2] != ".." && i[len(i)-2:2] != ".." &&
          \ i[len(i)-2:1] != "." && i[len(i)-1] != "."
             "put the next file in a new node and attach it
             try
                 let path = g:NERDTreePath.New(i)
                 call self.createChild(path, 0)
-                call g:NERDTreePathNotifier.NotifyListeners('init', path, {})
+                call g:NERDTreePathNotifier.NotifyListeners('init', path, self.getNerdtree(), {})
             catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
                 let invalidFilesFound += 1
             endtry
@@ -275,13 +327,13 @@ function! s:TreeDirNode._initChildren(silent)
     return self.getChildCount()
 endfunction
 
-"FUNCTION: TreeDirNode.New(path) {{{1
+"FUNCTION: TreeDirNode.New(path, nerdtree) {{{1
 "Returns a new TreeNode object with the given path and parent
 "
 "Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
-unlet s:TreeDirNode.New
-function! s:TreeDirNode.New(path)
+"path: dir that the node represents
+"nerdtree: the tree the node belongs to
+function! s:TreeDirNode.New(path, nerdtree)
     if a:path.isDirectory != 1
         throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object."
     endif
@@ -293,6 +345,7 @@ function! s:TreeDirNode.New(path)
     let newTreeNode.children = []
 
     let newTreeNode.parent = {}
+    let newTreeNode._nerdtree = a:nerdtree
 
     return newTreeNode
 endfunction
@@ -356,7 +409,7 @@ endfunction
 "FUNCTION: TreeDirNode._openInNewTab() {{{1
 function! s:TreeDirNode._openInNewTab()
     tabnew
-    call g:NERDTreeCreator.CreatePrimary(self.path.str())
+    call g:NERDTreeCreator.CreateTabTree(self.path.str())
 endfunction
 
 "FUNCTION: TreeDirNode.openRecursively() {{{1
@@ -377,7 +430,7 @@ endfunction
 "Args:
 "forceOpen: 1 if this node should be opened regardless of file filters
 function! s:TreeDirNode._openRecursively2(forceOpen)
-    if self.path.ignore() ==# 0 || a:forceOpen
+    if self.path.ignore(self.getNerdtree()) ==# 0 || a:forceOpen
         let self.isOpen = 1
         if self.children ==# []
             call self._initChildren(1)
@@ -394,7 +447,7 @@ endfunction
 "FUNCTION: TreeDirNode.refresh() {{{1
 unlet s:TreeDirNode.refresh
 function! s:TreeDirNode.refresh()
-    call self.path.refresh()
+    call self.path.refresh(self.getNerdtree())
 
     "if this node was ever opened, refresh its children
     if self.isOpen || !empty(self.children)
@@ -425,7 +478,7 @@ function! s:TreeDirNode.refresh()
 
                     "the node doesnt exist so create it
                     else
-                        let newNode = g:NERDTreeFileNode.New(path)
+                        let newNode = g:NERDTreeFileNode.New(path, self.getNerdtree())
                         let newNode.parent = self
                         call add(newChildNodes, newNode)
                     endif
@@ -450,7 +503,7 @@ endfunction
 "FUNCTION: TreeDirNode.refreshFlags() {{{1
 unlet s:TreeDirNode.refreshFlags
 function! s:TreeDirNode.refreshFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
     for i in self.children
         call i.refreshFlags()
     endfor
@@ -458,13 +511,16 @@ endfunction
 
 "FUNCTION: TreeDirNode.refreshDirFlags() {{{1
 function! s:TreeDirNode.refreshDirFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeDirNode.reveal(path) {{{1
 "reveal the given path, i.e. cache and open all treenodes needed to display it
 "in the UI
-function! s:TreeDirNode.reveal(path)
+"Returns the revealed node
+function! s:TreeDirNode.reveal(path, ...)
+    let opts = a:0 ? a:1 : {}
+
     if !a:path.isUnder(self.path)
         throw "NERDTree.InvalidArgumentsError: " . a:path.str() . " should be under " . self.path.str()
     endif
@@ -473,9 +529,10 @@ function! s:TreeDirNode.reveal(path)
 
     if self.path.equals(a:path.getParent())
         let n = self.findNode(a:path)
-        call b:NERDTree.render()
-        call n.putCursorHere(1,0)
-        return
+        if has_key(opts, "open")
+            call n.open()
+        endif
+        return n
     endif
 
     let p = a:path
@@ -484,7 +541,7 @@ function! s:TreeDirNode.reveal(path)
     endwhile
 
     let n = self.findNode(p)
-    call n.reveal(a:path)
+    return n.reveal(a:path, opts)
 endfunction
 
 "FUNCTION: TreeDirNode.removeChild(treenode) {{{1
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 b4924d78..adb0e96b 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/tree_file_node.vim
@@ -19,7 +19,7 @@ function! s:TreeFileNode.bookmark(name)
     "it so we can update its display string
     let oldMarkedNode = {}
     try
-        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1)
+        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1, self.getNerdtree())
     catch /^NERDTree.BookmarkNotFoundError/
     catch /^NERDTree.BookmarkedNodeNotFoundError/
     endtry
@@ -41,7 +41,7 @@ function! s:TreeFileNode.cacheParent()
         if parentPath.equals(self.path)
             throw "NERDTree.CannotCacheParentError: already at root"
         endif
-        let self.parent = s:TreeFileNode.New(parentPath)
+        let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree())
     endif
 endfunction
 
@@ -59,7 +59,7 @@ endfunction
 function! s:TreeFileNode.copy(dest)
     call self.path.copy(a:dest)
     let newPath = g:NERDTreePath.New(a:dest)
-    let parent = b:NERDTreeRoot.findNode(newPath.getParent())
+    let parent = self.getNerdtree().root.findNode(newPath.getParent())
     if !empty(parent)
         call parent.refresh()
         return parent.findNode(newPath)
@@ -83,7 +83,7 @@ endfunction
 "Return:
 "a string that can be used in the view to represent this node
 function! s:TreeFileNode.displayString()
-    return self.path.displayString()
+    return self.path.flagSet.renderToString() . self.path.displayString()
 endfunction
 
 "FUNCTION: TreeFileNode.equals(treenode) {{{1
@@ -165,7 +165,7 @@ function! s:TreeFileNode.findSibling(direction)
 
                 "if the next node is not an ignored node (i.e. wont show up in the
                 "view) then return it
-                if self.parent.children[siblingIndx].path.ignore() ==# 0
+                if self.parent.children[siblingIndx].path.ignore(self.getNerdtree()) ==# 0
                     return self.parent.children[siblingIndx]
                 endif
 
@@ -178,11 +178,16 @@ function! s:TreeFileNode.findSibling(direction)
     return {}
 endfunction
 
+"FUNCTION: TreeFileNode.getNerdtree(){{{1
+function! s:TreeFileNode.getNerdtree()
+    return self._nerdtree
+endfunction
+
 "FUNCTION: TreeFileNode.GetRootForTab(){{{1
 "get the root node for this tab
 function! s:TreeFileNode.GetRootForTab()
     if g:NERDTree.ExistsForTab()
-        return getbufvar(t:NERDTreeBufName, 'NERDTreeRoot')
+        return getbufvar(t:NERDTreeBufName, 'NERDTree').root
     end
     return {}
 endfunction
@@ -195,7 +200,7 @@ function! s:TreeFileNode.GetSelected()
         if path ==# {}
             return {}
         endif
-        return b:NERDTreeRoot.findNode(path)
+        return b:NERDTree.root.findNode(path)
     catch /^NERDTree/
         return {}
     endtry
@@ -205,51 +210,32 @@ endfunction
 "returns 1 if this node should be visible according to the tree filters and
 "hidden file filters (and their on/off status)
 function! s:TreeFileNode.isVisible()
-    return !self.path.ignore()
+    return !self.path.ignore(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.isRoot() {{{1
-"returns 1 if this node is b:NERDTreeRoot
 function! s:TreeFileNode.isRoot()
     if !g:NERDTree.ExistsForBuf()
         throw "NERDTree.NoTreeError: No tree exists for the current buffer"
     endif
 
-    return self.equals(b:NERDTreeRoot)
+    return self.equals(self.getNerdtree().root)
 endfunction
 
-"FUNCTION: TreeFileNode.makeRoot() {{{1
-"Make this node the root of the tree
-function! s:TreeFileNode.makeRoot()
-    if self.path.isDirectory
-        let b:NERDTreeRoot = self
-    else
-        call self.cacheParent()
-        let b:NERDTreeRoot = self.parent
-    endif
-
-    call b:NERDTreeRoot.open()
-
-    "change dir to the dir of the new root if instructed to
-    if g:NERDTreeChDirMode ==# 2
-        exec "cd " . b:NERDTreeRoot.path.str({'format': 'Edit'})
-    endif
-
-    silent doautocmd User NERDTreeNewRoot
-endfunction
-
-"FUNCTION: TreeFileNode.New(path) {{{1
+"FUNCTION: TreeFileNode.New(path, nerdtree) {{{1
 "Returns a new TreeNode object with the given path and parent
 "
 "Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
-function! s:TreeFileNode.New(path)
+"path: file/dir that the node represents
+"nerdtree: the tree the node belongs to
+function! s:TreeFileNode.New(path, nerdtree)
     if a:path.isDirectory
-        return g:NERDTreeDirNode.New(a:path)
+        return g:NERDTreeDirNode.New(a:path, a:nerdtree)
     else
         let newTreeNode = copy(self)
         let newTreeNode.path = a:path
         let newTreeNode.parent = {}
+        let newTreeNode._nerdtree = a:nerdtree
         return newTreeNode
     endif
 endfunction
@@ -289,7 +275,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 = b:NERDTree.ui.getLineNum(self)
+    let ln = self.getNerdtree().ui.getLineNum(self)
     if ln != -1
         if a:isJump
             mark '
@@ -298,11 +284,11 @@ function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
     else
         if a:recurseUpward
             let node = self
-            while node != {} && b:NERDTree.ui.getLineNum(node) ==# -1
+            while node != {} && self.getNerdtree().ui.getLineNum(node) ==# -1
                 let node = node.parent
                 call node.open()
             endwhile
-            call b:NERDTree.render()
+            call self._nerdtree.render()
             call node.putCursorHere(a:isJump, 0)
         endif
     endif
@@ -310,12 +296,12 @@ endfunction
 
 "FUNCTION: TreeFileNode.refresh() {{{1
 function! s:TreeFileNode.refresh()
-    call self.path.refresh()
+    call self.path.refresh(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.refreshFlags() {{{1
 function! s:TreeFileNode.refreshFlags()
-    call self.path.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
 endfunction
 
 "FUNCTION: TreeFileNode.rename() {{{1
@@ -326,7 +312,7 @@ function! s:TreeFileNode.rename(newName)
     call self.parent.removeChild(self)
 
     let parentPath = self.path.getParent()
-    let newParent = b:NERDTreeRoot.findNode(parentPath)
+    let newParent = self.getNerdtree().root.findNode(parentPath)
 
     if newParent != {}
         call newParent.createChild(self.path, 1)
@@ -337,70 +323,24 @@ endfunction
 "FUNCTION: TreeFileNode.renderToString {{{1
 "returns a string representation for this tree to be rendered in the view
 function! s:TreeFileNode.renderToString()
-    return self._renderToString(0, 0, [], self.getChildCount() ==# 1)
+    return self._renderToString(0, 0)
 endfunction
 
 "Args:
 "depth: the current depth in the tree for this call
 "drawText: 1 if we should actually draw the line for this node (if 0 then the
 "child nodes are rendered only)
-"vertMap: a binary array that indicates whether a vertical bar should be draw
 "for each depth in the tree
-"isLastChild:true if this curNode is the last child of its parent
-function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
+function! s:TreeFileNode._renderToString(depth, drawText)
     let output = ""
     if a:drawText ==# 1
 
-        let treeParts = ''
+        let treeParts = repeat('  ', a:depth - 1)
 
-        "get all the leading spaces and vertical tree parts for this line
-        if a:depth > 1
-            for j in a:vertMap[0:-2]
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '  '
-                else
-                    if j ==# 1
-                        let treeParts = treeParts . '| '
-                    else
-                        let treeParts = treeParts . '  '
-                    endif
-                endif
-            endfor
+        if !self.path.isDirectory
+            let treeParts = treeParts . '  '
         endif
 
-        "get the last vertical tree part for this line which will be different
-        "if this node is the last child of its parent
-        if !g:NERDTreeDirArrows
-            if a:isLastChild
-                let treeParts = treeParts . '`'
-            else
-                let treeParts = treeParts . '|'
-            endif
-        endif
-
-        "smack the appropriate dir/file symbol on the line before the file/dir
-        "name itself
-        if self.path.isDirectory
-            if self.isOpen
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▾ '
-                else
-                    let treeParts = treeParts . '~'
-                endif
-            else
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▸ '
-                else
-                    let treeParts = treeParts . '+'
-                endif
-            endif
-        else
-            if g:NERDTreeDirArrows
-                let treeParts = treeParts . '  '
-            else
-                let treeParts = treeParts . '-'
-            endif
-        endif
         let line = treeParts . self.displayString()
 
         let output = output . line . "\n"
@@ -410,18 +350,15 @@ function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
     if self.path.isDirectory ==# 1 && self.isOpen ==# 1
 
         let childNodesToDraw = self.getVisibleChildren()
-        if len(childNodesToDraw) > 0
 
-            "draw all the nodes children except the last
-            let lastIndx = len(childNodesToDraw)-1
-            if lastIndx > 0
-                for i in childNodesToDraw[0:lastIndx-1]
-                    let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0)
-                endfor
-            endif
+        if self.isCascadable() && a:depth > 0
 
-            "draw the last child, indicating that it IS the last
-            let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1)
+            let output = output . childNodesToDraw[0]._renderToString(a:depth, 0)
+
+        elseif len(childNodesToDraw) > 0
+            for i in childNodesToDraw
+                let output = output . i._renderToString(a:depth + 1, 1)
+            endfor
         endif
     endif
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/ui.vim b/sources_non_forked/nerdtree/lib/nerdtree/ui.vim
index 22e450c8..1ad44698 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/ui.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/ui.vim
@@ -21,18 +21,18 @@ endfunction
 "prints out the quick help
 function! s:UI._dumpHelp()
     let old_h = @h
-    if b:treeShowHelp ==# 1
+    if self.getShowHelp()
         let @h=   "\" NERD tree (" . nerdtree#version() . ") quickhelp~\n"
         let @h=@h."\" ============================\n"
         let @h=@h."\" File node mappings~\n"
         let @h=@h."\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n"
         let @h=@h."\" <CR>,\n"
-        if b:NERDTreeType ==# "primary"
+        if self.nerdtree.isTabTree()
             let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n"
         else
             let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in current window\n"
         endif
-        if b:NERDTreeType ==# "primary"
+        if self.nerdtree.isTabTree()
             let @h=@h."\" ". g:NERDTreeMapPreview .": preview\n"
         endif
         let @h=@h."\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
@@ -87,10 +87,10 @@ function! s:UI._dumpHelp()
 
         let @h=@h."\"\n\" ----------------------------\n"
         let @h=@h."\" Tree filtering mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (b:NERDTreeShowHidden ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (b:NERDTreeIgnoreEnabled ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (b:NERDTreeShowFiles ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (b:NERDTreeShowBookmarks ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (self.getShowHidden() ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (self.isIgnoreFilterEnabled() ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (self.getShowFiles() ? "on" : "off") . ")\n"
+        let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (self.getShowBookmarks() ? "on" : "off") . ")\n"
 
         "add quickhelp entries for each custom key map
         let @h=@h."\"\n\" ----------------------------\n"
@@ -116,7 +116,7 @@ function! s:UI._dumpHelp()
         let @h=@h."\" :ClearBookmarks [<names>]\n"
         let @h=@h."\" :ClearAllBookmarks\n"
         silent! put h
-    elseif g:NERDTreeMinimalUI == 0
+    elseif !self.isMinimal()
         let @h="\" Press ". g:NERDTreeMapHelp ." for help\n"
         silent! put h
     endif
@@ -129,6 +129,12 @@ endfunction
 function! s:UI.New(nerdtree)
     let newObj = copy(self)
     let newObj.nerdtree = a:nerdtree
+    let newObj._showHelp = 0
+    let newObj._ignoreEnabled = 1
+    let newObj._showFiles = g:NERDTreeShowFiles
+    let newObj._showHidden = g:NERDTreeShowHidden
+    let newObj._showBookmarks = g:NERDTreeShowBookmarks
+
     return newObj
 endfunction
 
@@ -149,18 +155,11 @@ function! s:UI.getPath(ln)
 
     "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
+        return self.nerdtree.root.path
     endif
 
     if line ==# s:UI.UpDirLine()
-        return b:NERDTreeRoot.path.getParent()
+        return self.nerdtree.root.path.getParent()
     endif
 
     let indent = self._indentLevelFor(line)
@@ -183,7 +182,7 @@ function! s:UI.getPath(ln)
 
         "have we reached the top of the tree?
         if lnum == rootLine
-            let dir = b:NERDTreeRoot.path.str({'format': 'UI'}) . dir
+            let dir = self.nerdtree.root.path.str({'format': 'UI'}) . dir
             break
         endif
         if curLineStripped =~# '/$'
@@ -196,7 +195,7 @@ function! s:UI.getPath(ln)
             endif
         endif
     endwhile
-    let curFile = b:NERDTreeRoot.path.drive . dir . curFile
+    let curFile = self.nerdtree.root.path.drive . dir . curFile
     let toReturn = g:NERDTreePath.New(curFile)
     return toReturn
 endfunction
@@ -206,19 +205,19 @@ endfunction
 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()
+        return self.getRootLineNum()
     endif
 
     let totalLines = line("$")
 
     "the path components we have matched so far
-    let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')]
+    let pathcomponents = [substitute(self.nerdtree.root.path.str({'format': 'UI'}), '/ *$', '', '')]
     "the index of the component we are searching for
     let curPathComponent = 1
 
     let fullpath = a:file_node.path.str({'format': 'UI'})
 
-    let lnum = b:NERDTree.ui.getRootLineNum()
+    let lnum = self.getRootLineNum()
     while lnum > 0
         let lnum = lnum + 1
         "have we reached the bottom of the tree?
@@ -259,15 +258,33 @@ function! s:UI.getRootLineNum()
     return rootLine
 endfunction
 
+"FUNCTION: s:UI.getShowBookmarks() {{{1
+function! s:UI.getShowBookmarks()
+    return self._showBookmarks
+endfunction
+
+"FUNCTION: s:UI.getShowFiles() {{{1
+function! s:UI.getShowFiles()
+    return self._showFiles
+endfunction
+
+"FUNCTION: s:UI.getShowHelp() {{{1
+function! s:UI.getShowHelp()
+    return self._showHelp
+endfunction
+
+"FUNCTION: s:UI.getShowHidden() {{{1
+function! s:UI.getShowHidden()
+    return self._showHidden
+endfunction
+
 "FUNCTION: s:UI._indentLevelFor(line) {{{1
 function! s:UI._indentLevelFor(line)
-    let level = match(a:line, '[^ \-+~▸▾`|]') / s:UI.IndentWid()
-    " 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
+    "have to do this work around because match() returns bytes, not chars
+    let numLeadBytes = match(a:line, '\M\[^ '.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']')
+    let leadChars = strchars(a:line[0:numLeadBytes-1])
+
+    return leadChars / s:UI.IndentWid()
 endfunction
 
 "FUNCTION: s:UI.IndentWid() {{{1
@@ -275,19 +292,25 @@ function! s:UI.IndentWid()
     return 2
 endfunction
 
+"FUNCTION: s:UI.isIgnoreFilterEnabled() {{{1
+function! s:UI.isIgnoreFilterEnabled()
+    return self._ignoreEnabled == 1
+endfunction
+
+"FUNCTION: s:UI.isMinimal() {{{1
+function! s:UI.isMinimal()
+    return g:NERDTreeMinimalUI
+endfunction
+
 "FUNCTION: s:UI.MarkupReg() {{{1
 function! s:UI.MarkupReg()
-    if g:NERDTreeDirArrows
-        return '^\([▾▸] \| \+[▾▸] \| \+\)'
-    endif
-
-    return '^[ `|]*[\-+~]'
+    return '^\(['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+\)'
 endfunction
 
 "FUNCTION: s:UI._renderBookmarks {{{1
 function! s:UI._renderBookmarks()
 
-    if g:NERDTreeMinimalUI == 0
+    if !self.isMinimal()
         call setline(line(".")+1, ">----------Bookmarks----------")
         call cursor(line(".")+1, col("."))
     endif
@@ -334,6 +357,11 @@ function! s:UI.saveScreenState()
     call nerdtree#exec(win . "wincmd w")
 endfunction
 
+"FUNCTION: s:UI.setShowHidden(val) {{{1
+function! s:UI.setShowHidden(val)
+    let self._showHidden = a:val
+endfunction
+
 "FUNCTION: s:UI._stripMarkup(line, removeLeadingSpaces){{{1
 "returns the given line with all the tree parts stripped off
 "
@@ -390,29 +418,29 @@ function! s:UI.render()
     call self._dumpHelp()
 
     "delete the blank line before the help and add one after it
-    if g:NERDTreeMinimalUI == 0
+    if !self.isMinimal()
         call setline(line(".")+1, "")
         call cursor(line(".")+1, col("."))
     endif
 
-    if b:NERDTreeShowBookmarks
+    if self.getShowBookmarks()
         call self._renderBookmarks()
     endif
 
     "add the 'up a dir' line
-    if !g:NERDTreeMinimalUI
+    if !self.isMinimal()
         call setline(line(".")+1, s:UI.UpDirLine())
         call cursor(line(".")+1, col("."))
     endif
 
     "draw the header line
-    let header = b:NERDTreeRoot.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
+    let header = self.nerdtree.root.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
     call setline(line(".")+1, header)
     call cursor(line(".")+1, col("."))
 
     "draw the tree
     let old_o = @o
-    let @o = b:NERDTreeRoot.renderToString()
+    let @o = self.nerdtree.root.renderToString()
     silent put o
     let @o = old_o
 
@@ -443,47 +471,52 @@ function! s:UI.renderViewSavingPosition()
         let currentNode = currentNode.parent
     endwhile
 
-    call b:NERDTree.render()
+    call self.render()
 
     if currentNode != {}
         call currentNode.putCursorHere(0, 0)
     endif
 endfunction
 
+"FUNCTION: s:UI.toggleHelp() {{{1
+function! s:UI.toggleHelp()
+    let self._showHelp = !self._showHelp
+endfunction
+
 " FUNCTION: s:UI.toggleIgnoreFilter() {{{1
 " toggles the use of the NERDTreeIgnore option
 function! s:UI.toggleIgnoreFilter()
-    let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled
-    call b:NERDTree.ui.renderViewSavingPosition()
-    call b:NERDTree.ui.centerView()
+    let self._ignoreEnabled = !self._ignoreEnabled
+    call self.renderViewSavingPosition()
+    call self.centerView()
 endfunction
 
 " FUNCTION: s:UI.toggleShowBookmarks() {{{1
 " toggles the display of bookmarks
 function! s:UI.toggleShowBookmarks()
-    let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
-    if b:NERDTreeShowBookmarks
-        call b:NERDTree.render()
+    let self._showBookmarks = !self._showBookmarks
+    if self.getShowBookmarks()
+        call self.nerdtree.render()
         call g:NERDTree.CursorToBookmarkTable()
     else
-        call b:NERDTree.ui.renderViewSavingPosition()
+        call self.renderViewSavingPosition()
     endif
-    call b:NERDTree.ui.centerView()
+    call self.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()
+    let self._showFiles = !self._showFiles
+    call self.renderViewSavingPosition()
+    call self.centerView()
 endfunction
 
 " FUNCTION: s:UI.toggleShowHidden() {{{1
 " toggles the display of hidden files
 function! s:UI.toggleShowHidden()
-    let b:NERDTreeShowHidden = !b:NERDTreeShowHidden
-    call b:NERDTree.ui.renderViewSavingPosition()
+    let self._showHidden = !self._showHidden
+    call self.renderViewSavingPosition()
     call self.centerView()
 endfunction
 
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim b/sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim
index e7a7c532..c53650a5 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/exec_menuitem.vim
@@ -2,7 +2,6 @@
 " File:        exec_menuitem.vim
 " Description: plugin for NERD Tree that provides an execute file menu item
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 22 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
 "              it and/or modify it under the terms of the Do What The Fuck You
diff --git a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
index e99a85be..20a9fcd3 100644
--- a/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
+++ b/sources_non_forked/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -2,7 +2,6 @@
 " File:        fs_menu.vim
 " Description: plugin for the NERD Tree that provides a file system menu
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 17 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
 "              it and/or modify it under the terms of the Do What The Fuck You
@@ -24,7 +23,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") || has("mac")
     call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
     call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
     call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
@@ -34,18 +33,11 @@ if g:NERDTreePath.CopyingSupported()
     call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
 endif
 
-"FUNCTION: s:echo(msg){{{1
-function! s:echo(msg)
-    redraw
-    echomsg "NERDTree: " . a:msg
-endfunction
-
-"FUNCTION: s:echoWarning(msg){{{1
-function! s:echoWarning(msg)
-    echohl warningmsg
-    call s:echo(a:msg)
-    echohl normal
-endfunction
+if has("unix") || has("osx")
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
+else
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
+endif
 
 "FUNCTION: s:promptToDelBuffer(bufnum, msg){{{1
 "prints out the given msg and, if the user responds by pushing 'y' then the
@@ -107,17 +99,17 @@ function! NERDTreeAddNode()
                           \ "", curDirNode.path.str() . g:NERDTreePath.Slash(), "file")
 
     if newNodeName ==# ''
-        call s:echo("Node Creation Aborted.")
+        call nerdtree#echo("Node Creation Aborted.")
         return
     endif
 
     try
         let newPath = g:NERDTreePath.Create(newNodeName)
-        let parentNode = b:NERDTreeRoot.findNode(newPath.getParent())
+        let parentNode = b:NERDTree.root.findNode(newPath.getParent())
 
-        let newTreeNode = g:NERDTreeFileNode.New(newPath)
+        let newTreeNode = g:NERDTreeFileNode.New(newPath, b:NERDTree)
         if empty(parentNode)
-            call b:NERDTreeRoot.refresh()
+            call b:NERDTree.root.refresh()
             call b:NERDTree.render()
         elseif parentNode.isOpen || !empty(parentNode.children)
             call parentNode.addChild(newTreeNode, 1)
@@ -125,7 +117,7 @@ function! NERDTreeAddNode()
             call newTreeNode.putCursorHere(1, 0)
         endif
     catch /^NERDTree/
-        call s:echoWarning("Node Not Created.")
+        call nerdtree#echoWarning("Node Not Created.")
     endtry
 endfunction
 
@@ -138,7 +130,7 @@ function! NERDTreeMoveNode()
                           \ "", curNode.path.str(), "file")
 
     if newNodePath ==# ''
-        call s:echo("Node Renaming Aborted.")
+        call nerdtree#echo("Node Renaming Aborted.")
         return
     endif
 
@@ -159,7 +151,7 @@ function! NERDTreeMoveNode()
 
         redraw
     catch /^NERDTree/
-        call s:echoWarning("Node Not Renamed.")
+        call nerdtree#echoWarning("Node Not Renamed.")
     endtry
 endfunction
 
@@ -199,10 +191,33 @@ function! NERDTreeDeleteNode()
 
             redraw
         catch /^NERDTree/
-            call s:echoWarning("Could not remove node")
+            call nerdtree#echoWarning("Could not remove node")
         endtry
     else
-        call s:echo("delete aborted")
+        call nerdtree#echo("delete aborted")
+    endif
+
+endfunction
+
+" FUNCTION: NERDTreeListNode() {{{1
+function! NERDTreeListNode()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('ls -ld ' . shellescape(treenode.path.str())), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
+    endif
+endfunction
+
+" FUNCTION: NERDTreeListNodeWin32() {{{1
+function! NERDTreeListNodeWin32()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('DIR /Q ' . shellescape(treenode.path.str()) . ' | FINDSTR "^[012][0-9]/[0-3][0-9]/[12][0-9][0-9][0-9]"'), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
     endif
 
 endfunction
@@ -221,7 +236,7 @@ function! NERDTreeCopyNode()
 
         let confirmed = 1
         if currentNode.path.copyingWillOverwrite(newNodePath)
-            call s:echo("Warning: copying may overwrite files! Continue? (yN)")
+            call nerdtree#echo("Warning: copying may overwrite files! Continue? (yN)")
             let choice = nr2char(getchar())
             let confirmed = choice ==# 'y'
         endif
@@ -230,22 +245,23 @@ function! NERDTreeCopyNode()
             try
                 let newNode = currentNode.copy(newNodePath)
                 if empty(newNode)
-                    call b:NERDTreeRoot.refresh()
+                    call b:NERDTree.root.refresh()
                     call b:NERDTree.render()
                 else
                     call NERDTreeRender()
                     call newNode.putCursorHere(0, 0)
                 endif
             catch /^NERDTree/
-                call s:echoWarning("Could not copy node")
+                call nerdtree#echoWarning("Could not copy node")
             endtry
         endif
     else
-        call s:echo("Copy aborted.")
+        call nerdtree#echo("Copy aborted.")
     endif
     redraw
 endfunction
 
+" FUNCTION: NERDTreeQuickLook() {{{1
 function! NERDTreeQuickLook()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
@@ -253,18 +269,19 @@ function! NERDTreeQuickLook()
     endif
 endfunction
 
+" FUNCTION: NERDTreeRevealInFinder() {{{1
 function! NERDTreeRevealInFinder()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
-        let x = system("open -R '" . treenode.path.str() . "'")
+        call system("open -R '" . treenode.path.str() . "'")
     endif
 endfunction
 
+" FUNCTION: NERDTreeExecuteFile() {{{1
 function! NERDTreeExecuteFile()
     let treenode = g:NERDTreeFileNode.GetSelected()
     if treenode != {}
-        let x = system("open '" . treenode.path.str() . "'")
+        call system("open '" . treenode.path.str() . "'")
     endif
 endfunction
-
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/nerdtree/plugin/NERD_tree.vim b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
index 966838c3..bbcc55f6 100644
--- a/sources_non_forked/nerdtree/plugin/NERD_tree.vim
+++ b/sources_non_forked/nerdtree/plugin/NERD_tree.vim
@@ -1,8 +1,6 @@
 " ============================================================================
 " File:        NERD_tree.vim
-" Description: vim global plugin that provides a nice tree explorer
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 28 December, 2011
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
 "              it and/or modify it under the terms of the Do What The Fuck You
@@ -67,7 +65,14 @@ 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())
+
+if !nerdtree#runningWindows()
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "▸")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "▾")
+else
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "+")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "~")
+endif
 call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
 
 if !exists("g:NERDTreeSortOrder")
@@ -83,8 +88,8 @@ if !exists('g:NERDTreeStatusline')
 
     "the exists() crap here is a hack to stop vim spazzing out when
     "loading a session that was created with an open nerd tree. It spazzes
-    "because it doesnt store b:NERDTreeRoot (its a b: var, and its a hash)
-    let g:NERDTreeStatusline = "%{exists('b:NERDTreeRoot')?b:NERDTreeRoot.path.str():''}"
+    "because it doesnt store b:NERDTree(its a b: var, and its a hash)
+    let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
 
 endif
 call s:initVariable("g:NERDTreeWinPos", "left")
@@ -188,7 +193,7 @@ function! NERDTreeFocus()
     if g:NERDTree.IsOpen()
         call g:NERDTree.CursorToTreeWin()
     else
-        call g:NERDTreeCreator.TogglePrimary("")
+        call g:NERDTreeCreator.ToggleTabTree("")
     endif
 endfunction
 
diff --git a/sources_non_forked/nerdtree/syntax/nerdtree.vim b/sources_non_forked/nerdtree/syntax/nerdtree.vim
index 5f7b49cc..8a4e4245 100644
--- a/sources_non_forked/nerdtree/syntax/nerdtree.vim
+++ b/sources_non_forked/nerdtree/syntax/nerdtree.vim
@@ -22,42 +22,19 @@ syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
 "highlighing for directory nodes and file nodes
 syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
 
-if g:NERDTreeDirArrows
-    syn match NERDTreeClosable #▾# containedin=NERDTreeDir,NERDTreeFile
-    syn match NERDTreeOpenable #▸# containedin=NERDTreeDir,NERDTreeFile
+exec 'syn match NERDTreeClosable #'.escape(g:NERDTreeDirArrowCollapsible, '~').'# containedin=NERDTreeDir,NERDTreeFile'
+exec 'syn match NERDTreeOpenable #'.escape(g:NERDTreeDirArrowExpandable, '~').'# containedin=NERDTreeDir,NERDTreeFile'
 
-    syn match NERDTreeDir #[^▾▸ ].*/#
-    syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
-    syn match NERDTreeFile  #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
+let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~').escape(g:NERDTreeDirArrowExpandable, '~')
+exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
+syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
+exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
 
-    "highlighting for readonly files
-    syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile
+"highlighting for readonly files
+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 #\~\<#
-    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=NERDTreeIgnore,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
-
-    syn match NERDTreeFlags #-\[.\]# containedin=NERDTreeFile,NERDTreePartFile
-    syn match NERDTreeFlags #[+~]\zs\[.\]# containedin=NERDTreeDir
-endif
+syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile,NERDTreeExecFile
+syn match NERDTreeFlags #\[.\]# containedin=NERDTreeDir
 
 syn match NERDTreeCWD #^[</].*$#
 
diff --git a/sources_non_forked/syntastic/CONTRIBUTING.md b/sources_non_forked/syntastic/CONTRIBUTING.md
index 378b53b3..9c78aa32 100644
--- a/sources_non_forked/syntastic/CONTRIBUTING.md
+++ b/sources_non_forked/syntastic/CONTRIBUTING.md
@@ -40,8 +40,8 @@ too:
 
 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.
+is changing rapidly at times, and it's quite possible that some features
+you want to add exist already.
 
 To submit a patch:
 
@@ -54,7 +54,7 @@ Small, focused patches are preferred.
 Large changes to the code should be discussed with the core team first.
 Create an issue and explain your plan and see what we say.
 
-Also make sure to update the manual whenever applicable.  Nobody can use
+Also, make sure to update the manual whenever applicable.  Nobody can use
 features that aren't documented.
 
 <a name="generalstyle"></a>
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index b9e08c4e..aa5d842f 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -35,7 +35,7 @@
 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.11. [I have enabled multiple checkers for the current filetype.  How can I display all errors from all 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)  
@@ -53,22 +53,23 @@ 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, 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, Mercury, NASM,
-Nix, 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, Sphinx, Tcl,
-TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT,
+Ada, Ansible configurations, API Blueprint, AppleScript, AsciiDoc, ASM,
+BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq,
+CSS, Cucumber, CUDA, D, Dart, DocBook, Dockerfile, Dust, Elixir, Erlang,
+eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell, Haxe, Handlebars,
+HSS, HTML, Jade, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo, LISP, LLVM
+intermediate language, Lua, Markdown, MATLAB, Mercury, NASM, Nix, Objective-C,
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
+iOS property lists, Puppet, Python, QML, R, Racket, Relax NG, reStructuredText,
+RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Sphinx, SQL, Stylus, Tcl, TeX,
+Texinfo, Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, XQuery,
 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], [vim-crystal][29], [vim-eastwood][28], and
-[vim-swift][24].
+for example: [merlin][30], [omnisharp-vim][25], [rust.vim][12],
+[syntastic-extras][26], [syntastic-more][27], [vim-crystal][29],
+[vim-eastwood][28], 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
@@ -159,10 +160,10 @@ following:
 
 ## 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):
+Syntastic has numerous options that can be configured, and the defaults
+are not particularly well suitable for new users.  It is recommended
+that you start by adding the following lines to your `vimrc` file, and
+return to them after reading the manual (see `:help syntastic` in Vim):
 ```vim
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
@@ -380,7 +381,7 @@ See `:help syntastic_quiet_messages` for details.
 <a name="faqaggregate"></a>
 
 __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?__
+display all errors from all checkers together?__
 
 A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
 ```vim
@@ -427,7 +428,8 @@ There are also a dedicated [google group][5], and a
 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].
+a look at [ghcmod-vim][31], [jedi-vim][7], [python-mode][8], [vim-go][32], or
+[YouCompleteMe][9].
 
 [0]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
 [1]: https://github.com/tpope/vim-pathogen
@@ -459,6 +461,9 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [27]: https://github.com/roktas/syntastic-more
 [28]: https://github.com/venantius/vim-eastwood
 [29]: https://github.com/rhysd/vim-crystal
+[30]: https://github.com/the-lambda-church/merlin
+[31]: https://github.com/eagletmt/ghcmod-vim
+[32]: https://github.com/fatih/vim-go
 
 <!--
 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 8d9ef73a..e49a29a0 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -223,24 +223,7 @@ function! s:_get_cflags(ft, ck, opts) abort " {{{2
 
     " check if the user manually set some cflags
     let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
-    if b_cflags ==# ''
-        if a:ft ==# 'c' || a:ft ==# 'cpp'
-            " check whether to search for include files at all
-            if !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
-                " refresh the include file search if desired
-                if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-                    let flags .= ' ' . s:_search_headers()
-                else
-                    " search for header includes if not cached already
-                    if !exists('b:syntastic_' . a:ft . '_includes')
-                        let b:syntastic_{a:ft}_includes = s:_search_headers()
-                    endif
-                    let flags .= ' ' . b:syntastic_{a:ft}_includes
-                endif
-            endif
-        endif
-    else
-        " user-defined cflags
+    if b_cflags !=# ''
         let flags .= ' ' . b_cflags
     endif
 
@@ -248,6 +231,19 @@ function! s:_get_cflags(ft, ck, opts) abort " {{{2
     let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
     let flags .= ' ' . syntastic#c#ReadConfig(config_file)
 
+    if b_cflags ==# '' && (a:ft ==# 'c' || a:ft ==# 'cpp') && !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
+        " refresh the include file search if desired
+        if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+            let flags .= ' ' . s:_search_headers()
+        else
+            " search for header includes if not cached already
+            if !exists('b:syntastic_' . a:ft . '_includes')
+                let b:syntastic_{a:ft}_includes = s:_search_headers()
+            endif
+            let flags .= ' ' . b:syntastic_{a:ft}_includes
+        endif
+    endif
+
     return flags
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 87792bc2..433ed146 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -59,27 +59,51 @@ 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) abort " {{{2
-    " JSON artifacts
-    let true = 1
-    let false = 0
-    let null = ''
+function! syntastic#preprocess#dockerfile_lint(errors) abort " {{{2
+    let out = []
+    let json = s:_decode_JSON(join(a:errors, ''))
 
+    if type(json) == type({})
+        try
+            let data = json['error']['data'] + json['warn']['data'] + json['info']['data']
+            for e in data
+                let type = toupper(e['level'][0])
+                if type ==# 'I'
+                    let type = 'W'
+                    let style = 1
+                else
+                    let style = 0
+                endif
+
+                let line = get(e, 'line', 1)
+                let message = e['message']
+                if has_key(e, 'description') && e['description'] !=# 'None'
+                    let message = message . '. ' . e['description']
+                endif
+
+                let msg =
+                    \ type . ':' .
+                    \ style . ':' .
+                    \ line . ':' .
+                    \ message
+                call add(out, msg)
+            endfor
+        catch /\m^Vim\%((\a\+)\)\=:E716/
+            call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format')
+            let out = []
+        endtry
+    else
+        call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format')
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#flow(errors) abort " {{{2
     let idx = 0
-    while idx < len(a:errors) && a:errors[idx][0] != '{'
+    while idx < len(a:errors) && a:errors[idx][0] !=# '{'
         let idx += 1
     endwhile
-
-    " 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[idx :], ''))
-    catch
-        let errs = {}
-    endtry
+    let errs = s:_decode_JSON(join(a:errors[idx :], ''))
 
     let out = []
     if type(errs) == type({}) && has_key(errs, 'errors') && type(errs['errors']) == type([])
@@ -108,33 +132,61 @@ function! syntastic#preprocess#flow(errors) abort " {{{2
 
                     call add(out, msg)
                 catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker javascript/flow: unknown error format')
+                    call syntastic#log#warn('checker javascript/flow: unrecognized error format')
                     let out = []
                     break
                 endtry
             else
-                call syntastic#log#warn('checker javascript/flow: unknown error format')
+                call syntastic#log#warn('checker javascript/flow: unrecognized error format')
                 let out = []
                 break
             endif
         endfor
     else
-        call syntastic#log#warn('checker javascript/flow: unknown error format')
+        call syntastic#log#warn('checker javascript/flow: unrecognized 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#iconv(errors) abort " {{{2
     return
-        \ (has('iconv') || has('iconv/dyn')) && &encoding !=# '' && &encoding !=# 'utf-8' ?
+        \ has('iconv') && &encoding !=# '' && &encoding !=# 'utf-8' ?
         \       map(a:errors, 'iconv(v:val, "utf-8", &encoding)') :
         \       a:errors
 endfunction " }}}2
 
+function! syntastic#preprocess#jscs(errors) abort " {{{2
+    let errs = join(a:errors, '')
+    if errs ==# ''
+        return []
+    endif
+
+    let json = s:_decode_JSON(errs)
+
+    let out = []
+    if type(json) == type({})
+        for fname in keys(json)
+            if type(json[fname]) == type([])
+                for e in json[fname]
+                    try
+                        let e['message'] = substitute(e['message'], "\n", ' ', 'g')
+                        cal add(out, fname . ':' . e['line'] . ':' . e['column'] . ':' . e['message'])
+                    catch /\m^Vim\%((\a\+)\)\=:E716/
+                        call syntastic#log#warn('checker javascript/jscs: unrecognized error item ' . string(e))
+                        let out = []
+                    endtry
+                endfor
+            else
+                call syntastic#log#warn('checker javascript/jscs: unrecognized error format')
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/jscs: unrecognized error format')
+    endif
+    return out
+endfunction " }}}2
+
 function! syntastic#preprocess#killEmpty(errors) abort " {{{2
     return filter(copy(a:errors), 'v:val !=# ""')
 endfunction " }}}2
@@ -152,22 +204,8 @@ function! syntastic#preprocess#perl(errors) abort " {{{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) 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 errs = s:_decode_JSON(join(a:errors, ''))
 
     let out = []
     if type(errs) == type({}) && has_key(errs, 'messages')
@@ -189,26 +227,23 @@ function! syntastic#preprocess#prospector(errors) abort " {{{2
 
                         call add(out, msg)
                     catch /\m^Vim\%((\a\+)\)\=:E716/
-                        call syntastic#log#warn('checker python/prospector: unknown error format')
+                        call syntastic#log#warn('checker python/prospector: unrecognized error format')
                         let out = []
                         break
                     endtry
                 else
-                    call syntastic#log#warn('checker python/prospector: unknown error format')
+                    call syntastic#log#warn('checker python/prospector: unrecognized error format')
                     let out = []
                     break
                 endif
             endfor
         else
-            call syntastic#log#warn('checker python/prospector: unknown error format')
+            call syntastic#log#warn('checker python/prospector: unrecognized error format')
         endif
     endif
 
     return out
 endfunction " }}}2
-" @vimlint(EVL102, 0, l:true)
-" @vimlint(EVL102, 0, l:false)
-" @vimlint(EVL102, 0, l:null)
 
 function! syntastic#preprocess#rparse(errors) abort " {{{2
     let errlist = copy(a:errors)
@@ -249,6 +284,43 @@ function! syntastic#preprocess#rparse(errors) abort " {{{2
     return out
 endfunction " }}}2
 
+function! syntastic#preprocess#stylelint(errors) abort " {{{2
+    let out = []
+
+    " CssSyntaxError: /path/to/file.css:2:11: Missed semicolon
+    let parts = matchlist(a:errors[0], '\v^CssSyntaxError: (.{-1,}):(\d+):(\d+): (.+)')
+    if len(parts) > 4
+        call add(out, 'E:' . join(parts[1:4], ':'))
+    else
+        let errs = s:_decode_JSON(join(a:errors, ''))
+
+        let out = []
+        if type(errs) == type([]) && len(errs) == 1 && type(errs[0]) == type({}) &&
+            \ has_key(errs[0], 'source') && has_key(errs[0], 'warnings') && type(errs[0]['warnings']) == type([])
+
+            for e in errs[0]['warnings']
+                try
+                    let severity = type(e['severity']) == type(0) ? ['W', 'E'][e['severity']-1] : e['severity'][0]
+                    let msg =
+                        \ severity . ':' .
+                        \ errs[0]['source'] . ':' .
+                        \ e['line'] . ':' .
+                        \ e['column'] . ':' .
+                        \ e['text']
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker css/stylelint: unrecognized error item ' . string(e))
+                    let out = []
+                    break
+                endtry
+            endfor
+        else
+            call syntastic#log#warn('checker css/stylelint: unrecognized error format')
+        endif
+    endif
+    return out
+endfunction " }}}2
+
 function! syntastic#preprocess#tslint(errors) abort " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
 endfunction " }}}2
@@ -268,22 +340,8 @@ function! syntastic#preprocess#validator(errors) abort " {{{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 errs = s:_decode_JSON(join(a:errors, ''))
 
     let out = []
     if type(errs) == type([])
@@ -300,22 +358,166 @@ function! syntastic#preprocess#vint(errors) abort " {{{2
 
                     call add(out, msg)
                 catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker vim/vint: unknown error format')
+                    call syntastic#log#warn('checker vim/vint: unrecognized error format')
                     let out = []
                     break
                 endtry
             else
-                call syntastic#log#warn('checker vim/vint: unknown error format')
+                call syntastic#log#warn('checker vim/vint: unrecognized error format')
                 let out = []
                 break
             endif
         endfor
     else
-        call syntastic#log#warn('checker vim/vint: unknown error format')
+        call syntastic#log#warn('checker vim/vint: unrecognized error format')
     endif
 
     return out
 endfunction " }}}2
+
+" }}}1
+
+" Workarounds {{{1
+
+" In errorformat, \ or % following %f make it depend on isfname.  The default
+" setting of isfname is crafted to work with completion, rather than general
+" filename matching.  The result for syntastic is that filenames containing
+" spaces (or a few other special characters) can't be matched.
+"
+" Fixing isfname to address this problem would depend on the set of legal
+" characters for filenames on the filesystem the project's files lives on.
+" Inferring the kind of filesystem a file lives on, in advance to parsing the
+" file's name, is an interesting problem (think f.i. a file loaded from a VFAT
+" partition, mounted on Linux).  A problem syntastic is not prepared to solve.
+"
+" As a result, the functions below exist for the only reason to avoid using
+" things like %f\, in errorformat.
+"
+" References:
+" https://groups.google.com/forum/#!topic/vim_dev/pTKmZmouhio
+" https://vimhelp.appspot.com/quickfix.txt.html#error-file-format
+
+function! syntastic#preprocess#basex(errors) abort " {{{2
+    let out = []
+    let idx = 0
+    while idx < len(a:errors)
+        let parts = matchlist(a:errors[idx], '\v^\[\S+\] Stopped at (.+), (\d+)/(\d+):')
+        if len(parts) > 3
+            let err = parts[1] . ':' . parts[2] . ':' . parts[3] . ':'
+            let parts = matchlist(a:errors[idx+1], '\v^\[(.)\D+(\d+)\] (.+)')
+            if len(parts) > 3
+                let err .= (parts[1] ==? 'W' || parts[1] ==? 'E' ? parts[1] : 'E') . ':' . parts[2] . ':' . parts[3]
+                call add(out, err)
+                let idx +=1
+            endif
+        elseif a:errors[idx] =~# '\m^\['
+            " unparseable errors
+            call add(out, a:errors[idx])
+        endif
+        let idx +=1
+    endwhile
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#bro(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^%(fatal )?(error|warning) in (.{-1,}), line (\d+): (.+)')
+        if len(parts) > 4
+            let parts[1] = parts[1][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#coffeelint(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}),(\d+)%(,\d*)?,(error|warn),(.+)')
+        if len(parts) > 4
+            let parts[3] = parts[3][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#mypy(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        " new format
+        let parts = matchlist(e, '\v^(.{-1,}):(\d+): error: (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+            continue
+        endif
+
+        " old format
+        let parts = matchlist(e, '\v^(.{-1,}), line (\d+): (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#nix(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}), at (.{-1,}):(\d+):(\d+)$')
+        if len(parts) > 4
+            call add(out, join(parts[2:4], ':') . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^(.{-1,}) at (.{-1,}), line (\d+):')
+        if len(parts) > 3
+            call add(out, parts[2] . ':' . parts[3] . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^error: (.{-1,}), in (.{-1,})$')
+        if len(parts) > 2
+            call add(out, parts[2] . ':' . parts[1])
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! s:_decode_JSON(json) abort " {{{2
+    if a:json ==# ''
+        return []
+    endif
+
+    " The following is inspired by https://github.com/MarcWeber/vim-addon-manager and
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    " A hat tip to Marc Weber for this trick
+    if substitute(a:json, '\v\"%(\\.|[^"\\])*\"|true|false|null|[+-]?\d+%(\.\d+%([Ee][+-]?\d+)?)?', '', 'g') !~# "[^,:{}[\\] \t]"
+        " JSON artifacts
+        let true = 1
+        let false = 0
+        let null = ''
+
+        try
+            let object = eval(a:json)
+        catch
+            " malformed JSON
+            let object = ''
+        endtry
+    else
+        let object = ''
+    endif
+
+    return object
+endfunction " }}}2
 " @vimlint(EVL102, 0, l:true)
 " @vimlint(EVL102, 0, l:false)
 " @vimlint(EVL102, 0, l:null)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index ab949076..eec3c0df 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -107,16 +107,16 @@ function! syntastic#util#rmrf(what) abort " {{{2
     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
+" Search the first 5 lines of the file for a magic number and return a map
+" containing the args and the executable
 "
-"e.g.
+" e.g.
 "
-"#!/usr/bin/perl -f -bar
+" #!/usr/bin/perl -f -bar
 "
-"returns
+" returns
 "
-"{'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
+" {'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
 function! syntastic#util#parseShebang() abort " {{{2
     for lnum in range(1, 5)
         let line = getline(lnum)
@@ -183,7 +183,7 @@ function! syntastic#util#screenWidth(str, tabstop) abort " {{{2
     return width
 endfunction " }}}2
 
-"print as much of a:msg as possible without "Press Enter" prompt appearing
+" Print as much of a:msg as possible without "Press Enter" prompt appearing
 function! syntastic#util#wideMsg(msg) abort " {{{2
     let old_ruler = &ruler
     let old_showcmd = &showcmd
@@ -226,7 +226,7 @@ function! syntastic#util#bufIsActive(buffer) abort " {{{2
     return 0
 endfunction " }}}2
 
-" start in directory a:where and walk up the parent folders until it finds a
+" Start in directory a:where and walk up the parent folders until it finds a
 " file named a:what; return path to that file
 function! syntastic#util#findFileInParent(what, where) abort " {{{2
     let old_suffixesadd = &suffixesadd
@@ -236,7 +236,7 @@ function! syntastic#util#findFileInParent(what, where) abort " {{{2
     return file
 endfunction " }}}2
 
-" start in directory a:where and walk up the parent folders until it finds a
+" Start in directory a:where and walk up the parent folders until it finds a
 " file matching a:what; return path to that file
 function! syntastic#util#findGlobInParent(what, where) abort " {{{2
     let here = fnamemodify(a:where, ':p')
@@ -303,7 +303,7 @@ function! syntastic#util#argsescape(opt) abort " {{{2
     return []
 endfunction " }}}2
 
-" decode XML entities
+" Decode XML entities
 function! syntastic#util#decodeXMLEntities(string) abort " {{{2
     let str = a:string
     let str = substitute(str, '\m&lt;', '<', 'g')
@@ -339,6 +339,87 @@ function! syntastic#util#stamp() abort " {{{2
     return split( split(reltimestr(reltime(g:_SYNTASTIC_START)))[0], '\.' )
 endfunction " }}}2
 
+let s:_wid_base = 'syntastic_' . getpid() . '_' . reltimestr(g:_SYNTASTIC_START) . '_'
+let s:_wid_pool = 0
+
+" Add unique IDs to windows
+function! syntastic#util#setWids() abort " {{{2
+    for tab in range(1, tabpagenr('$'))
+        for win in range(1, tabpagewinnr(tab, '$'))
+            if gettabwinvar(tab, win, 'syntastic_wid') ==# ''
+                call settabwinvar(tab, win, 'syntastic_wid', s:_wid_base . s:_wid_pool)
+                let s:_wid_pool += 1
+            endif
+        endfor
+    endfor
+endfunction " }}}2
+
+let s:_str2float = function(exists('*str2float') ? 'str2float' : 'str2nr')
+lockvar s:_str2float
+
+function! syntastic#util#str2float(val) abort " {{{2
+    return s:_str2float(a:val)
+endfunction " }}}2
+
+function! syntastic#util#float2str(val) abort " {{{2
+    return s:_float2str(a:val)
+endfunction " }}}2
+
+" Crude printf()-like width formatter.  Handles wide characters.
+function! syntastic#util#wformat(format, str) abort " {{{2
+    if a:format ==# ''
+        return a:str
+    endif
+
+ echomsg string(a:format) . ', ' . string(a:str)
+    let specs = matchlist(a:format, '\v^(-?)(0?)(%([1-9]\d*))?%(\.(\d+))?$')
+    if len(specs) < 5
+        return a:str
+    endif
+
+    let flushleft = specs[1] ==# '-'
+    let lpad = specs[2] ==# '0' ? '0' : ' '
+    let minlen = str2nr(specs[3])
+    let maxlen = str2nr(specs[4])
+    let out = substitute(a:str, "\t", ' ', 'g')
+
+    if maxlen && s:_width(out) > maxlen
+        let chars = filter(split(out, '\zs\ze', 1), 'v:val !=# ""')
+        let out = ''
+
+        if flushleft
+            for c in chars
+                if s:_width(out . c) < maxlen
+                    let out .= c
+                else
+                    let out .= &encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '>'
+                    break
+                endif
+            endfor
+        else
+            call reverse(chars)
+            for c in chars
+                if s:_width(c . out) < maxlen
+                    let out = c . out
+                else
+                    let out = (&encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '<') . out
+                    break
+                endif
+            endfor
+        endif
+    endif
+
+    if minlen && s:_width(out) < minlen
+        if flushleft
+            let out .= repeat(' ', minlen - s:_width(out))
+        else
+            let out = repeat(lpad, minlen - s:_width(out)) . out
+        endif
+    endif
+
+    return out
+endfunction " }}}2
+
 " }}}1
 
 " Private functions {{{1
@@ -416,6 +497,17 @@ function! s:_rmrf(what) abort " {{{2
     endif
 endfunction " }}}2
 
+function! s:_float2str_smart(val) abort " {{{2
+    return printf('%.1f', a:val)
+endfunction " }}}2
+
+function! s:_float2str_dumb(val) abort " {{{2
+    return a:val
+endfunction " }}}2
+
+let s:_float2str = function(has('float') ? 's:_float2str_smart' : 's:_float2str_dumb')
+lockvar s:_float2str
+
 " }}}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 e118d4cb..85871350 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -54,7 +54,7 @@ CONTENTS                                                  *syntastic-contents*
         7.10.vim-go................................|syntastic-vim-go|
         7.11.vim-virtualenv........................|syntastic-vim-virtualenv|
         7.12.YouCompleteMe.........................|syntastic-ycm|
-        7.13.The zsh shell and rvm.................|syntastic-zsh|
+        7.13.The zsh shell and MacVim..............|syntastic-zsh|
     8.About........................................|syntastic-about|
     9.License......................................|syntastic-license|
 
@@ -86,7 +86,7 @@ checker integrations, see the guide on the GitHub wiki:
 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
+|filetype|. This list is kept reasonably short to prevent slowing down Vim or
 trying to use conflicting checkers.
 
 You can see the list of checkers available for the current filetype with the
@@ -110,10 +110,10 @@ these commands, or perhaps install a plugin such as Tim Pope's 'unimpaired'
 ------------------------------------------------------------------------------
 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: >
+Syntastic has numerous options that can be configured, and the defaults are
+not particularly well suitable for new users. It is recommended that you start
+by adding the following lines to your vimrc, and return to them later as
+needed: >
     set statusline+=%#warningmsg#
     set statusline+=%{SyntasticStatuslineFlag()}
     set statusline+=%*
@@ -161,13 +161,13 @@ 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.
+Syntastic uses the |:sign| commands (provided that the |+signs| feature is
+compiled in) to mark lines with errors and warnings in the sign column. To
+enable this feature, use the |'syntastic_enable_signs'| option.
 
-Signs are colored using the Error and Todo syntax highlight groups by default.
-If you wish to customize the colors for the signs, you can use the following
-groups:
+Signs are colored using the Error and Todo syntax highlight groups by default
+(see |group-name|). If you wish to customize the colors for the signs, you
+can use the following groups:
     SyntasticErrorSign - For syntax errors, links to 'error' by default
     SyntasticWarningSign - For syntax warnings, links to 'todo' by default
     SyntasticStyleErrorSign - For style errors, links to 'SyntasticErrorSign'
@@ -194,17 +194,13 @@ 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. 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
-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.
+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*
@@ -251,7 +247,8 @@ 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'|.
+See also: |'syntastic_<filetype>_<checker>_quiet_messages'| and
+|'b:syntastic_skip_checks'|.
 
 ==============================================================================
 3. Commands                                               *syntastic-commands*
@@ -273,15 +270,15 @@ for more info.
 
 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
+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.
+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.
+the order specified.  The set by |'syntastic_aggregate_errors'| still apply.
 
 Example: >
     :SyntasticCheck flake8 pylint
@@ -301,24 +298,23 @@ Resets the list of errors and turns off all error notifiers.
 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
+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 >
+If this variable is enabled, syntastic in active mode will run syntax checks
+when buffers are first loaded, as well as on saving: >
     let g:syntastic_check_on_open = 1
 <
                                                      *'syntastic_check_on_wq'*
 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. >
+In active mode syntax checks are normally run whenever buffers are written to
+disk, even when the writes happen just before quitting Vim.  If you want to
+skip checks when you issue |:wq|, |:x|, and |:ZZ|, set this variable to 0: >
     let g:syntastic_check_on_wq = 0
 <
                                                 *'syntastic_aggregate_errors'*
@@ -332,36 +328,37 @@ time a checker finds any errors. >
                                                      *'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. >
+(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_sort_aggregated_errors'*
 Default: 1
 By default, when results from multiple checkers are aggregated in a single
-error list (that is either when |syntastic_aggregate_errors| is enabled, or
-when checking a file with a composite filetype), 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. >
+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'*
 Default: 1
 If enabled, syntastic will echo current error to the command window. If
-multiple errors are found on the same line, |syntastic_cursor_columns| is used
-to decide which one is shown. >
+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.
+|'syntastic_echo_current_error'| is set and multiple errors are found on the
+same line. When the option is enabled, the first error corresponding to the
+current column is shown. Otherwise, the first error on the current line is
+echoed, regardless of the cursor position on the current line.
 
 When dealing with very large lists of errors, disabling this option can speed
 up navigation significantly: >
@@ -402,10 +399,17 @@ errors (where possible). Highlighting can be turned off with the following >
 <
                                         *'syntastic_always_populate_loc_list'*
 Default: 0
-Enable this option to tell syntastic to always stick any detected errors into
-the |location-list|: >
+By default syntastic doesn't fill the |location-list| with the errors found
+by the checkers, in order to reduce clashes with other plugins. Enable this
+option to tell syntastic to always stick any detected errors into the
+|location-list|: >
     let g:syntastic_always_populate_loc_list = 1
 <
+Please note that if |'syntastic_auto_jump'| is set to a non-zero value the
+location list is overwritten with Syntastic's own list when taking a jump,
+regardless of the value of |'syntastic_always_populate_loc_list'|.  The
+location list is also overwritten when running the |:Errors| command.
+
                                                        *'syntastic_auto_jump'*
 Default: 0
 Enable this option if you want the cursor to jump to the first detected issue
@@ -426,12 +430,17 @@ When set to 3 the cursor will jump to the first error detected, if any. If
 all issues detected are warnings, the cursor won't jump. >
     let g:syntastic_auto_jump = 3
 <
+Please note that in either situation taking the jump also has the side effect
+of the location list being overwritten with Syntastic's own location list,
+regardless of the value of |'syntastic_always_populate_loc_list'|.
+
                                                    *'syntastic_auto_loc_list'*
 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. >
+When set to 0 the error window will be neither opened nor closed
+automatically. >
     let g:syntastic_auto_loc_list = 0
 <
 When set to 1 the error window will be automatically opened when errors are
@@ -441,6 +450,10 @@ detected, and closed when none are detected. >
 When set to 2 the error window will be automatically closed when no errors are
 detected, but not opened automatically. >
     let g:syntastic_auto_loc_list = 2
+<
+When set to 3 the error window will be automatically opened when errors are
+detected, but not closed automatically. >
+    let g:syntastic_auto_loc_list = 3
 <
                                                  *'syntastic_loc_list_height'*
 Default: 10
@@ -452,8 +465,8 @@ opens. >
 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: >
+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'*
@@ -528,10 +541,10 @@ 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
+    "regex" - is matched against the messages' text as a case-insensitive
               |regular-expression|
     "file"  - is matched against the filenames the messages refer to, as a
-              case sensitive |regular-expression|.
+              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).
@@ -565,12 +578,25 @@ ones produced by "pylint": >
 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
+    %e  - number of errors
+    %w  - number of warnings
+    %t  - total number of warnings and errors
+    %ne - filename of file containing first error
+    %nw - filename of file containing first warning
+    %N  - filename of file containing first warning or error
+    %pe - filename with path of file containing first error
+    %pw - filename with path of file containing first warning
+    %P  - filename with path of file containing first warning or error
     %fe - line number of first error
     %fw - line number of first warning
-    %F - line number of first warning or error
+    %F  - line number of first warning or error
+
+These flags accept width and alignment controls similar to the ones used by
+|'statusline'| flags:
+    %-0{minwid}.{maxwid}{flag}
+
+All fields except {flag} are optional. A single percent sign can be given as
+"%%".
 
 Several additional flags are available to hide text under certain conditions:
     %E{...} - hide the text in the brackets unless there are errors
@@ -612,7 +638,6 @@ 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
@@ -624,6 +649,13 @@ operations.  It must take care to initialize all environment variables needed
 by the checkers you're using.  Example: >
     let g:syntastic_shell = "/bin/sh"
 <
+                                             *'syntastic_nested_autocommands'*
+Default: 0
+Controls whether syntastic's autocommands |BufReadPost| and |BufWritePost|
+are called from other |BufReadPost| and |BufWritePost| autocommands (see
+|autocmd-nested|).  This is known to trigger interoperability problems with
+other plugins, so only enable it if you actually need that functionality.
+
                                                            *'syntastic_debug'*
 Default: 0
 Set this to the sum of one or more of the following flags to enable
@@ -780,7 +812,7 @@ 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).
+ignored if |'syntastic_sort_aggregated_errors'| is set (which is the default).
 
 ==============================================================================
 6. Notes                                                     *syntastic-notes*
@@ -792,7 +824,7 @@ 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.: >
+composite filetypes to simple ones using |'syntastic_filetype_map'|, e.g.: >
     let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
 <
 ------------------------------------------------------------------------------
@@ -809,7 +841,7 @@ checkers, without any translation or conversion.
 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
+shell.  It should be turned off if your 'shell' (or |'syntastic_shell'|) is
 "cmd.exe", and on for shells that expect an UNIX-like syntax, such as Cygwin's
 "sh".  Most checkers will stop working if 'shellslash' is set to the wrong
 value.
@@ -832,7 +864,7 @@ quickfix windows.
 
 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,
+reason, you should point |'syntastic_shell'| to a Bourne-compatible shell,
 such as "zsh", "bash", "ksh", or even the original Bourne "sh": >
     let g:syntastic_shell = "/bin/sh"
 <
@@ -854,7 +886,7 @@ details.
 
 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|
+can't be used together with syntastic. You can however set |'syntastic_shell'|
 to a more traditional shell, such as "zsh", "bash", "ksh", or even the
 original Bourne "sh": >
     let g:syntastic_shell = "/bin/sh"
@@ -915,9 +947,9 @@ 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
+for python in syntastic (see |'syntastic_mode_map'|), or disable lint checks in
+"python-mode", by setting |pymode_lint_on_write| to 0. E.g.: >
+    let g:pymode_lint_on_write = 0
 <
 ------------------------------------------------------------------------------
 7.9. vim-auto-save                                   *syntastic-vim-auto-save*
@@ -929,14 +961,12 @@ mode only work with "vim-auto-save" version 0.1.7 or later.
 ------------------------------------------------------------------------------
 7.10. vim-go                                                *syntastic-vim-go*
 
-The "vim-go" Vim plugin (https://github.com/fatih/vim-go) uses |quickfix|
-lists, and thus doesn't conflict with syntastic (which uses |location-list|
-lists).  However, both "vim-go" and syntastic run syntax checks by default
-when you save buffers to disk, and this can have confusing results.  To
-avoid both plugins opening error windows, you can either set passive
-mode for go in syntastic (see |syntastic_mode_map|), or prevent "vim-go"
-from showing a quickfix window when |g:go_fmt_command| fails, by setting
-|g:go_fmt_fail_silently| to 1.  E.g.: >
+Syntastic can be used along with the "vim-go" Vim plugin (see
+https://github.com/fatih/vim-go).  However, both "vim-go" and syntastic run
+syntax checks by default when you save buffers to disk.  To avoid conflicts,
+you have to either set passive mode in syntastic for the go filetype (see
+|syntastic_mode_map|), or prevent "vim-go" from showing a quickfix window when
+|g:go_fmt_command| fails, by setting |g:go_fmt_fail_silently| to 1.  E.g.: >
     let g:go_fmt_fail_silently = 1
 <
 ------------------------------------------------------------------------------
@@ -955,20 +985,19 @@ 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.: >
+have to set |g:ycm_show_diagnostics_ui| to 0. E.g.: >
     let g:ycm_show_diagnostics_ui = 0
 <
 ------------------------------------------------------------------------------
-7.13 The zsh shell and rvm                                     *syntastic-zsh*
+7.13 The zsh shell and MacVim                                  *syntastic-zsh*
 
 If you're running MacVim together with the "zsh" shell (http://www.zsh.org/)
-and "rvm" (https://rvm.io/), you need to be aware that MacVim does not source
-the .zshrc file, but will source a .zshenv file.  Consequently you have to
-either source the "rvm" scripts from within .zshenv, or just change your shell
-to something else: >
-    set shell=/bin/sh
-<
-Of course, you'll have to make sure "rvm" still works in the new shell.
+you need to be aware that MacVim does not source your .zshrc file, but will
+source a .zshenv file.  Consequently you have to move any setup steps relevant
+to the checkers you're using from .zshrc to .zshenv, otherwise your checkers
+will misbehave when run by syntastic.  This is particularly important for
+programs such as "rvm" (https://rvm.io/) or "rbenv" (http://rbenv.org/), that
+rely on setting environment variables.
 
 ==============================================================================
 8. About                                                     *syntastic-about*
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index acd27d89..545ca7d4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -9,7 +9,7 @@
 "
 "============================================================================
 
-if exists('g:loaded_syntastic_plugin')
+if exists('g:loaded_syntastic_plugin') || &compatible
     finish
 endif
 let g:loaded_syntastic_plugin = 1
@@ -19,11 +19,16 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.6.0-122'
+let g:_SYNTASTIC_VERSION = '3.7.0-69'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
 
+if v:version < 700 || (v:version == 700 && !has('patch175'))
+    call syntastic#log#error('need Vim version 7.0.175 or later')
+    finish
+endif
+
 for s:feature in [
             \ 'autocmd',
             \ 'eval',
@@ -87,6 +92,7 @@ let g:_SYNTASTIC_DEFAULTS = {
         \ 'ignore_extensions':        '\c\v^([gx]?z|lzma|bz2)$',
         \ 'ignore_files':             [],
         \ 'loc_list_height':          10,
+        \ 'nested_autocommands':      0,
         \ 'quiet_messages':           {},
         \ 'reuse_loc_lists':          0,
         \ 'shell':                    &shell,
@@ -130,7 +136,7 @@ let s:_DEBUG_DUMP_OPTIONS = [
         \ 'shelltemp',
         \ 'shellxquote'
     \ ]
-if v:version > 703 || (v:version == 703 && has('patch446'))
+if exists('+shellxescape')
     call add(s:_DEBUG_DUMP_OPTIONS, 'shellxescape')
 endif
 lockvar! s:_DEBUG_DUMP_OPTIONS
@@ -157,6 +163,8 @@ let s:registry = g:SyntasticRegistry.Instance()
 let s:notifiers = g:SyntasticNotifiers.Instance()
 let s:modemap = g:SyntasticModeMap.Instance()
 
+let s:_quit_pre = []
+
 " Commands {{{1
 
 " @vimlint(EVL103, 1, a:cursorPos)
@@ -184,12 +192,15 @@ endfunction " }}}2
 " @vimlint(EVL103, 0, a:cmdLine)
 " @vimlint(EVL103, 0, a:argLead)
 
-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()
+command! -bar -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
+command! -bar -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
+command! -bar Errors              call SyntasticErrors()
+command! -bar SyntasticReset      call SyntasticReset()
+command! -bar SyntasticToggleMode call SyntasticToggleMode()
+command! -bar SyntasticSetLoclist call SyntasticSetLoclist()
+
+command! SyntasticJavacEditClasspath runtime! syntax_checkers/java/*.vim | SyntasticJavacEditClasspath
+command! SyntasticJavacEditConfig    runtime! syntax_checkers/java/*.vim | SyntasticJavacEditConfig
 
 " }}}1
 
@@ -231,15 +242,26 @@ endfunction " }}}2
 " Autocommands {{{1
 
 augroup syntastic
-    autocmd BufReadPost  * call s:BufReadPostHook()
-    autocmd BufWritePost * call s:BufWritePostHook()
-    autocmd BufEnter     * call s:BufEnterHook()
+    autocmd!
+    autocmd BufEnter * call s:BufEnterHook()
 augroup END
 
-if v:version > 703 || (v:version == 703 && has('patch544'))
+if g:syntastic_nested_autocommands
+    augroup syntastic
+        autocmd BufReadPost  * nested call s:BufReadPostHook()
+        autocmd BufWritePost * nested call s:BufWritePostHook()
+    augroup END
+else
+    augroup syntastic
+        autocmd BufReadPost  * call s:BufReadPostHook()
+        autocmd BufWritePost * call s:BufWritePostHook()
+    augroup END
+endif
+
+if exists('##QuitPre')
     " QuitPre was added in Vim 7.3.544
     augroup syntastic
-        autocmd QuitPre * call s:QuitPreHook()
+        autocmd QuitPre * call s:QuitPreHook(expand('<amatch>', 1))
     augroup END
 endif
 
@@ -276,10 +298,15 @@ function! s:BufEnterHook() abort " {{{2
     endif
 endfunction " }}}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')
+function! s:QuitPreHook(fname) abort " {{{2
+    let buf = bufnr(fnameescape(a:fname))
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS, 'autocmd: QuitPre, buffer ' . buf . ' = ' . string(a:fname))
+
+    if !syntastic#util#var('check_on_wq')
+        call syntastic#util#setWids()
+        call add(s:_quit_pre, buf . '_' . getbufvar(buf, 'changetick') . '_' . w:syntastic_wid)
+    endif
+
     if get(w:, 'syntastic_loclist_set', 0)
         call SyntasticLoclistHide()
     endif
@@ -296,17 +323,23 @@ function! s:UpdateErrors(auto_invoked, checker_names) abort " {{{2
     call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
         \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+
+    call s:modemap.synch()
+
     if s:_skip_file()
         return
     endif
 
-    call s:modemap.synch()
     let run_checks = !a:auto_invoked || s:modemap.doAutoChecking()
     if run_checks
         call s:CacheErrors(a:checker_names)
         unlockvar! b:syntastic_changedtick
         let b:syntastic_changedtick = b:changedtick
         lockvar! b:syntastic_changedtick
+    else
+        if a:auto_invoked
+            return
+        endif
     endif
 
     let loclist = g:SyntasticLoclist.current()
@@ -477,6 +510,7 @@ function! SyntasticMake(options) abort " {{{2
 
     if has_key(a:options, 'errorformat')
         let &errorformat = a:options['errorformat']
+        set errorformat<
     endif
 
     if has_key(a:options, 'cwd')
@@ -610,11 +644,26 @@ function! s:_ignore_file(filename) abort " {{{2
     return 0
 endfunction " }}}2
 
+function! s:_is_quitting(buf) abort " {{{2
+    let quitting = 0
+    if exists('w:syntastic_wid')
+        let key = a:buf . '_' . getbufvar(a:buf, 'changetick') . '_' . w:syntastic_wid
+        let idx = index(s:_quit_pre, key)
+        if idx >= 0
+            call remove(s:_quit_pre, idx)
+            let quitting = 1
+        endif
+    endif
+
+    return quitting
+endfunction " }}}2
+
 " Skip running in special buffers
 function! s:_skip_file() abort " {{{2
     let fname = expand('%', 1)
-    let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype !=# '') ||
-        \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
+    let skip = s:_is_quitting(bufnr('%')) || get(b:, 'syntastic_skip_checks', 0) ||
+        \ (&buftype !=# '') || !filereadable(fname) || getwinvar(0, '&diff') ||
+        \ getwinvar(0, '&previewwindow') || s:_ignore_file(fname) ||
         \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '_skip_file: skipping checks')
@@ -628,6 +677,9 @@ function! s:_explain_skip(filetypes) abort " {{{2
         let why = []
         let fname = expand('%', 1)
 
+        if s:_is_quitting(bufnr('%'))
+            call add(why, 'quitting buffer')
+        endif
         if get(b:, 'syntastic_skip_checks', 0)
             call add(why, 'b:syntastic_skip_checks set')
         endif
@@ -640,6 +692,9 @@ function! s:_explain_skip(filetypes) abort " {{{2
         if getwinvar(0, '&diff')
             call add(why, 'diff mode')
         endif
+        if getwinvar(0, '&previewwindow')
+            call add(why, 'preview window')
+        endif
         if s:_ignore_file(fname)
             call add(why, 'filename matching g:syntastic_ignore_files')
         endif
diff --git a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
index da99dbb9..153b0bc9 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/autoloclist.vim
@@ -19,13 +19,13 @@ endfunction " }}}2
 
 function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) abort " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: toggle')
+    let auto_loc_list = syntastic#util#var('auto_loc_list')
     if !a:loclist.isEmpty()
-        if syntastic#util#var('auto_loc_list') == 1
+        if auto_loc_list == 1 || auto_loc_list == 3
             call a:loclist.show()
         endif
     else
-        if syntastic#util#var('auto_loc_list') > 0
-
+        if auto_loc_list == 1 || auto_loc_list == 2
             "TODO: this will close the loc list window if one was opened by
             "something other than syntastic
             lclose
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 3177ad05..6569da62 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -7,26 +7,36 @@ let g:SyntasticChecker = {}
 
 " Public methods {{{1
 
-function! g:SyntasticChecker.New(args) abort " {{{2
+function! g:SyntasticChecker.New(args, ...) abort " {{{2
     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'], '/')
+    if a:0
+        " redirected checker
+        let newObj._exec = get(a:args, 'exec', a:1['_exec'])
+
+        let filetype = a:1['_filetype']
+        let name = a:1['_name']
         let prefix = 'SyntaxCheckers_' . filetype . '_' . name . '_'
 
         if exists('g:syntastic_' . filetype . '_' . name . '_sort') && !exists('g:syntastic_' . newObj._filetype . '_' . newObj._name . '_sort')
             let g:syntastic_{newObj._filetype}_{newObj._name}_sort = g:syntastic_{filetype}_{name}_sort
         endif
-    else
-        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
-    endif
 
-    if has_key(a:args, 'enable')
-        let newObj._enable = a:args['enable']
+        if has_key(a:args, 'enable')
+            let newObj._enable = a:args['enable']
+        elseif has_key(a:1, '_enable')
+            let newObj._enable = a:1['_enable']
+        endif
+    else
+        let newObj._exec = get(a:args, 'exec', newObj._name)
+        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
+
+        if has_key(a:args, 'enable')
+            let newObj._enable = a:args['enable']
+        endif
     endif
 
     let newObj._locListFunc = function(prefix . 'GetLocList')
@@ -85,6 +95,11 @@ function! g:SyntasticChecker.getLocListRaw() abort " {{{2
 
     if has_key(self, '_enable')
         let status = syntastic#util#var(self._enable, -1)
+        if type(status) != type(0)
+            call syntastic#log#error('checker ' . name . ': invalid value ' . strtrans(string(status)) .
+                \ ' for g:syntastic_' . self._enable . '; try 0 or 1 instead')
+            return []
+        endif
         if status < 0
             call syntastic#log#error('checker ' . name . ': checks disabled for security reasons; ' .
                 \ 'set g:syntastic_' . self._enable . ' to 1 to override')
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index 48f44ba2..790c37f9 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -110,19 +110,21 @@ function! g:SyntasticLoclist.getStatuslineFlag() abort " {{{2
             "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 flags = {
+                \ '%':  '%',
+                \ 't':  num_issues,
+                \ 'e':  num_errors,
+                \ 'w':  num_warnings,
+                \ 'N':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':t') : ''),
+                \ 'P':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':p:~:.') : ''),
+                \ 'F':  (num_issues ? self._rawLoclist[0]['lnum'] : ''),
+                \ 'ne': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':t') : ''),
+                \ 'pe': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':p:~:.') : ''),
+                \ 'fe': (num_errors ? errors[0]['lnum'] : ''),
+                \ 'nw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':t') : ''),
+                \ 'pw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':p:~:.') : ''),
+                \ 'fw': (num_warnings ? warnings[0]['lnum'] : '') }
+            let output = substitute(output, '\v\C\%(-?\d*%(\.\d+)?)([npf][ew]|[NPFtew%])', '\=syntastic#util#wformat(submatch(1), flags[submatch(2)])', 'g')
 
             let self._stl_flag = output
         else
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 310a290a..5ad0a192 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -8,7 +8,8 @@ let g:loaded_syntastic_registry = 1
 let s:_DEFAULT_CHECKERS = {
         \ 'actionscript':  ['mxmlc'],
         \ 'ada':           ['gcc'],
-        \ 'apiblueprint':  ['snowcrash'],
+        \ 'ansible':       ['ansible_lint'],
+        \ 'apiblueprint':  ['drafter'],
         \ 'applescript':   ['osacompile'],
         \ 'asciidoc':      ['asciidoc'],
         \ 'asm':           ['gcc'],
@@ -29,6 +30,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'd':             ['dmd'],
         \ 'dart':          ['dartanalyzer'],
         \ 'docbk':         ['xmllint'],
+        \ 'dockerfile':    ['dockerfile_lint'],
         \ 'dustjs':        ['swiffer'],
         \ 'elixir':        [],
         \ 'erlang':        ['escript'],
@@ -42,6 +44,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'haxe':          ['haxe'],
         \ 'hss':           ['hss'],
         \ 'html':          ['tidy'],
+        \ 'jade':          ['jade_lint'],
         \ 'java':          ['javac'],
         \ 'javascript':    ['jshint', 'jslint'],
         \ 'json':          ['jsonlint', 'jsonval'],
@@ -66,7 +69,9 @@ let s:_DEFAULT_CHECKERS = {
         \ 'pod':           ['podchecker'],
         \ 'puppet':        ['puppet', 'puppetlint'],
         \ 'python':        ['python', 'flake8', 'pylint'],
+        \ 'qml':           ['qmllint'],
         \ 'r':             [],
+        \ 'rmd':           [],
         \ 'racket':        ['racket'],
         \ 'rnc':           ['rnv'],
         \ 'rst':           ['rst2pseudoxml'],
@@ -78,6 +83,8 @@ let s:_DEFAULT_CHECKERS = {
         \ 'slim':          ['slimrb'],
         \ 'sml':           ['smlnj'],
         \ 'spec':          ['rpmlint'],
+        \ 'sql':           ['sqlint'],
+        \ 'stylus':        ['stylint'],
         \ 'tcl':           ['nagelfar'],
         \ 'tex':           ['lacheck', 'chktex'],
         \ 'texinfo':       ['makeinfo'],
@@ -91,6 +98,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'xhtml':         ['tidy'],
         \ 'xml':           ['xmllint'],
         \ 'xslt':          ['xmllint'],
+        \ 'xquery':        ['basex'],
         \ 'yacc':          ['bison'],
         \ 'yaml':          ['jsyaml'],
         \ 'z80':           ['z80syntaxchecker'],
@@ -151,8 +159,21 @@ function! g:SyntasticRegistry.Instance() abort " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.CreateAndRegisterChecker(args) abort " {{{2
-    let checker = g:SyntasticChecker.New(a:args)
     let registry = g:SyntasticRegistry.Instance()
+
+    if has_key(a:args, 'redirect')
+        let [ft, name] = split(a:args['redirect'], '/')
+        call registry._loadCheckersFor(ft)
+
+        let clone = get(registry._checkerMap[ft], name, {})
+        if empty(clone)
+            throw 'Syntastic: Checker ' . a:args['redirect'] . ' redirects to unregistered checker ' . ft . '/' . name
+        endif
+
+        let checker = g:SyntasticChecker.New(a:args, clone)
+    else
+        let checker = g:SyntasticChecker.New(a:args)
+    endif
     call registry._registerChecker(checker)
 endfunction " }}}2
 
@@ -187,7 +208,7 @@ function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) abort "
     return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
 endfunction " }}}2
 
-" Same as getCheckers(), but keep only the checkers tyhat are available and
+" Same as getCheckers(), but keep only the checkers that are available and
 " disabled.  This runs the corresponding IsAvailable() functions for all checkers.
 function! g:SyntasticRegistry.getCheckersDisabled(ftalias, hints_list) abort " {{{2
     return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isDisabled() && v:val.isAvailable()')
diff --git a/sources_non_forked/syntastic/syntax_checkers/ansible/ansible_lint.vim b/sources_non_forked/syntastic/syntax_checkers/ansible/ansible_lint.vim
new file mode 100644
index 00000000..b09e7eb3
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ansible/ansible_lint.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        ansible_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Erik Zaadi <erik.zaadi at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ansible_ansible_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_ansible_ansible_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ansible_ansible_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 0, 4])
+endfunction
+
+function! SyntaxCheckers_ansible_ansible_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
+
+    let errorformat = '%f:%l: [ANSIBLE%n] %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'type': 'E'},
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ansible',
+    \ 'name': 'ansible_lint',
+    \ 'exec': 'ansible-lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim b/sources_non_forked/syntastic/syntax_checkers/apiblueprint/drafter.vim
similarity index 82%
rename from sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim
rename to sources_non_forked/syntastic/syntax_checkers/apiblueprint/drafter.vim
index 90109c7f..e404a4f2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/apiblueprint/snowcrash.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/apiblueprint/drafter.vim
@@ -1,5 +1,5 @@
 "============================================================================
-"File:        snowcrash.vim
+"File:        drafter.vim
 "Description: Syntax checking plugin for syntastic.vim
 "Maintainer:  LCD 47 <lcd047 at gmail dot com>
 "License:     This program is free software. It comes without any warranty,
@@ -10,19 +10,19 @@
 "
 "============================================================================
 
-if exists('g:loaded_syntastic_apiblueprint_snowcrash_checker')
+if exists('g:loaded_syntastic_apiblueprint_drafter_checker')
     finish
 endif
-let g:loaded_syntastic_apiblueprint_snowcrash_checker = 1
+let g:loaded_syntastic_apiblueprint_drafter_checker = 1
 
-if !exists('g:syntastic_apiblueprint_snowcrash_sort')
-    let g:syntastic_apiblueprint_snowcrash_sort = 1
+if !exists('g:syntastic_apiblueprint_drafter_sort')
+    let g:syntastic_apiblueprint_drafter_sort = 1
 endif
 
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_apiblueprint_snowcrash_GetLocList() dict
+function! SyntaxCheckers_apiblueprint_drafter_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'post_args': '-u -l' })
 
     let errorformat =
@@ -34,7 +34,7 @@ function! SyntaxCheckers_apiblueprint_snowcrash_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 2] })
+        \ 'returns': [0, 2, 3, 4] })
 
     for e in loclist
         let matches = matchlist(e['text'], '\v^(.+); line (\d+), column (\d+) - line (\d+), column (\d+)$')
@@ -58,7 +58,7 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'apiblueprint',
-    \ 'name': 'snowcrash'})
+    \ 'name': 'drafter'})
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
index 7bf7eb6c..d352eeeb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
@@ -19,6 +19,10 @@ if !exists('g:syntastic_asm_compiler_options')
     let g:syntastic_asm_compiler_options = ''
 endif
 
+if !exists('g:syntastic_asm_generic')
+    let g:syntastic_asm_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -36,14 +40,13 @@ function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
         \     '%f:%l:%c: %trror: %m,' .
         \     '%f:%l:%c: %tarning: %m,' .
         \     '%f:%l: %m',
-        \ 'main_flags': '-x assembler -fsyntax-only -masm=' . s:GetDialect() })
+        \ 'main_flags': '-x assembler -fsyntax-only' . (g:syntastic_asm_generic ? '' : ' -masm=' . s:GetDialect()) })
 endfunction " }}}1
 
 " Utilities {{{1
 
 function! s:GetDialect() " {{{2
-    return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
-        \ expand('%:e', 1) ==? 'asm' ? 'intel' : 'att'
+    return syntastic#util#var('asm_dialect', expand('%:e', 1) ==? 'asm' ? 'intel' : 'att')
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
index 38dfbde8..cea441b6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -40,14 +40,12 @@ 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 =
-        \ 'fatal %trror in %f\, line %l: %m,' .
-        \ '%trror in %f\, line %l: %m,' .
-        \ '%tarning in %f\, line %l: %m'
+    let errorformat = '%t:%f:%l:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'bro' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
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 19e67f1a..63d0cdbe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -43,9 +43,12 @@ function! SyntaxCheckers_c_clang_check_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'env': env,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
 endfunction
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 d3876eae..3124b233 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -43,9 +43,12 @@ function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
         \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
         \ '%E%m'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'env': env,
         \ 'defaults': {'bufnr': bufnr('')},
         \ 'returns': [0, 1] })
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index e153ed3f..befdbc88 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -24,17 +24,14 @@ function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
     endif
     let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
 
-    let errorformat =
-        \ '%f\,%l\,%\d%#\,%trror\,%m,' .
-        \ '%f\,%l\,%trror\,%m,' .
-        \ '%f\,%l\,%\d%#\,%tarn\,%m,' .
-        \ '%f\,%l\,%tarn\,%m'
+    let errorformat = '%f:%l:%t:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'coffeelint' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
index 9d96a5ac..6385554d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
@@ -22,7 +22,7 @@ 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\-%.%#\:,'.
+        \ '%AFile "%f"\, line %l\, characters %c-%.%#\:,'.
         \ '%C%m'
 
     return SyntasticMake({
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 1a92d4b6..55784bba 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_clang_check_checker')
 endif
 let g:loaded_syntastic_cpp_clang_check_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_check',
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 b45cf753..f6cac96d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_clang_tidy_checker')
 endif
 let g:loaded_syntastic_cpp_clang_tidy_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'clang_tidy',
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
index c103d7de..4e0eb86b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_cppcheck_checker')
 endif
 let g:loaded_syntastic_cpp_cppcheck_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'cppcheck',
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
index 127c5f09..82177694 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_cpp_oclint_checker')
 endif
 let g:loaded_syntastic_cpp_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'oclint',
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 d8346845..1e69dd4c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_cpp_pc_lint_checker')
 endif
 let g:loaded_syntastic_cpp_pc_lint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
     \ 'name': 'pc_lint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/mixedindentlint.vim b/sources_non_forked/syntastic/syntax_checkers/css/mixedindentlint.vim
new file mode 100644
index 00000000..a0ce3baa
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/mixedindentlint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_css_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_mixedindentlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'mixedindentlint',
+    \ 'redirect': 'javascript/mixedindentlint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
index bdf2665e..a065f0e8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_css_phpcs_checker')
 endif
 let g:loaded_syntastic_css_phpcs_checker = 1
 
-runtime! syntax_checkers/php/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'css',
     \ 'name': 'phpcs',
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
index 92e84e04..ce6d5aea 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
@@ -16,8 +16,6 @@ if exists('g:loaded_syntastic_css_recess_checker')
 endif
 let g:loaded_syntastic_css_recess_checker = 1
 
-runtime! syntax_checkers/less/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'css',
     \ 'name': 'recess',
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/stylelint.vim b/sources_non_forked/syntastic/syntax_checkers/css/stylelint.vim
new file mode 100644
index 00000000..1d2f40f2
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/css/stylelint.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        stylelint.vim
+"Description: Syntax checking plugin for syntastic.vim using `stylelint`
+"             (https://github.com/stylelint/stylelint).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_css_stylelint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_stylelint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_css_stylelint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f json' })
+
+    let errorformat = '%t:%f:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'stylelint',
+        \ 'returns': [0, 1, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'stylelint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
+
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
index 01fa4162..30d66d25 100644
--- a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_docbk_xmllint_checker')
 endif
 let g:loaded_syntastic_docbk_xmllint_checker = 1
 
-runtime! syntax_checkers/xml/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'docbk',
     \ 'name': 'xmllint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim b/sources_non_forked/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim
new file mode 100644
index 00000000..3a5b7694
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        dockerfile_lint.vim
+"Description: Syntax checking plugin for syntastic.vim using dockerfile-lint
+"             (https://github.com/projectatomic/dockerfile-lint).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_dockerfile_dockerfile_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_dockerfile_dockerfile_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dockerfile_dockerfile_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-j',
+        \ 'fname_before': '-f' })
+
+    let errorformat = '%t:%n:%l:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'dockerfile_lint',
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['nr']
+            let e['subtype'] = 'Style'
+        endif
+        call remove(e, 'nr')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dockerfile',
+    \ 'name': 'dockerfile_lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
index 3656b658..f32f505b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/go.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
@@ -27,6 +27,10 @@ function! SyntaxCheckers_go_go_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_go_go_GetLocList() dict
+    if !exists('s:go_new')
+        let s:go_new = syntastic#util#versionIsAtLeast(self.getVersion(self.getExecEscaped() . ' version'), [1, 5])
+    endif
+
     " Check with gofmt first, since `go build` and `go test` might not report
     " syntax errors in the current file if another file with syntax error is
     " compiled first.
@@ -51,15 +55,15 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     " compiled by `go build`, therefore `go test` must be called for those.
     if match(expand('%', 1), '\m_test\.go$') == -1
         let cmd = 'build'
-        let opts = syntastic#util#var('go_go_build_args')
+        let opts = syntastic#util#var('go_go_build_args', s:go_new ? '-buildmode=archive' : '')
         let cleanup = 0
     else
         let cmd = 'test -c'
-        let opts = syntastic#util#var('go_go_test_args')
+        let opts = syntastic#util#var('go_go_test_args', s:go_new ? '-buildmode=archive' : '')
         let cleanup = 1
     endif
     let opt_str = (type(opts) != type('') || opts !=# '') ? join(syntastic#util#argsescape(opts)) : opts
-    let makeprg = self.getExec() . ' ' . cmd . ' ' . opt_str
+    let makeprg = self.getExecEscaped() . ' ' . cmd . ' ' . opt_str
 
     " The first pattern is for warnings from C compilers.
     let errorformat =
@@ -67,6 +71,8 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ '%E%f:%l:%c:%m,' .
         \ '%E%f:%l:%m,' .
         \ '%C%\s%\+%m,' .
+        \ '%+Ecan''t load package: %m,' .
+        \ '%+Einternal error: %m,' .
         \ '%-G#%.%#'
 
     " The go compiler needs to either be run with an import path as an
@@ -77,6 +83,7 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'cwd': expand('%:p:h', 1),
+        \ 'env': {'GOGC': 'off'},
         \ 'defaults': {'type': 'e'} })
 
     if cleanup
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gometalinter.vim b/sources_non_forked/syntastic/syntax_checkers/go/gometalinter.vim
new file mode 100644
index 00000000..780f49b4
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gometalinter.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        gometalinter.vim
+"Description: Check go syntax using 'gometalint'
+"Maintainer:  Joshua Rubin <joshua@rubixconsulting.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_go_gometalinter_checker')
+    finish
+endif
+let g:loaded_syntastic_go_gometalinter_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gometalinter_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-t',
+        \ 'fname': syntastic#util#shexpand('%:p:h') })
+
+    let errorformat =
+        \ '%f:%l:%c:%trror: %m,' .
+        \ '%f:%l:%c:%tarning: %m,' .
+        \ '%f:%l::%trror: %m,' .
+        \ '%f:%l::%tarning: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['text'] =~# '\v\(%(deadcode|gocyclo|golint|defercheck|varcheck|structcheck|errcheck|dupl)\)$'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gometalinter'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
index 58dcc990..37472eeb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
@@ -19,7 +19,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_gotype_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' .'
+    let makeprg = self.makeprgBuild({
+        \ 'args': (expand('%', 1) =~# '\m_test\.go$' ? '-a' : ''),
+        \ 'fname': '.' })
 
     let errorformat =
         \ '%f:%l:%c: %m,' .
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
index c5d5d7b2..5d26637e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
@@ -23,7 +23,7 @@ function! SyntaxCheckers_go_govet_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_go_govet_GetLocList() dict
-    let makeprg = self.getExec() . ' vet'
+    let makeprg = self.getExecEscaped() . ' vet'
 
     let errorformat =
         \ '%Evet: %.%\+: %f:%l:%c: %m,' .
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 04462831..1d3c946b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -51,7 +51,14 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
         let s:ghc_mod_new = -1
     endif
 
-    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new)
+    " ghc-mod 5.4.0 wants to run in the root directory of the project;
+    " syntastic can't cope with the resulting complications
+    "
+    " References:
+    " https://hackage.haskell.org/package/ghc-mod-5.4.0.0/changelog
+    let s:ghc_mod_bailout = syntastic#util#versionIsAtLeast(parsed_ver, [5, 4])
+
+    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new) && !s:ghc_mod_bailout
 endfunction
 
 function! SyntaxCheckers_haskell_ghc_mod_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
index f97d67f2..096e429f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
@@ -18,6 +18,7 @@ function! SyntaxCheckers_haskell_hlint_GetLocList() dict
         \ 'fname': syntastic#util#shexpand('%:p')})
 
     let errorformat =
+        \ '%E%f:%l:%v: Error while reading hint file\, %m,' .
         \ '%E%f:%l:%v: Error: %m,' .
         \ '%W%f:%l:%v: Warning: %m,' .
         \ '%C%m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/jade/jade_lint.vim b/sources_non_forked/syntastic/syntax_checkers/jade/jade_lint.vim
new file mode 100644
index 00000000..59da5b06
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/jade/jade_lint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        jade_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Ben Parnell <benjaminparnell.94@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_jade_jade_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_jade_jade_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_jade_jade_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-r inline' })
+
+    let errorformat = '%f:%l:%c %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'jade',
+    \ 'name': 'jade_lint',
+    \ 'exec': 'jade-lint' })
+
+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/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 2f533be0..f4eee5e8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -17,7 +17,7 @@ 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'
+    let g:syntastic_java_checkstyle_classpath = 'checkstyle-6.10.1-all.jar'
 endif
 
 if !exists('g:syntastic_java_checkstyle_conf_file')
@@ -32,30 +32,38 @@ function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
         return 0
     endif
 
-    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))
+    call self.log('filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
 
-    return filereadable(classpath) && filereadable(conf_file)
+    return filereadable(conf_file)
 endfunction
 
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
-    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
+    " classpath
+    if !exists('s:sep')
+        let s:sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':'
+    endif
+    let classpath = join(map( split(g:syntastic_java_checkstyle_classpath, s:sep, 1), 'expand(v:val, 1)' ), s:sep)
+    call self.log('classpath =', classpath)
 
+    " forced options
+    let opts = []
+    if classpath !=# ''
+        call extend(opts, ['-cp', classpath])
+    endif
+    call extend(opts, [
+        \ 'com.puppycrawl.tools.checkstyle.Main',
+        \ '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
+        \ '-f', 'xml' ])
+
+    " filename
+    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
     if has('win32unix')
         let fname = substitute(syntastic#util#system('cygpath -m ' . fname), '\m\%x00', '', 'g')
     endif
 
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': [
-        \       '-cp', expand(g:syntastic_java_checkstyle_classpath, 1),
-        \       'com.puppycrawl.tools.checkstyle.Main',
-        \       '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
-        \       '-f', 'xml'],
-        \ 'fname': fname })
+    let makeprg = self.makeprgBuild({ 'args_after': opts, '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 d9738c6e..948c2441 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -84,11 +84,12 @@ lockvar! s:_FILE_SHORTCUTS
 
 " }}}1
 
-command! SyntasticJavacEditClasspath call s:EditClasspath()
+" Commands {{{1
 
-if g:syntastic_java_javac_config_file_enabled
-    command! SyntasticJavacEditConfig call s:EditConfig()
-endif
+command! SyntasticJavacEditClasspath call s:EditClasspath()
+command! SyntasticJavacEditConfig    call s:EditConfig()
+
+" }}}1
 
 function! SyntaxCheckers_java_javac_IsAvailable() dict " {{{1
     let s:has_maven = executable(expand(g:syntastic_java_maven_executable, 1))
@@ -173,9 +174,8 @@ function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
     let errorformat =
         \ '%E%f:%l: error: %m,'.
         \ '%W%f:%l: warning: %m,'.
-        \ '%A%f:%l: %m,'.
-        \ '%+Z%p^,'.
-        \ '%+C%.%#,'.
+        \ '%E%f:%l: %m,'.
+        \ '%Z%p^,'.
         \ '%-G%.%#'
 
     if output_dir !=# ''
@@ -290,6 +290,10 @@ function! s:SaveConfig() " {{{2
 endfunction " }}}2
 
 function! s:EditConfig() " {{{2
+    if !g:syntastic_java_javac_config_file_enabled
+        return
+    endif
+
     let command = 'syntastic javac config'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
@@ -356,7 +360,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(syntastic#util#system(mvn_cmd . ' dependency:build-classpath'), "\n")
+            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath -DincludeScope=test'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0
 
@@ -373,16 +377,10 @@ function! s:GetMavenClasspath() " {{{2
             let mvn_properties = s:GetMavenProperties()
 
             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 output_dir = get(mvn_properties, 'project.build.outputDirectory', join(['target', 'classes'], sep))
             let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
 
-            let test_output_dir = join(['target', 'test-classes'], sep)
-            if has_key(mvn_properties, 'project.build.testOutputDirectory')
-                let test_output_dir = mvn_properties['project.build.testOutputDirectory']
-            endif
+            let test_output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join(['target', 'test-classes'], sep))
             let mvn_classpath = s:AddToClasspath(mvn_classpath, test_output_dir)
 
             let g:syntastic_java_javac_maven_pom_ftime[pom] = getftime(pom)
@@ -397,23 +395,16 @@ function! s:MavenOutputDirectory() " {{{2
     let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
     if s:has_maven && filereadable(pom)
         let mvn_properties = s:GetMavenProperties()
-        let output_dir = getcwd()
-        if has_key(mvn_properties, 'project.properties.build.dir')
-            let output_dir = mvn_properties['project.properties.build.dir']
-        endif
+        let output_dir = get(mvn_properties, 'project.properties.build.dir', getcwd())
 
         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
+        let src_main_dir = get(mvn_properties, 'project.build.sourceDirectory', join(['src', 'main', 'java'], sep))
+        let src_test_dir = get(mvn_properties, 'project.build.testsourceDirectory', join(['src', 'test', 'java'], sep))
+        if stridx(expand('%:p:h', 1), src_main_dir) >= 0
+            let output_dir = get(mvn_properties, 'project.build.outputDirectory', join ([output_dir, 'target', 'classes'], sep))
         endif
-        if stridx(expand('%:p:h', 1), 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
+        if stridx(expand('%:p:h', 1), src_test_dir) >= 0
+            let output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join([output_dir, 'target', 'test-classes'], sep))
         endif
 
         if has('win32unix')
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index aaba7c9f..437bc558 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -18,21 +18,31 @@ if !exists('g:syntastic_javascript_eslint_sort')
     let g:syntastic_javascript_eslint_sort = 1
 endif
 
+if !exists('g:syntastic_javascript_eslint_generic')
+    let g:syntastic_javascript_eslint_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
+    if g:syntastic_javascript_eslint_generic
+        call self.log('generic eslint, exec =', self.getExec())
+    endif
+
     if !executable(self.getExec())
         return 0
     endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
+    return g:syntastic_javascript_eslint_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_eslint_GetLocList() dict
-    call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
-        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+    if !g:syntastic_javascript_eslint_generic
+        call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
+            \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+    endif
 
-    let makeprg = self.makeprgBuild({ 'args_before': '-f compact' })
+    let makeprg = self.makeprgBuild({ 'args_before': (g:syntastic_javascript_eslint_generic ? '' : '-f compact') })
 
     let errorformat =
         \ '%E%f: line %l\, col %c\, Error - %m,' .
@@ -43,9 +53,17 @@ function! SyntaxCheckers_javascript_eslint_GetLocList() dict
         \ 'errorformat': errorformat,
         \ 'postprocess': ['guards'] })
 
-    for e in loclist
-        let e['col'] += 1
-    endfor
+    if !g:syntastic_javascript_eslint_generic
+        if !exists('s:eslint_new')
+            let s:eslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
+        endif
+
+        if !s:eslint_new
+            for e in loclist
+                let e['col'] += 1
+            endfor
+        endif
+    endif
 
     return loclist
 endfunction
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index bc1f5646..e91b166c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -21,16 +21,24 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_javascript_jscs_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter checkstyle' })
+function! SyntaxCheckers_javascript_jscs_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 1])
+endfunction
 
-    let errorformat = '%f:%t:%l:%c:%m'
+function! SyntaxCheckers_javascript_jscs_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter json' })
+
+    let errorformat = '%f:%l:%c:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'subtype': 'Style',
-        \ 'preprocess': 'checkstyle',
+        \ 'preprocess': 'jscs',
+        \ 'defaults': {'type': 'E'},
         \ 'returns': [0, 2] })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 480c62c7..608fa6ef 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -18,6 +18,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
     let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
     let parsed_ver = !v:shell_error && (version_output =~# '\m^JSXHint\>') ? syntastic#util#parseVersion(version_output) : []
     if len(parsed_ver)
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/mixedindentlint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/mixedindentlint.vim
new file mode 100644
index 00000000..29954094
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/mixedindentlint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_mixedindentlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_mixedindentlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = 'Line %l in "%f" %.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'defaults': { 'text': 'Indentation differs from rest of file' },
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'mixedindentlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
index 0469f653..e652bd0d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/standard.vim
@@ -14,14 +14,22 @@ if exists('g:loaded_syntastic_javascript_standard_checker')
 endif
 let g:loaded_syntastic_javascript_standard_checker = 1
 
+if !exists('g:syntastic_javascript_standard_generic')
+    let g:syntastic_javascript_standard_generic = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_standard_IsAvailable() dict
+    if g:syntastic_javascript_standard_generic
+        call self.log('generic standard, exec =', self.getExec())
+    endif
+
     if !executable(self.getExec())
         return 0
     endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
+    return g:syntastic_javascript_standard_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
 endfunction
 
 function! SyntaxCheckers_javascript_standard_GetLocList() dict
diff --git a/sources_non_forked/syntastic/syntax_checkers/nix/nix.vim b/sources_non_forked/syntastic/syntax_checkers/nix/nix.vim
index 5b8fd218..f3c449d8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nix/nix.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nix/nix.vim
@@ -23,14 +23,15 @@ function! SyntaxCheckers_nix_nix_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_after': '--parse-only' })
 
     let errorformat =
-        \ '%m\, at %f:%l:%c,' .
-        \ '%m at %f\, line %l:,' .
-        \ 'error: %m\, in %f'
+        \ '%f:%l:%c:%m,' .
+        \ '%f:%l:%m,' .
+        \ '%f:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'e'} })
+        \ 'defaults': {'type': 'e'},
+        \ 'preprocess': 'nix' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
index f19cf69c..dcad8c53 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_nroff_igor_checker')
 endif
 let g:loaded_syntastic_nroff_igor_checker = 1
 
-runtime! syntax_checkers/docbk/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'nroff',
     \ 'name': 'igor',
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
index 7adf5b80..534d82b9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_objc_oclint_checker')
 endif
 let g:loaded_syntastic_objc_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'objc',
     \ 'name': 'oclint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
index addec47d..5528258e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
@@ -14,8 +14,6 @@ if exists('g:loaded_syntastic_objcpp_oclint_checker')
 endif
 let g:loaded_syntastic_objcpp_oclint_checker = 1
 
-runtime! syntax_checkers/c/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'objcpp',
     \ 'name': 'oclint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
index 7de61bb3..cad39bd3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_perl_podchecker_checker')
 endif
 let g:loaded_syntastic_perl_podchecker_checker = 1
 
-runtime! syntax_checkers/pod/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'perl',
     \ 'name': 'podchecker',
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
index 8e8ded17..19ca1fda 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
@@ -16,13 +16,14 @@ set cpo&vim
 function! SyntaxCheckers_python_mypy_GetLocList() dict
     let makeprg = self.makeprgBuild({})
 
-    let errorformat = '%f\, line %l: %m'
+    let errorformat = '%f:%l:%m'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': { 'type': 'E' },
-        \ 'returns': [0, 1] })
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'mypy' })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/sources_non_forked/syntastic/syntax_checkers/qml/qmllint.vim b/sources_non_forked/syntastic/syntax_checkers/qml/qmllint.vim
new file mode 100644
index 00000000..0aef61c6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/qml/qmllint.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        qmllint.vim
+"Description: Syntax checking plugin for syntastic.vim using qmllint
+"Maintainer:  Peter Wu <peter@lekensteyn.nl>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_qml_qmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_qml_qmllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_qml_qmllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l : %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
+        \ 'returns': [0, 255] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'qml',
+    \ 'name': 'qmllint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index ca086b13..854c1709 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -44,7 +44,6 @@ 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(setwd . 'library(lint); ' .
         \       'try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lintr.vim b/sources_non_forked/syntastic/syntax_checkers/r/lintr.vim
new file mode 100644
index 00000000..7c71ec07
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lintr.vim
@@ -0,0 +1,81 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" Security:
+"
+" This checker runs the code in your file.  This is probably fine if you
+" wrote the file yourself, but it can be a problem if you're trying to
+" check third party files.  If you are 100% willing to let Vim run the
+" code in your file, set g:syntastic_enable_r_lintr_checker to 1 in
+" your vimrc to enable this checker:
+"
+" let g:syntastic_enable_r_lintr_checker = 1
+
+if exists("g:loaded_syntastic_r_lintr_checker")
+    finish
+endif
+let g:loaded_syntastic_r_lintr_checker = 1
+
+if !exists('g:syntastic_r_lintr_linters')
+    let g:syntastic_r_lintr_linters = 'default_linters'
+endif
+
+if !exists('g:syntastic_r_lintr_cache')
+    let g:syntastic_r_lintr_cache = 'FALSE'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_r_lintr_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
+    return term != '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_r_lintr_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    call system(self.getExecEscaped() . ' --slave --no-restore --no-save -e ' . syntastic#util#shescape('library(lintr)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_r_lintr_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
+    let makeprg = self.getExecEscaped() . ' --slave --no-restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'suppressPackageStartupMessages(library(lintr)); ' .
+        \       'lint(cache = ' . g:syntastic_r_lintr_cache . ', commandArgs(TRUE), ' . g:syntastic_r_lintr_linters . ')') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%W%f:%l:%c: style: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%E%f:%l:%c: error: %m,'
+
+    call self.setWantSort(1)
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'lintr',
+    \ 'exec': 'R',
+    \ 'enable': 'enable_r_lintr_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rmd/lintr.vim b/sources_non_forked/syntastic/syntax_checkers/rmd/lintr.vim
new file mode 100644
index 00000000..dcc235f7
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/rmd/lintr.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_rmd_lintr_checker')
+    finish
+endif
+let g:loaded_syntastic_rmd_lintr_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rmd',
+    \ 'name': 'lintr',
+    \ 'redirect': 'r/lintr'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/sphinx.vim b/sources_non_forked/syntastic/syntax_checkers/rst/sphinx.vim
index 96843876..3c211f4a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/sphinx.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/sphinx.vim
@@ -29,9 +29,9 @@ function! SyntaxCheckers_rst_sphinx_GetLocList() dict
 
     let srcdir = syntastic#util#var('rst_sphinx_source_dir')
     call self.log('g:syntastic_rst_sphinx_source_dir =', srcdir)
-    if srcdir == ''
+    if srcdir ==# ''
         let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        if config == '' || !filereadable(config)
+        if config ==# '' || !filereadable(config)
             call self.log('conf.py file not found')
             return []
         endif
@@ -40,9 +40,9 @@ function! SyntaxCheckers_rst_sphinx_GetLocList() dict
 
     let confdir = syntastic#util#var('rst_sphinx_config_dir')
     call self.log('g:syntastic_rst_sphinx_config_dir =', confdir)
-    if confdir == ''
+    if confdir ==# ''
         let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        let confdir = (config != '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
+        let confdir = (config !=# '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
     endif
 
     let makeprg = self.makeprgBuild({
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/flog.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/flog.vim
new file mode 100644
index 00000000..127cdbdb
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/flog.vim
@@ -0,0 +1,72 @@
+"============================================================================
+"File:        flog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_flog_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_flog_checker = 1
+
+if !exists('g:syntastic_ruby_flog_threshold_warning')
+    let g:syntastic_ruby_flog_threshold_warning = 45
+endif
+
+if !exists('g:syntastic_ruby_flog_threshold_error')
+    let g:syntastic_ruby_flog_threshold_error = 90
+endif
+
+if !exists('g:syntastic_ruby_flog_sort')
+    let g:syntastic_ruby_flog_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_flog_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-a' })
+
+    " Example output:
+    "   93.25: MyClass::my_method my_file:42
+    let errorformat = '%\m%\s%#%m: %.%# %f:%l'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    let trail_w = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_warning) . ')'
+    let trail_e = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_error) . ')'
+    for e in loclist
+      let score = syntastic#util#str2float(e['text'])
+
+      let e['text'] = 'Complexity is too high (' . syntastic#util#float2str(score) . '/'
+      if score < g:syntastic_ruby_flog_threshold_warning
+          let e['valid'] = 0
+      elseif score < g:syntastic_ruby_flog_threshold_error
+          let e['type'] = 'W'
+          let e['text'] .= trail_w
+      else
+          let e['type'] = 'E'
+          let e['text'] .= trail_e
+      endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'flog'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/mixedindentlint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/mixedindentlint.vim
new file mode 100644
index 00000000..04a1fec4
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/mixedindentlint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_mixedindentlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'mixedindentlint',
+    \ 'redirect': 'javascript/mixedindentlint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
index 426bf2d4..3df8c803 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_scss_sass_checker')
 endif
 let g:loaded_syntastic_scss_sass_checker = 1
 
-runtime! syntax_checkers/sass/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'scss',
     \ 'name': 'sass',
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
index 98f7829a..f1b23729 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_scss_sassc_checker')
 endif
 let g:loaded_syntastic_scss_sassc_checker = 1
 
-runtime! syntax_checkers/sass/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'scss',
     \ 'name': 'sassc',
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slim_lint.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slim_lint.vim
new file mode 100644
index 00000000..f3879713
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slim_lint.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        slim_lint.vim
+"Description: Slim style and syntax checker plugin for Syntastic
+"Maintainer:  Vasily Kolesnikov <re.vkolesnikov@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_slim_slim_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_slim_slim_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_slim_slim_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l [%t] %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style'})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'slim',
+    \ 'name': 'slim_lint',
+    \ 'exec': 'slim-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sql/sqlint.vim b/sources_non_forked/syntastic/syntax_checkers/sql/sqlint.vim
new file mode 100644
index 00000000..1e1eea56
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/sql/sqlint.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        sqlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Purcell <steve@sanityinc.com>
+"License:     MIT
+"============================================================================
+
+if exists('g:loaded_syntastic_sql_sqlint_checker')
+    finish
+endif
+let g:loaded_syntastic_sql_sqlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sql_sqlint_GetHighlightRegex(i)
+    let term = matchstr(a:i['text'], '\m at or near "\zs[^"]\+\ze"')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 0, 3])
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l:%c:ERROR %m,' .
+        \ '%W%f:%l:%c:WARNING %m,' .
+        \ '%C %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sql',
+    \ 'name': 'sqlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim b/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim
new file mode 100644
index 00000000..f489910e
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/stylus/stylint.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        stylint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_stylus_stylint_checker')
+    finish
+endif
+let g:loaded_syntastic_stylus_stylint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_stylus_stylint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%WWarning: %m,' .
+        \ '%EError: %m,' .
+        \ '%CFile: %f,' .
+        \ '%CLine: %l:%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'stylus',
+    \ 'name': 'stylint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
index bf6fda9d..588cf3ba 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_text_igor_checker')
 endif
 let g:loaded_syntastic_text_igor_checker = 1
 
-runtime! syntax_checkers/docbk/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'text',
     \ 'name': 'igor',
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/eslint.vim
new file mode 100644
index 00000000..41e52764
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/eslint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        eslint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_typescript_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_typescript_eslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'eslint',
+    \ 'redirect': 'javascript/eslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
index 0aa2b114..de9242e5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -18,6 +18,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_typescript_tsc_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
     let version_output = split(syntastic#util#system(self.getExecEscaped() . ' --version'), '\n', 1)
     let ver = filter(copy(version_output), 'v:val =~# ''\m\<Version ''')
     let parsed_ver = len(ver) ? syntastic#util#parseVersion(ver[0], '\v<Version \zs\d+(\.\d+)\ze') : []
@@ -48,6 +52,7 @@ function! SyntaxCheckers_typescript_tsc_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
         \ 'defaults': {'bufnr': bufnr('')} })
 endfunction
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
index 9a927854..de224b6b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
@@ -22,9 +22,13 @@ function! SyntaxCheckers_typescript_tslint_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_typescript_tslint_GetLocList() dict
+    if !exists('s:tslint_new')
+        let s:tslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
+    endif
+
     let makeprg = self.makeprgBuild({
         \ 'args_after': '--format verbose',
-        \ 'fname_before': '-f' })
+        \ 'fname_before': (s:tslint_new ? '' : '-f') })
 
     " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
     let errorformat = '%f[%l\, %c]: %m'
diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/iverilog.vim b/sources_non_forked/syntastic/syntax_checkers/verilog/iverilog.vim
new file mode 100644
index 00000000..c34fec16
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/verilog/iverilog.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        iverilog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Psidium <psiidium at gmail dot com>
+"License:     The MIT License
+"============================================================================
+
+if exists('g:loaded_syntastic_verilog_iverilog_checker')
+    finish
+endif
+let g:loaded_syntastic_verilog_iverilog_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_verilog_iverilog_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-t null',
+        \ 'args': '-Wall' })
+
+    let errorformat =
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m,' .
+        \ '%E%f:%l:      : %m,' .
+        \ '%W%f:%l:        : %m,' .
+        \ '%f:%l: %m'
+
+    return SyntasticMake({'makeprg': makeprg, 'errorformat': errorformat})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'verilog',
+    \ 'name': 'iverilog'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/vcom.vim b/sources_non_forked/syntastic/syntax_checkers/vhdl/vcom.vim
new file mode 100644
index 00000000..6cdf4fbd
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/vhdl/vcom.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        vcom.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Vogel <jim dot e dot vogel at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vhdl_vcom_checker')
+    finish
+endif
+let g:loaded_syntastic_vhdl_vcom_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vhdl_vcom_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '-lint' })
+
+    let errorformat =
+        \ '** %tRROR: %f(%l): %m,' .
+        \ '** %tRROR: %m,' .
+        \ '** %tARNING: %f(%l): %m,' .
+        \ '** %tARNING: %m,' .
+        \ '** %tOTE: %m,' .
+        \ '%tRROR: %f(%l): %m,' .
+        \ '%tARNING[%*[0-9]]: %f(%l): %m,' .
+        \ '%tRROR: %m,' .
+        \ '%tARNING[%*[0-9]]: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if e['type'] !=? 'E' && e['type'] !=? 'W'
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vhdl',
+    \ 'name': 'vcom'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index 8569a829..67be033d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -74,6 +74,8 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
         endif
     endif
 
+    call self.log('options =', param)
+
     return vimlint#vimlint(expand('%', 1), param)
 endfunction " }}}1
 
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
index 413d112b..f4536e28 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_xhtml_jshint_checker')
 endif
 let g:loaded_syntastic_xhtml_jshint_checker = 1
 
-runtime! syntax_checkers/html/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'xhtml',
     \ 'name': 'jshint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/xquery/basex.vim b/sources_non_forked/syntastic/syntax_checkers/xquery/basex.vim
new file mode 100644
index 00000000..640a1910
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/xquery/basex.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        basex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  James Wright <james dot jw at hotmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xquery_basex_checker')
+    finish
+endif
+let g:loaded_syntastic_xquery_basex_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_xquery_basex_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-z',
+        \ 'fname_before': '-q',
+        \ 'fname': syntastic#util#shescape('inspect:module("' . escape(expand('%:p', 1), '"') . '")') })
+
+    let errorformat =
+        \ '%f:%l:%c:%t:%n:%m,' .
+        \ '%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'basex' })
+
+    for e in loclist
+        if e['type'] !=# 'W' && e['type'] !=# 'E'
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xquery',
+    \ 'name': 'basex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
index 1f16a46b..9ffb548f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
@@ -15,8 +15,6 @@ if exists('g:loaded_syntastic_xslt_xmllint_checker')
 endif
 let g:loaded_syntastic_xslt_xmllint_checker = 1
 
-runtime! syntax_checkers/xml/*.vim
-
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'xslt',
     \ 'name': 'xmllint',
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
index 020fad41..e8baa7ed 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -28,6 +28,7 @@ function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
     let errorformat =
         \ 'Error on line %l\, col %c:%m,' .
         \ 'JS-YAML: %m at line %l\, column %c:,' .
+        \ 'YAMLException: %m at line %l\, column %c:,' .
         \ '%-G%.%#'
 
     return SyntasticMake({
diff --git a/sources_non_forked/tlib/autoload/tlib.vim b/sources_non_forked/tlib/autoload/tlib.vim
index 2ed32001..5d805ac9 100644
--- a/sources_non_forked/tlib/autoload/tlib.vim
+++ b/sources_non_forked/tlib/autoload/tlib.vim
@@ -1,10 +1,7 @@
-" tlib.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-07-17.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.12
+" @Revision:    13
 
 " :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 568a4f25..0bcb6c0e 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-06-02.
-" @Revision:    0.0.109
+" @Last Change: 2014-11-18.
+" @Revision:    0.0.114
 
 let s:prototype = tlib#Object#New({'_class': ['Filter_cnf'], 'name': 'cnf'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
diff --git a/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim b/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
index 0ee55618..904b2261 100644
--- a/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Filter_glob.vim
@@ -2,8 +2,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.80
+" @Last Change: 2014-11-18.
+" @Revision:    0.0.82
 
 let s:prototype = tlib#Filter_cnf#New({'_class': ['Filter_glob'], 'name': 'glob'}) "{{{2
 let s:prototype.highlight = g:tlib#input#higroup
@@ -61,8 +61,8 @@ 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')
+    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/Object.vim b/sources_non_forked/tlib/autoload/tlib/Object.vim
index aa07ae4f..21f38b24 100644
--- a/sources_non_forked/tlib/autoload/tlib/Object.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Object.vim
@@ -1,20 +1,11 @@
-" Object.vim -- Prototype objects?
 " @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: 2011-03-10.
-" @Revision:    0.1.126
+" @Revision:    127
 
 " :filedoc:
 " Provides a prototype plus some OO-like methods.
 
-
-if &cp || exists("loaded_tlib_object_autoload")
-    finish
-endif
-let loaded_tlib_object_autoload = 1
-
 let s:id_counter = 0
 let s:prototype  = {'_class': ['object'], '_super': [], '_id': 0} "{{{2
 
diff --git a/sources_non_forked/tlib/autoload/tlib/Test.vim b/sources_non_forked/tlib/autoload/tlib/Test.vim
index 81c74e79..4a4281e8 100644
--- a/sources_non_forked/tlib/autoload/tlib/Test.vim
+++ b/sources_non_forked/tlib/autoload/tlib/Test.vim
@@ -1,18 +1,10 @@
-" Test.vim -- A test class
 " @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: 2010-09-05.
-" @Revision:    0.1.10
+" @Revision:    11
 
 " :enddoc:
 
-if &cp || exists("loaded_tlib_Test_autoload")
-    finish
-endif
-let loaded_tlib_Test_autoload = 1
-
 
 let s:prototype = tlib#Object#New({'_class': ['Test']}) "{{{2
 function! tlib#Test#New(...) "{{{3
diff --git a/sources_non_forked/tlib/autoload/tlib/TestChild.vim b/sources_non_forked/tlib/autoload/tlib/TestChild.vim
index 751c480f..16979a75 100644
--- a/sources_non_forked/tlib/autoload/tlib/TestChild.vim
+++ b/sources_non_forked/tlib/autoload/tlib/TestChild.vim
@@ -1,18 +1,10 @@
-" TestChild.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-05-18.
-" @Last Change: 2010-09-05.
-" @Revision:    0.1.14
+" @Revision:    15
 
 " :enddoc:
 
-if &cp || exists("loaded_tlib_TestChild_autoload")
-    finish
-endif
-let loaded_tlib_TestChild_autoload = 1
-
 
 let s:prototype = tlib#Test#New({'_class': ['TestChild']}) "{{{2
 function! tlib#TestChild#New(...) "{{{3
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index 71c4387c..fddf7b2f 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:    1397
+" @Revision:    1432
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -359,6 +359,7 @@ endf
 
 " :nodoc:
 function! s:prototype.SelectItem(mode, index) dict "{{{3
+    " TLogVAR a:mode, a:index
     let bi = self.GetBaseIdx(a:index)
     " if self.RespondTo('MaySelectItem')
     "     if !self.MaySelectItem(bi)
@@ -378,6 +379,14 @@ function! s:prototype.SelectItem(mode, index) dict "{{{3
 endf
 
 
+" :nodoc:
+function! s:prototype.FormatBaseFromData() abort dict "{{{3
+    if has_key(self, 'format_data') && has_key(self, 'data')
+        let self.base = map(copy(self.data), 'call(self.format_data, [v:val], self)')
+    endif    
+endf
+
+
 " :nodoc:
 function! s:prototype.FormatArgs(format_string, arg) dict "{{{3
     let nargs = len(substitute(a:format_string, '%%\|[^%]', '', 'g'))
@@ -603,11 +612,13 @@ endf
 " :nodoc:
 function! s:prototype.IsValidFilter() dict "{{{3
     let last = self.FilterRxPrefix() .'\('. self.filter[0][0] .'\)'
+    Tlibtrace 'tlib', last
     " TLogVAR last
     try
         let a = match("", last)
         return 1
     catch
+        Tlibtrace 'tlib', v:exception
         return 0
     endtry
 endf
@@ -673,13 +684,19 @@ endf
 " :nodoc:
 function! s:prototype.ReduceFilter() dict "{{{3
     " TLogVAR self.filter
-    if self.filter[0] == [''] && len(self.filter) > 1
-        call remove(self.filter, 0)
-    elseif empty(self.filter[0][0]) && len(self.filter[0]) > 1
-        call remove(self.filter[0], 0)
-    else
-        call self.matcher.ReduceFrontFilter(self)
-    endif
+    let reduced = 0
+    while !reduced
+        if self.filter[0] == [''] && len(self.filter) > 1
+            call remove(self.filter, 0)
+        elseif empty(self.filter[0][0]) && len(self.filter[0]) > 1
+            call remove(self.filter[0], 0)
+        else
+            call self.matcher.ReduceFrontFilter(self)
+        endif
+        if self.IsValidFilter()
+            let reduced = 1
+        endif
+    endwh
 endf
 
 
@@ -687,6 +704,7 @@ endf
 " filter is either a string or a list of list of strings.
 function! s:prototype.SetInitialFilter(filter) dict "{{{3
     " let self.initial_filter = [[''], [a:filter]]
+    Tlibtrace 'tlib', a:filter
     if type(a:filter) == 3
         let self.initial_filter = deepcopy(a:filter)
     else
@@ -816,10 +834,18 @@ function! s:prototype.UseInputListScratch() dict "{{{3
     if !exists('w:tlib_list_init')
         " TLogVAR scratch
         if has_key(self, 'index_next_syntax')
-            exec 'syntax match InputlListIndex /^\d\+:\s/ nextgroup='. self.index_next_syntax
+            if type(self.index_next_syntax) == 1
+                exec 'syntax match InputlListIndex /^\d\+:\s/ nextgroup='. self.index_next_syntax
+            elseif type(self.index_next_syntax) == 4
+                for [n, nsyn] in items(self.index_next_syntax)
+                    let fn = printf('%0'. world.index_width .'d', n)
+                    exec 'syntax match InputlListIndex /^'. fn .':\s/ nextgroup='. nsyn
+                endfor
+            endif
         else
             syntax match InputlListIndex /^\d\+:\s/
         endif
+        call tlib#hook#Run('tlib_UseInputListScratch', self)
         syntax match InputlListCursor /^\d\+\* .*$/ contains=InputlListIndex
         syntax match InputlListSelected /^\d\+# .*$/ contains=InputlListIndex
         hi def link InputlListIndex Constant
@@ -830,7 +856,6 @@ function! s:prototype.UseInputListScratch() dict "{{{3
         " let b:tlibDisplayListMarks = {}
         let b:tlibDisplayListMarks = []
         let b:tlibDisplayListWorld = self
-        call tlib#hook#Run('tlib_UseInputListScratch', self)
         let w:tlib_list_init = 1
     endif
     return scratch
@@ -842,6 +867,7 @@ endf
 function! s:prototype.Reset(...) dict "{{{3
     TVarArg ['initial', 0]
     " TLogVAR initial
+    Tlibtrace 'tlib', initial, self.initial_filter
     let self.state     = 'display'
     let self.offset    = 1
     let self.filter    = deepcopy(self.initial_filter)
@@ -853,6 +879,7 @@ function! s:prototype.Reset(...) dict "{{{3
     call self.UseInputListScratch()
     call self.ResetSelected()
     call self.Retrieve(!initial)
+    call self.FormatBaseFromData()
     return self
 endf
 
@@ -977,6 +1004,7 @@ function! s:prototype.DisplayHelp() dict "{{{3
     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('<Tab>', 'Complete word')
     call self.PushHelp('<S-Esc>, <F10>', 'Enter command')
 
     if self.key_mode == 'default'
@@ -1214,10 +1242,11 @@ endf
 
 " :nodoc:
 function! s:prototype.Query() dict "{{{3
+    let flt = self.DisplayFilter()
     if g:tlib_inputlist_shortmessage
-        let query = 'Filter: '. self.DisplayFilter()
+        let query = 'Filter: '. flt
     else
-        let query = self.query .' (filter: '. self.DisplayFilter() .'; press <F1> for help)'
+        let query = self.query .' (filter: '. flt .'; press <F1> for help)'
     endif
     return query
 endf
diff --git a/sources_non_forked/tlib/autoload/tlib/agent.vim b/sources_non_forked/tlib/autoload/tlib/agent.vim
index 766c5b33..98275f12 100644
--- a/sources_non_forked/tlib/autoload/tlib/agent.vim
+++ b/sources_non_forked/tlib/autoload/tlib/agent.vim
@@ -1,10 +1,7 @@
-" agent.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-24.
-" @Last Change: 2014-02-06.
-" @Revision:    0.1.251
+" @Revision:    328
 
 
 " :filedoc:
@@ -414,14 +411,17 @@ function! tlib#agent#ViewFile(world, selected) "{{{3
     if !empty(a:selected)
         let back = a:world.SwitchWindow('win')
         " TLogVAR back
-        if !&hidden && &l:modified
-            let cmd0 = 'split'
-            let cmd1 = 'sbuffer'
-        else
-            let cmd0 = 'edit'
-            let cmd1 = 'buffer'
-        endif
-        call tlib#file#With(cmd0, cmd1, a:selected, a:world)
+        for filename in a:selected
+            call tlib#file#Edit(filename)
+        endfor
+        " if !&hidden && &l:modified
+        "     let cmd0 = 'split'
+        "     let cmd1 = 'sbuffer'
+        " else
+        "     let cmd0 = 'edit'
+        "     let cmd1 = 'buffer'
+        " endif
+        " call tlib#file#With(cmd0, cmd1, a:selected, a:world)
         " TLogVAR &filetype
         exec back
         let a:world.state = 'display'
@@ -612,3 +612,53 @@ function! tlib#agent#CompleteAgentNames(ArgLead, CmdLine, CursorPos)
     return filter(copy(s:agent_names), 'stridx(v:val, a:ArgLead) != -1')
 endf
 
+
+function! tlib#agent#Complete(world, selected) abort "{{{3
+    let rxprefix = a:world.matcher.FilterRxPrefix()
+    let flt = a:world.filter[0][0]
+    " TLogVAR flt
+    let fltrx = rxprefix . flt . '\m[^[:space:][:cntrl:][:punct:]<>*+?&~{}()\[\]\\/]\+'
+    let fltrx0 = '\m^' . fltrx
+    " TLogVAR fltrx, fltrx0
+    let words = {}
+    for item in a:world.list
+        let parts = split(item, '\ze'. fltrx)
+        " TLogVAR item, parts
+        for part in parts
+            let word = matchstr(part, fltrx0)
+            " TLogVAR part, word
+            if !empty(word)
+                let words[word] = 1
+            endif
+        endfor
+    endfor
+    " TLogVAR keys(words)
+    let completions = keys(words)
+    " let completions = filter(keys(words), 'matchstr(v:val, fltrx0)')
+    let completions = sort(completions, 's:SortCompletions')
+    let completions = tlib#list#Uniq(completions)
+    " TLogVAR 0, completions
+    while len(completions) > 1
+        let nchar = strwidth(completions[0]) - 1
+        let completions = map(completions, 'strpart(v:val, 0, nchar)')
+        " TLogVAR 'reduce', completions
+        let completions = tlib#list#Uniq(completions)
+        " TLogVAR 'unique', len(completions), completions
+    endwh
+    " TLogVAR 9, completions
+    if empty(completions)
+        let a:world.state = 'redisplay update'
+    else
+        let a:world.filter[0][0] = completions[0]
+        let a:world.state = 'display update'
+    endif
+    return a:world
+endf
+
+
+function! s:SortCompletions(a, b) abort "{{{3
+    let i1 = strwidth(a:a)
+    let i2 = strwidth(a:b)
+    return i2 - i1
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/arg.vim b/sources_non_forked/tlib/autoload/tlib/arg.vim
index 96d5dc5b..2e995146 100644
--- a/sources_non_forked/tlib/autoload/tlib/arg.vim
+++ b/sources_non_forked/tlib/autoload/tlib/arg.vim
@@ -1,8 +1,8 @@
 " @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)
-" @Last Change: 2014-07-01.
-" @Revision:    63
+" @Last Change: 2015-11-19.
+" @Revision:    251
 
 
 " :def: function! tlib#arg#Get(n, var, ?default="", ?test='')
@@ -31,30 +31,25 @@ function! tlib#arg#Let(list, ...) "{{{3
 endf
 
 
-" :def: function! tlib#arg#Key(dict, list, ?default='')
-" See |:TKeyArg|.
-function! tlib#arg#Key(list, ...) "{{{3
-    let default = a:0 >= 1 ? a:1 : ''
-    let dict = a:list[0]
-    let list = map(copy(a:list[1:-1]), 'type(v:val) == 3 ? v:val : [v:val, default]')
-    let args = map(list, '"let ". v:val[0] ." = ". string(get(dict, v:val[0], v:val[1]))')
-    " TLogVAR dict, list, args
-    return join(args, ' | ')
-endf
-
-
-" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':')
+" :def: function! tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':', ?booleans=0)
 function! tlib#arg#StringAsKeyArgs(string, ...) "{{{1
-    TVarArg ['keys', {}], ['evaluate', 0], ['sep', ':']
+    TVarArg ['keys', {}], ['evaluate', 0], ['sep', ':'], ['booleans', 0]
     let keyargs = {}
     let args = split(a:string, '\\\@<! ')
-    let arglist = map(args, 'matchlist(v:val, ''^\%(\(\w\+\)'. sep .'\(.*\)\|\(.*\)\)$'')')
+    let key_rx = booleans ? '\([-+]\?\w\+\)' : '\(\w\+\)'
+    let arglist = map(args, 'matchlist(v:val, ''^\%('. key_rx . sep .'\(.*\)\|\(.*\)\)$'')')
     " TLogVAR a:string, args, arglist
-    let pos = 0
+    let pos = -1
     for matchlist in arglist
         if !empty(matchlist[3])
-            let keyargs[pos] = matchlist[3]
-            let pos += 1
+            if booleans && matchlist[3] =~ '^[-+]'
+                let key = substitute(matchlist[3], '^[-+]', '', '')
+                let val = matchstr(matchlist[3], '^[-+]')
+                let keyargs[key] = val ==# '+'
+            else
+                let pos += 1
+                let keyargs[pos] = matchlist[3]
+            endif
         else
             let [match, key, val; rest] = matchlist
             if empty(keys) || has_key(keys, key)
@@ -68,12 +63,242 @@ function! tlib#arg#StringAsKeyArgs(string, ...) "{{{1
             endif
         endif
     endfor
+    if pos >= 0
+        let keyargs['__posargs__'] = range(0, pos)
+    endif
     return keyargs
 endf
 
 
 function! tlib#arg#StringAsKeyArgsEqual(string) "{{{1
-    return tlib#arg#StringAsKeyArgs(a:string, [], 0, '=')
+    return tlib#arg#StringAsKeyArgs(a:string, [], 0, '=', 1)
+endf
+
+
+" :display: tlib#arg#GetOpts(args, ?def={})
+" Convert a list of strings of command-line arguments into a dictonary.
+"
+" The main use case is to pass [<f-args>], i.e. the command-line 
+" arguments of a command as list, from a command definition to this 
+" function.
+"
+" Example:
+" ['-h']
+" => If def contains a 'help' key, invoke |:help| on its value.
+"
+" ['-ab', '--foo', '--bar=BAR', 'bla', bla']
+" => {'a': 1, 'b': 1, 'foo': 1, 'bar': 'BAR', '__rest__': ['bla', 'bla']}
+"
+" ['-ab', '--', '--foo', '--bar=BAR']
+" => {'a': 1, 'b': 1, '__rest__': ['--foo', '--bar=BAR']}
+function! tlib#arg#GetOpts(args, ...) abort "{{{3
+    let throw = a:0 == 0
+    TVarArg ['def', {}]
+    " TLogVAR def
+    let opts = {'__exit__': 0}
+    for [key, vdef] in items(get(def, 'values', {}))
+        if has_key(vdef, 'default')
+            let opts[key] = vdef.default
+        endif
+    endfor
+    let idx = 0
+    for o in a:args
+        let [break, idx] = s:SetOpt(def, opts, idx, o)
+        if break == 1
+            break
+        elseif break == 2
+            if throw
+                throw 'tlib#arg#GetOpts: Show help'
+            else
+                let opts.__exit__ = 5
+            endif
+        endif
+    endfor
+    let opts.__rest__ = a:args[idx : -1]
+    return opts
+endf
+
+
+function! s:GetValueType(def) abort "{{{3
+    return get(a:def, 'type', type(get(a:def, 'default', '')))
+endf
+
+
+function! s:SetOpt(def, opts, idx, opt) abort "{{{3
+    " TLogVAR a:def
+    let idx = a:idx + 1
+    let break = 0
+    let long = get(a:def, 'long', 1)
+    let short = get(a:def, 'short', 1)
+    if (short && a:opt =~# '^-[?h]$') || (long && a:opt ==# '--help')
+        if has_key(a:def, 'help')
+            exec 'help' a:def.help
+        else
+            " TLogVAR a:def
+            let values = get(a:def, 'values', {})
+            let flags = get(a:def, 'flags', {})
+            if empty(values) && empty(flags)
+                echom 'No help'
+            else
+                if !empty(values)
+                    echom 'Options:'
+                    for [key, vdef] in sort(items(values))
+                        let opt = key
+                        let default = get(vdef, 'default', '')
+                        let type = s:GetValueType(vdef)
+                        if default =~ '^-\?\d\+\%(\.\d\+\)$'
+                            if type == -1
+                                let opt .= ' (flag)'
+                            elseif type == 1
+                                let opt .= '=INT'
+                            else
+                                let opt .= '=INT or maybe BOOL'
+                            endif
+                        elseif type(default) == 1
+                            let opt .= '=STRING'
+                        elseif type(default) == 3
+                            let opt .= '=COMMA-LIST'
+                        endif
+                        echom printf('  --%20s (default: %s)', opt, string(default))
+                    endfor
+                endif
+                if !empty(flags)
+                    echom 'Short flags:'
+                    for [sflag, lflag] in sort(items(flags))
+                        echom printf('  -%s -> %s', sflag, lflag)
+                    endfor
+                endif
+            endif
+        endif
+        let break = 2
+    elseif long &&  a:opt =~# '^--no-.\+'
+        let key = matchstr(a:opt, '^--no-\zs.\+$')
+        let a:opts[key] = s:Validate(a:def, key, 0)
+    elseif long &&  a:opt =~# '^--\w\+$'
+        let key = matchstr(a:opt, '^--\zs.\+$')
+        let a:opts[key] = s:Validate(a:def, key, 1)
+    elseif long &&  a:opt =~# '^--\w\+='
+        let ml = matchlist(a:opt, '^--\(\w\+\)=\(.*\)$')
+        if empty(ml)
+            throw 'tlib#arg#GetOpts: Cannot parse: '. a:opt
+        else
+            let values = get(a:def, 'values', {})
+            if has_key(values, ml[1])
+                let vdef = values[ml[1]]
+                let type = s:GetValueType(vdef)
+                if type == -1
+                    let opt_value = !!str2nr(ml[2])
+                elseif type == 0
+                    let opt_value = str2nr(ml[2])
+                elseif type == 1
+                    let opt_value = ml[2]
+                elseif type == 2
+                    let opt_value = function(ml[2])
+                elseif type == 3
+                    let opt_value = tlib#string#SplitCommaList(ml[2])
+                elseif type == 4
+                    throw 'tlib#arg#GetOpts: Unsupported type conversion for '. ml[1]
+                elseif type == 5
+                    let opt_value = str2float(ml[2])
+                endif
+            else
+                let opt_value = ml[2]
+            endif
+            let a:opts[ml[1]] = s:Validate(a:def, ml[1], opt_value)
+            unlet opt_value
+        endif
+    elseif short && a:opt =~# '^-\w='
+        let flagdefs = get(a:def, 'flags', {})
+        let flag = matchstr(a:opt, '^-\zs\w')
+        let rest = matchstr(a:opt, '^-\w\zs.*$')
+        call s:SetFlag(a:def, a:opts, idx, flag, rest, flagdefs)
+    elseif short && a:opt =~# '^-\w\+$'
+        let flagdefs = get(a:def, 'flags', {})
+        for flag in split(substitute(a:opt, '^-', '', ''), '\zs')
+            call s:SetFlag(a:def, a:opts, idx, flag, '', flagdefs)
+        endfor
+    else
+        let break = 1
+        if a:opt !=# '--'
+            let idx -= 1
+        endif
+    endif
+    return [break, idx]
+endf
+
+
+function! s:SetFlag(def, opts, idx, flag, rest, flagdefs) abort "{{{3
+    " TLogVAR a:def
+    if has_key(a:flagdefs, a:flag)
+        call s:SetOpt(a:def, a:opts, a:idx, a:flagdefs[a:flag] . a:rest)
+    else
+        let a:opts[a:flag] = s:Validate(a:def, a:flag, 1)
+    endif
+endf
+
+
+function! s:Validate(def, name, value) abort "{{{3
+    let values = get(a:def, 'values', {})
+    if has_key(values, a:name)
+        let vdef = values[a:name]
+        if has_key(vdef, 'validate')
+            if !call(vdef.validate, [a:value])
+                throw printf('tlib#arg: %s has invalid value: %s', string(a:name), string(a:value))
+            endif
+        endif
+    endif
+    return a:value
+endf
+
+
+":nodoc:
+function! tlib#arg#CComplete(def, ArgLead) abort "{{{3
+    let values = get(a:def, 'values', {})
+    let opt = matchstr(a:ArgLead, '^--\zs\w\+\ze=')
+    if has_key(values, opt)
+        let words = []
+        let vals = values[opt]
+        let complete_customlist = get(vals, 'complete_customlist', '')
+        if !empty(complete_customlist)
+            let words = eval(complete_customlist)
+        " else
+        "     let complete = get(vals, 'complete', '')
+        "     if !empty(complete)
+        "     endif
+        endif
+        if !empty(words)
+            let lead = substitute(a:ArgLead, '^--\w\+=', '', '')
+            if !empty(lead)
+                let nchar = len(lead)
+                call filter(words, 'strpart(v:val, 0, nchar) ==# lead')
+            endif
+            let words = map(words, '"--". opt ."=". v:val')
+            return sort(words)
+        endif
+    endif
+    let cs = {'-h': 1, '--help': 1}
+    for [name, vdef] in items(values)
+        let type = s:GetValueType(vdef)
+        if type >= 0
+            let name .= '='
+        else
+            let cs['--no-'. name] = 1
+        endif
+        let cs['--'. name] = 1
+    endfor
+    for [name, subst] in items(get(a:def, 'flags', {}))
+        let ldef = get(values, substitute(subst, '^--', '', ''), {})
+        let type = s:GetValueType(ldef)
+        if type >= 0
+            let name .= '='
+        endif
+        let cs['-'. name] = 1
+    endfor
+    let nchar = len(a:ArgLead)
+    if nchar > 0
+        call filter(cs, 'strpart(v:key, 0, nchar) ==# a:ArgLead')
+    endif
+    return sort(keys(cs))
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/assert.vim b/sources_non_forked/tlib/autoload/tlib/assert.vim
new file mode 100644
index 00000000..dbf48369
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/assert.vim
@@ -0,0 +1,44 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @Website:     https://github.com/tomtom
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2015-11-23
+" @Revision:    38
+
+
+" Enable tracing via |:Tlibassert|.
+function! tlib#assert#Enable() abort "{{{3
+    " :nodoc:
+    command! -nargs=+ -bar Tlibassert call tlib#assert#Assert(expand('<sfile>'), <q-args>, [<args>])
+endf
+
+
+" Disable tracing via |:Tlibassert|.
+function! tlib#assert#Disable() abort "{{{3
+    " :nodoc:
+    command! -nargs=+ -bang -bar Tlibassert :
+endf
+
+
+function! tlib#assert#Assert(caller, check, vals) abort "{{{3
+    for val in a:vals
+        " TLogVAR val
+        if type(val) == 3
+            call tlib#assert#Assert(a:caller, a:check, val)
+        elseif !val
+            throw 'Tlibassert: '. tlib#trace#Backtrace(a:caller) .': '. a:check
+        endif
+    endfor
+endf
+
+
+function! tlib#assert#Map(vals, expr) abort "{{{3
+    return tlib#assert#All(map(a:vals, a:expr))
+endf
+
+
+function! tlib#assert#All(vals) abort "{{{3
+    " TLogVAR a:vals, empty(filter(a:vals, '!v:val'))
+    return empty(filter(a:vals, '!v:val'))
+endf
+
+
diff --git a/sources_non_forked/tlib/autoload/tlib/balloon.vim b/sources_non_forked/tlib/autoload/tlib/balloon.vim
index cc70d038..69675239 100644
--- a/sources_non_forked/tlib/autoload/tlib/balloon.vim
+++ b/sources_non_forked/tlib/autoload/tlib/balloon.vim
@@ -3,8 +3,8 @@
 " @GIT:         http://github.com/tomtom/tlib_vim/
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2010-08-30.
-" @Last Change: 2010-09-05.
-" @Revision:    27
+" @Last Change: 2015-11-23.
+" @Revision:    48
 
 
 function! tlib#balloon#Register(expr) "{{{3
@@ -30,8 +30,13 @@ endf
 
 
 function! tlib#balloon#Remove(expr) "{{{3
-    if !exists('b:tlib_balloons')
+    if exists('b:tlib_balloons')
         call filter(b:tlib_balloons, 'v:val != a:expr')
+        if empty(b:tlib_balloons)
+            setlocal ballooneval&
+            setlocal balloonexpr&
+            unlet b:tlib_balloons
+        endif
     endif
 endf
 
@@ -52,3 +57,17 @@ function! tlib#balloon#Expr() "{{{3
 endf
 
 
+function! tlib#balloon#Expand(expr) abort "{{{3
+    if v:beval_bufnr != bufnr('%')
+        " TLogVAR v:beval_bufnr, bufnr('%')
+        return ''
+    endif
+    let win = winsaveview()
+    try
+        call setpos('.', [v:beval_bufnr, v:beval_lnum, v:beval_col, 0])
+        return expand(a:expr)
+    finally
+        call winrestview(win)
+    endtry
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/buffer.vim b/sources_non_forked/tlib/autoload/tlib/buffer.vim
index 8920f758..24e4e0a7 100644
--- a/sources_non_forked/tlib/autoload/tlib/buffer.vim
+++ b/sources_non_forked/tlib/autoload/tlib/buffer.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.352
+" @Last Change: 2015-11-06.
+" @Revision:    7.1.352
 
 
 " Where to display the line when using |tlib#buffer#ViewLine|.
@@ -160,7 +160,7 @@ function! tlib#buffer#GetList(...)
     elseif order == 'basename'
         call sort(buffer_list, function('s:CompareBuffernameByBasename'))
     endif
-    let buffer_nr = map(copy(buffer_list), 'matchstr(v:val, ''\s*\zs\d\+\ze'')')
+    let buffer_nr = map(copy(buffer_list), 'str2nr(matchstr(v:val, ''\s*\zs\d\+\ze''))')
     " TLogVAR buffer_list, buffer_nr
     if show_number
         call map(buffer_list, 'matchstr(v:val, ''^\s*\d\+.\{-}\ze\s\+\S\+ \d\+\s*$'')')
@@ -201,7 +201,7 @@ endf
 
 
 function! s:UndoHighlightLine() "{{{3
-    3match none
+    2match none
     autocmd! TLib CursorMoved,CursorMovedI <buffer>
     autocmd! TLib CursorHold,CursorHoldI <buffer>
     autocmd! TLib InsertEnter,InsertChange,InsertLeave <buffer>
@@ -211,8 +211,8 @@ endf
 
 function! tlib#buffer#HighlightLine(...) "{{{3
     TVarArg ['line', line('.')]
-    " exec '3match MatchParen /^\%'. a:line .'l.*/'
-    exec '3match Search /^\%'. line .'l.*/'
+    " exec '2match MatchParen /^\%'. a:line .'l.*/'
+    exec '2match Search /^\%'. line .'l.*/'
     call tlib#autocmdgroup#Init()
     exec 'autocmd TLib CursorMoved,CursorMovedI <buffer> if line(".") != '. line .' | call s:UndoHighlightLine() | endif'
     autocmd TLib CursorHold,CursorHoldI <buffer> call s:UndoHighlightLine()
@@ -276,27 +276,28 @@ endf
 function! tlib#buffer#InsertText(text, ...) "{{{3
     TVarArg ['keyargs', {}]
     " TLogVAR a:text, keyargs
-    TKeyArg keyargs, ['shift', 0], ['col', col('.')], ['lineno', line('.')], ['pos', 'e'],
-                \ ['indent', 0]
-    " TLogVAR shift, col, lineno, pos, indent
+    let keyargs = extend({
+                \ 'shift': 0, 'col': col('.'), 'lineno': line('.'), 'pos': 'e', 'indent': 0
+                \ }, keyargs)
+    " TLogVAR keyargs
     let grow = 0
     let post_del_last_line = line('$') == 1
-    let line = getline(lineno)
-    if col + shift > 0
-        let pre  = line[0 : (col - 1 + shift)]
-        let post = line[(col + shift): -1]
+    let line = getline(keyargs.lineno)
+    if keyargs.col + keyargs.shift > 0
+        let pre  = line[0 : (keyargs.col - 1 + keyargs.shift)]
+        let post = line[(keyargs.col + keyargs.shift): -1]
     else
         let pre  = ''
         let post = line
     endif
-    " TLogVAR lineno, line, pre, post
+    " TLogVAR keyargs.lineno, line, pre, post
     let text0 = pre . a:text . post
     let text  = split(text0, '\n', 1)
     " TLogVAR text
     let icol = len(pre)
-    " exec 'norm! '. lineno .'G'
-    call cursor(lineno, col)
-    if indent && col > 1
+    " exec 'norm! '. keyargs.lineno .'G'
+    call cursor(keyargs.lineno, keyargs.col)
+    if keyargs.indent && keyargs.col > 1
 		if &fo =~# '[or]'
             " FIXME: Is the simple version sufficient?
             " VERSION 1
@@ -306,13 +307,13 @@ function! tlib#buffer#InsertText(text, ...) "{{{3
 			" norm! a
 			" "norm! o
 			" " TAssertExec redraw | sleep 3
-			" let idt = strpart(getline('.'), 0, col('.') + shift)
+			" let idt = strpart(getline('.'), 0, keyargs.col('.') + keyargs.shift)
 			" " TLogVAR idt
 			" let idtl = len(idt)
 			" -1,.delete
 			" " TAssertExec redraw | sleep 3
-			" call append(lineno - 1, cline)
-			" call cursor(lineno, col)
+			" call append(keyargs.lineno - 1, cline)
+			" call cursor(keyargs.lineno, keyargs.col)
 			" " TAssertExec redraw | sleep 3
 			" if idtl == 0 && icol != 0
 			" 	let idt = matchstr(pre, '^\s\+')
@@ -336,27 +337,27 @@ function! tlib#buffer#InsertText(text, ...) "{{{3
         endfor
     endif
     " TLogVAR text
-    " exec 'norm! '. lineno .'Gdd'
+    " exec 'norm! '. keyargs.lineno .'Gdd'
     call tlib#normal#WithRegister('"tdd', 't')
-    call append(lineno - 1, text)
+    call append(keyargs.lineno - 1, text)
     if post_del_last_line
         call tlib#buffer#KeepCursorPosition('$delete')
     endif
     let tlen = len(text)
-    let posshift = matchstr(pos, '\d\+')
-    " TLogVAR pos
-    if pos =~ '^e'
-        exec lineno + tlen - 1
+    let posshift = matchstr(keyargs.pos, '\d\+')
+    " TLogVAR keyargs.pos
+    if keyargs.pos =~ '^e'
+        exec keyargs.lineno + tlen - 1
         exec 'norm! 0'. (len(text[-1]) - len(post) + posshift - 1) .'l'
-    elseif pos =~ '^s'
-        " TLogVAR lineno, pre, posshift
-        exec lineno
+    elseif keyargs.pos =~ '^s'
+        " TLogVAR keyargs.lineno, pre, posshift
+        exec keyargs.lineno
         exec 'norm! '. len(pre) .'|'
         if !empty(posshift)
             exec 'norm! '. posshift .'h'
         endif
     endif
-    " TLogDBG getline(lineno)
+    " TLogDBG getline(keyargs.lineno)
     " TLogDBG string(getline(1, '$'))
     return grow
 endf
diff --git a/sources_non_forked/tlib/autoload/tlib/cache.vim b/sources_non_forked/tlib/autoload/tlib/cache.vim
index 2d59c3e0..7d2266fd 100644
--- a/sources_non_forked/tlib/autoload/tlib/cache.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cache.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.1.243
+" @Last Change: 2015-10-24.
+" @Revision:    31.1.243
 
 
 " The cache directory. If empty, use |tlib#dir#MyRuntime|.'/cache'.
@@ -45,6 +45,8 @@ TLet g:tlib#cache#dont_purge = ['[\/]\.last_purge$']
 " |pathshorten()|.
 TLet g:tlib#cache#max_filename = 200
 
+let s:cache = {}
+
 
 " :display: tlib#cache#Dir(?mode = 'bg')
 " The default cache directory.
@@ -124,9 +126,13 @@ function! s:SetTimestamp(cfile, type) "{{{3
 endf
 
 
-function! tlib#cache#Save(cfile, dictionary) "{{{3
-    " TLogVAR a:cfile, a:dictionary
-    if !empty(a:cfile)
+function! tlib#cache#Save(cfile, dictionary, ...) "{{{3
+    TVarArg ['options', {}]
+    let in_memory = get(options, 'in_memory', 0)
+    if in_memory
+        " TLogVAR in_memory, a:cfile, localtime()
+        let s:cache[a:cfile] = {'mtime': localtime(), 'data': a:dictionary}
+    elseif !empty(a:cfile)
         " TLogVAR a:dictionary
         call writefile([string(a:dictionary)], a:cfile, 'b')
         call s:SetTimestamp(a:cfile, 'write')
@@ -142,33 +148,48 @@ endf
 
 
 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"))
+    TVarArg ['default', {}], ['options', {}]
+    let in_memory = get(options, 'in_memory', 0)
+    if in_memory
+        " TLogVAR in_memory, a:cfile
+        return get(get(s:cache, a:cfile, {}), 'data', default)
     else
-        let default = a:0 >= 1 ? a:1 : {}
-        return default
+        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
+            return default
+        endif
     endif
 endf
 
 
+" :display: tlib#cache#Value(cfile, generator, ftime, ?generator_args=[], ?options={})
 " 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 : []
+    TVarArg ['args', []], ['options', {}]
+    let in_memory = get(options, 'in_memory', 0)
+    let not_found = in_memory ? !has_key(s:cache, a:cfile) : !filereadable(a:cfile)
+    " TLogVAR in_memory, not_found
+    let cftime = in_memory ? (not_found ? 0 : s:cache[a:cfile].mtime) : getftime(a:cfile)
+    if not_found || (a:ftime != 0 && cftime < a:ftime)
         " TLogVAR a:generator, args
         let val = call(a:generator, args)
         " TLogVAR val
         let cval = {'val': val}
         " TLogVAR cval
-        call tlib#cache#Save(a:cfile, cval)
+        call tlib#cache#Save(a:cfile, cval, options)
         return val
     else
-        let val = tlib#cache#Get(a:cfile)
-        return val.val
+        let val = tlib#cache#Get(a:cfile, {}, options)
+        if !has_key(val, 'val')
+            throw 'tlib#cache#Value: Internal error: '. a:cfile
+        else
+            return val.val
+        endif
     endif
 endf
 
diff --git a/sources_non_forked/tlib/autoload/tlib/char.vim b/sources_non_forked/tlib/autoload/tlib/char.vim
index 277716d3..d3d2cb6f 100644
--- a/sources_non_forked/tlib/autoload/tlib/char.vim
+++ b/sources_non_forked/tlib/autoload/tlib/char.vim
@@ -1,15 +1,7 @@
-" char.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: 2014-01-20.
-" @Revision:    0.0.37
-
-if &cp || exists("loaded_tlib_char_autoload")
-    finish
-endif
-let loaded_tlib_char_autoload = 1
+" @Revision:    38
 
 
 " :def: function! tlib#char#Get(?timeout=0)
diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/sources_non_forked/tlib/autoload/tlib/cmd.vim
index 79334325..f65a2372 100644
--- a/sources_non_forked/tlib/autoload/tlib/cmd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cmd.vim
@@ -1,15 +1,7 @@
-" cmd.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-08-23.
-" @Last Change: 2014-10-21.
-" @Revision:    0.0.54
-
-if &cp || exists("loaded_tlib_cmd_autoload")
-    finish
-endif
-let loaded_tlib_cmd_autoload = 1
+" @Revision:    58
 
 
 let g:tlib#cmd#last_output = []
@@ -77,6 +69,12 @@ function! tlib#cmd#ParseScriptname(line) "{{{3
     exe 'drop '. fnameescape(parsedValue)
 endf
 
+
+function! tlib#cmd#TBrowseScriptnames() abort "{{{3
+   call tlib#cmd#BrowseOutputWithCallback("tlib#cmd#ParseScriptname", "scriptnames")
+endf
+
+
 " :def: function! tlib#cmd#UseVertical(?rx='')
 " Look at the history whether the command was called with vertical. If 
 " an rx is provided check first if the last entry in the history matches 
diff --git a/sources_non_forked/tlib/autoload/tlib/comments.vim b/sources_non_forked/tlib/autoload/tlib/comments.vim
index b356c7c1..879cde17 100644
--- a/sources_non_forked/tlib/autoload/tlib/comments.vim
+++ b/sources_non_forked/tlib/autoload/tlib/comments.vim
@@ -1,17 +1,7 @@
-" comments.vim
 " @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:     2007-11-15.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.24
-
-if &cp || exists("loaded_tlib_comments_autoload")
-    finish
-endif
-let loaded_tlib_comments_autoload = 1
-let s:save_cpo = &cpo
-set cpo&vim
+" @Revision:    25
 
 
 " function! tlib#comments#Comments(?rx='')
@@ -34,24 +24,3 @@ function! tlib#comments#Comments(...)
 endf
 
 
-" function! tlib#comments#PartitionLine(line) "{{{3
-"     if !empty(&commentstring)
-"         let cs = '^\(\s*\)\('. printf(tlib#rx#Escape(&commentstring), '\)\(.\{-}\)\(') .'\)\(.*\)$'
-"         let ml = matchlist(a:line, cs)
-"     else
-"         let ml = []
-"     endif
-"     if !empty(ml)
-"         let [m_0, pre, open, line, close, post; rest] = ml
-"     else
-"         let [m_0, pre, line; rest] = matchstr(a:line, '^\(\s*\)\(.*\)$')
-"         for [key, val] in tlib#comments#Comments()
-"             if +++
-"         endfor
-"     endif
-"     return {'pre': pre, 'open': open, 'line': line, 'close': close, 'post': post}
-" endf
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/sources_non_forked/tlib/autoload/tlib/date.vim b/sources_non_forked/tlib/autoload/tlib/date.vim
index 482d72c5..7be5e9fb 100644
--- a/sources_non_forked/tlib/autoload/tlib/date.vim
+++ b/sources_non_forked/tlib/autoload/tlib/date.vim
@@ -3,14 +3,27 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2010-03-25.
-" @Last Change: 2010-09-17.
-" @Revision:    0.0.34
+" @Last Change: 2015-11-23.
+" @Revision:    21.0.34
 
 
 if !exists('g:tlib#date#ShortDatePrefix') | let g:tlib#date#ShortDatePrefix = '20' | endif "{{{2
 if !exists('g:tlib#date#TimeZoneShift')   | let g:tlib#date#TimeZoneShift = 0      | endif "{{{2
 
 let g:tlib#date#dayshift = 60 * 60 * 24
+" let g:tlib#date#date_rx = '\<\(\d\{4}\)-\(\d\d\)-\(\d\d\)\%(\s\+\(\(\d\d\):\(\d\d\)\)\)\?\>'
+let g:tlib#date#date_rx = '\<\(\d\{4}\)-\(\d\d\)-\(\d\d\)\>'
+let g:tlib#date#date_format = '%Y-%m-%d'
+
+
+function! tlib#date#IsDate(text) abort "{{{3
+    return a:text =~# '^'. g:tlib#date#date_rx .'$'
+endf
+
+
+function! tlib#date#Format(secs1970) abort "{{{3
+    return strftime(g:tlib#date#date_format, a:secs1970)
+endf
 
 
 " :display: tlib#date#DiffInDays(date1, ?date2=localtime(), ?allow_zero=0)
@@ -118,3 +131,33 @@ function! tlib#date#SecondsSince1970(date, ...) "{{{3
     return seconds
 endf
 
+
+function! tlib#date#Shift(date, shift) abort "{{{3
+    let n = str2nr(matchstr(a:shift, '\d\+'))
+    let ml = matchlist(a:date, g:tlib#date#date_rx)
+    " TLogVAR a:date, a:shift, n, ml
+    if a:shift =~ 'd$'
+        let secs = tlib#date#SecondsSince1970(a:date) + g:tlib#date#dayshift * n
+        " TLogVAR secs
+        let date = tlib#date#Format(secs)
+    elseif a:shift =~ 'w$'
+        let secs = tlib#date#SecondsSince1970(a:date) + g:tlib#date#dayshift * n * 7
+        let date = tlib#date#Format(secs)
+    elseif a:shift =~ 'm$'
+        let d = str2nr(ml[3])
+        let ms = str2nr(ml[2]) + n
+        let m = (ms - 1) % 12 + 1
+        let yr = str2nr(ml[1]) + ms / 12
+        let date = printf('%04d-%02d-%02d', yr, m, d)
+        " TLogVAR d, ms, m, yr, date
+    elseif a:shift =~ 'y$'
+        let yr = str2nr(ml[1]) + n
+        let date = substitute(a:date, '^\d\{4}', yr, '')
+    endif
+    " if !empty(ml[4]) && date !~ '\s'. ml[4] .'$'
+    "     let date .= ' '. ml[4]
+    " endif
+    " TLogVAR date
+    return date
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/dictionary.vim b/sources_non_forked/tlib/autoload/tlib/dictionary.vim
new file mode 100644
index 00000000..77712b03
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/dictionary.vim
@@ -0,0 +1,15 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @Website:     https://github.com/tomtom
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2015-10-14
+" @Revision:    2
+
+
+function! tlib#dictionary#Rev(dict) abort "{{{3
+    let rev = {}
+    for [m, f] in items(a:dict)
+        let rev[f] = m
+    endfor
+    return rev
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/dir.vim b/sources_non_forked/tlib/autoload/tlib/dir.vim
index 758ab7d9..f6f3e4e9 100644
--- a/sources_non_forked/tlib/autoload/tlib/dir.vim
+++ b/sources_non_forked/tlib/autoload/tlib/dir.vim
@@ -1,15 +1,7 @@
-" dir.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: 2014-07-07.
-" @Revision:    0.0.38
-
-if &cp || exists("loaded_tlib_dir_autoload")
-    finish
-endif
-let loaded_tlib_dir_autoload = 1
+" @Revision:    40
 
 " TLet g:tlib#dir#sep = '/'
 TLet g:tlib#dir#sep = exists('+shellslash') && !&shellslash ? '\' : '/'
@@ -74,7 +66,7 @@ endf
 " :def: function! tlib#dir#CD(dir, ?locally=0) => CWD
 function! tlib#dir#CD(dir, ...) "{{{3
     TVarArg ['locally', 0]
-    let cmd = locally ? 'lcd ' : 'cd '
+    let cmd = locally ? 'lcd! ' : 'cd! '
     " let cwd = getcwd()
     let cmd .= tlib#arg#Ex(a:dir)
     " TLogVAR a:dir, locally, cmd
diff --git a/sources_non_forked/tlib/autoload/tlib/eval.vim b/sources_non_forked/tlib/autoload/tlib/eval.vim
index 7b2f859a..117209ed 100644
--- a/sources_non_forked/tlib/autoload/tlib/eval.vim
+++ b/sources_non_forked/tlib/autoload/tlib/eval.vim
@@ -1,15 +1,7 @@
-" eval.vim
 " @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:     2007-09-16.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.34
-
-if &cp || exists("loaded_tlib_eval_autoload")
-    finish
-endif
-let loaded_tlib_eval_autoload = 1
+" @Revision:    56
 
 
 function! tlib#eval#FormatValue(value, ...) "{{{3
@@ -53,3 +45,28 @@ function! tlib#eval#FormatValue(value, ...) "{{{3
 endf
 
 
+function! tlib#eval#Extend(a, b, ...) abort "{{{3
+    let mode = a:0 >= 1 ? a:1 : 'force'
+    if type(a:a) != type(a:b)
+        throw 'tlib#eval#Extend: Incompatible types: a='. string(a:a) .' b='. string(a:b)
+    elseif type(a:a) == 3 " list
+        return extend(a:a, a:b, mode)
+    elseif type(a:a) == 4 " dict
+        for k in keys(a:b)
+            if has_key(a:a, k)
+                if mode == 'force'
+                    let a:a[k] = tlib#eval#Extend(copy(a:a[k]), a:b[k], mode)
+                elseif mode == 'error'
+                    throw 'tlib#eval#Extend: Key already exists: '. k
+                endif
+            else
+                let a:a[k] = a:b[k]
+            endif
+            unlet! k
+        endfor
+        return a:a
+    else
+        return a:b
+    endif
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/file.vim b/sources_non_forked/tlib/autoload/tlib/file.vim
index b4a4d9e6..d0f89b96 100644
--- a/sources_non_forked/tlib/autoload/tlib/file.vim
+++ b/sources_non_forked/tlib/autoload/tlib/file.vim
@@ -1,17 +1,29 @@
-" file.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: 2014-07-07.
-" @Revision:    0.0.150
+" @Revision:    168
 
-if &cp || exists("loaded_tlib_file_autoload")
-    finish
+
+if !exists('g:tlib#file#drop')
+    " If true, use |:drop| to edit loaded buffers (only available with GUI).
+    let g:tlib#file#drop = has('gui')   "{{{2
 endif
-let loaded_tlib_file_autoload = 1
 
 
+if !exists('g:tlib#file#use_tabs')
+    let g:tlib#file#use_tabs = 0   "{{{2
+endif
+
+
+if !exists('g:tlib#file#edit_cmds')
+    let g:tlib#file#edit_cmds = g:tlib#file#use_tabs ? {'buffer': 'tab split | buffer', 'edit': 'tabedit'} : {}  "{{{2
+endif
+
+
+if !exists('g:tlib#file#absolute_filename_rx')
+    let g:tlib#file#absolute_filename_rx = '^\~\?[\/]'   "{{{2
+endif
+
 """ File related {{{1
 " For the following functions please see ../../test/tlib.vim for examples.
 
@@ -36,21 +48,32 @@ function! tlib#file#Split(filename) "{{{3
 endf
 
 
-" :display: tlib#file#Join(filename_parts, ?strip_slashes=1)
+" :display: tlib#file#Join(filename_parts, ?strip_slashes=1, ?maybe_absolute=0)
 " EXAMPLES: >
 "   tlib#file#Join(['foo', 'bar', 'filename.txt'])
 "   => 'foo/bar/filename.txt'
 function! tlib#file#Join(filename_parts, ...) "{{{3
-    TVarArg ['strip_slashes', 1]
+    TVarArg ['strip_slashes', 1], 'maybe_absolute'
     " TLogVAR a:filename_parts, strip_slashes
+    if maybe_absolute
+        let filename_parts = []
+        for part in a:filename_parts
+            if part =~ g:tlib#file#absolute_filename_rx
+                let filename_parts = []
+            endif
+            call add(filename_parts, part)
+        endfor
+    else
+        let filename_parts = a:filename_parts
+    endif
     if strip_slashes
         " let rx    = tlib#rx#Escape(g:tlib#dir#sep) .'$'
         let rx    = '[/\\]\+$'
-        let parts = map(copy(a:filename_parts), 'substitute(v:val, rx, "", "")')
+        let parts = map(copy(filename_parts), 'substitute(v:val, rx, "", "")')
         " TLogVAR parts
         return join(parts, g:tlib#dir#sep)
     else
-        return join(a:filename_parts, g:tlib#dir#sep)
+        return join(filename_parts, g:tlib#dir#sep)
     endif
 endf
 
@@ -181,3 +204,75 @@ function! tlib#file#With(fcmd, bcmd, files, ...) "{{{3
 endf
 
 
+" Return 0 if the file isn't readable/doesn't exist.
+" Otherwise return 1.
+function! tlib#file#Edit(fileid) "{{{3
+    if type(a:fileid) == 0
+        let bn = a:fileid
+        let filename = fnamemodify(bufname(bn), ':p')
+    else
+        let filename = fnamemodify(a:fileid, ':p')
+        let bn = bufnr(filename)
+    endif
+    if filename == expand('%:p')
+        return 1
+    else
+        " TLogVAR a:fileid, bn, filename, g:tlib#file#drop, filereadable(filename)
+        if bn != -1 && buflisted(bn)
+            if g:tlib#file#drop
+                " echom "DBG" get(g:tlib#file#edit_cmds, 'drop', 'drop') fnameescape(filename)
+                exec get(g:tlib#file#edit_cmds, 'drop', 'drop') fnameescape(filename)
+            else
+                " echom "DBG" get(g:tlib#file#edit_cmds, 'buffer', 'buffer') bn
+                exec get(g:tlib#file#edit_cmds, 'buffer', 'buffer') bn
+            endif
+            return 1
+        elseif filereadable(filename)
+            try
+                " let file = tlib#arg#Ex(filename)
+                " " TLogVAR file
+                " echom "DBG" get(g:tlib#file#edit_cmds, 'edit', 'edit') fnameescape(filename)
+                exec get(g:tlib#file#edit_cmds, 'edit', 'edit') fnameescape(filename)
+            catch /E325/
+                " swap file exists, let the user handle it
+            catch
+                echohl error
+                echom v:exception
+                echohl NONE
+            endtry
+            return 1
+        else
+            echom "TLIB: File not readable: " . filename
+            if filename != a:fileid
+                echom "TLIB: original filename: " . a:fileid
+            endif
+        endif
+    endif
+    return 0
+endf
+
+
+if v:version > 704 || (v:version == 704 && has('patch279'))
+
+    function! tlib#file#Glob(pattern) abort "{{{3
+        return glob(a:pattern, 0, 1)
+    endf
+
+    function! tlib#file#Globpath(path, pattern) abort "{{{3
+        return globpath(a:path, a:pattern, 0, 1)
+    endf
+
+else
+
+    " :nodoc:
+    function! tlib#file#Glob(pattern) abort "{{{3
+        return split(glob(a:pattern), '\n')
+    endf
+
+    " :nodoc:
+    function! tlib#file#Globpath(path, pattern) abort "{{{3
+        return split(globpath(a:path, a:pattern), '\n')
+    endf
+
+endif
+
diff --git a/sources_non_forked/tlib/autoload/tlib/hook.vim b/sources_non_forked/tlib/autoload/tlib/hook.vim
index fcef3404..07d05041 100644
--- a/sources_non_forked/tlib/autoload/tlib/hook.vim
+++ b/sources_non_forked/tlib/autoload/tlib/hook.vim
@@ -1,15 +1,7 @@
-" hook.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-08-21.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.10
-
-if &cp || exists("loaded_tlib_hook_autoload")
-    finish
-endif
-let loaded_tlib_hook_autoload = 1
+" @Revision:    11
 
 
 " :def: function! tlib#hook#Run(hook, ?dict={})
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index 1bb571fc..e8f892b0 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:    1338
+" @Revision:    1366
 
 
 " :filedoc:
@@ -131,6 +131,7 @@ TLet g:tlib#input#keyagents_InputList_s = {
             \ "\<End>":      'tlib#agent#End',
             \ "\<Up>":       'tlib#agent#Up',
             \ "\<Down>":     'tlib#agent#Down',
+            \ 9:             'tlib#agent#Complete',
             \ "\<c-Up>":     'tlib#agent#UpN',
             \ "\<c-Down>":   'tlib#agent#DownN',
             \ "\<Left>":     'tlib#agent#ShiftLeft',
@@ -252,6 +253,9 @@ TLet g:tlib#input#filename_max_width = '&co / 2'
 " Several pattern matching styles are supported. See 
 " |g:tlib#input#filter_mode|.
 "
+" Users can type <Tab> to complete the current filter with the longest 
+" match.
+"
 " EXAMPLES: >
 "   echo tlib#input#List('s', 'Select one item', [100,200,300])
 "   echo tlib#input#List('si', 'Select one item', [100,200,300])
@@ -362,7 +366,7 @@ function! tlib#input#ListW(world, ...) "{{{3
             " let time01 = str2float(reltimestr(reltime()))  " DBG
             " TLogVAR time01, time01 - time0
             try
-                call s:RunStateHandlers(world)
+                let world = s:RunStateHandlers(world)
 
                 " if exists('b:tlib_world_event')
                 "     let event = b:tlib_world_event
@@ -518,7 +522,8 @@ function! tlib#input#ListW(world, ...) "{{{3
                     "     let world.offset = world.prefidx
                     " endif
                     " TLogDBG 8
-                    if world.initial_display || !tlib#char#IsAvailable()
+                    " TLogVAR world.initial_display, !tlib#char#IsAvailable()
+                    if world.state =~ '\<update\>' || world.initial_display || !tlib#char#IsAvailable()
                         " TLogDBG len(dlist)
                         call world.DisplayList(world.Query(), dlist)
                         call world.FollowCursor()
@@ -585,8 +590,9 @@ function! tlib#input#ListW(world, ...) "{{{3
                 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)
+                    " let world = call(nagent, [world, world.GetSelectedItems(world.CurrentItem())])
+                    " call s:CheckAgentReturnValue(nagent, world)
+                    let world = s:CallAgent({'agent': nagent}, world, world.GetSelectedItems(world.CurrentItem()))
                 elseif !empty(world.next_eval)
                     let selected = world.GetSelectedItems(world.CurrentItem())
                     let neval = world.next_eval
@@ -601,9 +607,10 @@ function! tlib#input#ListW(world, ...) "{{{3
                     " TLogVAR c, world.key_map[world.key_mode][c]
                     " TLog "Agent: ". string(world.key_map[world.key_mode][c])
                     let handler = world.key_map[world.key_mode][c]
-                    " TLogVAR handler
-                    let world = call(handler.agent, [world, world.GetSelectedItems(world.CurrentItem())])
-                    call s:CheckAgentReturnValue(c, world)
+                    " " TLogVAR handler
+                    " let world = call(handler.agent, [world, world.GetSelectedItems(world.CurrentItem())])
+                    " call s:CheckAgentReturnValue(c, world)
+                    let world = s:CallAgent(handler, world, world.GetSelectedItems(world.CurrentItem()))
                     silent! let @/ = sr
                     " continue
                 elseif c == 13
@@ -662,8 +669,9 @@ function! tlib#input#ListW(world, ...) "{{{3
                     " 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)
+                    " let world = call(agent, [world, c])
+                    " call s:CheckAgentReturnValue(agent, world)
+                    let world = s:CallAgent({'agent': agent}, world, c)
                 elseif c >= 32
                     let world.state = 'display'
                     let numbase = get(world.numeric_chars, c, -99999)
@@ -856,6 +864,18 @@ function! tlib#input#ListW(world, ...) "{{{3
 endf
 
 
+function! s:CallAgent(handler, world, list) abort "{{{3
+    let agent = a:handler.agent
+    let args = [a:world, a:list]
+    if has_key(a:handler, 'args')
+        let args += a:handler.args
+    endif
+    let world = call(agent, args)
+    " TLogVAR world.state, world.rv
+    call s:CheckAgentReturnValue(agent, world)
+    return world
+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
@@ -916,6 +936,7 @@ function! s:Init(world, cmd) "{{{3
         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}')
         endfor
+        " TLogVAR a:world.key_mode
         if type(a:world.key_handlers) == 3
             call s:ExtendKeyMap(a:world, a:world.key_mode, a:world.key_handlers)
         elseif type(a:world.key_handlers) == 4
@@ -925,6 +946,7 @@ function! s:Init(world, cmd) "{{{3
         else
             throw "tlib#input#ListW: key_handlers must be either a list or a dictionary"
         endif
+        " TLogVAR a:world.type, a:world.key_map
         if !empty(a:cmd)
             let a:world.state .= ' '. a:cmd
         endif
@@ -943,7 +965,7 @@ function! s:ExtendKeyMap(world, key_mode, key_handlers) "{{{3
 endf
 
 
-function s:PopupmenuExists()
+function! s:PopupmenuExists()
     if !g:tlib#input#use_popup
                 \ || exists(':popup') != 2
                 \ || !(has('gui_win32') || has('gui_gtk') || has('gui_gtk2'))
@@ -1082,11 +1104,13 @@ function! s:RunStateHandlers(world) "{{{3
                 exec ea
             else
                 let agent = get(handler, 'agent', '')
-                let a:world = call(agent, [a:world, a:world.GetSelectedItems(a:world.CurrentItem())])
-                call s:CheckAgentReturnValue(agent, a:world)
+                " let world = call(agent, [a:world, a:world.GetSelectedItems(a:world.CurrentItem())])
+                " call s:CheckAgentReturnValue(agent, a:world)
+                let world = s:CallAgent({'agent': agent}, world, world.GetSelectedItems(world.CurrentItem()))
             endif
         endif
     endfor
+    return world
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/list.vim b/sources_non_forked/tlib/autoload/tlib/list.vim
index 31696fae..dbbc702f 100644
--- a/sources_non_forked/tlib/autoload/tlib/list.vim
+++ b/sources_non_forked/tlib/autoload/tlib/list.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: 2011-03-18.
-" @Revision:    57
+" @Last Change: 2015-10-21.
+" @Revision:    61
 
 
 """ List related functions {{{1
@@ -140,6 +140,7 @@ endf
 
 
 function! tlib#list#Uniq(list, ...) "{{{3
+    " TLogVAR a:list
     TVarArg ['get_value', ''], ['remove_empty', 0]
     if remove_empty
         call filter(a:list, 'type(v:val) == 0 || !empty(v:val)')
@@ -153,6 +154,7 @@ function! tlib#list#Uniq(list, ...) "{{{3
                 let seen[e] = 1
                 call add(uniques, e)
             endif
+            unlet e
         endfor
     else
         for e in a:list
@@ -161,6 +163,7 @@ function! tlib#list#Uniq(list, ...) "{{{3
                 let seen[v] = 1
                 call add(uniques, e)
             endif
+            unlet e
         endfor
     endif
     return uniques
diff --git a/sources_non_forked/tlib/autoload/tlib/loclist.vim b/sources_non_forked/tlib/autoload/tlib/loclist.vim
new file mode 100644
index 00000000..198dd1be
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/loclist.vim
@@ -0,0 +1,13 @@
+" @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)
+" @Last Change: 2015-10-24
+" @Revision:    2
+
+
+function! tlib#loclist#Browse(...) abort "{{{3
+    let list = getloclist(0)
+    return call(function('tlib#qfl#QflList'), [list] + a:000)
+endf
+
+
diff --git a/sources_non_forked/tlib/autoload/tlib/notify.vim b/sources_non_forked/tlib/autoload/tlib/notify.vim
index cf6a0473..2f45bdb8 100644
--- a/sources_non_forked/tlib/autoload/tlib/notify.vim
+++ b/sources_non_forked/tlib/autoload/tlib/notify.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-09-19.
-" @Last Change: 2012-01-02.
-" @Revision:    0.0.19
+" @Last Change: 2015-04-07.
+" @Revision:    0.3.19
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -17,13 +17,14 @@ function! tlib#notify#Echo(text, ...)
     TVarArg 'style'
     let ruler = &ruler
     let showcmd = &showcmd
+    let text = substitute(a:text, '\n', '|', 'g')
     try
         set noruler
         set noshowcmd
         if !empty(style)
-            exec 'echohl '. style
+            exec 'echohl' style
         endif
-        echo strpart(a:text, 0, &columns - 1)
+        echo strpart(text, 0, &columns - 1)
     finally
         if !empty(style)
             echohl None
diff --git a/sources_non_forked/tlib/autoload/tlib/progressbar.vim b/sources_non_forked/tlib/autoload/tlib/progressbar.vim
index 6ca0ce9b..e739eb3c 100644
--- a/sources_non_forked/tlib/autoload/tlib/progressbar.vim
+++ b/sources_non_forked/tlib/autoload/tlib/progressbar.vim
@@ -1,15 +1,7 @@
-" progressbar.vim
 " @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:     2007-09-30.
-" @Last Change: 2010-01-07.
-" @Revision:    0.0.69
-
-if &cp || exists("loaded_tlib_progressbar_autoload")
-    finish
-endif
-let loaded_tlib_progressbar_autoload = 1
+" @Revision:    72
 
 let s:statusline = []
 let s:laststatus = []
@@ -43,15 +35,15 @@ endf
 
 
 function! tlib#progressbar#Display(value, ...) "{{{3
-    TVarArg 'extra'
+    TVarArg 'extra', ['always', 0]
     let ts = localtime()
-    if ts == s:timestamp
+    if !always && ts == s:timestamp
         return
     else
         let s:timestamp = ts
     endif
     let val = a:value * s:width[0] / s:max[0]
-    if val != s:value[0]
+    if always || val != s:value[0]
         let s:value[0] = val
         let pbl = repeat('#', val)
         let pbr = repeat('.', s:width[0] - val)
diff --git a/sources_non_forked/tlib/autoload/tlib/qfl.vim b/sources_non_forked/tlib/autoload/tlib/qfl.vim
new file mode 100644
index 00000000..7d4b442d
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/qfl.vim
@@ -0,0 +1,314 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @Website:     https://github.com/tomtom
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2015-11-13
+" @Revision:    59
+
+" :nodoc:
+TLet g:tlib#qfl#world = {
+            \ 'type': 'mi',
+            \ 'query': 'Select entry',
+            \ 'pick_last_item': 0,
+            \ 'resize_vertical': 0,
+            \ 'resize': 20,
+            \ 'scratch': '__TLibQFL__',
+            \ 'tlib_UseInputListScratch': 'call tlib#qfl#InitListBuffer(world)',
+            \ 'key_handlers': [
+                \ {'key':  5, 'agent': 'tlib#qfl#AgentWithSelected', 'key_name': '<c-e>', 'help': 'Run a command on selected lines'},
+                \ {'key': 16, 'agent': 'tlib#qfl#AgentPreviewQFE',   'key_name': '<c-p>', 'help': 'Preview'},
+                \ {'key': 60, 'agent': 'tlib#qfl#AgentGotoQFE',      'key_name': '<',     'help': 'Jump (don''t close the list)'},
+                \ {'key': 19, 'agent': 'tlib#qfl#AgentSplitBuffer',  'key_name': '<c-s>', 'help': 'Show in split buffer'},
+                \ {'key': 20, 'agent': 'tlib#qfl#AgentTabBuffer',    'key_name': '<c-t>', 'help': 'Show in tab'},
+                \ {'key': 22, 'agent': 'tlib#qfl#AgentVSplitBuffer', 'key_name': '<c-v>', 'help': 'Show in vsplit buffer'},
+                \ {'key': 12, 'agent': 'tlib#qfl#AgentEditLine',     'key_name': '<c-l>', 'help': 'Edit selected line(s)'},
+                \ {'key': "\<c-insert>", 'agent': 'tlib#qfl#SetFollowCursor', 'key_name': '<c-ins>', 'help': 'Toggle trace cursor'},
+            \ ],
+            \ 'return_agent': 'tlib#qfl#AgentEditQFE',
+            \ }
+
+
+function! tlib#qfl#FormatQFLE(qfe) dict abort "{{{3
+    let filename = tlib#qfl#QfeFilename(a:qfe)
+    if get(self, 'qfl_short_filename', '')
+        let filename = pathshorten(filename)
+    endif
+    return printf("%s|%d| %s", filename, a:qfe.lnum, get(a:qfe, "text"))
+endf
+
+
+function! tlib#qfl#QfeFilename(qfe) abort "{{{3
+    let filename = get(a:qfe, 'filename')
+    if empty(filename)
+        let filename = bufname(get(a:qfe, 'bufnr'))
+    endif
+    return filename
+endf
+
+
+function! tlib#qfl#InitListBuffer(world) "{{{3
+    let set_syntax = get(a:world, 'set_syntax', 'tlib#qfl#SetSyntax')
+    call call(set_syntax, [], a:world)
+    if has('balloon_eval')
+        setlocal ballooneval balloonexpr=tlib#qfl#Balloon()
+    endif
+endf
+
+
+function! tlib#qfl#SetSyntax() dict abort "{{{3
+    let syntax = get(self, 'qfl_list_syntax', '')
+    let nextgroup = get(self, 'qfl_list_syntax_nextgroup', '')
+    " TLogVAR syntax, nextgroup
+    if !empty(syntax)
+        exec printf('runtime syntax/%s.vim', syntax)
+    endif
+    syn match TTagedFilesFilename /\%(\f\+\| \)\+\ze|\d\+| / nextgroup=TTagedFilesLNum
+    if !empty(nextgroup)
+        exec 'syn match TTagedFilesLNum /|\d\+|\s\+/ nextgroup='. nextgroup
+    else
+        syn match TTagedFilesLNum /|\d\+|/
+    endif
+    hi def link TTagedFilesFilename Directory
+    hi def link TTagedFilesLNum LineNr
+endf
+
+
+function! tlib#qfl#Balloon() "{{{3
+    let world = getbufvar(v:beval_bufnr, 'tlibDisplayListWorld')
+    let current = max([1, world.offset]) + v:beval_lnum - 1
+    if current > len(world.table)
+        let current = len(world.table)
+    endif
+    let baseidx = world.GetBaseIdx0(current)
+    " TLogVAR world.offset, v:beval_lnum, current, baseidx
+    let item = world.data[baseidx]
+    let bufnr = get(item, 'bufnr', 0)
+    let bufname = get(item, 'filename', '')
+    if bufnr == 0 && !empty(bufname)
+        let bufnr = bufnr(bufname)
+    endif
+    if empty(bufname) && bufnr > 0
+        let bufname = bufname(bufnr)
+    endif
+    " TLogVAR item
+    if bufnr == 0
+        return ''
+    else
+        let lines = [printf("%d#%d: %s", bufnr, item.lnum, bufname)]
+        if has('balloon_multiline')
+            let desc = {'nr': 'Error number', 'type': 'Error type', 'text': ''}
+            for key in ['nr', 'type', 'text']
+                if has_key(item, key) && !empty(item[key])
+                    let keydesc = get(desc, key, key)
+                    if empty(keydesc)
+                        let text = item[key]
+                    else
+                        let text = printf("%s: %s", key, item[key])
+                    endif
+                    call add(lines, text)
+                endif
+            endfor
+        endif
+        return join(lines, "\n")
+    endif
+    " v:beval_bufnr	number of the buffer in which balloon is going to show
+    " v:beval_winnr	number of the window
+    " v:beval_lnum	line number
+    " v:beval_col	column number (byte index)
+    " v:beval_text	word under or after the mouse pointer
+endf
+
+
+function! tlib#qfl#AgentEditQFE(world, selected, ...) "{{{3
+    TVarArg ['cmd_edit', ''], ['cmd_buffer', '']
+    " TVarArg ['cmd_edit', 'edit'], ['cmd_buffer', 'buffer']
+    " TLogVAR a:selected
+    if empty(a:selected)
+        call a:world.RestoreOrigin()
+        " call a:world.ResetSelected()
+    else
+        call a:world.RestoreOrigin()
+        for idx in a:selected
+            let idx -= 1
+            " TLogVAR idx
+            if idx >= 0
+                " TLogVAR a:world.data
+                " call tlog#Debug(string(map(copy(a:world.data), 'v:val.bufnr')))
+                " TLogVAR idx, a:world.data[idx]
+                let qfe = a:world.data[idx]
+                " let back = a:world.SwitchWindow('win')
+                " TLogVAR cmd_edit, cmd_buffer, qfe
+                let fn = tlib#qfl#QfeFilename(qfe)
+                " TLogVAR cmd_edit, cmd_buffer, fn
+                if empty(cmd_edit) && empty(cmd_buffer)
+                    if tlib#file#Edit(fn)
+                        call tlib#buffer#ViewLine(qfe.lnum)
+                    endif
+                else
+                    call tlib#file#With(cmd_edit, cmd_buffer, [fn], a:world)
+                    " TLogDBG bufname('%')
+                    " TLogVAR &filetype
+                    call tlib#buffer#ViewLine(qfe.lnum)
+                    " call a:world.SetOrigin()
+                    " exec back
+                endif
+            endif
+        endfor
+    endif
+    return a:world
+endf 
+
+
+function! tlib#qfl#AgentPreviewQFE(world, selected) "{{{3
+    " TLogVAR a:selected
+    let back = a:world.SwitchWindow('win')
+    call tlib#qfl#AgentEditQFE(a:world, a:selected[0:0])
+    exec back
+    redraw
+    let a:world.state = 'redisplay'
+    return a:world
+endf
+
+
+function! tlib#qfl#AgentGotoQFE(world, selected) "{{{3
+    if !empty(a:selected)
+        if a:world.win_wnr != winnr()
+            let world = tlib#agent#Suspend(a:world, a:selected)
+            exec a:world.win_wnr .'wincmd w'
+        endif
+        call tlib#qfl#AgentEditQFE(a:world, a:selected[0:0])
+    endif
+    return a:world
+endf
+
+
+function! tlib#qfl#AgentWithSelected(world, selected, ...) "{{{3
+    let cmd = a:0 >= 1 ? a:1 : input('Ex command: ', '', 'command')
+    let world = a:world
+    if !empty(cmd)
+        let world = tlib#qfl#RunCmdOnSelected(world, a:selected, cmd)
+    else
+        let world.state = 'redisplay'
+    endif
+    return world
+endf
+
+
+function! tlib#qfl#RunCmdOnSelected(world, selected, cmd, ...) "{{{3
+    let close_scratch = a:0 >= 1 ? a:1 : 1
+    if close_scratch
+        call a:world.CloseScratch()
+    endif
+    " TLogVAR a:cmd
+    for entry in a:selected
+        " TLogVAR entry, a:world.GetBaseItem(entry)
+        call tlib#qfl#AgentEditQFE(a:world, [entry])
+        " TLogDBG bufname('%')
+        exec a:cmd
+        " let item = a:world.data[a:world.GetBaseIdx(entry - 1)]
+        " <+TODO+>
+        let item = a:world.data[entry - 1]
+        " TLogVAR entry, item, getline('.')
+        if has_key(a:world, 'GetBufferLines')
+            let lines = a:world.GetBufferLines('.', '.')
+        else
+            let lines = getline('.', '.')
+        endif
+        let item['text'] = tlib#string#Strip(lines[0])
+    endfor
+    if has_key(a:world, 'AfterRunCmd')
+        if bufnr('%') == a:world.bufnr
+            call a:world.AfterRunCmd()
+        else
+            " <+TODO+> Run in other buffer
+        endif
+    endif
+    " call s:FormatBase(a:world)
+    call a:world.RestoreOrigin()
+    let a:world.state = 'reset'
+    return a:world
+endf
+
+
+function! tlib#qfl#AgentSplitBuffer(world, selected) "{{{3
+    call a:world.CloseScratch()
+    return tlib#qfl#AgentEditQFE(a:world, a:selected, 'split', 'sbuffer')
+endf
+
+
+function! tlib#qfl#AgentTabBuffer(world, selected) "{{{3
+    call a:world.CloseScratch()
+    return tlib#qfl#AgentEditQFE(a:world, a:selected, 'tabedit', 'tab sbuffer')
+endf
+
+
+function! tlib#qfl#AgentVSplitBuffer(world, selected) "{{{3
+    call a:world.CloseScratch()
+    return tlib#qfl#AgentEditQFE(a:world, a:selected, 'vertical split', 'vertical sbuffer')
+endf
+
+
+" function! tlib#qfl#AgentOpenBuffer(world, selected) "{{{3
+" endf
+
+
+function! tlib#qfl#AgentEditLine(world, selected) "{{{3
+    call a:world.CloseScratch()
+    let cmd = 'call tlib#qfl#EditLine(".")'
+    return tlib#qfl#RunCmdOnSelected(a:world, a:selected, cmd)
+    let a:world.state = 'reset'
+    return a:world
+endf
+
+
+function! tlib#qfl#EditLine(lnum) "{{{3
+    call inputsave()
+    let line = input('', getline(a:lnum))
+    call inputrestore()
+    if !empty(line)
+        call setline(line(a:lnum), line)
+    endif
+endf
+
+
+function! tlib#qfl#SetFollowCursor(world, selected) "{{{3
+    if empty(a:world.follow_cursor)
+        let a:world.follow_cursor = 'tlib#qfl#AgentPreviewQFE'
+    else
+        let a:world.follow_cursor = ''
+    endif
+    let a:world.state = 'redisplay'
+    return a:world
+endf
+
+
+function! tlib#qfl#QflList(list, ...) abort "{{{3
+    TVarArg ['world_dict', {}], ['anyway', 0], ['suspended', 0]
+    Tlibtrace 'tlib', world_dict, anyway, suspended
+    " TLogVAR a:list, world_dict, anyway, suspended
+    if !anyway && empty(a:list)
+        return
+    endif
+    let world = copy(g:tlib#qfl#world)
+    if !empty(world_dict)
+        let world = tlib#eval#Extend(world, world_dict)
+    endif
+    " TLogVAR world
+    let world = tlib#World#New(world)
+    " echom "DBG world" string(sort(keys(world)))
+    let world.data  = copy(a:list)
+    if !has_key(world, 'format_data')
+        let world.format_data = 'tlib#qfl#FormatQFLE'
+    endif
+    " TLogVAR world
+    " TLogVAR world.data
+    " call s:FormatBase(world)
+    " TLogVAR world.base
+    return tlib#input#ListW(world, suspended ? 'hibernate' : '')
+endf
+
+
+function! tlib#qfl#Browse(...) abort "{{{3
+    let list = getqflist()
+    return call(function('tlib#qfl#QflList'), [list] + a:000)
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/rx.vim b/sources_non_forked/tlib/autoload/tlib/rx.vim
index 686f27a8..83899838 100644
--- a/sources_non_forked/tlib/autoload/tlib/rx.vim
+++ b/sources_non_forked/tlib/autoload/tlib/rx.vim
@@ -1,15 +1,7 @@
-" rx.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-07-20.
-" @Last Change: 2010-02-26.
-" @Revision:    0.0.28
-
-if &cp || exists("loaded_tlib_rx_autoload")
-    finish
-endif
-let loaded_tlib_rx_autoload = 1
+" @Revision:    113
 
 
 " :def: function! tlib#rx#Escape(text, ?magic='m')
@@ -61,3 +53,8 @@ function! tlib#rx#Suffixes(...) "{{{3
     endif
 endf
 
+
+function! tlib#rx#LooksLikeRegexp(text) abort "{{{3
+    return a:text =~ '[.?*+{}\[\]]'
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/scratch.vim b/sources_non_forked/tlib/autoload/tlib/scratch.vim
index e64eb9e6..c9df64d3 100644
--- a/sources_non_forked/tlib/autoload/tlib/scratch.vim
+++ b/sources_non_forked/tlib/autoload/tlib/scratch.vim
@@ -1,15 +1,7 @@
-" scratch.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-07-18.
-" @Last Change: 2014-02-06.
-" @Revision:    0.0.252
-
-if &cp || exists("loaded_tlib_scratch_autoload")
-    finish
-endif
-let loaded_tlib_scratch_autoload = 1
+" @Revision:    255
 
 
 " Scratch window position. By default the list window is opened on the 
@@ -92,8 +84,9 @@ function! tlib#scratch#UseScratch(...) "{{{3
         setlocal nobuflisted
         setlocal foldmethod=manual
         setlocal foldcolumn=0
-        setlocal modifiable
         setlocal nospell
+        setlocal modifiable
+        setlocal noreadonly
         " TLogVAR &ft, ft
         if !empty(ft)
             let &l:ft = ft
diff --git a/sources_non_forked/tlib/autoload/tlib/string.vim b/sources_non_forked/tlib/autoload/tlib/string.vim
index d2ca319b..e5f8943a 100644
--- a/sources_non_forked/tlib/autoload/tlib/string.vim
+++ b/sources_non_forked/tlib/autoload/tlib/string.vim
@@ -1,15 +1,7 @@
-" string.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.115
-
-if &cp || exists("loaded_tlib_string_autoload")
-    finish
-endif
-let loaded_tlib_string_autoload = 1
+" @Revision:    121
 
 
 " :def: function! tlib#string#RemoveBackslashes(text, ?chars=' ')
@@ -156,3 +148,11 @@ function! s:CountHelper() "{{{3
     let s:count += 1
 endf
 
+
+function! tlib#string#SplitCommaList(text, ...) abort "{{{3
+    let sep = a:0 >= 1 ? a:1 : ',\s*'
+    let parts = split(a:text, '\\\@<!\zs'. sep)
+    let parts = map(parts, 'substitute(v:val, ''\\\(.\)'', ''\1'', ''g'')')
+    return parts
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/syntax.vim b/sources_non_forked/tlib/autoload/tlib/syntax.vim
index 968cd1fc..aa30b667 100644
--- a/sources_non_forked/tlib/autoload/tlib/syntax.vim
+++ b/sources_non_forked/tlib/autoload/tlib/syntax.vim
@@ -1,17 +1,7 @@
-" syntax.vim
 " @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:     2007-11-19.
-" @Last Change: 2009-02-15.
-" @Revision:    0.0.11
-
-if &cp || exists("loaded_tlib_syntax_autoload")
-    finish
-endif
-let loaded_tlib_syntax_autoload = 1
-let s:save_cpo = &cpo
-set cpo&vim
+" @Revision:    13
 
 
 function! tlib#syntax#Collect() "{{{3
@@ -23,7 +13,7 @@ function! tlib#syntax#Collect() "{{{3
         elseif line =~ '^\w'
             let ml = matchlist(line, '^\(\w\+\)\s\+\(xxx\s\+\(.*\)\|\(cluster.*\)\)$')
             if empty(ml)
-                echoerr 'Internal error: '. string(line)
+                " echoerr 'Internal error: '. string(line)
             else
                 let [m_0, syn, m_1, m_def1, m_def2; m_rest] = ml
                 let acc[syn] = [empty(m_def1) ? m_def2 : m_def1]
@@ -46,6 +36,3 @@ function! tlib#syntax#Names(...) "{{{3
     return names
 endf
 
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/sources_non_forked/tlib/autoload/tlib/sys.vim b/sources_non_forked/tlib/autoload/tlib/sys.vim
index 7808153d..affb86d1 100644
--- a/sources_non_forked/tlib/autoload/tlib/sys.vim
+++ b/sources_non_forked/tlib/autoload/tlib/sys.vim
@@ -1,7 +1,52 @@
 " @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
+" @Last Change: 2015-11-07.
+" @Revision:    51
+
+
+if !exists('g:tlib#sys#special_protocols')
+    " A list of |regexp|s matching protocol names that should be handled 
+    " by |g:tlib#sys#system_browser|.
+    " CAVEAT: Must be a |\V| |regexp|.
+    let g:tlib#sys#special_protocols = ['https\?', 'nntp', 'mailto']   "{{{2
+endif
+
+
+if !exists('g:tlib#sys#special_suffixes')
+    " A list of |regexp|s matching suffixes that should be handled by 
+    " |g:tlib#sys#system_browser|.
+    " CAVEAT: Must be a |\V| |regexp|.
+    let g:tlib#sys#special_suffixes = ['xlsx\?', 'docx\?', 'pptx\?', 'accdb', 'mdb', 'sqlite', 'pdf', 'jpg', 'png', 'gif']    "{{{2
+endif
+
+
+if !exists('g:tlib#sys#system_rx')
+    " Open links matching this |regexp| with |g:tlib#sys#system_browser|.
+    " CAVEAT: Must be a |\V| |regexp|.
+    let g:tlib#sys#system_rx = printf('\V\%(\^\%(%s\):\|.\%(%s\)\)', join(g:tlib#sys#special_protocols, '\|'), join(g:tlib#sys#special_suffixes, '\|'))   "{{{2
+endif
+
+
+if !exists("g:tlib#sys#system_browser")
+    if exists('g:netrw_browsex_viewer')
+        " Open files in the system browser.
+        " :read: let g:tlib#sys#system_browser = ... "{{{2
+        let g:tlib#sys#system_browser = "exec 'silent !'. g:netrw_browsex_viewer shellescape('%s')"
+    elseif has("win32") || has("win16") || has("win64")
+        " let g:tlib#sys#system_browser = "exec 'silent ! start \"\"' shellescape('%s')"
+        let g:tlib#sys#system_browser = "exec 'silent ! RunDll32.EXE URL.DLL,FileProtocolHandler' shellescape('%s')"
+    elseif has("mac")
+        let g:tlib#sys#system_browser = "exec 'silent !open' shellescape('%s')"
+    elseif exists('$XDG_CURRENT_DESKTOP') && !empty($XDG_CURRENT_DESKTOP)
+        let g:tlib#sys#system_browser = "exec 'silent !xdg-open' shellescape('%s') '&'"
+    elseif $GNOME_DESKTOP_SESSION_ID != "" || $DESKTOP_SESSION == 'gnome'
+        let g:tlib#sys#system_browser = "exec 'silent !gnome-open' shellescape('%s')"
+    elseif exists("$KDEDIR") && !empty($KDEDIR)
+        let g:tlib#sys#system_browser = "exec 'silent !kfmclient exec' shellescape('%s')"
+    else
+        let g:tlib#sys#system_browser = ''
+    endif
+endif
 
 
 if !exists('g:tlib#sys#windows')
@@ -14,47 +59,6 @@ if !exists('g:tlib#sys#null')
 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
@@ -84,6 +88,47 @@ function! tlib#sys#IsCygwinBin(cmd) "{{{3
 endf
 
 
+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', 1)   "{{{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
+
+
 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)))
@@ -125,3 +170,42 @@ function! tlib#sys#FileArgs(cmd, files) "{{{3
     endif
 endf
 
+
+" Check whether filename matches |g:tlib#sys#system_rx|, i.e. whether it 
+" is a special file that should not be opened in vim.
+function! tlib#sys#IsSpecial(filename) abort "{{{3
+    return a:filename =~ g:tlib#sys#system_rx
+endf
+
+
+" Open filename with the default OS application (see 
+" |g:tlib#sys#system_browser|), if |tlib#sys#IsSpecial()| return 1. 
+" Returns 1 if successful or 0 otherwise.
+function! tlib#sys#Open(filename) abort "{{{3
+    Tlibtrace 'tlib', a:filename
+    if !empty(g:tlib#sys#system_browser) && tlib#sys#IsSpecial(a:filename)
+        try
+            let cmd = printf(g:tlib#sys#system_browser, escape(a:filename, ' %#!'))
+            Tlibtrace 'tlib', cmd
+            exec cmd
+            return 1
+        catch
+            echohl ErrorMsg
+            echom v:exception
+            echohl NONE
+        endtry
+    endif
+    return 0
+endf
+
+
+" :def: function! tlib#sys#SystemInDir(dir, expr, ?input='')
+function! tlib#sys#SystemInDir(dir, ...) abort "{{{3
+    call tlib#dir#CD(a:dir)
+    try
+        return call(function('system'), a:000)
+    finally
+        cd! -
+    endtry
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/tab.vim b/sources_non_forked/tlib/autoload/tlib/tab.vim
index 6fc3bd46..fa6bb8d0 100644
--- a/sources_non_forked/tlib/autoload/tlib/tab.vim
+++ b/sources_non_forked/tlib/autoload/tlib/tab.vim
@@ -1,15 +1,7 @@
-" tab.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-08-27.
-" @Last Change: 2014-02-06.
-" @Revision:    0.0.30
-
-if &cp || exists("loaded_tlib_tab_autoload")
-    finish
-endif
-let loaded_tlib_tab_autoload = 1
+" @Revision:    31
 
 
 " Return a dictionary of bufnumbers => [[tabpage, winnr] ...]
diff --git a/sources_non_forked/tlib/autoload/tlib/tag.vim b/sources_non_forked/tlib/autoload/tlib/tag.vim
index 5695f0a3..e4239d37 100644
--- a/sources_non_forked/tlib/autoload/tlib/tag.vim
+++ b/sources_non_forked/tlib/autoload/tlib/tag.vim
@@ -1,15 +1,7 @@
-" tag.vim
 " @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:     2007-11-01.
-" @Last Change: 2013-09-25.
-" @Revision:    0.0.58
-
-if &cp || exists("loaded_tlib_tag_autoload")
-    finish
-endif
-let loaded_tlib_tag_autoload = 1
+" @Revision:    59
 
 
 " Extra tags for |tlib#tag#Retrieve()| (see there). Can also be buffer-local.
diff --git a/sources_non_forked/tlib/autoload/tlib/time.vim b/sources_non_forked/tlib/autoload/tlib/time.vim
index 4db9f34b..2273d555 100644
--- a/sources_non_forked/tlib/autoload/tlib/time.vim
+++ b/sources_non_forked/tlib/autoload/tlib/time.vim
@@ -1,15 +1,7 @@
-" time.vim
 " @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:     2007-10-17.
-" @Last Change: 2009-02-22.
-" @Revision:    0.0.29
-
-if &cp || exists("loaded_tlib_time_autoload")
-    finish
-endif
-let loaded_tlib_time_autoload = 1
+" @Revision:    36
 
 
 function! tlib#time#MSecs() "{{{3
@@ -19,12 +11,27 @@ endf
 
 
 function! tlib#time#Now() "{{{3
-    let rts = reltimestr(reltime())
-    let rtl = split(rts, '\.')
+    if has('reltime')
+        let rts = reltimestr(reltime())
+        let rtl = map(split(rts, '\.'), 'str2nr(v:val)')
+    else
+        let rtl = [localtime()]
+    endif
     return rtl
 endf
 
 
+function! tlib#time#FormatNow() "{{{3
+    let rtl = tlib#time#Now()
+    if len(rtl) == 2
+        let rts = strftime(g:tlib#date#date_format .' %H:%M:%S', rtl[0]) .'.'. rtl[1]
+    else
+        let rts = strftime(g:tlib#date#date_format .' %H:%M:%S', rtl[0])
+    endif
+    return rts
+endf
+
+
 function! tlib#time#Diff(a, b, ...) "{{{3
     TVarArg ['resolution', 2]
     let [as, am] = a:a
diff --git a/sources_non_forked/tlib/autoload/tlib/trace.vim b/sources_non_forked/tlib/autoload/tlib/trace.vim
new file mode 100644
index 00000000..0a98d1e9
--- /dev/null
+++ b/sources_non_forked/tlib/autoload/tlib/trace.vim
@@ -0,0 +1,117 @@
+" @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
+" @Website:     https://github.com/tomtom
+" @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+" @Last Change: 2015-11-23
+" @Revision:    134
+
+
+if !exists('g:tlib#trace#backtrace')
+    " The length of the backtrace that should be included in 
+    " |tlib#trace#Print()|.
+    let g:tlib#trace#backtrace = 2   "{{{2
+endif
+
+
+if !exists('g:tlib#trace#printf')
+    " The command used for printing traces from |tlib#trace#Print()|.
+    let g:tlib#trace#printf = 'echom %s'   "{{{2
+endif
+
+
+let s:trace_hl = {'error': 'ErrorMsg', 'fatal': 'ErrorMsg', 'warning': 'WarningMsg'}
+
+
+" Set |g:tlib#trace#printf| to make |tlib#trace#Print()| print to 
+" `filename`.
+function! tlib#trace#PrintToFile(filename) abort "{{{3
+    let g:tlib#trace#printf = 'call writefile([%s], '. string(a:filename) .', "a")'
+endf
+
+
+" Set the tracing |regexp|. See |:Tlibtrace|.
+" This will also call |tlib#trace#Enable()|.
+"
+" Examples:
+"   call tlib#trace#Set(["+foo", "-bar"])
+"   call tlib#trace#Set("+foo,-bar")
+function! tlib#trace#Set(vars) abort "{{{3
+    call tlib#trace#Enable()
+    if type(a:vars) == 1
+        let vars = tlib#string#SplitCommaList(a:vars, '[,[:space:]]\+')
+    else
+        let vars = a:vars
+    endif
+    for rx in vars
+        let rx1 = substitute(rx, '^[+-]', '', 'g')
+        if rx1 !~# '^\%(error\|fatal\)$' && s:trace_rx !~# '[(|]'. tlib#rx#Escape(rx1) .'\\'
+            " TLogVAR rx, rx1
+            if rx =~ '^+'
+                let s:trace_rx = substitute(s:trace_rx, '\ze\\)\$', '\\|'. tlib#rx#EscapeReplace(rx1), '')
+            elseif rx =~ '^-'
+                let s:trace_rx = substitute(s:trace_rx, '\\|'. tlib#rx#Escape(rx1), '', '')
+            else
+                echohl WarningMsg
+                echom 'tlib#trace#Print: Unsupported syntax:' rx
+                echohl NONE
+            endif
+        endif
+    endfor
+    echom "SetTrace:" s:trace_rx
+endf
+
+
+function! tlib#trace#Backtrace(caller) abort "{{{3
+    let caller = split(a:caller, '\.\.')
+    let start  = max([0, len(caller) - g:tlib#trace#backtrace - 1])
+    let caller = caller[start : -1]
+    return join(caller, '..')
+endf
+
+
+" Print the values of vars. The first value is a "guard" (see 
+" |:Tlibtrace|).
+function! tlib#trace#Print(caller, vars, values) abort "{{{3
+    let msg = ['TRACE']
+    let guard = a:values[0]
+    if type(guard) == 0
+        let cond = guard
+    else
+        let cond = guard =~# s:trace_rx
+    endif
+    " TLogVAR guard, cond, a:vars, a:values
+    if cond
+        call add(msg, guard)
+        call add(msg, tlib#time#FormatNow() .':')
+        if g:tlib#trace#backtrace > 0
+            let bt = tlib#trace#Backtrace(a:caller)
+            if !empty(bt)
+                call add(msg, bt .':')
+            endif
+        endif
+        for i in range(1, len(a:vars) - 1)
+            let v = substitute(a:vars[i], ',$', '', '')
+            let r = string(a:values[i])
+            call add(msg, v .'='. r .';')
+        endfor
+        exec printf(g:tlib#trace#printf, string(join(msg)))
+    endif
+endf
+
+
+" Enable tracing via |:Tlibtrace|.
+function! tlib#trace#Enable() abort "{{{3
+    if !exists('s:trace_rx')
+        let s:trace_rx = '^\%(error\)$'
+        " :nodoc:
+        command! -nargs=+ -bar Tlibtrace call tlib#trace#Print(expand('<sfile>'), [<f-args>], [<args>])
+    endif
+endf
+
+
+" Disable tracing via |:Tlibtrace|.
+function! tlib#trace#Disable() abort "{{{3
+    " :nodoc:
+    command! -nargs=+ -bang -bar Tlibtrace :
+    unlet! s:trace_rx
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/type.vim b/sources_non_forked/tlib/autoload/tlib/type.vim
index 0e1d3b91..455343f9 100644
--- a/sources_non_forked/tlib/autoload/tlib/type.vim
+++ b/sources_non_forked/tlib/autoload/tlib/type.vim
@@ -1,29 +1,71 @@
-" type.vim
 " @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:     2007-09-30.
-" @Last Change: 2010-09-27.
-" @Revision:    0.0.4
+" @Last Change: 2015-11-23.
+" @Revision:    6
+
 
 function! tlib#type#IsNumber(expr)
-    return type(a:expr) == 0
+    return tlib#type#Is(a:expr, 0)
 endf
 
+
 function! tlib#type#IsString(expr)
-    return type(a:expr) == 1
+    return tlib#type#Is(a:expr, 1)
 endf
 
+
 function! tlib#type#IsFuncref(expr)
-    return type(a:expr) == 2
+    return tlib#type#Is(a:expr, 2)
 endf
 
+
 function! tlib#type#IsList(expr)
-    return type(a:expr) == 3
+    return tlib#type#Is(a:expr, 3)
 endf
 
+
 function! tlib#type#IsDictionary(expr)
-    return type(a:expr) == 4
+    return tlib#type#Is(a:expr, 4)
+endf
+
+
+function! tlib#type#Is(val, type) abort "{{{3
+    if type(a:type) == 0
+        let type = a:type
+    elseif a:type =~? '^n\%[umber]'
+        let type = 0
+    elseif a:type =~? '^s\%[tring]'
+        let type = 1
+    elseif a:type =~? '^fu\%[ncref]'
+        let type = 2
+    elseif a:type =~? '^l\%[ist]'
+        let type = 3
+    elseif a:type =~? '^d\%[ictionary]'
+        let type = 4
+    elseif a:type =~? '^fl\%[oat]'
+        let type = 5
+    else
+        throw 'tlib#type#Is: Unknown type: ' a:type
+    endif
+    " TLogVAR a:val, a:type, type, type(a:val), type(a:val) == a:type
+    return type(a:val) == type
+endf
+
+
+function! tlib#type#Are(vals, type) abort "{{{3
+    return tlib#assert#Map(a:vals, 'tlib#type#Is(v:val,'. string(a:type) .')')
+endf
+
+
+function! tlib#type#Has(val, lst) abort "{{{3
+    return tlib#assert#All(map(a:lst, 'has_key(a:val, v:val)'))
+endf
+
+
+function! tlib#type#Have(vals, lst) abort "{{{3
+    return tlib#assert#Map(a:vals, 'tlib#type#Has(v:val,'. string(a:lst) .')')
 endf
 
 
diff --git a/sources_non_forked/tlib/autoload/tlib/var.vim b/sources_non_forked/tlib/autoload/tlib/var.vim
index 564515d9..dcd9264b 100644
--- a/sources_non_forked/tlib/autoload/tlib/var.vim
+++ b/sources_non_forked/tlib/autoload/tlib/var.vim
@@ -1,15 +1,7 @@
-" var.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: 2014-07-08.
-" @Revision:    0.0.29
-
-if &cp || exists("loaded_tlib_var_autoload")
-    finish
-endif
-let loaded_tlib_var_autoload = 1
+" @Revision:    30
 
 
 " Define a variable called NAME if yet undefined.
diff --git a/sources_non_forked/tlib/autoload/tlib/vcs.vim b/sources_non_forked/tlib/autoload/tlib/vcs.vim
index c7e21bab..15d051fa 100644
--- a/sources_non_forked/tlib/autoload/tlib/vcs.vim
+++ b/sources_non_forked/tlib/autoload/tlib/vcs.vim
@@ -1,9 +1,10 @@
-" vcs.vim
 " @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-09-30.
-" @Revision:    133
+" @Last Change: 2015-11-07.
+" @Revision:    190
+
+scriptencoding utf-8
 
 
 " A dictionarie of supported VCS (currently: git, hg, svn, bzr).
@@ -11,7 +12,8 @@
 TLet g:tlib#vcs#def = {
             \ 'git': {
             \     'dir': '.git',
-            \     'ls': 'git ls-files --full-name %s',
+            \     'ls': 'git ls-files --full-name',
+            \     'ls.postprocess': '*tlib#vcs#GitLsPostprocess',
             \     'diff': 'git diff --no-ext-diff -U0 %s'
             \ },
             \ 'hg': {
@@ -64,11 +66,13 @@ function! tlib#vcs#FindVCS(filename) "{{{3
     let dirname = fnamemodify(a:filename, isdirectory(a:filename) ? ':p' : ':p:h')
     let path = escape(dirname, ';') .';'
     " TLogVAR a:filename, dirname, path
+    Tlibtrace 'tlib', a:filename, path
     let depth = -1
     for vcs in keys(g:tlib#vcs#def)
         let subdir = g:tlib#vcs#def[vcs].dir
         let vcsdir = finddir(subdir, path)
         " TLogVAR vcs, subdir, vcsdir
+        Tlibtrace 'tlib', vcs, subdir, vcsdir
         if !empty(vcsdir)
             let vcsdir_depth = len(split(fnamemodify(vcsdir, ':p'), '\/'))
             if vcsdir_depth > depth
@@ -79,6 +83,7 @@ function! tlib#vcs#FindVCS(filename) "{{{3
             endif
         endif
     endfor
+    Tlibtrace 'tlib', type, dir
     " TLogVAR type, dir
     if empty(type)
         return ['', '']
@@ -92,13 +97,17 @@ function! s:GetCmd(vcstype, cmd)
     let vcsdef = get(g:tlib#vcs#def, a:vcstype, {})
     if has_key(vcsdef, a:cmd)
         let cmd = vcsdef[a:cmd]
-        let bin = get(g:tlib#vcs#executables, a:vcstype, '')
-        if empty(bin)
-            let cmd = ''
-        elseif bin != a:vcstype
-            " let bin = escape(shellescape(bin), '\')
-            let bin = escape(bin, '\')
-            let cmd = substitute(cmd, '^.\{-}\zs'. escape(a:vcstype, '\'), bin, '')
+        if cmd =~ '^\*'
+            let cmd = substitute(cmd, '^\*', '', '')
+        else
+            let bin = get(g:tlib#vcs#executables, a:vcstype, '')
+            if empty(bin)
+                let cmd = ''
+            elseif bin != a:vcstype
+                " let bin = escape(shellescape(bin), '\')
+                let bin = escape(bin, '\')
+                let cmd = substitute(cmd, '^.\{-}\zs'. escape(a:vcstype, '\'), bin, '')
+            endif
         endif
         return cmd
     else
@@ -115,6 +124,7 @@ function! tlib#vcs#Ls(...) "{{{3
     else
         let vcs = tlib#vcs#FindVCS(a:0 >= 1 ? a:1 : bufname('%'))
     endif
+    Tlibtrace 'tlib', vcs, a:000
     " TLogVAR vcs
     if !empty(vcs)
         let [vcstype, vcsdir] = vcs
@@ -129,11 +139,17 @@ function! tlib#vcs#Ls(...) "{{{3
                 else
                     let cmd = ls
                 endif
-                " TLogVAR cmd
-                let filess = system(cmd)
+                " TLogVAR cmd, getcwd()
+                Tlibtrace 'tlib', getcwd(), vcstype, vcsdir, rootdir, cmd
+                let filess = tlib#sys#SystemInDir(rootdir, cmd)
                 " TLogVAR filess
                 let files = split(filess, '\n')
+                let postprocess = s:GetCmd(vcstype, 'ls.postprocess')
+                if !empty(postprocess)
+                    call map(files, 'call(postprocess, [v:val])')
+                endif
                 call map(files, 'join([rootdir, v:val], "/")')
+                " TLogVAR files
                 return files
             endif
         endif
@@ -158,3 +174,16 @@ function! tlib#vcs#Diff(filename, ...) "{{{3
     return []
 endf
 
+
+function! tlib#vcs#GitLsPostprocess(filename) abort "{{{3
+    if a:filename =~ '^".\{-}"$'
+        let filename = matchstr(a:filename, '^"\zs.\{-}\ze"$')
+        let filename = substitute(filename, '\%(\\\@<!\\\(\d\d\d\)\)\+', '\=eval(''"''. submatch(0) .''"'')', 'g')
+        " let filename = eval(a:filename)
+        " TLogVAR a:filename, filename, &enc
+        return filename
+    else
+        return a:filename
+    endif
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/win.vim b/sources_non_forked/tlib/autoload/tlib/win.vim
index 81def069..4963af15 100644
--- a/sources_non_forked/tlib/autoload/tlib/win.vim
+++ b/sources_non_forked/tlib/autoload/tlib/win.vim
@@ -1,15 +1,7 @@
-" win.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-08-24.
-" @Last Change: 2010-12-04.
-" @Revision:    0.0.54
-
-if &cp || exists("loaded_tlib_win_autoload")
-    finish
-endif
-let loaded_tlib_win_autoload = 1
+" @Revision:    55
 
 
 " Return vim code to jump back to the original window.
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index cbf6fdfd..379dc549 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -30,14 +30,14 @@ installed.
 ========================================================================
 Contents~
 
-        :TRequire .............................. |:TRequire|
         :TLet .................................. |:TLet|
         :TScratch .............................. |:TScratch|
         :TVarArg ............................... |:TVarArg|
-        :TKeyArg ............................... |:TKeyArg|
         :TBrowseOutput ......................... |:TBrowseOutput|
         :TBrowseScriptnames .................... |:TBrowseScriptnames|
-        :TTimeCommand .......................... |:TTimeCommand|
+        :Tlibtrace ............................. |:Tlibtrace|
+        :Tlibtraceset .......................... |:Tlibtraceset|
+        :Tlibassert ............................ |:Tlibassert|
         Add .................................... |Add()|
         TestGetArg ............................. |TestGetArg()|
         TestGetArg1 ............................ |TestGetArg1()|
@@ -48,6 +48,15 @@ Contents~
         g:tlib#debug ........................... |g:tlib#debug|
         tlib#notify#Echo ....................... |tlib#notify#Echo()|
         tlib#notify#TrimMessage ................ |tlib#notify#TrimMessage()|
+        g:tlib#trace#backtrace ................. |g:tlib#trace#backtrace|
+        g:tlib#trace#printf .................... |g:tlib#trace#printf|
+        tlib#trace#PrintToFile ................. |tlib#trace#PrintToFile()|
+        tlib#trace#Set ......................... |tlib#trace#Set()|
+        tlib#trace#Backtrace ................... |tlib#trace#Backtrace()|
+        tlib#trace#Print ....................... |tlib#trace#Print()|
+        tlib#trace#Enable ...................... |tlib#trace#Enable()|
+        tlib#trace#Disable ..................... |tlib#trace#Disable()|
+        tlib#dictionary#Rev .................... |tlib#dictionary#Rev()|
         g:tlib_persistent ...................... |g:tlib_persistent|
         tlib#persistent#Dir .................... |tlib#persistent#Dir()|
         tlib#persistent#Filename ............... |tlib#persistent#Filename()|
@@ -66,6 +75,7 @@ Contents~
         tlib#progressbar#Display ............... |tlib#progressbar#Display()|
         tlib#progressbar#Restore ............... |tlib#progressbar#Restore()|
         tlib#eval#FormatValue .................. |tlib#eval#FormatValue()|
+        tlib#eval#Extend ....................... |tlib#eval#Extend()|
         tlib#list#Inject ....................... |tlib#list#Inject()|
         tlib#list#Compact ...................... |tlib#list#Compact()|
         tlib#list#Flatten ...................... |tlib#list#Flatten()|
@@ -83,6 +93,7 @@ Contents~
         tlib#cmd#BrowseOutputWithCallback ...... |tlib#cmd#BrowseOutputWithCallback()|
         tlib#cmd#DefaultBrowseOutput ........... |tlib#cmd#DefaultBrowseOutput()|
         tlib#cmd#ParseScriptname ............... |tlib#cmd#ParseScriptname()|
+        tlib#cmd#TBrowseScriptnames ............ |tlib#cmd#TBrowseScriptnames()|
         tlib#cmd#UseVertical ................... |tlib#cmd#UseVertical()|
         tlib#cmd#Time .......................... |tlib#cmd#Time()|
         tlib#cmd#Capture ....................... |tlib#cmd#Capture()|
@@ -91,6 +102,7 @@ Contents~
         tlib#balloon#Register .................. |tlib#balloon#Register()|
         tlib#balloon#Remove .................... |tlib#balloon#Remove()|
         tlib#balloon#Expr ...................... |tlib#balloon#Expr()|
+        tlib#balloon#Expand .................... |tlib#balloon#Expand()|
         g:tlib#vcs#def ......................... |g:tlib#vcs#def|
         g:tlib#vcs#executables ................. |g:tlib#vcs#executables|
         g:tlib#vcs#check ....................... |g:tlib#vcs#check|
@@ -98,6 +110,7 @@ Contents~
         tlib#vcs#FindVCS ....................... |tlib#vcs#FindVCS()|
         tlib#vcs#Ls ............................ |tlib#vcs#Ls()|
         tlib#vcs#Diff .......................... |tlib#vcs#Diff()|
+        tlib#vcs#GitLsPostprocess .............. |tlib#vcs#GitLsPostprocess()|
         tlib#char#Get .......................... |tlib#char#Get()|
         tlib#char#IsAvailable .................. |tlib#char#IsAvailable()|
         tlib#char#GetWithTimeout ............... |tlib#char#GetWithTimeout()|
@@ -129,6 +142,7 @@ Contents~
         tlib#normal#WithRegister ............... |tlib#normal#WithRegister()|
         tlib#time#MSecs ........................ |tlib#time#MSecs()|
         tlib#time#Now .......................... |tlib#time#Now()|
+        tlib#time#FormatNow .................... |tlib#time#FormatNow()|
         tlib#time#Diff ......................... |tlib#time#Diff()|
         tlib#time#DiffMSecs .................... |tlib#time#DiffMSecs()|
         tlib#var#Let ........................... |tlib#var#Let()|
@@ -187,6 +201,7 @@ Contents~
         tlib#agent#Null ........................ |tlib#agent#Null()|
         tlib#agent#ExecAgentByName ............. |tlib#agent#ExecAgentByName()|
         tlib#agent#CompleteAgentNames .......... |tlib#agent#CompleteAgentNames()|
+        tlib#agent#Complete .................... |tlib#agent#Complete()|
         tlib#bitwise#Num2Bits .................. |tlib#bitwise#Num2Bits()|
         tlib#bitwise#Bits2Num .................. |tlib#bitwise#Bits2Num()|
         tlib#bitwise#AND ....................... |tlib#bitwise#AND()|
@@ -206,6 +221,7 @@ Contents~
         tlib#rx#Escape ......................... |tlib#rx#Escape()|
         tlib#rx#EscapeReplace .................. |tlib#rx#EscapeReplace()|
         tlib#rx#Suffixes ....................... |tlib#rx#Suffixes()|
+        tlib#rx#LooksLikeRegexp ................ |tlib#rx#LooksLikeRegexp()|
         g:tlib_tags_extra ...................... |g:tlib_tags_extra|
         g:tlib_tag_substitute .................. |g:tlib_tag_substitute|
         tlib#tag#Retrieve ...................... |tlib#tag#Retrieve()|
@@ -239,23 +255,37 @@ Contents~
         tlib#input#Edit ........................ |tlib#input#Edit()|
         tlib#input#Dialog ...................... |tlib#input#Dialog()|
         tlib#number#ConvertBase ................ |tlib#number#ConvertBase()|
+        g:tlib#file#drop ....................... |g:tlib#file#drop|
+        g:tlib#file#use_tabs ................... |g:tlib#file#use_tabs|
+        g:tlib#file#edit_cmds .................. |g:tlib#file#edit_cmds|
+        g:tlib#file#absolute_filename_rx ....... |g:tlib#file#absolute_filename_rx|
         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#Canonic ...................... |tlib#file#Canonic()|
         tlib#file#With ......................... |tlib#file#With()|
+        tlib#file#Edit ......................... |tlib#file#Edit()|
+        tlib#file#Glob ......................... |tlib#file#Glob()|
+        tlib#file#Globpath ..................... |tlib#file#Globpath()|
+        g:tlib#sys#special_protocols ........... |g:tlib#sys#special_protocols|
+        g:tlib#sys#special_suffixes ............ |g:tlib#sys#special_suffixes|
+        g:tlib#sys#system_rx ................... |g:tlib#sys#system_rx|
+        g:tlib#sys#system_browser .............. |g:tlib#sys#system_browser|
         g:tlib#sys#windows ..................... |g:tlib#sys#windows|
         g:tlib#sys#null ........................ |g:tlib#sys#null|
+        tlib#sys#IsCygwinBin ................... |tlib#sys#IsCygwinBin()|
         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#sys#IsSpecial ..................... |tlib#sys#IsSpecial()|
+        tlib#sys#Open .......................... |tlib#sys#Open()|
+        tlib#sys#SystemInDir ................... |tlib#sys#SystemInDir()|
         tlib#paragraph#GetMetric ............... |tlib#paragraph#GetMetric()|
         tlib#paragraph#Move .................... |tlib#paragraph#Move()|
         g:tlib_inputlist_pct ................... |g:tlib_inputlist_pct|
@@ -265,27 +295,40 @@ Contents~
         tlib#World#New ......................... |tlib#World#New()|
         prototype.PrintLines
         prototype.Suspend
+        tlib#loclist#Browse .................... |tlib#loclist#Browse()|
         tlib#tab#BufMap ........................ |tlib#tab#BufMap()|
         tlib#tab#TabWinNr ...................... |tlib#tab#TabWinNr()|
         tlib#tab#Set ........................... |tlib#tab#Set()|
+        tlib#date#IsDate ....................... |tlib#date#IsDate()|
+        tlib#date#Format ....................... |tlib#date#Format()|
         tlib#date#DiffInDays ................... |tlib#date#DiffInDays()|
         tlib#date#Parse ........................ |tlib#date#Parse()|
         tlib#date#SecondsSince1970 ............. |tlib#date#SecondsSince1970()|
+        tlib#date#Shift ........................ |tlib#date#Shift()|
         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#type#Is ........................... |tlib#type#Is()|
+        tlib#type#Are .......................... |tlib#type#Are()|
+        tlib#type#Has .......................... |tlib#type#Has()|
+        tlib#type#Have ......................... |tlib#type#Have()|
         tlib#Filter_fuzzy#New .................. |tlib#Filter_fuzzy#New()|
+        tlib#assert#Enable ..................... |tlib#assert#Enable()|
+        tlib#assert#Disable .................... |tlib#assert#Disable()|
+        tlib#assert#Assert ..................... |tlib#assert#Assert()|
+        tlib#assert#Map ........................ |tlib#assert#Map()|
+        tlib#assert#All ........................ |tlib#assert#All()|
         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#StringAsKeyArgsEqual .......... |tlib#arg#StringAsKeyArgsEqual()|
+        tlib#arg#GetOpts ....................... |tlib#arg#GetOpts()|
         tlib#arg#Ex ............................ |tlib#arg#Ex()|
         tlib#fixes#Winpos ...................... |tlib#fixes#Winpos()|
         g:tlib#dir#sep ......................... |g:tlib#dir#sep|
@@ -316,6 +359,24 @@ Contents~
         tlib#grep#LocList ...................... |tlib#grep#LocList()|
         tlib#grep#QuickFixList ................. |tlib#grep#QuickFixList()|
         tlib#grep#List ......................... |tlib#grep#List()|
+        tlib#qfl#FormatQFLE .................... |tlib#qfl#FormatQFLE()|
+        tlib#qfl#QfeFilename ................... |tlib#qfl#QfeFilename()|
+        tlib#qfl#InitListBuffer ................ |tlib#qfl#InitListBuffer()|
+        tlib#qfl#SetSyntax ..................... |tlib#qfl#SetSyntax()|
+        tlib#qfl#Balloon ....................... |tlib#qfl#Balloon()|
+        tlib#qfl#AgentEditQFE .................. |tlib#qfl#AgentEditQFE()|
+        tlib#qfl#AgentPreviewQFE ............... |tlib#qfl#AgentPreviewQFE()|
+        tlib#qfl#AgentGotoQFE .................. |tlib#qfl#AgentGotoQFE()|
+        tlib#qfl#AgentWithSelected ............. |tlib#qfl#AgentWithSelected()|
+        tlib#qfl#RunCmdOnSelected .............. |tlib#qfl#RunCmdOnSelected()|
+        tlib#qfl#AgentSplitBuffer .............. |tlib#qfl#AgentSplitBuffer()|
+        tlib#qfl#AgentTabBuffer ................ |tlib#qfl#AgentTabBuffer()|
+        tlib#qfl#AgentVSplitBuffer ............. |tlib#qfl#AgentVSplitBuffer()|
+        tlib#qfl#AgentEditLine ................. |tlib#qfl#AgentEditLine()|
+        tlib#qfl#EditLine ...................... |tlib#qfl#EditLine()|
+        tlib#qfl#SetFollowCursor ............... |tlib#qfl#SetFollowCursor()|
+        tlib#qfl#QflList ....................... |tlib#qfl#QflList()|
+        tlib#qfl#Browse ........................ |tlib#qfl#Browse()|
         tlib#Filter_cnf#New .................... |tlib#Filter_cnf#New()|
         prototype.Pretty
         tlib#Object#New ........................ |tlib#Object#New()|
@@ -353,19 +414,12 @@ Contents~
         tlib#string#TrimRight .................. |tlib#string#TrimRight()|
         tlib#string#Strip ...................... |tlib#string#Strip()|
         tlib#string#Count ...................... |tlib#string#Count()|
+        tlib#string#SplitCommaList ............. |tlib#string#SplitCommaList()|
 
 
 ========================================================================
 plugin/02tlib.vim~
 
-                                                    *:TRequire*
-:TRequire NAME [VERSION [FILE]]
-    Make a certain vim file is loaded.
-
-    Conventions: If FILE isn't defined, plugin/NAME.vim is loaded. The 
-    file must provide a variable loaded_{NAME} that represents the version 
-    number.
-
                                                     *:TLet*
 :TLet VAR = VALUE
     Set a variable only if it doesn't already exist.
@@ -398,17 +452,6 @@ plugin/02tlib.vim~
       endf
 <
 
-                                                    *:TKeyArg*
-:TKeyArg DICT, VAR1, [VAR2, DEFAULT2] ...
-    A convenience wrapper for |tlib#arg#Let|.
-    EXAMPLES: >
-      function! Foo(keyargs)
-          TKeyArg a:keyargs, ['a', 1], 'b'
-          echo 'a='. a
-          echo 'b='. b
-      endf
-<
-
                                                     *:TBrowseOutput*
 :TBrowseOutput COMMAND
     Ever wondered how to efficiently browse the output of a command 
@@ -435,9 +478,24 @@ plugin/02tlib.vim~
       TBrowseScriptnames 
 <
 
-                                                    *:TTimeCommand*
-:TTimeCommand CMD
-    Time the execution time of CMD.
+                                                    *:Tlibtrace*
+:Tlibtrace GUARD, VAR1, VAR2...
+    Do nothing unless |tlib#trace#Enable()| was called.
+
+    When |:Tlibtraceset| or |tlib#trace#Enable()| were called:
+
+    If GUARD is a number that evaluates to true or if it is a string that 
+    matches a |regexp|, which was added using Tlibtrace! (with '!'), 
+    display the values of VAR1, VAR2 ...
+
+                                                    *:Tlibtraceset*
+:Tlibtraceset
+    :Tlibtraceset +RX1, -RX2...
+    If |tlib#trace#Enable()| was called: With the optional <bang>, users 
+    can add and remove GUARDs (actually a |regexp|) that should be traced.
+
+                                                    *:Tlibassert*
+:Tlibtrace ASSERTION
 
 
 ========================================================================
@@ -493,6 +551,56 @@ tlib#notify#TrimMessage(message)
     features.
 
 
+========================================================================
+autoload/tlib/trace.vim~
+
+                                                    *g:tlib#trace#backtrace*
+g:tlib#trace#backtrace         (default: 2)
+    The length of the backtrace that should be included in 
+    |tlib#trace#Print()|.
+
+                                                    *g:tlib#trace#printf*
+g:tlib#trace#printf            (default: 'echom %s')
+    The command used for printing traces from |tlib#trace#Print()|.
+
+                                                    *tlib#trace#PrintToFile()*
+tlib#trace#PrintToFile(filename)
+    Set |g:tlib#trace#printf| to make |tlib#trace#Print()| print to 
+    `filename`.
+
+                                                    *tlib#trace#Set()*
+tlib#trace#Set(vars)
+    Set the tracing |regexp|. See |:Tlibtrace|.
+    This will also call |tlib#trace#Enable()|.
+
+    Examples:
+      call tlib#trace#Set(["+foo", "-bar"])
+      call tlib#trace#Set("+foo,-bar")
+
+                                                    *tlib#trace#Backtrace()*
+tlib#trace#Backtrace(caller)
+
+                                                    *tlib#trace#Print()*
+tlib#trace#Print(caller, vars, values)
+    Print the values of vars. The first value is a "guard" (see 
+    |:Tlibtrace|).
+
+                                                    *tlib#trace#Enable()*
+tlib#trace#Enable()
+    Enable tracing via |:Tlibtrace|.
+
+                                                    *tlib#trace#Disable()*
+tlib#trace#Disable()
+    Disable tracing via |:Tlibtrace|.
+
+
+========================================================================
+autoload/tlib/dictionary.vim~
+
+                                                    *tlib#dictionary#Rev()*
+tlib#dictionary#Rev(dict)
+
+
 ========================================================================
 autoload/tlib/persistent.vim~
 
@@ -595,6 +703,9 @@ autoload/tlib/eval.vim~
                                                     *tlib#eval#FormatValue()*
 tlib#eval#FormatValue(value, ...)
 
+                                                    *tlib#eval#Extend()*
+tlib#eval#Extend(a, b, ...)
+
 
 ========================================================================
 autoload/tlib/list.vim~
@@ -714,6 +825,9 @@ tlib#cmd#DefaultBrowseOutput(cmd)
                                                     *tlib#cmd#ParseScriptname()*
 tlib#cmd#ParseScriptname(line)
 
+                                                    *tlib#cmd#TBrowseScriptnames()*
+tlib#cmd#TBrowseScriptnames()
+
                                                     *tlib#cmd#UseVertical()*
 tlib#cmd#UseVertical(?rx='')
     Look at the history whether the command was called with vertical. If 
@@ -751,6 +865,9 @@ tlib#balloon#Remove(expr)
                                                     *tlib#balloon#Expr()*
 tlib#balloon#Expr()
 
+                                                    *tlib#balloon#Expand()*
+tlib#balloon#Expand(expr)
+
 
 ========================================================================
 autoload/tlib/vcs.vim~
@@ -784,6 +901,9 @@ tlib#vcs#Ls(?filename=bufname('%'), ?vcs=[type, dir])
 tlib#vcs#Diff(filename, ?vcs=[type, dir])
     Return the diff for "filename"
 
+                                                    *tlib#vcs#GitLsPostprocess()*
+tlib#vcs#GitLsPostprocess(filename)
+
 
 ========================================================================
 autoload/tlib/char.vim~
@@ -918,7 +1038,7 @@ tlib#cache#Dir(?mode = 'bg')
 tlib#cache#Filename(type, ?file=%, ?mkdir=0, ?dir='')
 
                                                     *tlib#cache#Save()*
-tlib#cache#Save(cfile, dictionary)
+tlib#cache#Save(cfile, dictionary, ...)
 
                                                     *tlib#cache#MTime()*
 tlib#cache#MTime(cfile)
@@ -927,7 +1047,7 @@ tlib#cache#MTime(cfile)
 tlib#cache#Get(cfile, ...)
 
                                                     *tlib#cache#Value()*
-tlib#cache#Value(cfile, generator, ftime, ...)
+tlib#cache#Value(cfile, generator, ftime, ?generator_args=[], ?options={})
     Get a cached value from cfile. If it is outdated (compared to ftime) 
     or does not exist, create it calling a generator function.
 
@@ -961,6 +1081,9 @@ tlib#time#MSecs()
                                                     *tlib#time#Now()*
 tlib#time#Now()
 
+                                                    *tlib#time#FormatNow()*
+tlib#time#FormatNow()
+
                                                     *tlib#time#Diff()*
 tlib#time#Diff(a, b, ...)
 
@@ -1185,6 +1308,9 @@ tlib#agent#ExecAgentByName(world, selected)
                                                     *tlib#agent#CompleteAgentNames()*
 tlib#agent#CompleteAgentNames(ArgLead, CmdLine, CursorPos)
 
+                                                    *tlib#agent#Complete()*
+tlib#agent#Complete(world, selected)
+
 
 ========================================================================
 autoload/tlib/bitwise.vim~
@@ -1273,6 +1399,9 @@ tlib#rx#EscapeReplace(text, ?magic='m')
                                                     *tlib#rx#Suffixes()*
 tlib#rx#Suffixes(...)
 
+                                                    *tlib#rx#LooksLikeRegexp()*
+tlib#rx#LooksLikeRegexp(text)
+
 
 ========================================================================
 autoload/tlib/tag.vim~
@@ -1510,6 +1639,9 @@ tlib#input#List(type. ?query='', ?list=[], ?handlers=[], ?default="", ?timeout=0
     Several pattern matching styles are supported. See 
     |g:tlib#input#filter_mode|.
 
+    Users can type <Tab> to complete the current filter with the longest 
+    match.
+
     EXAMPLES: >
       echo tlib#input#List('s', 'Select one item', [100,200,300])
       echo tlib#input#List('si', 'Select one item', [100,200,300])
@@ -1582,6 +1714,19 @@ tlib#number#ConvertBase(num, base, ...)
 ========================================================================
 autoload/tlib/file.vim~
 
+                                                    *g:tlib#file#drop*
+g:tlib#file#drop               (default: has('gui'))
+    If true, use |:drop| to edit loaded buffers (only available with GUI).
+
+                                                    *g:tlib#file#use_tabs*
+g:tlib#file#use_tabs           (default: 0)
+
+                                                    *g:tlib#file#edit_cmds*
+g:tlib#file#edit_cmds          (default: g:tlib#file#use_tabs ? {'buffer': 'tab split | buffer', 'edit': 'tabedit'} : {})
+
+                                                    *g:tlib#file#absolute_filename_rx*
+g:tlib#file#absolute_filename_rx (default: '^\~\?[\/]')
+
                                                     *tlib#file#Split()*
 tlib#file#Split(filename)
     EXAMPLES: >
@@ -1590,7 +1735,7 @@ tlib#file#Split(filename)
 <
 
                                                     *tlib#file#Join()*
-tlib#file#Join(filename_parts, ?strip_slashes=1)
+tlib#file#Join(filename_parts, ?strip_slashes=1, ?maybe_absolute=0)
     EXAMPLES: >
       tlib#file#Join(['foo', 'bar', 'filename.txt'])
       => 'foo/bar/filename.txt'
@@ -1612,21 +1757,56 @@ tlib#file#Canonic(filename, ...)
                                                     *tlib#file#With()*
 tlib#file#With(fcmd, bcmd, files, ?world={})
 
+                                                    *tlib#file#Edit()*
+tlib#file#Edit(fileid)
+    Return 0 if the file isn't readable/doesn't exist.
+    Otherwise return 1.
+
+                                                    *tlib#file#Glob()*
+tlib#file#Glob(pattern)
+
+                                                    *tlib#file#Globpath()*
+tlib#file#Globpath(path, pattern)
+
 
 ========================================================================
 autoload/tlib/sys.vim~
 
+                                                    *g:tlib#sys#special_protocols*
+g:tlib#sys#special_protocols   (default: ['https\?', 'nntp', 'mailto'])
+    A list of |regexp|s matching protocol names that should be handled 
+    by |g:tlib#sys#system_browser|.
+    CAVEAT: Must be a |\V| |regexp|.
+
+                                                    *g:tlib#sys#special_suffixes*
+g:tlib#sys#special_suffixes    (default: ['xlsx\?', 'docx\?', 'pptx\?', 'accdb', 'mdb', 'sqlite', 'pdf', 'jpg', 'png', 'gif'])
+    A list of |regexp|s matching suffixes that should be handled by 
+    |g:tlib#sys#system_browser|.
+    CAVEAT: Must be a |\V| |regexp|.
+
+                                                    *g:tlib#sys#system_rx*
+g:tlib#sys#system_rx           (default: printf('\V\%(\^\%(%s\):\|.\%(%s\)\)', join(g:tlib#sys#special_protocols, '\|'), join(g:tlib#sys#special_suffixes, '\|')))
+    Open links matching this |regexp| with |g:tlib#sys#system_browser|.
+    CAVEAT: Must be a |\V| |regexp|.
+
+                                                    *g:tlib#sys#system_browser*
+g:tlib#sys#system_browser      (default: ...)
+    Open files in the system browser.
+
                                                     *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#IsCygwinBin()*
+tlib#sys#IsCygwinBin(cmd)
+
                                                     *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'))
+g:tlib#sys#check_cygpath       (default: g:tlib#sys#windows && tlib#sys#IsExecutable('cygpath', 1))
     If true, check whether we have to convert a path via cyppath -- 
     see |tlib#sys#MaybeUseCygpath|
 
@@ -1640,9 +1820,6 @@ 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)
 
@@ -1658,6 +1835,20 @@ tlib#sys#ConvertPath(converter, filename)
                                                     *tlib#sys#FileArgs()*
 tlib#sys#FileArgs(cmd, files)
 
+                                                    *tlib#sys#IsSpecial()*
+tlib#sys#IsSpecial(filename)
+    Check whether filename matches |g:tlib#sys#system_rx|, i.e. whether it 
+    is a special file that should not be opened in vim.
+
+                                                    *tlib#sys#Open()*
+tlib#sys#Open(filename)
+    Open filename with the default OS application (see 
+    |g:tlib#sys#system_browser|), if |tlib#sys#IsSpecial()| return 1. 
+    Returns 1 if successful or 0 otherwise.
+
+                                                    *tlib#sys#SystemInDir()*
+tlib#sys#SystemInDir(dir, expr, ?input='')
+
 
 ========================================================================
 autoload/tlib/paragraph.vim~
@@ -1715,6 +1906,13 @@ prototype.PrintLines
 prototype.Suspend
 
 
+========================================================================
+autoload/tlib/loclist.vim~
+
+                                                    *tlib#loclist#Browse()*
+tlib#loclist#Browse(...)
+
+
 ========================================================================
 autoload/tlib/tab.vim~
 
@@ -1733,6 +1931,12 @@ tlib#tab#Set(tabnr)
 ========================================================================
 autoload/tlib/date.vim~
 
+                                                    *tlib#date#IsDate()*
+tlib#date#IsDate(text)
+
+                                                    *tlib#date#Format()*
+tlib#date#Format(secs1970)
+
                                                     *tlib#date#DiffInDays()*
 tlib#date#DiffInDays(date1, ?date2=localtime(), ?allow_zero=0)
 
@@ -1743,6 +1947,9 @@ tlib#date#Parse(date, ?allow_zero=0) "{{{3
 tlib#date#SecondsSince1970(date, ...)
     tlib#date#SecondsSince1970(date, ?daysshift=0, ?allow_zero=0)
 
+                                                    *tlib#date#Shift()*
+tlib#date#Shift(date, shift)
+
 
 ========================================================================
 autoload/tlib/type.vim~
@@ -1762,6 +1969,18 @@ tlib#type#IsList(expr)
                                                     *tlib#type#IsDictionary()*
 tlib#type#IsDictionary(expr)
 
+                                                    *tlib#type#Is()*
+tlib#type#Is(val, type)
+
+                                                    *tlib#type#Are()*
+tlib#type#Are(vals, type)
+
+                                                    *tlib#type#Has()*
+tlib#type#Has(val, lst)
+
+                                                    *tlib#type#Have()*
+tlib#type#Have(vals, lst)
+
 
 ========================================================================
 autoload/tlib/Filter_fuzzy.vim~
@@ -1774,6 +1993,27 @@ tlib#Filter_fuzzy#New(...)
     In "fuzzy" mode, the pretty printing of filenames is disabled.
 
 
+========================================================================
+autoload/tlib/assert.vim~
+
+                                                    *tlib#assert#Enable()*
+tlib#assert#Enable()
+    Enable tracing via |:Tlibassert|.
+
+                                                    *tlib#assert#Disable()*
+tlib#assert#Disable()
+    Disable tracing via |:Tlibassert|.
+
+                                                    *tlib#assert#Assert()*
+tlib#assert#Assert(caller, check, vals)
+
+                                                    *tlib#assert#Map()*
+tlib#assert#Map(vals, expr)
+
+                                                    *tlib#assert#All()*
+tlib#assert#All(vals)
+
+
 ========================================================================
 autoload/tlib/textobjects.vim~
 
@@ -1813,16 +2053,30 @@ tlib#arg#Let(list, ?default='')
     Set a positional arguments from a variable argument list.
     See tlib#input#List() for an example.
 
-                                                    *tlib#arg#Key()*
-tlib#arg#Key(dict, list, ?default='')
-    See |:TKeyArg|.
-
                                                     *tlib#arg#StringAsKeyArgs()*
-tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':')
+tlib#arg#StringAsKeyArgs(string, ?keys=[], ?evaluate=0, ?sep=':', ?booleans=0)
 
                                                     *tlib#arg#StringAsKeyArgsEqual()*
 tlib#arg#StringAsKeyArgsEqual(string)
 
+                                                    *tlib#arg#GetOpts()*
+tlib#arg#GetOpts(args, ?def={})
+    Convert a list of strings of command-line arguments into a dictonary.
+
+    The main use case is to pass [<f-args>], i.e. the command-line 
+    arguments of a command as list, from a command definition to this 
+    function.
+
+    Example:
+    ['-h']
+    => If def contains a 'help' key, invoke |:help| on its value.
+
+    ['-ab', '--foo', '--bar=BAR', 'bla', bla']
+    => {'a': 1, 'b': 1, 'foo': 1, 'bar': 'BAR', '__rest__': ['bla', 'bla']}
+
+    ['-ab', '--', '--foo', '--bar=BAR']
+    => {'a': 1, 'b': 1, '__rest__': ['--foo', '--bar=BAR']}
+
                                                     *tlib#arg#Ex()*
 tlib#arg#Ex(arg, ?chars='%#! ')
     Escape some characters in a string.
@@ -1965,6 +2219,64 @@ tlib#grep#QuickFixList(rx, files)
 tlib#grep#List(rx, files)
 
 
+========================================================================
+autoload/tlib/qfl.vim~
+
+                                                    *tlib#qfl#FormatQFLE()*
+tlib#qfl#FormatQFLE(qfe)
+
+                                                    *tlib#qfl#QfeFilename()*
+tlib#qfl#QfeFilename(qfe)
+
+                                                    *tlib#qfl#InitListBuffer()*
+tlib#qfl#InitListBuffer(world)
+
+                                                    *tlib#qfl#SetSyntax()*
+tlib#qfl#SetSyntax()
+
+                                                    *tlib#qfl#Balloon()*
+tlib#qfl#Balloon()
+
+                                                    *tlib#qfl#AgentEditQFE()*
+tlib#qfl#AgentEditQFE(world, selected, ...)
+
+                                                    *tlib#qfl#AgentPreviewQFE()*
+tlib#qfl#AgentPreviewQFE(world, selected)
+
+                                                    *tlib#qfl#AgentGotoQFE()*
+tlib#qfl#AgentGotoQFE(world, selected)
+
+                                                    *tlib#qfl#AgentWithSelected()*
+tlib#qfl#AgentWithSelected(world, selected, ...)
+
+                                                    *tlib#qfl#RunCmdOnSelected()*
+tlib#qfl#RunCmdOnSelected(world, selected, cmd, ...)
+
+                                                    *tlib#qfl#AgentSplitBuffer()*
+tlib#qfl#AgentSplitBuffer(world, selected)
+
+                                                    *tlib#qfl#AgentTabBuffer()*
+tlib#qfl#AgentTabBuffer(world, selected)
+
+                                                    *tlib#qfl#AgentVSplitBuffer()*
+tlib#qfl#AgentVSplitBuffer(world, selected)
+
+                                                    *tlib#qfl#AgentEditLine()*
+tlib#qfl#AgentEditLine(world, selected)
+
+                                                    *tlib#qfl#EditLine()*
+tlib#qfl#EditLine(lnum)
+
+                                                    *tlib#qfl#SetFollowCursor()*
+tlib#qfl#SetFollowCursor(world, selected)
+
+                                                    *tlib#qfl#QflList()*
+tlib#qfl#QflList(list, ...)
+
+                                                    *tlib#qfl#Browse()*
+tlib#qfl#Browse(...)
+
+
 ========================================================================
 autoload/tlib/Filter_cnf.vim~
 
@@ -2177,6 +2489,9 @@ tlib#string#Strip(string)
                                                     *tlib#string#Count()*
 tlib#string#Count(string, rx)
 
+                                                    *tlib#string#SplitCommaList()*
+tlib#string#SplitCommaList(text, ...)
+
 
 
 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 e25ec7b5..cc2c3ca0 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -1,47 +1,25 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Created:     2007-04-10.
-" @Last Change: 2014-07-03.
+" @Last Change: 2015-11-23.
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    754
+" @Revision:    808
 " @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")
+if &cp || exists("g:loaded_tlib")
     finish
 endif
 if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 113
+let g:loaded_tlib = 117
 
 let s:save_cpo = &cpo
 set cpo&vim
 
 
-" Init~ {{{1
-" call tlib#autocmdgroup#Init()
-
-
-" Commands~ {{{1
-
-" :display: :TRequire NAME [VERSION [FILE]]
-" Make a certain vim file is loaded.
-"
-" Conventions: If FILE isn't defined, plugin/NAME.vim is loaded. The 
-" file must provide a variable loaded_{NAME} that represents the version 
-" number.
-command! -nargs=+ TRequire let s:require = [<f-args>]
-            \ | if !exists('loaded_'. get(s:require, 0))
-                \ | exec 'runtime '. get(s:require, 2, 'plugin/'. get(s:require, 0) .'.vim')
-                \ | if !exists('loaded_'. get(s:require, 0)) || loaded_{get(s:require, 0)} < get(s:require, 1, loaded_{get(s:require, 0)})
-                    \ | echoerr 'Require '.  get(s:require, 0) .' >= '. get(s:require, 1, 'any version will do')
-                    \ | finish
-                    \ | endif
-                \ | endif | unlet s:require
-
-
 " :display: :TLet VAR = VALUE
 " Set a variable only if it doesn't already exist.
 " EXAMPLES: >
@@ -59,7 +37,7 @@ command! -nargs=+ TLet if !exists(matchstr(<q-args>, '^[^=[:space:]]\+')) | exec
 " EXAMPLES: >
 "   TScratch 'scratch': '__FOO__'
 "   => Open a scratch buffer named __FOO__
-command! -bar -nargs=* -bang TScratch call tlib#scratch#UseScratch({'scratch_split': '<bang>' != '!', <args>})
+command! -bar -nargs=* -bang TScratch call tlib#scratch#UseScratch({'scratch_split': empty('<bang>'), <args>})
 
 
 " :display: :TVarArg VAR1, [VAR2, DEFAULT2] ...
@@ -73,17 +51,6 @@ command! -bar -nargs=* -bang TScratch call tlib#scratch#UseScratch({'scratch_spl
 command! -nargs=+ TVarArg exec tlib#arg#Let([<args>])
 
 
-" :display: :TKeyArg DICT, VAR1, [VAR2, DEFAULT2] ...
-" A convenience wrapper for |tlib#arg#Let|.
-" EXAMPLES: >
-"   function! Foo(keyargs)
-"       TKeyArg a:keyargs, ['a', 1], 'b'
-"       echo 'a='. a
-"       echo 'b='. b
-"   endf
-command! -nargs=+ TKeyArg exec tlib#arg#Key([<args>])
-
-
 " :display: :TBrowseOutput COMMAND
 " Ever wondered how to efficiently browse the output of a command 
 " without redirecting it to a file? This command takes a command as 
@@ -98,6 +65,7 @@ command! -nargs=+ TKeyArg exec tlib#arg#Key([<args>])
 "   TBrowseOutput 20verb TeaseTheCulprit
 command! -nargs=1 -complete=command TBrowseOutput call tlib#cmd#BrowseOutput(<q-args>)
 
+
 " :display: :TBrowseScriptnames
 " List all sourced script names (the output of ':scriptnames').
 "
@@ -106,12 +74,28 @@ command! -nargs=1 -complete=command TBrowseOutput call tlib#cmd#BrowseOutput(<q-
 "
 " EXAMPLES: >
 "   TBrowseScriptnames 
-command! -nargs=0 -complete=command TBrowseScriptnames call
-            \ tlib#cmd#BrowseOutputWithCallback("tlib#cmd#ParseScriptname", "scriptnames")
+command! -nargs=0 -complete=command TBrowseScriptnames call tlib#cmd#TBrowseScriptnames()
 
-" :display: :TTimeCommand CMD
-" Time the execution time of CMD.
-command! -nargs=1 -complete=command TTimeCommand call tlib#cmd#Time(<q-args>)
+
+" :display: :Tlibtrace GUARD, VAR1, VAR2...
+" Do nothing unless |tlib#trace#Enable()| was called.
+" 
+" When |:Tlibtraceset| or |tlib#trace#Enable()| were called:
+"
+" If GUARD is a number that evaluates to true or if it is a string that 
+" matches a |regexp|, which was added using Tlibtrace! (with '!'), 
+" display the values of VAR1, VAR2 ...
+command! -nargs=+ -bang -bar Tlibtrace :
+
+
+" :Tlibtraceset +RX1, -RX2...
+" If |tlib#trace#Enable()| was called: With the optional <bang>, users 
+" can add and remove GUARDs (actually a |regexp|) that should be traced.
+command! -nargs=+ -bang -bar Tlibtraceset call tlib#trace#Set(<q-args>)
+
+
+" :display: :Tlibtrace ASSERTION
+command! -nargs=+ -bang -bar Tlibassert :
 
 
 let &cpo = s:save_cpo
diff --git a/sources_non_forked/vim-airline/README.md b/sources_non_forked/vim-airline/README.md
index 795f8189..c4651cf4 100644
--- a/sources_non_forked/vim-airline/README.md
+++ b/sources_non_forked/vim-airline/README.md
@@ -181,7 +181,11 @@ Contributions and pull requests are welcome.  Please take note of the following
 *  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.
+
+## Themes
+
 *  If you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
+*  In the majority of cases, modifications to colors of existing themes will likely be rejected.  Themes are a subjective thing, so while you may prefer that a particular color be darker, another user will prefer it to be lighter, or something entirely different.  The more popular the theme, the more unlikely the change will be accepted.  However, it's pretty simple to create your own theme; copy the theme to `~/.vim/autoload/airline/themes` under a new name with your modifications, and it can be used.
 
 # License
 
@@ -199,7 +203,7 @@ MIT License. Copyright (c) 2013-2015 Bailey Ling.
 [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
+[10]: https://github.com/ctrlpvim/ctrlp.vim
 [11]: https://github.com/tpope/vim-pathogen
 [12]: https://github.com/Shougo/neobundle.vim
 [13]: https://github.com/gmarik/vundle
diff --git a/sources_non_forked/vim-airline/autoload/airline.vim b/sources_non_forked/vim-airline/autoload/airline.vim
index 0b66c7d6..1d102320 100644
--- a/sources_non_forked/vim-airline/autoload/airline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline.vim
@@ -88,6 +88,9 @@ function! airline#switch_matching_theme()
 endfunction
 
 function! airline#update_statusline()
+  if airline#util#getwinvar(winnr(), 'airline_disabled', 0)
+    return
+  endif
   for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
     if airline#util#getwinvar(nr, 'airline_disabled', 0)
       continue
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index b1f2224b..4b1c80a1 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -206,6 +206,10 @@ function! airline#extensions#load()
     call airline#extensions#whitespace#init(s:ext)
   endif
 
+  if get(g:, 'airline#extensions#wordcount#enabled', 1)
+    call airline#extensions#wordcount#init(s:ext)
+  endif
+
   if get(g:, 'airline#extensions#tabline#enabled', 0)
     call airline#extensions#tabline#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 7ad46508..01e23202 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -14,6 +14,10 @@ if s:head_format == 1
   function! s:format_name(name)
     return fnamemodify(a:name, ':t')
   endfunction
+elseif s:head_format == 2
+  function! s:format_name(name)
+    return pathshorten(a:name)
+  endfunction
 elseif type(s:head_format) == type('')
   function! s:format_name(name)
     return call(s:head_format, [a:name])
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
index 689b5617..32aaf39c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/capslock.vim
@@ -5,7 +5,7 @@ if !exists('*CapsLockStatusline')
 endif
 
 function! airline#extensions#capslock#status()
-  return CapsLockStatusline() == '[caps]' ? 'CAPS' : ''
+  return tolower(CapsLockStatusline()) == '[caps]' ? 'CAPS' : ''
 endfunction
 
 function! airline#extensions#capslock#init(ext)
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
index 1bd7899b..e4cb64b4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
@@ -34,7 +34,7 @@ function! airline#extensions#tabline#autoshow#on()
 
     " 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()
+    autocmd BufLeave,BufAdd,BufUnload * call airline#extensions#tabline#buflist#invalidate()
   augroup END
 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 fb9921ff..304e99b2 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -15,6 +15,7 @@ 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:long_format = get(g:, 'airline#extensions#whitespace#long_format', 'long[%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)
@@ -56,7 +57,12 @@ function! airline#extensions#whitespace#check()
       let mixed = s:check_mixed_indent()
     endif
 
-    if trailing != 0 || mixed != 0
+    let long = 0
+    if index(checks, 'long') > -1 && &tw > 0
+      let long = search('\%>'.&tw.'v.\+', 'nw')
+    endif
+
+    if trailing != 0 || mixed != 0 || long != 0
       let b:airline_whitespace_check = s:symbol
       if s:show_message
         if trailing != 0
@@ -65,6 +71,9 @@ function! airline#extensions#whitespace#check()
         if mixed != 0
           let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixed)
         endif
+        if long != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:long_format, long)
+        endif
       endif
     endif
   endif
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/wordcount.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/wordcount.vim
new file mode 100644
index 00000000..e6462322
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/wordcount.vim
@@ -0,0 +1,44 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:filetypes = get(g:, 'airline#extensions#wordcount#filetypes', '\vhelp|markdown|rst|org')
+let s:format = get(g:, 'airline#extensions#wordcount#format', '%d words')
+
+" adapted from http://stackoverflow.com/questions/114431/fast-word-count-function-in-vim
+function! s:update()
+  if &ft !~ s:filetypes
+    unlet! b:airline_wordcount
+    return
+  elseif mode() =~? 's'
+    " Bail on select mode
+    return
+  endif
+
+  let old_status = v:statusmsg
+  let position = getpos(".")
+  exe "silent normal! g\<c-g>"
+  let stat = v:statusmsg
+  call setpos('.', position)
+  let v:statusmsg = old_status
+
+  let parts = split(stat)
+  if len(parts) > 11
+    let cnt = str2nr(split(stat)[11])
+    let spc = g:airline_symbols.space
+    let b:airline_wordcount = printf(s:format, cnt) . spc . g:airline_right_alt_sep . spc
+  else
+    unlet! b:airline_wordcount
+  endif
+endfunction
+
+function! airline#extensions#wordcount#apply(...)
+  if &ft =~ s:filetypes
+    call airline#extensions#prepend_to_section('z', '%{get(b:, "airline_wordcount", "")}')
+  endif
+endfunction
+
+function! airline#extensions#wordcount#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#wordcount#apply')
+  autocmd BufReadPost,CursorMoved,CursorMovedI * call s:update()
+endfunction
+
diff --git a/sources_non_forked/vim-airline/autoload/airline/init.vim b/sources_non_forked/vim-airline/autoload/airline/init.vim
index 9b1d5fe0..f8e29639 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()
         \ 'accent': 'red',
         \ })
   call airline#parts#define_raw('file', '%f%m')
+  call airline#parts#define_raw('path', '%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','windowswap'])
@@ -96,7 +97,11 @@ function! airline#init#sections()
     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'])
+    if &autochdir == 1
+      let g:airline_section_c = airline#section#create(['%<', 'path', spc, 'readonly'])
+    else
+      let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
+    endif
   endif
   if !exists('g:airline_section_gutter')
     let g:airline_section_gutter = airline#section#create(['%='])
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/behelit.vim b/sources_non_forked/vim-airline/autoload/airline/themes/behelit.vim
index f12e902e..77f551c7 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/behelit.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/behelit.vim
@@ -51,6 +51,7 @@ let g:airline#themes#behelit#palette.normal.airline_warning = s:WI
 let g:airline#themes#behelit#palette.normal_modified.airline_warning = s:WI
 let g:airline#themes#behelit#palette.insert.airline_warning = s:WI
 let g:airline#themes#behelit#palette.insert_modified.airline_warning = s:WI
+let g:airline#themes#behelit#palette.insert_paste.airline_warning = s:WI
 let g:airline#themes#behelit#palette.visual.airline_warning = s:WI
 let g:airline#themes#behelit#palette.visual_modified.airline_warning = s:WI
 let g:airline#themes#behelit#palette.replace.airline_warning = s:WI
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/distinguished.vim b/sources_non_forked/vim-airline/autoload/airline/themes/distinguished.vim
new file mode 100644
index 00000000..0d65f4c4
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/distinguished.vim
@@ -0,0 +1,59 @@
+" vim-airline companion theme of distinguished
+" (https://github.com/Lokaltog/vim-distinguished)
+" I have nothing to do with the original
+" distinguished theme other than being a big fan.
+" this theme was shamelessly created by modifying
+" the Ubaryd airline theme.
+
+let s:gray    = [245, '#8a8a8a']
+let s:golden  = [143, '#afaf5f']
+let s:pink    = [131, '#af5f5f']
+let s:blue    = [ 67, '#5f87af']
+let s:orange  = [166, '#d75f00']
+let s:outerfg = [ 16, '#000000']
+let s:innerbg = [234, '#1c1c1c']
+let s:middle  = ['#bcbcbc', '#444444', 250, 238]
+
+" Normal mode
+let s:N1 = [s:outerfg[1], s:gray[1], s:outerfg[0], s:gray[0]]
+let s:N3 = [s:gray[1], s:innerbg[1], s:gray[0], s:innerbg[0]]
+
+" Insert mode
+let s:I1 = [s:outerfg[1], s:golden[1], s:outerfg[0], s:golden[0]]
+let s:I3 = [s:golden[1], s:innerbg[1], s:golden[0], s:innerbg[0]]
+
+" Visual mode
+let s:V1 = [s:outerfg[1], s:pink[1], s:outerfg[0], s:pink[0]]
+let s:V3 = [s:pink[1], s:innerbg[1], s:pink[0], s:innerbg[0]]
+
+" Replace mode
+let s:R1 = [s:outerfg[1], s:blue[1], s:outerfg[0], s:blue[0]]
+let s:R3 = [s:blue[1], s:innerbg[1], s:blue[0], s:innerbg[0]]
+
+" Inactive pane
+let s:IA = [s:middle[1], s:innerbg[1], s:middle[3], s:innerbg[0]]
+
+let g:airline#themes#distinguished#palette = {}
+let g:airline#themes#distinguished#palette.accents = {
+    \ 'red': ['#d70000', '', 160, '', '']}
+
+let g:airline#themes#distinguished#palette.inactive = {
+    \ 'airline_a': s:IA,
+    \ 'airline_b': s:IA,
+    \ 'airline_c': s:IA}
+
+let g:airline#themes#distinguished#palette.normal = airline#themes#generate_color_map(s:N1, s:middle, s:N3)
+let g:airline#themes#distinguished#palette.normal_modified = {
+    \ 'airline_a': ['', s:orange[1], '', s:orange[0], ''],
+    \ 'airline_c': [s:orange[1], '', s:orange[0], '', ''],
+    \ 'airline_x': [s:orange[1], '', s:orange[0], '', ''],
+    \ 'airline_z': ['', s:orange[1], '', s:orange[0], '']}
+
+let g:airline#themes#distinguished#palette.insert = airline#themes#generate_color_map(s:I1, s:middle, s:I3)
+let g:airline#themes#distinguished#palette.insert_modified = {}
+
+let g:airline#themes#distinguished#palette.replace = airline#themes#generate_color_map(s:R1, s:middle, s:R3)
+let g:airline#themes#distinguished#palette.replace_modified = {}
+
+let g:airline#themes#distinguished#palette.visual = airline#themes#generate_color_map(s:V1, s:middle, s:V3)
+let g:airline#themes#distinguished#palette.visual_modified = {}
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/term.vim b/sources_non_forked/vim-airline/autoload/airline/themes/term.vim
new file mode 100644
index 00000000..288ca6ac
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/term.vim
@@ -0,0 +1,92 @@
+
+" vim-airline 'term' theme
+" it is using current terminal colorscheme
+" and in gvim i left colors from 'wombat' theme but i am not using it anyway
+
+" Normal mode
+"          [ guifg, guibg, ctermfg, ctermbg, opts ]
+let s:N1 = [ '#141413' , '#CAE682' , 232 , 2 ] " mode
+let s:N2 = [ '#CAE682' , '#32322F' , 2 , 'black' ] " info
+let s:N3 = [ '#CAE682' , '#242424' , 2 , 233 ] " statusline
+let s:N4 = [ '#86CD74' , 10 ]                   " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 3 ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 3 , 'black' ]
+let s:I3 = [ '#FDE76E' , '#242424' , 3 , 233 ]
+let s:I4 = [ '#FADE3E' , 11 ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 4 ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 4 , 'black' ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 4 , 233 ]
+let s:V4 = [ '#7CB0E6' , 12 ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 1 ]
+let s:R2 = [ '#E5786D' , '#32322F' , 1 , 'black' ]
+let s:R3 = [ '#E5786D' , '#242424' , 1 , 233 ]
+let s:R4 = [ '#E55345' , 9 ]
+
+" Paste mode
+let s:PA = [ '#94E42C' , 6 ]
+
+" Info modified
+let s:IM = [ '#40403C' , 238 ]
+
+" Inactive mode
+let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
+
+let g:airline#themes#term#palette = {}
+
+let g:airline#themes#term#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
+
+let g:airline#themes#term#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#term#palette.normal_modified = {
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#term#palette.insert_modified = {
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#term#palette.visual_modified = {
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#term#palette.replace_modified = {
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.insert_paste = {
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#term#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#term#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
+      \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
+      \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )
+
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index 0d269b43..7911a69f 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -320,9 +320,13 @@ vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
   " 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'
+  " to only show the tail, e.g. a branch 'feature/foo' becomes 'foo', use
   let g:airline#extensions#branch#format = 1
 
+  " to truncate all path sections but the last one, e.g. a branch
+  " 'foo/bar/baz' becomes 'f/b/baz', use
+  let g:airline#extensions#branch#format = 2
+
   " if a string is provided, it should be the name of a function that
   " takes a string and returns the desired value
   let g:airline#extensions#branch#format = 'CustomBranchName'
@@ -401,6 +405,15 @@ eclim <https://eclim.org>
   |airline-syntastic| extension. >
   let g:airline#extensions#eclim#enabled = 1
 
+-------------------------------------                    *airline-wordcount*
+* enable/disable word counting. >
+  let g:airline#extensions#wordcount#enabled = 1
+<
+* regex of filetypes to enable word counting. >
+  " the default value matches filetypes typically used for documentation
+  " such as markdown and help files.
+  let g:airline#extensions#wordcount#filetypes = ...
+<
 -------------------------------------                   *airline-whitespace*
 * enable/disable detection of whitespace errors. >
   let g:airline#extensions#whitespace#enabled = 1
@@ -422,7 +435,7 @@ eclim <https://eclim.org>
   let g:airline#extensions#whitespace#symbol = '!'
 <
 * configure which whitespace checks to enable. >
-  let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ]
+  let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing', 'long' ]
 <
 * configure the maximum number of lines where whitespace checking is enabled. >
   let g:airline#extensions#whitespace#max_lines = 20000
@@ -433,6 +446,7 @@ eclim <https://eclim.org>
 * configure the formatting of the warning messages. >
   let g:airline#extensions#whitespace#trailing_format = 'trailing[%s]'
   let g:airline#extensions#whitespace#mixed_indent_format = 'mixed-indent[%s]'
+  let g:airline#extensions#whitespace#long_format = 'long[%s]'
 <
 -------------------------------------                      *airline-tabline*
 * enable/disable enhanced tabline. >
@@ -489,7 +503,11 @@ exposed.
   endfunction
   let g:airline#extensions#tabline#formatter = 'foo'
 <
+
   Note: the following variables are only used by the 'default' formatter.
+  When no disambiguation is needed, both 'unique_tail_improved' and
+  'unique_tail' delegate formatting to 'default', so these variables also
+  control rendering of unique filenames when using these formatters.
 
     * configure whether buffer numbers should be shown. >
       let g:airline#extensions#tabline#buffer_nr_show = 0
diff --git a/sources_non_forked/vim-commentary/README.markdown b/sources_non_forked/vim-commentary/README.markdown
index a39b19c7..5387ba6e 100644
--- a/sources_non_forked/vim-commentary/README.markdown
+++ b/sources_non_forked/vim-commentary/README.markdown
@@ -34,7 +34,7 @@ Once help tags have been generated, you can view the manual with
 
 Relax!  You just have to adjust `'commentstring'`:
 
-    autocmd FileType apache set commentstring=#\ %s
+    autocmd FileType apache setlocal commentstring=#\ %s
 
 ## Self-Promotion
 
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index a91cd712..2fc7db7e 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -13,6 +13,14 @@ function! s:surroundings() abort
         \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1)
 endfunction
 
+function! s:strip_white_space(l,r,line) abort
+  let [l, r] = [a:l, a:r]
+  if stridx(a:line,l) == -1 && stridx(a:line,l[0:-2]) == 0 && a:line[strlen(a:line)-strlen(r[1:]):-1] == r[1:]
+    return [l[0:-2], r[1:]]
+  endif
+  return [l, r]
+endfunction
+
 function! s:go(type,...) abort
   if a:0
     let [lnum1, lnum2] = [a:type, a:1]
@@ -24,6 +32,7 @@ function! s:go(type,...) abort
   let uncomment = 2
   for lnum in range(lnum1,lnum2)
     let line = matchstr(getline(lnum),'\S.*\s\@<!')
+    let [l, r] = s:strip_white_space(l,r,line)
     if line != '' && (stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
       let uncomment = 0
     endif
@@ -53,12 +62,14 @@ function! s:go(type,...) abort
 endfunction
 
 function! s:textobject(inner) abort
-  let [l, r] = s:surroundings()
+  let [l_, r_] = s:surroundings()
+  let [l, r] = [l_, r_]
   let lnums = [line('.')+1, line('.')-2]
   for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']]
     while lnums[index] != bound && line ==# '' || !(stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
       let lnums[index] += dir
       let line = matchstr(getline(lnums[index]+dir),'\S.*\s\@<!')
+      let [l, r] = s:strip_white_space(l_,r_,line)
     endwhile
   endfor
   while (a:inner || lnums[1] != line('$')) && empty(getline(lnums[0]))
diff --git a/sources_non_forked/vim-flake8/LICENSE b/sources_non_forked/vim-flake8/LICENSE
new file mode 100644
index 00000000..4380242a
--- /dev/null
+++ b/sources_non_forked/vim-flake8/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2014, Vincent Driessen
+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.
+
+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-flake8/README.mdown b/sources_non_forked/vim-flake8/README.mdown
new file mode 100644
index 00000000..692baadf
--- /dev/null
+++ b/sources_non_forked/vim-flake8/README.mdown
@@ -0,0 +1,169 @@
+vim-flake8
+==========
+`vim-flake8` is a Vim plugin that runs the currently open file through Flake8,
+a static syntax and style checker for Python source code.  It supersedes both
+[vim-pyflakes](https://github.com/nvie/vim-pyflakes) and
+[vim-pep8](https://github.com/nvie/vim-pep8).
+
+[Flake8](https://pypi.python.org/pypi/flake8/) is a wrapper around PyFlakes
+(static syntax checker), PEP8 (style checker) and Ned's MacCabe script
+(complexity checker).
+
+
+Installation
+------------
+Use [vim-pathogen](https://github.com/tpope/vim-pathogen) if you're not using
+it already.  Make sure you've installed the
+[flake8](https://pypi.python.org/pypi/flake8/) package.  Then, simply put the
+contents of this repository in your `~/.vim/bundle` directory.
+
+Usage
+-----
+1. Open a Python file
+2. Press `<F7>` to run `flake8` on it
+
+It shows the errors inside a quickfix window, which will allow your to quickly
+jump to the error locations by simply pressing [Enter].
+
+If any of `g:flake8_show_in_gutter` or `g:flake8_show_in_file` are set to `1`, call:
+
+    call flake8#Flake8UnplaceMarkers()
+
+To remove all markers. No default mapping is provided.
+
+Customization
+-------------
+If you don't want to use the `<F7>` key for flake8-checking, simply remap it to
+another key.  It autodetects whether it has been remapped and won't register
+the `<F7>` key if so.  For example, to remap it to `<F3>` instead, use:
+
+    autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
+
+For flake8 configuration options please consult the following page:
+
+https://flake8.readthedocs.org/en/latest/config.html
+
+To customize the location of your flake8 binary, set `g:flake8_cmd`:
+
+    let g:flake8_cmd="/opt/strangebin/flake8000"
+
+To customize the location of quick fix window, set `g:flake8_quickfix_location`:
+
+    let g:flake8_quickfix_location="topleft"
+
+To customize the height of quick fix window, set `g:flake8_quickfix_height`:
+
+    let g:flake8_quickfix_height=7
+
+To customize whether the quickfix window opens, set `g:flake8_show_quickfix`:
+
+    let g:flake8_show_quickfix=0  " don't show
+    let g:flake8_show_quickfix=1  " show (default)
+
+To customize whether the show signs in the gutter, set `g:flake8_show_in_gutter`:
+
+    let g:flake8_show_in_gutter=0  " don't show (default)
+    let g:flake8_show_in_gutter=1  " show
+
+To customize whether the show marks in the file, set `g:flake8_show_in_file`:
+
+    let g:flake8_show_in_file=0  " don't show (default)
+    let g:flake8_show_in_file=1  " show
+
+To customize the number of marks to show, set `g:flake8_max_markers`:
+
+    let g:flake8_max_markers=500  " (default)
+
+To customize the gutter markers, set any of `flake8_error_marker`, `flake8_warning_marker`,
+`flake8_pyflake_marker`, `flake8_complexity_marker`, `flake8_naming_marker`. Setting one to
+the empty string disables it. Ex.:
+
+    flake8_error_marker='EE'     " set error marker to 'EE'
+    flake8_warning_marker='WW'   " set warning marker to 'WW'
+    flake8_pyflake_marker=''     " disable PyFlakes warnings
+    flake8_complexity_marker=''  " disable McCabe complexity warnings
+    flake8_naming_marker=''      " disable naming warnings
+
+To customize the colors used for markers, define the highlight groups, `Flake8_Error`,
+`Flake8_Warning`, `Flake8_PyFlake`, `Flake8_Complexity`, `Flake8_Naming`:
+
+    " to use colors defined in the colorscheme
+    highlight link Flake8_Error      Error
+    highlight link Flake8_Warning    WarningMsg
+    highlight link Flake8_Complexity WarningMsg
+    highlight link Flake8_Naming     WarningMsg
+    highlight link Flake8_PyFlake    WarningMsg
+
+Tips
+----
+A tip might be to run the Flake8 check every time you write a Python file, to
+enable this, add the following line to your `.vimrc` file (thanks
+[Godefroid](https://github.com/gotcha)!):
+
+    autocmd BufWritePost *.py call Flake8()
+
+This plugin goes well together with the following plugin:
+
+- [PyUnit](https://github.com/nvie/vim-pyunit) (unit test helper under `<F8>`
+  and `<F9>`)
+
+
+History
+-------
+1.6: Deprecated configuring flake8 options through Vim settings.  Instead,
+advise users to use the `~/.config/flake8` config file.
+
+    - Decprecated options:
+      - `g:flake8_builtins`
+      - `g:flake8_ignore`
+      - `g:flake8_max_line_length`
+      - `g:flake8_max_complexity`
+
+    - New options:
+      - `g:flake8_quickfix_height`
+
+1.5: Added markers and the option to don't show the quickfix window, also split
+functions into a autoload file. Added:
+
+    - Options:
+      - `g:flake8_show_quickfix`
+      - `g:flake8_show_in_gutter`
+      - `g:flake8_show_in_file`
+      - `g:flake8_max_markers`
+      - `flake8_error_marker`
+      - `flake8_warning_marker`
+      - `flake8_pyflake_marker`
+      - `flake8_complexity_marker`
+      - `flake8_naming_marker`
+    - Functions:
+      - `flake8#Flake8UnplaceMarkers()`
+      - `flake8#Flake8()`
+    - Highlighting:
+      - `Flake8_Error`
+      - `Flake8_Warning`
+      - `Flake8_Complexity`
+      - `Flake8_Naming`
+      - `Flake8_PyFlake`
+
+1.4: Suppress output to stdout.
+
+1.3: Added the following options:
+
+    - `g:flake8_builtins="_,apply"`
+    - `g:flake8_max_complexity=10`
+
+1.2: Added the following options:
+
+    - `g:flake8_cmd="/opt/strangebin/flake8000"`
+    - `g:flake8_max_line_length=120`
+    - `g:flake8_ignore="E501,W293"`
+
+1.1: Added `g:flake8_ignore` option.
+
+1.0: Initial version.
+
+
+License
+-------
+
+Liberally licensed under BSD terms.
diff --git a/sources_non_forked/vim-flake8/autoload/flake8.vim b/sources_non_forked/vim-flake8/autoload/flake8.vim
new file mode 100644
index 00000000..06a1b6b4
--- /dev/null
+++ b/sources_non_forked/vim-flake8/autoload/flake8.vim
@@ -0,0 +1,250 @@
+"
+" Python filetype plugin for running flake8
+" Language:     Python (ft=python)
+" Maintainer:   Vincent Driessen <vincent@3rdcloud.com>
+" Version:      Vim 7 (may work with lower Vim versions, but not tested)
+" URL:          http://github.com/nvie/vim-flake8
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+"" ** external ** {{{
+
+function! flake8#Flake8()
+    call s:Flake8()
+    call s:Warnings()
+endfunction
+
+function! flake8#Flake8UnplaceMarkers()
+    call s:UnplaceMarkers()
+    call s:Warnings()
+endfunction
+
+"" }}}
+
+"" ** internal ** {{{
+
+"" warnings 
+
+let s:displayed_warnings = 0
+function s:Warnings()
+  if !s:displayed_warnings
+    let l:show_website_url = 0
+
+    let l:msg = "has been deprecated in favour of flake8 config files"
+    for setting_name in ['g:flake8_ignore', 'g:flake8_builtins', 'g:flake8_max_line_length', 'g:flake8_max_complexity']
+      if exists(setting_name)
+        echohl WarningMsg | echom setting_name l:msg | echohl None
+        let l:show_website_url = 1
+      endif
+    endfor
+
+    if l:show_website_url
+      let l:url = "http://flake8.readthedocs.org/en/latest/config.html"
+      echohl WarningMsg | echom l:url | echohl None
+    endif
+    let s:displayed_warnings = 1
+  endif
+endfunction
+
+"" config
+
+function! s:DeclareOption(name, globalPrefix, default)  " {{{
+    if !exists('g:'.a:name)
+        if a:default != ''
+            execute 'let s:'.a:name.'='.a:default
+        else
+            execute 'let s:'.a:name.'=""'
+        endif
+    else
+        execute 'let l:global="g:".a:name'
+        if l:global != ''
+            execute 'let s:'.a:name.'="'.a:globalPrefix.'".g:'.a:name
+        else
+            execute 'let s:'.a:name.'=""'
+        endif
+    endif
+endfunction  " }}}
+
+function! s:Setup()  " {{{
+    "" read options
+
+    " flake8 command
+    call s:DeclareOption('flake8_cmd', '', '"flake8"')
+    " quickfix
+    call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')
+    call s:DeclareOption('flake8_quickfix_height', '', 5)
+    call s:DeclareOption('flake8_show_quickfix', '', 1)
+    " markers to show
+    call s:DeclareOption('flake8_show_in_gutter', '',   0)
+    call s:DeclareOption('flake8_show_in_file', '',   0)
+    call s:DeclareOption('flake8_max_markers', '', 500)
+    " marker signs
+    call s:DeclareOption('flake8_error_marker', '', '"E>"')
+    call s:DeclareOption('flake8_warning_marker', '', '"W>"')
+    call s:DeclareOption('flake8_pyflake_marker', '', '"F>"')
+    call s:DeclareOption('flake8_complexity_marker', '', '"C>"')
+    call s:DeclareOption('flake8_naming_marker', '', '"N>"')
+
+    "" setup markerdata
+
+    if !exists('s:markerdata')
+        let s:markerdata = {}
+        let s:markerdata['E'] = {'name': 'Flake8_Error'}
+        let s:markerdata['W'] = {'name': 'Flake8_Warning'}
+        let s:markerdata['F'] = {'name': 'Flake8_PyFlake'}
+        let s:markerdata['C'] = {'name': 'Flake8_Complexity'}
+        let s:markerdata['N'] = {'name': 'Flake8_Nameing'}
+    endif
+    let s:markerdata['E'].marker = s:flake8_error_marker
+    let s:markerdata['W'].marker = s:flake8_warning_marker
+    let s:markerdata['F'].marker = s:flake8_pyflake_marker
+    let s:markerdata['C'].marker = s:flake8_complexity_marker
+    let s:markerdata['N'].marker = s:flake8_naming_marker
+endfunction  " }}}
+
+"" do flake8
+
+function! s:Flake8()  " {{{
+    " read config
+    call s:Setup()
+
+    if !executable(s:flake8_cmd)
+        echoerr "File " . s:flake8_cmd . " not found. Please install it first."
+        return
+    endif
+
+    " clear old
+    call s:UnplaceMarkers()
+    let s:matchids = []
+    let s:signids  = []
+
+    " store old grep settings (to restore later)
+    let l:old_gfm=&grepformat
+    let l:old_gp=&grepprg
+    let l:old_shellpipe=&shellpipe
+
+    " write any changes before continuing
+    if &readonly == 0
+        update
+    endif
+
+    set lazyredraw   " delay redrawing
+    cclose           " close any existing cwindows
+
+    " set shellpipe to > instead of tee (suppressing output)
+    set shellpipe=>
+
+    " perform the grep itself
+    let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
+    let &grepprg=s:flake8_cmd
+    silent! grep! "%"
+
+    " restore grep settings
+    let &grepformat=l:old_gfm
+    let &grepprg=l:old_gp
+    let &shellpipe=l:old_shellpipe
+
+    " process results
+    let l:results=getqflist()
+    let l:has_results=results != []
+    if l:has_results
+        " markers
+        if !s:flake8_show_in_gutter == 0 || !s:flake8_show_in_file == 0
+            call s:PlaceMarkers(l:results)
+        endif
+        " quickfix
+        if !s:flake8_show_quickfix == 0
+            " open cwindow
+            execute s:flake8_quickfix_location." copen".s:flake8_quickfix_height
+            setlocal wrap
+            nnoremap <buffer> <silent> c :cclose<CR>
+            nnoremap <buffer> <silent> q :cclose<CR>
+        endif
+    endif
+
+    set nolazyredraw
+    redraw!
+
+    " Show status
+    if l:has_results == 0
+        echon "Flake8 check OK"
+    else
+        echon "Flake8 found issues"
+    endif
+endfunction  " }}}
+
+"" markers
+
+function! s:PlaceMarkers(results)  " {{{
+    " in gutter?
+    if !s:flake8_show_in_gutter == 0
+        " define signs
+        for val in values(s:markerdata)
+            if val.marker != ''
+                execute "sign define ".val.name." text=".val.marker." texthl=".val.name
+            endif
+        endfor
+    endif
+
+    " place
+    let l:index0 = 100
+    let l:index  = l:index0
+    for result in a:results
+        if l:index >= (s:flake8_max_markers+l:index0)
+            break
+        endif
+        let l:type = strpart(result.text, 0, 1)
+        if has_key(s:markerdata, l:type) && s:markerdata[l:type].marker != ''
+            " file markers
+            if !s:flake8_show_in_file == 0
+                if !has_key(s:markerdata[l:type], 'matchstr')
+                    let s:markerdata[l:type].matchstr = '\%('
+                else
+                    let s:markerdata[l:type].matchstr .= '\|'
+                endif
+                let s:markerdata[l:type].matchstr .= '\%'.result.lnum.'l\%'.result.col.'c'
+            endif
+            " gutter markers
+            if !s:flake8_show_in_gutter == 0
+                execute ":sign place ".index." name=".s:markerdata[l:type].name
+                            \ . " line=".result.lnum." file=".expand("%:p")
+                let s:signids += [l:index]
+            endif
+            let l:index += 1
+        endif
+    endfor
+
+    " in file?
+    if !s:flake8_show_in_file == 0
+        for l:val in values(s:markerdata)
+            if l:val.marker != '' && has_key(l:val, 'matchstr')
+                let l:val.matchid = matchadd(l:val.name, l:val.matchstr.'\)')
+            endif
+        endfor
+    endif
+endfunction  " }}}
+
+function! s:UnplaceMarkers()  " {{{
+    " gutter markers
+    if exists('s:signids')
+        for i in s:signids
+            execute ":sign unplace ".i
+        endfor
+        unlet s:signids
+    endif
+    " file markers
+    for l:val in values(s:markerdata)
+        if has_key(l:val, 'matchid')
+            call matchdelete(l:val.matchid)
+            unlet l:val.matchid
+            unlet l:val.matchstr
+        endif
+    endfor
+endfunction  " }}}
+
+"" }}}
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
diff --git a/sources_non_forked/vim-flake8/ftplugin/python_flake8.vim b/sources_non_forked/vim-flake8/ftplugin/python_flake8.vim
new file mode 100644
index 00000000..dd062d91
--- /dev/null
+++ b/sources_non_forked/vim-flake8/ftplugin/python_flake8.vim
@@ -0,0 +1,55 @@
+"
+" Python filetype plugin for running flake8
+" Language:     Python (ft=python)
+" Maintainer:   Vincent Driessen <vincent@3rdcloud.com>
+" Version:      Vim 7 (may work with lower Vim versions, but not tested)
+" URL:          http://github.com/nvie/vim-flake8
+"
+" Only do this when not done yet for this buffer
+if exists("b:loaded_flake8_ftplugin")
+    finish
+endif
+let b:loaded_flake8_ftplugin=1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+"" Highlight groups for errors
+" pep8 errors
+highlight default Flake8_Error
+            \ ctermbg=DarkRed ctermfg=Red cterm=bold
+            \ guibg=DarkRed   guifg=Red   gui=bold
+" pep8 warnings
+highlight default Flake8_Warning
+            \ ctermbg=Yellow ctermfg=DarkYellow cterm=bold
+            \ guibg=Yellow   guifg=DarkYellow   gui=bold
+" PyFlakes codes
+highlight default Flake8_PyFlake
+            \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
+            \ guibg=DarkBlue   guifg=Blue   gui=bold
+" McCabe complexity warnings
+highlight default Flake8_Complexity
+            \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
+            \ guibg=DarkBlue   guifg=Blue   gui=bold
+" naming conventions
+highlight default Flake8_Naming
+            \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
+            \ guibg=DarkBlue   guifg=Blue   gui=bold
+
+" to not break with old versions
+function! Flake8()
+    call flake8#Flake8()
+endfunction
+
+" Add mappings, unless the user didn't want this.
+" The default mapping is registered under to <F7> by default, unless the user
+" remapped it already (or a mapping exists already for <F7>)
+if !exists("no_plugin_maps") && !exists("no_flake8_maps")
+    if !hasmapto('Flake8(') && !hasmapto('flake8#Flake8(')
+        noremap <buffer> <F7> :call flake8#Flake8()<CR>
+    endif
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
diff --git a/sources_non_forked/vim-fugitive/doc/fugitive.txt b/sources_non_forked/vim-fugitive/doc/fugitive.txt
index 0d186bff..9a2cb148 100644
--- a/sources_non_forked/vim-fugitive/doc/fugitive.txt
+++ b/sources_non_forked/vim-fugitive/doc/fugitive.txt
@@ -220,32 +220,40 @@ that are part of Git repositories).
 :[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.
+:Gbrowse                Open the current file, blob, tree, commit, or tag
+                        in your browser at the upstream hosting provider.
+                        If a range is given, it is appropriately appended to
+                        the URL as an anchor.
 
-                        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.
+                        Upstream providers can be added by installing an
+                        appropriate Vim plugin.  For example, GitHub can be
+                        supported by installing rhubarb.vim, available at
+                        <https://github.com/tpope/vim-rhubarb>.  (Native
+                        support for GitHub is currently included, but that is
+                        slated to be removed.)
 
-:[range]Gbrowse {revision}
-                        Like :Gbrowse, but for a given |fugitive-revision|.  A
+                        The hosting provider is determined by looking at the
+                        remote for the current or specified branch and falls
+                        back to "origin".  In the special case of a "."
+                        remote, a local instance of git-instaweb will be
+                        started and used.
+
+:Gbrowse {revision}     Like :Gbrowse, but for a given |fugitive-revision|.  A
                         useful value here is -, which ties the URL to the
                         latest commit rather than a volatile branch.
 
-:[range]Gbrowse [...]@{remote}
-                        Force using the given remote rather than the remote
+:Gbrowse [...]@{remote} Force using the given remote rather than the remote
                         for the current branch.  The remote is used to
                         determine which GitHub repository to link to.
 
+:{range}Gbrowse [args]  Appends an anchor to the URL that emphasizes the
+                        selected lines.  You almost certainly want to give a
+                        "-" argument in this case to force the URL to include
+                        an exact revision.
+
+:[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
+                        than opening it.
+
 MAPPINGS                                        *fugitive-mappings*
 
 These maps are available everywhere.
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 0332f246..046bd174 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -143,11 +143,11 @@ function! fugitive#extract_git_dir(path) abort
       break
     endif
     if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
-      return $GIT_DIR
+      return simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??'))
     endif
     if fugitive#is_git_dir($GIT_DIR)
       " Ensure that we've cached the worktree
-      call s:configured_tree($GIT_DIR)
+      call s:configured_tree(simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??')))
       if has_key(s:dir_for_worktree, root)
         return s:dir_for_worktree[root]
       endif
@@ -220,7 +220,7 @@ endfunction
 
 augroup fugitive
   autocmd!
-  autocmd BufNewFile,BufReadPost * call fugitive#detect(expand('<amatch>:p'))
+  autocmd BufNewFile,BufReadPost * call fugitive#detect(expand('%:p'))
   autocmd FileType           netrw call fugitive#detect(expand('%:p'))
   autocmd User NERDTreeInit,NERDTreeNewRoot call fugitive#detect(b:NERDTreeRoot.path.str())
   autocmd VimEnter * if expand('<amatch>')==''|call fugitive#detect(getcwd())|endif
@@ -320,6 +320,8 @@ function! s:repo_translate(spec) dict abort
     return 'fugitive://'.self.dir().'//'.ref
   elseif a:spec =~# '^:'
     return 'fugitive://'.self.dir().'//0/'.a:spec[1:-1]
+  elseif a:spec ==# '@'
+    return self.dir('HEAD')
   elseif a:spec =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(self.dir(a:spec))
     return self.dir(a:spec)
   elseif filereadable(self.dir('refs/'.a:spec))
@@ -404,6 +406,11 @@ function! s:repo_superglob(base) dict abort
     if a:base !~# '^/'
       let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"]
       let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n"))
+      " Add any stashes.
+      if filereadable(s:repo().dir('refs/stash'))
+        let heads += ["stash"]
+        let heads += sort(split(s:repo().git_chomp("stash","list","--pretty=format:%gd"),"\n"))
+      endif
       call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
       let results += heads
     endif
@@ -683,7 +690,7 @@ function! s:Git(bang, args) abort
   let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
   if exists(':terminal')
     let dir = s:repo().tree()
-    tabnew
+    tabedit %
     execute 'lcd' fnameescape(dir)
     execute 'terminal' git args
   else
@@ -1253,7 +1260,7 @@ function! s:Grep(cmd,bang,arg) abort
   try
     execute cd.'`=s:repo().tree()`'
     let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color')
-    let &grepformat = '%f:%l:%m'
+    let &grepformat = '%f:%l:%m,%m %f match%ts,%f'
     exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|')
     let list = a:cmd =~# '^l' ? getloclist(0) : getqflist()
     for entry in list
@@ -1328,7 +1335,14 @@ function! s:Edit(cmd,bang,...) abort
   let buffer = s:buffer()
   if a:cmd !~# 'read'
     if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
-      wincmd p
+      if winnr('$') == 1
+        let tabs = (&go =~# 'e' || !has('gui_running')) && &stal && (tabpagenr('$') >= &stal)
+        execute 'rightbelow' (&lines - &previewheight - &cmdheight - tabs - 1 - !!&laststatus).'new'
+      elseif winnr('#')
+        wincmd p
+      else
+        wincmd w
+      endif
       if &diff
         let mywinnr = winnr()
         for winnr in range(winnr('$'),1,-1)
@@ -1394,6 +1408,9 @@ function! s:Edit(cmd,bang,...) abort
   catch /^fugitive:/
     return 'echoerr v:errmsg'
   endtry
+  if file !~# '^fugitive:'
+    let file = s:sub(file, '/$', '')
+  endif
   if a:cmd ==# 'read'
     return 'silent %delete_|read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.')
   else
@@ -1456,6 +1473,9 @@ function! s:Write(force,...) abort
   let mytab = tabpagenr()
   let mybufnr = bufnr('')
   let path = a:0 ? join(a:000, ' ') : s:buffer().path()
+  if empty(path)
+    return 'echoerr '.string('fugitive: cannot determine file path')
+  endif
   if path =~# '^:\d\>'
     return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:repo().translate(s:buffer().expand(path)))
   endif
@@ -1613,9 +1633,9 @@ 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>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff('',<bang>0,<f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<bang>0,<f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<bang>0,<f-args>)")
 
 augroup fugitive_diff
   autocmd!
@@ -1729,11 +1749,16 @@ endfunction
 
 call s:add_methods('buffer',['compare_age'])
 
-function! s:Diff(vert,...) abort
+function! s:Diff(vert,keepfocus,...) abort
+  let args = copy(a:000)
+  let post = ''
+  if get(args, 0) =~# '^+'
+    let post = remove(args, 0)[1:-1]
+  endif
   let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert
   if exists(':DiffGitCached')
     return 'DiffGitCached'
-  elseif (!a:0 || a:1 == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
+  elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
     let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
     let nr = bufnr('')
     execute 'leftabove '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`'
@@ -1745,11 +1770,11 @@ function! s:Diff(vert,...) abort
     call s:diffthis()
     wincmd p
     call s:diffthis()
-    return ''
-  elseif a:0
-    let arg = join(a:000, ' ')
+    return post
+  elseif len(args)
+    let arg = join(args, ' ')
     if arg ==# ''
-      return ''
+      return post
     elseif arg ==# '/'
       let file = s:buffer().path('/')
     elseif arg ==# ':'
@@ -1782,13 +1807,17 @@ function! s:Diff(vert,...) abort
     else
       execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
     endif
+    let &l:readonly = &l:readonly
+    redraw
     let w:fugitive_diff_restore = restore
     let winnr = winnr()
     if getwinvar('#', '&diff')
       wincmd p
-      call feedkeys(winnr."\<C-W>w", 'n')
+      if !a:keepfocus
+        call feedkeys(winnr."\<C-W>w", 'n')
+      endif
     endif
-    return ''
+    return post
   catch /^fugitive:/
     return 'echoerr v:errmsg'
   endtry
@@ -2070,15 +2099,17 @@ function! s:BlameJump(suffix) abort
   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>"
+  if exists(':Gblame')
+    execute 'Gblame '.args
+    execute lnum
+    let delta = line('.') - line('w0') - offset
+    if delta > 0
+      execute 'normal! '.delta."\<C-E>"
+    elseif delta < 0
+      execute 'normal! '.(-delta)."\<C-Y>"
+    endif
+    syncbind
   endif
-  syncbind
   return ''
 endfunction
 
@@ -2145,11 +2176,18 @@ endfunction
 
 " Section: Gbrowse
 
-call s:command("-bar -bang -range -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)")
+call s:command("-bar -bang -range=0 -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:]_-]*\%(://.\{-\}\)\=$','','') : ''
+    let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)'
+    if a:0
+      let remote = matchstr(join(a:000, ' '),'@\zs\%('.validremote.'\)$')
+      let rev = substitute(join(a:000, ' '),'@\%('.validremote.'\)$','','')
+    else
+      let remote = ''
+      let rev = ''
+    endif
     if rev ==# ''
       let expanded = s:buffer().rev()
     elseif rev ==# ':'
@@ -2160,10 +2198,11 @@ function! s:Browse(bang,line1,count,...) abort
     let full = s:repo().translate(expanded)
     let commit = ''
     if full =~# '^fugitive://'
-      let commit = matchstr(full,'://.*//\zs\w\+')
+      let commit = matchstr(full,'://.*//\zs\w\w\+')
       let path = matchstr(full,'://.*//\w\+\zs/.*')
       if commit =~ '..'
         let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':'))
+        let branch = matchstr(expanded, '^[^:]*')
       else
         let type = 'blob'
       endif
@@ -2181,6 +2220,9 @@ function! s:Browse(bang,line1,count,...) abort
         let type = 'blob'
       endif
     endif
+    if type ==# 'tree' && !empty(path)
+      let path = s:sub(path, '/\=$', '/')
+    endif
     if path =~# '^\.git/.*HEAD' && filereadable(s:repo().dir(path[5:-1]))
       let body = readfile(s:repo().dir(path[5:-1]))[0]
       if body =~# '^\x\{40\}$'
@@ -2192,35 +2234,54 @@ function! s:Browse(bang,line1,count,...) abort
       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+/','')
+    let merge = ''
+    if path =~# '^\.git/refs/remotes/.'
+      if empty(remote)
+        let remote = matchstr(path, '^\.git/refs/remotes/\zs[^/]\+')
       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.*')
+      let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+      let branch = ''
+      let path = '.git/refs/heads/'.merge
+    elseif path =~# '^\.git/refs/heads/.'
+      let branch = path[16:-1]
+    elseif !exists('branch')
+      let branch = s:repo().head()
+    endif
+    if !empty(branch)
+      let r = s:repo().git_chomp('config','branch.'.branch.'.remote')
+      let m = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1]
+      if r ==# '.' && !empty(m)
+        let r2 = s:repo().git_chomp('config','branch.'.m.'.remote')
+        if r2 !~# '^\.\=$'
+          let r = r2
+          let m = s:repo().git_chomp('config','branch.'.m.'.merge')[11:-1]
         endif
-        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
+      if empty(remote)
+        let remote = r
+      endif
+      if r ==# '.' || r ==# remote
+        let merge = m
+        if path =~# '^\.git/refs/heads/.'
+          let path = '.git/refs/heads/'.merge
         endif
       endif
     endif
 
-    let raw = s:repo().git_chomp('config','remote.'.remote.'.url')
+    if empty(commit) && path !~# '^\.git/'
+      if a:line1 && !a:count && !empty(merge)
+        let commit = merge
+      else
+        let commit = s:repo().rev_parse('HEAD')
+      endif
+    endif
+
+    if empty(remote)
+      let remote = '.'
+      let raw = s:repo().git_chomp('config','remote.origin.url')
+    else
+      let raw = s:repo().git_chomp('config','remote.'.remote.'.url')
+    endif
     if raw ==# ''
       let raw = remote
     endif
@@ -2229,7 +2290,7 @@ function! s:Browse(bang,line1,count,...) abort
       let url = call(Handler, [{
             \ 'repo': s:repo(),
             \ 'remote': raw,
-            \ 'revision': rev,
+            \ 'revision': 'No longer provided',
             \ 'commit': commit,
             \ 'path': path,
             \ 'type': type,
@@ -2240,10 +2301,13 @@ function! s:Browse(bang,line1,count,...) abort
       endif
     endfor
 
-    if empty(url)
-      call s:throw("Instaweb failed to start and '".remote."' is not a supported remote")
+    if empty(url) && raw ==# '.'
+      call s:throw("Instaweb failed to start")
+    elseif empty(url)
+      call s:throw('"'.remote."' is not a supported remote")
     endif
 
+    let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))')
     if a:bang
       if has('clipboard')
         let @* = url
@@ -2279,7 +2343,7 @@ function! s:github_url(opts, ...) abort
   if repo ==# ''
     return ''
   endif
-  let path = a:opts.path
+  let path = substitute(a:opts.path, '^/', '', '')
   if index(domains, 'http://' . matchstr(repo, '^[^:/]*')) >= 0
     let root = 'http://' . s:sub(repo,':','/')
   else
@@ -2292,36 +2356,29 @@ function! s:github_url(opts, ...) abort
     else
       return root . '/commits/' . branch
     endif
-  elseif path =~# '^\.git/refs/.'
-    return root . '/commits/' . matchstr(path,'[^/]\+$')
+  elseif path =~# '^\.git/refs/tags/'
+    return root . '/releases/tag/' . path[15:-1]
+  elseif path =~# '^\.git/refs/remotes/[^/]\+/.'
+    return root . '/commits/' . matchstr(path,'remotes/[^/]\+/\zs.*')
   elseif path =~# '.git/\%(config$\|hooks\>\)'
     return root . '/admin'
   elseif path =~# '^\.git\>'
     return root
   endif
-  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
+  if a:opts.commit =~# '^\d\=$'
+    let commit = a:opts.repo.rev_parse('HEAD')
   else
     let commit = a:opts.commit
   endif
-  if a:opts.type == 'tree'
-    let url = s:sub(root . '/tree/' . commit . '/' . path,'/$','')
-  elseif a:opts.type == 'blob'
+  if get(a:opts, 'type', '') ==# 'tree' || a:opts.path =~# '/$'
+    let url = substitute(root . '/tree/' . commit . '/' . path, '/$', '', 'g')
+  elseif get(a:opts, 'type', '') ==# 'blob' || a:opts.path =~# '[^/]$'
     let url = root . '/blob/' . commit . '/' . path
     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
+      let url .= '#L' . a:opts.line1 . '-L' . a:opts.line2
     endif
-  elseif a:opts.type == 'tag'
-    let commit = matchstr(getline(3),'^tag \zs.*')
-    let url = root . '/tree/' . commit
   else
     let url = root . '/commit/' . commit
   endif
@@ -2329,6 +2386,9 @@ function! s:github_url(opts, ...) abort
 endfunction
 
 function! s:instaweb_url(opts) abort
+  if a:opts.remote !=# '.'
+    return ''
+  endif
   let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
   if output =~# 'http://'
     let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t')
@@ -2347,10 +2407,8 @@ function! s:instaweb_url(opts) abort
     endif
     let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path))
   else
-    if a:opts.type ==# 'blob'
-      let tmp = tempname()
-      silent execute 'write !'.a:opts.repo.git_command('hash-object','-w','--stdin').' > '.tmp
-      let url .= ';h=' . readfile(tmp)[0]
+    if a:opts.type ==# 'blob' && empty(a:opts.commit)
+      let url .= ';h='.a:opts.repo.git_chomp('hash-object', '-w', a:opts.path)
     else
       try
         let url .= ';h=' . a:opts.repo.rev_parse((a:opts.commit == '' ? 'HEAD' : ':' . a:opts.commit) . ':' . a:opts.path)
@@ -2391,11 +2449,17 @@ function! s:ReplaceCmd(cmd,...) abort
         let prefix = 'env GIT_INDEX_FILE='.s:shellesc(a:1).' '
       endif
     endif
+    let redir = ' > '.tmp
+    if &shellpipe =~ '2>&1'
+      let redir .= ' 2>&1'
+    endif
     if s:winshell()
       let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
-      call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').' > '.tmp.'"')
+      call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').redir.'"')
+    elseif &shell =~# 'fish'
+      call system(' begin;'.prefix.a:cmd.redir.';end ')
     else
-      call system(' ('.prefix.a:cmd.' > '.tmp.') ')
+      call system(' ('.prefix.a:cmd.redir.') ')
     endif
   finally
     if exists('old_index')
@@ -2438,16 +2502,13 @@ function! s:BufReadIndex() abort
     else
       let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
       let dir = getcwd()
-      if fugitive#git_version() =~# '^0\|^1\.[1-3]\.'
+      if fugitive#git_version() =~# '^0\|^1\.[1-7]\.'
         let cmd = s:repo().git_command('status')
-      elseif fugitive#git_version() =~# '^1\.[4-7]\.'
-        let cmd = s:repo().git_command('status', '-u')
       else
         let cmd = s:repo().git_command(
               \ '-c', 'status.displayCommentPrefix=true',
               \ '-c', 'color.status=false',
               \ '-c', 'status.short=false',
-              \ '-c', 'status.showUntrackedFiles=all',
               \ 'status')
       endif
       try
@@ -2668,6 +2729,10 @@ augroup fugitive_files
         \ if exists('b:git_dir') |
         \  call s:JumpInit() |
         \ endif
+  autocmd FileType git,gitcommit,gitrebase
+        \ if exists('b:git_dir') |
+        \   call s:GFInit() |
+        \ endif
 augroup END
 
 " Section: Temp files
@@ -2691,7 +2756,18 @@ augroup END
 
 " Section: Go to file
 
-function! s:JumpInit() abort
+nnoremap <SID>: :<C-U><C-R>=v:count ? v:count : ''<CR>
+function! s:GFInit(...) abort
+  cnoremap <buffer> <expr> <Plug><cfile> fugitive#cfile()
+  if !exists('g:fugitive_no_maps') && empty(mapcheck('gf', 'n'))
+    nmap <buffer> <silent> gf          <SID>:find <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W>f     <SID>:sfind <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W><C-F> <SID>:sfind <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W>gf  <SID>:tabfind <Plug><cfile><CR>
+  endif
+endfunction
+
+function! s:JumpInit(...) abort
   nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
   if !&modifiable
     nnoremap <buffer> <silent> o     :<C-U>exe <SID>GF("split")<CR>
@@ -2710,7 +2786,7 @@ function! s:JumpInit() abort
   endif
 endfunction
 
-function! s:GF(mode) abort
+function! s:cfile() abort
   try
     let buffer = s:buffer()
     let myhash = buffer.sha1()
@@ -2720,12 +2796,10 @@ function! s:GF(mode) abort
 
     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('.'),'/$',''))
+      if showtree && line('.') > 2
+        return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$','')]
       elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t'
-        return s:Edit(a:mode,0,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$',''))
+        return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')]
       endif
 
     elseif buffer.type('blob')
@@ -2735,38 +2809,40 @@ function! s:GF(mode) abort
       catch /^fugitive:/
       endtry
       if exists('sha1')
-        return s:Edit(a:mode,0,ref)
+        return [ref]
       endif
 
     else
 
+      let dcmds = []
+
       " Index
       if getline('.') =~# '^\d\{6\} \x\{40\} \d\t'
         let ref = matchstr(getline('.'),'\x\{40\}')
         let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':')
-        return s:Edit(a:mode,0,file)
+        return [file]
 
       elseif getline('.') =~# '^#\trenamed:.* -> '
         let file = '/'.matchstr(getline('.'),' -> \zs.*')
-        return s:Edit(a:mode,0,file)
+        return [file]
       elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.'
         let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
-        return s:Edit(a:mode,0,file)
+        return [file]
       elseif getline('.') =~# '^#\t.'
         let file = '/'.matchstr(getline('.'),'#\t\zs.*')
-        return s:Edit(a:mode,0,file)
+        return [file]
       elseif getline('.') =~# ': needs merge$'
         let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$')
-        return s:Edit(a:mode,0,file).'|Gdiff'
+        return [file, 'Gdiff!']
 
       elseif getline('.') ==# '# Not currently on any branch.'
-        return s:Edit(a:mode,0,'HEAD')
+        return ['HEAD']
       elseif getline('.') =~# '^# On branch '
         let file = 'refs/heads/'.getline('.')[12:]
-        return s:Edit(a:mode,0,file)
+        return [file]
       elseif getline('.') =~# "^# Your branch .*'"
         let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'")
-        return s:Edit(a:mode,0,file)
+        return [file]
       endif
 
       let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
@@ -2776,7 +2852,7 @@ function! s:GF(mode) abort
 
       elseif getline('.') =~# '^commit \x\{40\}\>'
         let ref = matchstr(getline('.'),'\x\{40\}')
-        return s:Edit(a:mode,0,ref)
+        return [ref]
 
       elseif getline('.') =~# '^parent \x\{40\}\>'
         let ref = matchstr(getline('.'),'\x\{40\}')
@@ -2786,21 +2862,21 @@ function! s:GF(mode) abort
           let parent += 1
           let line -= 1
         endwhile
-        return s:Edit(a:mode,0,ref)
+        return [ref]
 
       elseif getline('.') =~ '^tree \x\{40\}$'
         let ref = matchstr(getline('.'),'\x\{40\}')
         if s:repo().rev_parse(myhash.':') == ref
           let ref = myhash.':'
         endif
-        return s:Edit(a:mode,0,ref)
+        return [ref]
 
       elseif getline('.') =~# '^object \x\{40\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$'
         let ref = matchstr(getline('.'),'\x\{40\}')
         let type = matchstr(getline(line('.')+1),'type \zs.*')
 
       elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$'
-        return ''
+        let ref = buffer.rev()
 
       elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>'
         let ref = matchstr(getline('.'),'\x\{40\}')
@@ -2812,7 +2888,7 @@ function! s:GF(mode) abort
       elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW')
         let type = getline('.')[0]
         let lnum = line('.') - 1
-        let offset = -1
+        let offset = 0
         while getline(lnum) !~# '^@@ -\d\+,\d\+ +\d\+,'
           if getline(lnum) =~# '^[ '.type.']'
             let offset += 1
@@ -2821,18 +2897,25 @@ 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.'|normal! zv'
-        let dref = ''
+        let dcmds = [offset, 'normal!zv']
 
       elseif getline('.') =~# '^rename from '
         let ref = 'a/'.getline('.')[12:]
       elseif getline('.') =~# '^rename to '
         let ref = 'b/'.getline('.')[10:]
 
+      elseif getline('.') =~# '^@@ -\d\+,\d\+ +\d\+,'
+        let diff = getline(search('^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)', 'bcnW'))
+        let offset = matchstr(getline('.'), '+\zs\d\+')
+
+        let dref = matchstr(diff, '\Cdiff --git \zs\%(a/.*\|/dev/null\)\ze \%(b/.*\|/dev/null\)')
+        let ref = matchstr(diff, '\Cdiff --git \%(a/.*\|/dev/null\) \zs\%(b/.*\|/dev/null\)')
+        let dcmd = 'Gdiff! +'.offset
+
       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'
+        let dcmd = 'Gdiff!'
 
       elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)'
         let line = getline(line('.')-1)
@@ -2844,7 +2927,7 @@ function! s:GF(mode) abort
         let ref = getline('.')
 
       elseif expand('<cword>') =~# '^\x\{7,40\}\>'
-        return s:Edit(a:mode,0,expand('<cword>'))
+        return [expand('<cword>')]
 
       else
         let ref = ''
@@ -2870,16 +2953,38 @@ function! s:GF(mode) abort
       endif
 
       if exists('dref')
-        return s:Edit(a:mode,0,ref) . '|'.dcmd.' '.s:fnameescape(dref)
+        return [ref, dcmd . ' ' . s:fnameescape(dref)] + dcmds
       elseif ref != ""
-        return s:Edit(a:mode,0,ref)
+        return [ref] + dcmds
       endif
 
     endif
-    return ''
+    return []
+  endtry
+endfunction
+
+function! s:GF(mode) abort
+  try
+    let results = s:cfile()
   catch /^fugitive:/
     return 'echoerr v:errmsg'
   endtry
+  if len(results)
+    return s:Edit(a:mode, 0, results[0]).join(map(results[1:-1], '"|".v:val'), '')
+  else
+    return ''
+  endif
+endfunction
+
+function! fugitive#cfile() abort
+  let pre = ''
+  let results = s:cfile()
+  if empty(results)
+    return expand('<cfile>')
+  elseif len(results) > 1
+    let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' '
+  endif
+  return pre . s:fnameescape(fugitive#repo().translate(results[0]))
 endfunction
 
 " Section: Statusline
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index cadba931..e75c3271 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -1,8 +1,8 @@
 # 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
+Go (golang) support for Vim, which comes with pre-defined sensible settings (like
+auto gofmt on save), with autocomplete, snippet support, improved syntax
+highlighting, go toolchain commands, and more.  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.
@@ -11,41 +11,46 @@ disabled/enabled easily.
 
 ## Features
 
-* Improved Syntax highlighting, such as Functions, Operators, Methods..
+* Improved Syntax highlighting with items such as Functions, Operators, Methods.
 * Auto completion support via `gocode`
-* Better `gofmt` on save, keeps cursor position and doesn't break your undo
+* Better `gofmt` on save, which 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.
+* Look up documentation with `:GoDoc` inside Vim or open it in browser
 * Automatically import packages via `:GoImport` or plug it into autosave
-* Compile your package with `:GoBuild` , install it with `:GoInstall`
-* `:GoRun` quickly your current file/files
-* Run `:GoTest` and see any errors in quickfix window
-* Automatic `GOPATH` detection based on the directory structure (i.e: `godep`
-  vendored projects)
+* Compile your package with `:GoBuild`, install it with `:GoInstall` or test
+  them with `:GoTest` (also supports running single tests via `:GoTestFunc`)
+* Quickly execute your current file/files with `:GoRun`
+* Automatic `GOPATH` detection based on the directory structure (i.e. `gb`
+  projects, `godep` vendored projects)
 * Change or display `GOPATH` with `:GoPath`
 * Create a coverage profile and display annotated source code in browser to see
   which functions are covered with `:GoCoverage`
+* Call `gometalinter` with `:GoMetaLinter`, which invokes all possible linters
+  (golint, vet, errcheck, deadcode, etc..) and shows the warnings/errors
 * Lint your code with `:GoLint`
-* Run your code through `:GoVet` to catch static errors.
-* Advanced source analysis tool with oracle, such as `:GoImplements`,
-  `:GoCallees`, `:GoReferrers`
+* Run your code through `:GoVet` to catch static errors
+* Advanced source analysis tools utilizing oracle, such as `:GoImplements`,
+  `:GoCallees`, and `:GoReferrers`
 * Precise type-safe renaming of identifiers with `:GoRename`
 * List all source files and dependencies
-* Checking with `:GoErrCheck` for unchecked errors.
-* Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
+* Unchecked error checking with `:GoErrCheck`
+* Integrated and improved snippets, supporting `ultisnips` or `neosnippet`
 * Share your current code to [play.golang.org](http://play.golang.org) with `:GoPlay`
 * On-the-fly type information about the word under the cursor. Plug it into
   your custom vim function.
 * 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`
+* Custom vim text objects such as `a function` or `inner function`
+* All commands support collecting and displaying errors in Vim's location
+  list.
 
 ## Install
 
-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.
+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 oriented vim plugins. For Pathogen just clone the repo. For other
+plugin managers add the appropriate lines and execute the plugin's install
+command.
 
 *  [Pathogen](https://github.com/tpope/vim-pathogen)
   * `git clone https://github.com/fatih/vim-go.git ~/.vim/bundle/vim-go`
@@ -57,21 +62,22 @@ add the appropriate lines and execute the plugin's install command.
   * `Plugin 'fatih/vim-go'`
 
 Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
-`goimports`, etc..). You can easily install them with the included
-`:GoInstallBinaries` command. If you invoke it, all necessary binaries will be
+`goimports`, etc.). You can easily install them with the included
+`:GoInstallBinaries` command. If invoked, 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.
+it will use `$GOPATH/bin`). Note that this command requires `git` for fetching
+the individual Go packages. Additionally, use `:GoUpdateBinaries` to update the
+installed binaries.
 
 ### Optional
 
-* Autocompletion is enabled by default via `<C-x><C-o>`, to get real-time
+* 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
+* To display source code tag information on a sidebar install
 [tagbar](https://github.com/majutsushi/tagbar).
-* For snippet feature install:
+* For snippet features 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).
@@ -79,7 +85,7 @@ completion (completion by type) install:
 
 ## Usage
 
-Many of the [features](#features) are enabled by default. There are no
+Many of the plugin's [features](#features) are enabled by default. There are no
 additional settings needed. All usages and commands are listed in
 `doc/vim-go.txt`. Note that help tags needs to be populated. Check your plugin
 manager settings to generate the documentation (some do it automatically).
@@ -92,9 +98,9 @@ After that just open the help page to see all commands:
 vim-go has several `<Plug>` mappings which can be used to create custom
 mappings. Below are some examples you might find useful:
 
-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
+Run commands such as `go run` for the current file with `<leader>r` or `go
+build` and `go test` for the current package with `<leader>b` and `<leader>t` respectively.
+Display beautifully annotated source code to see which functions are covered
 with `<leader>c`.
 
 ```vim
@@ -104,9 +110,9 @@ 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:
+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)
@@ -183,7 +189,7 @@ Disable auto fmt on save:
 let g:go_fmt_autosave = 0
 ```
 
-Disable opening browser after posting to your snippet to `play.golang.org`:
+Disable opening browser after posting your snippet to `play.golang.org`:
 
 ```vim
 let g:go_play_open_browser = 0
@@ -197,23 +203,33 @@ let g:go_bin_path = expand("~/.gotools")
 let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
 ```
 
+### Location list navigation
+
+All commands support collecting and displaying errors in Vim's location
+  list.
+
+Quickly navigate through these location lists with `:lne` for next error and `:lp` 
+for previous.  You can also bind these to keys, for example:
+
+```vim
+map <C-n> :lne<CR>
+map <C-m> :lp<CR>
+```
+
+
+### Using with Syntastic
+Sometimes when using both `vim-go` and `syntastic` Vim will start lagging while saving and opening
+files. The following fixes this:
+
+```vim
+let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
+let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
+```
 
 ## More info
 
-Check out the Wiki page for more information. It includes Screencasts, FAQ
-section and many various piece of information:
-
-[https://github.com/fatih/vim-go/wiki](https://github.com/fatih/vim-go/wiki)
-
-
-## 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!
+Check out the [Wiki](https://github.com/fatih/vim-go/wiki) page for more information. It includes [Screencasts](https://github.com/fatih/vim-go/wiki/Screencasts), an [FAQ
+section](https://github.com/fatih/vim-go/wiki/FAQ-Troubleshooting), and many other [various pieces](https://github.com/fatih/vim-go/wiki) of information.
 
 ## Credits
 
diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim
index 24bc26a3..1b6f9f14 100644
--- a/sources_non_forked/vim-go/autoload/go/cmd.vim
+++ b/sources_non_forked/vim-go/autoload/go/cmd.vim
@@ -8,57 +8,88 @@ function! go#cmd#autowrite()
     endif
 endfunction
 
+
 " Build buils the source code without producting any output binary. We live in
 " an editor so the best is to build it to catch errors and fix them. By
 " default it tries to call simply 'go build', but it first tries to get all
 " dependent files for the current folder and passes it to go build.
 function! go#cmd#Build(bang, ...)
-    let default_makeprg = &makeprg
-    let gofiles = join(go#tool#Files(), '" "')
+    " expand all wildcards(i.e: '%' to the current file name)
+    let goargs = map(copy(a:000), "expand(v:val)")
+
+    " escape all shell arguments before we pass it to make
+    let goargs = go#util#Shelllist(goargs, 1)
+
+    " create our command arguments. go build discards any results when it
+    " compiles multiple packages. So we pass the `errors` package just as an
+    " placeholder with the current folder (indicated with '.')
+    let args = ["build"]  + goargs + [".", "errors"]
+
+    " if we have nvim, call it asynchronously and return early ;)
+    if has('nvim')
+        call go#jobcontrol#Spawn(a:bang, "build", args)
+        return
+    endif
 
     let old_gopath = $GOPATH
     let $GOPATH = go#path#Detect()
+    let default_makeprg = &makeprg
+    let &makeprg = "go " . join(args, ' ')
 
-    if v:shell_error
-        let &makeprg = "go build . errors"
-    else
-        let &makeprg = "go build -o /dev/null " . join(a:000, ' ') . ' "' . gofiles . '"'
-    endif
+    " execute make inside the source folder so we can parse the errors
+    " correctly
+    let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+    let dir = getcwd()
+    try
+      execute cd . fnameescape(expand("%:p:h"))
+      if g:go_dispatch_enabled && exists(':Make') == 2
+          call go#util#EchoProgress("building dispatched ...")
+          silent! exe 'Make'
+      else
+          silent! exe 'lmake!'
+      endif
+      redraw!
+    finally
+      execute cd . fnameescape(dir)
+    endtry
 
-    echon "vim-go: " | echohl Identifier | echon "building ..."| echohl None
-    if g:go_dispatch_enabled && exists(':Make') == 2
-        silent! exe 'Make'
-    else
-        silent! exe 'make!'
-    endif
-    redraw!
+    let errors = go#list#Get()
+    call go#list#Window(len(errors))
 
-    cwindow
-    let errors = getqflist()
-    if !empty(errors) 
+    if !empty(errors)
         if !a:bang
-            cc 1 "jump to first error if there is any
+            call go#list#JumpToFirst()
         endif
     else
-        redraws! | echon "vim-go: " | echohl Function | echon "[build] SUCCESS"| echohl None
+        call go#util#EchoSuccess("[build] SUCCESS")
     endif
 
     let &makeprg = default_makeprg
     let $GOPATH = old_gopath
 endfunction
 
+
+" Run runs the current file (and their dependencies if any) in a new terminal.
+function! go#cmd#RunTerm(bang, mode)
+    let cmd = "go run ".  go#util#Shelljoin(go#tool#Files())
+    call go#term#newmode(a:bang, cmd, a:mode)
+endfunction
+
 " Run runs the current file (and their dependencies if any) and outputs it.
 " This is intented to test small programs and play with them. It's not
 " suitable for long running apps, because vim is blocking by default and
 " calling long running apps will block the whole UI.
 function! go#cmd#Run(bang, ...)
-    let goFiles = '"' . join(go#tool#Files(), '" "') . '"'
+    if has('nvim')
+        call go#cmd#RunTerm(a:bang, '')
+        return
+    endif
 
     let old_gopath = $GOPATH
     let $GOPATH = go#path#Detect()
 
     if go#util#IsWin()
-        exec '!go run ' . goFiles
+        exec '!go run ' . go#util#Shelljoin(go#tool#Files())
         if v:shell_error
             redraws! | echon "vim-go: [run] " | echohl ErrorMsg | echon "FAILED"| echohl None
         else
@@ -69,23 +100,27 @@ function! go#cmd#Run(bang, ...)
         return
     endif
 
+    " :make expands '%' and '#' wildcards, so they must also be escaped
     let default_makeprg = &makeprg
-    if !len(a:000)
-        let &makeprg = 'go run ' . goFiles
+    if a:0 == 0
+        let &makeprg = 'go run ' . go#util#Shelljoin(go#tool#Files(), 1)
     else
-        let &makeprg = "go run " . expand(a:1)
+        let &makeprg = "go run " . go#util#Shelljoin(map(copy(a:000), "expand(v:val)"), 1)
     endif
 
     if g:go_dispatch_enabled && exists(':Make') == 2
-        silent! exe 'Make!'
+        silent! exe 'Make'
     else
-        exe 'make!'
+        exe 'lmake!'
     endif
 
-    cwindow
-    let errors = getqflist()
+    let items = go#list#Get()
+    let errors = go#tool#FilterValids(items)
+
+    call go#list#Populate(errors)
+    call go#list#Window(len(errors))
     if !empty(errors) && !a:bang
-        cc 1 "jump to first error if there is any
+        call go#list#JumpToFirst()
     endif
 
     let $GOPATH = old_gopath
@@ -93,21 +128,23 @@ function! go#cmd#Run(bang, ...)
 endfunction
 
 " Install installs the package by simple calling 'go install'. If any argument
-" is given(which are passed directly to 'go insta'') it tries to install those
-" packages. Errors are populated in the quickfix window.
+" is given(which are passed directly to 'go instal') it tries to install those
+" packages. Errors are populated in the location window.
 function! go#cmd#Install(bang, ...)
-    let pkgs = join(a:000, '" "')
-    let command = 'go install "' . pkgs . '"'
+    let command = 'go install ' . go#util#Shelljoin(a:000)
     call go#cmd#autowrite()
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
-        call go#tool#ShowErrors(out)
-        cwindow
-        let errors = getqflist()
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        call go#list#Populate(errors)
+        call go#list#Window(len(errors))
         if !empty(errors) && !a:bang
-            cc 1 "jump to first error if there is any
+            call go#list#JumpToFirst()
         endif
         return
+    else
+        call go#list#Clean()
+        call go#list#Window()
     endif
 
     echon "vim-go: " | echohl Function | echon "installed to ". $GOPATH | echohl None
@@ -117,42 +154,63 @@ endfunction
 " compile the tests instead of running them (useful to catch errors in the
 " test files). Any other argument is appendend to the final `go test` command
 function! go#cmd#Test(bang, compile, ...)
-    let command = "go test "
+    let args = ["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"
+        call add(args, "-c")
     endif
 
-    if len(a:000)
-        let command .= expand(a:1)
+    if a:0
+        " expand all wildcards(i.e: '%' to the current file name)
+        let goargs = map(copy(a:000), "expand(v:val)")
+
+        " escape all shell arguments before we pass it to test
+        call extend(args, go#util#Shelllist(goargs, 1))
+    else
+        " only add this if no custom flags are passed
+        let timeout  = get(g:, 'go_test_timeout', '10s')
+        call add(args, printf("-timeout=%s", timeout))
     endif
 
-    if len(a:000) == 2
-        let command .= a:2
+    if has('nvim')
+        if get(g:, 'go_term_enabled', 0)
+            call go#term#new(a:bang, ["go"] + args)
+        else
+            call go#jobcontrol#Spawn(a:bang, "test", args)
+        endif
+        return
     endif
 
-    call go#cmd#autowrite()
     if a:compile
         echon "vim-go: " | echohl Identifier | echon "compiling tests ..." | echohl None
     else
         echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
     endif
 
+    call go#cmd#autowrite()
     redraw
+
+    let command = "go " . join(args, ' ')
+
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
-        call go#tool#ShowErrors(out)
-        cwindow
-        let errors = getqflist()
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        let errors = go#tool#FilterValids(errors)
+
+        call go#list#Populate(errors)
+        call go#list#Window(len(errors))
         if !empty(errors) && !a:bang
-            cc 1 "jump to first error if there is any
+            call go#list#JumpToFirst()
+        elseif empty(errors)
+            " failed to parse errors, output the original content
+            call go#util#EchoError(out)
         endif
         echon "vim-go: " | echohl ErrorMsg | echon "[test] FAIL" | echohl None
     else
-        call setqflist([])
-        cwindow
+        call go#list#Clean()
+        call go#list#Window()
 
         if a:compile
             echon "vim-go: " | echohl Function | echon "[test] SUCCESS" | echohl None
@@ -182,17 +240,13 @@ function! go#cmd#TestFunc(bang, ...)
 
     let line = getline(test)
     let name = split(split(line, " ")[1], "(")[0]
-    let flag = "-run \"" . name . "$\""
+    let args = [a:bang, 0, "-run", name . "$"]
 
-    let a1 = ""
-    if len(a:000)
-        let a1 = a:1
-
-        " add extra space
-        let flag = " " . flag
+    if a:0
+        call extend(args, a:000)
     endif
 
-    call go#cmd#Test(a:bang, 0, a1, flag)
+    call call('go#cmd#Test', args)
 endfunction
 
 " Coverage creates a new cover profile with 'go test -coverprofile' and opens
@@ -200,76 +254,58 @@ endfunction
 function! go#cmd#Coverage(bang, ...)
     let l:tmpname=tempname()
 
-    let command = "go test -coverprofile=".l:tmpname
+    let command = "go test -coverprofile=" . l:tmpname . ' ' . go#util#Shelljoin(a:000)
 
     call go#cmd#autowrite()
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
-        call go#tool#ShowErrors(out)
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        call go#list#Populate(errors)
+        call go#list#Window(len(errors))
+        if !empty(errors) && !a:bang
+            call go#list#JumpToFirst()
+        endif
     else
-        " clear previous quick fix window
-        call setqflist([])
+        " clear previous location list 
+        call go#list#Clean()
+        call go#list#Window()
 
         let openHTML = 'go tool cover -html='.l:tmpname
         call go#tool#ExecuteInDir(openHTML)
     endif
-    cwindow
-    let errors = getqflist()
-    if !empty(errors) && !a:bang
-        cc 1 "jump to first error if there is any
-    endif
+
     call delete(l:tmpname)
 endfunction
 
-" Vet calls "go vet' on the current directory. Any warnings are populated in
-" the quickfix window
-function! go#cmd#Vet(bang)
-    call go#cmd#autowrite()
-    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
-
-    let errors = getqflist()
-    if !empty(errors) 
-        if !a:bang
-            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
-"
 " Generate runs 'go generate' in similar fashion to go#cmd#Build()
 function! go#cmd#Generate(bang, ...)
     let default_makeprg = &makeprg
-    let gofiles = join(go#tool#Files(), '" "')
 
     let old_gopath = $GOPATH
     let $GOPATH = go#path#Detect()
 
+    " :make expands '%' and '#' wildcards, so they must also be escaped
+    let goargs = go#util#Shelljoin(map(copy(a:000), "expand(v:val)"), 1)
     if v:shell_error
-        let &makeprg = "go generate " . join(a:000, ' ')
+        let &makeprg = "go generate " . goargs
     else
-        let &makeprg = "go generate " . join(a:000, ' ') . ' "' . gofiles . '"'
+        let gofiles = go#util#Shelljoin(go#tool#Files(), 1)
+        let &makeprg = "go generate " . goargs . ' ' . gofiles
     endif
 
     echon "vim-go: " | echohl Identifier | echon "generating ..."| echohl None
     if g:go_dispatch_enabled && exists(':Make') == 2
         silent! exe 'Make'
     else
-        silent! exe 'make!'
+        silent! exe 'lmake!'
     endif
     redraw!
 
-    cwindow
-    let errors = getqflist()
+    let errors = go#list#Get()
+    call go#list#Window(len(errors))
     if !empty(errors) 
         if !a:bang
-            cc 1 "jump to first error if there is any
+            call go#list#JumpToFirst()
         endif
     else
         redraws! | echon "vim-go: " | echohl Function | echon "[generate] SUCCESS"| echohl None
@@ -280,4 +316,3 @@ function! go#cmd#Generate(bang, ...)
 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
index a0f9da7b..7f405d9d 100644
--- a/sources_non_forked/vim-go/autoload/go/complete.vim
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -19,13 +19,21 @@ fu! s:gocodeCurrentBuffer()
     return file
 endf
 
-
 if go#vimproc#has_vimproc()
     let s:vim_system = get(g:, 'gocomplete#system_function', 'vimproc#system2')
+    let s:vim_shell_error = get(g:, 'gocomplete#shell_error_function', 'vimproc#get_last_status')
 else
     let s:vim_system = get(g:, 'gocomplete#system_function', 'system')
+    let s:vim_shell_error = ''
 endif
 
+fu! s:shell_error()
+    if empty(s:vim_shell_error)
+        return v:shell_error
+    endif
+    return call(s:vim_shell_error, [])
+endf
+
 fu! s:system(str, ...)
     return call(s:vim_system, [a:str] + a:000)
 endf
@@ -65,7 +73,7 @@ fu! s:gocodeCommand(cmd, preargs, args)
 
     let $GOPATH = old_gopath
 
-    if v:shell_error != 0
+    if s:shell_error() != 0
         return "[\"0\", []]"
     else
         if &encoding != 'utf-8'
diff --git a/sources_non_forked/vim-go/autoload/go/errcheck.vim b/sources_non_forked/vim-go/autoload/go/errcheck.vim
deleted file mode 100644
index 83d4025c..00000000
--- a/sources_non_forked/vim-go/autoload/go/errcheck.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-if !exists("g:go_errcheck_bin")
-    let g:go_errcheck_bin = "errcheck"
-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
-
-    let bin_path = go#path#CheckBinPath(g:go_errcheck_bin)
-    if empty(bin_path)
-        return
-    endif
-
-    echon "vim-go: " | echohl Identifier | echon "errcheck analysing ..." | echohl None
-    let out = system(bin_path . ' ' . package)
-    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": expand(go#path#Default() . "/src/" . tokens[1]),
-                            \"lnum": tokens[2],
-                            \"col": tokens[3],
-                            \"text": tokens[4]})
-            endif
-        endfor
-
-        if empty(errors)
-            echohl Error | echomsg "GoErrCheck returned error" | echohl None
-            echo out
-        endif
-
-        if !empty(errors)
-            redraw | echo
-            call setqflist(errors, 'r')
-        endif
-    else
-        redraw | echo
-        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 1a73392a..9ef9a2eb 100644
--- a/sources_non_forked/vim-go/autoload/go/fmt.vim
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -57,10 +57,9 @@ 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)
-
+    " Write current unsaved buffer to a temp file
+    let l:tmpname = tempname()
+    call writefile(getline(1, '$'), l:tmpname)
 
     if g:go_fmt_experimental == 1
         " save our undo file to be restored after we are done. This is needed to
@@ -77,16 +76,15 @@ function! go#fmt#Format(withGoimport)
         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,
+    " check if the user has installed command binary.
+    " For example if it's goimports, let us check if it's installed,
     " if not the user get's a warning via go#path#CheckBinPath()
-    if fmt_command != "gofmt"
-        " check if the user has installed goimports
-        let bin_path = go#path#CheckBinPath(fmt_command) 
-        if empty(bin_path) 
-            return 
-        endif
+    let bin_path = go#path#CheckBinPath(fmt_command)
+    if empty(bin_path)
+        return
+    endif
 
+    if fmt_command != "gofmt"
         " change GOPATH too, so goimports can pick up the correct library
         let old_gopath = $GOPATH
         let $GOPATH = go#path#Detect()
@@ -95,17 +93,18 @@ function! go#fmt#Format(withGoimport)
     endif
 
     " populate the final command with user based fmt options
-    let command = fmt_command . ' ' . g:go_fmt_options
+    let command = fmt_command . ' -w '
+    if a:withGoimport  != 1 
+        let command  = command . g:go_fmt_options
+    endif
 
     " execute our command...
     let out = system(command . " " . l:tmpname)
-    let splitted = split(out, '\n')
 
     if fmt_command != "gofmt"
         let $GOPATH = old_gopath
     endif
 
-
     "if there is no error on the temp file replace the output with the current
     "file (if this fails, we can always check the outputs first line with:
     "splitted =~ 'package \w\+')
@@ -113,34 +112,22 @@ function! go#fmt#Format(withGoimport)
         " 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 
+        " Replace current file with temp file, then reload buffer
+        let old_fileformat = &fileformat
+        call rename(l:tmpname, expand('%'))
+        silent edit!
+        let &fileformat = old_fileformat
+        let &syntax = &syntax
 
-        " delete any leftover before we replace the whole file. Suppose the
-        " file had 20 lines, but new output has 10 lines, only 1-10 are
-        " replaced with setline, remaining lines 11-20 won't get touched. So
-        " remove them.
-        if line('$') > len(splitted)
-            execute len(splitted) .',$delete'
-        endif
-
-        " setline iterates over the list and replaces each line
-        call setline(1, splitted)
-
-        " only clear quickfix if it was previously set, this prevents closing
-        " other quickfixes
+        " clean up previous location list, but only if it's due fmt
         if s:got_fmt_error 
             let s:got_fmt_error = 0
-            call setqflist([])
-            cwindow
+            call go#list#Clean()
+            call go#list#Window()
         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 splitted = split(out, '\n')
+        "otherwise get the errors and put them to location list
         let errors = []
         for line in splitted
             let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
@@ -155,11 +142,15 @@ function! go#fmt#Format(withGoimport)
             % | " Couldn't detect gofmt error format, output errors
         endif
         if !empty(errors)
-            call setqflist(errors, 'r')
+            call go#list#Populate(errors)
             echohl Error | echomsg "Gofmt returned error" | echohl None
         endif
+
         let s:got_fmt_error = 1
-        cwindow
+        call go#list#Window(len(errors))
+
+        " We didn't use the temp file, so clean up
+        call delete(l:tmpname)
     endif
 
     if g:go_fmt_experimental == 1
@@ -169,7 +160,6 @@ function! go#fmt#Format(withGoimport)
     endif
 
     " restore our cursor/windows positions
-    call delete(l:tmpname)
     call winrestview(l:curw)
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/import.vim b/sources_non_forked/vim-go/autoload/go/import.vim
index 2792f182..766a4af1 100644
--- a/sources_non_forked/vim-go/autoload/go/import.vim
+++ b/sources_non_forked/vim-go/autoload/go/import.vim
@@ -2,46 +2,11 @@
 " 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.
+" Check out the docs for more information at /doc/vim-go.txt
 "
-" 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)
+function! go#import#SwitchImport(enabled, localname, path, bang)
     let view = winsaveview()
-    let path = a:path
+    let path = substitute(a:path, '^\s*\(.\{-}\)\s*$', '\1', '')
 
     " Quotes are not necessary, so remove them if provided.
     if path[0] == '"'
@@ -61,6 +26,12 @@ function! go#import#SwitchImport(enabled, localname, path)
         return
     endif
 
+    if a:bang == "!"
+        let out = system("go get -u -v ".shellescape(path))
+        if v:shell_error
+            call s:Error("Can't find import: " . path . ":" . out)
+        endif
+    endif
     let exists = go#tool#Exists(path)
     if exists == -1
         call s:Error("Can't find import: " . path)
diff --git a/sources_non_forked/vim-go/autoload/go/jobcontrol.vim b/sources_non_forked/vim-go/autoload/go/jobcontrol.vim
new file mode 100644
index 00000000..3dedd5c8
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/jobcontrol.vim
@@ -0,0 +1,176 @@
+" s:jobs is a global reference to all jobs started with Spawn() or with the
+" internal function s:spawn
+let s:jobs = {}
+
+" Spawn is a wrapper around s:spawn. It can be executed by other files and
+" scripts if needed. Desc defines the description for printing the status
+" during the job execution (useful for statusline integration).
+function! go#jobcontrol#Spawn(bang, desc, args)
+  " autowrite is not enabled for jobs
+  call go#cmd#autowrite()
+
+  let job = s:spawn(a:bang, a:desc, a:args)
+  return job.id
+endfunction
+
+" Statusline returns the current status of the job
+function! go#jobcontrol#Statusline() abort
+  if empty(s:jobs)
+    return ''
+  endif
+
+  let import_path =  go#package#ImportPath(expand('%:p:h'))
+
+  for job in values(s:jobs)
+    if job.importpath != import_path
+      continue
+    endif
+
+    if job.state == "SUCCESS"
+      return ''
+    endif
+
+    return printf("%s ... [%s]", job.desc, job.state)
+  endfor
+
+  return ''
+endfunction
+
+" spawn spawns a go subcommand with the name and arguments with jobstart. Once
+" a job is started a reference will be stored inside s:jobs. spawn changes the
+" GOPATH when g:go_autodetect_gopath is enabled. The job is started inside the
+" current files folder.
+function! s:spawn(bang, desc, args)
+  let job = { 
+        \ 'desc': a:desc, 
+        \ 'bang': a:bang, 
+        \ 'winnr': winnr(),
+        \ 'importpath': go#package#ImportPath(expand('%:p:h')),
+        \ 'state': "RUNNING",
+        \ 'stderr' : [],
+        \ 'stdout' : [],
+        \ 'on_stdout': function('s:on_stdout'),
+        \ 'on_stderr': function('s:on_stderr'),
+        \ 'on_exit' : function('s:on_exit'),
+        \ }
+
+  " modify GOPATH if needed
+  let old_gopath = $GOPATH
+  let $GOPATH = go#path#Detect()
+
+  " execute go build in the files directory
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+
+  " cleanup previous jobs for this file
+  for jb in values(s:jobs)
+    if jb.importpath == job.importpath
+      unlet s:jobs[jb.id]
+    endif
+  endfor
+
+  let dir = getcwd()
+  let jobdir = fnameescape(expand("%:p:h"))
+  execute cd . jobdir
+
+  " append the subcommand, such as 'build'
+  let argv = ['go'] + a:args
+
+  " run, forrest, run!
+  let id = jobstart(argv, job)
+  let job.id = id
+  let job.dir = jobdir
+  let s:jobs[id] = job
+
+  execute cd . fnameescape(dir)
+
+  " restore back GOPATH
+  let $GOPATH = old_gopath
+
+  return job
+endfunction
+
+" on_exit is the exit handler for jobstart(). It handles cleaning up the job
+" references and also displaying errors in the quickfix window collected by
+" on_stderr handler. If there are no errors and a quickfix window is open,
+" it'll be closed.
+function! s:on_exit(job_id, exit_status)
+  let std_combined = self.stderr + self.stdout
+  if a:exit_status == 0
+    call go#list#Clean()
+    call go#list#Window()
+
+    let self.state = "SUCCESS"
+    return
+  endif
+
+  let self.state = "FAILED"
+
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+  let dir = getcwd()
+  try
+    execute cd self.dir
+    let errors = go#tool#ParseErrors(std_combined)
+    let errors = go#tool#FilterValids(errors)
+  finally
+    execute cd . fnameescape(dir)
+  endtry
+
+  if !len(errors)
+    " failed to parse errors, output the original content
+    call go#util#EchoError(std_combined[0])
+    return
+  endif
+
+  " if we are still in the same windows show the list
+  if self.winnr == winnr()
+    call go#list#Populate(errors)
+    call go#list#Window(len(errors))
+    if !empty(errors) && !self.bang
+      call go#list#JumpToFirst()
+    endif
+  endif
+endfunction
+
+" on_stdout is the stdout handler for jobstart(). It collects the output of
+" stderr and stores them to the jobs internal stdout list. 
+function! s:on_stdout(job_id, data)
+  call extend(self.stdout, a:data)
+endfunction
+
+" on_stderr is the stderr handler for jobstart(). It collects the output of
+" stderr and stores them to the jobs internal stderr list.
+function! s:on_stderr(job_id, data)
+  call extend(self.stderr, a:data)
+endfunction
+
+" abort_all aborts all current jobs created with s:spawn()
+function! s:abort_all()
+  if empty(s:jobs)
+    return
+  endif
+
+  for id in keys(s:jobs)
+    if id > 0
+      silent! call jobstop(id)
+    endif
+  endfor
+
+  let s:jobs = {}
+endfunction
+
+" abort aborts the job with the given name, where name is the first argument
+" passed to s:spawn()
+function! s:abort(path)
+  if empty(s:jobs)
+    return
+  endif
+
+  for job in values(s:jobs)
+    if job.importpath == path && job.id > 0
+      silent! call jobstop(job.id)
+      unlet s:jobs['job.id']
+    endif
+  endfor
+endfunction
+
+" vim:ts=2:sw=2:et
diff --git a/sources_non_forked/vim-go/autoload/go/lint.vim b/sources_non_forked/vim-go/autoload/go/lint.vim
index 5db858a1..96765764 100644
--- a/sources_non_forked/vim-go/autoload/go/lint.vim
+++ b/sources_non_forked/vim-go/autoload/go/lint.vim
@@ -1,30 +1,199 @@
-" 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_metalinter_command")
+    let g:go_metalinter_command = ""
+endif
+
+if !exists("g:go_metalinter_autosave_enabled")
+    let g:go_metalinter_autosave_enabled = ['vet', 'golint']
+endif
+
+if !exists("g:go_metalinter_enabled")
+    let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
+endif
+
+if !exists("g:go_metalinter_deadline")
+    let g:go_metalinter_deadline = "5s"
+endif
+
 if !exists("g:go_golint_bin")
     let g:go_golint_bin = "golint"
 endif
 
-function! go#lint#Run() abort
+if !exists("g:go_errcheck_bin")
+    let g:go_errcheck_bin = "errcheck"
+endif
+
+function! go#lint#Gometa(autosave, ...) abort
+    if a:0 == 0
+        let goargs = expand('%:p:h')
+    else
+        let goargs = go#util#Shelljoin(a:000)
+    endif
+
+    let meta_command = "gometalinter --disable-all"
+    if a:autosave || empty(g:go_metalinter_command)
+        let bin_path = go#path#CheckBinPath("gometalinter")
+        if empty(bin_path)
+            return
+        endif
+
+        if a:autosave
+            " include only messages for the active buffer
+            let meta_command .= " --include='^" . expand('%:p') . ".*$'"
+        endif
+
+        " linters
+        let linters = a:autosave ? g:go_metalinter_autosave_enabled : g:go_metalinter_enabled
+        for linter in linters
+            let meta_command .= " --enable=".linter
+        endfor
+
+        " deadline
+        let meta_command .= " --deadline=" . g:go_metalinter_deadline
+
+        " path
+        let meta_command .=  " " . goargs
+    else
+        " the user wants something else, let us use it.
+        let meta_command = g:go_metalinter_command
+    endif
+
+    " comment out the following two lines for debugging
+    " echo meta_command
+    " return
+
+    let out = go#tool#ExecuteInDir(meta_command)
+
+    if v:shell_error == 0
+        redraw | echo
+        call go#list#Clean()
+        call go#list#Window()
+        echon "vim-go: " | echohl Function | echon "[metalinter] PASS" | echohl None
+    else
+        " GoMetaLinter can output one of the two, so we look for both:
+        "   <file>:<line>:[<column>]: <message> (<linter>)
+        "   <file>:<line>:: <message> (<linter>)
+        " This can be defined by the following errorformat:
+        let errformat = "%f:%l:%c:%t%*[^:]:\ %m,%f:%l::%t%*[^:]:\ %m"
+
+        " Parse and populate our location list
+        call go#list#ParseFormat(errformat, split(out, "\n"))
+
+        let errors = go#list#Get()
+        call go#list#Window(len(errors))
+
+        if !a:autosave
+            call go#list#JumpToFirst()
+        endif
+    endif
+endfunction
+
+" Golint calls 'golint' on the current directory. Any warnings are populated in
+" the location list
+function! go#lint#Golint(...) abort
 	let bin_path = go#path#CheckBinPath(g:go_golint_bin) 
 	if empty(bin_path) 
 		return 
 	endif
 
-    silent cexpr system(bin_path . " " . shellescape(expand('%')))
-    cwindow
+    if a:0 == 0
+        let goargs = shellescape(expand('%'))
+    else
+        let goargs = go#util#Shelljoin(a:000)
+    endif
+
+    let out = system(bin_path . " " . goargs)
+    if empty(out)
+        echon "vim-go: " | echohl Function | echon "[lint] PASS" | echohl None
+        return
+    endif
+
+    call go#list#Parse(out)
+    let errors = go#list#Get()
+    call go#list#Window(len(errors))
+    call go#list#JumpToFirst()
 endfunction
 
+" Vet calls 'go vet' on the current directory. Any warnings are populated in
+" the location list
+function! go#lint#Vet(bang, ...)
+    call go#cmd#autowrite()
+    echon "vim-go: " | echohl Identifier | echon "calling vet..." | echohl None
+    if a:0 == 0
+        let out = go#tool#ExecuteInDir('go vet')
+    else
+        let out = go#tool#ExecuteInDir('go tool vet ' . go#util#Shelljoin(a:000))
+    endif
+    if v:shell_error
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        call go#list#Populate(errors)
+        call go#list#Window(len(errors))
+        if !empty(errors) && !a:bang
+            call go#list#JumpToFirst()
+        endif
+        echon "vim-go: " | echohl ErrorMsg | echon "[vet] FAIL" | echohl None
+    else
+        call go#list#Clean()
+        call go#list#Window()
+        redraw | echon "vim-go: " | echohl Function | echon "[vet] PASS" | echohl None
+    endif
+endfunction
+
+" ErrCheck calls 'errcheck' for the given packages. Any warnings are populated in
+" the location list
+function! go#lint#Errcheck(...) abort
+    if a:0 == 0
+        let goargs = go#package#ImportPath(expand('%:p:h'))
+        if goargs == -1
+            echohl Error | echomsg "vim-go: package is not inside GOPATH src" | echohl None
+            return
+        endif
+    else
+        let goargs = go#util#Shelljoin(a:000)
+    endif
+
+    let bin_path = go#path#CheckBinPath(g:go_errcheck_bin)
+    if empty(bin_path)
+        return
+    endif
+
+    echon "vim-go: " | echohl Identifier | echon "errcheck analysing ..." | echohl None
+    redraw
+
+    let command = bin_path . ' ' . goargs
+    let out = go#tool#ExecuteInDir(command)
+
+    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": expand(go#path#Default() . "/src/" . tokens[1]),
+                            \"lnum": tokens[2],
+                            \"col": tokens[3],
+                            \"text": tokens[4]})
+            endif
+        endfor
+
+        if empty(errors)
+            echohl Error | echomsg "GoErrCheck returned error" | echohl None
+            echo out
+            return
+        endif
+
+        if !empty(errors)
+            call go#list#Populate(errors)
+            call go#list#Window(len(errors))
+            if !empty(errors)
+                call go#list#JumpToFirst()
+            endif
+        endif
+    else
+        call go#list#Clean()
+        call go#list#Window()
+        echon "vim-go: " | echohl Function | echon "[errcheck] PASS" | echohl None
+    endif
+
+endfunction
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/autoload/go/list.vim b/sources_non_forked/vim-go/autoload/go/list.vim
new file mode 100644
index 00000000..9582d788
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/list.vim
@@ -0,0 +1,71 @@
+" Window opens the location list with the given height up to 10 lines maximum.
+" Otherwise g:go_loclist_height is used. If no or zero height is given it
+" closes the window
+function! go#list#Window(...)
+    " we don't use lwindow to close the location list as we need also the
+    " ability to resize the window. So, we are going to use lopen and cclose
+    " for a better user experience. If the number of errors in a current
+    " location list increases/decreases, cwindow will not resize when a new
+    " updated height is passed. lopen in the other hand resizes the screen.
+    if !a:0 || a:1 == 0
+        lclose
+        return
+    endif
+
+    let height = get(g:, "go_loclist_height", 0)
+    if height == 0
+        " prevent creating a large location height for a large set of numbers
+        if a:1 > 10
+            let height = 10
+        else
+            let height = a:1
+        endif
+    endif
+
+    exe 'lopen '. height
+endfunction
+
+
+" Get returns the current list of items from the location list
+function! go#list#Get()
+  return getloclist(0)
+endfunction
+
+" Populate populate the location list with the given items
+function! go#list#Populate(items)
+	call setloclist(0, a:items, 'r')
+endfunction
+
+function! go#list#PopulateWin(winnr, items)
+	call setloclist(a:winnr, a:items, 'r')
+endfunction
+
+" Parse parses the given items based on the specified errorformat nad
+" populates the location list.
+function! go#list#ParseFormat(errformat, items)
+  " backup users errorformat, will be restored once we are finished
+  let old_errorformat = &errorformat
+
+	" parse and populate the location list
+  let &errorformat = a:errformat
+	lgetexpr a:items
+
+	"restore back
+  let &errorformat = old_errorformat
+endfunction
+
+" Parse parses the given items based on the global errorformat nad
+" populates the location list.
+function! go#list#Parse(items)
+	lgetexpr a:items
+endfunction
+
+" JumpToFirst jumps to the first item in the location list
+function! go#list#JumpToFirst()
+  ll 1 
+endfunction
+
+" Clean cleans the location list
+function! go#list#Clean()
+	lex []
+endfunction
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
index 1cc9a90a..19efd773 100644
--- a/sources_non_forked/vim-go/autoload/go/oracle.vim
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -10,9 +10,9 @@ if !exists("g:go_oracle_bin")
 endif
 
 " Parses (via regex) Oracle's 'plain' format output and puts them into a
-" quickfix list.
-func! s:qflist(output)
-    let qflist = []
+" location list
+func! s:loclist(output)
+    let llist = []
     " Parse GNU-style 'file:line.col-line.col: message' format.
     let mx = '^\(\a:[\\/][^:]\+\|[^:]\+\):\(\d\+\):\(\d\+\):\(.*\)$'
     for line in split(a:output, "\n")
@@ -33,17 +33,17 @@ func! s:qflist(output)
         if bnr != -1
             let item['bufnr'] = bnr
         endif
-        call add(qflist, item)
+        call add(llist, item)
     endfor
-    call setqflist(qflist)
-    cwindow
+    call go#list#Populate(llist)
+    call go#list#Window(len(llist))
 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
+" and put it into location 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)
+func! s:loclistSecond(output)
     " backup users errorformat, will be restored once we are finished
     let old_errorformat = &errorformat
 
@@ -53,15 +53,13 @@ func! s:qflistSecond(output)
     "   '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
+    " useful and location only has the ability to show one line and column
     " number
-    let &errorformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m"
+    let errformat = "%f:%l.%c-%[%^:]%#:\ %m,%f:%l:%c:\ %m"
+    call go#list#ParseFormat(errformat, split(a:output, "\n"))
 
-    " create the quickfix list and open it
-    cgetexpr split(a:output, "\n")
-    cwindow
-
-    let &errorformat = old_errorformat
+    let errors = go#list#Get()
+    call go#list#Window(len(errors))
 endfun
 
 func! s:getpos(l, c)
@@ -73,7 +71,7 @@ func! s:getpos(l, c)
     return line2byte(a:l) + (a:c-2)
 endfun
 
-func! s:RunOracle(mode, selected) range abort
+func! s:RunOracle(mode, selected, needs_package) range abort
     let fname = expand('%:p')
     let dname = expand('%:p:h')
     let pkg = go#package#ImportPath(dname)
@@ -81,14 +79,10 @@ func! s:RunOracle(mode, selected) range abort
     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
+        let scopes = split(get(g:, 'go_oracle_scope'))
+    elseif a:needs_package || exists('g:go_oracle_include_tests') && pkg != -1
         " give import path so it includes all _test.go files too
-        let scopes = [shellescape(pkg)]
+        let scopes = [pkg]
     else
         " best usable way, only pass the package itself, without the test
         " files
@@ -100,27 +94,31 @@ func! s:RunOracle(mode, selected) range abort
     if empty(bin_path) 
         return 
     endif
+    
+    if exists('g:go_oracle_tags')
+        let tags = get(g:, 'go_oracle_tags')
+    else
+        let tags = ""
+    endif
 
     if a:selected != -1
         let pos1 = s:getpos(line("'<"), col("'<"))
         let pos2 = s:getpos(line("'>"), col("'>"))
-        let cmd = printf('%s -format plain -pos=%s:#%d,#%d %s',
+        let cmd = printf('%s -format plain -pos=%s:#%d,#%d -tags=%s %s',
                     \  bin_path,
-                    \  shellescape(fname), pos1, pos2, a:mode)
+                    \  shellescape(fname), pos1, pos2, tags, a:mode)
     else
         let pos = s:getpos(line('.'), col('.'))
-        let cmd = printf('%s -format plain -pos=%s:#%d %s',
+        let cmd = printf('%s -format plain -pos=%s:#%d -tags=%s %s',
                     \  bin_path,
-                    \  shellescape(fname), pos, a:mode)
+                    \  shellescape(fname), pos, tags, 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
+    let cmd .= ' ' . go#util#Shelljoin(scopes)
 
     echon "vim-go: " | echohl Identifier | echon "analysing ..." | echohl None
 
@@ -143,9 +141,9 @@ func! s:RunOracle(mode, selected) range abort
 endfunc
 
 function! go#oracle#Scope(...)
-    if len(a:000)
-        if len(a:000) == 1 && a:1 == '""'
-            let g:go_oracle_scope = ""
+    if a:0
+        if a:0 == 1 && a:1 == '""'
+            unlet g:go_oracle_scope
             echon "vim-go: " | echohl Function | echon "oracle scope is cleared"| echohl None
         else
             let g:go_oracle_scope = join(a:000, ' ')
@@ -155,59 +153,85 @@ function! go#oracle#Scope(...)
         return
     endif
 
-    if !exists(g:go_oracle_scope)
+    if !exists('g:go_oracle_scope')
         echon "vim-go: " | echohl Function | echon "oracle scope is not set"| echohl None
     else
         echon "vim-go: " | echohl Function | echon "current oracle scope: '". g:go_oracle_scope ."'" | echohl None
     endif
 endfunction
 
+function! go#oracle#Tags(...)
+    if a:0
+        if a:0 == 1 && a:1 == '""'
+            unlet g:go_oracle_tags
+            echon "vim-go: " | echohl Function | echon "oracle tags is cleared"| echohl None
+        else
+            let g:go_oracle_tags = a:1
+            echon "vim-go: " | echohl Function | echon "oracle tags changed to: '". g:go_oracle_tags ."'" | echohl None
+        endif
+
+        return
+    endif
+
+    if !exists('g:go_oracle_tags')
+        echon "vim-go: " | echohl Function | echon "oracle tags is not set"| echohl None
+    else
+        echon "vim-go: " | echohl Function | echon "current oracle tags: '". g:go_oracle_tags ."'" | echohl None
+    endif
+endfunction
+
 " Show 'implements' relation for selected package
 function! go#oracle#Implements(selected)
-    let out = s:RunOracle('implements', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('implements', a:selected, 0)
+    call s:loclistSecond(out)
 endfunction
 
 " Describe selected syntax: definition, methods, etc
 function! go#oracle#Describe(selected)
-    let out = s:RunOracle('describe', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('describe', a:selected, 0)
+    call s:loclistSecond(out)
 endfunction
 
 " Show possible targets of selected function call
 function! go#oracle#Callees(selected)
-    let out = s:RunOracle('callees', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('callees', a:selected, 1)
+    call s:loclistSecond(out)
 endfunction
 
 " Show possible callers of selected function
 function! go#oracle#Callers(selected)
-    let out = s:RunOracle('callers', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('callers', a:selected, 1)
+    call s:loclistSecond(out)
 endfunction
 
 " Show path from callgraph root to selected function
 function! go#oracle#Callstack(selected)
-    let out = s:RunOracle('callstack', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('callstack', a:selected, 1)
+    call s:loclistSecond(out)
 endfunction
 
 " Show free variables of selection
 function! go#oracle#Freevars(selected)
-    let out = s:RunOracle('freevars', a:selected)
-    call s:qflistSecond(out)
+    " Freevars requires a selection
+    if a:selected == -1
+        echon "vim-go: " | echohl Statement | echon "GoFreevars requires a selection (range) of code "| echohl None
+        return
+    endif
+
+    let out = s:RunOracle('freevars', a:selected, 0)
+    call s:loclistSecond(out)
 endfunction
 
 " Show send/receive corresponding to selected channel op
 function! go#oracle#ChannelPeers(selected)
-    let out = s:RunOracle('peers', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('peers', a:selected, 1)
+    call s:loclistSecond(out)
 endfunction
 
 " Show all refs to entity denoted by selected identifier
 function! go#oracle#Referrers(selected)
-    let out = s:RunOracle('referrers', a:selected)
-    call s:qflistSecond(out)
+    let out = s:RunOracle('referrers', a:selected, 0)
+    call s:loclistSecond(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
index 764c0964..6bdacb45 100644
--- a/sources_non_forked/vim-go/autoload/go/package.vim
+++ b/sources_non_forked/vim-go/autoload/go/package.vim
@@ -66,7 +66,8 @@ function! go#package#ImportPath(arg)
         return -1
     endif
 
-    return substitute(path, workspace . '/src/', '', '')
+    let srcdir = substitute(workspace . '/src/', '//', '/', '')
+    return substitute(path, srcdir, '', '')
 endfunction
 
 function! go#package#FromPath(arg)
diff --git a/sources_non_forked/vim-go/autoload/go/path.vim b/sources_non_forked/vim-go/autoload/go/path.vim
index 3c17252e..f4724210 100644
--- a/sources_non_forked/vim-go/autoload/go/path.vim
+++ b/sources_non_forked/vim-go/autoload/go/path.vim
@@ -65,10 +65,10 @@ function! go#path#HasPath(path)
     return hasA || hasB
 endfunction
 
-" Detect returns the current GOPATH. If a package manager is used, such
-" as Godeps or something like gb (not supported yet), it will modify the
-" GOPATH so those directories take precedence over the current GOPATH. It also
-" detects diretories whose are outside GOPATH.
+" Detect returns the current GOPATH. If a package manager is used, such as
+" Godeps, GB, it will modify the GOPATH so those directories take precedence
+" over the current GOPATH. It also detects diretories whose are outside
+" GOPATH.
 function! go#path#Detect()
     let gopath = $GOPATH
 
diff --git a/sources_non_forked/vim-go/autoload/go/rename.vim b/sources_non_forked/vim-go/autoload/go/rename.vim
index ef914634..3212f076 100644
--- a/sources_non_forked/vim-go/autoload/go/rename.vim
+++ b/sources_non_forked/vim-go/autoload/go/rename.vim
@@ -2,7 +2,7 @@ if !exists("g:go_gorename_bin")
     let g:go_gorename_bin = "gorename"
 endif
 
-function! go#rename#Rename(...)
+function! go#rename#Rename(bang, ...)
     let to = ""
     if a:0 == 0
         let from = expand("<cword>")
@@ -13,7 +13,6 @@ function! go#rename#Rename(...)
         let to = a:1
     endif
 
-
     "return with a warning if the bin doesn't exist
     let bin_path = go#path#CheckBinPath(g:go_gorename_bin) 
     if empty(bin_path) 
@@ -31,12 +30,26 @@ function! go#rename#Rename(...)
     let clean = split(out, '\n')
 
     if v:shell_error
-        redraw | echon "vim-go: " | echohl Statement | echon clean[0] | echohl None
+        let errors = go#tool#ParseErrors(split(out, '\n'))
+        call go#list#Populate(errors)
+        call go#list#Window(len(errors))
+        if !empty(errors) && !a:bang
+            call go#list#JumpToFirst()
+        elseif empty(errors)
+            " failed to parse errors, output the original content
+            call go#util#EchoError(out)
+        endif
+        return
     else
+        call go#list#Clean()
+        call go#list#Window()
         redraw | echon "vim-go: " | echohl Function | echon clean[0] | echohl None
     endif
 
     " refresh the buffer so we can see the new content
+    " TODO(arslan): also find all other buffers and refresh them too. For this
+    " we need a way to get the list of changes from gorename upon an success
+    " change.
     silent execute ":e"
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/term.vim b/sources_non_forked/vim-go/autoload/go/term.vim
new file mode 100644
index 00000000..eaca0f5c
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/term.vim
@@ -0,0 +1,127 @@
+if has('nvim') && !exists("g:go_term_mode")
+    let g:go_term_mode = 'vsplit'
+endif
+
+" s:jobs is a global reference to all jobs started with new()
+let s:jobs = {}
+
+" new creates a new terminal with the given command. Mode is set based on the
+" global variable g:go_term_mode, which is by default set to :vsplit
+function! go#term#new(bang, cmd)
+    call go#term#newmode(a:bang, a:cmd, g:go_term_mode)
+endfunction
+
+" new creates a new terminal with the given command and window mode.
+function! go#term#newmode(bang, cmd, mode)
+    let mode = a:mode
+    if empty(mode)
+        let mode = g:go_term_mode
+    endif
+
+    " modify GOPATH if needed
+    let old_gopath = $GOPATH
+    let $GOPATH = go#path#Detect()
+
+    " execute go build in the files directory
+    let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
+    let dir = getcwd()
+
+    execute cd . fnameescape(expand("%:p:h"))
+
+    execute mode.' __go_term__'
+
+    setlocal filetype=goterm
+    setlocal bufhidden=delete
+    setlocal winfixheight
+    setlocal noswapfile
+    setlocal nobuflisted
+
+    let job = { 
+                \ 'stderr' : [],
+                \ 'stdout' : [],
+                \ 'bang' : a:bang,
+                \ 'on_stdout': function('s:on_stdout'),
+                \ 'on_stderr': function('s:on_stderr'),
+                \ 'on_exit' : function('s:on_exit'),
+                \ }
+
+    let id = termopen(a:cmd, job)
+
+    execute cd . fnameescape(dir)
+
+    " restore back GOPATH
+    let $GOPATH = old_gopath
+
+    let job.id = id
+    startinsert
+
+    " resize new term if needed.
+    let height = get(g:, 'go_term_height', winheight(0))
+    let width = get(g:, 'go_term_width', winwidth(0))
+
+    " we are careful how to resize. for example it's vertical we don't change
+    " the height. The below command resizes the buffer
+    if a:mode == "split"
+        exe 'resize ' . height
+    elseif a:mode == "vertical"
+        exe 'vertical resize ' . width
+    endif
+
+    " we also need to resize the pty, so there you go...
+    call jobresize(id, width, height)
+
+    let s:jobs[id] = job
+    return id
+endfunction
+
+function! s:on_stdout(job_id, data)
+    if !has_key(s:jobs, a:job_id)
+        return
+    endif
+    let job = s:jobs[a:job_id]
+
+    call extend(job.stdout, a:data)
+endfunction
+
+function! s:on_stderr(job_id, data)
+    if !has_key(s:jobs, a:job_id)
+        return
+    endif
+    let job = s:jobs[a:job_id]
+
+    call extend(job.stderr, a:data)
+endfunction
+
+function! s:on_exit(job_id, data)
+    if !has_key(s:jobs, a:job_id)
+        return
+    endif
+    let job = s:jobs[a:job_id]
+
+    " usually there is always output so never branch into this clause
+    if empty(job.stdout)
+        call go#list#Clean()
+        call go#list#Window()
+    else
+        let errors = go#tool#ParseErrors(job.stdout)
+        let errors = go#tool#FilterValids(errors)
+        if !empty(errors)
+            " close terminal we don't need it
+            close 
+
+            call go#list#Populate(errors)
+            call go#list#Window(len(errors))
+            if !self.bang
+                call go#list#JumpToFirst()
+            endif
+        else
+            call go#list#Clean()
+            call go#list#Window()
+        endif
+
+    endif
+
+    unlet s:jobs[a:job_id]
+endfunction
+
+" 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
index 64bc0267..d378b5ab 100644
--- a/sources_non_forked/vim-go/autoload/go/tool.vim
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -40,28 +40,24 @@ function! go#tool#Imports()
     return imports
 endfunction
 
-function! go#tool#ShowErrors(out)
-    " cd into the current files directory. This is important so fnamemodify
-    " does create a full path for outputs when the token is only a single file
-    " name (such as for a go test output, i.e.: 'demo_test.go'). For other
-    " outputs, such as 'go install' we already get an absolute path (i.e.:
-    " '../foo/foo.go') and fnamemodify successfuly creates the full path.
-    let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-    let current_dir = getcwd()
-    execute cd . fnameescape(expand("%:p:h"))
-
+function! go#tool#ParseErrors(lines)
     let errors = []
 
-    for line in split(a:out, '\n')
+    for line in a:lines
         let fatalerrors = matchlist(line, '^\(fatal error:.*\)$')
         let tokens = matchlist(line, '^\s*\(.\{-}\):\(\d\+\):\s*\(.*\)')
 
         if !empty(fatalerrors)
             call add(errors, {"text": fatalerrors[1]})
         elseif !empty(tokens)
-            call add(errors, {"filename" : fnamemodify(tokens[1], ':p'),
-                        \"lnum":     tokens[2],
-                        \"text":     tokens[3]})
+            " strip endlines of form ^M
+            let out=substitute(tokens[3], '\r$', '', '')
+
+            call add(errors, {
+                        \ "filename" : fnamemodify(tokens[1], ':p'),
+                        \ "lnum"     : tokens[2],
+                        \ "text"     : out,
+                        \ })
         elseif !empty(errors)
             " Preserve indented lines.
             " This comes up especially with multi-line test output.
@@ -71,18 +67,43 @@ function! go#tool#ShowErrors(out)
         endif
     endfor
 
-    " return back to old dir once we are finished with populating the errors
-    execute cd . fnameescape(current_dir)
+    return errors
+endfunction
 
-    if !empty(errors)
-        call setqflist(errors, 'r')
-        return
-    endif
+"FilterValids filters the given items with only items that have a valid
+"filename. Any non valid filename is filtered out.
+function! go#tool#FilterValids(items)
+    " Remove any nonvalid filename from the location list to avoid opening an
+    " empty buffer. See https://github.com/fatih/vim-go/issues/287 for
+    " details.
+    let filtered = []
+    let is_readable = {}
 
-    if empty(errors)
-        " Couldn't detect error format, output errors
-        echo a:out
-    endif
+    for item in a:items
+        if has_key(item, 'bufnr')
+            let filename = bufname(item.bufnr)
+        elseif has_key(item, 'filename')
+            let filename = item.filename
+        else
+            " nothing to do, add item back to the list
+            call add(filtered, item)
+            continue
+        endif
+
+        if !has_key(is_readable, filename)
+            let is_readable[filename] = filereadable(filename)
+        endif
+        if is_readable[filename]
+            call add(filtered, item)
+        endif
+    endfor
+
+    for k in keys(filter(is_readable, '!v:val'))
+        echo "vim-go: " | echohl Identifier | echon "[run] Dropped " | echohl Constant | echon  '"' . k . '"'
+        echohl Identifier | echon " from location list (nonvalid filename)" | echohl None
+    endfor
+
+    return filtered
 endfunction
 
 function! go#tool#ExecuteInDir(cmd) abort
diff --git a/sources_non_forked/vim-go/autoload/go/util.vim b/sources_non_forked/vim-go/autoload/go/util.vim
index 337e75d9..85ab9331 100644
--- a/sources_non_forked/vim-go/autoload/go/util.vim
+++ b/sources_non_forked/vim-go/autoload/go/util.vim
@@ -27,7 +27,7 @@ endfunction
 
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 function! go#util#IsWin()
-	let win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
+	let win = ['win16', 'win32', 'win64', 'win95']
 	for w in win
 		if (has(w))
 			return 1
@@ -48,4 +48,42 @@ function! go#util#StripPathSep(path)
 	return a:path
 endfunction
 
+" Shelljoin returns a shell-safe string representation of arglist. The
+" {special} argument of shellescape() may optionally be passed.
+function! go#util#Shelljoin(arglist, ...)
+	if a:0
+		return join(map(copy(a:arglist), 'shellescape(v:val, ' . a:1 . ')'), ' ')
+	endif
+
+	return join(map(copy(a:arglist), 'shellescape(v:val)'), ' ')
+endfunction
+
+" Shelljoin returns a shell-safe representation of the items in the given
+" arglist. The {special} argument of shellescape() may optionally be passed.
+function! go#util#Shelllist(arglist, ...)
+	if a:0
+		return map(copy(a:arglist), 'shellescape(v:val, ' . a:1 . ')')
+    endif
+	return map(copy(a:arglist), 'shellescape(v:val)')
+endfunction
+
+" TODO(arslan): I couldn't parameterize the highlight types. Check if we can
+" simplify the following functions
+
+function! go#util#EchoSuccess(msg)
+    redraws! | echon "vim-go: " | echohl Function | echon a:msg | echohl None
+endfunction
+
+function! go#util#EchoError(msg)
+    redraws! | echon "vim-go: " | echohl ErrorMsg | echon a:msg | echohl None
+endfunction
+
+function! go#util#EchoWarning(msg)
+    redraws! | echon "vim-go: " | echohl WarningMsg | echon a:msg | echohl None
+endfunction
+
+function! go#util#EchoProgress(msg)
+    redraws! | echon "vim-go: " | echohl Identifier | echon a:msg | echohl None
+endfunction
+
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/compiler/go.vim b/sources_non_forked/vim-go/compiler/go.vim
index 2ce350d3..7b5a0255 100644
--- a/sources_non_forked/vim-go/compiler/go.vim
+++ b/sources_non_forked/vim-go/compiler/go.vim
@@ -21,14 +21,19 @@ else
     CompilerSet makeprg=go\ build
 endif
 
-CompilerSet errorformat=
-      \%-G#\ %.%#,
-      \%-G%.%#panic:\ %m,
-      \%Ecan\'t\ load\ package:\ %m,
-      \%A%f:%l:%c:\ %m,
-      \%A%f:%l:\ %m,
-      \%C%*\\s%m,
-      \%-G%.%#
+" Define the patterns that will be recognized by QuickFix when parsing the
+" output of Go command that use this errorforamt (when called make, cexpr or
+" lmake, lexpr). This is the global errorformat, however some command might
+" use a different output, for those we define them directly and modify the
+" errorformat ourselves. More information at:
+" http://vimdoc.sourceforge.net/htmldoc/quickfix.html#errorformat
+CompilerSet errorformat =%-G#\ %.%#                   " Ignore lines beginning with '#' ('# command-line-arguments' line sometimes appears?)
+CompilerSet errorformat+=%-G%.%#panic:\ %m            " Ignore lines containing 'panic: message'
+CompilerSet errorformat+=%Ecan\'t\ load\ package:\ %m " Start of multiline error string is 'can\'t load package'
+CompilerSet errorformat+=%A%f:%l:%c:\ %m              " Start of multiline unspecified string is 'filename:linenumber:columnnumber:'
+CompilerSet errorformat+=%A%f:%l:\ %m                 " Start of multiline unspecified string is 'filename:linenumber:'
+CompilerSet errorformat+=%C%*\\s%m                    " Continuation of multiline error message is indented
+CompilerSet errorformat+=%-G%.%#                      " All lines not matching any of the above patterns are ignored
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index 09ca8a11..2786208c 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -33,29 +33,38 @@ 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..
+  * Improved Syntax highlighting with items such as Functions, Operators, Methods.
   * Auto completion support via `gocode`
-  * Better `gofmt` on save, keeps cursor position and doesn't break your undo
+  * Better `gofmt` on save, which 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`
-  * Precise type-safe renaming of identifiers with `gorename`
+  * Go to symbol/declaration with `:GoDef`
+  * Look up documentation with `:GoDoc` inside Vim or open it in browser
+  * Automatically import packages via `:GoImport` or plug it into autosave
+  * Compile your package with `:GoBuild`, install it with `:GoInstall` or test
+    them with `:GoTest` (also supports running single tests via `:GoTestFunc`)
+  * Quickly execute your current file/files with `:GoRun`
+  * Automatic `GOPATH` detection based on the directory structure (i.e. `gb`
+    projects, `godep` vendored projects)
+  * Change or display `GOPATH` with `:GoPath`
+  * Create a coverage profile and display annotated source code in browser to see
+    which functions are covered with `:GoCoverage`
+  * Call `gometalinter` with `:GoMetaLinter`, which invokes all possible linters
+    (golint, vet, errcheck, deadcode, etc..) and shows the warnings/errors
+  * Lint your code with `:GoLint`
+  * Run your code through `:GoVet` to catch static errors
+  * Advanced source analysis tools utilizing oracle, such as `:GoImplements`,
+    `:GoCallees`, and `:GoReferrers`
+  * 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
-  * On-the-fly type information about the word under the cursor
+  * Unchecked error checking with `:GoErrCheck`
+  * Integrated and improved snippets, supporting `ultisnips` or `neosnippet`
+  * Share your current code to [play.golang.org](http://play.golang.org) with `:GoPlay`
+  * On-the-fly type information about the word under the cursor. Plug it into
+    your custom vim function.
   * 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`
+  * Custom vim text objects such as `a function` or `inner function`
+  * All commands support collecting and displaying errors in Vim's location
+  list.
 
 ===============================================================================
 INSTALL                                                           *go-install*
@@ -113,18 +122,20 @@ COMMANDS                                                          *go-commands*
                                                                   *:GoPath*
 :GoPath [path]
 
-    GoPath sets and ovverides GOPATH with the given {path}. If no {path} is
+    GoPath sets and overrides GOPATH with the given {path}. If no {path} is
     given it shows the current GOPATH. If `""` is given as path, it clears
     current `GOPATH` which was set with |GoPath| and restores `GOPATH` back to
-    the inital value which was sourced when Vim was started.
+    the initial value which was sourced when Vim was started.
 
                                                                   *:GoImport*
-:GoImport [path]
+: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
+    Go buffer, using proper style and ordering. If {path} is already being
     imported, an error will be displayed and the buffer will be untouched.
 
+    If [!] is given it will download the package with `go get`
+
                                                                 *:GoImportAs*
 :GoImportAs [localname] [path]
 
@@ -138,9 +149,9 @@ COMMANDS                                                          *go-commands*
     displayed and the buffer will be untouched.
 
                                                                     *:GoLint*
-:GoLint
+:GoLint [packages]
 
-    Run golint for the current Go file.
+    Run golint for the current Go file, or for given packages.
 
                                                                      *:GoDoc*
 :GoDoc [word]
@@ -177,7 +188,7 @@ COMMANDS                                                          *go-commands*
      'xterm-clipboard' otherwise it's get yanked into the `""` register.
 
                                                                      *:GoVet*
-:GoVet[!]
+:GoVet[!] [options]
 
     Run `go vet` for the directory under your current file. Vet examines Go
     source code and reports suspicious constructs, such as Printf calls whose
@@ -185,6 +196,10 @@ COMMANDS                                                          *go-commands*
     guarantee all reports are genuine problems, but it can find errors not caught
     by the compilers.
 
+    You may optionally pass any valid go tool vet flags/options. In this case,
+    `go tool vet` is run in place of `go vet`. For a full list please see
+    `go tool vet -h`.
+
     If [!] is not given the first error is jumped to.
 
                                                                      *:GoDef*
@@ -202,42 +217,48 @@ COMMANDS                                                          *go-commands*
     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.
 
+    You may optionally pass any valid go run flags/options. For a full list
+    please see `go help run`.
+
     If [!] is not given the first error is jumped to.
 
                                                                    *:GoBuild*
-:GoBuild[!] [options]
+:GoBuild[!] [expand]
 
     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.
 
     You may optionally pass any valid go build flags/options. For a full list
-    please see `go help build`.
+    please see `go help build`. Options are expanded with 'expand'.
 
     If [!] is not given the first error is jumped to.
 
                                                                    *:GoGenerate*
-:GoGenerate[!] [options]
+:GoGenerate[!] [expand]
 
     Creates or updates your auto-generated source files by running `go
     generate`.
 
     You may optionally pass any valid go generate flags/options. For a full list
-    please see `go help generate`.
+    please see `go help generate`. Options are expanded with 'expand'.
 
     If [!] is not given the first error is jumped to.
 
                                                                     *:GoInfo*
 :GoInfo
-    Show type information about the identifer under the cursor. For example
+    Show type information about the identifier 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[!]
+:GoInstall[!] [options]
 
-  Install your package with `go install`.
+    Install your package with `go install`.
+
+    You may optionally pass any valid go install flags/options. For a full list
+    please see `go help install`.
 
     If [!] is not given the first error is jumped to.
 
@@ -245,9 +266,16 @@ COMMANDS                                                          *go-commands*
 :GoTest[!] [expand]
 
     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
+    are populated in location list.  If an argument is passed, 'expand' is
     used as file selector (useful for cases like `:GoTest ./...`).
 
+    You may optionally pass any valid go test flags/options. For a full list
+    please see `go help test`.
+
+    GoTest timesout automatically after 10 seconds. To customize the timeout
+    use |g:go_test_timeout|. This feature is disabled if any arguments are
+    passed to the `:GoTest` command.
+
     If [!] is not given the first error is jumped to.
 
                                                               *:GoTestFunc*
@@ -266,7 +294,7 @@ COMMANDS                                                          *go-commands*
 :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
+    populated in location list.  If an argument is passed, 'expand' is used
     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.
@@ -274,18 +302,24 @@ COMMANDS                                                          *go-commands*
     If [!] is not given the first error is jumped to.
 
                                                                 *:GoCoverage*
-:GoCoverage[!]
+:GoCoverage[!] [options]
 
     Create a coverage profile and open a browser to display the annotated
     source code of the current package.
 
+    You may optionally pass any valid go test flags/options, such as
+    `-covermode set,count,atomic`. For a full list please see `go help test`.
+
     If [!] is not given the first error is jumped to.
 
                                                                 *:GoErrCheck*
-:GoErrCheck
+:GoErrCheck [options]
 
     Check for unchecked errors in you current package. Errors are populated in
-    quickfix window.
+    location list.
+
+    You may optionally pass any valid errcheck flags/options. For a full list
+    please see `errcheck -h`.
 
                                                                    *:GoFiles*
 :GoFiles
@@ -315,13 +349,15 @@ 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 quickfix list.
+    package) is shown location list.
                                                                 *:GoRename*
-:GoRename [to]
+: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.
 
+    If [!] is not given the first error is jumped to.
+
 
                                                             *:GoOracleScope*
 :GoOracleScope [path1] [path2] ...
@@ -336,13 +372,13 @@ COMMANDS                                                          *go-commands*
 
     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.
+    location 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
+    callers for the selected function under the cursor is shown in a location
     list.
 
                                                               *:GoDescribe*
@@ -359,7 +395,7 @@ COMMANDS                                                          *go-commands*
 
     Shows 'callstack' relation for the selected function. An arbitrary path
     from the root of the callgraph to the selected function is showed in a
-    quickfix list. This may be useful to understand how the function is
+    location list. This may be useful to understand how the function is
     reached in a given program.
 
                                                               *:GoFreevars*
@@ -395,6 +431,26 @@ COMMANDS                                                          *go-commands*
     object as does the selected identifier, within any package in the analysis
     scope.
 
+                                                              *:GoMetaLinter*
+:GoMetaLinter [path]
+
+    Calls the underlying `gometalinter` tool and displays all warnings and
+    errors in a location list. By default the following linters are enabled:
+    "'vet', 'golint', 'errcheck'". This can be changed with the
+    |g:go_metalinter_enabled| variable. To override the command completely use
+    the variable |g:go_metalinter_command|. To override the maximum linters
+    execution time use |g:go_metalinter_deadline| variable.
+
+                                                             *:GoOracleTags*
+:GoOracleTags [tags]
+
+    Changes the custom |g:go_oracle_tags| setting and overrides it with the
+    given build tags. This command cooperate with GoReferrers command when 
+    there exist mulitiple build tags in your project,then you can set one 
+    of the build tags for GoReferrers to find more accurate.
+    The custom build tags is cleared (unset) if `""` is given. If no arguments
+    is given it prints the current custom build tags.
+
 
 ===============================================================================
 MAPPINGS                                                        *go-mappings*
@@ -544,6 +600,9 @@ Show send/receive corresponding to selected channel op
 
 Show all refs to entity denoted by selected identifier
 
+                                                            *(go-metalinter)*
+
+Calls `go-metalinter` for the current directory
 
 ===============================================================================
 TEXT OBJECTS                                                 *go-text-objects*
@@ -564,6 +623,14 @@ if			      "inside a function", select contents of a function,
 ===============================================================================
 SETTINGS                                                        *go-settings*
 
+                                                      *'g:go_test_timeout'*
+
+Use this option to change the test timeout of |:GoTest|. By default it is
+set to 10 seconds . >
+
+  let g:go_test_timeout= '10s'
+<
+
                                                 *'g:go_play_browser_command'*
 
 Use this option to change the browser that is used to open the snippet url
@@ -571,7 +638,7 @@ 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 = ''
+  let g:go_play_browser_command = ''
 <
                                                    *'g:go_play_open_browser'*
 
@@ -623,7 +690,7 @@ is empty. >
 
                                                    *'g:go_fmt_fail_silently'*
 
-Use this option to disable showing a quickfix window when |g:go_fmt_command|
+Use this option to disable showing a location list when |g:go_fmt_command|
 fails. By default it's disabled. >
 
   let g:go_fmt_fail_silently = 0
@@ -772,6 +839,13 @@ Highlights build constraints. By default it's disabled. >
 
 	let g:go_highlight_build_constraints = 0
 <
+                                        *'g:go_highlight_string_spellcheck*
+
+Specifies spell checking enabled for strings. Spelling errors are highlighted
+if |spell| is enabled. By default it's enabled. >
+
+	let g:go_highlight_string_spellcheck = 1
+<
 
                                                 *'g:go_autodetect_gopath'*
 
@@ -779,7 +853,7 @@ Automatically modifies GOPATH for certain directory structures, such as for
 the tool godep which has his own dependencies via the `Godeps` folder. What
 this means is that all tools are now working with the newly modified GOPATH.
 So |GoDef| for example jumps to the source inside the `Godeps` (vendored)
-source. Currently only `godep` is supported, in the near future more tool
+source. Currently `godep` and `gb` is supported, in the near future more tool
 supports will be added. By default it's enabled. >
 
 	let g:go_autodetect_gopath = 1
@@ -789,12 +863,56 @@ supports will be added. By default it's enabled. >
 Adds custom text objects. By default it's enabled. >
 
 	let g:go_textobj_enabled = 1
+<
+                                                 *'g:go_metalinter_autosave'*
 
+Use this option to auto |:GoMetaLinter| on save. Only linter messages for
+the active buffer will be shown. By default it's disabled >
+
+  let g:go_metalinter_autosave = 0
+<
+                                         *'g:go_metalinter_autosave_enabled'*
+
+Specifies the enabled linters for auto |GoMetaLinter| on save. By
+default it's using `vet` and `golint`
+>
+  let g:go_metalinter_autosave_enabled = ['vet', 'golint']
+<
+                                                  *'g:go_metalinter_enabled'*
+
+Specifies the currently enabled linters for the |GoMetaLinter| command. By
+default it's using `vet`, `golint` and `errcheck`
+>
+  let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
+<
+                                                  *'g:go_metalinter_command'*
+
+Overrides the command to be executed when |GoMetaLinter| is called. This is
+an advanced settings and is for users who want to have a complete control
+over of how `gometalinter` should be executed. By default it's empty.
+>
+  let g:go_metalinter_command = ""
+<
+                                                  *'g:go_metalinter_deadline'*
+
+Overrides the maximum time the linters have to complete. By default it's 5
+seconds.
+>
+  let g:go_metalinter_deadline = "5s"
+<
+                                                  *'g:go_loclist_height'*
+
+Specifies the current location list height for all location lists. The default
+value (empty) sets automatically the height to the number of errors (maximum
+up to 10 errors to prevent large heights). Setting the value explicitly
+overrides this behavior. To get default Vim behavior set it to 10.
+>
+  let g:go_loclist_height = 0
 
 ===============================================================================
 TROUBLESHOOTING                                         *go-troubleshooting*
 
-I'm using Fish shell but have some problems using Vim-go~
+I'm using Fish shell but have some problems using vim-go~
 
 First environment variables in Fish are applied differently, it should be like:
 >
@@ -802,7 +920,7 @@ First environment variables in Fish are applied differently, it should be like:
 <
 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
+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):
 >
@@ -815,7 +933,7 @@ or
 	set shell='/bin/sh'
 >
 
-I'm seeing weirds errors during installation of binaries with
+I'm seeing weird errors during installation of binaries with
 GoInstallBinaries:
 
 If you see errors like this:
@@ -835,7 +953,7 @@ You'll see a more detailed error. If this works, vim-go will work too.
 ===============================================================================
 CREDITS                                                         *go-credits*
 
-* Go Authors for offical vim plugins
+* Go Authors for official 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,
diff --git a/sources_non_forked/vim-go/ftdetect/gofiletype.vim b/sources_non_forked/vim-go/ftdetect/gofiletype.vim
index 8e7626ee..573dbb01 100644
--- a/sources_non_forked/vim-go/ftdetect/gofiletype.vim
+++ b/sources_non_forked/vim-go/ftdetect/gofiletype.vim
@@ -18,7 +18,7 @@ function! s:gofiletype_post()
     let &g:fileencodings = s:current_fileencodings
 endfunction
 
-au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
+au BufNewFile *.go setfiletype go | setlocal 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/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
index 674891cd..a821e929 100644
--- a/sources_non_forked/vim-go/ftplugin/go/commands.vim
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -1,62 +1,8 @@
-if exists("g:go_loaded_commands")
-    finish
-endif
-let g:go_loaded_commands = 1
-
-" go_jump_to_error defines whether we should pass the bang attribute to the
-" command or not. This is only used for mappings, because the user can't pass
-" the bang attribute to the plug mappings below. So instead of hardcoding it
-" as 0 (no '!' attribute) or 1 (with '!' attribute) we pass the user setting,
-" which by default is enabled. For commands the user has the ability to pass
-" the '!', such as :GoBuild or :GoBuild!
-if !exists("g:go_jump_to_error")
-    let g:go_jump_to_error = 1
-endif
-
-
-" Some handy plug mappings
-nnoremap <silent> <Plug>(go-run) :<C-u>call go#cmd#Run(!g:go_jump_to_error,expand('%'))<CR>
-nnoremap <silent> <Plug>(go-build) :<C-u>call go#cmd#Build(!g:go_jump_to_error,'')<CR>
-nnoremap <silent> <Plug>(go-generate) :<C-u>call go#cmd#Generate(!g:go_jump_to_error,'')<CR>
-nnoremap <silent> <Plug>(go-install) :<C-u>call go#cmd#Install(!g:go_jump_to_error)<CR>
-nnoremap <silent> <Plug>(go-test) :<C-u>call go#cmd#Test(!g:go_jump_to_error, 0, '')<CR>
-nnoremap <silent> <Plug>(go-test-func) :<C-u>call go#cmd#TestFunc(!g:go_jump_to_error, '')<CR>
-nnoremap <silent> <Plug>(go-test-compile) :<C-u>call go#cmd#Test(!g:go_jump_to_error, 1, '')<CR>
-nnoremap <silent> <Plug>(go-coverage) :<C-u>call go#cmd#Coverage(!g:go_jump_to_error, '')<CR>
-nnoremap <silent> <Plug>(go-vet) :<C-u>call go#cmd#Vet(!g:go_jump_to_error)<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-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-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>
-
-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("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>
-
-
 " gorename
-command! -nargs=? GoRename call go#rename#Rename(<f-args>)
+command! -nargs=? GoRename call go#rename#Rename(<bang>0,<f-args>)
 
 " oracle
+command! -nargs=* -complete=customlist,go#package#Complete GoOracleScope call go#oracle#Scope(<f-args>)
 command! -range=% GoImplements call go#oracle#Implements(<count>)
 command! -range=% GoCallees call go#oracle#Callees(<count>)
 command! -range=% GoDescribe call go#oracle#Describe(<count>)
@@ -65,8 +11,7 @@ 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>)
-
-command! -nargs=* -complete=customlist,go#package#Complete GoOracleScope call go#oracle#Scope(<f-args>)
+command! -nargs=? GoOracleTags call go#oracle#Tags(<f-args>)
 
 " tool
 command! -nargs=0 GoFiles echo go#tool#Files()
@@ -82,7 +27,6 @@ command! -nargs=* -bang GoTest call go#cmd#Test(<bang>0, 0, <f-args>)
 command! -nargs=* -bang GoTestFunc call go#cmd#TestFunc(<bang>0, <f-args>)
 command! -nargs=* -bang GoTestCompile call go#cmd#Test(<bang>0, 1, <f-args>)
 command! -nargs=* -bang GoCoverage call go#cmd#Coverage(<bang>0, <f-args>)
-command! -nargs=0 -bang GoVet call go#cmd#Vet(<bang>0)
 
 " -- play
 command! -nargs=0 -range=% GoPlay call go#play#Share(<count>, <line1>, <line2>)
@@ -99,14 +43,14 @@ 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>)
+command! -nargs=? -complete=customlist,go#package#Complete GoDrop call go#import#SwitchImport(0, '', <f-args>, '')
+command! -nargs=1 -bang -complete=customlist,go#package#Complete GoImport call go#import#SwitchImport(1, '', <f-args>, '<bang>')
+command! -nargs=* -bang -complete=customlist,go#package#Complete GoImportAs call go#import#SwitchImport(1, <f-args>, '<bang>')
 
-" -- lint
-command! GoLint call go#lint#Run()
-
-" -- errcheck
-command! -nargs=? -complete=customlist,go#package#Complete GoErrCheck call go#errcheck#Run(<f-args>)
+" -- linters
+command! -nargs=* GoMetaLinter call go#lint#Gometa(0, <f-args>)
+command! -nargs=* GoLint call go#lint#Golint(<f-args>)
+command! -nargs=* -bang GoVet call go#lint#Vet(<bang>0, <f-args>)
+command! -nargs=* -complete=customlist,go#package#Complete GoErrCheck call go#lint#Errcheck(<f-args>)
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/ftplugin/go/mappings.vim b/sources_non_forked/vim-go/ftplugin/go/mappings.vim
new file mode 100644
index 00000000..9e243543
--- /dev/null
+++ b/sources_non_forked/vim-go/ftplugin/go/mappings.vim
@@ -0,0 +1,59 @@
+" go_jump_to_error defines whether we should pass the bang attribute to the
+" command or not. This is only used for mappings, because the user can't pass
+" the bang attribute to the plug mappings below. So instead of hardcoding it
+" as 0 (no '!' attribute) or 1 (with '!' attribute) we pass the user setting,
+" which by default is enabled. For commands the user has the ability to pass
+" the '!', such as :GoBuild or :GoBuild!
+if !exists("g:go_jump_to_error")
+    let g:go_jump_to_error = 1
+endif
+
+
+" Some handy plug mappings
+nnoremap <silent> <Plug>(go-run) :<C-u>call go#cmd#Run(!g:go_jump_to_error, '%')<CR>
+
+if has("nvim")
+	nnoremap <silent> <Plug>(go-run-vertical) :<C-u>call go#cmd#RunTerm('vsplit')<CR>
+	nnoremap <silent> <Plug>(go-run-split) :<C-u>call go#cmd#RunTerm('split')<CR>
+	nnoremap <silent> <Plug>(go-run-tab) :<C-u>call go#cmd#RunTerm('tab')<CR>
+endif
+
+nnoremap <silent> <Plug>(go-build) :<C-u>call go#cmd#Build(!g:go_jump_to_error)<CR>
+nnoremap <silent> <Plug>(go-generate) :<C-u>call go#cmd#Generate(!g:go_jump_to_error)<CR>
+nnoremap <silent> <Plug>(go-install) :<C-u>call go#cmd#Install(!g:go_jump_to_error)<CR>
+nnoremap <silent> <Plug>(go-test) :<C-u>call go#cmd#Test(!g:go_jump_to_error, 0)<CR>
+nnoremap <silent> <Plug>(go-test-func) :<C-u>call go#cmd#TestFunc(!g:go_jump_to_error)<CR>
+nnoremap <silent> <Plug>(go-test-compile) :<C-u>call go#cmd#Test(!g:go_jump_to_error, 1)<CR>
+nnoremap <silent> <Plug>(go-coverage) :<C-u>call go#cmd#Coverage(!g:go_jump_to_error)<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-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-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(!g:go_jump_to_error)<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("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>
+
+nnoremap <silent> <Plug>(go-metalinter) :<C-u>call go#lint#Gometa(0)<CR>
+nnoremap <silent> <Plug>(go-vet) :<C-u>call go#lint#Vet(!g:go_jump_to_error)<CR>
+
+
diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim
index e28b060e..43295ad7 100644
--- a/sources_non_forked/vim-go/plugin/go.vim
+++ b/sources_non_forked/vim-go/plugin/go.vim
@@ -9,6 +9,7 @@ let g:go_loaded_install = 1
 " needed by the user with GoInstallBinaries
 let s:packages = [
             \ "github.com/nsf/gocode",
+            \ "github.com/alecthomas/gometalinter", 
             \ "golang.org/x/tools/cmd/goimports",
             \ "github.com/rogpeppe/godef",
             \ "golang.org/x/tools/cmd/oracle",
@@ -132,6 +133,10 @@ augroup vim-go
         autocmd BufWritePre *.go call go#fmt#Format(-1)
     endif
 
+    " run gometalinter on save
+    if get(g:, "go_metalinter_autosave", 0)
+        autocmd BufWritePost *.go call go#lint#Gometa(1)
+    endif
 augroup END
 
 
diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim
index 0c606ecc..e4ecaf08 100644
--- a/sources_non_forked/vim-go/syntax/go.vim
+++ b/sources_non_forked/vim-go/syntax/go.vim
@@ -10,7 +10,7 @@
 "     let OPTION_NAME = 0
 "   in your ~/.vimrc file to disable particular options. You can also write:
 "     let OPTION_NAME = 1
-"   to enable particular options. 
+"   to enable particular options.
 "   At present, all options default to on, except highlight of:
 "   functions, methods and structs.
 "
@@ -25,6 +25,8 @@
 "     Highlights instances of tabs following spaces.
 "   - go_highlight_trailing_whitespace_error
 "     Highlights trailing white space.
+"   - go_highlight_string_spellcheck
+"     Specifies that strings should be spell checked
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -52,23 +54,27 @@ if !exists("g:go_highlight_trailing_whitespace_error")
 endif
 
 if !exists("g:go_highlight_operators")
-	let g:go_highlight_operators = 0
+  let g:go_highlight_operators = 0
 endif
 
 if !exists("g:go_highlight_functions")
-	let g:go_highlight_functions = 0
+  let g:go_highlight_functions = 0
 endif
 
 if !exists("g:go_highlight_methods")
-	let g:go_highlight_methods = 0
+  let g:go_highlight_methods = 0
 endif
 
 if !exists("g:go_highlight_structs")
-	let g:go_highlight_structs = 0
+  let g:go_highlight_structs = 0
 endif
 
 if !exists("g:go_highlight_build_constraints")
-    let g:go_highlight_build_constraints = 0
+  let g:go_highlight_build_constraints = 0
+endif
+
+if !exists("g:go_highlight_string_spellcheck")
+  let g:go_highlight_string_spellcheck = 1
 endif
 
 syn case match
@@ -111,8 +117,8 @@ 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 match       goBuiltins          /\<\v(append|cap|close|complex|copy|delete|imag|len)\ze\(/
+syn match       goBuiltins          /\<\v(make|new|panic|print|println|real|recover)\ze\(/
 syn keyword     goBoolean           iota true false nil
 
 hi def link     goBuiltins          Keyword
@@ -145,13 +151,18 @@ 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=+`+
+if g:go_highlight_string_spellcheck != 0
+  syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup,@Spell
+  syn region      goRawString         start=+`+ end=+`+ contains=@Spell
+else
+  syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+  syn region      goRawString         start=+`+ end=+`+
+endif
 syn match       goFormatSpecifier   /%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)*[vTtbcdoqxXUeEfgGsp]/ contained containedin=goString
 
 hi def link     goString            String
 hi def link     goRawString         String
-hi def link 	goFormatSpecifier   goSpecialString
+hi def link     goFormatSpecifier   goSpecialString
 
 " Characters; their contents
 syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
@@ -197,9 +208,17 @@ 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\>\)\@="
+  "
+  " \(\<chan\>\)\@<!<-  (only pick arrow when it doesn't come after a chan)
+  " this prevents picking up 'chan<- chan<-' but not '<- chan'
+  syn match goSpaceError display "\(\(\<chan\>\)\@<!<-\)\@<=\s\+\(\<chan\>\)\@="
+
   " send-only annotation on chan type
-  syn match goSpaceError display "\(\<chan\)\@<=\s\+\(<-\)\@="
+  "
+  " \(<-\)\@<!\<chan\>  (only pick chan when it doesn't come after an arrow)
+  " this prevents picking up '<-chan <-chan' but not 'chan <-'
+  syn match goSpaceError display "\(\(<-\)\@<!\<chan\>\)\@<=\s\+\(<-\)\@="
+
   " value-ignoring receives in a few contexts
   syn match goSpaceError display "\(\(^\|[={(,;]\)\s*<-\)\@<=\s\+"
 endif
@@ -234,57 +253,76 @@ syn keyword     goTodo              contained NOTE
 hi def link     goTodo              Todo
 
 
-" Operators; 
+" Operators;
 if g:go_highlight_operators != 0
-	" match single-char operators:          - + % < > ! & | ^ * =
-	" and corresponding two-char operators: -= += %= <= >= != &= |= ^= *= ==
-	syn match goOperator /[-+%<>!&|^*=]=\?/
-	" match / and /=
-	syn match goOperator /\/\%(=\|\ze[^/*]\)/
-	" match two-char operators:               << >> &^
-	" and corresponding three-char operators: <<= >>= &^=
-	syn match goOperator /\%(<<\|>>\|&^\)=\?/
-	" match remaining two-char operators: := && || <- ++ --
-	syn match goOperator /:=\|||\|<-\|++\|--/
-	" match ...
-	syn match goOperator /\.\.\./
+  " match single-char operators:          - + % < > ! & | ^ * =
+  " and corresponding two-char operators: -= += %= <= >= != &= |= ^= *= ==
+  syn match goOperator /[-+%<>!&|^*=]=\?/
+  " match / and /=
+  syn match goOperator /\/\%(=\|\ze[^/*]\)/
+  " match two-char operators:               << >> &^
+  " and corresponding three-char operators: <<= >>= &^=
+  syn match goOperator /\%(<<\|>>\|&^\)=\?/
+  " match remaining two-char operators: := && || <- ++ --
+  syn match goOperator /:=\|||\|<-\|++\|--/
+  " match ...
+  syn match goOperator /\.\.\./
 endif
-hi def link     goOperator					Operator
+hi def link     goOperator          Operator
 
-" Functions; 
+" Functions;
 if g:go_highlight_functions != 0
-	syn match goFunction							/\(func\s\+\)\@<=\w\+\((\)\@=/
-	syn match goFunction							/\()\s\+\)\@<=\w\+\((\)\@=/
+  syn match goFunction              /\(func\s\+\)\@<=\w\+\((\)\@=/
+  syn match goFunction              /\()\s\+\)\@<=\w\+\((\)\@=/
 endif
-hi def link     goFunction					Function
+hi def link     goFunction          Function
 
-" Methods; 
+" Methods;
 if g:go_highlight_methods != 0
-	syn match goMethod								/\(\.\)\@<=\w\+\((\)\@=/
+  syn match goMethod                /\(\.\)\@<=\w\+\((\)\@=/
 endif
-hi def link     goMethod						Type
+hi def link     goMethod            Type
 
-" Structs; 
+" Structs;
 if g:go_highlight_structs != 0
-	syn match goStruct								/\(.\)\@<=\w\+\({\)\@=/
-	syn match goStructDef							/\(type\s\+\)\@<=\w\+\(\s\+struct\s\+{\)\@=/
+  syn match goStruct                /\(.\)\@<=\w\+\({\)\@=/
+  syn match goStructDef             /\(type\s\+\)\@<=\w\+\(\s\+struct\s\+{\)\@=/
 endif
-hi def link     goStruct						Function
+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
+    syn match   goBuildKeyword      display contained "+build"
+    " Highlight the known values of GOOS, GOARCH, and other +build options.
+    syn keyword goBuildDirectives   contained
+      \ android darwin dragonfly freebsd linux nacl netbsd openbsd plan9
+      \ solaris windows 386 amd64 amd64p32 arm armbe arm64 arm64be ppc64
+      \ ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc
+      \ s390 s390x sparc sparc64 cgo ignore race
 
-hi def link     goBuildComment      Comment
-hi def link     goBuildOs           Type
-hi def link     goBuildArch         Type
-hi def link     goBuildDirective    PreProc
+    " Other words in the build directive are build tags not listed above, so
+    " avoid highlighting them as comments by using a matchgroup just for the
+    " start of the comment.
+    " The rs=s+2 option lets the \s*+build portion be part of the inner region
+    " instead of the matchgroup so it will be highlighted as a goBuildKeyword.
+    syn region  goBuildComment      matchgroup=goBuildCommentStart
+      \ start="//\s*+build\s"rs=s+2 end="$"
+      \ contains=goBuildKeyword,goBuildDirectives
+    hi def link goBuildCommentStart Comment
+    hi def link goBuildDirectives   Type
+    hi def link goBuildKeyword      PreProc
+
+    " One or more line comments that are followed immediately by a "package"
+    " declaration are treated like package documentation, so these must be
+    " matched as comments to avoid looking like working build constraints.
+    " The he, me, and re options let the "package" itself be highlighted by
+    " the usual rules.
+    syn region  goPackageComment    start=/\v(\/\/.*\n)+\s*package/
+      \ end=/\v\n\s*package/he=e-7,me=e-7,re=e-7
+      \ contains=@goCommentGroup,@Spell
+    hi def link goPackageComment    Comment
+endif
 
 
 " Search backwards for a global declaration to start processing the syntax.
diff --git a/sources_non_forked/vim-go/syntax/gotexttmpl.vim b/sources_non_forked/vim-go/syntax/gotexttmpl.vim
index 50b4653d..37c62a90 100644
--- a/sources_non_forked/vim-go/syntax/gotexttmpl.vim
+++ b/sources_non_forked/vim-go/syntax/gotexttmpl.vim
@@ -37,7 +37,7 @@ 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
+syn region      goCharacter         contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
 
 hi def link     goCharacter         Character
 
@@ -65,8 +65,8 @@ hi def link     goImaginary  Number
 syn cluster     gotplLiteral     contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
 syn keyword     gotplControl     contained   if else end range with template
 syn keyword     gotplFunctions   contained   and html index js len not or print printf println urlquery eq ne lt le gt ge
-syn match       gotplVariable    contained   /\$[^ ]*\>/
-syn match       goTplIdentifier  contained   /\.[^ ]*\>/
+syn match       gotplVariable    contained   /\$[a-zA-Z0-9_]*\>/
+syn match       goTplIdentifier  contained   /\.[^\s}]*\>/
 
 hi def link     gotplControl        Keyword
 hi def link     gotplFunctions      Function
diff --git a/sources_non_forked/vim-indent-object/doc/indent-object.txt b/sources_non_forked/vim-indent-object/doc/indent-object.txt
index 5b581020..b22c9865 100644
--- a/sources_non_forked/vim-indent-object/doc/indent-object.txt
+++ b/sources_non_forked/vim-indent-object/doc/indent-object.txt
@@ -86,6 +86,12 @@ this case if blank lines are ignored, then the entire file would be selected.
 Instead when code at the top level is being indented blank lines are
 considered to delimit the block.
 
+This exceptional behaviour can be disabled by executing the following line
+>
+      :let g:indent_object_except_first_level = 0
+<
+(default is 1)
+
 
 ==============================================================================
 ABOUT                                                          *idntobj-about*
diff --git a/sources_non_forked/vim-indent-object/plugin/indent-object.vim b/sources_non_forked/vim-indent-object/plugin/indent-object.vim
index afb8edd2..199b4338 100644
--- a/sources_non_forked/vim-indent-object/plugin/indent-object.vim
+++ b/sources_non_forked/vim-indent-object/plugin/indent-object.vim
@@ -10,10 +10,10 @@
 "  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
@@ -41,6 +41,10 @@ let s:l1 = -1
 let s:c0 = -1
 let s:c1 = -1
 
+if !exists("g:indent_object_except_first_level")
+	let g:indent_object_except_first_level = 1
+endif
+
 function! <Sid>TextObject(inner, incbelow, vis, range, count)
 
 	" Record the current state of the visual region.
@@ -109,7 +113,10 @@ function! <Sid>TextObject(inner, incbelow, vis, range, count)
 		" Search backward for the first line with less indent than the target
 		" indent (skipping blank lines).
 		let blnk = getline(l_1) =~ "^\\s*$"
-		while l_1 > 0 && ((idnt == 0 && !blnk) || (idnt != 0 && (blnk || indent(l_1) >= idnt)))
+		while l_1 > 0 && (blnk || indent(l_1) >= idnt)
+			if g:indent_object_except_first_level && idnt == 0 && blnk
+				break
+			endif
 			if !blnk || !a:inner
 				let l_1o = l_1
 			endif
@@ -121,7 +128,10 @@ function! <Sid>TextObject(inner, incbelow, vis, range, count)
 		" indent (skipping blank lines).
 		let line_cnt = line("$")
 		let blnk = getline(l2) =~ "^\\s*$"
-		while l2 <= line_cnt && ((idnt == 0 && !blnk) || (idnt != 0 && (blnk || indent(l2) >= idnt)))
+		while l2 <= line_cnt && (blnk || indent(l2) >= idnt)
+			if g:indent_object_except_first_level && idnt == 0 && blnk
+				break
+			endif
 			if !blnk || !a:inner
 				let l2o = l2
 			endif
diff --git a/sources_non_forked/vim-jade/README.markdown b/sources_non_forked/vim-jade/README.markdown
new file mode 100644
index 00000000..2c2222ed
--- /dev/null
+++ b/sources_non_forked/vim-jade/README.markdown
@@ -0,0 +1,19 @@
+# vim-jade #
+
+Vim syntax highlighting for Jade templates.
+
+Installation
+------------
+
+I prefer to install plugins using Tim Pope's 
+[pathogen.vim](https://github.com/tpope/vim-pathogen).  Installation using
+pathogen is quite simple.
+
+    cd ~/.vim/bundle
+    git clone git://github.com/digitaltoad/vim-jade.git
+
+If you do not want to use pathogen.  You can always install vim-jade in the 
+normal manner by copying each directory to your ~/.vim directory.  Make sure 
+not to overwrite any existing directory of the same name and instead copy only 
+the contents of the source directory to the directory of the same name in your 
+~/.vim directory.
diff --git a/sources_non_forked/vim-jade/ftdetect/jade.vim b/sources_non_forked/vim-jade/ftdetect/jade.vim
new file mode 100644
index 00000000..c21dcff7
--- /dev/null
+++ b/sources_non_forked/vim-jade/ftdetect/jade.vim
@@ -0,0 +1,2 @@
+" Jade
+autocmd BufNewFile,BufReadPost *.jade set filetype=jade
diff --git a/sources_non_forked/vim-jade/ftplugin/jade.vim b/sources_non_forked/vim-jade/ftplugin/jade.vim
new file mode 100644
index 00000000..577f5547
--- /dev/null
+++ b/sources_non_forked/vim-jade/ftplugin/jade.vim
@@ -0,0 +1,57 @@
+" Vim filetype plugin
+" Language: Jade
+" Maintainer: Joshua Borton
+" Credits: Tim Pope
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+setlocal iskeyword+=-
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+unlet! b:did_ftplugin
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+  let s:undo_ftplugin = b:undo_ftplugin
+  unlet b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+  let s:browsefilter = b:browsefilter
+  unlet b:browsefilter
+endif
+if exists("b:match_words")
+  let s:match_words = b:match_words
+  unlet b:match_words
+endif
+
+" Change the browse dialog on Win32 to show mainly Haml-related files
+if has("gui_win32")
+  let b:browsefilter="Jade Files (*.jade)\t*.jade\n" . s:browsefilter
+endif
+
+" Load the combined list of match_words for matchit.vim
+if exists("loaded_matchit")
+  let b:match_words = s:match_words
+endif
+
+setlocal comments=://-,:// commentstring=//\ %s
+
+setlocal suffixesadd+=.jade
+
+let b:undo_ftplugin = "setl cms< com< "
+      \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+
+let &cpo = s:save_cpo
+
+" vim:set sw=2:
diff --git a/sources_non_forked/vim-jade/indent/jade.vim b/sources_non_forked/vim-jade/indent/jade.vim
new file mode 100644
index 00000000..8cfa656d
--- /dev/null
+++ b/sources_non_forked/vim-jade/indent/jade.vim
@@ -0,0 +1,70 @@
+" Vim indent file
+" Language: Jade
+" Maintainer: Joshua Borton
+" Credits: Tim Pope (vim-jade)
+" Last Change: 2010 Sep 22
+
+if exists("b:did_indent")
+  finish
+endif
+
+unlet! b:did_indent
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetJadeIndent()
+setlocal indentkeys=o,O,*<Return>,},],0),!^F
+
+" Only define the function once.
+if exists("*GetJadeIndent")
+  finish
+endif
+
+let s:attributes = '\%((.\{-\})\)'
+let s:tag = '\([%.#][[:alnum:]_-]\+\|'.s:attributes.'\)*[<>]*'
+
+if !exists('g:jade_self_closing_tags')
+  let g:jade_self_closing_tags = 'meta|link|img|hr|br|input'
+endif
+
+setlocal formatoptions+=r
+setlocal comments+=n:\|
+
+function! GetJadeIndent()
+  let lnum = prevnonblank(v:lnum-1)
+  if lnum == 0
+    return 0
+  endif
+  let line = substitute(getline(lnum),'\s\+$','','')
+  let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
+  let lastcol = strlen(line)
+  let line = substitute(line,'^\s\+','','')
+  let indent = indent(lnum)
+  let cindent = indent(v:lnum)
+  let increase = indent + &sw
+  if indent == indent(lnum)
+    let indent = cindent <= indent ? -1 : increase
+  endif
+
+  let group = synIDattr(synID(lnum,lastcol,1),'name')
+
+  if line =~ '^!!!'
+    return indent
+  elseif line =~ '^/\%(\[[^]]*\]\)\=$'
+    return increase
+  elseif line =~ '^\%(if\|else\|unless\|for\|each\|block\|mixin\|append\|case\|when\)'
+    return increase
+  elseif line =~ '^'.s:tag.'[&!]\=[=~-].*,\s*$'
+    return increase
+  elseif line == '-#'
+    return increase
+  elseif line =~? '^\v%('.g:jade_self_closing_tags.')>'
+    return indent
+  elseif group =~? '\v^%(jadeAttributesDelimiter|jadeClass|jadeId|htmlTagName|htmlSpecialTagName|jadeFilter|jadeTagBlockChar)$'
+    return increase
+  else
+    return indent
+  endif
+endfunction
+
+" vim:set sw=2:
diff --git a/sources_non_forked/vim-jade/syntax/jade.vim b/sources_non_forked/vim-jade/syntax/jade.vim
new file mode 100644
index 00000000..ed88e071
--- /dev/null
+++ b/sources_non_forked/vim-jade/syntax/jade.vim
@@ -0,0 +1,104 @@
+" Vim syntax file
+" Language: Jade
+" Maintainer: Joshua Borton
+" Credits: Tim Pope
+" Filenames: *.jade
+
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'jade'
+endif
+
+silent! syntax include @htmlCoffeescript syntax/coffee.vim
+unlet! b:current_syntax
+silent! syntax include @htmlStylus syntax/stylus.vim
+unlet! b:current_syntax
+silent! syntax include @htmlCss syntax/css.vim
+unlet! b:current_syntax
+silent! syntax include @htmlMarkdown syntax/markdown.vim
+unlet! b:current_syntax
+
+syn case match
+
+syn region  javascriptParenthesisBlock start="(" end=")" contains=@htmlJavascript contained keepend
+syn cluster htmlJavascript add=javascriptParenthesisBlock
+
+syn region  jadeJavascript matchgroup=jadeJavascriptOutputChar start="[!&]\==\|\~" skip=",\s*$" end="$" contained contains=@htmlJavascript keepend
+syn region  jadeJavascript matchgroup=jadeJavascriptChar start="-" skip=",\s*$" end="$" contained contains=@htmlJavascript keepend
+syn cluster jadeTop contains=jadeBegin,jadeComment,jadeHtmlComment,jadeJavascript
+syn match   jadeBegin "^\s*\%([<>]\|&[^=~ ]\)\@!" nextgroup=jadeTag,jadeClassChar,jadeIdChar,jadePlainChar,jadeJavascript,jadeScriptConditional,jadeScriptStatement,jadePipedText
+syn match   jadeTag "+\?\w\+\%(:\w\+\)\=" contained contains=htmlTagName,htmlSpecialTagName nextgroup=@jadeComponent
+syn cluster jadeComponent contains=jadeAttributes,jadeIdChar,jadeBlockExpansionChar,jadeClassChar,jadePlainChar,jadeJavascript,jadeTagBlockChar,jadeTagInlineText
+syn match   jadeComment '\s*\/\/.*$'
+syn region  jadeCommentBlock start="\z(\s*\)\/\/.*$" end="^\%(\z1\s\|\s*$\)\@!" keepend 
+syn region  jadeHtmlConditionalComment start="<!--\%(.*\)>" end="<!\%(.*\)-->"
+syn region  jadeAttributes matchgroup=jadeAttributesDelimiter start="(" end=")" contained contains=@htmlJavascript,jadeHtmlArg,htmlArg,htmlEvent,htmlCssDefinition nextgroup=@jadeComponent
+syn match   jadeClassChar "\." contained nextgroup=jadeClass
+syn match   jadeBlockExpansionChar ":\s\+" contained nextgroup=jadeTag,jadeClassChar,jadeIdChar
+syn match   jadeIdChar "#[[{]\@!" contained nextgroup=jadeId
+syn match   jadeClass "\%(\w\|-\)\+" contained nextgroup=@jadeComponent
+syn match   jadeId "\%(\w\|-\)\+" contained nextgroup=@jadeComponent
+syn region  jadeDocType start="^\s*\(!!!\|doctype\)" end="$"
+" Unless I'm mistaken, syntax/html.vim requires
+" that the = sign be present for these matches.
+" This adds the matches back for jade.
+syn keyword jadeHtmlArg contained href title
+
+syn match   jadePlainChar "\\" contained
+syn region  jadeInterpolation matchgroup=jadeInterpolationDelimiter start="[#!]{" end="}" contains=@htmlJavascript
+syn match   jadeInterpolationEscape "\\\@<!\%(\\\\\)*\\\%(\\\ze#{\|#\ze{\)"
+syn match   jadeTagInlineText "\s.*$" contained contains=jadeInterpolation,jadeTextInlineJade
+syn region  jadePipedText matchgroup=jadePipeChar start="|" end="$" contained contains=jadeInterpolation,jadeTextInlineJade nextgroup=jadePipedText skipnl
+syn match   jadeTagBlockChar "\.$" contained nextgroup=jadeTagBlockText,jadeTagBlockEnd skipnl
+syn region  jadeTagBlockText start="\%(\s*\)\S" end="\ze\n" contained contains=jadeInterpolation,jadeTextInlineJade nextgroup=jadeTagBlockText,jadeTagBlockEnd skipnl
+syn region  jadeTagBlockEnd start="\s*\S" end="$" contained contains=jadeInterpolation,jadeTextInlineJade nextgroup=jadeBegin skipnl
+syn region  jadeTextInlineJade matchgroup=jadeInlineDelimiter start="#\[" end="]" contains=jadeTag keepend
+
+syn region  jadeJavascriptFilter matchgroup=jadeFilter start="^\z(\s*\):javascript\s*$" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlJavascript
+syn region  jadeMarkdownFilter matchgroup=jadeFilter start=/^\z(\s*\):\%(markdown\|marked\)\s*$/ end=/^\%(\z1\s\|\s*$\)\@!/ contains=@htmlMarkdown
+syn region  jadeStylusFilter matchgroup=jadeFilter start="^\z(\s*\):stylus\s*$" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlStylus
+syn region  jadePlainFilter matchgroup=jadeFilter start="^\z(\s*\):\%(sass\|less\|cdata\)\s*$" end="^\%(\z1\s\|\s*$\)\@!"
+
+syn match  jadeScriptConditional "^\s*\<\%(if\|else\|else if\|unless\|while\|until\|case\|when\|default\)\>[?!]\@!"
+syn match  jadeScriptStatement "^\s*\<\%(each\|for\|block\|prepend\|append\|mixin\|extends\|include\)\>[?!]\@!"
+syn region  jadeScriptLoopRegion start="^\s*\(for \)" end="$" contains=jadeScriptLoopKeywords
+syn keyword  jadeScriptLoopKeywords for in contained
+
+syn region  jadeJavascript start="^\z(\s*\)script\%(:\w\+\)\=" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlJavascript,jadeJavascriptTag,jadeCoffeescriptFilter keepend 
+
+syn region  jadeCoffeescriptFilter matchgroup=jadeFilter start="^\z(\s*\):coffee-\?script\s*$" end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlCoffeescript contained
+syn region  jadeJavascriptTag contained start="^\z(\s*\)script\%(:\w\+\)\=" end="$" contains=jadeBegin,jadeTag
+syn region  jadeCssBlock        start="^\z(\s*\)style" nextgroup=@jadeComponent,jadeError  end="^\%(\z1\s\|\s*$\)\@!" contains=@htmlCss keepend
+
+syn match  jadeError "\$" contained
+
+hi def link jadePlainChar              Special
+hi def link jadeScriptConditional      PreProc
+hi def link jadeScriptLoopKeywords     PreProc
+hi def link jadeScriptStatement        PreProc
+hi def link jadeHtmlArg                htmlArg
+hi def link jadeAttributeString        String
+hi def link jadeAttributesDelimiter    Identifier
+hi def link jadeIdChar                 Special
+hi def link jadeClassChar              Special
+hi def link jadeBlockExpansionChar     Special
+hi def link jadePipeChar               Special
+hi def link jadeTagBlockChar           Special
+hi def link jadeId                     Identifier
+hi def link jadeClass                  Type
+hi def link jadeInterpolationDelimiter Delimiter
+hi def link jadeInlineDelimiter        Delimiter
+hi def link jadeFilter                 PreProc
+hi def link jadeDocType                PreProc
+hi def link jadeComment                Comment
+hi def link jadeCommentBlock           Comment
+hi def link jadeHtmlConditionalComment jadeComment
+
+let b:current_syntax = "jade"
+
+if main_syntax == "jade"
+  unlet main_syntax
+endif
diff --git a/sources_non_forked/vim-less/ftplugin/less.vim b/sources_non_forked/vim-less/ftplugin/less.vim
index c4da0a58..88a6e7b7 100644
--- a/sources_non_forked/vim-less/ftplugin/less.vim
+++ b/sources_non_forked/vim-less/ftplugin/less.vim
@@ -19,7 +19,7 @@ setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
 setlocal omnifunc=csscomplete#CompleteCSS
 setlocal suffixesadd=.less
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,://
-setlocal fo=jcroql
+setlocal fo=croql
 
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
diff --git a/sources_non_forked/vim-markdown/README.markdown b/sources_non_forked/vim-markdown/README.markdown
index 055b8de2..3660da38 100644
--- a/sources_non_forked/vim-markdown/README.markdown
+++ b/sources_non_forked/vim-markdown/README.markdown
@@ -11,6 +11,11 @@ installing from this repository, add the following to your vimrc:
 
     autocmd BufNewFile,BufReadPost *.md set filetype=markdown
 
+If you want to enable fenced code block syntax highlighting in your markdown
+documents you can enable it in your `.vimrc` like so:
+
+    let g:markdown_fenced_languages = ['html', 'python', 'bash=sh']
+
 ## License
 
 Copyright © Tim Pope.  Distributed under the same terms as Vim itself.
diff --git a/sources_non_forked/vim-markdown/syntax/markdown.vim b/sources_non_forked/vim-markdown/syntax/markdown.vim
index 8c981bbe..925f9069 100644
--- a/sources_non_forked/vim-markdown/syntax/markdown.vim
+++ b/sources_non_forked/vim-markdown/syntax/markdown.vim
@@ -85,19 +85,19 @@ exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start=
 
 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
+syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```*.*$" end="^\s*```*\ze\s*$" keepend
 
 syn match markdownFootnote "\[^[^\]]\+\]"
 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')
+    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
 
-syn match markdownEscape "\\[][\\`*_{}()#+.!-]"
+syn match markdownEscape "\\[][\\`*_{}()<>#+.!-]"
 syn match markdownError "\w\@<=_\w\@="
 
 hi def link markdownH1                    htmlH1
diff --git a/sources_non_forked/vim-multiple-cursors/.travis.yml b/sources_non_forked/vim-multiple-cursors/.travis.yml
index e99037a9..cfb198ab 100644
--- a/sources_non_forked/vim-multiple-cursors/.travis.yml
+++ b/sources_non_forked/vim-multiple-cursors/.travis.yml
@@ -1,7 +1,11 @@
+sudo: false
 language: ruby
-rvm:
-  - 1.9.3
-before_install: sudo apt-get install vim-gtk
+
+addons:
+  apt:
+    packages:
+      - vim-gtk
+
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
diff --git a/sources_non_forked/vim-multiple-cursors/Gemfile.lock b/sources_non_forked/vim-multiple-cursors/Gemfile.lock
index 12bf0d65..e833b243 100644
--- a/sources_non_forked/vim-multiple-cursors/Gemfile.lock
+++ b/sources_non_forked/vim-multiple-cursors/Gemfile.lock
@@ -1,17 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.4)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    vimrunner (0.3.0)
+    diff-lcs (1.2.5)
+    rake (10.4.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    vimrunner (0.3.1)
 
 PLATFORMS
   ruby
@@ -20,3 +25,6 @@ DEPENDENCIES
   rake
   rspec
   vimrunner
+
+BUNDLED WITH
+   1.10.6
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index 2a991a18..3c22687f 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -13,7 +13,7 @@
  - *[Known Issues](#known-issues)*
  - [Changelog](#changelog)
  - [Contributing](#contributing)
- - [Credit](#credit) 
+ - [Credit](#credit)
 
 ###Contributors
 - [eapache](https://github.com/eapache)
@@ -27,16 +27,22 @@
 ### It's great for quick refactoring
 ![Example1](assets/example1.gif?raw=true)
 
+Vim command sequence: `2Gfp<C-n><C-n><C-n>cname`
+
 ### Add a cursor to each line of your visual selection
 ![Example2](assets/example2.gif?raw=true)
 
+Vim command sequence: `2Gvip<C-n>i"<Right><Right><Right>",<Esc>vipJ$r]Idays = [`
+
 ### Do it backwards too! This is not just a replay of the above gif :)
 ![Example3](assets/example3.gif?raw=true)
 
+Vim command sequence: `2Gdf[$r,0f,v<C-n>…<C-n>c<CR><Up><Del><Right><Right><Right><Del>`
+
 ### Add multiple cursors using regexes
 ![Example4](assets/example4.gif?raw=true)
 
-To see what keystrokes are used for the above example, see [this issue](https://github.com/terryma/vim-multiple-cursors/issues/39).
+To see what keystrokes are used for the above examples, see [this issue](https://github.com/terryma/vim-multiple-cursors/issues/39).
 
 ## Features
 - Live update in Insert mode
@@ -132,6 +138,15 @@ normal mode will "fail to replay" when multiple cursors are active. For example,
 changing it from `{}` to `{'d':1}` makes normal-mode mappings beginning with `d`
 (such as `dw` to delete a word) work in multi-cursor mode.
 
+### ```g:multi_cursor_visual_maps``` (Default: see below)
+Default value: `{'i':1, 'a':1, 'f':1, 'F':1, 't':1, 'T':1}`
+
+Any key in this map (values are ignored) will cause multi-cursor _Visual_ mode
+to pause for map completion just like normal vim. Otherwise keys mapped in
+visual mode will "fail to replay" when multiple cursors are active. For example,
+changing it from `{}` to `{'i':1}` makes visual-mode mappings beginning with `i`
+(such as `it` to select an "inner tag block") work in multi-cursor mode.
+
 The default list contents should work for anybody, unless they have remapped a
 key from an operator-pending command to a non-operator-pending command or
 vice versa.
@@ -144,9 +159,9 @@ such as `j` as if they were operator-pending commands can break things.
 
 ### ```Multiple_cursors_before/Multiple_cursors_after``` (Default: `nothing`)
 
-Other plugins may trigger on keypresses when in insert mode. These plugins 
+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 
+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),
@@ -187,9 +202,6 @@ highlight link multiple_cursors_visual Visual
 
 ## Known Issues
 - Select mode is not implemented
-- I and A do not work in Visual mode yet (See #55)
-  
- Single key command to switch to Insert mode such as c or s from Visual mode or i, a, I, A in Normal mode should work without any issues. **NOTE**: vim's Visual block mode also supports I and A commands, however they do not work in this plugin's Visual mode at the moment. For now, to use I and A, switch to normal mode by pressing v first.
 
 ## Changelog
 See [CHANGELOG.md](CHANGELOG.md)
@@ -211,6 +223,4 @@ Obviously inspired by Sublime Text's [multiple selection][sublime-multiple-selec
 [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-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index 5763c7b4..7784c08c 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -268,6 +268,7 @@ function! s:Cursor.new(position)
   let obj = copy(self)
   let obj.position = copy(a:position)
   let obj.visual = []
+  let obj.saved_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('"')
@@ -332,6 +333,7 @@ endfunction
 
 " Remove the visual selection and its highlight
 function! s:Cursor.remove_visual_selection() dict
+  let self.saved_visual = deepcopy(self.visual)
   let self.visual = []
   " TODO(terryma): Move functionality into separate class
   call s:cm.remove_highlight(self.visual_hi_id)
@@ -409,6 +411,7 @@ function! s:CursorManager.reset(restore_view, restore_setting, ...) dict
   let self.saved_winview = []
   let self.start_from_find = 0
   let s:char = ''
+  let s:saved_char = ''
   if a:restore_setting
     call self.restore_user_settings()
   endif
@@ -626,6 +629,13 @@ function! s:CursorManager.restore_user_settings() dict
   call setreg('"', s:paste_buffer_temporary_text, s:paste_buffer_temporary_type)
 endfunction
 
+" Reposition all cursors to the start or end of their region
+function! s:CursorManager.reposition_all_within_region(start) dict
+  for c in self.cursors
+    call c.update_position(c.saved_visual[a:start ? 0 : 1])
+  endfor
+endfunction
+
 " Reselect the current cursor's region in visual mode
 function! s:CursorManager.reapply_visual_selection() dict
   call s:select_in_visual_mode(self.get_current().visual)
@@ -670,6 +680,9 @@ endfunction
 
 " This is the last user input that we're going to replicate, in its string form
 let s:char = ''
+" This is either `I` or `A`, as input in Visual mode, that we're going to use
+" to make the appropriate transition into Insert mode
+let s:saved_char = ''
 " This is the mode the user is in before s:char
 let s:from_mode = ''
 " This is the mode the user is in after s:char
@@ -898,12 +911,34 @@ endfunction
 " to be called to continue the fanout process
 function! s:detect_bad_input()
   if !s:valid_input
+    " To invoke the appropriate `<Plug>(multiple-cursors-apply)` mapping, we
+    " need to revert back to the mode the user was in when the input was entered
+    call s:revert_mode(s:to_mode, s:from_mode)
     " We ignore the bad input and force invoke s:apply_user_input_next
     call feedkeys("\<Plug>(multiple-cursors-apply)")
     let s:bad_input += 1
   endif
 endfunction
 
+" Complete transition into Insert mode when `I` or `A` is input in Visual mode
+function! s:handle_visual_IA_to_insert()
+  if !empty(s:saved_char) && s:char =~# 'v\|V' && s:to_mode ==# 'n'
+    if s:saved_char ==# 'I'
+      call s:cm.reposition_all_within_region(1)
+    endif
+    call feedkeys(tolower(s:saved_char))
+    let s:saved_char = ''
+  endif
+endfunction
+
+" Begin transition into Insert mode when `I` or `A` is input in Visual mode
+function! s:handle_visual_IA_to_normal()
+  if s:char =~# 'I\|A' && s:from_mode =~# 'v\|V'
+    let s:saved_char = s:char
+    let s:char = s:from_mode " spoof a 'v' or 'V' input to transiton from Visual into Normal mode
+  endif
+endfunction
+
 " Apply the user input at the next cursor location
 function! s:apply_user_input_next(mode)
   let s:valid_input = 1
@@ -931,6 +966,7 @@ function! s:apply_user_input_next(mode)
       call s:update_visual_markers(s:cm.get_current().visual)
     endif
     call feedkeys("\<Plug>(multiple-cursors-wait)")
+    call s:handle_visual_IA_to_insert()
   else
     " Continue to next
     call feedkeys("\<Plug>(multiple-cursors-input)")
@@ -1050,8 +1086,8 @@ endfunction
 let s:retry_keys = ""
 function! s:display_error()
   if s:bad_input == s:cm.size()
-        \ && s:from_mode ==# 'n'
-        \ && has_key(g:multi_cursor_normal_maps, s:char[0])
+        \ && ((s:from_mode ==# 'n'    && has_key(g:multi_cursor_normal_maps, s:char[0]))
+        \ ||  (s:from_mode =~# 'v\|V' && has_key(g:multi_cursor_visual_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
@@ -1124,6 +1160,7 @@ function! s:wait_for_user_input(mode)
   let s:char = s:retry_keys . s:saved_keys
   if len(s:saved_keys) == 0
     let s:char .= s:get_char()
+    call s:handle_visual_IA_to_normal()
   else
     let s:saved_keys = ""
   endif
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 877f3f0b..422d5cf7 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -133,7 +133,7 @@ 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>"`
+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.
@@ -177,6 +177,16 @@ normal mode will "fail to replay" when multiple cursors are active. For example,
 changing it from `{}` to `{'d':1}` makes normal-mode mappings beginning with `d`
 (such as `dw` to delete a word) work in multi-cursor mode.
 
+*g:multi_cursor_visual_maps* (Default: )
+
+Default value: `{'i':1, 'a':1, 'f':1, 'F':1, 't':1, 'T':1}`
+
+Any key in this map (values are ignored) will cause multi-cursor _Visual_ mode
+to pause for map completion just like normal vim. Otherwise keys mapped in
+visual mode will "fail to replay" when multiple cursors are active. For example,
+changing it from `{}` to `{'i':1}` makes visual-mode mappings beginning with `i`
+(such as `it` to select an "inner tag block") work in multi-cursor mode.
+
 The default list contents should work for anybody, unless they have remapped a
 key from an operator-pending command to a non-operator-pending command or
 vice versa.
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 538ae57b..6595bc35 100644
--- a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
@@ -1,7 +1,7 @@
 "===============================================================================
 " File: multiple_cursors.vim
 " Author: Terry Ma
-" Description: Emulate Sublime Text's multi selection feature 
+" Description: Emulate Sublime Text's multi selection feature
 " Potential Features:
 " - Create a blinking cursor effect? Good place to do it would be instead of
 "   waiting for user input, cycle through the highlight
@@ -42,11 +42,14 @@ let s:settings_if_default = {
 
 let s:default_insert_maps = {}
 let s:default_normal_maps = {'!':1, '@':1, '=':1, 'q':1, 'r':1, 't':1, 'T':1, 'y':1, '[':1, ']':1, '\':1, 'd':1, 'f':1, 'F':1, 'g':1, '"':1, 'z':1, 'c':1, 'm':1, '<':1, '>':1}
+let s:default_visual_maps = {'i':1, 'a':1, 'f':1, 'F':1, 't':1, 'T':1}
 
 let g:multi_cursor_insert_maps =
       \ get(g:, 'multi_cursor_insert_maps', s:default_insert_maps)
 let g:multi_cursor_normal_maps =
       \ get(g:, 'multi_cursor_normal_maps', s:default_normal_maps)
+let g:multi_cursor_visual_maps =
+      \ get(g:, 'multi_cursor_visual_maps', s:default_visual_maps)
 
 call s:init_settings(s:settings)
 
@@ -54,8 +57,12 @@ if g:multi_cursor_use_default_mapping
   call s:init_settings(s:settings_if_default)
 endif
 
-if !exists('g:multi_cursor_start_word_key') && exists('g:multi_cursor_next_key')
-  let g:multi_cursor_start_word_key = g:multi_cursor_next_key
+if !exists('g:multi_cursor_start_word_key')
+  if exists('g:multi_cursor_start_key')
+    let g:multi_cursor_start_word_key = g:multi_cursor_start_key
+  elseif exists('g:multi_cursor_next_key')
+    let g:multi_cursor_start_word_key = g:multi_cursor_next_key
+  endif
 endif
 
 " External mappings
diff --git a/sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb b/sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb
index 99ba6c4d..73c81c5b 100644
--- a/sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb
+++ b/sources_non_forked/vim-multiple-cursors/spec/benchmark_spec.rb
@@ -58,6 +58,7 @@ end
 
 describe "Multiple Cursors" do
   let(:filename) { 'test.txt' }
+  let(:options) { [] }
 
   specify "#benchmark" do
     before <<-EOF
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 03f34f66..07efba50 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
@@ -17,7 +17,7 @@ def before(string)
 end
 
 def after(string)
-  get_file_content().should eq normalize_string_indent(string)
+  expect(get_file_content()).to eq normalize_string_indent(string)
 end
 
 def type(string)
@@ -163,6 +163,32 @@ describe "Multiple Cursors when normal_maps is empty" do
 
 end
 
+describe "Multiple Cursors when visual_maps is empty" do
+  let(:filename) { 'test.txt' }
+  let(:options) { ['let g:multi_cursor_visual_maps = {}'] }
+
+  # Operator-pending commands are handled correctly thanks to their inclusion
+  # in `g:multi_cursor_visual_maps`.
+  #
+  # When an operator-pending command like 'f' is missing from that setting's
+  # value, then it should result in a no-op, but we should still remain in
+  # multicursor mode.
+  specify "#visual mode 'i'" do
+    before <<-EOF
+      hello world x
+      hello world x
+    EOF
+
+    type 'fw<C-n><C-n>fx<Esc>'
+
+    after <<-EOF
+      hello  x
+      hello  x
+    EOF
+  end
+
+end
+
 describe "Multiple Cursors" do
   let(:filename) { 'test.txt' }
   let(:options) { [] }
@@ -417,6 +443,216 @@ describe "Multiple Cursors" do
     EOF
   end
 
+  specify "#visual mode 'i'" do
+    before <<-EOF
+      hi (hello world jan) bye
+      hi (hello world feb) bye
+      hi (hello world mar) bye
+    EOF
+
+    type 'fw<C-n><C-n><C-n>ibcone<Esc>'
+
+    after <<-EOF
+      hi (one) bye
+      hi (one) bye
+      hi (one) bye
+    EOF
+  end
+
+  specify "#visual mode 'a'" do
+    before <<-EOF
+      hi (hello world jan) bye
+      hi (hello world feb) bye
+      hi (hello world mar) bye
+    EOF
+
+    type 'fw<C-n><C-n><C-n>abcone<Esc>'
+
+    after <<-EOF
+      hi one bye
+      hi one bye
+      hi one bye
+    EOF
+  end
+
+  specify "#visual mode 'f'" do
+    before <<-EOF
+      hi (hello world jan) bye
+      hi (hello world feb) bye
+      hi (hello world mar) bye
+    EOF
+
+    type 'fw<C-n><C-n><C-n>f)cone<Esc>'
+
+    after <<-EOF
+      hi (hello one bye
+      hi (hello one bye
+      hi (hello one bye
+    EOF
+  end
+
+  specify "#visual mode 'F'" do
+    before <<-EOF
+      hi (hello world jan) bye
+      hi (hello world feb) bye
+      hi (hello world mar) bye
+    EOF
+
+    type 'fw<C-n><C-n><C-n>F(cbefore<Esc>'
+
+    after <<-EOF
+      hi beforeorld jan) bye
+      hi beforeorld feb) bye
+      hi beforeorld mar) bye
+    EOF
+  end
+
+  specify "#visual mode 't'" do
+    before <<-EOF
+      hello.jan
+      hello hi.feb
+      hello hi bye.mar
+    EOF
+
+    type '<C-n><C-n><C-n>t.cone<Esc>'
+
+    after <<-EOF
+      one.jan
+      one.feb
+      one.mar
+    EOF
+  end
+
+  specify "#visual mode 'T'" do
+    before <<-EOF
+      jan.world
+      feb.hi world
+      mar.bye hi world
+    EOF
+
+    type 'fw<C-n><C-n><C-n>T.cbefore<Esc>'
+
+    after <<-EOF
+      jan.beforeorld
+      feb.beforeorld
+      mar.beforeorld
+    EOF
+  end
+
+  specify "#visual line mode 'f'" do
+    before <<-EOF
+      hello jan world
+      hello feb world
+      hello mar world
+    EOF
+
+    type '<C-n><C-n><C-n>VfwvAafter<Esc>'
+
+    after <<-EOF
+      hello jan wafterorld
+      hello feb wafterorld
+      hello mar wafterorld
+    EOF
+  end
+
+  specify "#visual mode 'I'" do
+    before <<-EOF
+      hello world jan
+      hello world feb
+      hello world mar
+    EOF
+
+    type 'w<C-n><C-n><C-n>Ibefore<Esc>'
+
+    after <<-EOF
+      hello beforeworld jan
+      hello beforeworld feb
+      hello beforeworld mar
+    EOF
+  end
+
+  specify "#visual mode 'A'" do
+    before <<-EOF
+      hello world jan
+      hello world feb
+      hello world mar
+    EOF
+
+    type 'w<C-n><C-n><C-n>Aafter<Esc>'
+
+    after <<-EOF
+      hello worldafter jan
+      hello worldafter feb
+      hello worldafter mar
+    EOF
+  end
+
+  specify "#resize regions visual mode 'I'" do
+    before <<-EOF
+      hello world jan
+      hello world feb
+      hello world mar
+    EOF
+
+    type 'w<C-n><C-n><C-n>hhhIbefore<Esc>'
+
+    after <<-EOF
+      hello beforeworld jan
+      hello beforeworld feb
+      hello beforeworld mar
+    EOF
+  end
+
+  specify "#resize regions visual mode 'A'" do
+    before <<-EOF
+      hello world jan
+      hello world feb
+      hello world mar
+    EOF
+
+    type 'w<C-n><C-n><C-n>hhhAbefore<Esc>'
+
+    after <<-EOF
+      hello wobeforerld jan
+      hello wobeforerld feb
+      hello wobeforerld mar
+    EOF
+  end
+
+  specify "#no word boundries visual mode 'I'" do
+    before <<-EOF
+      hello hibye world
+      hello hibye world
+      hello hibye world
+    EOF
+
+    vim.normal ':MultipleCursorsFind bye<CR>'
+    type 'Ibefore<Esc>'
+
+    after <<-EOF
+      hello hibeforebye world
+      hello hibeforebye world
+      hello hibeforebye world
+    EOF
+  end
+
+  specify "#variable-length regions visual mode 'I'" do
+    before <<-EOF
+      hello hii world
+      hello hiiii world
+      hello hiiiiii world
+    EOF
+
+    vim.normal ':MultipleCursorsFind \<hi*\><CR>'
+    type 'Ibefore<Esc>'
+
+    after <<-EOF
+      hello beforehii world
+      hello beforehiiii world
+      hello beforehiiiiii world
+    EOF
+  end
+
   specify "#normal mode 'I'" do
     before <<-EOF
       hello
diff --git a/sources_non_forked/vim-snipmate/Contributors.md b/sources_non_forked/vim-snipmate/Contributors.md
index e06d6939..d59d7a7c 100644
--- a/sources_non_forked/vim-snipmate/Contributors.md
+++ b/sources_non_forked/vim-snipmate/Contributors.md
@@ -15,6 +15,7 @@ additional contributions from:
 * [bpugh](https://github.com/bpugh)
 * [bruno-](https://github.com/bruno-)
 * [darkwise](https://github.com/darkwise)
+* [dreviejo](https://github.com/dreviejo)
 * [fish-face](https://github.com/fish-face)
 * [henrik](https://github.com/henrik)
 * [holizz](https://github.com/holizz)
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 1209a174..cb8f3564 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -223,6 +223,9 @@ fun! snipMate#ReadSnippetsFile(file) abort
 		if line[:6] == 'snippet'
 			let inSnip = 1
 			let bang = (line[7] == '!')
+			if bang
+				let bang += line[8] == '!'
+			endif
 			let trigger = strpart(line, 8 + bang)
 			let name = ''
 			let space = stridx(trigger, ' ') + 1
@@ -336,7 +339,10 @@ endfunction
 
 function! snipMate#SetByPath(dict, trigger, path, snippet, bang, snipversion) abort
 	let d = a:dict
-	if !has_key(d, a:trigger) || a:bang
+	if a:bang == 2
+		unlet! d[a:trigger]
+		return
+	elseif !has_key(d, a:trigger) || a:bang == 1
 		let d[a:trigger] = {}
 	endif
 	let d[a:trigger][a:path] = [a:snippet, a:snipversion]
@@ -434,14 +440,13 @@ endf
 
 " used by both: completion and insert snippet
 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
-	" first \W stays connected to whatever's before it, so split it off
-	if !empty(parts) && parts[0] =~ '\W$'
-		let parts = [ parts[0][:-2], strpart(parts[0], len(parts[0]) - 1) ]
-					\ + parts[1:]
-	endif
+	" Split non-word characters into their own piece
+	" so 'foo.bar..baz' becomes ['foo', '.', 'bar', '.', '.', 'baz']
+	" First split just after a \W and then split each resultant string just
+	" before a \W
+	let parts = filter(tlib#list#Flatten(
+				\ map(split(a:word, '\W\zs'), 'split(v:val, "\\ze\\W")')),
+				\ '!empty(v:val)')
 	" Only look at the last few possibilities. Too many can be slow.
 	if len(parts) > 5
 		let parts = parts[-5:]
diff --git a/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
index c4d0a0b6..deee2eca 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipmate/legacy.vim
@@ -87,7 +87,7 @@ function! snipmate#legacy#build_stops(snip, lnum, col, indent) abort
 
 		let stops[i] = {}
 		let stops[i].line = a:lnum + s:count(beforeTabStop, "\n")
-		let stops[i].col = a:indent + len(matchstr(withoutOthers, '\_^.*\ze'.s:sigil .'{'.i.'\D'))
+		let stops[i].col = a:indent + len(matchstr(withoutOthers, '[^\n]\{-}\ze'.s:sigil .'{'.i.'\D'))
 		let stops[i].placeholder = 0
 		let stops[i].mirrors = []
 		if stops[i].line == a:lnum
diff --git a/sources_non_forked/vim-snipmate/doc/snipMate.txt b/sources_non_forked/vim-snipmate/doc/snipMate.txt
index a8d321ed..f490f315 100644
--- a/sources_non_forked/vim-snipmate/doc/snipMate.txt
+++ b/sources_non_forked/vim-snipmate/doc/snipMate.txt
@@ -158,7 +158,8 @@ g:snipMate.override
                                 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.
+                                maps and other settings work. Note: Load order
+                                is determined by 'runtimepath'.
 
 g:snipMate['no_match_completion_feedkeys_chars']
                                 A string inserted when no match for a trigger
@@ -252,6 +253,9 @@ overridden on a per-snippet basis by defining the snippet with a bang (!): >
         expanded text
         more expanded text
 
+Two bangs will remove the trigger entirely from SnipMate's lookup. In this
+case any snippet text is unused.
+
 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.
@@ -301,18 +305,19 @@ 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.
 
-However, SnipMate will always stop at the zero tab stop $0. Once it jumps to
+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.
+
+                                                       *SnipMate-zero-tabstop*
+SnipMate will always stop at the special 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: >
+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" class="$2">
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index f4160650..9d6b08f9 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -60,6 +60,24 @@ improved by Adnan Zafar. So maybe time is not ready to make a final decision yet
 
 [github issue/discussion](https://github.com/honza/vim-snippets/issues/363)
 
+Vendor Snippets
+---------------
+
+Additional library and framework snippets are available for UltiSnips users in
+the `UltiSnips/` directory. These files are removed from the default language
+namespaces to prevent them from all being loaded automatically. If there is a
+separate library, framework, or package you would like to support open a pull
+request!
+
+Additional snippets can be added to the current buffer with the
+`:UltiSnipsAddFiletypes` command followed by the snippet name without the
+"snippets" ending. For example, to add the JavaScript Jasmine snippets, run:
+`:UltiSnipsAddFiletypes javascript-jasmine`. To have this snippet loaded
+everytime a JavaScript file is opened or created you can add the command to your
+`.vim/ftplugin/javascript.vim` file.
+
+For more see the UltiSnips docs (`:help UltiSnips`).
+
 Installation
 ------------
 
@@ -151,6 +169,7 @@ so that all users can benefit from them.  People can list their snippet reposito
 * https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
 * https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
 * https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
+* https://github.com/sniphpets (advanced snippets for PHP, Symfony 2/3, Doctrine and etc.)
 
 Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
 
@@ -216,6 +235,7 @@ This list is kept up-to-date on a best effort basis.
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
+* Supercollider - [lpil](https://github.com/lpil)
 
 License
 -------
diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index fb6138a1..0e286e5a 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -10,69 +10,7 @@ priority -60
 # NICE BOXES #
 ##############
 global !p
-import string, vim
-
-""" Maps a filetype to comment format used for boxes.
-Automatically filled during usage"""
-_commentDict = { }
-
-def _parse_comments(s):
-	""" Parses vim's comments option to extract comment format """
-	i = iter(s.split(","))
-
-	rv = []
-	try:
-		while True:
-			# get the flags and text of a comment part
-			flags, text = next(i).split(':', 1)
-
-			if len(flags) == 0:
-				rv.append((text, text, text, ""))
-			# parse 3-part comment, but ignore those with O flag
-			elif 's' in flags and 'O' not in flags:
-				ctriple = []
-				indent = ""
-
-				if flags[-1] in string.digits:
-					indent = " " * int(flags[-1])
-				ctriple.append(text)
-
-				flags,text = next(i).split(':', 1)
-				assert(flags[0] == 'm')
-				ctriple.append(text)
-
-				flags,text = next(i).split(':', 1)
-				assert(flags[0] == 'e')
-				ctriple.append(text)
-				ctriple.append(indent)
-
-				rv.append(ctriple)
-			elif 'b' in flags:
-				if len(text) == 1:
-					rv.insert(0, (text,text,text, ""))
-	except StopIteration:
-		return rv
-
-def _get_comment_format():
-	""" 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):
-	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(",")
-
+from vimsnippets import foldmarker, make_box, get_comment_format
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -102,17 +40,17 @@ $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]`
+`!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]`
+`!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]`
+`!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]`
+`!p snip.rv = get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = get_comment_format()[2]`
 endsnippet
 
 ##########################
diff --git a/sources_non_forked/vim-snippets/UltiSnips/c.snippets b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
index 5c4299c6..56f34e5e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/c.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/c.snippets
@@ -11,7 +11,7 @@ endsnippet
 snippet ifndef "#ifndef ... #define ... #endif"
 #ifndef ${1/([A-Za-z0-9_]+).*/$1/}
 #define ${1:SYMBOL} ${2:value}
-#endif
+#endif /* ifndef $1 */
 endsnippet
 
 snippet #if "#if #endif" b
@@ -20,14 +20,6 @@ ${VISUAL}${0}
 #endif
 endsnippet
 
-snippet inc "#include local header (inc)"
-#include "${1:`!p snip.rv = snip.basename + '.h'`}"
-endsnippet
-
-snippet Inc "#include <> (Inc)"
-#include <${1:.h}>
-endsnippet
-
 snippet mark "#pragma mark (mark)"
 #if 0
 ${1:#pragma mark -
@@ -57,10 +49,6 @@ for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
 }
 endsnippet
 
-snippet enum "Enumeration"
-enum ${1:name} { $0 };
-endsnippet
-
 snippet once "Include header once only guard"
 #ifndef ${1:`!p
 if not snip.c:
@@ -77,22 +65,6 @@ ${VISUAL}${0}
 #endif /* end of include guard: $1 */
 endsnippet
 
-snippet td "Typedef"
-typedef ${1:int} ${2:MyCustomType};
-endsnippet
-
-snippet wh "while loop"
-while(${1:/* condition */}) {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet do "do...while loop (do)"
-do {
-	${VISUAL}${0}
-} while(${1:/* condition */});
-endsnippet
-
 snippet fprintf "fprintf ..."
 fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee-jasmine.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/coffee_jasmine.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/coffee-jasmine.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee-react.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee-react.snippets
new file mode 100644
index 00000000..4cdb40f8
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/coffee-react.snippets
@@ -0,0 +1,80 @@
+#
+# CoffeeScript versions -- adapted from coffee-jasmine
+# for some ReactJS matchers.
+#
+priority -50
+
+extends coffee
+
+priority -49
+
+snippet createClass "React define Class" b
+${1:classname}Class = React.createClass
+	displayName: "$1"
+	render: ->
+		${2}
+$1 = React.createFactory($1)
+endsnippet
+
+snippet PropTypes "React define propTypes" b
+propTypes: ->
+	${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+endsnippet
+
+snippet propType "React propType (key/value)" b
+${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+${4}
+endsnippet
+
+snippet setState "React setState" b
+@setState
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet getInitialState "React define getInitialState" b
+getInitialState: ->
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet getDefaultProps "React define getDefaultProps" b
+getDefaultProps: ->
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet componentWillMount "React define componentWillMount" b
+componentWillMount: ->
+	${1}
+endsnippet
+
+snippet componentDidMount "React define componentDidMount" b
+componentDidMount: ->
+	${1}
+endsnippet
+
+snippet componentWillReceiveProps "React define componentWillReceiveProps" b
+componentWillReceiveProps: (nextProps) ->
+	${1}
+endsnippet
+
+snippet shouldComponentUpdate "React define shouldComponentUpdate" b
+shouldComponentUpdate: (nextProps, nextState) ->
+	${1}
+endsnippet
+
+snippet componentWillUpdate "React define componentWillUpdate" b
+componentWillUpdate: (nextProps, nextState) ->
+	${1}
+endsnippet
+
+snippet componentDidUpdate "React define componentDidUpdate" b
+componentDidUpdate: (prevProps, prevState) ->
+	${1}
+endsnippet
+
+snippet componentWillUnmount "React define componentWillUnmount" b
+componentWillUnmount: ->
+	${1}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
index 467b2b57..75e7d062 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/coffee.snippets
@@ -94,3 +94,7 @@ endsnippet
 snippet log "Log" b
 console.log ${1:"${2:msg}"}
 endsnippet
+
+snippet kv "Key:value for object" b
+${1:key}:${2:value}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/django.snippets b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
index 9d6ce279..eabd80f7 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/django.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/django.snippets
@@ -1,238 +1,361 @@
 priority -50
 
-# Generic Tags
-snippet %
-{% ${1} %}${2}
+# This files will define django snippets from sublime text djaneiro
+# FORMS SNIPPETS
+
+snippet form "Form" b
+class ${1:FORMNAME}(forms.Form):
+
+	${2:# TODO: Define form fields here}
 endsnippet
 
-snippet %%
-{% ${1:tag_name} %}
-	${2}
-{% end$1 %}
+snippet modelform "ModelForm" b
+class ${1:MODELNAME}Form(forms.ModelForm):
+
+	class Meta:
+		model = $1
 endsnippet
 
-snippet {
-{{ ${1} }}${2}
+snippet fbool "BooleanField" b
+${1:FIELDNAME} = forms.BooleanField($2)
 endsnippet
 
-# Template Tags
-
-snippet autoescape
-{% autoescape ${1:off} %}
-	${2}
-{% endautoescape %}
+snippet fchar "CharField" b
+${1:FIELDNAME} = forms.CharField($2)
 endsnippet
 
-snippet block
-{% block ${1} %}
-	${2}
-{% endblock $1 %}
+snippet fchoice "ChoiceField" b
+${1:FIELDNAME} = forms.ChoiceField($2)
 endsnippet
 
-snippet #
-{# ${1:comment} #}
+snippet fcombo "ComboField" b
+${1:FIELDNAME} = forms.ComboField($2)
 endsnippet
 
-snippet comment
-{% comment %}
-	${1}
-{% endcomment %}
+snippet fdate "DateField" b
+${1:FIELDNAME} = forms.DateField($2)
 endsnippet
 
-snippet cycle
-{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet fdatetime "DateTimeField" b
+${1:FIELDNAME} = forms.DateTimeField($2)
 endsnippet
 
-snippet debug
-{% debug %}
+snippet fdecimal "DecimalField" b
+${1:FIELDNAME} = forms.DecimalField($2)
 endsnippet
 
-snippet extends
-{% extends "${1:base.html}" %}
+snippet fmail "EmailField" b
+${1:FIELDNAME} = forms.EmailField($2)
 endsnippet
 
-snippet filter
-{% filter ${1} %}
-	${2}
-{% endfilter %}
+snippet ffile "FileField" b
+${1:FIELDNAME} = forms.FileField($2)
 endsnippet
 
-snippet firstof
-{% firstof ${1} %}
+snippet ffilepath "FilePathField" b
+${1:FIELDNAME} = forms.FilePathField($2)
 endsnippet
 
-snippet for
-{% for ${1} in ${2} %}
-	${3}
-{% endfor %}
+snippet ffloat "FloatField" b
+${1:FIELDNAME} = forms.FloatField($2)
 endsnippet
 
-snippet empty
-{% empty %}
-	${1}
+snippet fip "IPAddressField" b
+${1:FIELDNAME} = forms.IPAddressField($2)
 endsnippet
 
-snippet if
-{% if ${1} %}
-	${2}
-{% endif %}
+snippet fimg "ImageField" b
+${1:FIELDNAME} = forms.ImageField($2)
 endsnippet
 
-snippet else
-{% else %}
-	${1}
+snippet fint "IntegerField" b
+${1:FIELDNAME} = forms.IntegerField($2)
 endsnippet
 
-snippet ifchanged
-{% ifchanged %}${1}{% endifchanged %}
+snippet fmochoice "ModelChoiceField" b
+${1:FIELDNAME} = forms.ModelChoiceField($2)
 endsnippet
 
-snippet ifequal
-{% ifequal ${1} ${2} %}
-	${3}
-{% endifequal %}
+snippet fmomuchoice "ModelMultipleChoiceField" b
+${1:FIELDNAME} = forms.ModelMultipleChoiceField($2)
 endsnippet
 
-snippet ifnotequal
-{% ifnotequal ${1} ${2} %}
-	${3}
-{% endifnotequal %}
+snippet fmuval "MultiValueField" b
+${1:FIELDNAME} = forms.MultiValueField($2)
 endsnippet
 
-snippet include
-{% include "${1}" %}
+snippet fmuchoice "MultipleChoiceField" b
+${1:FIELDNAME} = forms.MultipleChoiceField($2)
 endsnippet
 
-snippet load
-{% load ${1} %}
+snippet fnullbool "NullBooleanField" b
+${1:FIELDNAME} = forms.NullBooleanField($2)
 endsnippet
 
-snippet now
-{% now "${1:jS F Y H:i}" %}
+snippet freg "RegexField" b
+${1:FIELDNAME} = forms.RegexField($2)
 endsnippet
 
-snippet regroup
-{% regroup ${1} by ${2} as ${3} %}
+snippet fslug "SlugField" b
+${1:FIELDNAME} = forms.SlugField($2)
 endsnippet
 
-snippet spaceless
-{% spaceless %}${1}{% endspaceless %}
+snippet fsdatetime "SplitDateTimeField" b
+${1:FIELDNAME} = forms.SplitDateTimeField($2)
 endsnippet
 
-snippet ssi
-{% ssi ${1} %}
+snippet ftime "TimeField" b
+${1:FIELDNAME} = forms.TimeField($2)
 endsnippet
 
-snippet trans
-{% trans "${1:string}" %}
+snippet ftchoice "TypedChoiceField" b
+${1:FIELDNAME} = forms.TypedChoiceField($2)
 endsnippet
 
-snippet url
-{% url ${1} as ${2} %}
+snippet ftmuchoice "TypedMultipleChoiceField" b
+${1:FIELDNAME} = forms.TypedMultipleChoiceField($2)
 endsnippet
 
-snippet widthratio
-{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+snippet furl "URLField" b
+${1:FIELDNAME} = forms.URLField($2)
 endsnippet
 
-snippet with
-{% with ${1} as ${2} %}
+# MODELS SNIPPETS
+
+snippet model "Model" b
+class ${1:MODELNAME}(models.Model):
+	${0}
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
+
+	def __str__(self):
+		return super($1, self).__str__()
+
 endsnippet
 
-# Template Filters
+snippet modelfull "Model" b
+class ${1:MODELNAME}(models.Model):
+	${2:# TODO: Define fields here}
 
-# Note: Since SnipMate can't determine which template filter you are
-# expanding without the "|" character, these do not add the "|"
-# character.  These save a few keystrokes still.
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
 
-# Note: Template tags that take no arguments are not implemented.
+	def __str__(self):
+		return super($1, self).__str__()
+
+	def save(self):
+		return super($1, self).save()
+
+	@models.permalink
+	def get_absolute_url(self):
+		return ('')
+
+	${3:# TODO: Define custom methods here}
 
-snippet add
-add:"${1}"
 endsnippet
 
-snippet center
-center:"${1}"
+snippet mauto "AutoField" b
+${1:FIELDNAME} = models.AutoField($2)
 endsnippet
 
-snippet cut
-cut:"${1}"
+snippet mbigint "BigIntegerField" b
+${1:FIELDNAME} = models.BigIntegerField($2)
 endsnippet
 
-snippet date
-date:"${1}"
+snippet mbool "BooleanField" b
+${1:FIELDNAME} = models.BooleanField($2)
 endsnippet
 
-snippet default
-default:"${1}"
+snippet mchar "CharField" b
+${1:FIELDNAME} = models.CharField($2, max_length=${3:50})
 endsnippet
 
-snippet defaultifnone
-default_if_none:"${1}"
+snippet mcoseint "CommaSeparatedIntegerField" b
+${1:FIELDNAME} = models.CommaSeparatedIntegerField($2)
 endsnippet
 
-snippet dictsort
-dictsort:"${1}"
+snippet mdate "DateField" b
+${1:FIELDNAME} = models.DateField($2)
 endsnippet
 
-snippet dictsortrev
-dictsortreversed:"${1}"
+snippet mdatetime "DateTimeField" b
+${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet divisibleby
-divisibleby:"${1}"
+snippet mdecimal "DecimalField" b
+${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet floatformat
-floatformat:"${1}"
+snippet memail "EmailField" b
+${1:FIELDNAME} = models.EmailField($2)
 endsnippet
 
-snippet getdigit
-get_digit:"${1}"
+snippet mfile "FileField" b
+${1:FIELDNAME} = models.FileField($2)
 endsnippet
 
-snippet join
-join:"${1}"
+snippet mfilepath "FilePathField" b
+${1:FIELDNAME} = models.FilePathField($2)
 endsnippet
 
-snippet lengthis
-length_is:"${1}"
+snippet mfloat "FloatField" b
+${1:FIELDNAME} = models.FloatField($2)
 endsnippet
 
-snippet pluralize
-pluralize:"${1}"
+snippet fk "ForeignKey" b
+${1:FIELDNAME} = models.ForeignKey($2)
 endsnippet
 
-snippet removetags
-removetags:"${1}"
+snippet mip "IPAddressField" b
+${1:FIELDNAME} = models.IPAddressField($2)
 endsnippet
 
-snippet slice
-slice:"${1}"
+snippet mimg "ImageField" b
+${1:FIELDNAME} = models.ImageField($2)
 endsnippet
 
-snippet stringformat
-stringformat:"${1}"
+snippet mint "IntegerField" b
+${1:FIELDNAME} = models.IntegerField($2)
 endsnippet
 
-snippet time
-time:"${1}"
+snippet m2m "ManyToManyField" b
+${1:FIELDNAME} = models.ManyToManyField($2)
 endsnippet
 
-snippet truncatewords
-truncatewords:${1}
+snippet mnullbool "NullBooleanField" b
+${1:FIELDNAME} = models.NullBooleanField($2)
 endsnippet
 
-snippet truncatewordshtml
-truncatewords_html:${1}
+snippet o2o "OneToOneField" b
+${1:FIELDNAME} = models.OneToOneField($2)
 endsnippet
 
-snippet urlizetrunc
-urlizetrunc:${1}
+snippet mphone "PhoneNumberField" b
+${1:FIELDNAME} = models.PhoneNumberField($2)
 endsnippet
 
-snippet wordwrap
-wordwrap:${1}
+snippet mposint "PositiveIntegerField" b
+${1:FIELDNAME} = models.PositiveIntegerField($2)
 endsnippet
 
-# vim:ft=snippets:
+snippet mpossmallint "PositiveSmallIntegerField" b
+${1:FIELDNAME} = models.PositiveSmallIntegerField($2)
+endsnippet
+
+snippet mslug "SlugField" b
+${1:FIELDNAME} = models.SlugField($2)
+endsnippet
+
+snippet msmallint "SmallIntegerField" b
+${1:FIELDNAME} = models.SmallIntegerField($2)
+endsnippet
+
+snippet mtext "TextField" b
+${1:FIELDNAME} = models.TextField($2)
+endsnippet
+
+snippet mtime "TimeField" b
+${1:FIELDNAME} = models.TimeField($2)
+endsnippet
+
+snippet murl "URLField" b
+${1:FIELDNAME} = models.URLField($2)
+endsnippet
+
+snippet musstate "USStateField" b
+${1:FIELDNAME} = models.USStateField($2)
+endsnippet
+
+snippet mxml "XMLField" b
+${1:FIELDNAME} = models.XMLField($2)
+endsnippet
+
+# VIEWS SNIPPETS
+
+snippet adminview "Model Admin View" b
+class ${1}Admin(admin.ModelAdmin):
+	'''
+		Admin View for ${1}
+	'''
+	list_display = ('${2}',)
+	list_filter = ('${3}',)
+	inlines = [
+		${4}Inline,
+	]
+	raw_id_fields = ('${5}',)
+	readonly_fields = ('${6}',)
+	search_fields = ['${7}']
+admin.site.register(${1}, ${1}Admin)
+endsnippet
+
+snippet createview "Generic Create View" b
+class ${1:MODEL_NAME}CreateView(CreateView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet deleteview "Generic Delete View" b
+class ${1:MODEL_NAME}DeleteView(DeleteView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet detailview "Generic Detail View" b
+class ${1:MODEL_NAME}DetailView(DetailView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet listview "Generic List View" b
+class ${1:MODEL_NAME}ListView(ListView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet stackedinline "Stacked Inline" b
+class ${1}Inline(admin.StackedInline):
+	'''
+	Stacked Inline View for ${1}
+	'''
+	model = ${2:${1}}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = (${6},)
+endsnippet
+
+snippet tabularinline "Tabular Inline" b
+class ${1}Inline(admin.TabularInline):
+	'''
+	Tabular Inline View for ${1}
+	'''
+	model = ${2:${1}}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = (${6},)
+endsnippet
+
+snippet templateview "Generic Template View" b
+class ${1:CLASS_NAME}(TemplateView):
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet updateview "Generic Update View" b
+class ${1:MODEL_NAME}UpdateView(UpdateView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet dispatch "Dispatch View method" b
+def dispatch(self, request, *args, **kwargs):
+	return super(${1:CLASS_NAME}, self).dispatch(request, *args, **kwargs)
+endsnippet
+
+snippet context "get_context_data view method" b
+def get_context_data(self, **kwargs):
+	kwargs['extra_context'] = ${1:'New Value'}
+	return super(${2:CLASS_NAME}, self).get_context_data(**kwargs)
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index b626cc4a..fe38c2fc 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -27,11 +27,11 @@ def textmate_var(var, snip):
 endglobal
 
 
-snippet % "<% ${0} %>"
+snippet % "<% ${0} %>" i
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
 endsnippet
 
-snippet = "<%= ${0} %>"
+snippet = "<%= ${0} %>" i
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -43,59 +43,59 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`Fixtures.identify(:${1:name})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`$0
 endsnippet
 
-snippet ft "form_tag"
-`!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)`
+snippet ft "form_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${2:update}'}${3:, ${4:${5:class} => '${6:form}'\}}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ffs "form_for submit 2"
+snippet ffs "form_for submit 2" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f_fields_for (nff)"
+snippet f. "f_fields_for (nff)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`f.fields_for :${1:attribute} do |${2:f}|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet f. "f.checkbox"
+snippet f. "f.checkbox" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.file_field"
+snippet f. "f.file_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.hidden_field"
+snippet f. "f.hidden_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.label"
+snippet f. "f.label" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.password_field"
+snippet f. "f.password_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.radio_button"
+snippet f. "f.radio_button" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_button :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.submit"
+snippet f. "f.submit" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.text_area"
+snippet f. "f.text_area" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.text_field"
+snippet f. "f.text_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet ffe "form_for with errors"
+snippet ffe "form_for with errors" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`error_messages_for :${1:model}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
@@ -103,17 +103,17 @@ snippet ffe "form_for with errors"
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ff "form_for"
+snippet ff "form_for" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ist "image_submit_tag"
+snippet ist "image_submit_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, :id => "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name => "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class => "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled => ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet it "image_tag"
+snippet it "image_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, :title => "${5:title}"}${6:, :class => "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -121,47 +121,51 @@ snippet layout "layout"
 layout "${1:template_name}"${2:${3:, :only => ${4:[:${5:action}, :${6:action}]}}${7:, :except => ${8:[:${9:action}, :${10:action}]}}}
 endsnippet
 
-snippet jit "javascript_include_tag"
+snippet jit "javascript_include_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lia "link_to (action)"
+snippet lt "link_to (name, dest)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", ${2:dest}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lia "link_to (action)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet liai "link_to (action, id)"
+snippet liai "link_to (action, id)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lic "link_to (controller)"
+snippet lic "link_to (controller)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lica "link_to (controller, action)"
+snippet lica "link_to (controller, action)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet licai "link_to (controller, action, id)"
+snippet licai "link_to (controller, action, id)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet linpp "link_to (nested path plural)"
+snippet linpp "link_to (nested path plural)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:${10}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet linp "link_to (nested path)"
+snippet linp "link_to (nested path)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lipp "link_to (path plural)"
+snippet lipp "link_to (path plural)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${4:model}s_path}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lip "link_to (path)"
+snippet lip "link_to (path)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:${12}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lim "link_to model"
+snippet lim "link_to model" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:model}.${2:name}, ${3:${4:$1}_path(${14:$1})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -213,11 +217,11 @@ snippet rps "render (partial,status) (rps)"
 render :partial => "${1:item}", :status => ${2:500}
 endsnippet
 
-snippet slt "stylesheet_link_tag"
+snippet slt "stylesheet_link_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet st "submit_tag"
+snippet st "submit_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets b/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
deleted file mode 100644
index 419edb4b..00000000
--- a/sources_non_forked/vim-snippets/UltiSnips/haskell.snippets
+++ /dev/null
@@ -1,68 +0,0 @@
-priority -50
-
-snippet if "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}
-endsnippet
-
-snippet :: "Type signature"
-${1:name} :: ${2:Type} -> ${3:Type}
-endsnippet
-
-snippet => "Type constraint"
-(${1:Class} ${2:a}) => $2
-endsnippet
-
-snippet def "Function definition"
-${1:name} :: ${2:Type} -> ${3:Type}
-endsnippet
-
-snippet def[] "Function definition for list patterns"
-${1:name} :: [${2:Type}] -> ${3:Type}
-$1 [] = ${4:undefined}
-$1 ${5:(x:xs)} = ${6:undefined}
-endsnippet
-
-snippet = "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-endsnippet
-
-snippet 2= "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-$1 ${4:pattern} = ${5:undefined}
-endsnippet
-
-snippet 3= "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-$1 ${4:pattern} = ${5:undefined}
-$1 ${6:pattern} = ${7:undefined}
-endsnippet
-
-snippet | "Guard"
-| ${1:predicate} = ${2:undefined}
-endsnippet
-
-snippet \ "Lambda expression"
-\\${1:pattern} -> ${2:expression}
-endsnippet
-
-snippet [|] "List comprehension"
-[${3:foo }$1 | ${1:x} <- ${2:xs} ]
-endsnippet
-
-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/htmldjango.snippets b/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
index 5836a2f6..ad571504 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/htmldjango.snippets
@@ -1,3 +1,299 @@
 priority -50
 
-extends html, django
+extends html
+
+# Generic Tags
+snippet % "" bi
+{% ${1} %}${2}
+endsnippet
+
+snippet %% "" bi
+{% ${1:tag_name} %}
+	${2}
+{% end$1 %}
+endsnippet
+
+snippet { "" bi
+{{ ${1} }}${2}
+endsnippet
+
+# Template Tags
+
+snippet autoescape "" bi
+{% autoescape ${1:off} %}
+	${2}
+{% endautoescape %}
+endsnippet
+
+snippet block "" bi
+{% block ${1} %}
+	${2}
+{% endblock $1 %}
+endsnippet
+
+snippet # "" bi
+{# ${1:comment} #}
+endsnippet
+
+snippet comment "" bi
+{% comment %}
+	${1}
+{% endcomment %}
+endsnippet
+
+snippet cycle "" bi
+{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+endsnippet
+
+snippet debug "" bi
+{% debug %}
+endsnippet
+
+snippet extends "" bi
+{% extends "${1:base.html}" %}
+endsnippet
+
+snippet filter "" bi
+{% filter ${1} %}
+	${2}
+{% endfilter %}
+endsnippet
+
+snippet firstof "" bi
+{% firstof ${1} %}
+endsnippet
+
+snippet for "" bi
+{% for ${1} in ${2} %}
+	${3}
+{% endfor %}
+endsnippet
+
+snippet empty "" bi
+{% empty %}
+	${1}
+endsnippet
+
+snippet if "" bi
+{% if ${1} %}
+	${2}
+{% endif %}
+endsnippet
+
+snippet iif "" bi
+{% if ${1} %}${2}{% endif %}
+endsnippet
+
+snippet ielse "" bi
+{% else %}${1}
+endsnippet
+
+snippet else "" bi
+{% else %}
+	${1}
+endsnippet
+
+snippet ielif "" bi
+{% elif %}${1}
+endsnippet
+
+snippet elif "" bi
+{% elif %}
+	${1}
+endsnippet
+
+snippet ifchanged "" bi
+{% ifchanged %}${1}{% endifchanged %}
+endsnippet
+
+snippet ifequal "" bi
+{% ifequal ${1} ${2} %}
+	${3}
+{% endifequal %}
+endsnippet
+
+snippet ifnotequal "" bi
+{% ifnotequal ${1} ${2} %}
+	${3}
+{% endifnotequal %}
+endsnippet
+
+snippet include "" bi
+{% include "${1}" %}
+endsnippet
+
+snippet load "" bi
+{% load ${1} %}
+endsnippet
+
+snippet now "" bi
+{% now "${1:jS F Y H:i}" %}
+endsnippet
+
+snippet regroup "" bi
+{% regroup ${1} by ${2} as ${3} %}
+endsnippet
+
+snippet spaceless "" bi
+{% spaceless %}${1}{% endspaceless %}
+endsnippet
+
+snippet ssi "" bi
+{% ssi ${1} %}
+endsnippet
+
+snippet trans "" bi
+{% trans "${1:string}" %}
+endsnippet
+
+snippet url "" bi
+{% url ${1} as ${2} %}
+endsnippet
+
+snippet widthratio "" bi
+{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+endsnippet
+
+snippet with "" bi
+{% with ${1} as ${2} %}
+	${VISUAL}
+{% endwith %}
+endsnippet
+
+snippet verbatim "" bi
+{% verbatim %}
+	${VISUAL}
+{% endverbatim %}
+endsnippet
+
+snippet super "" bi
+{{ block.super }}
+endsnippet
+
+snippet staticu "" bi
+{{ STATIC_URL }}
+endsnippet
+
+snippet static "" bi
+{% static "${VISUAL}" %}
+endsnippet
+
+snippet mediau "" bi
+{{ MEDIA_URL }}
+endsnippet
+
+snippet iblock "" bi
+{% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
+endsnippet
+
+snippet csfr "" bi
+{% csrf_token %}
+endsnippet
+
+snippet blocktrans "" bi
+{% blocktrans %}
+    ${VISUAL}
+{% endblocktrans %}
+endsnippet
+
+snippet lorem "" bi
+{% lorem ${1} %}
+endsnippet
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add "" bi
+add:"${1}"
+endsnippet
+
+snippet center "" bi
+center:"${1}"
+endsnippet
+
+snippet cut "" bi
+cut:"${1}"
+endsnippet
+
+snippet date "" bi
+date:"${1}"
+endsnippet
+
+snippet default "" bi
+default:"${1}"
+endsnippet
+
+snippet defaultifnone "" bi
+default_if_none:"${1}"
+endsnippet
+
+snippet dictsort "" bi
+dictsort:"${1}"
+endsnippet
+
+snippet dictsortrev "" bi
+dictsortreversed:"${1}"
+endsnippet
+
+snippet divisibleby "" bi
+divisibleby:"${1}"
+endsnippet
+
+snippet floatformat "" bi
+floatformat:"${1}"
+endsnippet
+
+snippet getdigit "" bi
+get_digit:"${1}"
+endsnippet
+
+snippet join "" bi
+join:"${1}"
+endsnippet
+
+snippet lengthis "" bi
+length_is:"${1}"
+endsnippet
+
+snippet pluralize "" bi
+pluralize:"${1}"
+endsnippet
+
+snippet removetags "" bi
+removetags:"${1}"
+endsnippet
+
+snippet slice "" bi
+slice:"${1}"
+endsnippet
+
+snippet stringformat "" bi
+stringformat:"${1}"
+endsnippet
+
+snippet time "" bi
+time:"${1}"
+endsnippet
+
+snippet truncatewords "" bi
+truncatewords:${1}
+endsnippet
+
+snippet truncatewordshtml "" bi
+truncatewords_html:${1}
+endsnippet
+
+snippet urlizetrunc "" bi
+urlizetrunc:${1}
+endsnippet
+
+snippet wordwrap "" bi
+wordwrap:${1}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-angular.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/javascript-angular.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-ember.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/javascript_ember.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/javascript-ember.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-jasmine.snippets
similarity index 73%
rename from sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/javascript-jasmine.snippets
index e3f3ad70..77aec773 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_jasmine.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript-jasmine.snippets
@@ -28,10 +28,40 @@ afterEach(function() {
 });
 endsnippet
 
+snippet befa "before all (js)" b
+beforeAll(function() {
+	$0
+});
+endsnippet
+
+snippet afta "after all (js)" b
+afterAll(function() {
+	$0
+});
+endsnippet
+
 snippet any "any (js)" b
 jasmine.any($1)
 endsnippet
 
+snippet anyt "anything (js)" b
+jasmine.anything()
+endsnippet
+
+snippet objc "object containing (js)" b
+jasmine.objectContaining({
+	${VISUAL}$0
+});
+endsnippet
+
+snippet arrc "array containing (js)" b
+jasmine.arrayContaining([${1:value1}]);
+endsnippet
+
+snippet strm "string matching (js)" b
+jasmine.stringMatching("${1:matcher}")
+endsnippet
+
 snippet ru "runs (js)" b
 runs(function() {
 	$0
@@ -50,6 +80,14 @@ snippet ee "expect to equal (js)" b
 expect(${1:target}).toEqual(${2:value});
 endsnippet
 
+snippet el "expect to be less than (js)" b
+expect(${1:target}).toBeLessThan(${2:value});
+endsnippet
+
+snippet eg "expect to be greater than (js)" b
+expect(${1:target}).toBeGreaterThan(${2:value});
+endsnippet
+
 snippet eb "expect to be (js)" b
 expect(${1:target}).toBe(${2:value});
 endsnippet
@@ -74,6 +112,10 @@ snippet ed "expect to be defined (js)" b
 expect(${1:target}).toBeDefined();
 endsnippet
 
+snippet eud "expect to be defined (js)" b
+expect(${1:target}).toBeUndefined();
+endsnippet
+
 snippet en "expect to be null (js)" b
 expect(${1:target}).toBeNull();
 endsnippet
@@ -98,6 +140,14 @@ snippet note "expect not to equal (js)" b
 expect(${1:target}).not.toEqual(${2:value});
 endsnippet
 
+snippet notl "expect to not be less than (js)" b
+expect(${1:target}).not.toBeLessThan(${2:value});
+endsnippet
+
+snippet notg "expect to not be greater than (js)" b
+expect(${1:target})..not.toBeGreaterThan(${2:value});
+endsnippet
+
 snippet notm "expect not to match (js)" b
 expect(${1:target}).not.toMatch(${2:pattern});
 endsnippet
@@ -139,35 +189,19 @@ spyOn(${1:object}, '${2:method}')$0;
 endsnippet
 
 snippet sr "spy on and return (js)" b
-spyOn(${1:object}, '${2:method}').andReturn(${3:arguments});
+spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
 endsnippet
 
 snippet st "spy on and throw (js)" b
-spyOn(${1:object}, '${2:method}').andThrow(${3:exception});
+spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
 endsnippet
 
 snippet sct "spy on and call through (js)" b
-spyOn(${1:object}, '${2:method}').andCallThrough();
+spyOn(${1:object}, '${2:method}').and.callThrough();
 endsnippet
 
 snippet scf "spy on and call fake (js)" b
-spyOn(${1:object}, '${2:method}').andCallFake(${3:function});
-endsnippet
-
-snippet esc "expect was called (js)" b
-expect(${1:target}).wasCalled();
-endsnippet
-
-snippet escw "expect was called with (js)" b
-expect(${1:target}).wasCalledWith(${2:arguments});
-endsnippet
-
-snippet notsc "expect was not called (js)" b
-expect(${1:target}).wasNotCalled();
-endsnippet
-
-snippet noscw "expect was not called with (js)" b
-expect(${1:target}).wasNotCalledWith(${2:arguments});
+spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
 endsnippet
 
 snippet ethbc "expect to have been called (js)" b
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-jsdoc.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/javascript_jsdoc.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/javascript-jsdoc.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript-node.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-node.snippets
new file mode 100644
index 00000000..7a14deeb
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript-node.snippets
@@ -0,0 +1,65 @@
+priority -50
+
+snippet #! "shebang"
+#!/usr/bin/env node
+endsnippet
+
+snippet vreq "assign a CommonJS-style module to a var"
+var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
+endsnippet
+
+snippet ex "module.exports"
+module.exports = ${1};
+endsnippet
+
+snippet hcs "http.createServer"
+http.createServer(${1}).listen(${2});
+endsnippet
+
+snippet ncs "net.createServer"
+net.createServer(function(${1:socket}){
+	${1}.on('data', function(${3:data}){
+		${4}
+	});
+	${1}.on('end', function(){
+		${5}
+	});
+}).listen(${6:8124});
+endsnippet
+
+snippet pipe "pipe"
+pipe(${1:stream})${2}
+endsnippet
+
+# Express snippets
+
+snippet eget "express GET"
+${1:app}.get('${2}', ${3});
+endsnippet
+
+snippet epost "express POST"
+${1:app}.post('${2}', ${3});
+endsnippet
+
+snippet eput "express PUT"
+${1:app}.put('${2}', ${3});
+endsnippet
+
+snippet edelete "express DELETE"
+${1:app}.delete('${2}', ${3});
+endsnippet
+
+# process snippets
+
+snippet stdout "stdout"
+process.stdout
+endsnippet
+
+snippet stdin "stdin"
+process.stdin
+endsnippet
+
+snippet stderr "stderr"
+process.stderr
+endsnippet
+
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript-openui5.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript-openui5.snippets
new file mode 100644
index 00000000..5553c79a
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript-openui5.snippets
@@ -0,0 +1,205 @@
+snippet sapmlabel
+	var ${1} = new sap.m.Label({ 
+				design : ${2}, 
+				text : ${3}, 
+				visible : ${4}, 
+				textAlign : ${5}, 
+				textDirection : ${6}, 
+				width : ${7}, 
+				required : ${7}
+			});
+
+snippet sapmtext
+	var ${1} = new sap.m.Text({
+				text :${2},
+				textDirection :${3},
+				visible :${4},
+				wrapping : ${5},
+				textAlign : ${6},
+				width :${7},
+				maxLines :${8}
+			});
+
+snippet sapmbutton
+	var ${1} = new sap.m.Button({
+				text : ${2},
+				type : ${3},
+				width : ${4},
+				enabled :${5},
+				visible :${6},
+				icon : ${7},
+				iconFirst : ${8},
+				activeIcon :${9},
+				iconDensityAware : ${10},
+			});
+snippet sapmflexbox
+	var ${1} = new sap.m.FlexBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+snippet sapmhbox
+	var ${1} = new sap.m.HBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+
+snippet sapmvbox
+	var ${1} = new sap.m.VBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+
+snippet sapcomponent
+	sap.ui.controller("${1}", {
+	   onInit: function(){
+	   }, 
+	   onAfterRendering: function() {
+	   },
+	   onAfterRendering: function() {
+	   },
+	   onExit: function() {
+	   },
+	});
+
+snippet sapminput
+	var ${1} = new sap.m.Input({
+		value :${2},
+		width : ${3},
+		enabled :${4},
+		visible :${5},
+		valueState :${6},
+		name : ${7},
+		placeholder : ${8},
+		editable : ${9},
+		type : ${10},
+		maxLength :${11}, 
+		valueStateText :${12}, 
+		showValueStateMessage :${13}, 
+		dateFormat :${14},
+		showValueHelp :${15},
+		showSuggestion :${16},
+		valueHelpOnly :${17},
+		filterSuggests :${18},
+		maxSuggestionWidth :${19},
+		startSuggestion : ${20},
+		showTableSuggestionValueHelp : ${21},
+		description : ${22},
+		fieldWidth : ${23},
+		valueLiveUpdate :${24},
+		suggestionItems  :[${25}],
+		suggestionColumns : [${26}],
+		suggestionRows : [${27}],
+		liveChange : ${28},
+		valueHelpRequest :${29}, 
+		suggest : ${30},
+		suggestionItemSelected : ${31}
+	});
+snippet _sthis
+	var _self = this;
+
+snippet sapmresponsivepopup
+	var ${1} = new sap.m.ResponsivePopover({
+				placement :${2} ,//sap.m.PlacementType (default: sap.m.PlacementType.Right)
+				showHeader :${3} ,//boolean (default: true)
+				title : ${4},//string
+				icon :${5} ,//sap.ui.core.URI
+				modal :${6} ,// boolean
+				offsetX :${7}, //int
+				offsetY :${8}, //int
+				contentWidth : ${9},//sap.ui.core.CSSSize
+				contentHeight :${10}, //sap.ui.core.CSSSize
+				horizontalScrolling :${11}, //boolean
+				verticalScrolling :${12}, //boolean
+				showCloseButton :${13}, //boolean (default: true)
+				//Aggregations
+				content :${14},  //sap.ui.core.Control[]
+				customHeader :${15},  //sap.m.IBar
+				subHeader : ${16}, //sap.m.IBar
+				beginButton :${17},  //sap.m.Button
+				endButton : ${18}, //sap.m.Button
+				//Associations
+				initialFocus : ${19}, //string | sap.ui.core.Control
+				//Events
+				beforeOpen :${20},  //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterOpen : ${21}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				beforeClose : ${22}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterClose : ${23} //fnList
+			});
+
+snippet sapicon
+	var ${1} = new sap.ui.core.Icon({
+					src :${2} , //sap.ui.core.URI
+					size :${3} , //sap.ui.core.CSSSize
+					color :${4} , //sap.ui.core.CSSColor
+					hoverColor : ${5} ,  // sap.ui.core.CSSColor
+					activeColor :${6} , //sap.ui.core.CSSColor
+					width :${7} , //sap.ui.core.CSSSize
+					height : ${8} ,//sap.ui.core.CSSSize
+					backgroundColor :${8} , //sap.ui.core.CSSColor
+					hoverBackgroundColor :${9} , //sap.ui.core.CSSColor
+					activeBackgroundColor :${10} , //sap.ui.core.CSSColor
+					visible :${11} , //boolean (default: true)
+					decorative : ${12} ,//boolean (default: true)
+				});
+snippet extendVerticalL 
+	sap.ui.layout.VerticalLayout.extend("${1}", {
+	    metadata: {
+		properties: {
+		  	${2} 
+		},
+		aggregations: {
+			${3}	
+		},
+		events: {
+			${4}
+		}
+	    },
+	   init: function(){
+		${5}	
+	    },
+	    
+	    renderer: "${6}"
+	});	
+snippet extendHorizontalL 
+	sap.ui.layout.HorizontalLayout.extend("${1}", {
+	    metadata: {
+		properties: {
+		  	${2} 
+		},
+		aggregations: {
+			${3}	
+		},
+		events: {
+			${4}
+		}
+	    },
+	   init: function(){
+		${5}	
+	    },
+	    
+	    renderer: "${6}"
+	});	
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 6c177bc1..9480e812 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -59,7 +59,7 @@ ${1:var }${2:function_name} = function $2(${3}) {
 endsnippet
 
 snippet iife "Immediately-Invoked Function Expression (iife)"
-(function (${1:argument}) {
+(function(${1:window}) {
 	${VISUAL}$0
 }(${2:$1}));
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
index bc59c60c..b6d0c1a3 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/lua.snippets
@@ -32,6 +32,65 @@ for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
 end
 endsnippet
 
+snippet do "do block"
+do
+	$0
+end
+endsnippet
+
+snippet repeat "repeat loop" b
+repeat
+	$1
+until $0
+endsnippet
+
+snippet while "while loop" b
+while $1 do
+	$0
+end
+endsnippet
+
+snippet if "if statement" b
+if $1 then
+	$0
+end
+endsnippet
+
+snippet ife "if/else statement" b
+if $1 then
+	$2
+else
+	$0
+end
+endsnippet
+
+snippet eif "if/elseif statement" b
+if $1 then
+	$2
+elseif $3 then
+	$0
+end
+endsnippet
+
+snippet eife "if/elseif/else statement" b
+if $1 then
+	$2
+elseif $3 then
+	$4
+else
+	$0
+end
+endsnippet
+
+snippet pcall "pcall statement" b
+local ok, err = pcall(${1:your_function})
+if not ok then
+	handler(${2:ok, err})
+${3:else
+	success(${4:ok, err})
+}end
+endsnippet
+
 snippet local "local x = 1"
 local ${1:x} = ${0:1}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
index ad165c56..ce858f0b 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/pandoc.snippets
@@ -4,7 +4,7 @@ extends markdown
 priority -49
 
 snippet title "Title Header" b
-% ${1:`!v Filename('', 'title')`}
+% ${1:`!v vim_snippets#Filename('$1', 'title')`}
 % ${2:`!v g:snips_author`}
 % ${3:`!v strftime("%d %B %Y")`}
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets b/sources_non_forked/vim-snippets/UltiSnips/php-laravel.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/php-laravel.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 100%
rename from sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/php-phpunit.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets b/sources_non_forked/vim-snippets/UltiSnips/php-symfony2.snippets
similarity index 100%
rename from sources_non_forked/vim-snippets/UltiSnips/php_symfony2.snippets
rename to sources_non_forked/vim-snippets/UltiSnips/php-symfony2.snippets
diff --git a/sources_non_forked/vim-snippets/UltiSnips/python.snippets b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
index 1c16529a..9372bdcf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/python.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/python.snippets
@@ -12,10 +12,16 @@ $0
 endsnippet
 
 snippet ifmain "ifmain" b
-if __name__ == '__main__':
+if __name__ == `!p snip.rv = get_quoting_style(snip)`__main__`!p snip.rv = get_quoting_style(snip)`:
 	${1:${VISUAL:main()}}
 endsnippet
 
+snippet with "with" b
+with ${1:expr}`!p snip.rv = " as " if t[2] else ""`${2:var}:
+	${3:${VISUAL:pass}}
+${0}
+endsnippet
+
 snippet for "for loop" b
 for ${1:item} in ${2:iterable}:
 	${3:${VISUAL:pass}}
@@ -35,6 +41,8 @@ NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
 GOOGLE  = 0x4
+NUMPY   = 0x5
+JEDI    = 0x6
 
 SINGLE_QUOTES = "'"
 DOUBLE_QUOTES = '"'
@@ -69,7 +77,10 @@ def get_quoting_style(snip):
 	return DOUBLE_QUOTES
 
 def triple_quotes(snip):
-	return get_quoting_style(snip) * 3
+	style = snip.opt("g:ultisnips_python_triple_quoting_style")
+	if not style:
+		return get_quoting_style(snip) * 3
+	return (SINGLE_QUOTES if style == 'single' else DOUBLE_QUOTES) * 3
 
 def triple_quotes_handle_trailing(snip, quoting_style):
 	"""
@@ -105,6 +116,8 @@ def get_style(snip):
 	if    style == "doxygen": return DOXYGEN
 	elif  style == "sphinx": return SPHINX
 	elif  style == "google": return GOOGLE
+	elif  style == "numpy": return NUMPY
+	elif  style == "jedi": return JEDI
 	else: return NORMAL
 
 
@@ -117,12 +130,16 @@ def format_arg(arg, style):
 		return ":%s: TODO" % arg
 	elif style == GOOGLE:
 		return "%s (TODO): TODO" % arg
+	elif style == JEDI:
+		return ":type %s: TODO" % arg
+	elif style == NUMPY:
+		return "%s : TODO" % arg
 
 
 def format_return(style):
 	if style == DOXYGEN:
 		return "@return: TODO"
-	elif style in (NORMAL, SPHINX):
+	elif style in (NORMAL, SPHINX, JEDI):
 		return ":returns: TODO"
 	elif style == GOOGLE:
 		return "Returns: TODO"
@@ -139,6 +156,8 @@ def write_docstring_args(args, snip):
 
 	if style == GOOGLE:
 		write_google_docstring_args(args, snip)
+	elif style == NUMPY:
+		write_numpy_docstring_args(args, snip)
 	else:
 		for arg in args:
 			snip += format_arg(arg, style)
@@ -165,6 +184,23 @@ def write_google_docstring_args(args, snip):
 		snip.rv += '\n' + snip.mkline('', indent='')
 
 
+def write_numpy_docstring_args(args, snip):
+	if args:
+		snip += "Parameters"
+		snip += "----------"
+
+	kwargs = [arg for arg in args if arg.is_kwarg()]
+	args = [arg for arg in args if not arg.is_kwarg()]
+
+	if args:
+		for arg in args:
+			snip += format_arg(arg, NUMPY)
+	if kwargs:
+		for kwarg in kwargs:
+			snip += format_arg(kwarg, NUMPY) + ', optional'
+	snip.rv += '\n' + snip.mkline('', indent='')
+
+
 def write_init_body(args, parents, snip):
 	parents = [p.strip() for p in parents.split(",")]
 	parents = [p for p in parents if p != 'object']
@@ -199,7 +235,13 @@ def write_function_docstring(t, snip):
 		write_docstring_args(args, snip)
 
 	style = get_style(snip)
-	snip += format_return(style)
+
+	if style == NUMPY:
+		snip += 'Returns'
+		snip += '-------'
+		snip += 'TODO'
+	else:
+		snip += format_return(style)
 	snip.rv += '\n' + snip.mkline('', indent='')
 	snip += triple_quotes(snip)
 
@@ -546,14 +588,14 @@ endsnippet
 snippet try "Try / Except" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 endsnippet
 
 snippet trye "Try / Except / Else" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 else:
 	${5:pass}
@@ -562,7 +604,7 @@ endsnippet
 snippet tryf "Try / Except / Finally" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 finally:
 	${5:pass}
@@ -571,7 +613,7 @@ endsnippet
 snippet tryef "Try / Except / Else / Finally" b
 try:
 	${1:${VISUAL:pass}}
-except${2: ${3:Exception}, ${4:e}}:
+except${2: ${3:Exception} as ${4:e}}:
 	${5:raise}
 else:
 	${6:pass}
@@ -588,6 +630,10 @@ snippet pdb "Set PDB breakpoint" b
 import pdb; pdb.set_trace()
 endsnippet
 
+snippet ipy "Embed IPython shell" b
+import IPython; IPython.embed()
+endsnippet
+
 snippet ipdb "Set IPDB breakpoint" b
 import ipdb; ipdb.set_trace()
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index 4a65d772..b377fa97 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -18,6 +18,12 @@ fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 }
 endsnippet
 
+snippet pfn "A public function, optionally with arguments and return type."
+pub fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
+	${VISUAL}${0}
+}
+endsnippet
+
 snippet arg "Function Arguments" i
 ${1:a}: ${2:T}${3:, arg}
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets b/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
deleted file mode 100644
index cab17c14..00000000
--- a/sources_non_forked/vim-snippets/UltiSnips/scss.snippets
+++ /dev/null
@@ -1,57 +0,0 @@
-extends css
-
-priority -50
-
-snippet imp "@import '...';" b
-@import '${1:file}';
-endsnippet
-
-snippet inc "@include mixin(...);" b
-@include ${1:mixin}(${2});
-endsnippet
-
-snippet ext "@extend %placeholder;" b
-@extend %${1:%placeholder};
-endsnippet
-
-snippet mixin "@mixin (...) { ... }" b
-@mixin ${1:name}(${2}) {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet fun "@function (...) { ... }" b
-@function ${1:name}(${2}) {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet if "@if (...) { ... }" b
-@if ${1:condition} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet else "@else { ... }" b
-@else ${1:condition} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet for "@for loop" b
-@for ${1:$i} from ${2:1} through ${3:3} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet each "@each loop" b
-@each ${1:$item} in ${2:item, item, item} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet while "@while loop" b
-@while ${1:$i} ${2:>} ${3:0} {
-	${VISUAL}$0
-}
-endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/supercollider.snippets b/sources_non_forked/vim-snippets/UltiSnips/supercollider.snippets
new file mode 100644
index 00000000..b8538aa9
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/supercollider.snippets
@@ -0,0 +1,10 @@
+snippet for
+for (${1:1}, ${2:10}) {${3: |i}|}
+	$0
+}
+endsnippet
+snippet sdef
+SynthDef(\\${1:synthName}, {${2: |${3:x}|}
+	${0}
+}).add;
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/typescript.snippets b/sources_non_forked/vim-snippets/UltiSnips/typescript.snippets
new file mode 100644
index 00000000..11072ddd
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/typescript.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends javascript
diff --git a/sources_non_forked/vim-snippets/pythonx/vimsnippets.py b/sources_non_forked/vim-snippets/pythonx/vimsnippets.py
index b00edb15..6a446a2a 100644
--- a/sources_non_forked/vim-snippets/pythonx/vimsnippets.py
+++ b/sources_non_forked/vim-snippets/pythonx/vimsnippets.py
@@ -1,5 +1,7 @@
 """Helper methods used in UltiSnips snippets."""
 
+import string, vim
+
 def complete(tab, opts):
     """
     get options that start with tab
@@ -18,3 +20,73 @@ def complete(tab, opts):
     if not len(opts):
         msg = "{0}"
     return msg.format("|".join(opts))
+
+def _parse_comments(s):
+    """ Parses vim's comments option to extract comment format """
+    i = iter(s.split(","))
+
+    rv = []
+    try:
+        while True:
+            # get the flags and text of a comment part
+            flags, text = next(i).split(':', 1)
+
+            if len(flags) == 0:
+                rv.append((text, text, text, ""))
+            # parse 3-part comment, but ignore those with O flag
+            elif 's' in flags and 'O' not in flags:
+                ctriple = ["TRIPLE"]
+                indent = ""
+
+                if flags[-1] in string.digits:
+                    indent = " " * int(flags[-1])
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'm'
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'e'
+                ctriple.append(text)
+                ctriple.append(indent)
+
+                rv.append(ctriple)
+            elif 'b' in flags:
+                if len(text) == 1:
+                    rv.insert(0, ("SINGLE_CHAR", text, text, text, ""))
+    except StopIteration:
+        return rv
+
+def get_comment_format():
+    """ Returns a 4-element tuple (first_line, middle_lines, end_line, indent)
+    representing the comment format for the current file.
+
+    It first looks at the 'commentstring', if that ends with %s, it uses that.
+    Otherwise it parses '&comments' and prefers single character comment
+    markers if there are any.
+    """
+    commentstring = vim.eval("&commentstring")
+    if commentstring.endswith("%s"):
+        c = commentstring[:-2]
+        return (c, c, c, "")
+    comments = _parse_comments(vim.eval("&comments"))
+    for c in comments:
+        if c[0] == "SINGLE_CHAR":
+            return c[1:]
+    return comments[0][1:]
+
+
+def make_box(twidth, bwidth=None):
+    b, m, e, i = (s.strip() for s in get_comment_format())
+    bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
+    sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+    nspaces = (bwidth_inner - twidth) // 2
+    mlines = i + m + " " + " " * nspaces
+    mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
+    eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+    return sline, mlines, mlinee, eline
+
+def foldmarker():
+    "Return a tuple of (open fold marker, close fold marker)"
+    return vim.eval("&foldmarker").split(",")
diff --git a/sources_non_forked/vim-snippets/snippets/c.snippets b/sources_non_forked/vim-snippets/snippets/c.snippets
index aa7ce847..f4745c25 100644
--- a/sources_non_forked/vim-snippets/snippets/c.snippets
+++ b/sources_non_forked/vim-snippets/snippets/c.snippets
@@ -25,7 +25,7 @@ snippet Inc
 snippet ndef
 	#ifndef $1
 	#define ${1:SYMBOL} ${2:value}
-	#endif
+	#endif /* ifndef $1 */
 # define
 snippet def
 	#define
@@ -98,6 +98,8 @@ snippet case
 	case ${1:/* variable case */}:
 		${2}
 		${3:break;}
+snippet ret
+	return ${0};
 ##
 ## Loops
 # for
@@ -146,6 +148,9 @@ snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
 	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+
+snippet enum
+	enum ${1:name} { ${0} };
 # typedef enum
 snippet tde
 	typedef enum {
@@ -221,23 +226,3 @@ snippet getopt
 # This is kind of convenient
 snippet .
 	[${1}]
-# 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}
diff --git a/sources_non_forked/vim-snippets/snippets/cpp.snippets b/sources_non_forked/vim-snippets/snippets/cpp.snippets
index 632f76f9..ca9fbe3c 100644
--- a/sources_non_forked/vim-snippets/snippets/cpp.snippets
+++ b/sources_non_forked/vim-snippets/snippets/cpp.snippets
@@ -1,5 +1,13 @@
 extends c
 
+##
+## Preprocessor
+# #include <...>
+snippet inc
+	#include <${1:iostream}>
+snippet binc
+	#include <boost/${1:shared_ptr}.hpp>
+##
 ## STL Collections
 # std::array
 snippet array
diff --git a/sources_non_forked/vim-snippets/snippets/elixir.snippets b/sources_non_forked/vim-snippets/snippets/elixir.snippets
index 8ca37912..bd621760 100644
--- a/sources_non_forked/vim-snippets/snippets/elixir.snippets
+++ b/sources_non_forked/vim-snippets/snippets/elixir.snippets
@@ -70,7 +70,7 @@ snippet defma
 		${0}
 	end
 snippet defmo
-	defmodule ${1:module_name} do
+	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
 snippet defp
@@ -95,6 +95,8 @@ snippet mdoc
 	@moduledoc """
 	${0}
 	"""
+snippet mdocf
+	@moduledoc false
 snippet rec
 	receive do
 		${1} ->
@@ -123,3 +125,7 @@ snippet try try .. rescue .. end
 snippet pry
 	require IEx; IEx.pry
 	${0}
+snippet qu
+	quote do
+		${1}
+	end
diff --git a/sources_non_forked/vim-snippets/snippets/eruby.snippets b/sources_non_forked/vim-snippets/snippets/eruby.snippets
index 00696963..adad8cb0 100644
--- a/sources_non_forked/vim-snippets/snippets/eruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/eruby.snippets
@@ -22,23 +22,23 @@ snippet for
 		${0}
 	<% end %>
 snippet rp
-	<%= render :partial => '${0:item}' %>
+	<%= render partial: '${0:item}' %>
 snippet rpl
-	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'${0} } %>
+	<%= render partial: '${1:item}', locals: { :${2:name} => '${3:value}'${0} } %>
 snippet rps
-	<%= render :partial => '${1:item}', :status => ${0:500} %>
+	<%= render partial: '${1:item}', status: ${0:500} %>
 snippet rpc
-	<%= render :partial => '${1:item}', :collection => ${0:items} %>
+	<%= render partial: '${1:item}', collection: ${0:items} %>
 snippet lia
-	<%= link_to '${1:link text...}', :action => '${0:index}' %>
+	<%= link_to '${1:link text...}', action: '${0:index}' %>
 snippet liai
-	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${0:@item} %>
+	<%= link_to '${1:link text...}', action: '${2:edit}', id: ${0:@item} %>
 snippet lic
-	<%= link_to '${1:link text...}', :controller => '${0:items}' %>
+	<%= link_to '${1:link text...}', controller: '${0:items}' %>
 snippet lica
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${0: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 => ${0:@item} %>
+	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${3:edit}', id: ${0:@item} %>
 snippet yield
 	<%= yield ${1::content_symbol} %>
 snippet conf
@@ -110,11 +110,11 @@ snippet ofcfs
 snippet ofs
 	<%= options_for_select ${1:collection}, ${2:value_method} %>
 snippet rf
-	<%= render :file => "${1:file}"${0} %>
+	<%= render file: "${1:file}"${0} %>
 snippet rt
-	<%= render :template => "${1:file}"${0} %>
+	<%= render template: "${1:file}"${0} %>
 snippet slt
-	<%= stylesheet_link_tag ${1::all}, :cache => ${0:true} %>
+	<%= stylesheet_link_tag ${1::all}, cache: ${0:true} %>
 snippet sslt
 	<%= stylesheet_link_tag "${0}" %>
 snippet if
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index 633c9aaf..e4957e4c 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -2,11 +2,13 @@ snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet haddock
 	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet ghc
+	{-# OPTIONS_GHC ${0:-fno-warn-unused-imports} #-}
 snippet inline
 	{-# INLINE ${0:name} #-}
 snippet info
 	-- |
-	-- Module      :  ${1:Module.Namespace}
+	-- Module      :  ${1:`substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`}
 	-- Copyright   :  ${2:Author} ${3:2011-2012}
 	-- License     :  ${4:BSD3}
 	--
@@ -40,9 +42,12 @@ snippet class
 		${0}
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
-	)	where
-	`expand('%') =~ 'Main' ? "\n\nmain = do\n  print \"hello world\"" : ""`
+	) where
+	`expand('%') =~ 'Main' ? "\nmain :: IO ()\nmain = undefined" : ""`
 
+snippet main
+	main :: IO ()
+	main = ${0:undefined}
 snippet const
 	${1:name} :: ${2:a}
 	$1 = ${0:undefined}
@@ -52,25 +57,21 @@ snippet fn
 snippet fn2
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
 	$1 ${5} = ${0:undefined}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} = ${0:undefined}
+snippet => "Type constraint"
+	(${1:Class} ${2:a}) => $2
 snippet ap
 	${1:map} ${2:fn} ${0:list}
-snippet do
-	do
-
-snippet λ
-	\\${1:x} -> ${0:expression}
 snippet \
 	\\${1:x} -> ${0:expression}
 snippet (\
 	(\\${1:x} -> ${0:expression})
 snippet <-
 	${1:a} <- ${0:m a}
-snippet ←
-	${1:a} <- ${0:m a}
 snippet ->
 	${1:m a} -> ${0:a}
-snippet →
-	${1:m a} -> ${0:a}
 snippet tup
 	(${1:a}, ${0:b})
 snippet tup2
@@ -90,3 +91,25 @@ snippet let
 snippet where
 	where
 		${1:fn} = ${0:undefined}
+snippet spec
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main, spec) where
+
+	import Test.Hspec
+	import Test.QuickCheck
+
+	main :: IO ()
+	main = hspec spec
+
+	spec :: Spec
+	spec =
+		describe "${1}" $ do
+			$0
+snippet desc
+	describe "${1}" $ do
+		$0
+snippet it
+	it "${1}" $
+		$0
+snippet itp
+	it "${1}" $ property $
+		$0
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 89438b41..f41f983e 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -159,18 +159,18 @@ snippet address
 		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}">
 snippet area+
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}">
 	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}">
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="default" coords="${1}" href="${2}" alt="${0}">
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}">
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}">
 snippet article
 	<article>
 		${0}
@@ -200,7 +200,7 @@ snippet audio
 snippet b
 	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${0}" />
+	<base href="${1}" target="${0}">
 snippet bdi
 	<bdi>${0}</bdo>
 snippet bdo
@@ -218,7 +218,7 @@ snippet body
 		${0}
 	</body>
 snippet br
-	<br />
+	<br>
 snippet button
 	<button type="${1:submit}">${0}</button>
 snippet button.
@@ -240,9 +240,9 @@ snippet cite
 snippet code
 	<code>${0}</code>
 snippet col
-	<col />
+	<col>
 snippet col+
-	<col />
+	<col>
 	col+
 snippet colgroup
 	<colgroup>
@@ -254,11 +254,11 @@ snippet colgroup+
 		col+${0}
 	</colgroup>
 snippet command
-	<command type="command" label="${1}" icon="${0}" />
+	<command type="command" label="${1}" icon="${0}">
 snippet command:c
-	<command type="checkbox" label="${1}" icon="${0}" />
+	<command type="checkbox" label="${1}" icon="${0}">
 snippet command:r
-	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}" />
+	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}">
 snippet datagrid
 	<datagrid>
 		${0}
@@ -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}
@@ -423,7 +423,7 @@ snippet h6#
 	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${0}
@@ -449,7 +449,7 @@ snippet hgroup.
 		${0}
 	</hgroup>
 snippet hr
-	<hr />
+	<hr>
 snippet html
 	<html>
 	${0}
@@ -493,59 +493,59 @@ snippet iframe.
 snippet iframe#
 	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}" />
+	<img src="${1}" alt="${2}">
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}" />
+	<img class="${1}" src="${2}" alt="${3}">
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}" />
+	<img id="${1}" src="${2}" alt="${3}">
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
+	<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}" />
+	<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}" />
+	<input type="text" name="${1}" id="${2:$1}" value="${3}">
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}">
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}">
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
+	<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}" />
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}">
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}" />
+	<input type="checkbox" name="${1}" id="${2:$1}">
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}" />
+	<input type="radio" name="${1}" id="${2:$1}">
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="color" name="${1}" id="${2:$1}" value="${3}">
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="date" name="${1}" id="${2:$1}" value="${3}">
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
+	<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}" />
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}">
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="email" name="${1}" id="${2:$1}" value="${3}">
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="file" name="${1}" id="${2:$1}" value="${3}">
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="month" name="${1}" id="${2:$1}" value="${3}">
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="number" name="${1}" id="${2:$1}" value="${3}">
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="password" name="${1}" id="${2:$1}" value="${3}">
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="range" name="${1}" id="${2:$1}" value="${3}">
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}">
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="search" name="${1}" id="${2:$1}" value="${3}">
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="time" name="${1}" id="${2:$1}" value="${3}">
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="url" name="${1}" id="${2:$1}" value="${3}">
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="week" name="${1}" id="${2:$1}" value="${3}">
 snippet ins
 	<ins>${0}</ins>
 snippet kbd
@@ -579,19 +579,19 @@ snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
 	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
+	<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" />
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml">
 snippet link:s
-	<link rel="stylesheet" href="${1:style.css}" />
+	<link rel="stylesheet" href="${1:style.css}">
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
+	<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" />
+	<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" />
+	<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}" />
+	<link rel="apple-touch-icon" href="${1:favicon.png}">
 snippet main
 	<main role="main">
 		${0}
@@ -610,7 +610,7 @@ snippet map#
 	</map>
 snippet map+
 	<map name="${1}">
-		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
+		<area shape="${2}" coords="${3}" href="${4}" alt="${5}">${6}
 	</map>
 snippet mark
 	<mark>${0}</mark>
@@ -627,17 +627,17 @@ snippet menu:t
 		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}" />
+	<meta http-equiv="${1}" content="${2}">
 snippet meta:s
-	<meta ${0} />
+	<meta ${0}>
 snippet meta:d
-	<meta name="description" content="${0}" />
+	<meta name="description" content="${0}">
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
+	<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" />
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8">
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 snippet meter
 	<meter>${0}</meter>
 snippet nav
@@ -665,13 +665,13 @@ snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
 	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 		<param name="src" value="$1" />
-		<param name="controller" value="$4" />
-		<param name="autoplay" value="$5" />
+		<param name="controller" value="$4">
+		<param name="autoplay" value="$5">
 		<embed src="${1:movie.mov}"
 			width="${2:320}" height="${3:240}"
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
-			pluginspage="http://www.apple.com/quicktime/download/" />
+			pluginspage="http://www.apple.com/quicktime/download/">
 	</object>
 snippet ol
 	<ol>
@@ -711,7 +711,7 @@ snippet p.
 snippet p#
 	<p id="${1}">${0}</p>
 snippet param
-	<param name="${1}" value="${2}" />
+	<param name="${1}" value="${2}">
 snippet pre
 	<pre>
 		${0}
@@ -774,7 +774,7 @@ snippet select+
 snippet small
 	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${0}" />
+	<source src="${1}" type="${2}" media="${0}">
 snippet span
 	<span>${0}</span>
 snippet span.
@@ -876,4 +876,4 @@ snippet var
 snippet video
 	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
-	<wbr />
+	<wbr>
diff --git a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
index be087cec..7d14ca83 100644
--- a/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
+++ b/sources_non_forked/vim-snippets/snippets/htmldjango.snippets
@@ -1,5 +1,7 @@
 # Generic tags
 
+extends html
+
 snippet %
 	{% ${1} %}
 snippet %%
@@ -138,4 +140,3 @@ snippet urlizetrunc
 	urlizetrunc:${0}
 snippet wordwrap
 	wordwrap:${0}
-
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets
index a3f7fa7a..f5be9189 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.d3.snippets
@@ -16,8 +16,8 @@ snippet marginconvention
 	var ${8:height} = ${9:500} - $1.top - $1.bottom;
 	
 	var ${10:svg} = d3.select("${11}").append("svg")
-	  .attr("width", $6)
-	  .attr("height", $8)
+	  .attr("width", $6 + $1.left + $1.right)
+	  .attr("height", $8 + $1.top + $1.bottom)
 	    .append("g")
 	  .attr("transform", "translate(" + $1.left + "," + $1.top + ")")
 snippet nest
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets
new file mode 100644
index 00000000..e1873c5e
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.es6.snippets
@@ -0,0 +1,26 @@
+snippet const
+	const ${0} = ${1};
+snippet let
+	let ${0} = ${1};
+snippet im
+	import ${0} from '${1}';
+snippet cla
+	class ${0} {
+		${1}
+	}
+snippet clax
+	class ${0} extends ${1} {
+		${2}
+	}
+snippet =>
+	(${0}) => {
+		${1}
+	}
+snippet af
+	(${0}) => {
+		${1}
+	}
+snippet sym
+	const ${0} = Symbol('${1}');
+snippet ed
+	export default ${0}
diff --git a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
index 4832815d..11f3f76c 100644
--- a/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/javascript/javascript.snippets
@@ -11,7 +11,7 @@ snippet fun
 		${0}
 	}
 # Anonymous Function
-snippet f
+snippet f "" w
 	function(${1}) {
 		${0}
 	}
@@ -80,6 +80,18 @@ snippet try
 	} catch (${2:e}) {
 		${0:/* handle error */}
 	}
+# try finally
+snippet tryf
+	try {
+		${1}
+	} catch (${2:e}) {
+		${0:/* handle error */}
+	} finally {
+		${3:/* be executed regardless of the try / catch result*/}
+	}
+# throw Error
+snippet terr
+	throw new Error('${1:error message}')
 # return
 snippet ret
 	return ${0:result};
@@ -88,12 +100,12 @@ snippet ret
 
 # for loop
 snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
+	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 --) {
+	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2--) {
 		var ${3:v} = $1[$2];${0:}
 	}
 # While loop
@@ -203,7 +215,6 @@ snippet @par
 	@param {${1:type}} ${2:name} ${0:description}
 snippet @ret
 	@return {${1:type}} ${0:description}
-
 # JSON
 
 # JSON.parse
@@ -243,6 +254,9 @@ snippet cl
 # console.debug
 snippet cd
 	console.debug(${0});
+# console.err
+snippet ce
+	console.err(${0});
 # console.trace
 snippet ct
 	console.trace(${0:label});
diff --git a/sources_non_forked/vim-snippets/snippets/jinja.snippets b/sources_non_forked/vim-snippets/snippets/jinja.snippets
new file mode 100644
index 00000000..7d14ca83
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/jinja.snippets
@@ -0,0 +1,142 @@
+# Generic tags
+
+extends html
+
+snippet %
+	{% ${1} %}
+snippet %%
+	{% ${1:tag_name} %}
+	${0}
+	{% end$1 %}
+snippet {
+	{{ ${1} }}
+# Template Tags
+
+snippet autoescape
+	{% autoescape ${1:off} %}
+		${0}
+	{% endautoescape %}
+snippet block
+	{% block ${1} %}
+		${0}
+	{% endblock %}
+snippet #
+	{# ${0:comment} #}
+snippet comment
+	{% comment %}
+		${0}
+	{% endcomment %}
+snippet cycle
+	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet debug
+	{% debug %}
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet filter
+	{% filter ${1} %}
+		${0}
+	{% endfilter %}
+snippet firstof
+	{% firstof ${1} %}
+snippet for
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet empty
+	{% empty %}
+	${0}
+snippet if
+	{% if ${1} %}
+		${0}
+	{% endif %}
+snippet el
+	{% else %}
+		${1}
+snippet eif
+	{% elif ${1} %}
+		${0}
+snippet ifchanged
+	{% ifchanged %}${1}{% endifchanged %}
+snippet ifequal
+	{% ifequal ${1} ${2} %}
+		${0}
+	{% endifequal %}
+snippet ifnotequal
+	{% ifnotequal ${1} ${2} %}
+		${0}
+	{% endifnotequal %}
+snippet include
+	{% include "${0}" %}
+snippet load
+	{% load ${0} %}
+snippet now
+	{% now "${0:jS F Y H:i}" %}
+snippet regroup
+	{% regroup ${1} by ${2} as ${0} %}
+snippet spaceless
+	{% spaceless %}${0}{% endspaceless %}
+snippet ssi
+	{% ssi ${0} %}
+snippet trans
+	{% trans "${0:string}" %}
+snippet url
+	{% url ${1} as ${0} %}
+snippet widthratio
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
+snippet with
+	{% with ${1} as ${2} %}
+		${0}
+	{% endwith %}
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+	add:"${0}"
+snippet center
+	center:"${0}"
+snippet cut
+	cut:"${0}"
+snippet date
+	date:"${0}"
+snippet default
+	default:"${0}"
+snippet defaultifnone
+	default_if_none:"${0}"
+snippet dictsort
+	dictsort:"${0}"
+snippet dictsortrev
+	dictsortreversed:"${0}"
+snippet divisibleby
+	divisibleby:"${0}"
+snippet floatformat
+	floatformat:"${0}"
+snippet getdigit
+	get_digit:"${0}"
+snippet join
+	join:"${0}"
+snippet lengthis
+	length_is:"${0}"
+snippet pluralize
+	pluralize:"${0}"
+snippet removetags
+	removetags:"${0}"
+snippet slice
+	slice:"${0}"
+snippet stringformat
+	stringformat:"${0}"
+snippet time
+	time:"${0}"
+snippet truncatewords
+	truncatewords:${0}
+snippet truncatewordshtml
+	truncatewords_html:${0}
+snippet urlizetrunc
+	urlizetrunc:${0}
+snippet wordwrap
+	wordwrap:${0}
diff --git a/sources_non_forked/vim-snippets/snippets/perl6.snippets b/sources_non_forked/vim-snippets/snippets/perl6.snippets
new file mode 100644
index 00000000..21ddf5bd
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/perl6.snippets
@@ -0,0 +1,116 @@
+# shebang
+snippet #!
+	#!/usr/bin/env perl6
+
+# Hash Pointer
+snippet .
+	 =>
+# Function
+snippet sub
+	sub ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+snippet mul
+	multi ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+# Conditional
+snippet if
+	if ${1} {
+		${2}
+	}
+# Conditional if..else
+snippet ife
+	if ${1} {
+		${2}
+	}
+	else {
+		${3}
+	}
+snippet eif
+	elsif ${1) {
+		${2}
+	}
+# Conditional One-line
+snippet xif
+	${1:expression} if ${2:condition};
+# Unless conditional
+snippet unless
+	unless ${1} {
+		${2}
+	}
+# Unless conditional One-line
+snippet xunless
+	${1:expression} unless ${2:condition};
+# Ternary conditional
+snippet tc
+	${1:condition} ?? ${2:value-if-true} !! ${3:value-if-false};
+# given - when (perl6 switch)
+snippet switch
+	given ${1:$var} {
+	  when ${2:condition} {
+		  ${3:# code block ...}
+	  }
+	  ${4}
+	  default {
+		  ${5}
+	  }
+	}
+# 'loop' - C's for.
+snippet loop
+	loop (my ${1:$i} = 0; $$1 < ${2:count}; $$1++) {
+		${3}
+	}
+# for loop
+snippet for
+	for ${1:@array} -> ${2:$variable} {
+		${3}
+	}
+# While Loop
+snippet wh
+	while ${1} {
+		${2}
+	}
+# Repeat while and repean until
+snippet rp
+	repeat {
+		${1}
+	} ${2:while|until} ${3};
+# classes ..
+snippet cl
+	${1:my} class ${2:ClassName} ${3:is|does Parent|Role}{
+		${4}
+	}
+snippet has
+	has ${1:Type} ${2:$!identifier};
+snippet mth
+	method ${1:method_name}(${2:$attr}) {
+		${3}
+	}
+snippet pmth
+	method ${1:!}${2:method_name}(${3:$attr}) {
+		${4}
+	}
+snippet smth
+	submethod ${1:submethod_name}(${2:$attr}) {
+		${3}
+	}
+# Tests
+snippet test
+	use v6;
+	use Test;
+	${1:use lib 'lib';}
+
+	plan ${2:$num-tests};
+
+# IO
+snippet slurp
+	my ${1:$var} = "${2:filename}".IO.slurp;
+snippet rfile
+	for "${1:filename}".IO.lines -> $line {
+		${2}
+	}
+snippet open
+	my $fh = open "${1:filename}", ${2::r|:w|:a};
+	${3:# actions};
+	$fh.close;
diff --git a/sources_non_forked/vim-snippets/snippets/php.snippets b/sources_non_forked/vim-snippets/snippets/php.snippets
index b200463a..45a78212 100644
--- a/sources_non_forked/vim-snippets/snippets/php.snippets
+++ b/sources_non_forked/vim-snippets/snippets/php.snippets
@@ -601,4 +601,5 @@ snippet tc
 	{
 		${0:code}
 	}
-
+snippet te 
+	throw new ${1:Exception}("${2:Error Processing Request}");
diff --git a/sources_non_forked/vim-snippets/snippets/puppet.snippets b/sources_non_forked/vim-snippets/snippets/puppet.snippets
index 8b0a4109..9e9ceeb2 100644
--- a/sources_non_forked/vim-snippets/snippets/puppet.snippets
+++ b/sources_non_forked/vim-snippets/snippets/puppet.snippets
@@ -221,7 +221,7 @@ snippet package
 
 snippet yumrepo
 	yumrepo { "${1:repo name}":
-		Descr   => "${2:$1}",
+		descr   => "${2:$1}",
 		enabled => ${0:1},
 	}
 
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index ea5f2c98..d8f01054 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -1,6 +1,9 @@
 snippet #!
 	#!/usr/bin/env python
 	# -*- coding: utf-8 -*-
+snippet #!3
+	#!/usr/bin/env python3
+	# -*- coding: utf-8 -*-
 snippet imp
 	import ${0:module}
 snippet uni
@@ -145,6 +148,9 @@ snippet ptpython
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()
+# pdb in nosetests
+snippet nosetrace
+	from nose.tools import set_trace; set_trace()
 snippet pprint
 	import pprint; pprint.pprint(${1})
 snippet "
diff --git a/sources_non_forked/vim-snippets/snippets/rst.snippets b/sources_non_forked/vim-snippets/snippets/rst.snippets
index f4d99d7a..b1852458 100644
--- a/sources_non_forked/vim-snippets/snippets/rst.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rst.snippets
@@ -56,11 +56,40 @@ snippet err:
 snippet cau:
 	.. caution::
 		${0:Watch out!}
-#Spinx only
+#Sphinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
 
 		${0}
+snippet tod:
+	.. todo::
+		${0}
+snippet lis:
+	.. list-table:: ${0:Title}
+		:header-rows: 1
+		:stub-columns: 1
+
+		* - x1,y1
+		  - x2,y1
+		  - x3,y1
+		* - x1,y2
+		  - x2,y2
+		  - x3,y2
+		* - x1,y3
+		  - x2,y3
+		  - x3,y3
+
+snippet toc:
+	.. toctree::
+		:maxdepth: 2
+
+		${0}
+snippet dow:
+	:download:`${0:text} <${1:path}>`
+snippet ref:
+	:ref:`${0:text} <${1:path}>`
+snippet doc:
+	:doc:`${0:text} <${1:path}>`
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 6b9d85d7..e9509a29 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -1,12 +1,7 @@
-# encoding for Ruby 1.9
 snippet enc
 	# encoding: utf-8
-
-# #!/usr/bin/env ruby
 snippet #!
 	#!/usr/bin/env ruby
-	# encoding: utf-8
-
 # New Block
 snippet =b
 	=begin rdoc
@@ -29,15 +24,12 @@ snippet beg
 		${0}
 	rescue ${1:Exception} => ${2:e}
 	end
-
 snippet req require
 	require '${1}'
 snippet reqr
 	require_relative '${1}'
 snippet #
 	# =>
-snippet end
-	__END__
 snippet case
 	case ${1:object}
 	when ${2:condition}
@@ -115,7 +107,7 @@ snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${0}
 	end
-snippet cla class .. initialize .. end
+snippet clai class .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
 			${0}
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index c273f537..eeab689c 100644
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -7,6 +7,10 @@ snippet fn "Function definition"
 	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
+snippet pfn "Function definition"
+	pub fn ${1:function_name}(${2})${3} {
+		${0}
+	}
 snippet test "Unit test function"
 	#[test]
 	fn ${1:test_function_name}() {
@@ -106,7 +110,7 @@ snippet loop "loop {}" b
 	loop {
 		${0}
 	}
-snippet while "while loop"
+snippet wh "while loop"
 	while ${1:condition} {
 		${0}
 	}
diff --git a/sources_non_forked/vim-snippets/snippets/scss.snippets b/sources_non_forked/vim-snippets/snippets/scss.snippets
index 9a208cab..998a1200 100644
--- a/sources_non_forked/vim-snippets/snippets/scss.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scss.snippets
@@ -1,3 +1,5 @@
+extends css
+
 snippet $
 	$${1:variable}: ${0:value};
 snippet imp
@@ -8,7 +10,7 @@ snippet mix
 	}
 snippet inc
 	@include ${1:mixin}(${2});
-snippet ex
+snippet ext
 	@extend ${0};
 snippet fun
 	@function ${1:name}(${2:args}) {
diff --git a/sources_non_forked/vim-snippets/snippets/simplemvcf.snippets b/sources_non_forked/vim-snippets/snippets/simplemvcf.snippets
new file mode 100644
index 00000000..2ef6a653
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/simplemvcf.snippets
@@ -0,0 +1,122 @@
+snippet sm_controller
+	<?php
+		namespace Controllers;
+		use Core\View;
+		use Core\Controller;
+
+		class ${1:class_name} extends Controller
+		{
+			public function __construct()
+			{
+				parent::__construct();
+			}
+
+			public function index()
+			{
+				${2:}
+			}
+		}
+snippet sm_model
+	<?php 
+		namespace Models;
+	 
+		use Core\Model;
+	  
+		class ${1:class_name} extends Model 
+		{    
+			function __construct()
+			{
+				parent::__construct();
+			}  
+		}
+snippet sm_model_crud
+	<?php 
+		namespace Models;
+
+		use Core\Model;
+
+		class ${1:class_name} extends Model 
+		{    
+			private $${2:table};
+			function __construct()
+			{
+				parent::__construct();
+			}  
+			
+			public function getRow($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.' WHERE ${3:where}', $data);
+			}
+
+			public function getRows($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.');
+			}
+
+			public function insert($data)
+			{
+				$this->db->insert($table, $data);
+			}
+
+			public function update($data, $where)
+			{
+				$this->db->update($table ,$data, $where);
+			}
+
+			public function delete($where)
+			{
+				$this->db->delete($table, $where);
+			}
+		}
+snippet sm_render
+	View::render('${1:view}', $${2:array});
+snippet sm_render_template
+	View::renderTemplate('${1:part}', $${2:array});
+
+# database
+snippet sm_db_select
+	$this->db->select(${1:sql}, ${2:where});
+
+snippet sm_db_insert
+	$this->db->insert(${1:table}, ${2:data});
+
+snippet sm_db_update
+	$this->db->update(${1:table}, ${2:data}, ${3:where});
+
+snippet sm_db_delete
+	$this->db->delete(${1:table}, ${2:where});
+
+snippet sm_db_truncate
+	$this->db->delete(${1:table});
+
+#session
+snippet sm_session_set
+	Session::set(${1:key}, ${2:value});
+
+snippet sm_session_get
+	Session::get(${1:key});
+
+snippet sm_session_pull
+	Session::pull(${1:key});
+
+snippet sm_session_id
+	Session::id();
+
+snippet sm_session_destroy
+	Session::set(${1:key});
+	
+snippet sm_session_display
+	Session::display();
+
+#url
+snippet sm_url_redirect
+	Url:redirect('${1:path}');
+
+snippet sm_url_previous
+	Url:previous();
+
+snippet sm_url_templatepath
+	Url:templatePath();
+
+snippet sm_url_autolink
+	Url:autolink('${1:string}');
diff --git a/sources_non_forked/vim-snippets/snippets/stylus.snippets b/sources_non_forked/vim-snippets/snippets/stylus.snippets
index d03d1781..205f8479 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}
diff --git a/sources_non_forked/vim-snippets/snippets/supercollider.snippets b/sources_non_forked/vim-snippets/snippets/supercollider.snippets
new file mode 100644
index 00000000..afaefb69
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/supercollider.snippets
@@ -0,0 +1,22 @@
+snippet b
+	(
+		${0}
+	)
+snippet if
+	if (${1}) {
+		${0}
+	}
+snippet ife
+	if (${1}) {
+		${2}
+	} {
+		${0}
+	}
+snippet for
+	for (${1:1}, ${2:10}) { |i|
+		${0}
+	}
+snippet sdef
+	SynthDef(\\${1:synthName}, {${2}
+		${0}
+	}).add;
diff --git a/sources_non_forked/vim-snippets/snippets/tex.snippets b/sources_non_forked/vim-snippets/snippets/tex.snippets
index 0727cb45..a618ceb1 100644
--- a/sources_non_forked/vim-snippets/snippets/tex.snippets
+++ b/sources_non_forked/vim-snippets/snippets/tex.snippets
@@ -76,6 +76,14 @@ snippet enum enumerate environment
 	\begin{enumerate}
 		\item ${0}
 	\end{enumerate}
+snippet enuma enumerate environment
+	\begin{enumerate}[(a)]
+		\item ${0}
+	\end{enumerate}
+snippet enumi enumerate environment
+	\begin{enumerate}[(i)]
+		\item ${0}
+	\end{enumerate}
 # Itemize
 snippet itemize itemize environment
 	\begin{itemize}
@@ -249,7 +257,7 @@ snippet frac \frac{}{}
 snippet sum \sum^{}_{}
 	\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim \lim_{}
-	\lim_{${1:x \to +\infty}} ${0}
+	\lim_{${1:n \to \infty}} ${0}
 snippet frame frame environment
 	\begin{frame}[${1:t}]{${2:title}}
 		${0}
@@ -275,7 +283,11 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+snippet \{ \{ \}
+	\\{ ${0} \\}
 #delimiter
+snippet lr left right
+	\left${1} ${0} \right$1
 snippet lr( left( right) 
 	\left( ${0} \right)
 snippet lr| left| right| 
@@ -286,7 +298,6 @@ snippet lr[ left[ right]
 	\left[ ${0} \right]
 snippet lra langle rangle 
 	\langle ${0} \rangle
-
 # Code listings
 snippet lst
 	\begin{listing}[language=${1:language}]
diff --git a/sources_non_forked/vim-snippets/snippets/xml.snippets b/sources_non_forked/vim-snippets/snippets/xml.snippets
new file mode 100644
index 00000000..0ab346ba
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/xml.snippets
@@ -0,0 +1,12 @@
+# xml declaration
+snippet xml
+	<?xml version="1.0" encoding="UTF-8"?>
+# tag
+snippet t
+	<${1:}>
+		${2}
+	</$1>
+# inline tag
+snippet ti
+	<${1:}>${2}</$1>
+
diff --git a/sources_non_forked/vim-snippets/tests.sh b/sources_non_forked/vim-snippets/tests.sh
index 5b93b6ba..07f0ff31 100644
--- a/sources_non_forked/vim-snippets/tests.sh
+++ b/sources_non_forked/vim-snippets/tests.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets);
+SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets)
 
 if [[ $? -ne 1 ]]; then
-  echo These snippet lines are indented with spaces:;
-  echo;
-  echo "$SPACED";
-  echo;
+  echo These snippet lines are indented with spaces:
+  echo
+  echo "$SPACED"
+  echo
   echo Tests failed!
-  exit 1;
+  exit 1
 fi
 
 echo Tests passed!
-exit 0;
+exit 0
diff --git a/sources_non_forked/vim-surround/plugin/surround.vim b/sources_non_forked/vim-surround/plugin/surround.vim
index 82b016ed..6a986e89 100644
--- a/sources_non_forked/vim-surround/plugin/surround.vim
+++ b/sources_non_forked/vim-surround/plugin/surround.vim
@@ -164,7 +164,7 @@ function! s:wrap(string,char,type,removed,special)
   elseif newchar ==# ':'
     let before = ':'
     let after = ''
-  elseif newchar =~# "[tT\<C-T><,]"
+  elseif newchar =~# "[tT\<C-T><]"
     let dounmapp = 0
     let dounmapb = 0
     if !maparg(">","c")
@@ -200,7 +200,7 @@ function! s:wrap(string,char,type,removed,special)
         let before = '<'.tag.attributes.'>'
         let after  = '</'.substitute(tag,' .*','','').'>'
       endif
-      if newchar == "\<C-T>" || newchar == ","
+      if newchar == "\<C-T>"
         if type ==# "v" || type ==# "V"
           let before .= "\n\t"
         endif
@@ -386,7 +386,7 @@ function! s:dosurround(...) " {{{1
   let strcount = (scount == 1 ? "" : scount)
   if char == '/'
     exe 'norm! '.strcount.'[/d'.strcount.']/'
-  elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>"''`]'
+  elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>"''`]'
     exe 'norm! T'.char
     if getline('.')[col('.')-1] == char
       exe 'norm! l'
@@ -416,7 +416,7 @@ function! s:dosurround(...) " {{{1
     norm! "_x
     call setreg('"','/**/',"c")
     let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','')
-  elseif char =~# '[[:punct:]]' && char !~# '[][(){}<>]'
+  elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>]'
     exe 'norm! F'.char
     exe 'norm! df'.char
   else
diff --git a/update_plugins.py b/update_plugins.py
index bdea53d8..e4191a95 100644
--- a/update_plugins.py
+++ b/update_plugins.py
@@ -41,6 +41,8 @@ vim-commentary https://github.com/tpope/vim-commentary
 vim-go https://github.com/fatih/vim-go
 vim-gitgutter https://github.com/airblade/vim-gitgutter
 gruvbox https://github.com/morhetz/gruvbox
+vim-flake8 https://github.com/nvie/vim-flake8
+vim-jade https://github.com/digitaltoad/vim-jade
 """.strip()
 
 GITHUB_ZIP = '%s/archive/master.zip'
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index b70093b6..0b2d0141 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -232,7 +232,7 @@ map <C-h> <C-W>h
 map <C-l> <C-W>l
 
 " Close the current buffer
-map <leader>bd :Bclose<cr>
+map <leader>bd :Bclose<cr>:tabclose<cr>gT
 
 " Close all the buffers
 map <leader>ba :bufdo bd<cr>
diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim
index 255a31cf..9ae020dd 100644
--- a/vimrcs/extended.vim
+++ b/vimrcs/extended.vim
@@ -10,11 +10,11 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Set font according to system
 if has("mac") || has("macunix")
-    set gfn=Source\ Code\ Pro:h15,Menlo:h15
+    set gfn=Hack:h14,Source\ Code\ Pro:h15,Menlo:h15
 elseif has("win16") || has("win32")
-    set gfn=Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
+    set gfn=Hack:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
 elseif has("linux")
-    set gfn=Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
+    set gfn=Hack:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
 elseif has("unix")
     set gfn=Monospace\ 11
 endif
diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim
index bbff26f5..da48f593 100644
--- a/vimrcs/plugins_config.vim
+++ b/vimrcs/plugins_config.vim
@@ -104,6 +104,7 @@ au FileType mako vmap Si S"i${ _(<esc>2f"a) }<esc>
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 let g:airline_theme="luna"
 
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Vimroom
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -113,16 +114,29 @@ let g:goyo_margin_bottom = 2
 nnoremap <silent> <leader>z :Goyo<cr>
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Vim-go
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:go_fmt_command = "goimports"
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Syntastic (syntax checker)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Python
 let g:syntastic_python_checkers=['pyflakes']
+
+" Javascript
 let g:syntastic_javascript_checkers = ['jshint']
 
+" Go
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_go_checkers = ['go', 'golint', 'errcheck']
+
 " Custom CoffeeScript SyntasticCheck
 func! SyntasticCheckCoffeescript()
     let l:filename = substitute(expand("%:p"), '\(\w\+\)\.coffee', '.coffee.\1.js', '')
-    execute "e " . l:filename
+    execute "tabedit " . l:filename
     execute "SyntasticCheck"
     execute "Errors"
 endfunc