diff --git a/.gitignore b/.gitignore
index 6524f395..66d01465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ sources_forked/yankring/doc/tags
 sources_non_forked/tlib/doc/tags
 my_configs.vim
 tags
+.DS_Store
diff --git a/sources_non_forked/goyo.vim/plugin/goyo.vim b/sources_non_forked/goyo.vim/plugin/goyo.vim
index c64d4aae..7c43f4ef 100644
--- a/sources_non_forked/goyo.vim/plugin/goyo.vim
+++ b/sources_non_forked/goyo.vim/plugin/goyo.vim
@@ -1,4 +1,4 @@
-" Copyright (c) 2013 Junegunn Choi
+" Copyright (c) 2014 Junegunn Choi
 "
 " MIT License
 "
@@ -33,13 +33,12 @@ function! s:set_color(group, attr, color)
   execute printf("hi %s %s%s=%s", a:group, gui ? 'gui' : 'cterm', a:attr, a:color)
 endfunction
 
-function! s:blank()
-  let main = bufwinnr(t:goyo_master)
-  if main != -1
-    execute main . 'wincmd w'
-  else
+function! s:blank(repel)
+  if bufwinnr(t:goyo_pads.r) <= bufwinnr(t:goyo_pads.l) + 1
+    \ || bufwinnr(t:goyo_pads.b) <= bufwinnr(t:goyo_pads.t) + 3
     call s:goyo_off()
   endif
+  execute 'wincmd' a:repel
 endfunction
 
 function! s:init_pad(command)
@@ -59,12 +58,12 @@ function! s:init_pad(command)
   return bufnr
 endfunction
 
-function! s:setup_pad(bufnr, vert, size)
+function! s:setup_pad(bufnr, vert, size, repel)
   let win = bufwinnr(a:bufnr)
   execute win . 'wincmd w'
   execute (a:vert ? 'vertical ' : '') . 'resize ' . max([0, a:size])
   augroup goyop
-    autocmd WinEnter,CursorMoved <buffer> nested call s:blank()
+    execute 'autocmd WinEnter,CursorMoved <buffer> nested call s:blank("'.a:repel.'")'
     autocmd WinLeave <buffer> call s:hide_statusline()
   augroup END
 
@@ -86,17 +85,21 @@ function! s:hmargin()
 endfunction
 
 function! s:resize_pads()
+  let t:goyo_width         = max([2, t:goyo_width])
+  let t:goyo_margin_top    = min([max([2, t:goyo_margin_top]),    &lines / 2 - 1])
+  let t:goyo_margin_bottom = min([max([2, t:goyo_margin_bottom]), &lines / 2 - 1])
+
   let hmargin = s:hmargin()
-  let tmargin = get(g:, 'goyo_margin_top', 4)
-  let bmargin = get(g:, 'goyo_margin_bottom', 4)
 
   augroup goyop
     autocmd!
   augroup END
-  call s:setup_pad(t:goyo_pads.t, 0, tmargin - 1)
-  call s:setup_pad(t:goyo_pads.b, 0, bmargin - 2)
-  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1)
-  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1)
+  call s:setup_pad(t:goyo_pads.t, 0, t:goyo_margin_top - 1, 'j')
+  call s:setup_pad(t:goyo_pads.b, 0, t:goyo_margin_bottom - 2, 'k')
+  call s:setup_pad(t:goyo_pads.l, 1, hmargin / 2 - 1, 'l')
+  call s:setup_pad(t:goyo_pads.r, 1, hmargin / 2 - 1, 'h')
+
+  let t:goyo_width = winwidth(0)
 endfunction
 
 function! s:tranquilize()
@@ -119,6 +122,41 @@ function! s:hide_statusline()
   let &l:statusline = repeat(' ', winwidth(0))
 endfunction
 
+function! s:hide_linenr()
+  if !get(g:, 'goyo_linenr', 0)
+    setlocal nonu
+    if exists('&rnu')
+      setlocal nornu
+    endif
+  endif
+  if exists('&colorcolumn')
+    setlocal colorcolumn=
+  endif
+endfunction
+
+function! s:maps_nop()
+  let mapped = filter(['R', 'H', 'J', 'K', 'L', '|', '_', '='],
+                    \ "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <c-w>'.escape(c, '|').' <nop>'
+  endfor
+  return mapped
+endfunction
+
+function! s:maps_resize()
+  let commands = {
+  \ '>': ':<c-u>let t:goyo_width = winwidth(0) + 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '<': ':<c-u>let t:goyo_width = winwidth(0) - 2 * v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '+': ':<c-u>let t:goyo_margin_top -= v:count1 <bar> let t:goyo_margin_bottom -= v:count1 <bar> call <sid>resize_pads()<cr>',
+  \ '-': ':<c-u>let t:goyo_margin_top += v:count1 <bar> let t:goyo_margin_bottom += v:count1 <bar> call <sid>resize_pads()<cr>'
+  \ }
+  let mapped = filter(keys(commands), "empty(maparg(\"\<c-w>\".v:val, 'n'))")
+  for c in mapped
+    execute 'nnoremap <silent> <c-w>'.c.' '.commands[c]
+  endfor
+  return mapped
+endfunction
+
 function! s:goyo_on(width)
   let s:orig_tab = tabpagenr()
 
@@ -127,6 +165,8 @@ function! s:goyo_on(width)
 
   let t:goyo_master = winbufnr(0)
   let t:goyo_width  = a:width
+  let t:goyo_margin_top = get(g:, 'goyo_margin_top', 4)
+  let t:goyo_margin_bottom = get(g:, 'goyo_margin_bottom', 4)
   let t:goyo_pads = {}
   let t:goyo_revert =
     \ { 'laststatus':     &laststatus,
@@ -140,6 +180,7 @@ function! s:goyo_on(width)
     \   'sidescroll':     &sidescroll,
     \   'sidescrolloff':  &sidescrolloff
     \ }
+  let t:goyo_maps = extend(s:maps_nop(), s:maps_resize())
   if has('gui_running')
     let t:goyo_revert.guioptions = &guioptions
   endif
@@ -177,16 +218,7 @@ function! s:goyo_on(width)
     silent! call lightline#disable()
   endif
 
-  if !get(g:, 'goyo_linenr', 0)
-    setlocal nonu
-    if exists('&rnu')
-      setlocal nornu
-    endif
-  endif
-  if exists('&colorcolumn')
-    setlocal colorcolumn=
-  endif
-
+  call s:hide_linenr()
   " Global options
   let &winheight = max([&winminheight, 1])
   set winminheight=1
@@ -217,11 +249,11 @@ function! s:goyo_on(width)
 
   augroup goyo
     autocmd!
-    autocmd BufWinLeave <buffer> call s:goyo_off()
     autocmd TabLeave    *        call s:goyo_off()
     autocmd VimResized  *        call s:resize_pads()
     autocmd ColorScheme *        call s:tranquilize()
-    autocmd WinEnter,WinLeave <buffer> call s:hide_statusline()
+    autocmd BufWinEnter *        call s:hide_linenr() | call s:hide_statusline()
+    autocmd WinEnter,WinLeave *  call s:hide_statusline()
   augroup END
 
   call s:hide_statusline()
@@ -251,6 +283,10 @@ function! s:goyo_off()
   augroup END
   augroup! goyop
 
+  for c in t:goyo_maps
+    execute 'nunmap <c-w>'.escape(c, '|')
+  endfor
+
   let goyo_revert             = t:goyo_revert
   let goyo_disabled_gitgutter = t:goyo_disabled_gitgutter
   let goyo_disabled_signify   = t:goyo_disabled_signify
@@ -268,6 +304,7 @@ function! s:goyo_off()
   tabclose
   execute 'normal! '.s:orig_tab.'gt'
   if winbufnr(0) == goyo_orig_buffer
+    " Doesn't work if window closed with `q`
     execute printf('normal! %dG%d|', line, col)
   endif
 
diff --git a/sources_non_forked/nerdtree/lib/nerdtree/path.vim b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
index ea6aa032..dbecb027 100644
--- a/sources_non_forked/nerdtree/lib/nerdtree/path.vim
+++ b/sources_non_forked/nerdtree/lib/nerdtree/path.vim
@@ -623,8 +623,13 @@ function! s:Path.str(...)
 
     if has_key(options, 'truncateTo')
         let limit = options['truncateTo']
-        if len(toReturn) > limit
-            let toReturn = "<" . strpart(toReturn, len(toReturn) - limit + 1)
+        if len(toReturn) > limit-1
+            let toReturn = toReturn[(len(toReturn)-limit+1):]
+            if len(split(toReturn, '/')) > 1
+                let toReturn = '</' . join(split(toReturn, '/')[1:], '/') . '/'
+            else
+                let toReturn = '<' . toReturn
+            endif
         endif
     endif
 
diff --git a/sources_non_forked/syntastic/README.markdown b/sources_non_forked/syntastic/README.markdown
index 1f8ede1a..4d03421e 100644
--- a/sources_non_forked/syntastic/README.markdown
+++ b/sources_non_forked/syntastic/README.markdown
@@ -18,10 +18,27 @@
 
 
 - - -
-1\. [Introduction](#introduction)  
-2\. [Installation](#installation)  
-3\. [FAQ](#faq)  
-4\. [Other resources](#otherresources)  
+1. [Introduction](#introduction)  
+2. [Installation](#installation)  
+2.1. [Requirements](#requirements)  
+2.2. [Installing syntastic with Pathogen](#installpathogen)  
+3. [Recommended settings](#settings)  
+4. [FAQ](#faq)  
+4.1. [I installed syntastic but it isn't reporting any errors...](#faqinfo)  
+4.2. [The `python` checker complains about syntactically valid Python 3 constructs...](#faqpython3)  
+4.3. [Are there any local checkers for HTML5 that I can use with syntastic?](#faqhtml5)  
+4.4. [The `perl` checker has stopped working...](#faqperl)  
+4.5. [What happened to the `rustc` checker?](#faqrust)  
+4.6. [I run a checker and the location list is not updated...](#faqloclist)  
+4.6. [I run`:lopen` or `:lwindow` and the error window is empty...](#faqloclist)  
+4.7. [How can I pass additional arguments to a checker?](#faqargs)  
+4.8. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
+4.9. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
+4.10. [I have enabled multiple checkers for the current filetype.  How can I display all of the errors from all of the checkers together?](#faqaggregate)  
+4.11. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
+4.12. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
+5. [Resources](#otherresources)  
+
 - - -
 
 <a name="introduction"></a>
@@ -35,17 +52,17 @@ are detected, the user is notified and is happy because they didn't have to
 compile their code or execute their script to find them.
 
 At the time of this writing, syntax checking plugins exist for ActionScript,
-Ada, AppleScript, Arduino, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
-C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
-DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
-Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS,
-Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM,
-Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable
-Object, OS X and iOS property lists, Puppet, Python, R, Racket, Relax NG,
-reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo,
-Twig, TypeScript, Vala, Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML,
-z80, Zope page templates, and zsh.  See the [wiki][3] for details about the
-corresponding supported checkers.
+Ada, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C, C++, C#, Cabal,
+Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart, DocBook, Dust,
+Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go, Haml, Haskell,
+Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON, JSX, LESS, Lex, Limbo,
+LISP, LLVM intermediate language, Lua, Markdown, MATLAB, NASM, Objective-C,
+Objective-C++, OCaml, Perl, Perl POD, PHP, gettext Portable Object, OS X and
+iOS property lists, Puppet, Python, R, Racket, Relax NG, reStructuredText, RPM
+spec, Ruby, SASS/SCSS, Scala, Slim, Tcl, TeX, Texinfo, Twig, TypeScript, Vala,
+Verilog, VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates,
+and zsh.  See the [wiki][3] for details about the corresponding supported
+checkers.
 
 Below is a screenshot showing the methods that Syntastic uses to display syntax
 errors.  Note that, in practise, you will only have a subset of these methods
@@ -128,18 +145,36 @@ If you get an error when you do this, then you probably didn't install
 following:
 
 1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
-2. Added the `call pathogen#infect()` line to your `~/.vimrc` file
+2. Added the `execute pathogen#infect()` line to your `~/.vimrc` file
 3. Did the `git clone` of syntastic inside `~/.vim/bundle`
 4. Have permissions to access all of these directories.
 
+<a name="settings"></a>
+
+## 3\. Recommended settings
+
+Syntastic has a large number of options that can be configured, and the
+defaults are not particularly well suitable for new users.  It is recommended
+that you start by adding the following lines to your `vimrc` file, and return
+to them after reading the manual (see `:help syntastic` in Vim):
+```vim
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+```
 
 <a name="faq"></a>
 
-## 3\. FAQ
+## 4\. FAQ
 
 <a name="faqinfo"></a>
 
-__Q. I installed syntastic but it isn't reporting any errors...__
+__4.1. Q. I installed syntastic but it isn't reporting any errors...__
 
 A. The most likely reason is that none of the syntax checkers that it requires
 is installed. For example: by default, python requires either `flake8` or
@@ -155,7 +190,7 @@ create an issue - or better yet, create a pull request.
 
 <a name="faqpython3"></a>
 
-__Q. The `python` checker complains about syntactically valid Python 3 constructs...__
+__4.2. Q. The `python` checker complains about syntactically valid Python 3 constructs...__
 
 A. Configure the `python` checker to call a Python 3 interpreter rather than
 Python 2, e.g:
@@ -163,9 +198,27 @@ Python 2, e.g:
 let g:syntastic_python_python_exec = '/path/to/python3'
 ```
 
+<a name="faqhtml5"></a>
+
+__4.3. Q. Are there any local checkers for HTML5 that I can use with syntastic?__
+
+[HTML Tidy][18] has a fork named [HTML Tidy for HTML5][19].  It's a drop
+in replacement, and syntastic can use it without changes.  Just install it
+somewhere and point `g:syntastic_html_tidy_exec` to its executable.
+
+Alternatively, you can install [vnu.jar][21] from the [validator.nu][20]
+project and run it as a [HTTP server][23]:
+```sh
+$ java -Xss512k -cp /path/to/vnu.jar nu.validator.servlet.Main 8888
+```
+Then you can [configure][22] syntastic to use it:
+```vim
+let g:syntastic_html_validator_api = 'http://localhost:8888/'
+```
+
 <a name="faqperl"></a>
 
-__Q. The `perl` checker has stopped working...__
+__4.4. Q. The `perl` checker has stopped working...__
 
 A. The `perl` checker runs `perl -c` against your file, which in turn
 __executes__ any `BEGIN`, `UNITCHECK`, and `CHECK` blocks, and any `use`
@@ -174,14 +227,14 @@ wrote the file yourself, but it's a security problem if you're checking third
 party files.  Since there is currently no way to disable this behaviour while
 still producing useful results, the checker is now disabled by default.  To
 (re-)enable it, make sure the `g:syntastic_perl_checkers` list includes `perl`,
-and set `g:syntastic_enable_perl_checker` to 1 in your vimrc:
+and set `g:syntastic_enable_perl_checker` to 1 in your `vimrc`:
 ```vim
 let g:syntastic_enable_perl_checker = 1
 ```
 
 <a name="faqrust"></a>
 
-__Q. What happened to the `rustc` checker?__
+__4.5. Q. What happened to the `rustc` checker?__
 
 A. It has been included in the [Rust compiler package][12].  If you have
 a recent version of the Rust compiler, the checker should be picked up
@@ -189,27 +242,27 @@ automatically by syntastic.
 
 <a name="faqloclist"></a>
 
-__Q. I run a checker and the location list is not updated...__  
-__Q. I run`:lopen` or `:lwindow` and the error window is empty...__
+__4.6. Q. I run a checker and the location list is not updated...__  
+__4.6. Q. I run`:lopen` or `:lwindow` and the error window is empty...__
 
 A. By default the location list is changed only when you run the `:Errors`
 command, in order to minimise conflicts with other plugins.  If you want the
 location list to always be updated when you run the checkers, add this line to
-your vimrc:
+your `vimrc`:
 ```vim
 let g:syntastic_always_populate_loc_list = 1
 ```
 
 <a name="faqargs"></a>
 
-__Q. How can I pass additional arguments to a checker?__
+__4.7. Q. How can I pass additional arguments to a checker?__
 
 A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
 that do can be configured using global variables. The general form of the
 global `args` variables is `syntastic_<filetype>_<checker>_args`.
 
-So, If you wanted to pass "--my --args --here" to the ruby mri checker you
-would add this line to your vimrc:
+So, If you wanted to pass `--my --args --here` to the ruby mri checker you
+would add this line to your `vimrc`:
 ```vim
 let g:syntastic_ruby_mri_args = "--my --args --here"
 ```
@@ -218,10 +271,10 @@ See `:help syntastic-checker-options` for more information.
 
 <a name="faqcheckers"></a>
 
-__Q. Syntastic supports several checkers for my filetype - how do I tell it
+__4.8. Q. Syntastic supports several checkers for my filetype - how do I tell it
 which one(s) to use?__
 
-A. Stick a line like this in your vimrc:
+A. Stick a line like this in your `vimrc`:
 ```vim
 let g:syntastic_<filetype>_checkers = ['<checker-name>']
 ```
@@ -259,7 +312,7 @@ filetype of the current file is `php`).
 
 <a name="faqstyle"></a>
 
-__Q. What is the difference between syntax checkers and style checkers?__
+__4.9. Q. What is the difference between syntax checkers and style checkers?__
 
 A. The errors and warnings they produce are highlighted differently and can
 be filtered by different rules, but otherwise the distinction is pretty much
@@ -289,10 +342,10 @@ See `:help syntastic_quiet_messages` for details.
 
 <a name="faqaggregate"></a>
 
-__Q. I have enabled multiple checkers for the current filetype.  How can I
+__4.10. Q. I have enabled multiple checkers for the current filetype.  How can I
 display all of the errors from all of the checkers together?__
 
-A. Set `g:syntastic_aggregate_errors` to 1 in your vimrc:
+A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
 ```vim
 let g:syntastic_aggregate_errors = 1
 ```
@@ -301,19 +354,19 @@ See `:help syntastic-aggregating-errors` for more details.
 
 <a name="faqlnext"></a>
 
-__Q. How can I jump between the different errors without using the location
+__4.11. Q. How can I jump between the different errors without using the location
 list at the bottom of the window?__
 
 A. Vim provides several built-in commands for this. See `:help :lnext` and
-`:help :lprev`.
+`:help :lprevious`.
 
 If you use these commands a lot then you may want to add shortcut mappings to
-your vimrc, or install something like [unimpaired][2], which provides such
+your `vimrc`, or install something like [unimpaired][2], which provides such
 mappings (among other things).
 
 <a name="faqbdelete"></a>
 
-__Q. The error window is closed automatically when I :quit the current buffer
+__4.12. Q. The error window is closed automatically when I :quit the current buffer
 but not when I :bdelete it?__
 
 A. There is no safe way to handle that situation automatically, but you can
@@ -324,10 +377,9 @@ nnoremap <silent> <C-d> :lclose<CR>:bdelete<CR>
 cabbrev <silent> bd lclose\|bdelete
 ```
 
-
 <a name="otherresources"></a>
 
-## 4\. Other resources
+## 5\. Resources
 
 The preferred place for posting suggestions, reporting bugs, and general
 discussions related to syntastic is the [issue tracker at GitHub][4].
@@ -358,6 +410,12 @@ a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
 [15]: https://github.com/MarcWeber/vim-addon-manager
 [16]: https://github.com/junegunn/vim-plug/
 [17]: https://github.com/gmarik/Vundle.vim
+[18]: http://tidy.sourceforge.net/
+[19]: http://w3c.github.io/tidy-html5/
+[20]: http://about.validator.nu/
+[21]: https://github.com/validator/validator/releases/latest
+[22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
+[23]: http://validator.github.io/validator/#standalone
 
 <!--
 vim:tw=79:sw=4:
diff --git a/sources_non_forked/syntastic/autoload/syntastic/c.vim b/sources_non_forked/syntastic/autoload/syntastic/c.vim
index 32226482..44279d1f 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/c.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/c.vim
@@ -18,9 +18,17 @@ endfunction " }}}2
 " read additional compiler flags from the given configuration file
 " the file format and its parsing mechanism is inspired by clang_complete
 function! syntastic#c#ReadConfig(file) " {{{2
-    " search in the current file's directory upwards
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: looking for', a:file)
+
+    " search upwards from the current file's directory
     let config = findfile(a:file, '.;')
-    if config == '' || !filereadable(config)
+    if config == ''
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file not found')
+        return ''
+    endif
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: config file:', config)
+    if !filereadable(config)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file unreadable')
         return ''
     endif
 
@@ -31,6 +39,7 @@ function! syntastic#c#ReadConfig(file) " {{{2
     try
         let lines = readfile(config)
     catch /\m^Vim\%((\a\+)\)\=:E48[45]/
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: error reading file')
         return ''
     endtry
 
@@ -62,7 +71,7 @@ endfunction " }}}2
 " GetLocList() for C-like compilers
 function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     try
-        let flags = s:_getCflags(a:filetype, a:subchecker, a:options)
+        let flags = s:_get_cflags(a:filetype, a:subchecker, a:options)
     catch /\m\C^Syntastic: skip checks$/
         return []
     endtry
@@ -70,9 +79,9 @@ function! syntastic#c#GetLocList(filetype, subchecker, options) " {{{2
     let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
         \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
 
-    let errorformat = s:_getCheckerVar('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+    let errorformat = s:_get_checker_var('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
 
-    let postprocess = s:_getCheckerVar('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+    let postprocess = s:_get_checker_var('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
         \ ['filterForeignErrors'] : []
 
     " process makeprg
@@ -91,25 +100,25 @@ function! s:_init() " {{{2
     let s:handlers = []
     let s:cflags = {}
 
-    call s:_regHandler('\m\<cairo',       's:_check_pkg', ['cairo', 'cairo'])
-    call s:_regHandler('\m\<freetype',    's:_check_pkg', ['freetype', 'freetype2', 'freetype'])
-    call s:_regHandler('\m\<glade',       's:_check_pkg', ['glade', 'libglade-2.0', 'libglade'])
-    call s:_regHandler('\m\<glib',        's:_check_pkg', ['glib', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<gtk',         's:_check_pkg', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:_regHandler('\m\<libsoup',     's:_check_pkg', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:_regHandler('\m\<libxml',      's:_check_pkg', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:_regHandler('\m\<pango',       's:_check_pkg', ['pango', 'pango'])
-    call s:_regHandler('\m\<SDL',         's:_check_pkg', ['sdl', 'sdl'])
-    call s:_regHandler('\m\<opengl',      's:_check_pkg', ['opengl', 'gl'])
-    call s:_regHandler('\m\<webkit',      's:_check_pkg', ['webkit', 'webkit-1.0'])
+    call s:_registerHandler('\m\<cairo',       's:_checkPackage', ['cairo', 'cairo'])
+    call s:_registerHandler('\m\<freetype',    's:_checkPackage', ['freetype', 'freetype2', 'freetype'])
+    call s:_registerHandler('\m\<glade',       's:_checkPackage', ['glade', 'libglade-2.0', 'libglade'])
+    call s:_registerHandler('\m\<glib',        's:_checkPackage', ['glib', 'glib-2.0', 'glib'])
+    call s:_registerHandler('\m\<gtk',         's:_checkPackage', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:_registerHandler('\m\<libsoup',     's:_checkPackage', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:_registerHandler('\m\<libxml',      's:_checkPackage', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:_registerHandler('\m\<pango',       's:_checkPackage', ['pango', 'pango'])
+    call s:_registerHandler('\m\<SDL',         's:_checkPackage', ['sdl', 'sdl'])
+    call s:_registerHandler('\m\<opengl',      's:_checkPackage', ['opengl', 'gl'])
+    call s:_registerHandler('\m\<webkit',      's:_checkPackage', ['webkit', 'webkit-1.0'])
 
-    call s:_regHandler('\m\<php\.h\>',    's:_check_php',    [])
-    call s:_regHandler('\m\<Python\.h\>', 's:_check_python', [])
-    call s:_regHandler('\m\<ruby',        's:_check_ruby',   [])
+    call s:_registerHandler('\m\<php\.h\>',    's:_checkPhp',    [])
+    call s:_registerHandler('\m\<Python\.h\>', 's:_checkPython', [])
+    call s:_registerHandler('\m\<ruby',        's:_checkRuby',   [])
 endfunction " }}}2
 
-" return a handler dictionary object
-function! s:_regHandler(regex, function, args) " {{{2
+" register a handler dictionary object
+function! s:_registerHandler(regex, function, args) " {{{2
     let handler = {}
     let handler["regex"] = a:regex
     let handler["func"] = function(a:function)
@@ -117,8 +126,75 @@ function! s:_regHandler(regex, function, args) " {{{2
     call add(s:handlers, handler)
 endfunction " }}}2
 
+" try to find library with 'pkg-config'
+" search possible libraries from first to last given
+" argument until one is found
+function! s:_checkPackage(name, ...) " {{{2
+    if executable('pkg-config')
+        if !has_key(s:cflags, a:name)
+            for pkg in a:000
+                let pkg_flags = system('pkg-config --cflags ' . pkg)
+                " since we cannot necessarily trust the pkg-config exit code
+                " we have to check for an error output as well
+                if v:shell_error == 0 && pkg_flags !~? 'not found'
+                    let pkg_flags = ' ' . substitute(pkg_flags, "\n", '', '')
+                    let s:cflags[a:name] = pkg_flags
+                    return pkg_flags
+                endif
+            endfor
+        else
+            return s:cflags[a:name]
+        endif
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find PHP includes with 'php-config'
+function! s:_checkPhp() " {{{2
+    if executable('php-config')
+        if !has_key(s:cflags, 'php')
+            let s:cflags['php'] = system('php-config --includes')
+            let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
+        endif
+        return s:cflags['php']
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find the python headers with distutils
+function! s:_checkPython() " {{{2
+    if executable('python')
+        if !has_key(s:cflags, 'python')
+            let s:cflags['python'] = system('python -c ''from distutils import ' .
+                \ 'sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())''')
+            let s:cflags['python'] = substitute(s:cflags['python'], "\n", '', '')
+            let s:cflags['python'] = ' -I' . s:cflags['python']
+        endif
+        return s:cflags['python']
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find the ruby headers with 'rbconfig'
+function! s:_checkRuby() " {{{2
+    if executable('ruby')
+        if !has_key(s:cflags, 'ruby')
+            let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
+                \ '''puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]''')
+            let s:cflags['ruby'] = substitute(s:cflags['ruby'], "\n", '', '')
+            let s:cflags['ruby'] = ' -I' . s:cflags['ruby']
+        endif
+        return s:cflags['ruby']
+    endif
+    return ''
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
 " resolve checker-related user variables
-function! s:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
+function! s:_get_checker_var(scope, filetype, subchecker, name, default) " {{{2
     let prefix = a:scope . ':' . 'syntastic_'
     if exists(prefix . a:filetype . '_' . a:subchecker . '_' . a:name)
         return {a:scope}:syntastic_{a:filetype}_{a:subchecker}_{a:name}
@@ -130,10 +206,10 @@ function! s:_getCheckerVar(scope, filetype, subchecker, name, default) " {{{2
 endfunction " }}}2
 
 " resolve user CFLAGS
-function! s:_getCflags(ft, ck, opts) " {{{2
+function! s:_get_cflags(ft, ck, opts) " {{{2
     " determine whether to parse header files as well
-    if has_key(a:opts, 'header_names') && expand('%') =~? a:opts['header_names']
-        if s:_getCheckerVar('g', a:ft, a:ck, 'check_header', 0)
+    if has_key(a:opts, 'header_names') && expand('%', 1) =~? a:opts['header_names']
+        if s:_get_checker_var('g', a:ft, a:ck, 'check_header', 0)
             let flags = get(a:opts, 'header_flags', '') . ' -c ' . syntastic#c#NullOutput()
         else
             " checking headers when check_header is unset: bail out
@@ -143,21 +219,21 @@ function! s:_getCflags(ft, ck, opts) " {{{2
         let flags = get(a:opts, 'main_flags', '')
     endif
 
-    let flags .= ' ' . s:_getCheckerVar('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_getIncludeDirs(a:ft)
+    let flags .= ' ' . s:_get_checker_var('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_get_include_dirs(a:ft)
 
     " check if the user manually set some cflags
-    let b_cflags = s:_getCheckerVar('b', a:ft, a:ck, 'cflags', '')
+    let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
     if b_cflags == ''
         " check whether to search for include files at all
-        if !s:_getCheckerVar('g', a:ft, a:ck, 'no_include_search', 0)
+        if !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
             if a:ft ==# 'c' || a:ft ==# 'cpp'
                 " refresh the include file search if desired
-                if s:_getCheckerVar('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-                    let flags .= ' ' . s:_searchHeaders()
+                if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+                    let flags .= ' ' . s:_search_headers()
                 else
                     " search for header includes if not cached already
                     if !exists('b:syntastic_' . a:ft . '_includes')
-                        let b:syntastic_{a:ft}_includes = s:_searchHeaders()
+                        let b:syntastic_{a:ft}_includes = s:_search_headers()
                     endif
                     let flags .= ' ' . b:syntastic_{a:ft}_includes
                 endif
@@ -169,7 +245,7 @@ function! s:_getCflags(ft, ck, opts) " {{{2
     endif
 
     " add optional config file parameters
-    let config_file = s:_getCheckerVar('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
     let flags .= ' ' . syntastic#c#ReadConfig(config_file)
 
     return flags
@@ -177,7 +253,7 @@ endfunction " }}}2
 
 " get the gcc include directory argument depending on the default
 " includes and the optional user-defined 'g:syntastic_c_include_dirs'
-function! s:_getIncludeDirs(filetype) " {{{2
+function! s:_get_include_dirs(filetype) " {{{2
     let include_dirs = []
 
     if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
@@ -195,7 +271,7 @@ endfunction " }}}2
 
 " search the first 100 lines for include statements that are
 " given in the handlers dictionary
-function! s:_searchHeaders() " {{{2
+function! s:_search_headers() " {{{2
     let includes = ''
     let files = []
     let found = []
@@ -221,7 +297,7 @@ function! s:_searchHeaders() " {{{2
     " search included headers
     for hfile in files
         if hfile != ''
-            let filename = expand('%:p:h') . syntastic#util#Slash() . hfile
+            let filename = expand('%:p:h', 1) . syntastic#util#Slash() . hfile
 
             try
                 let lines = readfile(filename, '', 100)
@@ -250,69 +326,6 @@ function! s:_searchHeaders() " {{{2
     return includes
 endfunction " }}}2
 
-" try to find library with 'pkg-config'
-" search possible libraries from first to last given
-" argument until one is found
-function! s:_check_pkg(name, ...) " {{{2
-    if executable('pkg-config')
-        if !has_key(s:cflags, a:name)
-            for pkg in a:000
-                let pkg_flags = system('pkg-config --cflags ' . pkg)
-                " since we cannot necessarily trust the pkg-config exit code
-                " we have to check for an error output as well
-                if v:shell_error == 0 && pkg_flags !~? 'not found'
-                    let pkg_flags = ' ' . substitute(pkg_flags, "\n", '', '')
-                    let s:cflags[a:name] = pkg_flags
-                    return pkg_flags
-                endif
-            endfor
-        else
-            return s:cflags[a:name]
-        endif
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find PHP includes with 'php-config'
-function! s:_check_php() " {{{2
-    if executable('php-config')
-        if !has_key(s:cflags, 'php')
-            let s:cflags['php'] = system('php-config --includes')
-            let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
-        endif
-        return s:cflags['php']
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find the ruby headers with 'rbconfig'
-function! s:_check_ruby() " {{{2
-    if executable('ruby')
-        if !has_key(s:cflags, 'ruby')
-            let s:cflags['ruby'] = system('ruby -r rbconfig -e ' .
-                \ '''puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]''')
-            let s:cflags['ruby'] = substitute(s:cflags['ruby'], "\n", '', '')
-            let s:cflags['ruby'] = ' -I' . s:cflags['ruby']
-        endif
-        return s:cflags['ruby']
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find the python headers with distutils
-function! s:_check_python() " {{{2
-    if executable('python')
-        if !has_key(s:cflags, 'python')
-            let s:cflags['python'] = system('python -c ''from distutils import ' .
-                \ 'sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())''')
-            let s:cflags['python'] = substitute(s:cflags['python'], "\n", '', '')
-            let s:cflags['python'] = ' -I' . s:cflags['python']
-        endif
-        return s:cflags['python']
-    endif
-    return ''
-endfunction " }}}2
-
 " }}}1
 
 " default include directories
diff --git a/sources_non_forked/syntastic/autoload/syntastic/log.vim b/sources_non_forked/syntastic/autoload/syntastic/log.vim
index f84eb1d2..8573a2fc 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/log.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/log.vim
@@ -61,11 +61,11 @@ endfunction " }}}2
 " @vimlint(EVL102, 0, l:OLD_VAR)
 
 function! syntastic#log#debug(level, msg, ...) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    let leader = s:_log_timestamp()
     call s:_logRedirect(1)
 
     if a:0 > 0
@@ -81,11 +81,11 @@ function! syntastic#log#debug(level, msg, ...) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugShowOptions(level, names) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    let leader = s:_log_timestamp()
     call s:_logRedirect(1)
 
     let vlist = copy(type(a:names) == type("") ? [a:names] : a:names)
@@ -97,16 +97,16 @@ function! syntastic#log#debugShowOptions(level, names) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugShowVariables(level, names) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
-    let leader = s:_logTimestamp()
+    let leader = s:_log_timestamp()
     call s:_logRedirect(1)
 
     let vlist = type(a:names) == type("") ? [a:names] : a:names
     for name in vlist
-        let msg = s:_formatVariable(name)
+        let msg = s:_format_variable(name)
         if msg != ''
             echomsg leader . msg
         endif
@@ -116,7 +116,7 @@ function! syntastic#log#debugShowVariables(level, names) " {{{2
 endfunction " }}}2
 
 function! syntastic#log#debugDump(level) " {{{2
-    if !s:isDebugEnabled(a:level)
+    if !s:_isDebugEnabled(a:level)
         return
     endif
 
@@ -136,14 +136,14 @@ function! s:_isDebugEnabled_dumb(level) " {{{2
     return (g:syntastic_debug / a:level) % 2
 endfunction " }}}2
 
-let s:isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
-lockvar s:isDebugEnabled
+let s:_isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
+lockvar s:_isDebugEnabled
 
 function! s:_logRedirect(on) " {{{2
     if exists("g:syntastic_debug_file")
         if a:on
             try
-                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file))
+                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file, 1))
             catch /\m^Vim\%((\a\+)\)\=:/
                 silent! redir END
                 unlet g:syntastic_debug_file
@@ -154,11 +154,15 @@ function! s:_logRedirect(on) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_logTimestamp() " {{{2
+" }}}1
+
+" Utilities {{{1
+
+function! s:_log_timestamp() " {{{2
     return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
 endfunction " }}}2
 
-function! s:_formatVariable(name) " {{{2
+function! s:_format_variable(name) " {{{2
     let vals = []
     if exists('g:syntastic_' . a:name)
         call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
diff --git a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
index 04c88583..85d59818 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/preprocess.vim
@@ -30,7 +30,7 @@ endfunction " }}}2
 
 function! syntastic#preprocess#checkstyle(errors) " {{{2
     let out = []
-    let fname = expand('%')
+    let fname = expand('%', 1)
     for err in a:errors
         if match(err, '\m<error\>') > -1
             let line = str2nr(matchstr(err, '\m\<line="\zs\d\+\ze"'))
@@ -59,6 +59,70 @@ function! syntastic#preprocess#cppcheck(errors) " {{{2
     return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
 endfunction " }}}2
 
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! syntastic#preprocess#flow(errors) " {{{2
+    " JSON artifacts
+    let true = 1
+    let false = 0
+    let null = ''
+
+    " A hat tip to Marc Weber for this trick
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    try
+        let errs = eval(join(a:errors, ''))
+    catch
+        let errs = {}
+    endtry
+
+    let out = []
+    if type(errs) == type({}) && has_key(errs, 'errors') && type(errs['errors']) == type([])
+        for e in errs['errors']
+            if type(e) == type({}) && has_key(e, 'message') && type(e['message']) == type([]) && len(e['message'])
+                let m = e['message'][0]
+                let t = e['message'][1:]
+
+                try
+                    let msg =
+                        \ m['path'] . ':' .
+                        \ m['line'] . ':' .
+                        \ m['start'] . ':' .
+                        \ (m['line'] ==# m['endline'] ? m['end'] . ':' : '') .
+                        \ ' ' . m['descr']
+
+                    if len(t)
+                        let msg .= ' ' . join(map(t,
+                            \ 'v:val["descr"] . " (" . v:val["path"] . ":" . v:val["line"] . ":" . v:val["start"] . ' .
+                            \ '"," . (v:val["line"] !=# v:val["endline"] ? v:val["endline"] . ":" : "") . ' .
+                            \ 'v:val["end"] . ")"'))
+                    endif
+
+                    let msg = substitute(msg, '\r', '', 'g')
+                    let msg = substitute(msg, '\n', ' ', 'g')
+
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker javascript/flow: unknown error format')
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker javascript/flow: unknown error format')
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/flow: unknown error format')
+    endif
+
+    return out
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
+
 function! syntastic#preprocess#killEmpty(errors) " {{{2
     return filter(copy(a:errors), 'v:val != ""')
 endfunction " }}}2
@@ -67,7 +131,7 @@ function! syntastic#preprocess#perl(errors) " {{{2
     let out = []
 
     for e in a:errors
-        let parts = matchlist(e, '\v^(.*)\sat\s(.*)\sline\s(\d+)(.*)$')
+        let parts = matchlist(e, '\v^(.*)\sat\s(.{-})\sline\s(\d+)(.*)$')
         if !empty(parts)
             call add(out, parts[2] . ':' . parts[3] . ':' . parts[1] . parts[4])
         endif
@@ -76,6 +140,9 @@ function! syntastic#preprocess#perl(errors) " {{{2
     return syntastic#util#unique(out)
 endfunction " }}}2
 
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
 function! syntastic#preprocess#prospector(errors) " {{{2
     " JSON artifacts
     let true = 1
@@ -125,6 +192,9 @@ function! syntastic#preprocess#prospector(errors) " {{{2
 
     return out
 endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
 
 function! syntastic#preprocess#rparse(errors) " {{{2
     let errlist = copy(a:errors)
diff --git a/sources_non_forked/syntastic/autoload/syntastic/util.vim b/sources_non_forked/syntastic/autoload/syntastic/util.vim
index 27ef34b2..f6ef7009 100644
--- a/sources_non_forked/syntastic/autoload/syntastic/util.vim
+++ b/sources_non_forked/syntastic/autoload/syntastic/util.vim
@@ -47,6 +47,13 @@ function! syntastic#util#tmpdir() " {{{2
         else
             let tempdir = '/tmp/vim-syntastic-' . getpid()
         endif
+
+        try
+            call mkdir(tempdir, 'p', 0700)
+        catch /\m^Vim\%((\a\+)\)\=:E739/
+            call syntastic#log#error(v:exception)
+            let tempdir = '.'
+        endtry
     endif
 
     return tempdir
@@ -54,6 +61,11 @@ endfunction " }}}2
 
 " Recursively remove a directory
 function! syntastic#util#rmrf(what) " {{{2
+    " try to make sure we don't delete directories we didn't create
+    if a:what !~? 'vim-syntastic-'
+        return
+    endif
+
     if  getftype(a:what) ==# 'dir'
         if !exists('s:rmrf')
             let s:rmrf =
@@ -141,14 +153,14 @@ endfunction " }}}2
 
 " strwidth() was added in Vim 7.3; if it doesn't exist, we use strlen()
 " and hope for the best :)
-let s:width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
-lockvar s:width
+let s:_width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
+lockvar s:_width
 
 function! syntastic#util#screenWidth(str, tabstop) " {{{2
     let chunks = split(a:str, "\t", 1)
-    let width = s:width(chunks[-1])
+    let width = s:_width(chunks[-1])
     for c in chunks[:-2]
-        let cwidth = s:width(c)
+        let cwidth = s:_width(c)
         let width += cwidth + a:tabstop - cwidth % a:tabstop
     endfor
     return width
@@ -166,7 +178,7 @@ function! syntastic#util#wideMsg(msg) " {{{2
     "convert tabs to spaces so that the tabs count towards the window
     "width as the proper amount of characters
     let chunks = split(msg, "\t", 1)
-    let msg = join(map(chunks[:-2], 'v:val . repeat(" ", &tabstop - s:width(v:val) % &tabstop)'), '') . chunks[-1]
+    let msg = join(map(chunks[:-2], 'v:val . repeat(" ", &tabstop - s:_width(v:val) % &tabstop)'), '') . chunks[-1]
     let msg = strpart(msg, 0, &columns - 1)
 
     set noruler noshowcmd
@@ -212,7 +224,7 @@ function! syntastic#util#findInParent(what, where) " {{{2
 
     let old = ''
     while here != ''
-        let p = split(globpath(here, a:what), '\n')
+        let p = split(globpath(here, a:what, 1), '\n')
 
         if !empty(p)
             return fnamemodify(p[0], ':p')
@@ -249,8 +261,19 @@ function! syntastic#util#shescape(string) " {{{2
 endfunction " }}}2
 
 " A less noisy shellescape(expand())
-function! syntastic#util#shexpand(string) " {{{2
-    return syntastic#util#shescape(expand(a:string))
+function! syntastic#util#shexpand(string, ...) " {{{2
+    return syntastic#util#shescape(a:0 ? expand(a:string, a:1) : expand(a:string, 1))
+endfunction " }}}2
+
+" Escape arguments
+function! syntastic#util#argsescape(opt) " {{{2
+    if type(a:opt) == type('') && a:opt != ''
+        return [a:opt]
+    elseif type(a:opt) == type([])
+        return map(copy(a:opt), 'syntastic#util#shescape(v:val)')
+    endif
+
+    return []
 endfunction " }}}2
 
 " decode XML entities
@@ -311,16 +334,38 @@ function! s:_translateFilter(filters) " {{{2
 endfunction " }}}2
 
 function! s:_translateElement(key, term) " {{{2
-    if a:key ==? 'level'
-        let ret = 'v:val["type"] !=? ' . string(a:term[0])
-    elseif a:key ==? 'type'
-        let ret = a:term ==? 'style' ? 'get(v:val, "subtype", "") !=? "style"' : 'has_key(v:val, "subtype")'
-    elseif a:key ==? 'regex'
-        let ret = 'v:val["text"] !~? ' . string(a:term)
-    elseif a:key ==? 'file'
-        let ret = 'bufname(str2nr(v:val["bufnr"])) !~# ' . string(a:term)
+    let fkey = a:key
+    if fkey[0] == '!'
+        let fkey = fkey[1:]
+        let not = 1
     else
-        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(a:key)))
+        let not = 0
+    endif
+
+    if fkey ==? 'level'
+        let op = not ? ' ==? ' : ' !=? '
+        let ret = 'v:val["type"]' . op . string(a:term[0])
+    elseif fkey ==? 'type'
+        if a:term ==? 'style'
+            let op = not ? ' ==? ' : ' !=? '
+            let ret = 'get(v:val, "subtype", "")' . op . '"style"'
+        else
+            let op = not ? '!' : ''
+            let ret = op . 'has_key(v:val, "subtype")'
+        endif
+    elseif fkey ==? 'regex'
+        let op = not ? ' =~? ' : ' !~? '
+        let ret = 'v:val["text"]' . op . string(a:term)
+    elseif fkey ==? 'file' || fkey[:4] ==? 'file:'
+        let op = not ? ' =~# ' : ' !~# '
+        let ret = 'bufname(str2nr(v:val["bufnr"]))'
+        let mod = fkey[4:]
+        if mod != ''
+            let ret = 'fnamemodify(' . ret . ', ' . string(mod) . ')'
+        endif
+        let ret .= op . string(a:term)
+    else
+        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(fkey)))
         let ret = "1"
     endif
     return ret
@@ -332,7 +377,11 @@ function! s:_rmrf(what) " {{{2
     endif
 
     if getftype(a:what) ==# 'dir'
-        for f in split(globpath(a:what, '*'), "\n")
+        if filewritable(a:what) != 2
+            return
+        endif
+
+        for f in split(globpath(a:what, '*', 1), "\n")
             call s:_rmrf(f)
         endfor
         silent! call system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
diff --git a/sources_non_forked/syntastic/doc/syntastic.txt b/sources_non_forked/syntastic/doc/syntastic.txt
index b6d8dbe4..423bd7d9 100644
--- a/sources_non_forked/syntastic/doc/syntastic.txt
+++ b/sources_non_forked/syntastic/doc/syntastic.txt
@@ -21,6 +21,7 @@ CONTENTS                                                  *syntastic-contents*
 
     1.Intro........................................|syntastic-intro|
         1.1.Quick start............................|syntastic-quickstart|
+        1.2.Recommended settings...................|syntastic-recommended|
     2.Functionality provided.......................|syntastic-functionality|
         2.1.The statusline flag....................|syntastic-statusline-flag|
         2.2.Error signs............................|syntastic-error-signs|
@@ -85,13 +86,35 @@ You can see the list of checkers available for the current filetype with the
 
 You probably want to override the configured list of checkers for the
 filetypes you use, and also change the arguments passed to specific checkers
-to suit your needs. See |syntastic-checker-options| for details.
+to suit your needs. See |syntastic-checker-options| below for details.
 
 Use |:SyntasticCheck| to manually check right now. Use |:Errors| to open the
 |location-list| window, and |:lclose| to close it. You can clear the error
 list with |:SyntasticReset|, and you can use |:SyntasticToggleMode| to switch
 between active (checking on writing the buffer) and passive (manual) checking.
 
+You don't have to switch focus to the |location-list| window to jump to the
+different errors.  Vim provides several built-in commands for this, for
+example |:lnext| and |:lprevious|.  You may want to add shortcut mappings for
+these commands, or perhaps install a plugin such as Tim Pope's 'unimpaired'
+(see https://github.com/tpope/vim-unimpaired) that provides such mappings.
+
+------------------------------------------------------------------------------
+1.2. Recommended settings                              *syntastic-recommended*
+
+Syntastic has a large number of options that can be configured, and the
+defaults are not particularly well suitable for new users. It is recommended
+that you start by adding the following lines to your vimrc, and return to them
+later as needed: >
+    set statusline+=%#warningmsg#
+    set statusline+=%{SyntasticStatuslineFlag()}
+    set statusline+=%*
+
+    let g:syntastic_always_populate_loc_list = 1
+    let g:syntastic_auto_loc_list = 1
+    let g:syntastic_check_on_open = 1
+    let g:syntastic_check_on_wq = 0
+<
 ==============================================================================
 2. Functionality provided                            *syntastic-functionality*
 
@@ -163,8 +186,9 @@ Example: >
 You can use the |:Errors| command to display the errors for the current buffer
 in the |location-list|.
 
-Note that when you use |:Errors|, the current location list is overwritten
-with Syntastic's own location list.
+Note that when you use |:Errors| the current location list is overwritten with
+Syntastic's own location list. The location list is also overwritten when
+|syntastic_auto_jump| is non-zero and the cursor has to jump to an issue.
 
 By default syntastic doesn't fill the |location-list| with the errors found by
 the checkers, in order to reduce clashes with other plugins. Consequently, if
@@ -382,12 +406,17 @@ when saving or opening a file.
 When set to 0 the cursor won't jump automatically. >
     let g:syntastic_auto_jump = 0
 <
-When set to 1 the cursor will always jump to the first issue detected. >
+When set to 1 the cursor will always jump to the first issue detected,
+regardless of type. >
     let g:syntastic_auto_jump = 1
 <
 When set to 2 the cursor will jump to the first issue detected, but only if
 this issue is an error. >
     let g:syntastic_auto_jump = 2
+<
+When set to 3 the cursor will jump to the first error detected, if any. If
+all issues detected are warnings, the cursor won't jump. >
+    let g:syntastic_auto_jump = 3
 <
                                                    *'syntastic_auto_loc_list'*
 Default: 2
@@ -424,8 +453,9 @@ Default: {}
 Use this option to map non-standard filetypes to standard ones.  Corresponding
 checkers are mapped accordingly, which allows syntastic to check files with
 non-standard filetypes: >
-    let g:syntastic_filetype_map = { "latex": "tex",
-                                   \ "gentoo-metadata": "xml" }
+    let g:syntastic_filetype_map = {
+        \ "latex": "tex",
+        \ "gentoo-metadata": "xml" }
 <
 Composite filetypes can also be mapped to simple types, which disables the
 default behaviour of running both checkers against the input file: >
@@ -440,9 +470,10 @@ done).
 
 The option should be set to something like: >
 
-    let g:syntastic_mode_map = { "mode": "active",
-                               \ "active_filetypes": ["ruby", "php"],
-                               \ "passive_filetypes": ["puppet"] }
+    let g:syntastic_mode_map = {
+        \ "mode": "active",
+        \ "active_filetypes": ["ruby", "php"],
+        \ "passive_filetypes": ["puppet"] }
 <
 "mode" can be mapped to one of two values - "active" or "passive". When set
 to "active", syntastic does automatic checking whenever a buffer is saved or
@@ -458,30 +489,49 @@ the "passive_filetypes" array ("active_filetypes" is ignored).
 If any of "mode", "active_filetypes", or "passive_filetypes" are left
 unspecified, they default to values above.
 
+If local variable |'b:syntastic_mode'| is defined its value takes precedence
+over all calculations involving |'syntastic_mode_map'| for the corresponding
+buffer.
+
 At runtime, the |:SyntasticToggleMode| command can be used to switch between
 active and passive modes.
 
+                                                          *'b:syntastic_mode'*
+Default: unset
+Only the local form |'b:syntastic_mode'| is used. When set to either "active"
+or "passive", it takes precedence over |'syntastic_mode_map'| when deciding
+whether the corresponding buffer should be checked automatically.
+
                                                   *'syntastic_quiet_messages'*
 Default: {}
 Use this option to filter out some of the messages produced by checkers.  The
 option should be set to something like: >
-    let g:syntastic_quiet_messages = { "level": "warnings",
-                                     \ "type":  "style",
-                                     \ "regex": '\m\[C03\d\d\]',
-                                     \ "file":  ['\m^/usr/include/', '\m\c\.h$'] }
+    let g:syntastic_quiet_messages = {
+        \ "!level":  "errors",
+        \ "type":    "style",
+        \ "regex":   '\m\[C03\d\d\]',
+        \ "file:p":  ['\m^/usr/include/', '\m\c\.h$'] }
 <
 Each element turns off messages matching the patterns specified by the
 corresponding value. Values are lists, but if a list consist of a single
-element you can omit adding the brackets (e.g. you can write "style" instead
-of ["style"]). Elements with values [] or '' are ignored (this is useful for
+element you may omit the brackets (e.g. you may write "style" instead of
+["style"]). Elements with values [] or '' are ignored (this is useful for
 overriding filters, cf. |filter-overrides|).
 
     "level" - takes one of two values, "warnings" or "errors"
     "type"  - can be either "syntax" or "style"
     "regex" - is matched against the messages' text as a case insensitive
               |regular-expression|
-    "file"  - is matched against the filename the error refers to, as a case
-              sensitive |regular-expression|.
+    "file"  - is matched against the filenames the messages refer to, as a
+              case sensitive |regular-expression|.
+
+If a key is prefixed by an exclamation mark "!", the corresponding filter is
+negated (i.e. the above example silences all messages that are NOT errors).
+
+The "file" key may be followed by one or more filename modifiers (see
+|filename-modifiers|). The modifiers are applied to the filenames the messages
+refer to before matching against the value (i.e. in the above example the full
+path of the issues are matched against '\m^/usr/include/' and '\m\c\.h$').
 
 If |'syntastic_id_checkers'| is set, filters are applied before error messages
 are labeled with the names of the checkers that created them.
@@ -685,8 +735,9 @@ options that can be set, these are usually documented in the wiki:
 In the same vein, 'g:syntastic_<filetype>_<checker-name>_quiet_messages' can
 be used to restrict message filters to messages produced by specific checkers.
 Example: >
-    let g:syntastic_python_pylama_quiet_messages = { "type":  "style",
-                                                   \ "regex": '\m\[C03\d\d\]' }
+    let g:syntastic_python_pylama_quiet_messages = {
+        \ "type":  "style",
+        \ "regex": '\m\[C03\d\d\]' }
 <
 See |syntastic_quiet_messages| for the syntax.
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic.vim b/sources_non_forked/syntastic/plugin/syntastic.vim
index 4a00a1f4..3ab7c094 100644
--- a/sources_non_forked/syntastic/plugin/syntastic.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic.vim
@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.5.0-72'
+let g:_SYNTASTIC_VERSION = '3.5.0-148'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1
@@ -154,7 +154,7 @@ let s:modemap = g:SyntasticModeMap.Instance()
 " @vimlint(EVL103, 1, a:argLead)
 function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) " {{{2
     let checker_names = []
-    for ft in s:resolveFiletypes()
+    for ft in s:_resolve_filetypes([])
         call extend(checker_names, s:registry.getNamesOfAvailableCheckers(ft))
     endfor
     return join(checker_names, "\n")
@@ -174,28 +174,56 @@ endfunction " }}}2
 " @vimlint(EVL103, 0, a:cmdLine)
 " @vimlint(EVL103, 0, a:argLead)
 
-command! SyntasticToggleMode call s:ToggleMode()
-command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck
-            \ call s:UpdateErrors(0, <f-args>) <bar>
-            \ call syntastic#util#redraw(g:syntastic_full_redraws)
-command! Errors call s:ShowLocList()
-command! -nargs=? -complete=custom,s:CompleteFiletypes SyntasticInfo
-            \ call s:modemap.modeInfo(<f-args>) <bar>
-            \ call s:registry.echoInfoFor(s:resolveFiletypes(<f-args>)) <bar>
-            \ call s:explainSkip(<f-args>)
-command! SyntasticReset
-            \ call s:ClearCache() <bar>
-            \ call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-command! SyntasticSetLoclist call g:SyntasticLoclist.current().setloclist()
+command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
+command! -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
+command! Errors              call SyntasticErrors()
+command! SyntasticReset      call SyntasticReset()
+command! SyntasticToggleMode call SyntasticToggleMode()
+command! SyntasticSetLoclist call SyntasticSetLoclist()
 
 " }}}1
 
-" Autocommands and hooks {{{1
+" Public API {{{1
+
+function! SyntasticCheck(...) " {{{2
+    call s:UpdateErrors(0, a:000)
+    call syntastic#util#redraw(g:syntastic_full_redraws)
+endfunction " }}}2
+
+function! SyntasticInfo(...) " {{{2
+    call s:modemap.modeInfo(a:000)
+    call s:registry.echoInfoFor(s:_resolve_filetypes(a:000))
+    call s:_explain_skip(a:000)
+endfunction " }}}2
+
+function! SyntasticErrors() " {{{2
+    call g:SyntasticLoclist.current().show()
+endfunction " }}}2
+
+function! SyntasticReset() " {{{2
+    call s:ClearCache()
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+endfunction " }}}2
+
+function! SyntasticToggleMode() " {{{2
+    call s:modemap.toggleMode()
+    call s:ClearCache()
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+    call s:modemap.echoMode()
+endfunction " }}}2
+
+function! SyntasticSetLoclist() " {{{2
+    call g:SyntasticLoclist.current().setloclist()
+endfunction " }}}2
+
+" }}}1
+
+" Autocommands {{{1
 
 augroup syntastic
-    autocmd BufReadPost * call s:BufReadPostHook()
+    autocmd BufReadPost  * call s:BufReadPostHook()
     autocmd BufWritePost * call s:BufWritePostHook()
-    autocmd BufEnter * call s:BufEnterHook()
+    autocmd BufEnter     * call s:BufEnterHook()
 augroup END
 
 if v:version > 703 || (v:version == 703 && has('patch544'))
@@ -209,14 +237,14 @@ function! s:BufReadPostHook() " {{{2
     if g:syntastic_check_on_open
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
             \ 'autocmd: BufReadPost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
-        call s:UpdateErrors(1)
+        call s:UpdateErrors(1, [])
     endif
 endfunction " }}}2
 
 function! s:BufWritePostHook() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: BufWritePost, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
-    call s:UpdateErrors(1)
+    call s:UpdateErrors(1, [])
 endfunction " }}}2
 
 function! s:BufEnterHook() " {{{2
@@ -232,7 +260,7 @@ function! s:BufEnterHook() " {{{2
         let loclist = filter(copy(getloclist(0)), 'v:val["valid"] == 1')
         let owner = str2nr(getbufvar(bufnr(""), 'syntastic_owner_buffer'))
         let buffers = syntastic#util#unique(map(loclist, 'v:val["bufnr"]') + (owner ? [owner] : []))
-        if !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
+        if get(w:, 'syntastic_loclist_set', 0) && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
             call SyntasticLoclistHide()
         endif
     endif
@@ -242,7 +270,9 @@ function! s:QuitPreHook() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
         \ 'autocmd: QuitPre, buffer ' . bufnr("") . ' = ' . string(bufname(str2nr(bufnr("")))))
     let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
-    call SyntasticLoclistHide()
+    if get(w:, 'syntastic_loclist_set', 0)
+        call SyntasticLoclistHide()
+    endif
 endfunction " }}}2
 
 " }}}1
@@ -250,30 +280,36 @@ endfunction " }}}2
 " Main {{{1
 
 "refresh and redraw all the error info for this buf when saving or reading
-function! s:UpdateErrors(auto_invoked, ...) " {{{2
+function! s:UpdateErrors(auto_invoked, checker_names) " {{{2
     call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
     call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS)
     call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
-        \ ': ' . (a:0 ? join(a:000) : 'default checkers'))
-    if s:skipFile()
+        \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+    if s:_skip_file()
         return
     endif
 
     call s:modemap.synch()
-    let run_checks = !a:auto_invoked || s:modemap.allowsAutoChecking(&filetype)
+    let run_checks = !a:auto_invoked || s:modemap.doAutoChecking()
     if run_checks
-        call s:CacheErrors(a:000)
+        call s:CacheErrors(a:checker_names)
     endif
 
     let loclist = g:SyntasticLoclist.current()
 
+    if exists('*SyntasticCheckHook')
+        call SyntasticCheckHook(loclist.getRaw())
+    endif
+
     " populate loclist and jump {{{3
-    let do_jump = syntastic#util#var('auto_jump')
+    let do_jump = syntastic#util#var('auto_jump') + 0
     if do_jump == 2
-        let first = loclist.getFirstIssue()
-        let type = get(first, 'type', '')
-        let do_jump = type ==? 'E'
+        let do_jump = loclist.getFirstError(1)
+    elseif do_jump == 3
+        let do_jump = loclist.getFirstError()
+    elseif 0 > do_jump || do_jump > 3
+        let do_jump = 0
     endif
 
     let w:syntastic_loclist_set = 0
@@ -283,7 +319,7 @@ function! s:UpdateErrors(auto_invoked, ...) " {{{2
         let w:syntastic_loclist_set = 1
         if run_checks && do_jump && !loclist.isEmpty()
             call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: jump')
-            silent! lrewind
+            execute 'silent! lrewind ' . do_jump
 
             " XXX: Vim doesn't call autocmd commands in a predictible
             " order, which can lead to missing filetype when jumping
@@ -312,13 +348,13 @@ function! s:CacheErrors(checker_names) " {{{2
     call s:ClearCache()
     let newLoclist = g:SyntasticLoclist.New([])
 
-    if !s:skipFile()
+    if !s:_skip_file()
         " debug logging {{{3
         call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . getcwd())
         " }}}3
 
-        let filetypes = s:resolveFiletypes()
+        let filetypes = s:_resolve_filetypes([])
         let aggregate_errors = syntastic#util#var('aggregate_errors') || len(filetypes) > 1
         let decorate_errors = aggregate_errors && syntastic#util#var('id_checkers')
         let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
@@ -397,18 +433,6 @@ function! s:CacheErrors(checker_names) " {{{2
     call newLoclist.deploy()
 endfunction " }}}2
 
-function! s:ToggleMode() " {{{2
-    call s:modemap.toggleMode()
-    call s:ClearCache()
-    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-    call s:modemap.echoMode()
-endfunction " }}}2
-
-"display the cached errors for this buf in the location list
-function! s:ShowLocList() " {{{2
-    call g:SyntasticLoclist.current().show()
-endfunction " }}}2
-
 "Emulates the :lmake command. Sets up the make environment according to the
 "options given, runs make, resets the environment, returns the location list
 "
@@ -440,7 +464,7 @@ function! SyntasticMake(options) " {{{2
     let old_lc_all = $LC_ALL
     " }}}3
 
-    call s:bashHack()
+    call s:_bash_hack()
 
     if has_key(a:options, 'errorformat')
         let &errorformat = a:options['errorformat']
@@ -519,7 +543,7 @@ function! SyntasticMake(options) " {{{2
     let &shellredir = old_shellredir
     " }}}3
 
-    if !s:_running_windows && (s:uname() =~ "FreeBSD" || s:uname() =~ "OpenBSD")
+    if !s:_running_windows && (s:_os_name() =~ "FreeBSD" || s:_os_name() =~ "OpenBSD")
         call syntastic#util#redraw(g:syntastic_full_redraws)
     endif
 
@@ -530,12 +554,12 @@ function! SyntasticMake(options) " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'raw loclist:', errors)
 
     if has_key(a:options, 'defaults')
-        call s:addToErrors(errors, a:options['defaults'])
+        call s:_add_to_errors(errors, a:options['defaults'])
     endif
 
     " Add subtype info if present.
     if has_key(a:options, 'subtype')
-        call s:addToErrors(errors, { 'subtype': a:options['subtype'] })
+        call s:_add_to_errors(errors, { 'subtype': a:options['subtype'] })
     endif
 
     if has_key(a:options, 'Postprocess') && !empty(a:options['Postprocess'])
@@ -566,12 +590,12 @@ endfunction " }}}2
 
 " Utilities {{{1
 
-function! s:resolveFiletypes(...) " {{{2
-    let type = a:0 ? a:1 : &filetype
+function! s:_resolve_filetypes(filetypes) " {{{2
+    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
 endfunction " }}}2
 
-function! s:ignoreFile(filename) " {{{2
+function! s:_ignore_file(filename) " {{{2
     let fname = fnamemodify(a:filename, ':p')
     for pattern in g:syntastic_ignore_files
         if fname =~# pattern
@@ -582,22 +606,22 @@ function! s:ignoreFile(filename) " {{{2
 endfunction " }}}2
 
 " Skip running in special buffers
-function! s:skipFile() " {{{2
-    let fname = expand('%')
+function! s:_skip_file() " {{{2
+    let fname = expand('%', 1)
     let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype != '') ||
-        \ !filereadable(fname) || getwinvar(0, '&diff') || s:ignoreFile(fname) ||
+        \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
         \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
     if skip
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'skipFile: skipping')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '_skip_file: skipping checks')
     endif
     return skip
 endfunction " }}}2
 
 " Explain why checks will be skipped for the current file
-function! s:explainSkip(...) " {{{2
-    if !a:0 && s:skipFile()
+function! s:_explain_skip(filetypes) " {{{2
+    if empty(a:filetypes) && s:_skip_file()
         let why = []
-        let fname = expand('%')
+        let fname = expand('%', 1)
 
         if get(b:, 'syntastic_skip_checks', 0)
             call add(why, 'b:syntastic_skip_checks set')
@@ -611,7 +635,7 @@ function! s:explainSkip(...) " {{{2
         if getwinvar(0, '&diff')
             call add(why, 'diff mode')
         endif
-        if s:ignoreFile(fname)
+        if s:_ignore_file(fname)
             call add(why, 'filename matching g:syntastic_ignore_files')
         endif
         if fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
@@ -623,7 +647,7 @@ function! s:explainSkip(...) " {{{2
 endfunction " }}}2
 
 " Take a list of errors and add default values to them from a:options
-function! s:addToErrors(errors, options) " {{{2
+function! s:_add_to_errors(errors, options) " {{{2
     for err in a:errors
         for key in keys(a:options)
             if !has_key(err, key) || empty(err[key])
@@ -638,12 +662,12 @@ endfunction " }}}2
 " XXX: Is this still needed?
 " The script changes &shellredir to stop the screen
 " flicking when shelling out to syntax checkers.
-function! s:bashHack() " {{{2
+function! s:_bash_hack() " {{{2
     if g:syntastic_bash_hack
         if !exists('s:shell_is_bash')
             let s:shell_is_bash =
                 \ !s:_running_windows &&
-                \ (s:uname() !~# "FreeBSD") && (s:uname() !~# "OpenBSD") &&
+                \ (s:_os_name() !~# "FreeBSD") && (s:_os_name() !~# "OpenBSD") &&
                 \ &shell =~# '\m\<bash$'
         endif
 
@@ -653,7 +677,7 @@ function! s:bashHack() " {{{2
     endif
 endfunction " }}}2
 
-function! s:uname() " {{{2
+function! s:_os_name() " {{{2
     if !exists('s:_uname')
         let s:_uname = system('uname')
         lockvar s:_uname
diff --git a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
index b4f491ca..7ba575f4 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/balloons.vim
@@ -22,10 +22,10 @@ endfunction " }}}2
 
 " Update the error balloons
 function! g:SyntasticBalloonsNotifier.refresh(loclist) " {{{2
-    unlet! b:syntastic_balloons
+    unlet! b:syntastic_private_balloons
     if self.enabled() && !a:loclist.isEmpty()
-        let b:syntastic_balloons = a:loclist.balloons()
-        if !empty(b:syntastic_balloons)
+        let b:syntastic_private_balloons = a:loclist.balloons()
+        if !empty(b:syntastic_private_balloons)
             set ballooneval balloonexpr=SyntasticBalloonsExprNotifier()
         endif
     endif
@@ -34,10 +34,10 @@ endfunction " }}}2
 " Reset the error balloons
 " @vimlint(EVL103, 1, a:loclist)
 function! g:SyntasticBalloonsNotifier.reset(loclist) " {{{2
-    let b:syntastic_balloons = {}
+    let b:syntastic_private_balloons = {}
     if has('balloon_eval')
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'balloons: reset')
-        unlet! b:syntastic_balloons
+        unlet! b:syntastic_private_balloons
         set noballooneval
     endif
 endfunction " }}}2
@@ -48,10 +48,10 @@ endfunction " }}}2
 " Private functions {{{1
 
 function! SyntasticBalloonsExprNotifier() " {{{2
-    if !exists('b:syntastic_balloons')
+    if !exists('b:syntastic_private_balloons')
         return ''
     endif
-    return get(b:syntastic_balloons, v:beval_lnum, '')
+    return get(b:syntastic_private_balloons, v:beval_lnum, '')
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/checker.vim b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
index 740b8d2a..9211e02a 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/checker.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/checker.vim
@@ -30,7 +30,7 @@ function! g:SyntasticChecker.New(args) " {{{2
     if exists('*' . prefix . 'IsAvailable')
         let newObj._isAvailableFunc = function(prefix . 'IsAvailable')
     else
-        let newObj._isAvailableFunc = function('SyntasticCheckerIsAvailableDefault')
+        let newObj._isAvailableFunc = function('s:_isAvailableDefault')
     endif
 
     if exists('*' . prefix . 'GetHighlightRegex')
@@ -51,7 +51,7 @@ endfunction " }}}2
 function! g:SyntasticChecker.getExec() " {{{2
     return
         \ expand( exists('b:syntastic_' . self._name . '_exec') ? b:syntastic_{self._name}_exec :
-        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec) )
+        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec', self._exec), 1 )
 endfunction " }}}2
 
 function! g:SyntasticChecker.getExecEscaped() " {{{2
@@ -162,28 +162,18 @@ endfunction " }}}2
 
 function! g:SyntasticChecker._getOpt(opts, basename, name, default) " {{{2
     let ret = []
-    call extend( ret, self._shescape(get(a:opts, a:name . '_before', '')) )
-    call extend( ret, self._shescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
-    call extend( ret, self._shescape(get(a:opts, a:name . '_after', '')) )
+    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_before', '')) )
+    call extend( ret, syntastic#util#argsescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
+    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_after', '')) )
 
     return ret
 endfunction " }}}2
 
-function! g:SyntasticChecker._shescape(opt) " {{{2
-    if type(a:opt) == type('') && a:opt != ''
-        return [a:opt]
-    elseif type(a:opt) == type([])
-        return map(copy(a:opt), 'syntastic#util#shescape(v:val)')
-    endif
-
-    return []
-endfunction " }}}2
-
 " }}}1
 
-" Non-method functions {{{1
+" Private functions {{{1
 
-function! SyntasticCheckerIsAvailableDefault() dict " {{{2
+function! s:_isAvailableDefault() dict " {{{2
     return executable(self.getExec())
 endfunction " }}}2
 
diff --git a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
index 629cf2d6..c81cf827 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/cursor.vim
@@ -19,8 +19,8 @@ endfunction " }}}2
 function! g:SyntasticCursorNotifier.refresh(loclist) " {{{2
     if self.enabled() && !a:loclist.isEmpty()
         call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: refresh')
-        let b:syntastic_messages = copy(a:loclist.messages(bufnr('')))
-        let b:syntastic_line = -1
+        let b:syntastic_private_messages = copy(a:loclist.messages(bufnr('')))
+        let b:syntastic_private_line = -1
         let b:syntastic_cursor_columns = a:loclist.getCursorColumns()
         autocmd! syntastic CursorMoved
         autocmd syntastic CursorMoved * call SyntasticRefreshCursor()
@@ -31,26 +31,26 @@ endfunction " }}}2
 function! g:SyntasticCursorNotifier.reset(loclist) " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: reset')
     autocmd! syntastic CursorMoved
-    unlet! b:syntastic_messages
-    let b:syntastic_line = -1
+    unlet! b:syntastic_private_messages
+    let b:syntastic_private_line = -1
 endfunction " }}}2
 " @vimlint(EVL103, 0, a:loclist)
 
 " }}}1
 
-" Private methods {{{1
+" Private functions {{{1
 
 function! SyntasticRefreshCursor() " {{{2
-    if !exists('b:syntastic_messages') || empty(b:syntastic_messages)
+    if !exists('b:syntastic_private_messages') || empty(b:syntastic_private_messages)
         " file not checked
         return
     endif
 
-    if !exists('b:syntastic_line')
-        let b:syntastic_line = -1
+    if !exists('b:syntastic_private_line')
+        let b:syntastic_private_line = -1
     endif
     let l = line('.')
-    let current_messages = get(b:syntastic_messages, l, {})
+    let current_messages = get(b:syntastic_private_messages, l, {})
 
     if !exists('b:syntastic_cursor_columns')
         let b:syntastic_cursor_columns = g:syntastic_cursor_columns
@@ -58,28 +58,28 @@ function! SyntasticRefreshCursor() " {{{2
 
     if b:syntastic_cursor_columns
         let c = virtcol('.')
-        if !exists('b:syntastic_idx')
-            let b:syntastic_idx = -1
+        if !exists('b:syntastic_private_idx')
+            let b:syntastic_private_idx = -1
         endif
 
-        if s:_isSameIndex(l, b:syntastic_line, c, b:syntastic_idx, current_messages)
+        if s:_is_same_index(l, b:syntastic_private_line, c, b:syntastic_private_idx, current_messages)
             return
         else
-            let b:syntastic_line = l
+            let b:syntastic_private_line = l
         endif
 
         if !empty(current_messages)
-            let b:syntastic_idx = s:_findIndex(c, current_messages)
-            call syntastic#util#wideMsg(current_messages[b:syntastic_idx].text)
+            let b:syntastic_private_idx = s:_find_index(c, current_messages)
+            call syntastic#util#wideMsg(current_messages[b:syntastic_private_idx].text)
         else
-            let b:syntastic_idx = -1
+            let b:syntastic_private_idx = -1
             echo
         endif
     else
-        if l == b:syntastic_line
+        if l == b:syntastic_private_line
             return
         endif
-        let b:syntastic_line = l
+        let b:syntastic_private_line = l
 
         if !empty(current_messages)
             call syntastic#util#wideMsg(current_messages[0].text)
@@ -91,9 +91,9 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
-function! s:_isSameIndex(line, old_line, column, idx, messages) " {{{2
+function! s:_is_same_index(line, old_line, column, idx, messages) " {{{2
     if a:old_line >= 0 && a:line == a:old_line && a:idx >= 0
         if len(a:messages) <= 1
             return 1
@@ -113,7 +113,7 @@ function! s:_isSameIndex(line, old_line, column, idx, messages) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_findIndex(column, messages) " {{{2
+function! s:_find_index(column, messages) " {{{2
     let max = len(a:messages) - 1
     if max == 0
         return 0
diff --git a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
index fb7cefb7..ced93578 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/loclist.vim
@@ -43,10 +43,10 @@ endfunction " }}}2
 function! g:SyntasticLoclist.sort() " {{{2
     if !self._sorted
         for e in self._rawLoclist
-            call s:_setScreenColumn(e)
+            call s:_set_screen_column(e)
         endfor
 
-        call sort(self._rawLoclist, self._columns ? 's:_compareErrorItemsByColumns' : 's:_compareErrorItemsByLines')
+        call sort(self._rawLoclist, self._columns ? 's:_compare_error_items_by_columns' : 's:_compare_error_items_by_lines')
 
         let self._sorted = 1
     endif
@@ -133,8 +133,19 @@ function! g:SyntasticLoclist.getStatuslineFlag() " {{{2
     return self._stl_flag
 endfunction " }}}2
 
-function! g:SyntasticLoclist.getFirstIssue() " {{{2
-    return get(self._rawLoclist, 0, {})
+function! g:SyntasticLoclist.getFirstError(...) " {{{2
+    let max_issues = len(self._rawLoclist)
+    if a:0 && a:1 < max_issues
+        let max_issues = a:1
+    endif
+
+    for idx in range(max_issues)
+        if get(self._rawLoclist[idx], 'type', '') ==? 'E'
+            return idx + 1
+        endif
+    endfor
+
+    return 0
 endfunction " }}}2
 
 function! g:SyntasticLoclist.getName() " {{{2
@@ -243,9 +254,9 @@ function! g:SyntasticLoclist.messages(buf) " {{{2
                     for l in keys(self._cachedMessages[b])
                         if len(self._cachedMessages[b][l]) > 1
                             for e in self._cachedMessages[b][l]
-                                call s:_setScreenColumn(e)
+                                call s:_set_screen_column(e)
                             endfor
-                            call sort(self._cachedMessages[b][l], 's:_compareErrorItemsByColumns')
+                            call sort(self._cachedMessages[b][l], 's:_compare_error_items_by_columns')
                         endif
                     endfor
                 endfor
@@ -253,7 +264,7 @@ function! g:SyntasticLoclist.messages(buf) " {{{2
 
             for b in keys(self._cachedMessages)
                 for l in keys(self._cachedMessages[b])
-                    call s:_removeShadowedItems(self._cachedMessages[b][l])
+                    call s:_remove_shadowed_items(self._cachedMessages[b][l])
                 endfor
             endfor
         endif
@@ -320,7 +331,7 @@ endfunction " }}}2
 
 " }}}1
 
-" Non-method functions {{{1
+" Public functions {{{1
 
 function! SyntasticLoclistHide() " {{{2
     call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
@@ -329,13 +340,13 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
 function! s:_translate(key, val) " {{{2
     return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
 endfunction " }}}2
 
-function! s:_setScreenColumn(item) " {{{2
+function! s:_set_screen_column(item) " {{{2
     if !has_key(a:item, 'scol')
         let col = get(a:item, 'col', 0)
         if col != 0 && get(a:item, 'vcol', 0) == 0
@@ -352,7 +363,7 @@ function! s:_setScreenColumn(item) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_removeShadowedItems(errors) " {{{2
+function! s:_remove_shadowed_items(errors) " {{{2
     " keep only the first message at a given column
     let i = 0
     while i < len(a:errors) - 1
@@ -384,7 +395,7 @@ function! s:_removeShadowedItems(errors) " {{{2
     endwhile
 endfunction " }}}2
 
-function! s:_compareErrorItemsByColumns(a, b) " {{{2
+function! s:_compare_error_items_by_columns(a, b) " {{{2
     if a:a['bufnr'] != a:b['bufnr']
         " group by file
         return a:a['bufnr'] - a:b['bufnr']
@@ -402,7 +413,7 @@ function! s:_compareErrorItemsByColumns(a, b) " {{{2
     endif
 endfunction " }}}2
 
-function! s:_compareErrorItemsByLines(a, b) " {{{2
+function! s:_compare_error_items_by_lines(a, b) " {{{2
     if a:a['bufnr'] != a:b['bufnr']
         " group by file
         return a:a['bufnr'] - a:b['bufnr']
diff --git a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
index 6dd9490d..4b54a268 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/modemap.vim
@@ -38,6 +38,15 @@ function! g:SyntasticModeMap.allowsAutoChecking(filetype) " {{{2
     endif
 endfunction " }}}2
 
+function! g:SyntasticModeMap.doAutoChecking() " {{{2
+    let local_mode = get(b:, 'syntastic_mode', '')
+    if local_mode ==# 'active' || local_mode ==# 'passive'
+        return local_mode ==# 'active'
+    endif
+
+    return self.allowsAutoChecking(&filetype)
+endfunction " }}}2
+
 function! g:SyntasticModeMap.isPassive() " {{{2
     return self._mode ==# 'passive'
 endfunction " }}}2
@@ -62,13 +71,13 @@ function! g:SyntasticModeMap.echoMode() " {{{2
     echo "Syntastic: " . self._mode . " mode enabled"
 endfunction " }}}2
 
-function! g:SyntasticModeMap.modeInfo(...) " {{{2
+function! g:SyntasticModeMap.modeInfo(filetypes) " {{{2
     echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION
-    let type = a:0 ? a:1 : &filetype
+    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
     echomsg 'Info for filetype: ' . type
 
     call self.synch()
-    echomsg 'Mode: ' . self._mode
+    echomsg 'Global mode: ' . self._mode
     if self._mode ==# 'active'
         if len(self._passiveFiletypes)
             let plural = len(self._passiveFiletypes) != 1 ? 's' : ''
@@ -81,6 +90,14 @@ function! g:SyntasticModeMap.modeInfo(...) " {{{2
         endif
     endif
     echomsg 'Filetype ' . type . ' is ' . (self.allowsAutoChecking(type) ? 'active' : 'passive')
+
+    if !len(a:filetypes)
+        if exists('b:syntastic_mode') && (b:syntastic_mode ==# 'active' || b:syntastic_mode ==# 'passive')
+            echomsg 'Local mode: ' . b:syntastic_mode
+        endif
+
+        echomsg 'The current file will ' . (self.doAutoChecking() ? '' : 'not ') . 'be checked automatically'
+    endif
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
index 11b72c6a..7f933a17 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/notifiers.vim
@@ -34,12 +34,12 @@ function! g:SyntasticNotifiers.refresh(loclist) " {{{2
         if !has_key(g:{class}, 'enabled') || self._notifier[type].enabled()
             if index(s:_PERSISTENT_NOTIFIERS, type) > -1
                 " refresh only if loclist has changed since last call
-                if !exists('b:syntastic_' . type . '_stamp')
-                    let b:syntastic_{type}_stamp = []
+                if !exists('b:syntastic_private_' . type . '_stamp')
+                    let b:syntastic_private_{type}_stamp = []
                 endif
-                if a:loclist.isNewerThan(b:syntastic_{type}_stamp) || a:loclist.isEmpty()
+                if a:loclist.isNewerThan(b:syntastic_private_{type}_stamp) || a:loclist.isEmpty()
                     call self._notifier[type].refresh(a:loclist)
-                    let b:syntastic_{type}_stamp = syntastic#util#stamp()
+                    let b:syntastic_private_{type}_stamp = syntastic#util#stamp()
                 endif
             else
                 call self._notifier[type].refresh(a:loclist)
@@ -62,7 +62,7 @@ function! g:SyntasticNotifiers.reset(loclist) " {{{2
 
         " also reset stamps
         if index(s:_PERSISTENT_NOTIFIERS, type) > -1
-            let b:syntastic_{type}_stamp = []
+            let b:syntastic_private_{type}_stamp = []
         endif
     endfor
 endfunction " }}}2
diff --git a/sources_non_forked/syntastic/plugin/syntastic/registry.vim b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
index 8f50f8af..be597c56 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/registry.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/registry.vim
@@ -9,7 +9,6 @@ let s:_DEFAULT_CHECKERS = {
         \ 'actionscript':['mxmlc'],
         \ 'ada':         ['gcc'],
         \ 'applescript': ['osacompile'],
-        \ 'arduino':     ['avrgcc'],
         \ 'asciidoc':    ['asciidoc'],
         \ 'asm':         ['gcc'],
         \ 'bro':         ['bro'],
@@ -92,7 +91,7 @@ let s:_DEFAULT_CHECKERS = {
         \ 'yaml':        ['jsyaml'],
         \ 'z80':         ['z80syntaxchecker'],
         \ 'zpt':         ['zptlint'],
-        \ 'zsh':         ['zsh', 'shellcheck']
+        \ 'zsh':         ['zsh', 'shellcheck'],
     \ }
 lockvar! s:_DEFAULT_CHECKERS
 
@@ -108,6 +107,25 @@ let s:_DEFAULT_FILETYPE_MAP = {
     \ }
 lockvar! s:_DEFAULT_FILETYPE_MAP
 
+let s:_ECLIM_TYPES = [
+        \ 'c',
+        \ 'cpp',
+        \ 'html',
+        \ 'java',
+        \ 'php',
+        \ 'python',
+        \ 'ruby',
+    \ ]
+lockvar! s:_ECLIM_TYPES
+
+let s:_YCM_TYPES = [
+        \ 'c',
+        \ 'cpp',
+        \ 'objc',
+        \ 'objcpp',
+    \ ]
+lockvar! s:_YCM_TYPES
+
 let g:SyntasticRegistry = {}
 
 " }}}1
@@ -138,7 +156,7 @@ endfunction " }}}2
 " not checked for availability (that is, the corresponding IsAvailable() are
 " not run).
 function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) " {{{2
-    let ft = s:_normaliseFiletype(a:ftalias)
+    let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
 
     let checkers_map = self._checkerMap[ft]
@@ -181,13 +199,13 @@ function! g:SyntasticRegistry.getKnownFiletypes() " {{{2
 endfunction " }}}2
 
 function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) " {{{2
-    let ft = s:_normaliseFiletype(a:ftalias)
+    let ft = s:_normalise_filetype(a:ftalias)
     call self._loadCheckersFor(ft)
     return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
 endfunction " }}}2
 
 function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
-    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normaliseFiletype(v:val)' ))
+    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normalise_filetype(v:val)' ))
     if len(ft_list) != 1
         let available = []
         let active = []
@@ -211,6 +229,30 @@ function! g:SyntasticRegistry.echoInfoFor(ftalias_list) " {{{2
     let plural = cnt != 1 ? 's' : ''
     let cklist = cnt ? join(active) : '-'
     echomsg 'Currently enabled checker' . plural . ': ' . cklist
+
+    " Eclim feels entitled to mess with syntastic's variables {{{3
+    if exists(':EclimValidate') && get(g:, 'EclimFileTypeValidate', 1)
+        let disabled = filter(copy(ft_list), 's:_disabled_by_eclim(v:val)')
+        let cnt = len(disabled)
+        if cnt
+            let plural = cnt != 1 ? 's' : ''
+            let cklist = join(disabled, ', ')
+            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by Eclim'
+        endif
+    endif
+    " }}}3
+
+    " So does YouCompleteMe {{{3
+    if exists('g:loaded_youcompleteme') && get(g:, 'ycm_show_diagnostics_ui', get(g:, 'ycm_register_as_syntastic_checker', 1))
+        let disabled = filter(copy(ft_list), 's:_disabled_by_ycm(v:val)')
+        let cnt = len(disabled)
+        if cnt
+            let plural = cnt != 1 ? 's' : ''
+            let cklist = join(disabled, ', ')
+            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by YouCompleteMe'
+        endif
+    endif
+    " }}}3
 endfunction " }}}2
 
 " }}}1
@@ -257,17 +299,31 @@ endfunction " }}}2
 
 " }}}1
 
-" Private functions {{{1
+" Utilities {{{1
 
 "resolve filetype aliases, and replace - with _ otherwise we cant name
 "syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:_normaliseFiletype(ftalias) " {{{2
+function! s:_normalise_filetype(ftalias) " {{{2
     let ft = get(s:_DEFAULT_FILETYPE_MAP, a:ftalias, a:ftalias)
     let ft = get(g:syntastic_filetype_map, ft, ft)
     let ft = substitute(ft, '\m-', '_', 'g')
     return ft
 endfunction " }}}2
 
+function! s:_disabled_by_eclim(filetype) " {{{2
+    if index(s:_ECLIM_TYPES, a:filetype) >= 0
+        let lang = toupper(a:filetype[0]) . a:filetype[1:]
+        let ft = a:filetype !=# 'cpp' ? lang : 'C'
+        return get(g:, 'Eclim' . lang . 'Validate', 1) && !get(g:, 'Eclim' . ft . 'SyntasticEnabled', 0)
+    endif
+
+    return 0
+endfunction " }}}2
+
+function! s:_disabled_by_ycm(filetype) " {{{2
+    return index(s:_YCM_TYPES, a:filetype) >= 0
+endfunction " }}}2
+
 " }}}1
 
 " vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/plugin/syntastic/signs.vim b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
index 9d169490..e1616af0 100644
--- a/sources_non_forked/syntastic/plugin/syntastic/signs.vim
+++ b/sources_non_forked/syntastic/plugin/syntastic/signs.vim
@@ -127,10 +127,10 @@ endfunction " }}}2
 
 " Get all the ids of the SyntaxError signs in the buffer
 function! g:SyntasticSignsNotifier._bufSignIds() " {{{2
-    if !exists("b:syntastic_sign_ids")
-        let b:syntastic_sign_ids = []
+    if !exists("b:syntastic_private_sign_ids")
+        let b:syntastic_private_sign_ids = []
     endif
-    return b:syntastic_sign_ids
+    return b:syntastic_private_sign_ids
 endfunction " }}}2
 
 " }}}1
diff --git a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
index dd47287d..83803bdc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -64,4 +64,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
index 14e79a04..5687ff5d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ada/gcc.vim
@@ -23,7 +23,7 @@ function! SyntaxCheckers_ada_gcc_IsAvailable() dict
     if !exists('g:syntastic_ada_compiler')
         let g:syntastic_ada_compiler = self.getExec()
     endif
-    return executable(expand(g:syntastic_ada_compiler))
+    return executable(expand(g:syntastic_ada_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_ada_gcc_GetLocList() dict
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim b/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
index 522e6a27..e3131f02 100644
--- a/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/applescript/osacompile.vim
@@ -46,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
deleted file mode 100644
index 98647638..00000000
--- a/sources_non_forked/syntastic/syntax_checkers/arduino/avrgcc.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-"============================================================================
-"File:        avrgcc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Karel <karelishere at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_arduino_avrgcc_checker')
-    finish
-endif
-let g:loaded_syntastic_arduino_avrgcc_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'arduino',
-    \ 'name': 'avrgcc',
-    \ 'exec': 'avr-gcc',
-    \ 'redirect': 'c/avrgcc'})
-
-" vim: set et sts=4 sw=4:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
index bec2a49d..03262e65 100644
--- a/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/asciidoc/asciidoc.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
index f5ecebe6..7bf7eb6c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/asm/gcc.vim
@@ -22,14 +22,14 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_asm_gcc_IsAvailable() dict
+function! SyntaxCheckers_asm_gcc_IsAvailable() dict " {{{1
     if !exists('g:syntastic_asm_compiler')
         let g:syntastic_asm_compiler = self.getExec()
     endif
-    return executable(expand(g:syntastic_asm_compiler))
-endfunction
+    return executable(expand(g:syntastic_asm_compiler, 1))
+endfunction " }}}1
 
-function! SyntaxCheckers_asm_gcc_GetLocList() dict
+function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
     return syntastic#c#GetLocList('asm', 'gcc', {
         \ 'errorformat':
         \     '%-G%f:%s:,' .
@@ -37,12 +37,16 @@ function! SyntaxCheckers_asm_gcc_GetLocList() dict
         \     '%f:%l:%c: %tarning: %m,' .
         \     '%f:%l: %m',
         \ 'main_flags': '-x assembler -fsyntax-only -masm=' . s:GetDialect() })
-endfunction
+endfunction " }}}1
 
-function! s:GetDialect()
+" Utilities {{{1
+
+function! s:GetDialect() " {{{2
     return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
-        \ expand('%:e') ==? 'asm' ? 'intel' : 'att'
-endfunction
+        \ expand('%:e', 1) ==? 'asm' ? 'intel' : 'att'
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'asm',
@@ -51,4 +55,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
index 7f52ed3b..03ab79be 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
@@ -32,4 +32,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
index 7a3c1672..410304be 100644
--- a/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/bro/bro.vim
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
index 5563d61d..0fbb9840 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/avrgcc.vim
@@ -54,4 +54,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
index 56a4260f..ea64ec49 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/checkpatch.vim
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
index 6ef9096c..8110d147 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_check.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
index 3514b55b..250506ad 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
index e4223cb2..a9d9b9eb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_cppcheck_config':
-"
-"   let g:syntastic_cppcheck_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_cppcheck_checker")
     finish
@@ -66,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
index 796d7730..4fa92166 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_c_gcc_IsAvailable() dict
         let g:syntastic_c_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
     endif
     call self.log('g:syntastic_c_compiler =', g:syntastic_c_compiler)
-    return executable(expand(g:syntastic_c_compiler))
+    return executable(expand(g:syntastic_c_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_c_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/make.vim b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
index 8b84173f..e477994d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/make.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/make.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
index 51f09b29..3cb8cad5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_oclint_checker")
     finish
@@ -69,4 +62,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
index 4987457c..3a606d29 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/pc_lint.vim
@@ -63,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
index b7c30a0a..dfb29c91 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/sparse.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_sparse_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_sparse_config':
-"
-"   let g:syntastic_sparse_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_sparse_checker")
     finish
@@ -33,13 +26,15 @@ function! SyntaxCheckers_c_sparse_GetLocList() dict
         \ 'args': syntastic#c#ReadConfig(g:syntastic_sparse_config_file),
         \ 'args_after': '-ftabstop=' . &ts })
 
-    let errorformat = '%f:%l:%v: %trror: %m,%f:%l:%v: %tarning: %m,'
+    let errorformat =
+        \ '%f:%l:%v: %trror: %m,' .
+        \ '%f:%l:%v: %tarning: %m,'
 
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr("")},
-        \ 'returns': [0] })
+        \ 'returns': [0, 1] })
     return loclist
 endfunction
 
@@ -50,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
index f56af1ae..8d8ee321 100644
--- a/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/c/splint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_splint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_splint_config':
-"
-"   let g:syntastic_splint_config_file = '.config'
 
 if exists("g:loaded_syntastic_c_splint_checker")
     finish
@@ -59,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
index 191969be..24059feb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cabal/cabal.vim
@@ -40,7 +40,7 @@ function! SyntaxCheckers_cabal_cabal_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'preprocess': 'cabal',
         \ 'defaults': {'bufnr': bufnr('')} })
 endfunction
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim b/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
index e7773331..77e70cbb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/chef/foodcritic.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
index ca31e226..4780bf1f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/co/coco.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
index 09fd7eae..0cff0cc5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cobol/cobc.vim
@@ -28,7 +28,7 @@ function! SyntaxCheckers_cobol_cobc_IsAvailable() dict
         let g:syntastic_cobol_compiler = self.getExec()
     endif
     call self.log('g:syntastic_cobol_compiler =', g:syntastic_cobol_compiler)
-    return executable(expand(g:syntastic_cobol_compiler))
+    return executable(expand(g:syntastic_cobol_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_cobol_cobc_GetLocList() dict
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
index c19c047b..a1e1a450 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffee.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
index 17a656bd..53e8c5c6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -46,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
index 292bbaaa..c22bd776 100644
--- a/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/coq/coqtop.vim
@@ -37,4 +37,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
index 3eb7b809..a8bcc90c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_check.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'clang-check',
     \ 'redirect': 'c/clang_check'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
index e4266664..d752e661 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/clang_tidy.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'clang-tidy',
     \ 'redirect': 'c/clang_tidy'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
index b4b9d344..97f30f06 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_cppcheck_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_cppcheck_config':
-"
-"   let g:syntastic_cppcheck_config_file = '.config'
 
 if exists("g:loaded_syntastic_cpp_cppcheck_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'cppcheck',
     \ 'redirect': 'c/cppcheck'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
index 60664343..d6012c6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/cpplint.vim
@@ -9,18 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about cpplint see:
-"    https://code.google.com/p/google-styleguide/
-"
-" Checker options:
-"
-" - g:syntastic_cpp_cpplint_thres (integer; default: 5)
-"   error threshold: policy violations with a severity above this
-"   value are highlighted as errors, the others are warnings
-"
-" - g:syntastic_cpp_cpplint_args (string; default: '--verbose=3')
-"   command line options to pass to cpplint
 
 if exists("g:loaded_syntastic_cpp_cpplint_checker")
     finish
@@ -61,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
index 669e6252..1243980c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_cpp_gcc_IsAvailable() dict
         let g:syntastic_cpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang++'
     endif
     call self.log('g:syntastic_cpp_compiler =', g:syntastic_cpp_compiler)
-    return executable(expand(g:syntastic_cpp_compiler))
+    return executable(expand(g:syntastic_cpp_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_cpp_gcc_GetLocList() dict
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
index b467cd75..f0a6fd0b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_cpp_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
index 95feab5e..c1fd1c16 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cpp/pc_lint.vim
@@ -23,4 +23,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'exec': 'lint-nt',
     \ 'redirect': 'c/pc_lint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim b/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
index d7662a1c..c99a2698 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cs/mcs.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
index 0fc06269..6c6b05c1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/csslint.vim
@@ -8,11 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" Specify additional options to csslint with this option. e.g. to disable
-" warnings:
-"
-"   let g:syntastic_csslint_options = '--warnings=none'
 
 if exists('g:loaded_syntastic_css_csslint_checker')
     finish
@@ -49,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
index 86aefeb6..e2a620b1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/phpcs.vim
@@ -9,10 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpcs
-"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
-"
 
 if exists("g:loaded_syntastic_css_phpcs_checker")
     finish
@@ -26,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'phpcs',
     \ 'redirect': 'php/phpcs'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
index ee382dbd..334f4e0f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/prettycss.vim
@@ -9,11 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about PrettyCSS see:
-"
-"   - http://fidian.github.io/PrettyCSS/
-"   - https://github.com/fidian/PrettyCSS
 
 if exists("g:loaded_syntastic_css_prettycss_checker")
     finish
@@ -63,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
index 6d043e44..f1467ae6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/css/recess.vim
@@ -23,4 +23,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'recess',
     \ 'redirect': 'less/recess'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim b/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
index c06a06e5..4da2b974 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cucumber/cucumber.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
index f93332b1..edfd4f24 100644
--- a/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/cuda/nvcc.vim
@@ -6,18 +6,6 @@
 "
 "============================================================================
 
-" in order to also check header files add this to your .vimrc:
-" (this creates an empty .syntastic_dummy.cu file in your source directory)
-"
-"   let g:syntastic_cuda_check_header = 1
-
-" By default, nvcc and thus syntastic, defaults to the most basic architecture.
-" This can produce false errors if the developer intends to compile for newer
-" hardware and use newer features, eg. double precision numbers. To pass a
-" specific target arch to nvcc, e.g. add the following to your .vimrc:
-"
-"   let g:syntastic_cuda_arch = "sm_20"
-
 if exists("g:loaded_syntastic_cuda_nvcc_checker")
     finish
 endif
@@ -53,7 +41,7 @@ function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
         \ '%DMaking %*\a in %f,'.
         \ '%f|%l| %m'
 
-    if expand('%') =~? '\m\%(.h\|.hpp\|.cuh\)$'
+    if expand('%', 1) =~? '\m\%(.h\|.hpp\|.cuh\)$'
         if exists('g:syntastic_cuda_check_header')
             let makeprg =
                 \ 'echo > .syntastic_dummy.cu ; ' .
@@ -75,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
index d751ede3..069d486d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/d/dmd.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_d_dmd_IsAvailable() dict
         let g:syntastic_d_compiler = self.getExec()
     endif
     call self.log('g:syntastic_d_compiler =', g:syntastic_d_compiler)
-    return executable(expand(g:syntastic_d_compiler))
+    return executable(expand(g:syntastic_d_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_d_dmd_GetLocList() dict
@@ -57,4 +57,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
index edf71df3..4305fdf1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/dart/dartanalyzer.vim
@@ -53,7 +53,7 @@ function! SyntaxCheckers_dart_dartanalyzer_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2] })
+        \ 'returns': [0, 1, 2, 3] })
 
     for e in loclist
         let e['text'] = substitute(e['text'], '\m\\\([\\|]\)', '\1', 'g')
@@ -73,4 +73,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
index 46a12f6b..54488610 100644
--- a/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/igor.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
index bfb9da0a..722dfadd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/docbk/xmllint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'xmllint',
     \ 'redirect': 'xml/xmllint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim b/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
index 0bdf2813..3e4d416c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/dustjs/swiffer.vim
@@ -35,4 +35,4 @@ call SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
index c834b51e..c77e7594 100644
--- a/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/elixir/elixir.vim
@@ -35,7 +35,7 @@ function! SyntaxCheckers_elixir_elixir_GetLocList() dict
 
     let make_options = {}
     let compile_command = 'elixir'
-    let mix_file = syntastic#util#findInParent('mix.exs', expand('%:p:h'))
+    let mix_file = syntastic#util#findInParent('mix.exs', expand('%:p:h', 1))
 
     if filereadable(mix_file)
         let compile_command = 'mix compile'
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
index b4725505..9fd869fc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/escript.vim
@@ -19,13 +19,13 @@ if !exists('g:syntastic_erlc_include_path')
     let g:syntastic_erlc_include_path = ''
 endif
 
-let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'erlang_check_file.erl')
+let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'erlang_check_file.erl')
 
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_erlang_escript_GetLocList() dict
-    if expand('%:e') ==# 'hrl'
+    if expand('%:e', 1) ==# 'hrl'
         return []
     endif
 
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
index 91629c43..83963303 100644
--- a/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
index 96f94780..012242ed 100644
--- a/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    let fname = "'" . escape(expand('%'), "\\'") . "'"
+    let fname = "'" . escape(expand('%', 1), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
     if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped(). ' --version'), [1, 9])
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
index 935b6bb8..74a626c8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/fortran/gfortran.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict
         let g:syntastic_fortran_compiler = self.getExec()
     endif
     call self.log('g:syntastic_fortran_compiler = ', g:syntastic_fortran_compiler)
-    return executable(expand(g:syntastic_fortran_compiler))
+    return executable(expand(g:syntastic_fortran_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_fortran_gfortran_GetLocList() dict
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
index 43b9069a..5faee03c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/glsl/cgc.vim
@@ -27,7 +27,7 @@ let s:glsl_extensions = {
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_glsl_cgc_GetLocList() dict
+function! SyntaxCheckers_glsl_cgc_GetLocList() dict " {{{1
     let makeprg = self.makeprgBuild({
         \ 'args_before': '-oglsl -profile ' . s:GetProfile(),
         \ 'args': (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
@@ -39,9 +39,11 @@ function! SyntaxCheckers_glsl_cgc_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetProfile()
+" Utilities {{{1
+
+function! s:GetProfile() " {{{2
     let save_view = winsaveview()
     let old_foldenable = &foldenable
     let old_lazyredraw = &lazyredraw
@@ -61,11 +63,13 @@ function! s:GetProfile()
         let profile = matchstr(getline(line), magic . '\zs.*')
     else
         let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
-        let profile = get(extensions, tolower(expand('%:e')), 'gpu_vert')
+        let profile = get(extensions, tolower(expand('%:e', 1)), 'gpu_vert')
     endif
 
     return profile
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \'filetype': 'glsl',
@@ -74,4 +78,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/go.vim b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
index 868d7140..a7f6b10a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/go.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/go.vim
@@ -8,10 +8,11 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
+"============================================================================
+"
 " This syntax checker does not reformat your source code.
 " Use a BufWritePre autocommand to that end:
 "   autocmd FileType go autocmd BufWritePre <buffer> Fmt
-"============================================================================
 
 if exists("g:loaded_syntastic_go_go_checker")
     finish
@@ -22,7 +23,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_go_IsAvailable() dict
-    return executable('go') && executable('gofmt')
+    return executable(self.getExec()) && executable('gofmt')
 endfunction
 
 function! SyntaxCheckers_go_go_GetLocList() dict
@@ -48,13 +49,17 @@ function! SyntaxCheckers_go_go_GetLocList() dict
 
     " Test files, i.e. files with a name ending in `_test.go`, are not
     " compiled by `go build`, therefore `go test` must be called for those.
-    if match(expand('%'), '\m_test\.go$') == -1
-        let makeprg = 'go build ' . syntastic#c#NullOutput()
+    if match(expand('%', 1), '\m_test\.go$') == -1
+        let cmd = 'build'
+        let opts = syntastic#util#var('go_go_build_args')
         let cleanup = 0
     else
-        let makeprg = 'go test -c ' . syntastic#c#NullOutput()
+        let cmd = 'test -c'
+        let opts = syntastic#util#var('go_go_test_args')
         let cleanup = 1
     endif
+    let opt_str = (type(opts) != type('') || opts != '') ? join(syntastic#util#argsescape(opts)) : opts
+    let makeprg = self.getExec() . ' ' . cmd . ' ' . opt_str . ' ' . syntastic#c#NullOutput()
 
     " The first pattern is for warnings from C compilers.
     let errorformat =
@@ -71,11 +76,11 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     let errors = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'e'} })
 
     if cleanup
-        call delete(expand('%:p:h') . syntastic#util#Slash() . expand('%:p:h:t') . '.test')
+        call delete(expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:p:h:t', 1) . '.test')
     endif
 
     return errors
@@ -88,4 +93,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
index 62b86cbc..92838e8f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gofmt.vim
@@ -8,10 +8,11 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
+"============================================================================
+"
 " This syntax checker does not reformat your source code.
 " Use a BufWritePre autocommand to that end:
 "   autocmd FileType go autocmd BufWritePre <buffer> Fmt
-"============================================================================
 
 if exists("g:loaded_syntastic_go_gofmt_checker")
     finish
@@ -41,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
index e517e6f5..253a485b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/golint.vim
@@ -28,6 +28,7 @@ function! SyntaxCheckers_go_golint_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'w'},
         \ 'subtype': 'Style' })
 endfunction
 
@@ -38,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
index 6c49b997..70e3082f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/gotype.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_go_gotype_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'e'} })
 endfunction
 
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
index c4b7fd93..98985789 100644
--- a/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/go/govet.vim
@@ -19,11 +19,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_go_govet_IsAvailable() dict
-    return executable('go')
+    return executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_go_govet_GetLocList() dict
-    let makeprg = 'go vet'
+    let makeprg = self.getExec() . ' vet'
 
     let errorformat =
         \ '%Evet: %.%\+: %f:%l:%c: %m,' .
@@ -37,15 +37,16 @@ function! SyntaxCheckers_go_govet_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h'),
+        \ 'cwd': expand('%:p:h', 1),
         \ 'defaults': {'type': 'w'} })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'go',
-    \ 'name': 'govet'})
+    \ 'name': 'govet',
+    \ 'exec': 'go' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
index a26fa6cc..c0c73182 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml.vim
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim b/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
index 160d9a5a..6db49403 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haml/haml_lint.vim
@@ -34,4 +34,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
index adf4b611..8ada4c79 100644
--- a/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/handlebars/handlebars.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
index 97760508..ebc208e3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/ghc-mod.vim
@@ -30,10 +30,10 @@ function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
     " know the version in order to know how to find out the version. :)
 
     " Try "ghc-mod version".
-    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+    let ver = filter(split(system(self.getExecEscaped() . ' version'), '\n'), 'v:val =~# ''\m\sversion''')
     if !len(ver)
         " That didn't work.  Try "ghc-mod" alone.
-        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m^ghc-mod version''')
+        let ver = filter(split(system(self.getExecEscaped()), '\n'), 'v:val =~# ''\m\sversion''')
     endif
 
     if len(ver)
@@ -80,4 +80,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
index 978abd20..b2c1781b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
index 592e4d39..f97d67f2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/hlint.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
index e2f4a13d..7cf7e7ba 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haskell/scan.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
index 3769627f..2b990b8e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/haxe/haxe.vim
@@ -24,7 +24,7 @@ function! SyntaxCheckers_haxe_haxe_GetLocList() dict
     elseif exists('g:vaxe_hxml')
         let hxml = g:vaxe_hxml
     else
-        let hxml = syntastic#util#findInParent('*.hxml', expand('%:p:h'))
+        let hxml = syntastic#util#findInParent('*.hxml', expand('%:p:h', 1))
     endif
     let hxml = fnamemodify(hxml, ':p')
 
@@ -60,4 +60,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim b/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
index 0f2ef527..76b8b50b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/hss/hss.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
index 30c89b2f..fa163791 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/jshint.vim
@@ -51,4 +51,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
index 9070bfae..71a16159 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/tidy.vim
@@ -17,23 +17,17 @@
 "
 " HTML Tidy for HTML5 can be used without changes by this checker, just install
 " it and point g:syntastic_html_tidy_exec to the executable.
-"
-" Checker options:
-"
-" - g:syntastic_html_tidy_ignore_errors (list; default: [])
-"   list of errors to ignore
-" - g:syntastic_html_tidy_blocklevel_tags (list; default: [])
-"   list of additional blocklevel tags, to be added to "--new-blocklevel-tags"
-" - g:syntastic_html_tidy_inline_tags (list; default: [])
-"   list of additional inline tags, to be added to "--new-inline-tags"
-" - g:syntastic_html_tidy_empty_tags (list; default: [])
-"   list of additional empty tags, to be added to "--new-empty-tags"
 
 if exists("g:loaded_syntastic_html_tidy_checker")
     finish
 endif
 let g:loaded_syntastic_html_tidy_checker = 1
 
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Checker options {{{1
+
 if !exists('g:syntastic_html_tidy_ignore_errors')
     let g:syntastic_html_tidy_ignore_errors = []
 endif
@@ -50,27 +44,9 @@ if !exists('g:syntastic_html_tidy_empty_tags')
     let g:syntastic_html_tidy_empty_tags = []
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
+" }}}1
 
-" TODO: join this with xhtml.vim for DRY's sake?
-function! s:TidyEncOptByFenc()
-    let TIDY_OPTS = {
-            \ 'utf-8':        '-utf8',
-            \ 'ascii':        '-ascii',
-            \ 'latin1':       '-latin1',
-            \ 'iso-2022-jp':  '-iso-2022',
-            \ 'cp1252':       '-win1252',
-            \ 'macroman':     '-mac',
-            \ 'utf-16le':     '-utf16le',
-            \ 'utf-16':       '-utf16',
-            \ 'big5':         '-big5',
-            \ 'cp932':        '-shiftjis',
-            \ 'sjis':         '-shiftjis',
-            \ 'cp850':        '-ibm858',
-        \ }
-    return get(TIDY_OPTS, &fileencoding, '-utf8')
-endfunction
+" Constants {{{1
 
 let s:IGNORE_ERRORS = [
         \ "<table> lacks \"summary\" attribute",
@@ -163,29 +139,9 @@ let s:EMPTY_TAGS = [
     \ ]
 lockvar! s:EMPTY_TAGS
 
-function! s:IgnoreError(text)
-    for item in s:IGNORE_ERRORS + g:syntastic_html_tidy_ignore_errors
-        if stridx(a:text, item) != -1
-            return 1
-        endif
-    endfor
-    return 0
-endfunction
+" }}}1
 
-function! s:NewTags(name)
-    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
-endfunction
-
-function! s:Args()
-    let args = s:TidyEncOptByFenc() .
-        \ ' --new-blocklevel-tags ' . s:NewTags('blocklevel_tags') .
-        \ ' --new-inline-tags ' . s:NewTags('inline_tags') .
-        \ ' --new-empty-tags ' . s:NewTags('empty_tags') .
-        \ ' -e'
-    return args
-endfunction
-
-function! SyntaxCheckers_html_tidy_GetLocList() dict
+function! SyntaxCheckers_html_tidy_GetLocList() dict " {{{1
     let makeprg = self.makeprgBuild({ 'args_after': s:Args() })
 
     let errorformat =
@@ -207,7 +163,52 @@ function! SyntaxCheckers_html_tidy_GetLocList() dict
     endfor
 
     return loclist
-endfunction
+endfunction " }}}1
+
+" Utilities {{{1
+
+" TODO: join this with xhtml.vim for DRY's sake?
+function! s:TidyEncOptByFenc() " {{{2
+    let TIDY_OPTS = {
+            \ 'utf-8':        '-utf8',
+            \ 'ascii':        '-ascii',
+            \ 'latin1':       '-latin1',
+            \ 'iso-2022-jp':  '-iso-2022',
+            \ 'cp1252':       '-win1252',
+            \ 'macroman':     '-mac',
+            \ 'utf-16le':     '-utf16le',
+            \ 'utf-16':       '-utf16',
+            \ 'big5':         '-big5',
+            \ 'cp932':        '-shiftjis',
+            \ 'sjis':         '-shiftjis',
+            \ 'cp850':        '-ibm858',
+        \ }
+    return get(TIDY_OPTS, &fileencoding, '-utf8')
+endfunction " }}}2
+
+function! s:IgnoreError(text) " {{{2
+    for item in s:IGNORE_ERRORS + g:syntastic_html_tidy_ignore_errors
+        if stridx(a:text, item) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction " }}}2
+
+function! s:NewTags(name) " {{{2
+    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
+endfunction " }}}2
+
+function! s:Args() " {{{2
+    let args = s:TidyEncOptByFenc() .
+        \ ' --new-blocklevel-tags ' . s:NewTags('blocklevel_tags') .
+        \ ' --new-inline-tags ' . s:NewTags('inline_tags') .
+        \ ' --new-empty-tags ' . s:NewTags('empty_tags') .
+        \ ' -e'
+    return args
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'html',
@@ -216,4 +217,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
index 6a8e503d..809c2458 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/validator.vim
@@ -9,24 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For detail;s about validator see: http://about.validator.nu/
-"
-" Checker options:
-"
-" - g:syntastic_html_validator_api (string; default: 'http://validator.nu/')
-"   URL of the service to use for checking; leave it to the default to run the
-"   checks against http://validator.nu/, or set it to 'http://localhost:8888/'
-"   if you're running a local service as per http://about.validator.nu/#src
-"
-" - g:syntastic_html_validator_parser (string; default: empty)
-"   parser to use; legal values are: xml, xmldtd, html, html5, html4, html4tr;
-"   set it to 'html5' to check HTML5 files;  see the wiki for reference:
-"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#parser
-"
-" - g:syntastic_html_validator_nsfilter (string; default: empty)
-"   sets the nsfilter for the parser; see the wiki for details:
-"   http://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#nsfilter
 
 if exists("g:loaded_syntastic_html_validator_checker")
     finish
@@ -50,7 +32,7 @@ set cpo&vim
 
 function! SyntaxCheckers_html_validator_GetLocList() dict
     let fname = syntastic#util#shexpand('%')
-    let makeprg = self.getExecEscaped() . ' -s --compressed -F out=gnu -F asciiquotes=yes' .
+    let makeprg = self.getExecEscaped() . ' -q -s --compressed -F out=gnu -F asciiquotes=yes' .
         \ (g:syntastic_html_validator_parser != '' ? ' -F parser=' . g:syntastic_html_validator_parser : '') .
         \ (g:syntastic_html_validator_nsfilter != '' ? ' -F nsfilter=' . g:syntastic_html_validator_nsfilter : '') .
         \ ' -F doc=@' . fname . '\;type=text/html\;filename=' . fname . ' ' . g:syntastic_html_validator_api
@@ -84,4 +66,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
index 747b7583..dd921022 100644
--- a/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/html/w3.vim
@@ -9,13 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" Checker option:
-"
-" - g:syntastic_html_w3_api (string; default: 'http://validator.w3.org/check')
-"   URL of the service to use for checking; leave it to the default to run the
-"   checks against http://validator.w3.org/, or set it to
-"   'http://localhost/w3c-validator/check' if you're running a local service
 
 if exists("g:loaded_syntastic_html_w3_checker")
     finish
@@ -30,7 +23,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_html_w3_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' -s -F output=json ' .
+    let makeprg = self.getExecEscaped() . ' -q -s -F output=json ' .
         \ '-F uploaded_file=@' . syntastic#util#shexpand('%:p') . '\;type=text/html ' .
         \ g:syntastic_html_w3_api
 
@@ -66,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
index 6e059737..8afa5179 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/checkstyle.vim
@@ -32,8 +32,8 @@ function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
         return 0
     endif
 
-    let classpath = expand(g:syntastic_java_checkstyle_classpath)
-    let conf_file = expand(g:syntastic_java_checkstyle_conf_file)
+    let classpath = expand(g:syntastic_java_checkstyle_classpath, 1)
+    let conf_file = expand(g:syntastic_java_checkstyle_conf_file, 1)
     call self.log(
         \ 'filereadable(' . string(classpath) . ') = ' . filereadable(classpath) . ', ' .
         \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
@@ -43,7 +43,7 @@ endfunction
 
 function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
-    let fname = syntastic#util#shescape( expand('%:p:h') . syntastic#util#Slash() . expand('%:t') )
+    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
 
     if has('win32unix')
         let fname = substitute(system('cygpath -m ' . fname), '\m\%x00', '', 'g')
@@ -51,9 +51,9 @@ function! SyntaxCheckers_java_checkstyle_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
         \ 'args_after': [
-        \       '-cp', expand(g:syntastic_java_checkstyle_classpath),
+        \       '-cp', expand(g:syntastic_java_checkstyle_classpath, 1),
         \       'com.puppycrawl.tools.checkstyle.Main',
-        \       '-c', expand(g:syntastic_java_checkstyle_conf_file),
+        \       '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
         \       '-f', 'xml'],
         \ 'fname': fname })
 
@@ -74,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
index 3623d75f..03ff2193 100644
--- a/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/java/javac.vim
@@ -18,7 +18,11 @@ let g:syntastic_java_javac_maven_pom_tags = ['build', 'properties']
 let g:syntastic_java_javac_maven_pom_properties = {}
 let s:has_maven = 0
 
-" Global Options
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Checker options {{{1
+
 if !exists('g:syntastic_java_javac_executable')
     let g:syntastic_java_javac_executable = 'javac'
 endif
@@ -43,17 +47,6 @@ if !exists('g:syntastic_java_javac_delete_output')
     let g:syntastic_java_javac_delete_output = 1
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! s:CygwinPath(path)
-    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
-endfunction
-
-if !exists('g:syntastic_java_javac_temp_dir')
-    let g:syntastic_java_javac_temp_dir = syntastic#util#tmpdir()
-endif
-
 if !exists('g:syntastic_java_javac_autoload_maven_classpath')
     let g:syntastic_java_javac_autoload_maven_classpath = 1
 endif
@@ -78,32 +71,144 @@ if !exists('g:syntastic_java_javac_maven_pom_classpath')
     let g:syntastic_java_javac_maven_pom_classpath = {}
 endif
 
-function! s:RemoveCarriageReturn(line)
+" }}}1
+
+command! SyntasticJavacEditClasspath call s:EditClasspath()
+
+if g:syntastic_java_javac_config_file_enabled
+    command! SyntasticJavacEditConfig call s:EditConfig()
+endif
+
+function! SyntaxCheckers_java_javac_IsAvailable() dict " {{{1
+    let s:has_maven = executable(expand(g:syntastic_java_maven_executable, 1))
+    return executable(expand(g:syntastic_java_javac_executable, 1))
+endfunction " }}}1
+
+function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
+    let javac_opts = g:syntastic_java_javac_options
+
+    let output_dir = ''
+    if g:syntastic_java_javac_delete_output
+        let output_dir = syntastic#util#tmpdir()
+        let javac_opts .= ' -d ' . syntastic#util#shescape(output_dir)
+    endif
+
+    " load classpath from config file
+    if g:syntastic_java_javac_config_file_enabled
+        call s:LoadConfigFile()
+    endif
+
+
+    " add classpathes to javac_classpath {{{2
+    let javac_classpath = ''
+
+    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
+        if path != ''
+            try
+                let ps = glob(path, 1, 1)
+            catch
+                let ps = split(glob(path, 1), "\n")
+            endtry
+            if type(ps) == type([])
+                for p in ps
+                    let javac_classpath = s:AddToClasspath(javac_classpath, p)
+                endfor
+            else
+                let javac_classpath = s:AddToClasspath(javac_classpath, ps)
+            endif
+        endif
+    endfor
+
+    if s:has_maven && g:syntastic_java_javac_autoload_maven_classpath
+        if !g:syntastic_java_javac_delete_output
+            let javac_opts .= ' -d ' . syntastic#util#shescape(s:MavenOutputDirectory())
+        endif
+        let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
+    endif
+    " }}}2
+
+    " load custom classpath {{{2
+    if g:syntastic_java_javac_custom_classpath_command != ''
+        let lines = system(g:syntastic_java_javac_custom_classpath_command)
+        if syntastic#util#isRunningWindows() || has('win32unix')
+            let lines = substitute(lines, "\r\n", "\n", 'g')
+        endif
+        for l in split(lines, "\n")
+            let javac_classpath = s:AddToClasspath(javac_classpath, l)
+        endfor
+    endif
+
+    if javac_classpath != ''
+        let javac_opts .= ' -cp ' . syntastic#util#shexpand(javac_classpath)
+    endif
+    " }}}2
+
+    let fname = expand('%:p:h', 1) . syntastic#util#Slash() . expand ('%:t', 1)
+
+    if has('win32unix')
+        let fname = s:CygwinPath(fname)
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': javac_opts,
+        \ 'fname': syntastic#util#shescape(fname) })
+
+    " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
+    let errorformat =
+        \ '%E%f:%l:\ error:\ %m,'.
+        \ '%W%f:%l:\ warning:\ %m,'.
+        \ '%A%f:%l:\ %m,'.
+        \ '%+Z%p^,'.
+        \ '%+C%.%#,'.
+        \ '%-G%.%#'
+
+    if output_dir != ''
+        silent! call mkdir(output_dir, 'p')
+    endif
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['cygwinRemoveCR'] })
+
+    if output_dir != ''
+        call syntastic#util#rmrf(output_dir)
+    endif
+    return errors
+
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:CygwinPath(path) " {{{2
+    return substitute(system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
+endfunction " }}}2
+
+function! s:RemoveCarriageReturn(line) " {{{2
     return substitute(a:line, "\r", '', 'g')
-endfunction
+endfunction " }}}2
 
-function! s:ClassSep()
+function! s:ClassSep() " {{{2
     return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
-endfunction
+endfunction " }}}2
 
-function! s:AddToClasspath(classpath, path)
+function! s:AddToClasspath(classpath, path) " {{{2
     if a:path == ''
         return a:classpath
     endif
     return (a:classpath != '') ? a:classpath . s:ClassSep() . a:path : a:path
-endfunction
+endfunction " }}}2
 
-function! s:SplitClasspath(classpath)
+function! s:SplitClasspath(classpath) " {{{2
     return split(a:classpath, s:ClassSep())
-endfunction
+endfunction " }}}2
 
-function! s:LoadConfigFile()
-    if filereadable(expand(g:syntastic_java_javac_config_file))
-        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file))
+function! s:LoadConfigFile() " {{{2
+    if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+        exe 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
     endif
-endfunction
+endfunction " }}}2
 
-function! s:SaveClasspath()
+function! s:SaveClasspath() " {{{2
     " build classpath from lines
     let path = ''
     let lines = getline(1, line('$'))
@@ -112,9 +217,9 @@ function! s:SaveClasspath()
     endfor
     " save classpath to config file
     if g:syntastic_java_javac_config_file_enabled
-        if filereadable(expand(g:syntastic_java_javac_config_file))
+        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
             " load lines from config file
-            let lines = readfile(expand(g:syntastic_java_javac_config_file))
+            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
             " strip g:syntastic_java_javac_classpath options from config file lines
             let i = 0
             while i < len(lines)
@@ -130,14 +235,14 @@ function! s:SaveClasspath()
         " add new g:syntastic_java_javac_classpath option to config
         call add(lines, 'let g:syntastic_java_javac_classpath = ' . string(path))
         " save config file lines
-        call writefile(lines, expand(g:syntastic_java_javac_config_file))
+        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
     endif
     " set new classpath
     let g:syntastic_java_javac_classpath = path
     let &modified = 0
-endfunction
+endfunction " }}}2
 
-function! s:EditClasspath()
+function! s:EditClasspath() " {{{2
     let command = 'syntastic javac classpath'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
@@ -160,25 +265,25 @@ function! s:EditClasspath()
     else
         execute winnr . 'wincmd w'
     endif
-endfunction
+endfunction " }}}2
 
-function! s:SaveConfig()
+function! s:SaveConfig() " {{{2
     " get lines
     let lines = getline(1, line('$'))
     if g:syntastic_java_javac_config_file_enabled
         " save config file lines
-        call writefile(lines, expand(g:syntastic_java_javac_config_file))
+        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
     endif
     let &modified = 0
-endfunction
+endfunction " }}}2
 
-function! s:EditConfig()
+function! s:EditConfig() " {{{2
     let command = 'syntastic javac config'
     let winnr = bufwinnr('^' . command . '$')
     if winnr < 0
         let lines = []
-        if filereadable(expand(g:syntastic_java_javac_config_file))
-            let lines = readfile(expand(g:syntastic_java_javac_config_file))
+        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
         endif
         execute (len(lines) + 5) . 'sp ' . fnameescape(command)
 
@@ -194,9 +299,9 @@ function! s:EditConfig()
     else
         execute winnr . 'wincmd w'
     endif
-endfunction
+endfunction " }}}2
 
-function! s:GetMavenProperties()
+function! s:GetMavenProperties() " {{{2
     let mvn_properties = {}
     let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
@@ -230,15 +335,9 @@ function! s:GetMavenProperties()
         return g:syntastic_java_javac_maven_pom_properties[pom]
     endif
     return mvn_properties
-endfunction
+endfunction " }}}2
 
-command! SyntasticJavacEditClasspath call s:EditClasspath()
-
-if g:syntastic_java_javac_config_file_enabled
-    command! SyntasticJavacEditConfig call s:EditConfig()
-endif
-
-function! s:GetMavenClasspath()
+function! s:GetMavenClasspath() " {{{2
     let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
         if !has_key(g:syntastic_java_javac_maven_pom_ftime, pom) || g:syntastic_java_javac_maven_pom_ftime[pom] != getftime(pom)
@@ -279,14 +378,9 @@ function! s:GetMavenClasspath()
         return g:syntastic_java_javac_maven_pom_classpath[pom]
     endif
     return ''
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_java_javac_IsAvailable() dict
-    let s:has_maven = executable(expand(g:syntastic_java_maven_executable))
-    return executable(expand(g:syntastic_java_javac_executable))
-endfunction
-
-function! s:MavenOutputDirectory()
+function! s:MavenOutputDirectory() " {{{2
     let pom = findfile('pom.xml', '.;')
     if s:has_maven && filereadable(pom)
         let mvn_properties = s:GetMavenProperties()
@@ -294,13 +388,13 @@ function! s:MavenOutputDirectory()
         if has_key(mvn_properties, 'project.properties.build.dir')
             let output_dir = mvn_properties['project.properties.build.dir']
         endif
-        if stridx(expand( '%:p:h' ), 'src.main.java') >= 0
+        if stridx(expand('%:p:h', 1), 'src.main.java') >= 0
             let output_dir .= '/target/classes'
             if has_key(mvn_properties, 'project.build.outputDirectory')
                 let output_dir = mvn_properties['project.build.outputDirectory']
             endif
         endif
-        if stridx(expand( '%:p:h' ), 'src.test.java') >= 0
+        if stridx(expand('%:p:h', 1), 'src.test.java') >= 0
             let output_dir .= '/target/test-classes'
             if has_key(mvn_properties, 'project.build.testOutputDirectory')
                 let output_dir = mvn_properties['project.build.testOutputDirectory']
@@ -313,97 +407,9 @@ function! s:MavenOutputDirectory()
         return output_dir
     endif
     return '.'
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_java_javac_GetLocList() dict
-    let javac_opts = g:syntastic_java_javac_options
-
-    let output_dir = ''
-    if g:syntastic_java_javac_delete_output
-        let output_dir = g:syntastic_java_javac_temp_dir
-        let javac_opts .= ' -d ' . syntastic#util#shescape(output_dir)
-    endif
-
-    " load classpath from config file
-    if g:syntastic_java_javac_config_file_enabled
-        call s:LoadConfigFile()
-    endif
-
-    let javac_classpath = ''
-
-    " add classpathes to javac_classpath
-    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
-        if path != ''
-            try
-                let ps = glob(path, 0, 1)
-            catch
-                let ps = split(glob(path, 0), "\n")
-            endtry
-            if type(ps) == type([])
-                for p in ps
-                    let javac_classpath = s:AddToClasspath(javac_classpath, p)
-                endfor
-            else
-                let javac_classpath = s:AddToClasspath(javac_classpath, ps)
-            endif
-        endif
-    endfor
-
-    if s:has_maven && g:syntastic_java_javac_autoload_maven_classpath
-        if !g:syntastic_java_javac_delete_output
-            let javac_opts .= ' -d ' . syntastic#util#shescape(s:MavenOutputDirectory())
-        endif
-        let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
-    endif
-
-    " load custom classpath
-    if g:syntastic_java_javac_custom_classpath_command != ''
-        let lines = system(g:syntastic_java_javac_custom_classpath_command)
-        if syntastic#util#isRunningWindows() || has('win32unix')
-            let lines = substitute(lines, "\r\n", "\n", 'g')
-        endif
-        for l in split(lines, "\n")
-            let javac_classpath = s:AddToClasspath(javac_classpath, l)
-        endfor
-    endif
-
-    if javac_classpath != ''
-        let javac_opts .= ' -cp ' . syntastic#util#shexpand(javac_classpath)
-    endif
-
-    let fname = expand('%:p:h') . syntastic#util#Slash() . expand ('%:t')
-
-    if has('win32unix')
-        let fname = s:CygwinPath(fname)
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args': javac_opts,
-        \ 'fname': syntastic#util#shescape(fname) })
-
-    " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
-    let errorformat =
-        \ '%E%f:%l:\ error:\ %m,'.
-        \ '%W%f:%l:\ warning:\ %m,'.
-        \ '%A%f:%l:\ %m,'.
-        \ '%+Z%p^,'.
-        \ '%+C%.%#,'.
-        \ '%-G%.%#'
-
-    if g:syntastic_java_javac_delete_output
-        silent! call mkdir(output_dir, 'p')
-    endif
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['cygwinRemoveCR'] })
-
-    if g:syntastic_java_javac_delete_output
-        call syntastic#util#rmrf(output_dir)
-    endif
-    return errors
-
-endfunction
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'java',
@@ -412,4 +418,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
index 6a45fb89..e8102b8c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -32,7 +32,7 @@ function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
     let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
     call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
 
-    let jar = expand(cp)
+    let jar = expand(cp, 1)
     call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar))
 
     return filereadable(jar)
@@ -42,15 +42,15 @@ function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
     call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
     call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
 
-    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''))
+    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''), 1)
     if filereadable(flist)
-        let file_list = map( readfile(flist), 'expand(v:var)' )
+        let file_list = map( readfile(flist), 'expand(v:var, 1)' )
     else
-        let file_list = [expand('%')]
+        let file_list = [expand('%', 1)]
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path)]),
+        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path, 1)]),
         \ 'args_after': '--js',
         \ 'fname': file_list })
 
@@ -73,4 +73,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
index acb91898..d66e8b85 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/eslint.vim
@@ -61,4 +61,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
new file mode 100644
index 00000000..2fc2cc46
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/flow.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        flow.vim
+"Description: Javascript syntax checker - using flow
+"Maintainer:  Michael Robinson <mike@pagesofinterest.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_flow_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_flow_checker = 1
+
+if !exists('g:syntastic_javascript_flow_sort')
+    let g:syntastic_javascript_flow_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_flow_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'check',
+        \ 'args_after': '--show-all-errors --json' })
+
+    let errorformat =
+        \ '%f:%l:%c:%n: %m,' .
+        \ '%f:%l:%c: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'flow',
+        \ 'defaults': {'type': 'E'} })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['nr'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'flow'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
index 1704ac27..5266b15b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/gjslint.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
index b1d3b754..a3db94e2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jscs.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
index f0dc59fe..63d9bab8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim
@@ -61,4 +61,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
index 8f4148d6..c3db1cb6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsl.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
index 63bb4101..9ade0e8a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jslint.vim
@@ -8,8 +8,8 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
-"Tested with jslint 0.1.4.
 "============================================================================
+
 if exists("g:loaded_syntastic_javascript_jslint_checker")
     finish
 endif
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
index 1d249237..89677dde 100644
--- a/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
index 2b9ec451..83f18dc7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/json/jsonlint.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
index 16e30091..55858ca7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/json/jsonval.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
index 786386ac..fce21b74 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/lessc.vim
@@ -10,13 +10,6 @@
 "
 "============================================================================
 
-" To send additional options to less use the variable g:syntastic_less_options.
-" The default is
-"   let g:syntastic_less_options = "--no-color"
-"
-" To use less-lint instead of less set the variable
-" g:syntastic_less_use_less_lint.
-
 if exists("g:loaded_syntastic_less_lessc_checker")
     finish
 endif
@@ -33,7 +26,7 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
+let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'less-lint.js')
 
 function! SyntaxCheckers_less_lessc_IsAvailable() dict
     call self.log('g:syntastic_less_use_less_lint =', g:syntastic_less_use_less_lint)
@@ -70,4 +63,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/less/recess.vim b/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
index 92944189..1a8d876e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/less/recess.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
index b8bc6483..8070cc6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lex/flex.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
index b501e3c9..9c88a2d0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/limbo/limbo.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_limbo_limbo_GetLocList() dict
     let makeprg = self.makeprgBuild({ 'args_before': include . '-w' . output })
 
     let errorformat = '%E%f:%l:%m'
-    if expand('%') =~# '\m\.m$'
+    if expand('%', 1) =~# '\m\.m$'
         let errorformat = '%-G%f:%l: near ` EOF ` : no implementation module,' . errorformat
     endif
 
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
index 5e726a92..50530d8b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lisp/clisp.vim
@@ -19,9 +19,13 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_lisp_clisp_GetLocList() dict
+    let tmpdir = syntastic#util#tmpdir()
+    let out = tmpdir != '.' ? ('-o ' . syntastic#util#shescape(tmpdir . syntastic#util#Slash() . 'syntastic_' . getpid())) : ''
+
     let makeprg = self.makeprgBuild({
         \ 'args_after': '-q',
-        \ 'fname_before': '-c' })
+        \ 'fname_before': '-c',
+        \ 'post_args_after': out })
 
     let errorformat  =
         \ '%-G;%.%#,' .
@@ -33,10 +37,14 @@ function! SyntaxCheckers_lisp_clisp_GetLocList() dict
         \ '%Z %m,' .
         \ '%-G%.%#'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
         \ 'defaults': {'bufnr': bufnr('')} })
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
@@ -46,4 +54,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim b/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
index c65a1672..a6755b82 100644
--- a/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/llvm/llvm.vim
@@ -36,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
index 5805e780..bc05a34f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/lua/luac.vim
@@ -62,4 +62,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim b/sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim
new file mode 100644
index 00000000..b9efa0d9
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/lua/luacheck.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"File:        luacheck.vim
+"Description: Lua static analysis using luacheck
+"Maintainer:  Thiago Bastos <tbastos@tbastos.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists("g:loaded_syntastic_lua_luacheck_checker")
+    finish
+endif
+let g:loaded_syntastic_lua_luacheck_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_lua_luacheck_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m''\zs\S\+\ze''')
+    if term != ''
+        return '\V\<' . escape(term, '\') . '\>'
+    endif
+
+    let term = matchstr(a:item['text'], '\m\(accessing undefined\|setting non-standard global\|' .
+                \ 'setting non-module global\|unused global\) variable \zs\S\+')
+    if term == ''
+        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze was previously defined')
+    endif
+    if term == ''
+        let term = matchstr(a:item['text'], '\munused \(variable\|argument\|loop variable\) \zs\S\+')
+    endif
+    if term == ''
+        let term = matchstr(a:item['text'], '\m\(value assigned to variable\|value of argument\|' .
+                \ 'value of loop variable\) \zs\S\+')
+    endif
+    if term == ''
+        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze is never set')
+    endif
+
+    return term != '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_lua_luacheck_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-color' })
+
+    let errorformat =
+        \ '%f:%l:%c: %m,'.
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'defaults': { 'type': 'W' },
+        \ 'returns': [0, 1, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lua',
+    \ 'name': 'luacheck' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
index 781a5e38..db5c816a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/markdown/mdl.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim b/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
index 1b15eeac..1eedec63 100644
--- a/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/matlab/mlint.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
index 65bf9aa9..4262d285 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nasm/nasm.vim
@@ -21,7 +21,7 @@ set cpo&vim
 function! SyntaxCheckers_nasm_nasm_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args_after': '-X gnu -f elf' .
-        \       ' -I ' . syntastic#util#shescape(expand("%:p:h") . "/") .
+        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . '/') .
         \       ' ' . syntastic#c#NullOutput() })
 
     let errorformat = '%f:%l: %t%*[^:]: %m'
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
index 4c36b499..f19cf69c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/igor.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'igor',
     \ 'redirect': 'docbk/igor'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim b/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
index 28085d54..ac7a73f0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/nroff/mandoc.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
index d44eac17..73da7f81 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_objc_gcc_IsAvailable() dict
         let g:syntastic_objc_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
     endif
     call self.log('g:syntastic_objc_compiler =', g:syntastic_objc_compiler)
-    return executable(expand(g:syntastic_objc_compiler))
+    return executable(expand(g:syntastic_objc_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_objc_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
index a415c41f..21ac7527 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objc/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_objc_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
index 13ff8c1a..6ae7ba50 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim
@@ -27,7 +27,7 @@ function! SyntaxCheckers_objcpp_gcc_IsAvailable() dict
         let g:syntastic_objcpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
     endif
     call self.log('g:syntastic_objcpp_compiler =', g:syntastic_objcpp_compiler)
-    return executable(expand(g:syntastic_objcpp_compiler))
+    return executable(expand(g:syntastic_objcpp_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_objcpp_gcc_GetLocList() dict
@@ -56,4 +56,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
index 84f71d29..58a3d46c 100644
--- a/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/objcpp/oclint.vim
@@ -8,13 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "============================================================================
-"
-" The setting 'g:syntastic_oclint_config_file' allows you to define a file
-" that contains additional compiler arguments like include directories or
-" CFLAGS. The file is expected to contain one option per line. If none is
-" given the filename defaults to '.syntastic_oclint_config':
-"
-"   let g:syntastic_oclint_config_file = '.config'
 
 if exists("g:loaded_syntastic_objcpp_oclint_checker")
     finish
@@ -28,4 +21,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'oclint',
     \ 'redirect': 'c/oclint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
index 5f7a0ee7..8a0ee2f6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -9,44 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" The more reliable way to check for a single .ml file is to use ocamlc.
-" You can do that setting this in your .vimrc:
-"
-"   let g:syntastic_ocaml_use_ocamlc = 1
-" It's possible to use ocamlc in conjuction with Jane Street's Core. In order
-" to do that, you have to specify this in your .vimrc:
-"
-"   let g:syntastic_ocaml_use_janestreet_core = 1
-"   let g:syntastic_ocaml_janestreet_core_dir = <path>
-"
-" Where path is the path to your core installation (usually a collection of
-" .cmx and .cmxa files).
-"
-"
-" By default the camlp4o preprocessor is used to check the syntax of .ml, and .mli files,
-" ocamllex is used to check .mll files and menhir is used to check .mly files.
-" The output is all redirected to /dev/null, nothing is written to the disk.
-"
-" If your source code needs camlp4r then you can define this in your .vimrc:
-"
-"   let g:syntastic_ocaml_camlp4r = 1
-"
-" If you used some syntax extensions, or you want to also typecheck the source
-" code, then you can define this:
-"
-"   let g:syntastic_ocaml_use_ocamlbuild = 1
-"
-" This will run ocamlbuild <name>.inferred.mli, so it will write to your _build
-" directory (and possibly rebuild your myocamlbuild.ml plugin), only enable this
-" if you are ok with that.
-"
-" If you are using syntax extensions / external libraries and have a properly
-" set up _tags (and myocamlbuild.ml file) then it should just work
-" to enable this flag and get syntax / type checks through syntastic.
-"
-" For best results your current directory should be the project root
-" (same situation if you want useful output from :make).
 
 if exists("g:loaded_syntastic_ocaml_camlp4o_checker")
     finish
@@ -62,9 +24,7 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict
-    return executable(s:ocamlpp)
-endfunction
+" Checker options {{{1
 
 if !exists('g:syntastic_ocaml_use_ocamlc') || !executable('ocamlc')
     let g:syntastic_ocaml_use_ocamlc = 0
@@ -78,7 +38,13 @@ if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable("ocamlbuild")
     let g:syntastic_ocaml_use_ocamlbuild = 0
 endif
 
-function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict
+" }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict " {{{1
+    return executable(s:ocamlpp)
+endfunction " }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
     let makeprg = s:GetMakeprg()
     if makeprg == ""
         return []
@@ -96,9 +62,11 @@ function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict
         \ '%-G+%.%#'
 
     return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetMakeprg()
+" Utilities {{{1
+
+function! s:GetMakeprg() " {{{2
     if g:syntastic_ocaml_use_ocamlc
         return s:GetOcamlcMakeprg()
     endif
@@ -108,30 +76,30 @@ function! s:GetMakeprg()
     endif
 
     return s:GetOtherMakeprg()
-endfunction
+endfunction " }}}2
 
-function! s:GetOcamlcMakeprg()
+function! s:GetOcamlcMakeprg() " {{{2
     if g:syntastic_ocaml_use_janestreet_core
         let build_cmd = "ocamlc -I "
-        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir)
+        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir, 1)
         let build_cmd .= " -c " . syntastic#util#shexpand('%')
         return build_cmd
     else
         return "ocamlc -c " . syntastic#util#shexpand('%')
     endif
-endfunction
+endfunction " }}}2
 
-function! s:GetOcamlBuildMakeprg()
+function! s:GetOcamlBuildMakeprg() " {{{2
     return "ocamlbuild -quiet -no-log -tag annot," . s:ocamlpp . " -no-links -no-hygiene -no-sanitize " .
                 \ syntastic#util#shexpand('%:r') . ".cmi"
-endfunction
+endfunction " }}}2
 
-function! s:GetOtherMakeprg()
+function! s:GetOtherMakeprg() " {{{2
     "TODO: give this function a better name?
     "
     "TODO: should use throw/catch instead of returning an empty makeprg
 
-    let extension = expand('%:e')
+    let extension = expand('%:e', 1)
     let makeprg = ""
 
     if stridx(extension, 'mly') >= 0 && executable("menhir")
@@ -144,7 +112,9 @@ function! s:GetOtherMakeprg()
     endif
 
     return makeprg
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'ocaml',
@@ -153,4 +123,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
index 553c55a5..e0d8f159 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perl.vim
@@ -26,16 +26,6 @@
 " References:
 "
 " - http://perldoc.perl.org/perlrun.html#*-c*
-"
-" Checker options:
-"
-" - g:syntastic_perl_interpreter (string; default: 'perl')
-"   The perl interpreter to use.
-"
-" - g:syntastic_perl_lib_path (list; default: [])
-"   List of include directories to be added to the perl command line. Example:
-"
-"       let g:syntastic_perl_lib_path = [ './lib', './lib/auto' ]
 
 if exists('g:loaded_syntastic_perl_perl_checker')
     finish
@@ -106,4 +96,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
index cd010945..1d060d23 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/perlcritic.vim
@@ -9,20 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about perlcritic see:
-"
-" - http://perlcritic.tigris.org/
-" - https://metacpan.org/module/Perl::Critic
-"
-" Checker options:
-"
-" - g:syntastic_perl_perlcritic_thres (integer; default: 5)
-"   error threshold: policy violations with a severity above this
-"   value are highlighted as errors, the others are warnings
-"
-" - g:syntastic_perl_perlcritic_args (string; default: empty)
-"   command line options to pass to perlcritic
 
 if exists("g:loaded_syntastic_perl_perlcritic_checker")
     finish
@@ -63,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
index 5ffc7365..a633fd8d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/perl/podchecker.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'podchecker',
     \ 'redirect': 'pod/podchecker'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/php.vim b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
index 558dc0ac..0b61c768 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/php.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/php.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
index e6600ac6..90202be9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpcs.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpcs
-"    - phpcs (see http://pear.php.net/package/PHP_CodeSniffer)
 
 if exists("g:loaded_syntastic_php_phpcs_checker")
     finish
@@ -22,13 +19,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_php_phpcs_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '--tab-width=' . &tabstop,
-        \ 'args_after': '--report=csv' })
+    let makeprg = self.makeprgBuild({ 'args_after': '--report=csv' })
 
     let errorformat =
         \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity%.%#,'.
-        \ '"%f"\,%l\,%v\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
+        \ '"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
 
     return SyntasticMake({
         \ 'makeprg': makeprg,
@@ -43,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim b/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
index d857d9e2..c5182499 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phplint.vim
@@ -88,4 +88,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
index 6b6022ab..c7a744d5 100644
--- a/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" See here for details of phpmd
-"   - phpmd (see http://phpmd.org)
 
 if exists("g:loaded_syntastic_php_phpmd_checker")
     finish
@@ -44,7 +41,7 @@ function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
     endif
     let term = matchstr(a:item['text'], "\\m\\C^The '\\S\\+()' method which returns ")
     if term != ''
-        return '\V'.substitute(term, "\\m\\C^The '\\(\\S\\+\\()' method which returns.*", '\1', '')
+        return '\V'.substitute(term, "\\m\\C^The '\\(\\S\\+\\)()' method which returns.*", '\1', '')
     endif
     let term = matchstr(a:item['text'], '\m\C variable \S\+ should begin with ')
     if term != ''
@@ -77,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
index 254aa91a..2115146a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/po/msgfmt.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim b/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
index 34a37e55..b79fe72f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/pod/podchecker.vim
@@ -48,4 +48,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
index dedb9544..5cec0357 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppet.vim
@@ -50,4 +50,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
index d9948cae..55148782 100644
--- a/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/codec.py b/sources_non_forked/syntastic/syntax_checkers/python/codec.py
new file mode 100644
index 00000000..6e980c7b
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/python/codec.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+from sys import argv, exit
+
+import codecs
+import re
+import os
+
+
+if len(argv) != 2:
+    exit(1)
+
+try:
+    with open(argv[1]) as fle:
+        text = fle.readlines()
+
+    if text:
+        match = re.match(r"#\s*coding\s*:\s*(?P<coding>\w+)", text[0])
+        if match:
+            text = codecs.lookup(match.groupdict()["coding"]).incrementaldecoder().decode(
+                ''.join(text).encode('utf-8')).encode('utf-8')
+
+    if isinstance(text, list):
+        text = ''.join(text).encode('utf-8')
+
+    compile(text, argv[1], 'exec', 0, 1)
+except SyntaxError as err:
+    print('%s:%s:%s: %s' % (err.filename, err.lineno, err.offset, err.msg))
+except Exception as err:
+    print('%s:%s:%s: %s' % (os.path.abspath(argv[1]), 1, 0, err))
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
index 1e4f1c9b..fc7c8e59 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/flake8.vim
@@ -69,4 +69,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
index 05a07080..2fea0fe8 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/frosted.vim
@@ -60,4 +60,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
index 5a560431..068ab007 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/mypy.vim
@@ -32,4 +32,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
index 1872456a..374cabe3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep257.vim
@@ -2,8 +2,6 @@
 "File:        pep257.vim
 "Description: Docstring style checking plugin for syntastic.vim
 "============================================================================
-"
-" For details about pep257 see: https://github.com/GreenSteam/pep257
 
 if exists('g:loaded_syntastic_python_pep257_checker')
     finish
@@ -60,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
index 0f35c276..961f0ded 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pep8.vim
@@ -9,8 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" For details about pep8 see: https://github.com/jcrocholl/pep8
 
 if exists("g:loaded_syntastic_python_pep8_checker")
     finish
@@ -47,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
index ea987f97..df6d22b1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/prospector.vim
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
index 69a3060f..159964d0 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -33,4 +33,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
index 530a275c..b0db97a7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pyflakes.vim
@@ -71,4 +71,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
index b0352b2e..ab49e32b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylama.vim
@@ -71,4 +71,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
index 25a60e9d..65436b44 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/pylint.vim
@@ -95,4 +95,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/python/python.vim b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
index 3d1c0aee..6d0c11e6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/python/python.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/python/python.vim
@@ -15,10 +15,14 @@ if exists("g:loaded_syntastic_python_python_checker")
 endif
 let g:loaded_syntastic_python_python_checker = 1
 
+if !exists('g:syntastic_python_python_use_codec')
+    let g:syntastic_python_python_use_codec = 0
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
-let s:compiler = expand('<sfile>:p:h') . syntastic#util#Slash() . 'compile.py'
+let s:base_path = expand('<sfile>:p:h', 1) . syntastic#util#Slash()
 
 function! SyntaxCheckers_python_python_IsAvailable() dict
     if !executable(self.getExec())
@@ -32,7 +36,9 @@ function! SyntaxCheckers_python_python_IsAvailable() dict
 endfunction
 
 function! SyntaxCheckers_python_python_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:compiler] })
+    let compiler = s:base_path . (g:syntastic_python_python_use_codec ? 'codec.py' : 'compile.py')
+    call self.log('using compiler script', compiler)
+    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), compiler] })
 
     let errorformat = '%E%f:%l:%c: %m'
 
@@ -52,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
index 792305f3..5e8eec58 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/lint.vim
@@ -80,4 +80,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
index ec924c38..388cbbf4 100644
--- a/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/r/svtools.vim
@@ -75,4 +75,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
index f76c321c..34159e71 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -27,7 +27,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_racket_code_ayatollah_IsAvailable() dict
-    let s:script = expand(g:syntastic_racket_code_ayatollah_script)
+    let s:script = expand(g:syntastic_racket_code_ayatollah_script, 1)
     return executable(self.getExec()) && filereadable(s:script)
 endfunction
 
@@ -59,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
index 71615205..a6c84c18 100644
--- a/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/racket/racket.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim b/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
index db8bd581..1653d218 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rnc/rnv.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
index a368e9e6..fb851fd2 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
@@ -59,4 +59,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim b/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
index 5c831490..fc331b3b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/rst/rstcheck.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
index bf57b091..fbf5b7fa 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/jruby.vim
@@ -47,4 +47,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
index 54c8365f..f357e370 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/macruby.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
index b4b8d3af..8945ea3e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim
@@ -77,4 +77,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
new file mode 100644
index 00000000..becc23d6
--- /dev/null
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/reek.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        reek.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Mindaugas Mozūras
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_ruby_reek_checker")
+    finish
+endif
+let g:loaded_syntastic_ruby_reek_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_reek_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
+    call self.log(self.getExec() . ' version =', ver)
+
+    return syntastic#util#versionIsAtLeast(ver, [1, 3, 0])
+endfunction
+
+function! SyntaxCheckers_ruby_reek_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --quiet --line-number --single-line' })
+
+    let errorformat =
+        \ '%E%.%#: Racc::ParseError: %f:%l :: %m,' .
+        \ '%W%f:%l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if e['type'] ==? 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'reek'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
index baf2ad4d..23bc1ff3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -9,9 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" In order to use rubocop with the default ruby checker (mri):
-"     let g:syntastic_ruby_checkers = ['mri', 'rubocop']
 
 if exists("g:loaded_syntastic_ruby_rubocop_checker")
     finish
@@ -29,11 +26,11 @@ function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
     let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
     call self.log(self.getExec() . ' version =', ver)
 
-    return syntastic#util#versionIsAtLeast(ver, [0, 9, 0])
+    return syntastic#util#versionIsAtLeast(ver, [0, 12, 0])
 endfunction
 
 function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs --silent' })
+    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs' })
 
     let errorformat = '%f:%l:%c: %t: %m'
 
@@ -61,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
index b4839f54..e0387df6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -42,4 +42,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
index ce8e6939..da24112a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sass.vim
@@ -39,7 +39,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_sass_sass_GetLocList() dict
-    if !g:syntastic_sass_check_partials && expand('%:t')[0] == '_'
+    if !g:syntastic_sass_check_partials && expand('%:t', 1)[0] == '_'
         return []
     endif
 
@@ -81,4 +81,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
index 731d1789..2c1332a1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sass/sassc.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
index 6f1fcf6d..25d6a4d7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/fsc.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
index 0d0c15aa..918c0f6f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalac.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
index 5d282692..1df96c00 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scala/scalastyle.vim
@@ -31,8 +31,8 @@ function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict
         return 0
     endif
 
-    let jar = expand(g:syntastic_scala_scalastyle_jar)
-    let conf_file = expand(g:syntastic_scala_scalastyle_config_file)
+    let jar = expand(g:syntastic_scala_scalastyle_jar, 1)
+    let conf_file = expand(g:syntastic_scala_scalastyle_config_file, 1)
     call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar) . ', ' .
         \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
 
@@ -42,8 +42,8 @@ endfunction
 function! SyntaxCheckers_scala_scalastyle_GetLocList() dict
 
     let makeprg = self.makeprgBuild({
-        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar)],
-        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file)] })
+        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar, 1)],
+        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file, 1)] })
 
     let errorformat =
         \ '%trror file=%f message=%m line=%l column=%c,' .
@@ -74,4 +74,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
index 0f837ca5..86a30211 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sass.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'sass',
     \ 'redirect': 'sass/sass'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
index 75fdc2aa..c5638d33 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/sassc.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'sassc',
     \ 'redirect': 'sass/sassc'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
index 523e981c..ab19f27f 100644
--- a/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -30,12 +30,24 @@ endfunction
 
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
     let makeprg = self.makeprgBuild({})
+
     let errorformat = '%f:%l [%t] %m'
-    return SyntasticMake({
+
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
         \ 'returns': [0, 1, 2, 65, 66] })
+
+    let cutoff = strlen('Syntax Error: ')
+    for e in loclist
+        if e['text'][: cutoff-1] ==# 'Syntax Error: '
+            let e['text'] = e['text'][cutoff :]
+        else
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
@@ -46,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim b/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
index 73b0dcba..63b7a486 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/bashate.vim
@@ -45,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim b/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
index 42751cf9..eb68113a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/checkbashisms.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
index 95e6b48d..6989fba3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/sh.vim
@@ -18,12 +18,12 @@ let g:loaded_syntastic_sh_sh_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_sh_sh_IsAvailable() dict
+function! SyntaxCheckers_sh_sh_IsAvailable() dict " {{{1
     call self.log('shell =', s:GetShell())
     return s:IsShellValid()
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_sh_sh_GetLocList() dict
+function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1
     if s:GetShell() ==# 'zsh'
         return s:ForwardToZshChecker()
     endif
@@ -41,9 +41,11 @@ function! SyntaxCheckers_sh_sh_GetLocList() dict
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat })
-endfunction
+endfunction " }}}1
 
-function! s:GetShell()
+" Utilities {{{1
+
+function! s:GetShell() " {{{2
     if !exists('b:shell') || b:shell == ''
         let b:shell = ''
         let shebang = syntastic#util#parseShebang()['exe']
@@ -62,14 +64,14 @@ function! s:GetShell()
         endif
     endif
     return b:shell
-endfunction
+endfunction " }}}2
 
-function! s:IsShellValid()
+function! s:IsShellValid() " {{{2
     let shell = s:GetShell()
     return shell != '' && executable(shell)
-endfunction
+endfunction " }}}2
 
-function! s:ForwardToZshChecker()
+function! s:ForwardToZshChecker() " {{{2
     let registry = g:SyntasticRegistry.Instance()
     let zsh_checkers = registry.getCheckersAvailable('zsh', ['zsh'])
     if !empty(zsh_checkers)
@@ -77,7 +79,9 @@ function! s:ForwardToZshChecker()
     else
         return []
     endif
-endfunction
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'sh',
@@ -86,4 +90,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
index de69683c..0e76606b 100644
--- a/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/sh/shellcheck.vim
@@ -41,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
index 51e641a1..8fb05c84 100644
--- a/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim
@@ -53,4 +53,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim b/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
index dfd965dc..7e9431bf 100644
--- a/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/spec/rpmlint.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
index 0797690e..95ab9903 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tcl/nagelfar.vim
@@ -7,10 +7,11 @@
 "             it and/or modify it under the terms of the Do What The Fuck You
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"Notes:       Requires nagelfar v1.1.12 or later with support for -H option.
-"             See nagelfar homepage http://nagelfar.berlios.de/.
 "
 "============================================================================
+"
+"Notes:       Requires nagelfar v1.1.12 or later with support for -H option.
+"             See nagelfar homepage http://nagelfar.berlios.de/.
 
 if exists("g:loaded_syntastic_tcl_nagelfar_checker")
     finish
@@ -40,4 +41,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
index 7d4c90a2..9b359028 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/chktex.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim b/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
index 0896919c..f1565200 100644
--- a/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/tex/lacheck.vim
@@ -37,4 +37,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
index 63cae936..6eca27d9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/texinfo/makeinfo.vim
@@ -44,4 +44,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
index f092b4bb..d45ba3fe 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/atdtool.vim
@@ -58,4 +58,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
index 4b358e5a..bf6fda9d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/igor.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'igor',
     \ 'redirect': 'docbk/igor'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim b/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
index 20111468..26835e4a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/text/language_check.vim
@@ -34,4 +34,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim b/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
index 36e264bf..b4f9be13 100644
--- a/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/twig/twiglint.vim
@@ -38,4 +38,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
index 521a5314..d7073670 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tsc.vim
@@ -40,4 +40,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
index eeeb8b4c..4c62299e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/typescript/tslint.vim
@@ -43,4 +43,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
index c2ca1138..0b9fe41e 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vala/valac.vim
@@ -2,23 +2,6 @@
 "File:        vala.vim
 "Description: Syntax checking plugin for syntastic.vim
 "Maintainer:  Konstantin Stepanov (me@kstep.me)
-"Notes:       Add special comment line into your vala file starting with
-"             "// modules: " and containing space delimited list of vala
-"             modules, used by the file, so this script can build correct
-"             --pkg arguments.
-"             Add another special comment line into your vala file starting
-"             with "// vapidirs: " followed by a space delimited list of
-"             the vapi directories so this script can build with the correct
-"             --vapidir arguments
-"             Alternatively you can set the g:syntastic_vala_modules array
-"             and/or the g:syntastic_vala_vapidirs array
-"             in your .vimrc or .lvimrc with localvimrc plugin
-"             (http://www.vim.org/scripts/script.php?script_id=441).
-"             Valac compiler is not the fastest thing in the world, so you
-"             may want to disable this plugin with
-"             let g:syntastic_vala_check_disabled = 1 command in your .vimrc or
-"             command line. Unlet this variable to set it to 0 to reenable
-"             this checker.
 "License:     This program is free software. It comes without any warranty,
 "             to the extent permitted by applicable law. You can redistribute
 "             it and/or modify it under the terms of the Do What The Fuck You
@@ -35,12 +18,29 @@ let g:loaded_syntastic_vala_valac_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos)
+function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos) " {{{1
     let length = strlen(matchstr(a:pos['text'], '\m\^\+$'))
     return '\%>' . (a:pos['col'] - 1) . 'c\%<' . (a:pos['col'] + length) . 'c'
-endfunction
+endfunction " }}}1
 
-function! s:GetValaModules()
+function! SyntaxCheckers_vala_valac_GetLocList() dict " {{{1
+    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
+    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
+    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
+
+    let errorformat =
+        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
+        \ '%C%m,'.
+        \ '%Z%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetValaModules() " {{{2
     if exists('g:syntastic_vala_modules')
         if type(g:syntastic_vala_modules) == type('')
             return split(g:syntastic_vala_modules, '\s\+')
@@ -54,9 +54,9 @@ function! s:GetValaModules()
     let modules_line = search('^// modules: ', 'n')
     let modules_str = getline(modules_line)
     return split(strpart(modules_str, 12), '\s\+')
-endfunction
+endfunction " }}}2
 
-function! s:GetValaVapiDirs()
+function! s:GetValaVapiDirs() " {{{2
     if exists('g:syntastic_vala_vapi_dirs')
         if type(g:syntastic_vala_vapi_dirs) == type('')
             return split(g:syntastic_vala_vapi_dirs, '\s\+')
@@ -70,22 +70,9 @@ function! s:GetValaVapiDirs()
     let vapi_line = search('^//\s*vapidirs:\s*','n')
     let vapi_str = getline(vapi_line)
     return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
-endfunction
+endfunction " }}}2
 
-function! SyntaxCheckers_vala_valac_GetLocList() dict
-    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
-    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
-    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
-
-    let errorformat =
-        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
-        \ '%C%m,'.
-        \ '%Z%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vala',
@@ -94,4 +81,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
index afe58fca..72a46beb 100644
--- a/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/verilog/verilator.vim
@@ -21,7 +21,7 @@ function! SyntaxCheckers_verilog_verilator_IsAvailable() dict
         let g:syntastic_verilog_compiler = self.getExec()
     endif
     call self.log('g:syntastic_verilog_compiler =', g:syntastic_verilog_compiler)
-    return executable(expand(g:syntastic_verilog_compiler))
+    return executable(expand(g:syntastic_verilog_compiler, 1))
 endfunction
 
 function! SyntaxCheckers_verilog_verilator_GetLocList() dict
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
index ff02224a..7ec856b9 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vhdl/ghdl.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
index ddcf9273..58037e80 100644
--- a/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim
@@ -18,7 +18,7 @@ let g:loaded_syntastic_vim_vimlint_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
+function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item) " {{{1
     let term = matchstr(a:item['text'], '\m `\zs[^`]\+\ze`')
     if term != ''
         let col = get(a:item, 'col', 0)
@@ -33,17 +33,17 @@ function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item)
     endif
 
     return ''
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_vim_vimlint_IsAvailable() dict
-    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim')
-    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim')
-    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim') = " . string(vimlparser) . ', ' .
-                \ "globpath(&runtimepath, 'autoload/vimlint.vim') = " .    string(vimlint))
+function! SyntaxCheckers_vim_vimlint_IsAvailable() dict " {{{1
+    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim', 1)
+    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim', 1)
+    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim', 1) = " . string(vimlparser) . ', ' .
+                \ "globpath(&runtimepath, 'autoload/vimlint.vim', 1) = " .    string(vimlint))
     return vimlparser != '' && vimlint != ''
-endfunction
+endfunction " }}}1
 
-function! SyntaxCheckers_vim_vimlint_GetLocList() dict
+function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
     " EVL102: unused variable v
     " EVL103: unused argument v
     " EVL104: variable may not be initialized on some execution path: v
@@ -74,11 +74,13 @@ function! SyntaxCheckers_vim_vimlint_GetLocList() dict
         endif
     endif
 
-    return vimlint#vimlint(expand('%'), param)
-endfunction
+    return vimlint#vimlint(expand('%', 1), param)
+endfunction " }}}1
+
+" Utilities {{{1
 
 " @vimlint(EVL103, 1, a:filename)
-function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
+function! s:vimlintOutput(filename, pos, ev, eid, mes, obj) " {{{2
     call add(a:obj.error, {
         \ 'bufnr': bufnr(''),
         \ 'lnum': a:pos.lnum,
@@ -87,9 +89,11 @@ function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
         \ 'type': a:ev[0],
         \ 'text': '[' . a:eid . '] ' . a:mes,
         \ 'valid': a:pos.lnum > 0 })
-endfunction
+endfunction " }}}2
 " @vimlint(EVL103, 0, a:filename)
 
+" }}}1
+
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'vim',
     \ 'name': 'vimlint',
@@ -98,4 +102,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
index 3312ccef..6a1069c6 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/jshint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'jshint',
     \ 'redirect': 'html/jshint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
index 1eed9209..12e8b155 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -20,12 +20,14 @@ if exists("g:loaded_syntastic_xhtml_tidy_checker")
 endif
 let g:loaded_syntastic_xhtml_tidy_checker = 1
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 if !exists('g:syntastic_xhtml_tidy_ignore_errors')
     let g:syntastic_xhtml_tidy_ignore_errors = []
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
+" Constants {{{1
 
 " TODO: join this with html.vim DRY's sake?
 function! s:TidyEncOptByFenc()
@@ -46,16 +48,9 @@ function! s:TidyEncOptByFenc()
     return get(TIDY_OPTS, &fileencoding, '-utf8')
 endfunction
 
-function! s:IgnoreError(text)
-    for item in g:syntastic_xhtml_tidy_ignore_errors
-        if stridx(a:text, item) != -1
-            return 1
-        endif
-    endfor
-    return 0
-endfunction
+" }}}1
 
-function! SyntaxCheckers_xhtml_tidy_GetLocList() dict
+function! SyntaxCheckers_xhtml_tidy_GetLocList() dict " {{{1
     let encopt = s:TidyEncOptByFenc()
     let makeprg = self.makeprgBuild({ 'args_after': encopt . ' -xml -e' })
 
@@ -77,7 +72,20 @@ function! SyntaxCheckers_xhtml_tidy_GetLocList() dict
     endfor
 
     return loclist
-endfunction
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:IgnoreError(text) " {{{2
+    for item in g:syntastic_xhtml_tidy_ignore_errors
+        if stridx(a:text, item) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction " }}}2
+
+" }}}1
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'xhtml',
@@ -86,4 +94,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim b/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
index a9ad1451..6a6c3db1 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/plutil.vim
@@ -39,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
index 3076cabb..108abed7 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xml/xmllint.vim
@@ -49,4 +49,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
index e224c256..d84a4eee 100644
--- a/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/xslt/xmllint.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'xmllint',
     \ 'redirect': 'xml/xmllint'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim b/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
index 8444879e..0a948b2d 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yacc/bison.vim
@@ -52,4 +52,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
index 4361edc2..82ca3946 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -8,9 +8,6 @@
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
-"
-"Installation: $ npm install -g js-yaml
-"
 "============================================================================
 
 if exists("g:loaded_syntastic_yaml_jsyaml_checker")
@@ -49,4 +46,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
index 6c12a627..d5582dbd 100644
--- a/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -7,7 +7,6 @@
 "             it and/or modify it under the terms of the Do What The Fuck You
 "             Want To Public License, Version 2, as published by Sam Hocevar.
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"Installation: cpanm YAML::XS
 "
 "============================================================================
 
@@ -70,4 +69,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
index 6a3998a3..38c65ccc 100644
--- a/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
@@ -1,5 +1,5 @@
 "============================================================================
-"File:        z80.vim
+"File:        z80syntaxchecker.vim
 "Description: Syntax checking plugin for syntastic.vim
 "Maintainer:  Romain Giot <giot.romain at gmail dot com>
 "License:     This program is free software. It comes without any warranty,
@@ -9,12 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" To obtain this application there are two solutions:
-" - Install this python package:
-"   https://github.com/rgiot/pycpcdemotools
-" - Copy/paste this script in your search path:
-"   https://raw.githubusercontent.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
 
 if exists("g:loaded_syntastic_z80_z80syntaxchecker_checker")
     finish
@@ -42,4 +36,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
index 6769b55b..f1749f30 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zpt/zptlint.vim
@@ -9,15 +9,6 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-"
-" In order for this plugin to be useful, you will need to set up the
-" zpt filetype in your vimrc
-"
-"    " set up zope page templates as the zpt filetype
-"    au BufNewFile,BufRead *.pt,*.cpt,*.zpt set filetype=zpt syntax=xml
-"
-" Then install the zptlint program, found on pypi:
-" http://pypi.python.org/pypi/zptlint
 
 if exists("g:loaded_syntastic_zpt_zptlint_checker")
     finish
@@ -48,4 +39,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
index 42f6fcf1..a0f9e7e3 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zsh/shellcheck.vim
@@ -22,4 +22,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'name': 'shellcheck',
     \ 'redirect': 'sh/shellcheck'})
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim b/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
index 48057631..92a2f13a 100644
--- a/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
+++ b/sources_non_forked/syntastic/syntax_checkers/zsh/zsh.vim
@@ -35,4 +35,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sts=4 sw=4:
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/sources_non_forked/tlib/autoload/tlib/World.vim b/sources_non_forked/tlib/autoload/tlib/World.vim
index b6a8581d..71c4387c 100644
--- a/sources_non_forked/tlib/autoload/tlib/World.vim
+++ b/sources_non_forked/tlib/autoload/tlib/World.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1393
+" @Revision:    1397
 
 " :filedoc:
 " A prototype used by |tlib#input#List|.
@@ -688,7 +688,7 @@ endf
 function! s:prototype.SetInitialFilter(filter) dict "{{{3
     " let self.initial_filter = [[''], [a:filter]]
     if type(a:filter) == 3
-        let self.initial_filter = copy(a:filter)
+        let self.initial_filter = deepcopy(a:filter)
     else
         let self.initial_filter = [[a:filter]]
     endif
@@ -815,7 +815,11 @@ function! s:prototype.UseInputListScratch() dict "{{{3
     endif
     if !exists('w:tlib_list_init')
         " TLogVAR scratch
-        syntax match InputlListIndex /^\d\+:/
+        if has_key(self, 'index_next_syntax')
+            exec 'syntax match InputlListIndex /^\d\+:\s/ nextgroup='. self.index_next_syntax
+        else
+            syntax match InputlListIndex /^\d\+:\s/
+        endif
         syntax match InputlListCursor /^\d\+\* .*$/ contains=InputlListIndex
         syntax match InputlListSelected /^\d\+# .*$/ contains=InputlListIndex
         hi def link InputlListIndex Constant
@@ -1119,10 +1123,11 @@ function! s:prototype.DisplayList(...) dict "{{{3
         if self.state =~ '\<display\>'
             call self.Resize(self.GetResize(ll), eval(get(self, 'resize_vertical', 0)))
             call tlib#normal#WithRegister('gg"tdG', 't')
+            let lines = copy(list)
+            let lines = map(lines, 'substitute(v:val, ''[[:cntrl:][:space:]]'', " ", "g")')
             let w = winwidth(0) - &fdc
             " let w = winwidth(0) - &fdc - 1
-            let lines = copy(list)
-            let lines = map(lines, 'printf("%-'. w .'.'. w .'s", substitute(v:val, ''[[:cntrl:][:space:]]'', " ", "g"))')
+            let lines = map(lines, 'printf("%-'. w .'.'. w .'s", v:val)')
             " TLogVAR lines
             call append(0, lines)
             call tlib#normal#WithRegister('G"tddgg', 't')
diff --git a/sources_non_forked/tlib/autoload/tlib/cmd.vim b/sources_non_forked/tlib/autoload/tlib/cmd.vim
index 01975b60..79334325 100644
--- a/sources_non_forked/tlib/autoload/tlib/cmd.vim
+++ b/sources_non_forked/tlib/autoload/tlib/cmd.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-08-23.
-" @Last Change: 2014-02-05.
-" @Revision:    0.0.53
+" @Last Change: 2014-10-21.
+" @Revision:    0.0.54
 
 if &cp || exists("loaded_tlib_cmd_autoload")
     finish
@@ -109,3 +109,11 @@ function! tlib#cmd#Time(cmd) "{{{3
     echom 'Time: '. diff .': '. a:cmd
 endf
 
+
+function! tlib#cmd#Capture(cmd) "{{{3
+    redir => s
+    silent exec a:cmd
+    redir END
+    return s
+endf
+
diff --git a/sources_non_forked/tlib/autoload/tlib/input.vim b/sources_non_forked/tlib/autoload/tlib/input.vim
index 6cd57f5e..1bb571fc 100644
--- a/sources_non_forked/tlib/autoload/tlib/input.vim
+++ b/sources_non_forked/tlib/autoload/tlib/input.vim
@@ -1,7 +1,7 @@
 " @Author:      Tom Link (micathom AT gmail com?subject=[vim])
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    1317
+" @Revision:    1338
 
 
 " :filedoc:
@@ -113,12 +113,17 @@ TLet g:tlib#input#numeric_chars = {
 
 
 " :nodefault:
-" The default key bindings for single-item-select list views. If you 
-" want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-" lines to after/plugin/02tlib.vim: >
+" The default key bindings for single-item-select list views.
 "
-"   let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-"   let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
+" This variable is best customized via the variable 
+" g:tlib_extend_keyagents_InputList_s. If you want to use <c-j>, <c-k> 
+" to move the cursor up and down, add these two lines to your |vimrc| 
+" file:
+"
+"   let g:tlib_extend_keyagents_InputList_s = {
+"       \ 10: 'tlib#agent#Down',
+"       \ 11: 'tlib#agent#Up'
+"       \ }
 TLet g:tlib#input#keyagents_InputList_s = {
             \ "\<PageUp>":   'tlib#agent#PageUp',
             \ "\<PageDown>": 'tlib#agent#PageDown',
@@ -154,6 +159,10 @@ TLet g:tlib#input#keyagents_InputList_s = {
             \ }
             " \ 63:            'tlib#agent#Help',
 
+if exists('g:tlib_extend_keyagents_InputList_s')
+    let g:tlib#input#keyagents_InputList_s = extend(g:tlib#input#keyagents_InputList_s, g:tlib_extend_keyagents_InputList_s)
+endif
+
 
 " :nodefault:
 TLet g:tlib#input#keyagents_InputList_m = {
@@ -166,6 +175,11 @@ TLet g:tlib#input#keyagents_InputList_m = {
             \ }
 " "\<c-space>": 'tlib#agent#Select'
 
+if exists('g:tlib_extend_keyagents_InputList_m')
+    let g:tlib#input#keyagents_InputList_m = extend(g:tlib#input#keyagents_InputList_m, g:tlib_extend_keyagents_InputList_m)
+endif
+
+
 
 " :nodefault:
 TLet g:tlib#input#handlers_EditList = [
@@ -184,6 +198,11 @@ TLet g:tlib#input#handlers_EditList = [
             \ ]
 
 
+" A dictionary KEY => {'agent': AGENT, 'key_name': KEY_NAME} to 
+" customize keyboard shortcuts in the list view.
+TLet g:tlib#input#user_shortcuts = {}
+
+
 " If true, define a popup menu for |tlib#input#List()| and related 
 " functions.
 TLet g:tlib#input#use_popup = has('menu') && (has('gui_gtk') || has('gui_gtk2') || has('gui_win32'))
@@ -381,10 +400,13 @@ function! tlib#input#ListW(world, ...) "{{{3
 
                 " TLogVAR world.filter
                 " TLogVAR world.sticky
-                if world.state =~ '\<pick\>'
+                if world.state =~ '\<picked\>'
+                    " TLogVAR world.rv
+                    throw 'picked'
+                elseif world.state =~ '\<pick\>'
                     let world.rv = world.CurrentItem()
                     " TLogVAR world.rv
-                    throw 'pick'
+                    throw 'picked'
                 elseif world.state =~ 'display'
                     if world.state =~ '^display'
                         " let time03 = str2float(reltimestr(reltime()))  " DBG
@@ -679,6 +701,11 @@ function! tlib#input#ListW(world, ...) "{{{3
                     " let world.state = 'continue'
                 endif
 
+            catch /^picked$/
+                call world.ClearAllMarks()
+                call world.MarkCurrent(world.prefidx)
+                let world.state = 'exit'
+
             catch /^pick$/
                 call world.ClearAllMarks()
                 call world.MarkCurrent(world.prefidx)
@@ -686,7 +713,7 @@ function! tlib#input#ListW(world, ...) "{{{3
                 " TLogDBG 'Pick item #'. world.prefidx
 
             finally
-                " TLogDBG 'finally 1'
+                " TLogDBG 'finally 1', world.state
                 if world.state =~ '\<suspend\>'
                     " if !world.allow_suspend
                     "     echom "Cannot be suspended"
@@ -695,10 +722,10 @@ function! tlib#input#ListW(world, ...) "{{{3
                 elseif !empty(world.list) && !empty(world.base)
                     " TLogVAR world.list
                     if empty(world.state)
-                        " TLogVAR world.state
                         let world.rv = world.CurrentItem()
+                        " TLogVAR world.state, world.rv
                     endif
-                    " TLog "postprocess"
+                    " TLogVAR "postprocess"
                     for handler in world.post_handlers
                         let state = get(handler, 'postprocess', '')
                         " TLogVAR handler
@@ -746,7 +773,6 @@ function! tlib#input#ListW(world, ...) "{{{3
                 return ''
             endif
         elseif !empty(world.return_agent)
-            " TLog "return_agent"
             " TLogDBG 'return agent'
             " TLogVAR world.return_agent
             call world.CloseScratch()
diff --git a/sources_non_forked/tlib/autoload/tlib/var.vim b/sources_non_forked/tlib/autoload/tlib/var.vim
index 86c1350a..564515d9 100644
--- a/sources_non_forked/tlib/autoload/tlib/var.vim
+++ b/sources_non_forked/tlib/autoload/tlib/var.vim
@@ -3,8 +3,8 @@
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2007-06-30.
-" @Last Change: 2014-07-03.
-" @Revision:    0.0.26
+" @Last Change: 2014-07-08.
+" @Revision:    0.0.29
 
 if &cp || exists("loaded_tlib_var_autoload")
     finish
@@ -75,12 +75,16 @@ endf
 " EXAMPLE:
 "   echo tlib#var#List('tlib_', 'g:')
 function! tlib#var#List(rx, ...) "{{{3
-    TVarArg ['prefix', '']
-    redir => vars
-    silent! exec 'let '. prefix
-    redir END
-    let varlist = split(vars, '\n')
-    call map(varlist, 'matchstr(v:val, ''^\S\+'')')
+    TVarArg ['prefix', 'g:']
+    if v:version >= 704
+        exec 'let varlist = keys('. prefix .')'
+    else
+        redir => vars
+        silent! exec 'let '. prefix
+        redir END
+        let varlist = split(vars, '\n')
+        call map(varlist, 'matchstr(v:val, ''^\S\+'')')
+    endif
     call filter(varlist, 'v:val =~ a:rx')
     return varlist
 endf
diff --git a/sources_non_forked/tlib/autoload/tlib/vcs.vim b/sources_non_forked/tlib/autoload/tlib/vcs.vim
index 6166db8c..c7e21bab 100644
--- a/sources_non_forked/tlib/autoload/tlib/vcs.vim
+++ b/sources_non_forked/tlib/autoload/tlib/vcs.vim
@@ -2,8 +2,8 @@
 " @Author:      Tom Link (mailto:micathom AT gmail com?subject=[vim])
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 " @Created:     2012-03-08.
-" @Last Change: 2014-07-01.
-" @Revision:    131
+" @Last Change: 2014-09-30.
+" @Revision:    133
 
 
 " A dictionarie of supported VCS (currently: git, hg, svn, bzr).
diff --git a/sources_non_forked/tlib/doc/tlib.txt b/sources_non_forked/tlib/doc/tlib.txt
index 3d5fc3f3..cbf6fdfd 100644
--- a/sources_non_forked/tlib/doc/tlib.txt
+++ b/sources_non_forked/tlib/doc/tlib.txt
@@ -85,6 +85,7 @@ Contents~
         tlib#cmd#ParseScriptname ............... |tlib#cmd#ParseScriptname()|
         tlib#cmd#UseVertical ................... |tlib#cmd#UseVertical()|
         tlib#cmd#Time .......................... |tlib#cmd#Time()|
+        tlib#cmd#Capture ....................... |tlib#cmd#Capture()|
         tlib#syntax#Collect .................... |tlib#syntax#Collect()|
         tlib#syntax#Names ...................... |tlib#syntax#Names()|
         tlib#balloon#Register .................. |tlib#balloon#Register()|
@@ -224,6 +225,7 @@ Contents~
         g:tlib#input#keyagents_InputList_s ..... |g:tlib#input#keyagents_InputList_s|
         g:tlib#input#keyagents_InputList_m ..... |g:tlib#input#keyagents_InputList_m|
         g:tlib#input#handlers_EditList ......... |g:tlib#input#handlers_EditList|
+        g:tlib#input#user_shortcuts ............ |g:tlib#input#user_shortcuts|
         g:tlib#input#use_popup ................. |g:tlib#input#use_popup|
         g:tlib#input#format_filename ........... |g:tlib#input#format_filename|
         g:tlib#input#filename_padding_r ........ |g:tlib#input#filename_padding_r|
@@ -723,6 +725,9 @@ tlib#cmd#Time(cmd)
     Print the time in seconds or milliseconds (if your version of VIM 
     has |+reltime|) a command takes.
 
+                                                    *tlib#cmd#Capture()*
+tlib#cmd#Capture(cmd)
+
 
 ========================================================================
 autoload/tlib/syntax.vim~
@@ -1434,13 +1439,17 @@ g:tlib#input#numeric_chars
 
                                                     *g:tlib#input#keyagents_InputList_s*
 g:tlib#input#keyagents_InputList_s
-    The default key bindings for single-item-select list views. If you 
-    want to use <c-j>, <c-k> to move the cursor up and down, add these two 
-    lines to after/plugin/02tlib.vim: >
+    The default key bindings for single-item-select list views.
 
-      let g:tlib#input#keyagents_InputList_s[10] = 'tlib#agent#Down'  " <c-j>
-      let g:tlib#input#keyagents_InputList_s[11] = 'tlib#agent#Up'    " <c-k>
-<
+    This variable is best customized via the variable 
+    g:tlib_extend_keyagents_InputList_s. If you want to use <c-j>, <c-k> 
+    to move the cursor up and down, add these two lines to your |vimrc| 
+    file:
+
+      let g:tlib_extend_keyagents_InputList_s = {
+          \ 10: 'tlib#agent#Down',
+          \ 11: 'tlib#agent#Up'
+          \ }
 
                                                     *g:tlib#input#keyagents_InputList_m*
 g:tlib#input#keyagents_InputList_m
@@ -1448,6 +1457,11 @@ g:tlib#input#keyagents_InputList_m
                                                     *g:tlib#input#handlers_EditList*
 g:tlib#input#handlers_EditList
 
+                                                    *g:tlib#input#user_shortcuts*
+g:tlib#input#user_shortcuts    (default: {})
+    A dictionary KEY => {'agent': AGENT, 'key_name': KEY_NAME} to 
+    customize keyboard shortcuts in the list view.
+
                                                     *g:tlib#input#use_popup*
 g:tlib#input#use_popup         (default: has('menu') && (has('gui_gtk') || has('gui_gtk2') || has('gui_win32')))
     If true, define a popup menu for |tlib#input#List()| and related 
diff --git a/sources_non_forked/tlib/plugin/02tlib.vim b/sources_non_forked/tlib/plugin/02tlib.vim
index cadec3ea..e25ec7b5 100644
--- a/sources_non_forked/tlib/plugin/02tlib.vim
+++ b/sources_non_forked/tlib/plugin/02tlib.vim
@@ -2,7 +2,7 @@
 " @Created:     2007-04-10.
 " @Last Change: 2014-07-03.
 " @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
-" @Revision:    753
+" @Revision:    754
 " @Website:     http://www.vim.org/account/profile.php?user_id=4037
 " GetLatestVimScripts: 1863 1 tlib.vim
 " tlib.vim -- Some utility functions
@@ -14,7 +14,7 @@ if v:version < 700 "{{{2
     echoerr "tlib requires Vim >= 7"
     finish
 endif
-let loaded_tlib = 112
+let loaded_tlib = 113
 
 let s:save_cpo = &cpo
 set cpo&vim
diff --git a/sources_non_forked/vim-airline/autoload/airline/builder.vim b/sources_non_forked/vim-airline/autoload/airline/builder.vim
index d03af12e..5f4e080c 100644
--- a/sources_non_forked/vim-airline/autoload/airline/builder.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/builder.vim
@@ -4,8 +4,7 @@
 let s:prototype = {}
 
 function! s:prototype.split(...)
-  let self._side = 0
-  let self._line .= '%#'.self._curgroup.'#'.(a:0 ? a:1 : '%=')
+  call add(self._sections, ['|', a:0 ? a:1 : '%='])
 endfunction
 
 function! s:prototype.add_section_spaced(group, contents)
@@ -13,21 +12,97 @@ function! s:prototype.add_section_spaced(group, contents)
 endfunction
 
 function! s:prototype.add_section(group, contents)
-  if self._curgroup != ''
-    if self._curgroup == a:group
-      let self._line .= self._side ? self._context.left_alt_sep : self._context.right_alt_sep
-    else
-      call airline#highlighter#add_separator(self._curgroup, a:group, self._side)
-      let self._line .= '%#'.self._curgroup.'_to_'.a:group.'#'
-      let self._line .= self._side ? self._context.left_sep : self._context.right_sep
+  call add(self._sections, [a:group, a:contents])
+endfunction
+
+function! s:prototype.add_raw(text)
+  call add(self._sections, ['', a:text])
+endfunction
+
+function! s:get_prev_group(sections, i)
+  let x = a:i - 1
+  while x >= 0
+    let group = a:sections[x][0]
+    if group != '' && group != '|'
+      return group
     endif
-  endif
+    let x = x - 1
+  endwhile
+  return ''
+endfunction
 
-  if self._curgroup != a:group
-    let self._line .= '%#'.a:group.'#'
-  endif
+function! s:prototype.build()
+  let side = 1
+  let line = ''
+  let i = 0
+  let length = len(self._sections)
+  let split = 0
 
-  if self._context.active
+  while i < length
+    let section = self._sections[i]
+    let group = section[0]
+    let contents = section[1]
+    let prev_group = s:get_prev_group(self._sections, i)
+
+    if group == ''
+      let line .= contents
+    elseif group == '|'
+      let side = 0
+      let line .= contents
+      let split = 1
+    else
+      if prev_group == ''
+        let line .= '%#'.group.'#'
+      elseif split
+        let line .= s:get_transitioned_seperator(self, prev_group, group, side)
+        let split = 0
+      else
+        let line .= s:get_seperator(self, prev_group, group, side)
+      endif
+      let line .= s:get_accented_line(self, group, contents)
+    endif
+
+    let i = i + 1
+  endwhile
+
+  if !self._context.active
+    let line = substitute(line, '%#.\{-}\ze#', '\0_inactive', 'g')
+  endif
+  return line
+endfunction
+
+function! s:should_change_group(group1, group2)
+  if a:group1 == a:group2
+    return 0
+  endif
+  let color1 = airline#highlighter#get_highlight(a:group1)
+  let color2 = airline#highlighter#get_highlight(a:group2)
+  if has('gui_running')
+    return color1[1] != color2[1] || color1[0] != color2[0]
+  else
+    return color1[3] != color2[3] || color1[2] != color2[2]
+  endif
+endfunction
+
+function! s:get_transitioned_seperator(self, prev_group, group, side)
+  let line = ''
+  call airline#highlighter#add_separator(a:prev_group, a:group, a:side)
+  let line .= '%#'.a:prev_group.'_to_'.a:group.'#'
+  let line .= a:side ? a:self._context.left_sep : a:self._context.right_sep
+  let line .= '%#'.a:group.'#'
+  return line
+endfunction
+
+function! s:get_seperator(self, prev_group, group, side)
+  if s:should_change_group(a:prev_group, a:group)
+    return s:get_transitioned_seperator(a:self, a:prev_group, a:group, a:side)
+  else
+    return a:side ? a:self._context.left_alt_sep : a:self._context.right_alt_sep
+  endif
+endfunction
+
+function! s:get_accented_line(self, group, contents)
+  if a:self._context.active
     let contents = []
     let content_parts = split(a:contents, '__accent')
     for cpart in content_parts
@@ -40,28 +115,13 @@ function! s:prototype.add_section(group, contents)
     let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
     let line = substitute(line, '%#__restore__#', '', 'g')
   endif
-
-  let self._line .= line
-  let self._curgroup = a:group
-endfunction
-
-function! s:prototype.add_raw(text)
-  let self._line .= a:text
-endfunction
-
-function! s:prototype.build()
-  if !self._context.active
-    let self._line = substitute(self._line, '%#.\{-}\ze#', '\0_inactive', 'g')
-  endif
-  return self._line
+  return line
 endfunction
 
 function! airline#builder#new(context)
   let builder = copy(s:prototype)
   let builder._context = a:context
-  let builder._side = 1
-  let builder._curgroup = ''
-  let builder._line = ''
+  let builder._sections = []
 
   call extend(builder._context, {
         \ 'left_sep': g:airline_left_sep,
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions.vim b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
index 1738f626..22a91cfe 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions.vim
@@ -22,10 +22,10 @@ let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
 let s:filetype_overrides = {
       \ 'nerdtree': [ 'NERD', '' ],
       \ 'gundo': [ 'Gundo', '' ],
-      \ 'diff': [ 'diff', '' ],
       \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
       \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
       \ 'startify': [ 'startify', '' ],
+      \ 'vim-plug': [ 'Plugins', '' ],
       \ }
 
 let s:filetype_regex_overrides = {}
@@ -178,7 +178,7 @@ function! airline#extensions#load()
     call airline#extensions#bufferline#init(s:ext)
   endif
 
-  if get(g:, 'virtualenv_loaded', 0) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
+  if isdirectory($VIRTUAL_ENV) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
     call airline#extensions#virtualenv#init(s:ext)
   endif
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
index e97cae85..6e82d664 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/branch.vim
@@ -107,6 +107,7 @@ function! s:check_in_path()
         if match(root, pattern) >= 0
           let root = substitute(root, pattern, '', '')
         endif
+      endif
     endif
 
     let b:airline_file_in_root = stridx(bufferpath, root) > -1
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
index 11a89220..ef7da681 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -36,6 +36,9 @@ endfunction
 " Arguments: focus, byfname, regexp, prv, item, nxt, marked
 function! airline#extensions#ctrlp#ctrlp_airline(...)
   let b = airline#builder#new({'active': 1})
+  if a:2 == 'file'
+    call b.add_section_spaced('CtrlPlight', 'by fname')
+  endif
   if a:3
     call b.add_section_spaced('CtrlPlight', 'regex')
   endif
@@ -48,7 +51,7 @@ function! airline#extensions#ctrlp#ctrlp_airline(...)
   endif
   call b.add_section_spaced('CtrlPdark', a:7)
   call b.split()
-  call b.add_raw('%#CtrlPdark#'.a:1.(g:airline_symbols.space))
+  call b.add_section_spaced('CtrlPdark', a:1)
   call b.add_section_spaced('CtrlPdark', a:2)
   call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
   return b.build()
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
index 53b000d4..faa1fb68 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/default.vim
@@ -61,9 +61,9 @@ function! airline#extensions#default#apply(builder, context)
   let active = a:context.active
 
   if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
-    call <sid>build_sections(a:builder, a:context, s:layout[0])
+    call s:build_sections(a:builder, a:context, s:layout[0])
   else
-    let text = <sid>get_section(winnr, 'c')
+    let text = s:get_section(winnr, 'c')
     if empty(text)
       let text = ' %f%m '
     endif
@@ -73,7 +73,7 @@ function! airline#extensions#default#apply(builder, context)
   call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
 
   if airline#util#getwinvar(winnr, 'airline_render_right', 1)
-    call <sid>build_sections(a:builder, a:context, s:layout[1])
+    call s:build_sections(a:builder, a:context, s:layout[1])
   endif
 
   return 1
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
index 8efc5275..2be4077e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -25,7 +25,7 @@ function! s:get_text()
   let nr = bufnr('%')
   for buf in split(buffers, '\n')
     if match(buf, '\v^\s*'.nr) > -1
-      if match(buf, '\[Quickfix List\]') > -1
+      if match(buf, '\cQuickfix') > -1
         return g:airline#extensions#quickfix#quickfix_text
       else
         return g:airline#extensions#quickfix#location_text
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
index e0111a59..4681a2a4 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline.vim
@@ -1,29 +1,18 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+scriptencoding utf-8
+
 let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
 let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
 let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:show_tabs = get(g:, 'airline#extensions#tabline#show_tabs', 1)
 let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
 let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
 let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
 let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
 let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
-
-let s:builder_context = {
-      \ 'active'        : 1,
-      \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
-      \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
-      \ }
-if get(g:, 'airline_powerline_fonts', 0)
-  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
-  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
-else
-  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
-  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
-endif
-
 let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
 let s:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
 let s:spc = g:airline_symbols.space
@@ -76,9 +65,10 @@ function! s:toggle_on()
     augroup airline_tabline
       autocmd!
       if s:show_buffers == 1
-        autocmd CursorMoved * call <sid>on_cursormove(s:buf_min_count, len(s:get_buffer_list()))
+        autocmd BufEnter * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()))
+        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()) - 1)
       else
-        autocmd TabEnter * call <sid>on_cursormove(s:tab_min_count, tabpagenr('$'))
+        autocmd TabEnter * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
       endif
     augroup END
   endif
@@ -108,7 +98,7 @@ function! airline#extensions#tabline#load_theme(palette)
   call airline#highlighter#exec('airline_tabhid', l:tabhid)
 endfunction
 
-function! s:on_cursormove(min_count, total_count)
+function! s:show_tabline(min_count, total_count)
   if a:total_count >= a:min_count
     if &showtabline != 2
       set showtabline=2
@@ -126,7 +116,7 @@ function! airline#extensions#tabline#get()
     let s:current_tabcnt = curtabcnt
     let s:current_bufnr = -1  " force a refresh...
   endif
-  if s:show_buffers && curtabcnt == 1
+  if s:show_buffers && curtabcnt == 1 || !s:show_tabs
     return s:get_buffers()
   else
     return s:get_tabs()
@@ -148,15 +138,19 @@ function! s:get_buffer_list()
   let cur = bufnr('%')
   for nr in range(1, bufnr('$'))
     if buflisted(nr) && bufexists(nr)
+      let toadd = 1
       for ex in s:excludes
-        if match(bufname(nr), ex)
-          continue
+        if match(bufname(nr), ex) >= 0
+          let toadd = 0
+          break
         endif
       endfor
       if getbufvar(nr, 'current_syntax') == 'qf'
-        continue
+        let toadd = 0
+      endif
+      if toadd
+        call add(buffers, nr)
       endif
-      call add(buffers, nr)
     endif
   endfor
 
@@ -231,7 +225,7 @@ function! s:get_buffers()
   endif
 
   let l:index = 1
-  let b = airline#builder#new(s:builder_context)
+  let b = s:new_builder()
   let tab_bufs = tabpagebuflist(tabpagenr())
   for nr in s:get_visible_buffers()
     if nr < 0
@@ -270,6 +264,7 @@ function! s:get_buffers()
 
   call b.add_section('airline_tabfill', '')
   call b.split()
+  call b.add_section('airline_tabfill', '')
   call b.add_section('airline_tabtype', ' buffers ')
 
   let s:current_bufnr = cur
@@ -306,6 +301,23 @@ function! s:define_buffer_idx_mode_mappings()
   noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
 endfunction
 
+function! s:new_builder()
+  let builder_context = {
+        \ 'active'        : 1,
+        \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
+        \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
+        \ }
+  if get(g:, 'airline_powerline_fonts', 0)
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
+  else
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
+  endif
+
+  return airline#builder#new(builder_context)
+endfunction
+
 function! s:get_tabs()
   let curbuf = bufnr('%')
   let curtab = tabpagenr()
@@ -315,7 +327,7 @@ function! s:get_tabs()
     endif
   endif
 
-  let b = airline#builder#new(s:builder_context)
+  let b = s:new_builder()
   for i in range(1, tabpagenr('$'))
     if i == curtab
       let group = 'airline_tabsel'
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 3590fbb5..e96deeb2 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -1,6 +1,8 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+scriptencoding utf-8
+
 let s:skip_symbol = '…'
 
 function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
index f070c472..27f847e3 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -1,7 +1,7 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-if !get(g:, 'virtualenv_loaded', 0)
+if !isdirectory($VIRTUAL_ENV)
   finish
 endif
 
@@ -13,8 +13,13 @@ endfunction
 
 function! airline#extensions#virtualenv#apply(...)
   if &filetype =~ "python"
+    if get(g:, 'virtualenv_loaded', 0)
+      let statusline = virtualenv#statusline()
+    else
+      let statusline = fnamemodify($VIRTUAL_ENV, ':t')
+    endif
     call airline#extensions#append_to_section('x',
-          \ s:spc.g:airline_right_alt_sep.s:spc.'%{virtualenv#statusline()}')
+          \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
   endif
 endfunction
 
diff --git a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
index 86574129..f535e45e 100644
--- a/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -67,7 +67,7 @@ function! airline#extensions#whitespace#check()
     endif
   endif
   return b:airline_whitespace_check
-endfunction!
+endfunction
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
index b941eae7..f2378ce8 100644
--- a/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/bubblegum.vim
@@ -60,3 +60,11 @@ let g:airline#themes#bubblegum#palette.inactive_modified = {
       \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
       \ }
 
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#bubblegum#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, '' ] ,
+      \ [ s:gui_orange, s:gui_med_gray_lo, s:cterm_orange, s:cterm_med_gray_lo, '' ] ,
+      \ [ s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green, 'bold' ] )
diff --git a/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
new file mode 100644
index 00000000..56be7ba0
--- /dev/null
+++ b/sources_non_forked/vim-airline/autoload/airline/themes/durant.vim
@@ -0,0 +1,59 @@
+let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
+let s:N2 = [ '#93a1a1' , '#586e75' , 245 , 240 ]
+let s:N3 = [ '#93a1a1' , '#073642' , 240 , 233 ]
+let g:airline#themes#durant#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+
+let g:airline#themes#durant#normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+
+let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#9e9e9e' , '#303030' , 247 , 236 ]
+let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ]
+let g:airline#themes#durant#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#durant#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#durant#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.replace = copy(g:airline#themes#durant#palette.insert)
+let g:airline#themes#durant#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+
+let g:airline#themes#durant#palette.replace_modified = g:airline#themes#durant#palette.insert_modified
+
+let s:V1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ]
+let s:V2 = [ '#ffffff' , '#44403a' , 255, 238 ]
+let s:V3 = [ '#90a680' , '#2e2d2a' , 64, 235 ]
+let g:airline#themes#durant#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#durant#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
+let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
+let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
+let g:airline#themes#durant#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#durant#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+  let g:airline#themes#durant#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+        \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
+        \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
+        \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
+
diff --git a/sources_non_forked/vim-airline/doc/airline.txt b/sources_non_forked/vim-airline/doc/airline.txt
index ddc81ce0..7620abe5 100644
--- a/sources_non_forked/vim-airline/doc/airline.txt
+++ b/sources_non_forked/vim-airline/doc/airline.txt
@@ -391,6 +391,9 @@ eclim <https://eclim.org>
 * enable/disable displaying buffers with a single tab. >
   let g:airline#extensions#tabline#show_buffers = 1
 <
+* enable/disable displaying tabs, regardless of number. >
+  let g:airline#extensions#tabline#show_tabs = 1
+<
 * configure filename match rules to exclude from the tabline. >
   let g:airline#extensions#tabline#excludes = []
 <
diff --git a/sources_non_forked/vim-airline/t/builder.vim b/sources_non_forked/vim-airline/t/builder.vim
index 3d1afcda..57feb148 100644
--- a/sources_non_forked/vim-airline/t/builder.vim
+++ b/sources_non_forked/vim-airline/t/builder.vim
@@ -13,9 +13,27 @@ describe 'active builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#>%#NonText#world'
+    Expect stl =~ '%#Normal#hello%#Normal_to_Search#>%#Search#world'
+  end
+
+  it 'should reuse highlight group if background colors match'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=1 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello>world'
+  end
+
+  it 'should switch highlight groups if foreground colors differ'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=2 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello%#Foo1_to_Foo2#>%#Foo2#world'
   end
 
   it 'should split left/right sections'
@@ -27,9 +45,9 @@ describe 'active builder'
   it 'after split, sections use the right separator'
     call s:builder.split()
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#<%#NonText#world'
+    Expect stl =~ 'hello%#Normal_to_Search#<%#Search#world'
   end
 
   it 'should not repeat the same highlight group'
@@ -57,6 +75,14 @@ describe 'active builder'
     Expect stl !~ '%#__restore__#'
     Expect stl =~ '%#Normal#'
   end
+
+  it 'should blend colors from the left through the split to the right'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.split()
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ 'Normal_to_Search'
+  end
 end
 
 describe 'inactive builder'
@@ -66,9 +92,9 @@ describe 'inactive builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_inactive#world'
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_Search_inactive#>%#Search_inactive#world'
   end
 
   it 'should not render accents'
diff --git a/sources_non_forked/vim-airline/t/extensions_default.vim b/sources_non_forked/vim-airline/t/extensions_default.vim
index b98e8166..d6fc572d 100644
--- a/sources_non_forked/vim-airline/t/extensions_default.vim
+++ b/sources_non_forked/vim-airline/t/extensions_default.vim
@@ -2,6 +2,7 @@ let g:airline_theme = 'dark'
 call airline#init#bootstrap()
 call airline#init#sections()
 source plugin/airline.vim
+call airline#load_theme()
 
 describe 'default'
   before
diff --git a/sources_non_forked/vim-commentary/plugin/commentary.vim b/sources_non_forked/vim-commentary/plugin/commentary.vim
index 9da6a304..a91cd712 100644
--- a/sources_non_forked/vim-commentary/plugin/commentary.vim
+++ b/sources_non_forked/vim-commentary/plugin/commentary.vim
@@ -9,9 +9,8 @@ endif
 let g:loaded_commentary = 1
 
 function! s:surroundings() abort
-  return split(substitute(substitute(
-        \ get(b:, 'commentary_format', &commentstring)
-        \ ,'\S\zs%s',' %s','') ,'%s\ze\S', '%s ', ''), '%s', 1)
+  return split(get(b:, 'commentary_format', substitute(substitute(
+        \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1)
 endfunction
 
 function! s:go(type,...) abort
diff --git a/sources_non_forked/vim-fugitive/plugin/fugitive.vim b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
index 8fabd1cc..7ef5a929 100644
--- a/sources_non_forked/vim-fugitive/plugin/fugitive.vim
+++ b/sources_non_forked/vim-fugitive/plugin/fugitive.vim
@@ -145,6 +145,13 @@ function! fugitive#extract_git_dir(path) abort
     if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
       return $GIT_DIR
     endif
+    if fugitive#is_git_dir($GIT_DIR)
+      " Ensure that we've cached the worktree
+      call s:configured_tree($GIT_DIR)
+      if has_key(s:dir_for_worktree, root)
+        return s:dir_for_worktree[root]
+      endif
+    endif
     let dir = s:sub(root, '[\/]$', '') . '/.git'
     let type = getftype(dir)
     if type ==# 'dir' && fugitive#is_git_dir(dir)
@@ -178,7 +185,14 @@ function! fugitive#detect(path) abort
     endif
   endif
   if exists('b:git_dir')
-    silent doautocmd User FugitiveBoot
+    if exists('#User#FugitiveBoot')
+      try
+        let [save_mls, &modelines] = [&mls, 0]
+        doautocmd User FugitiveBoot
+      finally
+        let &mls = save_mls
+      endtry
+    endif
     cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
     nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
     let buffer = fugitive#buffer()
@@ -193,7 +207,12 @@ function! fugitive#detect(path) abort
         call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
       endif
     endif
-    silent doautocmd User Fugitive
+    try
+      let [save_mls, &modelines] = [&mls, 0]
+      doautocmd User Fugitive
+    finally
+      let &mls = save_mls
+    endtry
   endif
 endfunction
 
@@ -211,6 +230,8 @@ augroup END
 
 let s:repo_prototype = {}
 let s:repos = {}
+let s:worktree_for_dir = {}
+let s:dir_for_worktree = {}
 
 function! s:repo(...) abort
   let dir = a:0 ? a:1 : (exists('b:git_dir') && b:git_dir !=# '' ? b:git_dir : fugitive#extract_git_dir(expand('%:p')))
@@ -234,21 +255,23 @@ function! s:repo_dir(...) dict abort
   return join([self.git_dir]+a:000,'/')
 endfunction
 
-function! s:repo_configured_tree() dict abort
-  if !has_key(self,'_tree')
-    let self._tree = ''
-    if filereadable(self.dir('config'))
-      let config = readfile(self.dir('config'),'',10)
+function! s:configured_tree(git_dir) abort
+  if !has_key(s:worktree_for_dir, a:git_dir)
+    let s:worktree_for_dir[a:git_dir] = ''
+    let config_file = a:git_dir . '/config'
+    if filereadable(config_file)
+      let config = readfile(config_file,'',10)
       call filter(config,'v:val =~# "^\\s*worktree *="')
       if len(config) == 1
-        let self._tree = matchstr(config[0], '= *\zs.*')
+        let s:worktree_for_dir[a:git_dir] = matchstr(config[0], '= *\zs.*')
+        let s:dir_for_worktree[s:worktree_for_dir[a:git_dir]] = a:git_dir
       endif
     endif
   endif
-  if self._tree =~# '^\.'
-    return simplify(self.dir(self._tree))
+  if s:worktree_for_dir[a:git_dir] =~# '^\.'
+    return simplify(a:git_dir . '/' . s:worktree_for_dir[a:git_dir])
   else
-    return self._tree
+    return s:worktree_for_dir[a:git_dir]
   endif
 endfunction
 
@@ -256,7 +279,7 @@ function! s:repo_tree(...) dict abort
   if self.dir() =~# '/\.git$'
     let dir = self.dir()[0:-6]
   else
-    let dir = self.configured_tree()
+    let dir = s:configured_tree(self.git_dir)
   endif
   if dir ==# ''
     call s:throw('no work tree')
@@ -269,7 +292,7 @@ function! s:repo_bare() dict abort
   if self.dir() =~# '/\.git$'
     return 0
   else
-    return self.configured_tree() ==# ''
+    return s:configured_tree(self.git_dir) ==# ''
   endif
 endfunction
 
@@ -334,7 +357,7 @@ function! s:repo_head(...) dict abort
     return branch
 endfunction
 
-call s:add_methods('repo',['dir','configured_tree','tree','bare','translate','head'])
+call s:add_methods('repo',['dir','tree','bare','translate','head'])
 
 function! s:repo_git_command(...) dict abort
   let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir)
@@ -2274,7 +2297,7 @@ endfunction
 function! s:instaweb_url(opts) abort
   let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
   if output =~# 'http://'
-    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.opts.dir(),':t')
+    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t')
   else
     return ''
   endif
@@ -2495,7 +2518,9 @@ function! s:BufWriteIndexFile() abort
     endif
     if v:shell_error == 0
       setlocal nomodified
-      silent execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      if exists('#BufWritePost')
+        execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      endif
       call fugitive#reload_status()
       return ''
     else
diff --git a/sources_non_forked/vim-go/README.md b/sources_non_forked/vim-go/README.md
index 78b0ab5f..17e3ad82 100644
--- a/sources_non_forked/vim-go/README.md
+++ b/sources_non_forked/vim-go/README.md
@@ -33,6 +33,7 @@ disabled/enabled easily.
 * Share your current code to [play.golang.org](http://play.golang.org)
 * On-the-fly type information about the word under the cursor
 * Tagbar support to show tags of the source code in a sidebar with `gotags`
+* Custom vim text objects, such a `a function` or `inner function`
 
 ## Install
 
@@ -53,9 +54,10 @@ and execute `:PluginInstall` (or `:BundleInstall` for older versions of Vundle)
 
 Please be sure all necessary binaries are installed (such as `gocode`, `godef`,
 `goimports`, etc..). You can easily install them with the included
-`:GoInstallBinaries`. Those binaries will be automatically downloaded and
-installed to your `$GOBIN` environment (if not set it will use `$GOPATH/bin`).
-It requires `git` and `hg` for fetching the individual Go packages.
+`:GoInstallBinaries` command. Those binaries will be automatically downloaded
+and installed to your `$GOBIN` environment (if not set it will use
+`$GOPATH/bin`).  It requires `git` and `hg` for fetching the individual Go
+packages.
 
 ### Optional
 
@@ -72,13 +74,12 @@ completion (completion by type) install:
 
 ## Usage
 
-All [features](#features) are enabled by default. There are no additional
-settings needed.  Usage and commands are listed in `doc/vim-go.txt`. Just open
-the help page to see all commands:
+Many of the [features](#features) are enabled by default. There are no
+additional settings needed. All usages and commands are listed in
+`doc/vim-go.txt`. Just open the help page to see all commands:
 
     :help vim-go
 
-
 ## Mappings
 
 vim-go has several `<Plug>` mappings which can be used to create custom
@@ -178,56 +179,14 @@ let g:go_bin_path = expand("~/.gotools")
 let g:go_bin_path = "/home/fatih/.mypath"      "or give absolute path
 ```
 
-## Snippets
-
-Snippets are useful and very powerful. By default ultisnips is
-used, however you can change it to neosnippet with:
-
+By default syntax-highlighting for Functions, Methods and Structs is disabled.
+To change it:
 ```vim
-let g:go_snippet_engine = "neosnippet"
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_structs = 1
 ```
 
-Snippet feature is enabled only if the snippet plugins are installed.  Below are
-some examples snippets and the corresponding trigger keywords, The `|`
-character defines the cursor. Ultisnips has support for multiple cursors
-
-
-`ff` is useful for debugging:
-
-```go
-fmt.Printf(" | %+v\n", |)
-```
-
-`errn` expands to:
-
-```go
-if err != nil {
-    return err
-}
-```
-
-Use `gof` to quickly create a anonymous goroutine :
-
-```go
-go func() {
-    |
-}()
-```
-
-To add `json` tags to a struct field, use `json` trigger:
-
-```
-type foo struct {
-    bar string  `json:"myField"
-           ^ type `json` here, hit tab and type "myField". It will expand to `json:"myField"`
-}
-```
-
-...
-
-And many more! For the full list have a look at the
-[included snippets](https://github.com/fatih/vim-go/blob/master/gosnippets/):
-
 ## Troubleshooting
 
 ### I'm using Fish shell but have some problems using Vim-go
diff --git a/sources_non_forked/vim-go/autoload/go/cmd.vim b/sources_non_forked/vim-go/autoload/go/cmd.vim
index 75f67173..dfb5abde 100644
--- a/sources_non_forked/vim-go/autoload/go/cmd.vim
+++ b/sources_non_forked/vim-go/autoload/go/cmd.vim
@@ -3,9 +3,22 @@ if !exists("g:go_jump_to_error")
 endif
 
 function! go#cmd#Run(bang, ...)
+    let goFiles = '"' . join(go#tool#Files(), '" "') . '"'
+
+    if IsWin()
+        exec '!go run ' . goFiles
+        if v:shell_error
+            redraws! | echon "vim-go: [run] " | echohl ErrorMsg | echon "FAILED"| echohl None
+        else
+            redraws! | echon "vim-go: [run] " | echohl Function | echon "SUCCESS"| echohl None
+        endif
+
+        return
+    endif
+
     let default_makeprg = &makeprg
     if !len(a:000)
-        let &makeprg = "go run " . join(go#tool#Files(), ' ')
+        let &makeprg = 'go run ' . goFiles
     else
         let &makeprg = "go run " . expand(a:1)
     endif
@@ -25,8 +38,8 @@ function! go#cmd#Run(bang, ...)
 endfunction
 
 function! go#cmd#Install(...)
-    let pkgs = join(a:000, ' ')
-    let command = 'go install '.pkgs
+    let pkgs = join(a:000, '" "')
+    let command = 'go install "' . pkgs . '"'
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
         call go#tool#ShowErrors(out)
@@ -41,13 +54,13 @@ function! go#cmd#Install(...)
     endif
 endfunction
 
-function! go#cmd#Build(bang)
+function! go#cmd#Build(bang, ...)
     let default_makeprg = &makeprg
-    let gofiles = join(go#tool#Files(), ' ')
+    let gofiles = join(go#tool#Files(), '" "')
     if v:shell_error
         let &makeprg = "go build . errors"
     else
-        let &makeprg = "go build -o /dev/null " . gofiles
+        let &makeprg = "go build -o /dev/null " . join(a:000, ' ') . ' "' . gofiles . '"'
     endif
 
     echon "vim-go: " | echohl Identifier | echon "building ..."| echohl None
@@ -60,7 +73,7 @@ function! go#cmd#Build(bang)
             if g:go_jump_to_error
                 cc 1 "jump to first error if there is any
             endif
-        else 
+        else
             redraws! | echon "vim-go: " | echohl Function | echon "[build] SUCCESS"| echohl None
         endif
     endif
@@ -75,21 +88,22 @@ function! go#cmd#Test(...)
     endif
 
     echon "vim-go: " | echohl Identifier | echon "testing ..." | echohl None
+    redraw
     let out = go#tool#ExecuteInDir(command)
     if v:shell_error
         call go#tool#ShowErrors(out)
+        cwindow
+        let errors = getqflist()
+        if !empty(errors)
+            if g:go_jump_to_error
+                cc 1 "jump to first error if there is any
+            endif
+        endif
+        echon "vim-go: " | echohl ErrorMsg | echon "[test] FAIL" | echohl None
     else
         call setqflist([])
-    endif
-    cwindow
-
-    let errors = getqflist()
-    if !empty(errors)
-        if g:go_jump_to_error
-            cc 1 "jump to first error if there is any
-        endif
-    else
-        redraw | echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
+        cwindow
+        echon "vim-go: " | echohl Function | echon "[test] PASS" | echohl None
     endif
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/complete.vim b/sources_non_forked/vim-go/autoload/go/complete.vim
index d244c5c9..69b2d53c 100644
--- a/sources_non_forked/vim-go/autoload/go/complete.vim
+++ b/sources_non_forked/vim-go/autoload/go/complete.vim
@@ -43,9 +43,9 @@ fu! s:gocodeCommand(cmd, preargs, args)
         let a:preargs[i] = s:gocodeShellescape(a:preargs[i])
     endfor
 
-    let bin_path = go#tool#BinPath(g:go_gocode_bin) 
-    if empty(bin_path) 
-        return 
+    let bin_path = go#tool#BinPath(g:go_gocode_bin)
+    if empty(bin_path)
+        return
     endif
 
     let result = s:system(printf('%s %s %s %s', bin_path, join(a:preargs), a:cmd, join(a:args)))
@@ -96,7 +96,7 @@ function! go#complete#GetInfo()
 
     " no candidates are found
     if len(out) == 1
-        return
+        return ""
     endif
 
     " only one candiate is found
@@ -119,14 +119,16 @@ function! go#complete#GetInfo()
     if len(filtered) == 1
         return filtered[0]
     endif
+
+    return ""
 endfunction
 
 function! go#complete#Info()
     let result = go#complete#GetInfo()
-    if len(result) > 0
+    if !empty(result)
         echo "vim-go: " | echohl Function | echon result | echohl None
     endif
-endfunction!
+endfunction
 
 fu! go#complete#Complete(findstart, base)
     "findstart = 1 when we need to get the text length
diff --git a/sources_non_forked/vim-go/autoload/go/def.vim b/sources_non_forked/vim-go/autoload/go/def.vim
index ce6de7e6..0be1f024 100644
--- a/sources_non_forked/vim-go/autoload/go/def.vim
+++ b/sources_non_forked/vim-go/autoload/go/def.vim
@@ -13,15 +13,15 @@ function! go#def#Jump(...)
 		let arg = a:1
 	endif
 
-	let bin_path = go#tool#BinPath(g:go_godef_bin) 
-	if empty(bin_path) 
-		return 
+	let bin_path = go#tool#BinPath(g:go_godef_bin)
+	if empty(bin_path)
+		return
 	endif
 
 	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
 
 	" get output of godef
-	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), LineEnding()))
 
 	" jump to it
 	call s:godefJump(out, "")
@@ -31,15 +31,15 @@ endfunction
 function! go#def#JumpMode(mode)
 	let arg = s:getOffset()
 
-	let bin_path = go#tool#BinPath(g:go_godef_bin) 
-	if empty(bin_path) 
-		return 
+	let bin_path = go#tool#BinPath(g:go_godef_bin)
+	if empty(bin_path)
+		return
 	endif
 
 	let command = bin_path . " -f=" . expand("%:p") . " -i " . shellescape(arg)
 
 	" get output of godef
-	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), "\n"))
+	let out=system(command, join(getbufline(bufnr('%'), 1, '$'), LineEnding()))
 
 	call s:godefJump(out, a:mode)
 endfunction
@@ -51,7 +51,7 @@ function! s:getOffset()
 		let offs = line2byte(pos[0]) + pos[1] - 2
 	else
 		let c = pos[1]
-		let buf = line('.') == 1 ? "" : (join(getline(1, pos[0] - 1), "\n") . "\n")
+		let buf = line('.') == 1 ? "" : (join(getline(1, pos[0] - 1), LineEnding()) . LineEnding())
 		let buf .= c == 1 ? "" : getline(pos[0])[:c-2]
 		let offs = len(iconv(buf, &encoding, "utf-8"))
 	endif
@@ -66,7 +66,7 @@ function! s:godefJump(out, mode)
 	let &errorformat = "%f:%l:%c"
 
 	if a:out =~ 'godef: '
-		let out=substitute(a:out, '\n$', '', '')
+		let out=substitute(a:out, LineEnding() . '$', '', '')
 		echom out
 	else
 		let parts = split(a:out, ':')
@@ -85,7 +85,7 @@ function! s:godefJump(out, mode)
 			let &switchbuf = "usetab"
 
 			if bufloaded(fileName) == 0
-				tab split 
+				tab split
 			endif
 		else
 			if a:mode  == "split"
@@ -96,11 +96,10 @@ function! s:godefJump(out, mode)
 		endif
 
 		" jump to file now
-		ll 1
+		sil ll 1
 		normal zz
 
 		let &switchbuf = old_switchbuf
 	end
 	let &errorformat = old_errorformat
 endfunction
-
diff --git a/sources_non_forked/vim-go/autoload/go/doc.vim b/sources_non_forked/vim-go/autoload/go/doc.vim
index 6c9085c3..9509b652 100644
--- a/sources_non_forked/vim-go/autoload/go/doc.vim
+++ b/sources_non_forked/vim-go/autoload/go/doc.vim
@@ -35,7 +35,7 @@ function! s:godocWord(args)
     if !executable('godoc')
         echohl WarningMsg
         echo "godoc command not found."
-        echo "  install with: go get code.google.com/p/go.tools/cmd/godoc"
+        echo "  install with: go get golang.org/x/tools/cmd/godoc"
         echohl None
         return []
     endif
@@ -51,7 +51,7 @@ function! s:godocWord(args)
         let words = a:args
     endif
 
-    if !len(words) 
+    if !len(words)
         return []
     endif
 
@@ -85,7 +85,7 @@ function! go#doc#OpenBrowser(...)
     call go#tool#OpenBrowser(godoc_url)
 endfunction
 
-function! go#doc#Open(mode, ...)
+function! go#doc#Open(newmode, mode, ...)
     let pkgs = s:godocWord(a:000)
     if empty(pkgs)
         return
@@ -102,10 +102,14 @@ function! go#doc#Open(mode, ...)
         return -1
     endif
 
-    call s:GodocView(a:mode, content)
+    call s:GodocView(a:newmode, a:mode, content)
+
+    if exported_name == ''
+        silent! normal gg
+        return -1
+    endif
 
     " jump to the specified name
-
     if search('^func ' . exported_name . '(')
         silent! normal zt
         return -1
@@ -125,11 +129,11 @@ function! go#doc#Open(mode, ...)
     silent! normal gg
 endfunction
 
-function! s:GodocView(position, content)
+function! s:GodocView(newposition, position, content)
     " reuse existing buffer window if it exists otherwise create a new one
     if !bufexists(s:buf_nr)
-        execute a:position
-        file `="[Godoc]"`
+        execute a:newposition
+        sil file `="[Godoc]"`
         let s:buf_nr = bufnr('%')
     elseif bufwinnr(s:buf_nr) == -1
         execute a:position
@@ -149,9 +153,9 @@ function! s:GodocView(position, content)
     setlocal iskeyword-=-
 
     setlocal modifiable
-    %delete _ 
+    %delete _
     call append(0, split(a:content, "\n"))
-    $delete _ 
+    sil $delete _
     setlocal nomodifiable
 endfunction
 
diff --git a/sources_non_forked/vim-go/autoload/go/errcheck.vim b/sources_non_forked/vim-go/autoload/go/errcheck.vim
index 06a79192..e470f22b 100644
--- a/sources_non_forked/vim-go/autoload/go/errcheck.vim
+++ b/sources_non_forked/vim-go/autoload/go/errcheck.vim
@@ -2,13 +2,19 @@ if !exists("g:go_errcheck_bin")
     let g:go_errcheck_bin = "errcheck"
 endif
 
-function! go#errcheck#Run() abort
-    let bin_path = go#tool#BinPath(g:go_errcheck_bin) 
-    if empty(bin_path) 
-        return 
+function! go#errcheck#Run(...) abort
+    if a:0 == 0
+        let package = go#package#ImportPath(expand('%:p:h'))
+    else
+        let package = a:1
+    end
+
+    let bin_path = go#tool#BinPath(g:go_errcheck_bin)
+    if empty(bin_path)
+        return
     endif
 
-    let out = system(bin_path . ' ' . shellescape(expand('%:p:h')))
+    let out = system(bin_path . ' ' . package)
     if v:shell_error
         let errors = []
         let mx = '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)'
@@ -16,7 +22,7 @@ function! go#errcheck#Run() abort
             let tokens = matchlist(line, mx)
 
             if !empty(tokens)
-                call add(errors, {"filename": tokens[1],
+                call add(errors, {"filename": expand(DefaultGoPath() . "/src/" . tokens[1]),
                             \"lnum": tokens[2],
                             \"col": tokens[3],
                             \"text": tokens[4]})
diff --git a/sources_non_forked/vim-go/autoload/go/fmt.vim b/sources_non_forked/vim-go/autoload/go/fmt.vim
index ed1417e2..f640b9ff 100644
--- a/sources_non_forked/vim-go/autoload/go/fmt.vim
+++ b/sources_non_forked/vim-go/autoload/go/fmt.vim
@@ -39,6 +39,10 @@ if !exists('g:go_fmt_options')
     let g:go_fmt_options = ''
 endif
 
+if !exists("g:go_fmt_experimental")
+    let g:go_fmt_experimental = 0
+endif
+
 let s:got_fmt_error = 0
 
 "  we have those problems : 
@@ -57,12 +61,15 @@ function! go#fmt#Format(withGoimport)
     let l:tmpname=tempname()
     call writefile(getline(1,'$'), l:tmpname)
 
-    " save our undo file to be restored after we are done. This is needed to
-    " prevent an additional undo jump due to BufWritePre auto command and also
-    " restore 'redo' history because it's getting being destroyed every
-    " BufWritePre
-    let tmpundofile=tempname()
-    exe 'wundo! ' . tmpundofile
+
+    if g:go_fmt_experimental == 1
+        " save our undo file to be restored after we are done. This is needed to
+        " prevent an additional undo jump due to BufWritePre auto command and also
+        " restore 'redo' history because it's getting being destroyed every
+        " BufWritePre
+        let tmpundofile=tempname()
+        exe 'wundo! ' . Tmpundofile
+    endif
 
     " get the command first so we can test it
     let fmt_command = g:go_fmt_command
@@ -128,9 +135,11 @@ function! go#fmt#Format(withGoimport)
         cwindow
     endif
 
-    " restore our undo history
-    silent! exe 'rundo ' . tmpundofile
-    call delete(tmpundofile)
+    if g:go_fmt_experimental == 1
+        " restore our undo history
+        silent! exe 'rundo ' . tmpundofile
+        call delete(tmpundofile)
+    endif
 
     " restore our cursor/windows positions
     call delete(l:tmpname)
diff --git a/sources_non_forked/vim-go/autoload/go/oracle.vim b/sources_non_forked/vim-go/autoload/go/oracle.vim
index 2dc24b98..1fc2e7dc 100644
--- a/sources_non_forked/vim-go/autoload/go/oracle.vim
+++ b/sources_non_forked/vim-go/autoload/go/oracle.vim
@@ -3,8 +3,7 @@
 "
 "  Part of this plugin was taken directly from the oracle repo, however it's
 "  massively changed for a better integration into vim-go. Thanks Alan Donovan
-"  for the first iteration based on quickfix!  - fatih arslan
-"
+"  for the first iteration based on quickfix!  - Fatih Arslan
 "
 
 if !exists("g:go_oracle_bin")
@@ -89,8 +88,6 @@ func! s:RunOracle(mode, selected) range abort
         " unfortunaly oracle outputs a very long stack trace that is not
         " parsable to show the real error. But the main issue is usually the
         " package which doesn't build. 
-        " echo out
-        " redraw | echon 'vim-go: could not run static analyser (does it build?)'
         redraw | echon "vim-go: " | echohl Statement | echon out | echohl None
         return {}
     else
@@ -139,12 +136,12 @@ function! go#oracle#Implements(selected)
     endfor
 
     " open a window and put the result
-    call go#ui#OpenWindow(result)
+    call go#ui#OpenWindow("Implements", result)
 
     " define some buffer related mappings:
     "
     " go to definition when hit enter
-    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition()<CR>
+    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("implements")<CR>
     " close the window when hit ctrl-c
     nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
 endfunction
@@ -182,7 +179,43 @@ endfunction
 " Show possible targets of selected function call
 function! go#oracle#Callees(selected)
     let out = s:RunOracle('callees', a:selected)
-    echo out
+    if empty(out)
+        return
+    endif
+
+    " be sure the callees object exists which contains the position and names
+    " of the callees, before we continue
+    if !has_key(out, "callees")
+        return
+    endif
+
+    " get the callees list
+    if has_key(out.callees, "callees")
+        let callees = out.callees.callees
+    else
+        redraw | echon "vim-go: " | echon "no callees available"| echohl None
+        return
+    endif
+
+    let title = "Call targets:"
+
+    " start to populate our buffer content
+    let result  = [title, ""]
+
+    for calls in callees
+        let line = calls.name . "\t" . calls.pos
+        call add(result, line)
+    endfor
+
+    " open a window and put the result
+    call go#ui#OpenWindow("Callees", result)
+
+    " define some buffer related mappings:
+    "
+    " go to definition when hit enter
+    nnoremap <buffer> <CR> :<C-u>call go#ui#OpenDefinition("call targets")<CR>
+    " close the window when hit ctrl-c
+    nnoremap <buffer> <c-c> :<C-u>call go#ui#CloseWindow()<CR>
 endfunction
 
 " Show possible callers of selected function
diff --git a/sources_non_forked/vim-go/autoload/go/rename.vim b/sources_non_forked/vim-go/autoload/go/rename.vim
index 9e401e31..5c15d22f 100644
--- a/sources_non_forked/vim-go/autoload/go/rename.vim
+++ b/sources_non_forked/vim-go/autoload/go/rename.vim
@@ -19,9 +19,9 @@ function! go#rename#Rename(...)
         return 
     endif
 
-    let fname = expand('%:p:t')
+    let fname = resolve(expand('%:p:t'))
     let pos = s:getpos(line('.'), col('.'))
-    let cmd = printf('%s -offset %s:#%d -to %s',  bin_path, shellescape(fname), pos, to)
+    let cmd = printf('%s -offset %s -to %s', shellescape(bin_path), shellescape(printf('%s:#%d', fname, pos)), shellescape(to))
 
     let out = go#tool#ExecuteInDir(cmd)
 
diff --git a/sources_non_forked/vim-go/autoload/go/textobj.vim b/sources_non_forked/vim-go/autoload/go/textobj.vim
new file mode 100644
index 00000000..fa985a8e
--- /dev/null
+++ b/sources_non_forked/vim-go/autoload/go/textobj.vim
@@ -0,0 +1,15 @@
+if !exists("g:go_textobj_enabled")
+    let g:go_textobj_enabled = 1
+endif
+
+function! go#textobj#Function(mode)
+  if search('^\s*func .*{$', 'Wce', line('.')) <= 0
+        \ && search('^\s*func .*{$', 'bWce') <= 0
+    return
+  endif
+  if a:mode == 'a'
+    normal! Va{V
+  else " a:mode == 'i'
+    normal! Vi{V
+  endif
+endfunction
diff --git a/sources_non_forked/vim-go/autoload/go/tool.vim b/sources_non_forked/vim-go/autoload/go/tool.vim
index d5691057..b0b28236 100644
--- a/sources_non_forked/vim-go/autoload/go/tool.vim
+++ b/sources_non_forked/vim-go/autoload/go/tool.vim
@@ -1,18 +1,15 @@
 function! go#tool#Files()
-    if has ("win32")
-        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\n\"}}{{end}}"'
+    if IsWin()
+        let command = 'go list -f "{{range $f := .GoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}\{{$f}}{{printf \"\n\"}}{{end}}"'
     else
-        " let command = "go list -f $'{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}\n{{end}}'"
-
-        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
-
+        let command = "go list -f '{{range $f := .GoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}{{range $f := .CgoFiles}}{{$.Dir}}/{{$f}}{{printf \"\\n\"}}{{end}}'"
     endif
     let out = go#tool#ExecuteInDir(command)
     return split(out, '\n')
 endfunction
 
 function! go#tool#Deps()
-    if has ("win32")
+    if IsWin()
         let command = 'go list -f "{{range $f := .Deps}}{{$f}}{{printf \"\n\"}}{{end}}"'
     else
         let command = "go list -f $'{{range $f := .Deps}}{{$f}}\n{{end}}'"
@@ -23,7 +20,7 @@ endfunction
 
 function! go#tool#Imports()
     let imports = {}
-    if has ("win32")
+    if IsWin()
         let command = 'go list -f "{{range $f := .Imports}}{{$f}}{{printf \"\n\"}}{{end}}"'
     else
         let command = "go list -f $'{{range $f := .Imports}}{{$f}}\n{{end}}'"
@@ -35,7 +32,7 @@ function! go#tool#Imports()
     endif
 
     for package_path in split(out, '\n')
-        let package_name = fnamemodify(package_path, ":t")
+        let package_name = fnamemodify(package_path, ":t:r")
         let imports[package_name] = package_path
     endfor
 
@@ -45,8 +42,12 @@ endfunction
 function! go#tool#ShowErrors(out)
     let errors = []
     for line in split(a:out, '\n')
+        let fatalerrors = matchlist(line, '^\(fatal error:.*\)$')
         let tokens = matchlist(line, '^\s*\(.\{-}\):\(\d\+\):\s*\(.*\)')
-        if !empty(tokens)
+
+        if !empty(fatalerrors)
+            call add(errors, {"text": fatalerrors[1]})
+        elseif !empty(tokens)
             call add(errors, {"filename" : expand("%:p:h:") . "/" . tokens[1],
                         \"lnum":     tokens[2],
                         \"text":     tokens[3]})
@@ -120,7 +121,7 @@ function! go#tool#BinPath(binpath)
     " append our GOBIN and GOPATH paths and be sure they can be found there...
     " let us search in our GOBIN and GOPATH paths
     let old_path = $PATH
-    let $PATH = $PATH . ":" .go_bin_path
+    let $PATH = $PATH . PathSep() .go_bin_path
 
     if !executable(binpath) 
         echo "vim-go: could not find '" . basename . "'. Run :GoInstallBinaries to fix it."
@@ -140,7 +141,7 @@ endfunction
 function! s:get_browser_command()
     let go_play_browser_command = get(g:, 'go_play_browser_command', '')
     if go_play_browser_command == ''
-        if has('win32') || has('win64')
+        if IsWin()
             let go_play_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
         elseif has('mac') || has('macunix') || has('gui_macvim') || system('uname') =~? '^darwin'
             let go_play_browser_command = 'open %URL%'
diff --git a/sources_non_forked/vim-go/autoload/go/ui.vim b/sources_non_forked/vim-go/autoload/go/ui.vim
index 56ac8c9e..c658141d 100644
--- a/sources_non_forked/vim-go/autoload/go/ui.vim
+++ b/sources_non_forked/vim-go/autoload/go/ui.vim
@@ -1,11 +1,11 @@
 let s:buf_nr = -1
 
 "OpenWindow opens a new scratch window and put's the content into the window
-function! go#ui#OpenWindow(content)
+function! go#ui#OpenWindow(title, content)
     " reuse existing buffer window if it exists otherwise create a new one
     if !bufexists(s:buf_nr)
         execute 'botright new'
-        file `="[Implements]"`
+        file `="[" . a:title . "]"`
         let s:buf_nr = bufnr('%')
     elseif bufwinnr(s:buf_nr) == -1
         execute 'botright new'
@@ -17,9 +17,9 @@ function! go#ui#OpenWindow(content)
 
     " Keep minimum height to 10, if there is more just increase it that it
     " occupies all results
-    let implements_height = 10
-    if len(a:content) < implements_height
-        exe 'resize ' . implements_height
+    let buffer_height = 10
+    if len(a:content) < buffer_height
+        exe 'resize ' . buffer_height
     else
         exe 'resize ' . len(a:content)
     endif
@@ -58,11 +58,11 @@ endfunction
 
 " OpenDefinition parses the current line and jumps to it by openening a new
 " tab
-function! go#ui#OpenDefinition()
+function! go#ui#OpenDefinition(filter)
     let curline = getline('.')
 
-    " don't touch our first line and any blank line
-    if curline =~ "implements" || curline =~ "^$"
+    " don't touch our first line or any blank line
+    if curline =~ a:filter || curline =~ "^$"
         " supress information about calling this function
         echo "" 
         return
diff --git a/sources_non_forked/vim-go/compiler/go.vim b/sources_non_forked/vim-go/compiler/go.vim
index c5ae0bd2..ea339845 100644
--- a/sources_non_forked/vim-go/compiler/go.vim
+++ b/sources_non_forked/vim-go/compiler/go.vim
@@ -15,8 +15,12 @@ endif
 
 let s:save_cpo = &cpo
 set cpo-=C
+if filereadable("makefile") || filereadable("Makefile")
+    CompilerSet makeprg=make
+else
+    CompilerSet makeprg=go\ build
+endif
 
-CompilerSet makeprg=go\ build
 CompilerSet errorformat=
       \%-G#\ %.%#,
       \%-G%.%#panic:\ %m,
diff --git a/sources_non_forked/vim-go/doc/vim-go.txt b/sources_non_forked/vim-go/doc/vim-go.txt
index 1dbd5860..edfcae36 100644
--- a/sources_non_forked/vim-go/doc/vim-go.txt
+++ b/sources_non_forked/vim-go/doc/vim-go.txt
@@ -17,10 +17,11 @@ CONTENTS                                                          *go-contents*
 	1. Intro........................................|go-intro|
 	2. Install......................................|go-install|
 	3. Commands.....................................|go-commands|
-	4. Settings.....................................|go-settings|
-	5. Mappings.....................................|go-mappings|
-	6. Troubleshooting..............................|go-troubleshooting|
-	7. Credits......................................|go-credits|
+	4. Mappings.....................................|go-mappings|
+	5. Text Objects.................................|go-text-objects|
+	6. Settings.....................................|go-settings|
+	7. Troubleshooting..............................|go-troubleshooting|
+	8. Credits......................................|go-credits|
 
 ===============================================================================
 INTRO                                                                *go-intro*
@@ -49,7 +50,7 @@ easily.
   * Checking with `errcheck` for unchecked errors.
   * Integrated and improved snippets. Supports `ultisnips` or `neosnippet`
   * Share your current code to play.golang.org
-  * Type information about the underlying identifier 
+  * Type information about the underlying identifier
   * Tagbar support to show tags of the source code in a sidebar with `gotags`
 
 ===============================================================================
@@ -134,7 +135,7 @@ COMMANDS                                                          *go-commands*
 
     Filter the current Go buffer through goimports (needs to be installed).
     `goimports` automatically discards/add import path based on the code. Like
-    |GoFmt|, It tries to preserve cursor position and avoids replacing the 
+    |GoFmt|, It tries to preserve cursor position and avoids replacing the
     buffer with stderr output.
 
                                                                      *:GoPlay*
@@ -159,7 +160,7 @@ COMMANDS                                                          *go-commands*
 
     Goto declaration/definition for the given [identifier]. If no argument is
     given, it will jump to the declaration under the cursor. By default the
-    mapping `gd` is enabled to invoke GoDef for the identifier under the cursor. 
+    mapping `gd` is enabled to invoke GoDef for the identifier under the cursor.
     See |g:go_def_mapping_enabled| to disable it.
 
                                                                      *:GoRun*
@@ -167,16 +168,19 @@ COMMANDS                                                          *go-commands*
 
     Build and run your current main package. By default all main files for the
     current file is used. If an argument is passed, 'expand' is used as file
-    selector. For example use `:GoRun %` to select the current file only.  
+    selector. For example use `:GoRun %` to select the current file only.
 
     If [!] is not given the first error is jumped to.
 
                                                                    *:GoBuild*
-:GoBuild[!]
+:GoBuild[!] [options]
 
     Build your package with `go build`. It automatically builds only the files
     that depends on the current file. GoBuild doesn't produce a result file.
-    Use 'make' to create a result file. 
+    Use 'make' to create a result file.
+
+    You may optionally pass any valid go build flags/options. For a full list
+    please see `go help build`.
 
     If [!] is not given the first error is jumped to.
 
@@ -238,8 +242,9 @@ COMMANDS                                                          *go-commands*
 :GoImplements
 
     Show 'implements' relation for a selected package. A list of interfaces
-    for the type under the cursor (or selected package) is shown in a custom
-    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`.
+    for the type that implements an interface under the cursor (or selected
+    package) is shown in a custom window. Hit `<enter>` to jump in a new tab
+    or close it via `<c-c>`.
 
                                                                 *:GoRename*
 :GoRename [to]
@@ -247,6 +252,16 @@ COMMANDS                                                          *go-commands*
     Rename the identifier under the cursor to the desired new name. If no
     argument is given a prompt will ask for the desired identifier.
 
+                                                              *:GoCallees*
+:GoCallees
+
+    Show 'callees' relation for a selected package. A list of call targets
+    for the type under the cursor (or selected package) is shown in a custom
+    window. Hit `<enter>` to jump in a new tab or close it via `<c-c>`. For
+    example if called for a interface method call, it will show all call targets
+    that has implemented the method.
+
+
 ===============================================================================
 MAPPINGS                                                        *go-mappings*
 
@@ -353,6 +368,23 @@ Show the interfaces that the type under the cursor implements.
 
 Rename the identifier under the cursor to the desired new name
 
+                                                              *(go-callees)*
+
+Show the call targets for the type under the cursor
+
+===============================================================================
+TEXT OBJECTS                                                 *go-text-objects*
+
+vim-go comes with several custom |text-objects| that can be used to operate
+upon regions of text. vim-go currently defines the following text objects:
+
+                                               *go-v_af* *go-af*
+af			      "a function", select contents from a function definition to the
+               closing bracket.
+
+                                               *go-v_if* *go-if*
+if			      "inside a function", select contents of a function,
+			        excluding the function definition and the closing bracket.
 
 
 ===============================================================================
@@ -410,6 +442,16 @@ fails. By default it's disabled. >
 
   let g:go_fmt_fail_silently = 0
 <
+
+                                                   *'g:go_fmt_experimental'*
+
+Use this option to enable fmt's experimental mode. This experimental mode is
+superior to the current mode as it fully saves the undo history, so undo/redo
+doesn't break. However it's causing problems on some Vim versions. By default
+it's disabled. >
+
+  let g:go_fmt_experimental = 1
+<
                                               *'g:go_doc_keywordprg_enabled'*
 
 Use this option to change the enable GoDoc to run on words under the cursor
@@ -443,7 +485,7 @@ is empty. >
 
 <                                                            *'g:go_bin_path'*
 
-Use this option to change default path for vim-go tools when using 
+Use this option to change default path for vim-go tools when using
 |GoInstallBinaries| and |GoUpdateBinaries|. If not set `$GOBIN` or
 `$GOPATH/bin` is used. >
 
@@ -517,6 +559,12 @@ Highlights struct names. By default it's disabled. >
 
 	let g:go_highlight_structs = 0
 <
+                                                  *'g:go_textobj_enabled'*
+
+Adds custom text objects. By default it's enabled. >
+
+	let g:go_textobj_enabled = 1
+
 ===============================================================================
 TROUBLESHOOTING                                         *go-troubleshooting*
 
diff --git a/sources_non_forked/vim-go/ftplugin/go.vim b/sources_non_forked/vim-go/ftplugin/go.vim
index 548159ad..2ab7f39a 100644
--- a/sources_non_forked/vim-go/ftplugin/go.vim
+++ b/sources_non_forked/vim-go/ftplugin/go.vim
@@ -9,9 +9,7 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-if !exists("g:go_auto_type_info")
-    let g:go_auto_type_info = 0
-endif
+let b:undo_ftplugin = "setl fo< com< cms<"
 
 setlocal formatoptions-=t
 
@@ -22,42 +20,27 @@ setlocal noexpandtab
 
 compiler go
 
-if !exists("g:go_doc_keywordprg_enabled")
-    let g:go_doc_keywordprg_enabled = 1
-endif
-if g:go_doc_keywordprg_enabled
-    " keywordprg doesn't allow to use vim commands, override it
-    nnoremap <buffer> <silent> K :GoDoc<cr> 
-endif
-
-
-if !exists("g:go_def_mapping_enabled")
-    let g:go_def_mapping_enabled = 1
-endif
-if g:go_def_mapping_enabled
-   nnoremap <buffer> <silent> gd :GoDef<cr>
-endif
-
-
-let b:undo_ftplugin = "setl fo< com< cms<"
-
 " Set gocode completion
 setlocal omnifunc=go#complete#Complete
 
-" GoInfo automatic update
-if g:go_auto_type_info != 0
-    setlocal updatetime=300
-    au! CursorHold *.go nested call go#complete#Info()
+if get(g:, "go_doc_keywordprg_enabled", 1)
+    " keywordprg doesn't allow to use vim commands, override it
+    nnoremap <buffer> <silent> K :GoDoc<cr>
 endif
 
-
-" autoload settings
-if !exists('g:go_fmt_autosave')
-    let g:go_fmt_autosave = 1
+if get(g:, "go_def_mapping_enabled", 1)
+   nnoremap <buffer> <silent> gd :GoDef<cr>
 endif
 
-if g:go_fmt_autosave
-    autocmd BufWritePre <buffer> call go#fmt#Format(-1)
+if get(g:, "go_textobj_enabled", 1)
+    onoremap <buffer> af :<c-u>call go#textobj#Function('a')<cr>
+    xnoremap <buffer> af :<c-u>call go#textobj#Function('a')<cr>
+    onoremap <buffer> if :<c-u>call go#textobj#Function('i')<cr>
+    xnoremap <buffer> if :<c-u>call go#textobj#Function('i')<cr>
+endif
+
+if get(g:, "go_auto_type_info", 0)
+    setlocal updatetime=800
 endif
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/ftplugin/go/commands.vim b/sources_non_forked/vim-go/ftplugin/go/commands.vim
index e3b0940c..0403ae9e 100644
--- a/sources_non_forked/vim-go/ftplugin/go/commands.vim
+++ b/sources_non_forked/vim-go/ftplugin/go/commands.vim
@@ -17,6 +17,7 @@ nnoremap <silent> <Plug>(go-info) :<C-u>call go#complete#Info()<CR>
 nnoremap <silent> <Plug>(go-import) :<C-u>call go#import#SwitchImport(1, '', expand('<cword>'))<CR>
 
 nnoremap <silent> <Plug>(go-implements) :<C-u>call go#oracle#Implements(-1)<CR>
+nnoremap <silent> <Plug>(go-callees) :<C-u>call go#oracle#Callees(-1)<CR>
 
 nnoremap <silent> <Plug>(go-rename) :<C-u>call go#rename#Rename()<CR>
 
@@ -25,10 +26,10 @@ nnoremap <silent> <Plug>(go-def-vertical) :<C-u>call go#def#JumpMode("vsplit")<C
 nnoremap <silent> <Plug>(go-def-split) :<C-u>call go#def#JumpMode("split")<CR>
 nnoremap <silent> <Plug>(go-def-tab) :<C-u>call go#def#JumpMode("tab")<CR>
 
-nnoremap <silent> <Plug>(go-doc) :<C-u>call go#doc#Open("leftabove new")<CR>
-nnoremap <silent> <Plug>(go-doc-tab) :<C-u>call go#doc#Open("tabnew")<CR>
-nnoremap <silent> <Plug>(go-doc-vertical) :<C-u>call go#doc#Open("vnew")<CR>
-nnoremap <silent> <Plug>(go-doc-split) :<C-u>call go#doc#Open("split")<CR>
+nnoremap <silent> <Plug>(go-doc) :<C-u>call go#doc#Open("new", "split")<CR>
+nnoremap <silent> <Plug>(go-doc-tab) :<C-u>call go#doc#Open("tabnew", "tabe")<CR>
+nnoremap <silent> <Plug>(go-doc-vertical) :<C-u>call go#doc#Open("vnew", "vsplit")<CR>
+nnoremap <silent> <Plug>(go-doc-split) :<C-u>call go#doc#Open("new", "split")<CR>
 nnoremap <silent> <Plug>(go-doc-browser) :<C-u>call go#doc#OpenBrowser()<CR>
 
 
@@ -37,6 +38,7 @@ command! -nargs=? GoRename call go#rename#Rename(<f-args>)
 
 " oracle
 command! -range=% GoImplements call go#oracle#Implements(<count>)
+command! -range=% GoCallees call go#oracle#Callees(<count>)
 
 " tool
 command! -nargs=0 GoFiles echo go#tool#Files()
@@ -45,7 +47,7 @@ command! -nargs=* GoInfo call go#complete#Info()
 
 " cmd
 command! -nargs=* -bang GoRun call go#cmd#Run(<bang>0,<f-args>)
-command! -nargs=? -bang GoBuild call go#cmd#Build(<bang>0)
+command! -nargs=* -bang GoBuild call go#cmd#Build(<bang>0,<f-args>)
 command! -nargs=* GoInstall call go#cmd#Install(<f-args>)
 command! -nargs=* GoTest call go#cmd#Test(<f-args>)
 command! -nargs=* GoCoverage call go#cmd#Coverage(<f-args>)
@@ -58,7 +60,7 @@ command! -nargs=0 -range=% GoPlay call go#play#Share(<count>, <line1>, <line2>)
 command! -nargs=* -range GoDef :call go#def#Jump(<f-args>)
 
 " -- doc
-command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#doc#Open('leftabove new', <f-args>)
+command! -nargs=* -range -complete=customlist,go#package#Complete GoDoc call go#doc#Open('new', 'split', <f-args>)
 command! -nargs=* -range -complete=customlist,go#package#Complete GoDocBrowser call go#doc#OpenBrowser(<f-args>)
 
 " -- fmt
@@ -74,12 +76,11 @@ command! -nargs=* -complete=customlist,go#package#Complete GoImportAs call go#im
 command! GoLint call go#lint#Run()
 
 " -- errcheck
-command! GoErrCheck call go#errcheck#Run()
+command! -nargs=? -complete=customlist,go#package#Complete GoErrCheck call go#errcheck#Run(<f-args>)
 
 " Disable all commands until they are fully integrated.
 "
 " command! -range=% GoOracleDescribe call go#oracle#Describe(<count>)
-" command! -range=% GoOracleCallees  call go#oracle#Callees(<count>)
 " command! -range=% GoOracleCallers call go#oracle#Callers(<count>)
 " command! -range=% GoOracleCallgraph call go#oracle#Callgraph(<count>)
 " command! -range=% GoOracleCallstack call go#oracle#Callstack(<count>)
diff --git a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
index cb499b57..07718281 100644
--- a/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
+++ b/sources_non_forked/vim-go/gosnippets/UltiSnips/go.snippets
@@ -2,151 +2,143 @@
 
 priority -10
 
-# when to abbriviate and when not?
-# b doesn't work here, because it ignores whitespace
-# optional local name?
-snippet import "Import declaration" b
+# shorthand variable declaration
+snippet : "v := value"
+${1} := ${0}
+endsnippet
+
+# anonymous function
+snippet anon "fn := func() { ... }"
+${1:fn} := func() {
+	${0}
+}
+endsnippet
+
+# append
+snippet ap "append(slice, value)"
+append(${1:slice}, ${0:value})
+endsnippet
+
+# break
+snippet br "break"
+break
+endsnippet
+
+# channel
+snippet ch "chan Type"
+chan ${0:int}
+endsnippet
+
+# case
+snippet case "case ...:"
+case ${1:value}:
+	${0}
+endsnippet
+
+# constant
+snippet con "const XXX Type = ..."
+const ${1:NAME} ${2:Type} = ${0:0}
+endsnippet
+
+# constants
+snippet cons "const ( ... )"
+const (
+	${1:NAME} ${2:Type} = ${3:value}
+	${0}
+)
+endsnippet
+
+# constants with iota
+snippet iota "const ( ... = iota )"
+const (
+	${1:NAME} ${2:Type} = iota
+	${0}
+)
+endsnippet
+
+# continue
+snippet cn "continue"
+continue
+endsnippet
+
+# default case
+snippet default "default: ..."
+default:
+	${0}
+
+endsnippet
+
+# defer
+snippet df "defer someFunction()"
+defer ${1:func}(${2})
+${0}
+endsnippet
+
+snippet def "defer func() { ... }"
+defer func() {
+	${0}
+}()
+endsnippet
+
+# defer recover
+snippet defr
+defer func() {
+	if err := recover(); err != nil {
+		${0}
+	}
+}()
+endsnippet
+
+# gpl
+snippet gpl
+/*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
+*
+* Copyright (C) ${1:Author}, `strftime("%Y")`
+*/
+${0}
+endsnippet
+
+# import
+snippet import "import ( ... )"
 import (
 	"${1:package}"
 )
 endsnippet
 
-snippet package "Package declaration" b
-// Package $1 provides ${2:...}
-package ${1:main}
-${0:${VISUAL}}
-endsnippet
-
-# Mostly converted from: https://github.com/AlanQuatermain/go-tmbundle
-snippet /^cons/ "Constants declaration" r
-const (
-	${1:constant}${2/(.+)/ /}${2:type} = ${0:value}
-)
-endsnippet
-
-snippet /^con/ "Constant declaration" r
-const ${1:name}${2/(.+)/ /}${2:type} = ${0:value}
-endsnippet
-
-snippet iota "Iota constant generator" b
-const (
-	${1:constant}${2/(.+)/ /}${2:type} = iota
-)
-endsnippet
-
-snippet struct "Struct declaration" b
-type ${1:Struct} struct {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet interface "Interface declaration" b
+# full interface snippet
+snippet interface "interface I { ... }"
 type ${1:Interface} interface {
-	${0:${VISUAL}}
+	${2:/* TODO: add methods */}
 }
 endsnippet
 
-# statements
-snippet for "For loop" b
-for ${1:condition} {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet fori "Integer for loop" b
-for ${1:i} := 0; $1 < ${2:N}; $1++ {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet forr "For range loop" b
-for ${2:name} := range ${1:collection} {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet if "If statement" b
-if ${1:condition}${1/(.+)/ /}{
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet switch "Switch statement" b
-switch ${1:expression}${1/(.+)/ /}{
-case${0}
-}
-endsnippet
-
-snippet select "Select statement" b
-select {
-case${0}
-}
-endsnippet
-
-snippet case "Case clause" b
-case ${1:condition}:
-	${0:${VISUAL}}
-endsnippet
-
-snippet default "Default clause" b
-default:
-	${0:${VISUAL}}
-endsnippet
-
-# functions
-snippet /^main/ "Main function" r
-func main() {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet /^meth/ "Method" r
-func (${1:receiver} ${2:type}) ${3:name}(${4:params})${5/(.+)/ /}${5:type} {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet func "Function" b
-func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet anon "Anonymous Function" !b
-${1:fn} := func() {
-	${2}
-}
-endsnippet
-
-# types and variables
-snippet map "Map type" b
-map[${1:keytype}]${2:valtype}
-endsnippet
-
-snippet : "Short variable declaration :=" !b
-${1:name} := ${0:value}
-endsnippet
-
-snippet var "Variable declaration" b
-var ${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value}}
-endsnippet
-
-snippet vars "Variables declaration" b
-var (
-	${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value} }
-)
-endsnippet
-
-snippet json "JSON field"
-\`json:"${1:displayName}"\`
-endsnippet
-
-snippet er "Error clause " !b
-if err != nil {
+# if condition
+snippet if "if ... { ... }"
+if ${1:condition} {
 	${0}
 }
 endsnippet
 
+# else snippet
+snippet else
+else {
+	${0}
+}
+endsnippet
+
+# error snippet
 snippet errn "Error return " !b
 if err != nil {
 	return err
@@ -161,55 +153,195 @@ if err != nil {
 ${0}
 endsnippet
 
-snippet errn,, "Error return with three return values" !b
-if err != nil {
-	return ${1:nil}, ${2:nil}, err
-}
-${0}
+snippet json "\`json:key\`"
+\`json:"${1:keyName}"\`
 endsnippet
 
-snippet ok "OK statement" !b
-if !ok {
+# fallthrough
+snippet ft "fallthrough"
+fallthrough
+endsnippet
+
+# for loop
+snippet for "for ... { ... }"
+for ${1} {
+	${0}
+}
+endsnippet
+
+# for integer loop
+snippet fori "for 0..N-1 { ... }"
+for ${1:i} := 0; $1 < ${2:N}; $1++ {
+	${0}
+}
+endsnippet
+
+# for range loop
+snippet forr "for k, v := range items { ... }"
+for ${2:k}, ${3:v} := range ${1} {
+	${0}
+}
+endsnippet
+
+# function
+snippet func "func Function(...) [error] { ... }"
+func ${1:name}(${2:params})${3/(.+)/ /}`!p opening_par(snip, 3)`$3`!p closing_par(snip, 3)` {
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet gof "Anonymous Goroutine" !b
+# Fmt Printf debug
+snippet ff "fmt.Printf(...)"
+fmt.Printf("${1} = %+v\n", $1)
+endsnippet
+
+# Fmt Println debug
+snippet fn "fmt.Println(...)"
+fmt.Println("${1}")
+endsnippet
+
+# log printf
+snippet lf "log.Printf(...)"
+log.Printf("${1} = %+v\n", $1)
+endsnippet
+
+# log println
+snippet ln "log.Println(...)"
+log.Println("${1}")
+endsnippet
+
+# make
+snippet make "make(Type, size)"
+make(${1:[]string}, ${2:0})${0}
+endsnippet
+
+# map
+snippet map "map[Type]Type"
+map[${1:string}]${0:int}
+endsnippet
+
+# main()
+snippet main "func main() { ... }"
+func main() {
+	${0}
+}
+endsnippet
+
+# method
+snippet meth "func (self Type) Method(...) [error] { ... }"
+func (${1:receiver} ${2:type}) ${3:name}(${4:params})${5/(.+)/ /}`!p opening_par(snip, 5)`$5`!p closing_par(snip, 5)` {
+	${0:${VISUAL}}
+}
+endsnippet
+
+# ok
+snippet ok "if !ok { ... }"
+if !ok {
+	${0}
+}
+endsnippet
+
+# package
+snippet package "package ..."
+// Package $1 provides ${2:...}
+package ${1:main}
+${0}
+endsnippet
+
+# panic
+snippet pn "panic()"
+panic("${0:msg}")
+endsnippet
+
+# return
+snippet rt "return"
+return ${0}
+endsnippet
+
+# select
+snippet select "select { case a := <-chan: ... }"
+select {
+case ${1:v1} := <-${2:chan1}
+	${0}
+}
+endsnippet
+
+# struct
+snippet st "type T struct { ... }"
+type ${1:Type} struct {
+${0}
+}
+endsnippet
+
+# switch
+snippet switch "switch x { ... }"
+switch ${1:var} {
+case ${2:value1}:
+	${0}
+}
+endsnippet
+
+# sprintf
+snippet sp "fmt.Sprintf(...)"
+fmt.Sprintf("%${1:s}", ${2:var})
+endsnippet
+
+# goroutine named function
+snippet go "go someFunc(...)"
+go ${1:funcName}(${0})
+endsnippet
+
+# goroutine anonymous function
+snippet gof "go func() { ... }()"
 go func() {
 	${1}
 }()
 endsnippet
 
-snippet def "Anonymous Defer" !b
-defer func() {
-	${1}
-}()
-endsnippet
-
-snippet ff "Fmt Printf debug" !b
-fmt.Printf("${1} %+v\n", $1)
-endsnippet
-
-snippet fn "Fmt Println debug" !b
-fmt.Println("${1}")
-endsnippet
-
-snippet lf "Log Printf debug" !b
-log.Printf("${1} %+v\n", $1)
-endsnippet
-
-snippet ln "Log Println debug" !b
-log.Println("${1}")
-endsnippet
-
-snippet make "make allocation" !b
-make(${1:Type}, ${2:size})${0}
-endsnippet
-
-snippet test "test function" b
+# test function
+snippet test "func TestXYZ(t *testing.T) { ... }"
 func Test${1:Function}(t *testing.T) {
-	${2}
+	${0}
 }
 endsnippet
 
+# variable declaration
+snippet var "var x Type [= ...]"
+var ${1:x} ${2:Type}${3: = ${0:value\}}
+endsnippet
+
+# variables declaration
+snippet vars "var ( ... )"
+var (
+${1:x} ${2:Type}${3: = ${0:value\}}
+)
+endsnippet
+
+global !p
+
+import re
+
+# Automatically wrap return types with parentheses
+
+def return_values(s):
+	# remove everything wrapped in parentheses
+	s = re.sub("\(.*?\)|\([^)]*$", "", s)
+	return len(s.split(","))
+
+def opening_par(snip, pos):
+	if return_values(t[pos]) > 1 and not t[pos].startswith("("):
+		snip.rv = "("
+	else:
+		snip.rv = ""
+
+def closing_par(snip, pos):
+	if return_values(t[pos]) > 1:
+		snip.rv = ")"
+	else:
+		snip.rv = ""
+
+endglobal
+
+
 # vim:ft=snippets:
+
diff --git a/sources_non_forked/vim-go/gosnippets/snippets/go.snip b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
index d4b16c5c..a2d3b89e 100644
--- a/sources_non_forked/vim-go/gosnippets/snippets/go.snip
+++ b/sources_non_forked/vim-go/gosnippets/snippets/go.snip
@@ -1,53 +1,70 @@
 # shorthand variable declaration
-snippet v
-	${1} := ${2}
-# variable initialization
-snippet vr
-	var ${1:t} ${0:string}
-# variable declaration
-snippet var
-	var ${1} ${2} = ${3}
-# variables declaration
-snippet vars
-	var (
-		${1} ${2} = ${3}
-	)
+snippet :
+abbr v := value
+	${1} := ${0}
+# anonymous function
+snippet anon
+abbr fn := func() { ... }
+	${1:fn} := func() {
+		${0}
+	}
 # append
 snippet ap
+abbr append(slice, value)
 	append(${1:slice}, ${0:value})
-# bool
-snippet bl
-	bool
-# byte
-snippet bt
-	byte
 # break
 snippet br
+abbr break
 	break
 # channel
 snippet ch
+abbr chan Type
 	chan ${0:int}
 # case
-snippet cs
+snippet case
+abbr case ...:
 	case ${1:value}:
 		${0}
-# const
-snippet c
-	const ${1:NAME} = ${0:0}
-# constants with iota
-snippet co
+# constant
+snippet con
+abbr const XXX Type = ...
+	const ${1:NAME} ${2:Type} = ${0:0}
+# constants
+snippet cons
+abbr const ( ... )
 	const (
-		${1:NAME1} = iota
-		${0:NAME2}
+		${1:NAME} ${2:Type} = ${3:value}
+		${0}
+	)
+# constants with iota
+snippet iota
+abbr const ( ... = iota )
+	const (
+		${1:NAME} ${2:Type} = iota
+		${0}
 	)
 # continue
 snippet cn
+abbr continue
 	continue
+# default case
+snippet default
+abbr default: ...
+	default:
+		${0}
+
 # defer
 snippet df
-	defer ${0:func}()
+abbr defer someFunction()
+	defer ${1:func}(${2})
+	${0}
+snippet def
+abbr defer func() { ... }
+	defer func() {
+		${0}
+	}()
 # defer recover
-snippet dfr
+snippet defr
 	defer func() {
 		if err := recover(); err != nil {
 			${0}
@@ -73,171 +90,185 @@ snippet gpl
 	 */
 
 	${0}
-# int
-snippet i
-	int
 # import
-snippet im
+snippet import
+abbr import ( ... )
 	import (
 		"${1:package}"
 	)
-# interface
-snippet in
-	interface{}
 # full interface snippet
-snippet inf
-	interface ${1:name} {
-		${2:/* methods */}
+snippet interface
+abbr interface I { ... }
+	type ${1:Interface} interface {
+		${2:/* TODO: add methods */}
 	}
 # if condition
 snippet if
-	if ${1:/* condition */} {
-		${2}
+abbr if ... { ... }
+	if ${1:condition} {
+		${0}
 	}
 # else snippet
-snippet el
+abbr else { ... }
+snippet else
 	else {
-		${1}
+		${0}
 	}
 # error snippet
-snippet ir
+snippet errn
+abbr if err != nil { ... }
 	if err != nil {
 		return err
 	}
+
+# error snippet with two return values
+snippet errn,
+abbr if err != nil { return [...], err }
+	if err != nil {
+		return ${2}$1, err
+	}
 	${0}
-# false
-snippet f
-	false
+
+# json snippet
+snippet json
+abbr \`json:key\`
+	\`json:"${1:keyName}"\`
 # fallthrough
 snippet ft
+abbr fallthrough
 	fallthrough
-# float
-snippet fl
-	float32
-# float32
-snippet f3
-	float32
-# float64
-snippet f6
-	float64
-# if else
-snippet ie
-	if ${1:/* condition */} {
-		${2}
-	} else {
-		${3}
-	}
-	${0}
 # for loop
-snippet fo
-	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4}
+snippet for
+abbr for ... { ... }
+	for ${1} {
+		${0}
+	}
+# for integer loop
+snippet fori
+abbr for 0..N-1 { ... }
+	for ${1:i} := 0; $1 < ${2:N}; $1++ {
+		${0}
 	}
-	${0}
 # for range loop
-snippet fr
-	for ${1:k}, ${2:v} := range ${3} {
-		${4}
+snippet forr
+abbr for k, v := range items { ... }
+	for ${2:k}, ${3:v} := range ${1} {
+		${0}
 	}
-	${0}
-# function simple
-snippet fun
-	func ${1:funcName}(${2}) ${3:error} {
-		${4}
+# function
+snippet func
+abbr func function(...) [error] { ... }
+	func ${1:function}(${2}) ${3:error }{
+		${0}
 	}
-	${0}
-# function on receiver
-snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5}
-	}
-	${0}
 # Fmt Printf debug
 snippet ff
-	fmt.Printf("${1} %+v\n", ${0})
+abbr fmt.Printf(...)
+	fmt.Printf("${1} = %+v\n", $1)
+	${0}
 # Fmt Println debug
 snippet fn
+abbr fmt.Println(...)
 	fmt.Println("${1}")
 # log printf
 snippet lf
-	log.Printf("%${1:s}", ${2:var})
-# log printf
-snippet lp
+abbr log.Printf(...)
+	log.Printf("${1} = %+v\n", $1)
+# log println
+snippet ln
+abbr log.Println(...)
 	log.Println("${1}")
 # make
-snippet mk
-	make(${1:[]string}, ${0:0})
+snippet make
+abbr make(Type, size)
+	make(${1:[]string}, ${2:0})${0}
 # map
-snippet mp
+snippet map
+abbr map[Type]Type
 	map[${1:string}]${0:int}
 # main()
 snippet main
+abbr func main() { ... }
+options head
 	func main() {
-		${1}
+		${0}
 	}
+# method
+snippet meth
+abbr func (self Type) Method(...) [error] { ... }
+regexp /^meth/
+	func (${1:self} ${2:Type}) ${3:Do}(${4}) ${5:error }{
+		${0}
+	}
+# ok
+snippet ok
+abbr if !ok { ... }
+	if !ok {
+		${0}
+	}
+# package
+snippet package
+abbr package ...
+	// Package $1 provides ${2:...}
+	package ${1:main}
 	${0}
-# new
-snippet nw
-	new(${0:type})
 # panic
-snippet pn
-	panic("${0:msg}")
-# print
-snippet pr
-	fmt.Printf("%${1:s}\n", ${2:var})
-# range
-snippet rn
-	range ${0}
+snippet panic
+alias pn
+abbr panic("...")
+	panic("${0}")
 # return
-snippet rt
+snippet return
+alias rt
+abbr return ...
 	return ${0}
-# result
-snippet rs
-	result
 # select
-snippet sl
+snippet select
+abbr select { case a := <-chan: ... }
 	select {
 	case ${1:v1} := <-${2:chan1}
-		${3}
-	case ${4:v2} := <-${5:chan2}
-		${6}
-	default:
 		${0}
 	}
-# string
-snippet sr
-	string
 # struct
 snippet st
-	struct ${1:name} {
-		${2:/* data */}
-	}
-	${0}
-# switch
-snippet sw
-	switch ${1:var} {
-	case ${2:value1}:
-		${3}
-	case ${4:value2}:
-		${5}
-	default:
+abbr type T struct { ... }
+	type ${1:Type} struct {
 		${0}
 	}
+# switch
+snippet switch
+abbr switch x { ... }
+	switch ${1:var} {
+	case ${2:value1}:
+		${0}
+	}
+# sprintf
 snippet sp
+abbr fmt.Sprintf(...)
 	fmt.Sprintf("%${1:s}", ${2:var})
-# true
-snippet t
-	true
 # goroutine named function
-snippet g
+snippet go
+abbr go someFunc(...)
 	go ${1:funcName}(${0})
 # goroutine anonymous function
-snippet ga
-	go func(${1} ${2:type}) {
-		${3:/* code */}
-	}(${0})
+snippet gof
+abbr go func(...) { ... }(...)
+	go func(${1}) {
+		${3:/* TODO */}
+	}(${2})
 # test function
 snippet test
+abbr func TestXYZ(t *testing.T) { ... }
 	func Test${1:Function}(t *testing.T) {
-		${2}
+		${0}
 	}
+# variable declaration
+snippet var
+abbr var x Type [= ...]
+	var ${1:x} ${2:Type}${3: = ${0:value\}}
+# variables declaration
+snippet vars
+abbr var ( ... )
+	var (
+		${1:x} ${2:Type}${3: = ${0:value\}}
+	)
diff --git a/sources_non_forked/vim-go/plugin/go.vim b/sources_non_forked/vim-go/plugin/go.vim
index f71a64dd..e460ebdc 100644
--- a/sources_non_forked/vim-go/plugin/go.vim
+++ b/sources_non_forked/vim-go/plugin/go.vim
@@ -7,12 +7,12 @@ let g:go_loaded_install = 1
 " these packages are used by vim-go and can be automatically installed if
 " needed by the user with GoInstallBinaries
 let s:packages = [
-            \ "github.com/nsf/gocode", 
-            \ "code.google.com/p/go.tools/cmd/goimports", 
-            \ "code.google.com/p/rog-go/exp/cmd/godef", 
-            \ "code.google.com/p/go.tools/cmd/oracle", 
-            \ "code.google.com/p/go.tools/cmd/gorename",
-            \ "github.com/golang/lint/golint", 
+            \ "github.com/nsf/gocode",
+            \ "golang.org/x/tools/cmd/goimports",
+            \ "code.google.com/p/rog-go/exp/cmd/godef",
+            \ "golang.org/x/tools/cmd/oracle",
+            \ "golang.org/x/tools/cmd/gorename",
+            \ "github.com/golang/lint/golint",
             \ "github.com/kisielk/errcheck",
             \ "github.com/jstemmer/gotags",
             \ ]
@@ -23,6 +23,49 @@ command! GoErrCheck call go#errcheck#Run()
 command! GoInstallBinaries call s:GoInstallBinaries(-1)
 command! GoUpdateBinaries call s:GoInstallBinaries(1)
 
+" LineEnding returns the correct line ending, based on the current fileformat
+function! LineEnding()
+    if &fileformat == 'dos'
+        return "\r\n"
+    elseif &fileformat == 'mac'
+        return "\r"
+    endif
+
+    return "\n"
+endfunction
+
+" IsWin returns 1 if current OS is Windows or 0 otherwise
+function! IsWin()
+    let win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
+    for w in win
+        if (has(w))
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" PathSep returns the appropriate path separator based on OS.
+function! PathSep()
+    if IsWin()
+        return ";"
+    endif
+
+    return ":"
+endfunction
+
+" DefaultGoPath returns the default GOPATH.
+" If there is only one GOPATH it returns that, otherwise it returns the first one.
+function! DefaultGoPath()
+    let go_paths = split($GOPATH, PathSep())
+
+    if len(go_paths) == 1
+        return $GOPATH
+    endif
+
+    return go_paths[0]
+endfunction
 
 " GetBinPath returns the binary path of installed go tools
 function! GetBinPath()
@@ -35,24 +78,11 @@ function! GetBinPath()
     elseif $GOBIN != ""
         let bin_path = $GOBIN
     elseif $GOPATH != ""
-        " take care of multi element GOPATH's
-        let go_paths = split($GOPATH, ":")
-
-        if len(go_paths) == 1 
-            " one single PATH
-            let bin_path = $GOPATH . '/bin/'
-        else
-            " multiple paths, use the first one
-            let bin_path = go_paths[0]. '/bin/'
-        endif
+        let bin_path = expand(DefaultGoPath() . "/bin/")
     else
         " could not find anything
-        return ""
     endif
 
-    " add trailing slash if there is no one
-    if bin_path[-1:-1] != '/' | let bin_path .= '/' | endif
-
     return bin_path
 endfunction
 
@@ -60,9 +90,9 @@ endfunction
 " packages variable. It uses by default $GOBIN or $GOPATH/bin as the binary
 " target install directory. GoInstallBinaries doesn't install binaries if they
 " exist, to update current binaries pass 1 to the argument.
-function! s:GoInstallBinaries(updateBinaries) 
+function! s:GoInstallBinaries(updateBinaries)
     if $GOPATH == ""
-        echohl Error 
+        echohl Error
         echomsg "vim.go: $GOPATH is not set"
         echohl None
         return
@@ -82,7 +112,17 @@ function! s:GoInstallBinaries(updateBinaries)
     let old_path = $PATH
 
     " vim's executable path is looking in PATH so add our go_bin path to it
-    let $PATH = $PATH . ":" .go_bin_path
+    let $PATH = $PATH . PathSep() .go_bin_path
+
+    " when shellslash is set on MS-* systems, shellescape puts single quotes
+    " around the output string. cmd on Windows does not handle single quotes
+    " correctly. Unsetting shellslash forces shellescape to use double quotes
+    " instead.
+    let resetshellslash = 0
+    if has('win32') && &shellslash
+        let resetshellslash = 1
+        set noshellslash
+    endif
 
     for pkg in s:packages
         let basename = fnamemodify(pkg, ":t")
@@ -94,7 +134,7 @@ function! s:GoInstallBinaries(updateBinaries)
         endif
 
         if !executable(bin) || a:updateBinaries == 1
-            if a:updateBinaries == 1 
+            if a:updateBinaries == 1
                 echo "vim-go: Updating ". basename .". Reinstalling ". pkg . " to folder " . go_bin_path
             else
                 echo "vim-go: ". basename ." not found. Installing ". pkg . " to folder " . go_bin_path
@@ -109,6 +149,9 @@ function! s:GoInstallBinaries(updateBinaries)
 
     " restore back!
     let $PATH = old_path
+    if resetshellslash
+        set shellslash
+    endif
 endfunction
 
 " CheckBinaries checks if the necessary binaries to install the Go tool
@@ -130,5 +173,23 @@ function! s:CheckBinaries()
     endif
 endfunction
 
+" Autocommands
+" ============================================================================
+
+augroup vim-go
+    autocmd!
+
+    " GoInfo automatic update
+    if get(g:, "go_auto_type_info", 0)
+        autocmd CursorHold *.go nested call go#complete#Info()
+    endif
+
+    " code formatting on save
+    if get(g:, "go_fmt_autosave", 1)
+        autocmd BufWritePre *.go call go#fmt#Format(-1)
+    endif
+
+augroup END
+
 
 " vim:ts=4:sw=4:et
diff --git a/sources_non_forked/vim-go/syntax/go.vim b/sources_non_forked/vim-go/syntax/go.vim
index 59f72ed7..4ee39a71 100644
--- a/sources_non_forked/vim-go/syntax/go.vim
+++ b/sources_non_forked/vim-go/syntax/go.vim
@@ -10,7 +10,9 @@
 "     let OPTION_NAME = 0
 "   in your ~/.vimrc file to disable particular options. You can also write:
 "     let OPTION_NAME = 1
-"   to enable particular options. At present, all options default to on.
+"   to enable particular options. 
+"   At present, all options default to on, except highlight of:
+"   functions, methods and structs.
 "
 "   - go_highlight_array_whitespace_error
 "     Highlights white space after "[]".
@@ -107,10 +109,10 @@ syn match       goDeclaration       /\<func\>/
 " Predefined functions and values
 syn keyword     goBuiltins          append cap close complex copy delete imag len
 syn keyword     goBuiltins          make new panic print println real recover
-syn keyword     goConstants         iota true false nil
+syn keyword     goBoolean           iota true false nil
 
 hi def link     goBuiltins          Keyword
-hi def link     goConstants         Keyword
+hi def link     goBoolean           Boolean
 
 " Comments; their contents
 syn keyword     goTodo              contained TODO FIXME XXX BUG
@@ -141,9 +143,11 @@ hi def link     goEscapeError       Error
 syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
 syn region      goString            start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
 syn region      goRawString         start=+`+ end=+`+
+syn match       goFormatSpecifier   /%[#0\-\ \+\*]*[vTtbcdoqxXUeEfgGsp]/ contained containedin=goString
 
 hi def link     goString            String
 hi def link     goRawString         String
+hi def link 	goFormatSpecifier   goSpecialString
 
 " Characters; their contents
 syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
@@ -199,7 +203,7 @@ endif
 " Extra types commonly seen
 if g:go_highlight_extra_types != 0
   syn match goExtraType /\<bytes\.\(Buffer\)\>/
-  syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+  syn match goExtraType /\<io\.\(Reader\|ReadSeeker\|ReadWriter\|ReadCloser\|ReadWriteCloser\|Writer\|WriteCloser\|Seeker\)\>/
   syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
   syn match goExtraType /\<unsafe\.Pointer\>/
 endif
diff --git a/sources_non_forked/vim-multiple-cursors/.gitignore b/sources_non_forked/vim-multiple-cursors/.gitignore
new file mode 100644
index 00000000..0a56e3fc
--- /dev/null
+++ b/sources_non_forked/vim-multiple-cursors/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/sources_non_forked/vim-multiple-cursors/README.md b/sources_non_forked/vim-multiple-cursors/README.md
index 04da4c6b..b9844a5b 100644
--- a/sources_non_forked/vim-multiple-cursors/README.md
+++ b/sources_non_forked/vim-multiple-cursors/README.md
@@ -1,4 +1,10 @@
-# vim-multiple-cursors [![Build Status](https://travis-ci.org/terryma/vim-multiple-cursors.png)](https://travis-ci.org/terryma/vim-multiple-cursors)
+# vim-multiple-cursors [![Build Status](https://travis-ci.org/terryma/vim-multiple-cursors.svg)](https://travis-ci.org/terryma/vim-multiple-cursors)
+
+###Contributors
+- [eapache](https://github.com/eapache)
+- [aschrab](https://github.com/aschrab)
+- [kristijanhusak](https://github.com/kristijanhusak)
+- [faceleg](https://github.com/faceleg)
 
 ## About
 [There](https://github.com/paradigm/vim-multicursor) [have](https://github.com/felixr/vim-multiedit) [been](https://github.com/hlissner/vim-multiedit) [many](https://github.com/adinapoli/vim-markmultiple) [attempts](https://github.com/AndrewRadev/multichange.vim) at bringing Sublime Text's awesome [multiple selection][sublime-multiple-selection] feature into Vim, but none so far have been in my opinion a faithful port that is simplistic to use, yet powerful and intuitive enough for an existing Vim user. [vim-multiple-cursors] is yet another attempt at that.
@@ -20,7 +26,9 @@ To see what keystrokes are used for the above example, see [this issue](https://
 ## Features
 - Live update in Insert mode
 - One key to rule it all! See [Quick Start](#quick-start) on what the key does in different scenarios
-- Works in Normal, Insert, and Visual mode for SINGLE key command
+- Works in Normal, Insert, and Visual mode for any commands (including
+  multi-key commands, assuming you set `g:multicursor_insert_maps` and
+  `g:multicursor_normal_maps`; see Settings below for details)
 
 ## Installation
 Install using [Pathogen], [Vundle], [Neobundle], or your favorite Vim package manager.
@@ -36,7 +44,7 @@ Two additional keys are also mapped:
 - `Ctrl-p` in Visual mode will remove the current virtual cursor and go back to the previous virtual cursor location. This is useful if you are trigger happy with `Ctrl-n` and accidentally went too far.
 - `Ctrl-x` in Visual mode will remove the current virtual cursor and skip to the next virtual cursor location. This is useful if you don't want the current selection to be a candidate to operate on later.
 
-You can also add multiple cursors using a regular expression. The command `MultipleCursorsFind` accepts a range and a pattern, and it will create a virtual cursor at the end of every match within the range. If no range is passed in, then it defaults to the entire buffer.  
+You can also add multiple cursors using a regular expression. The command `MultipleCursorsFind` accepts a range and a pattern, and it will create a virtual cursor at the end of every match within the range. If no range is passed in, then it defaults to the entire buffer.
 
 **NOTE:** If at any time you have lingering cursors on screen, you can press `Ctrl-n` in Normal mode and it will remove all prior cursors before starting a new one.
 
@@ -61,14 +69,21 @@ By default, the 'next' key is also used to enter multicursor mode. If you want t
 let g:multi_cursor_start_key='<F6>'
 ```
 
-**IMPORTANT:** Please note that currently only single keystrokes and special keys can be mapped. This contraint is also the reason why multikey commands such as `ciw` do not work and cause unexpected behavior in Normal mode. This means that a mapping like `<Leader>n` will NOT work correctly. For a list of special keys that are supported, see `help :key-notation`
+Note that when multicursor mode is started, it selects current word without boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in Normal mode (as `*` does) but still have old behaviour up your sleeve, you can do the following:
+```
+let g:multi_cursor_start_key='g<C-n>'
+let g:multi_cursor_start_word_key='<C-n>'
+```
+In this configuration `<C-n>` will start multicursor mode using word boundaries (but only in Normal mode, as it does not make much sense to use it in Visual mode). Old behaviour without word boundaries is still available using `g<C-n>`.
+
+**IMPORTANT:** Please note that currently only single keystrokes and special keys can be mapped. This means that a mapping like `<Leader>n` will NOT work correctly. For a list of special keys that are supported, see `help :key-notation`
 
 **NOTE:** Please make sure to always map something to `g:multi_cursor_quit_key`, otherwise you'll have a tough time quitting from multicursor mode.
 
-**NOTE:** Prior to version 1.3, the recommended way to map the keys is using the expressoin quote syntax in Vim, using something like `"\<C-n>"` or `"\<Esc>"` (see h: expr-quote). After 1.3, the recommended way is to use a raw string like above. If your key mappings don't appear to work, give the new syntax a try.
+**NOTE:** Prior to version 1.3, the recommended way to map the keys is using the expression quote syntax in Vim, using something like `"\<C-n>"` or `"\<Esc>"` (see h: expr-quote). After 1.3, the recommended way is to use a raw string like above. If your key mappings don't appear to work, give the new syntax a try.
 
 ## Setting
-Currently there're two additional global settings one can tweak:
+Currently there're three additional global settings one can tweak:
 ### ```g:multi_cursor_exit_from_visual_mode``` (Default: 1)
 
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
@@ -76,6 +91,54 @@ If set to 0, then pressing `g:multi_cursor_quit_key` in _Visual_ mode will not q
 ### ```g:multi_cursor_exit_from_insert_mode``` (Default: 1)
 If set to 0, then pressing `g:multi_cursor_quit_key` in _Insert_ mode will not quit and delete all existing cursors. This is useful if you want to press Escape and go back to Normal mode, and still be able to operate on all the cursors.
 
+### ```g:multi_cursor_insert_maps``` (Default: `{}`)
+Any key in this map (values are ignored) will cause multi-cursor _Insert_ mode
+to pause for `timeoutlen` waiting for map completion just like normal vim.
+Otherwise keys mapped in insert mode are ignored when multiple cursors are
+active. For example, setting it to `{'\':1}` will make insert-mode mappings
+beginning with the default leader key work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys *start*
+mappings.
+
+### ```g:multi_cursor_normal_maps``` (Default: `{}`)
+Any key in this map (values are ignored) will cause multi-cursor _Normal_ mode
+to pause for map completion just like normal vim. Otherwise keys mapped in
+normal mode will "fail to replay" when multiple cursors are active. For example,
+setting it to `{'d':1}` will make normal-mode mappings beginning with `d` (such
+as `dw` to delete a word) work in multi-cursor mode. You have to
+manually set this because vim doesn't provide a way to see which keys *start*
+mappings; setting it to include motion commands like `j` can break things.
+
+### Interactions with other plugins
+
+### ```Multiple_cursors_before/Multiple_cursors_after``` (Default: `nothing`)
+
+Other plugins may trigger on keypresses when in insert mode. These plugins 
+generally provide a means to toggle their active state. These hooks allow
+the user to provide functions in their .vimrc to do this when multiple-cursor-mode 
+is entered.
+
+For example, if you are using [Neocomplete](https://github.com/Shougo/neocomplete.vim),
+add this to your vimrc to prevent conflict:
+
+```
+" Called once right before you start selecting multiple cursors
+function! Multiple_cursors_before()
+  if exists(':NeoCompleteLock')==2
+    exe 'NeoCompleteLock'
+  endif
+endfunction
+
+" Called once only when the multiple selection is canceled (default <Esc>)
+function! Multiple_cursors_after()
+  if exists(':NeoCompleteUnlock')==2
+    exe 'NeoCompleteUnlock'
+  endif
+endfunction
+```
+
+With this locking and unlocking we prevent neocomplete to trigger it's function calls until we are finished with multiple cursors editing.
+
 ### Highlight
 The plugin uses the highlight group `multiple_cursors_cursor` and `multiple_cursors_visual` to highlight the virtual cursors and their visual selections respectively. You can customize them by putting something similar like the following in your vimrc:
 
@@ -86,8 +149,6 @@ highlight link multiple_cursors_visual Visual
 ```
 
 ## Issues
-- Multi key commands like `ciw` do not work at the moment
-- All user input typed before Vim is able to fan out the last operation to all cursors is lost. This is a implementation decision to keep the input perfectly synced in all locations, at the cost of potentially losing user input.
 - Select mode is not implemented
 
 ## Changelog
diff --git a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
index 7cdae119..4543fce1 100644
--- a/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/autoload/multiple_cursors.vim
@@ -8,22 +8,23 @@
 " it to work the way we like. '<C-n>' is converted to '\<C-n>' by the end and
 " the global vars are replaced by their new value. This is ok since the mapping
 " using '<C-n>' should already have completed in the plugin file.
-for key in [ 'g:multi_cursor_next_key',
+for s:key in [ 'g:multi_cursor_next_key',
            \ 'g:multi_cursor_prev_key',
            \ 'g:multi_cursor_skip_key',
            \ 'g:multi_cursor_quit_key' ]
-  if exists(key)
+  if exists(s:key)
     " Translate raw strings like "<C-n>" into key code like "\<C-n>"
-    exec 'let temp = '.key
-    if temp =~ '^<.*>$'
-      exec 'let '.key.' = "\'.temp.'"' 
+    exec 'let s:temp = '.s:key
+    if s:temp =~ '^<.*>$'
+      exec 'let '.s:key.' = "\'.s:temp.'"'
     endif
   else
     " If the user didn't define it, initialize it to an empty string so the
     " logic later don't break
-    exec 'let '.key.' = ""'
+    exec 'let '.s:key.' = ""'
   endif
 endfor
+unlet! s:key s:temp
 
 " These keys will not be replicated at every cursor location. Make sure that
 " this assignment happens AFTER the key tweak setting above
@@ -38,6 +39,13 @@ let s:hi_group_cursor = 'multiple_cursors_cursor'
 " The highlight group we use for all the visual selection
 let s:hi_group_visual = 'multiple_cursors_visual'
 
+" Used for preventing multiple calls on before function
+let s:before_function_called = 0
+
+" Used for searching whole words (search pattern is wrapped with \< and \>)
+" Keep old behaviour by default (act like g*)
+let s:use_word_boundary = 0
+
 " Set up highlighting
 if !hlexists(s:hi_group_cursor)
   exec "highlight ".s:hi_group_cursor." term=reverse cterm=reverse gui=reverse"
@@ -50,28 +58,29 @@ endif
 " Internal Mappings
 "===============================================================================
 
-inoremap <silent> <Plug>(i) <C-o>:call <SID>process_user_input()<CR>
-nnoremap <silent> <Plug>(i) :call <SID>process_user_input()<CR>
-xnoremap <silent> <Plug>(i) :<C-u>call <SID>process_user_input()<CR>
+inoremap <silent> <Plug>(multiple-cursors-input) <C-o>:call <SID>process_user_input()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-input) :call <SID>process_user_input()<CR>
+xnoremap <silent> <Plug>(multiple-cursors-input) :<C-u>call <SID>process_user_input()<CR>
 
-inoremap <silent> <Plug>(a) <C-o>:call <SID>apply_user_input_next('i')<CR>
-nnoremap <silent> <Plug>(a) :call <SID>apply_user_input_next('n')<CR>
-xnoremap <silent> <Plug>(a) :<C-u>call <SID>apply_user_input_next('v')<CR>
+inoremap <silent> <Plug>(multiple-cursors-apply) <C-o>:call <SID>apply_user_input_next('i')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-apply) :call <SID>apply_user_input_next('n')<CR>
+xnoremap <silent> <Plug>(multiple-cursors-apply) :<C-u>call <SID>apply_user_input_next('v')<CR>
 
-inoremap <silent> <Plug>(d) <C-o>:call <SID>detect_bad_input()<CR>
-nnoremap <silent> <Plug>(d) :call <SID>detect_bad_input()<CR>
-xnoremap <silent> <Plug>(d) :<C-u>call <SID>detect_bad_input()<CR>
+inoremap <silent> <Plug>(multiple-cursors-detect) <C-o>:call <SID>detect_bad_input()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-detect) :call <SID>detect_bad_input()<CR>
+xnoremap <silent> <Plug>(multiple-cursors-detect) :<C-u>call <SID>detect_bad_input()<CR>
 
-inoremap <silent> <Plug>(w) <C-o>:call <SID>wait_for_user_input('')<CR>
-nnoremap <silent> <Plug>(w) :call <SID>wait_for_user_input('')<CR>
-xnoremap <silent> <Plug>(w) :<C-u>call <SID>wait_for_user_input('')<CR>
+inoremap <silent> <Plug>(multiple-cursors-wait) <C-o>:call <SID>wait_for_user_input('')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-wait) :call <SID>wait_for_user_input('')<CR>
+xnoremap <silent> <Plug>(multiple-cursors-wait) :<C-u>call <SID>wait_for_user_input('')<CR>
 
 " Note that although these mappings are seemingly triggerd from Visual mode,
 " they are in fact triggered from Normal mode. We quit visual mode to allow the
 " virtual highlighting to take over
-nnoremap <silent> <Plug>(p) :<C-u>call multiple_cursors#prev()<CR>
-nnoremap <silent> <Plug>(s) :<C-u>call multiple_cursors#skip()<CR>
-nnoremap <silent> <Plug>(n) :<C-u>call multiple_cursors#new('v')<CR>
+nnoremap <silent> <Plug>(multiple-cursors-prev) :<C-u>call multiple_cursors#prev()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-skip) :<C-u>call multiple_cursors#skip()<CR>
+nnoremap <silent> <Plug>(multiple-cursors-new) :<C-u>call multiple_cursors#new('v', 0)<CR>
+nnoremap <silent> <Plug>(multiple-cursors-new-word) :<C-u>call multiple_cursors#new('v', 1)<CR>
 
 "===============================================================================
 " Public Functions
@@ -95,7 +104,13 @@ endfunction
 " 3. In visual mode, if the visual selection covers a single line, a new cursor
 " is created at the end of the visual selection. Another cursor will be
 " attempted to be created at the next occurrence of the visual selection
-function! multiple_cursors#new(mode)
+function! multiple_cursors#new(mode, word_boundary)
+  " Call before function if exists only once until it is canceled (<Esc>)
+  if exists('*Multiple_cursors_before') && !s:before_function_called
+    exe "call Multiple_cursors_before()"
+    let s:before_function_called = 1
+  endif
+  let s:use_word_boundary = a:word_boundary
   if a:mode ==# 'n'
     " Reset all existing cursors, don't restore view and setting
     call s:cm.reset(0, 0)
@@ -238,6 +253,9 @@ function! s:Cursor.new(position)
   let obj.cursor_hi_id = s:highlight_cursor(a:position)
   let obj.visual_hi_id = 0
   let obj.line_length = col([a:position[0], '$'])
+  if has('folding')
+    silent! execute a:position[0] . "foldopen!"
+  endif
   return obj
 endfunction
 
@@ -328,7 +346,7 @@ function! s:CursorManager.new()
 endfunction
 
 " Clear all cursors and their highlights
-function! s:CursorManager.reset(restore_view, restore_setting) dict
+function! s:CursorManager.reset(restore_view, restore_setting, ...) dict
   if a:restore_view
     " Return the view back to the beginning
     if !empty(self.saved_winview)
@@ -361,6 +379,11 @@ function! s:CursorManager.reset(restore_view, restore_setting) dict
   if a:restore_setting
     call self.restore_user_settings()
   endif
+  " Call after function if exists and only if action is canceled (<Esc>)
+  if exists('*Multiple_cursors_after') && a:0 && s:before_function_called
+    exe "call Multiple_cursors_after()"
+    let s:before_function_called = 0
+  endif
 endfunction
 
 " Returns 0 if it's not managing any cursors at the moment
@@ -435,6 +458,8 @@ function! s:CursorManager.update_current() dict
     call cur.update_visual_selection(s:get_visual_region(s:pos('.')))
   elseif s:from_mode ==# 'v' || s:from_mode ==# 'V'
     call cur.remove_visual_selection()
+  elseif s:from_mode ==# 'i' && s:to_mode ==# 'n' && self.current_index == self.size() - 1
+    normal! `^
   endif
   let vdelta = line('$') - s:saved_linecount
   " If the total number of lines changed in the buffer, we need to potentially
@@ -628,6 +653,12 @@ endfunction
 " visual selection ended
 function! s:exit_visual_mode()
   exec "normal! \<Esc>gv\<Esc>"
+
+  " Call before function if exists only once until it is canceled (<Esc>)
+  if exists('*Multiple_cursors_before') && !s:before_function_called
+    exe "call Multiple_cursors_before()"
+    let s:before_function_called = 1
+  endif
 endfunction
 
 " Visually select input region, where region is an array containing the start
@@ -643,7 +674,7 @@ endfunction
 function! s:select_in_visual_mode(region)
   if a:region[0] == a:region[1]
     normal! v
-  else 
+  else
     call cursor(a:region[1])
     normal! m`
     call cursor(a:region[0])
@@ -660,7 +691,7 @@ endfunction
 function! s:update_visual_markers(region)
   if a:region[0] == a:region[1]
     normal! v
-  else 
+  else
     call cursor(a:region[1])
     normal! m`
     call cursor(a:region[0])
@@ -674,7 +705,11 @@ endfunction
 " Mode change: Normal -> Normal
 " Cursor change: Set to the end of the match
 function! s:find_next(text)
-  let pattern = '\V\C'.substitute(escape(a:text, '\'), '\n', '\\n', 'g')
+  let pattern = substitute(escape(a:text, '\'), '\n', '\\n', 'g')
+  if s:use_word_boundary == 1
+      let pattern = '\<'.pattern.'\>'
+  endif
+  let pattern = '\V\C'.pattern
   call search(pattern)
   let start = s:pos('.')
   call search(pattern, 'ce')
@@ -714,7 +749,7 @@ function! s:highlight_region(region)
       let pattern = s1.'\|'.s2
       " More than two lines
       if (s[1][0] - s[0][0] > 1)
-        let pattern = pattern.'\|\%>'.s[0][0].'l\%<'.s[1][0].'l.*\ze.\_$' 
+        let pattern = pattern.'\|\%>'.s[0][0].'l\%<'.s[1][0].'l.*\ze.\_$'
       endif
     endif
   endif
@@ -725,28 +760,31 @@ endfunction
 function! s:revert_mode(from, to)
   if a:to ==# 'v'
     call s:cm.reapply_visual_selection()
-  endif
-  if a:to ==# 'V'
+  elseif a:to ==# 'V'
     call s:cm.reapply_visual_selection()
     normal! V
-  endif
-  if a:to ==# 'n' && a:from ==# 'i'
+  elseif a:to ==# 'n' && a:from ==# 'i'
     stopinsert
   endif
 endfunction
 
 " Consume all the additional character the user typed between the last
 " getchar() and here, to avoid potential race condition.
-" TODO(terryma): This solves the problem of cursors getting out of sync, but
-" we're potentially losing user input. We COULD replay these characters as
-" well...
+let s:saved_keys = ""
 function! s:feedkeys(keys)
   while 1
     let c = getchar(0)
+    let char_type = type(c)
     " Checking type is important, when strings are compared with integers,
     " strings are always converted to ints, and all strings are equal to 0
-    if type(c) == 0 && c == 0
-      break
+    if char_type == 0
+      if c == 0
+        break
+      else
+        let s:saved_keys .= nr2char(c)
+      endif
+    elseif char_type == 1 " char with more than 8 bits (as string)
+      let s:saved_keys .= c
     endif
   endwhile
   call feedkeys(a:keys)
@@ -770,8 +808,8 @@ function! s:process_user_input()
 
   " Apply the user input. Note that the above could potentially change mode, we
   " use the mapping below to help us determine what the new mode is
-  " Note that it's possible that \<Plug>(a) never gets called, we have a
-  " detection mechanism using \<Plug>(d). See its documentation for more details
+  " Note that it's possible that \<Plug>(multiple-cursors-apply) never gets called, we have a
+  " detection mechanism using \<Plug>(multiple-cursors-detect). See its documentation for more details
 
   " Assume that input is not valid
   let s:valid_input = 0
@@ -781,14 +819,14 @@ function! s:process_user_input()
   " FIXME(terryma): Undo always places the cursor at the beginning of the line.
   " Figure out why.
   if s:from_mode ==# 'i' || s:to_mode ==# 'i'
-    silent! undojoin | call s:feedkeys(s:char."\<Plug>(a)")
+    silent! undojoin | call s:feedkeys(s:char."\<Plug>(multiple-cursors-apply)")
   else
-    call s:feedkeys(s:char."\<Plug>(a)")
+    call s:feedkeys(s:char."\<Plug>(multiple-cursors-apply)")
   endif
-  
+
   " Even when s:char produces invalid input, this method is always called. The
   " 't' here is important
-  call feedkeys("\<Plug>(d)", 't')
+  call feedkeys("\<Plug>(multiple-cursors-detect)", 't')
 endfunction
 
 " This method is always called during fanout, even when a bad user input causes
@@ -797,7 +835,7 @@ endfunction
 function! s:detect_bad_input()
   if !s:valid_input
     " We ignore the bad input and force invoke s:apply_user_input_next
-    call feedkeys("\<Plug>(a)")
+    call feedkeys("\<Plug>(multiple-cursors-apply)")
     let s:bad_input += 1
   endif
 endfunction
@@ -828,10 +866,10 @@ function! s:apply_user_input_next(mode)
       " This is necessary to set the "'<" and "'>" markers properly
       call s:update_visual_markers(s:cm.get_current().visual)
     endif
-    call feedkeys("\<Plug>(w)")
+    call feedkeys("\<Plug>(multiple-cursors-wait)")
   else
     " Continue to next
-    call feedkeys("\<Plug>(i)")
+    call feedkeys("\<Plug>(multiple-cursors-input)")
   endif
 endfunction
 
@@ -873,7 +911,7 @@ endfunction
 " Quits multicursor mode and clears all cursors. Return true if exited
 " successfully.
 function! s:exit()
-  if s:char !=# g:multi_cursor_quit_key
+  if s:last_char() !=# g:multi_cursor_quit_key
     return 0
   endif
   let exit = 0
@@ -887,7 +925,7 @@ function! s:exit()
     let exit = 1
   endif
   if exit
-    call s:cm.reset(1, 1)
+    call s:cm.reset(1, 1, 1)
     return 1
   endif
   return 0
@@ -902,11 +940,15 @@ function! s:handle_special_key(key, mode)
   " increasing the call stack, since feedkeys execute after the current call
   " finishes
   if a:key == g:multi_cursor_next_key
-    call s:feedkeys("\<Plug>(n)")
+    if s:use_word_boundary == 1
+      call s:feedkeys("\<Plug>(multiple-cursors-new-word)")
+    else
+      call s:feedkeys("\<Plug>(multiple-cursors-new)")
+    endif
   elseif a:key == g:multi_cursor_prev_key
-    call s:feedkeys("\<Plug>(p)")
+    call s:feedkeys("\<Plug>(multiple-cursors-prev)")
   elseif a:key == g:multi_cursor_skip_key
-    call s:feedkeys("\<Plug>(s)")
+    call s:feedkeys("\<Plug>(multiple-cursors-skip)")
   endif
 endfunction
 
@@ -941,12 +983,20 @@ function! s:revert_highlight_fix()
   let s:saved_line = 0
 endfunction
 
+let s:retry_keys = ""
 function! s:display_error()
-  if s:bad_input > 0
-    echohl ErrorMsg |
-          \ echo "Key '".s:char."' cannot be replayed at ".
-          \ s:bad_input." cursor location".(s:bad_input == 1 ? '' : 's') |
-          \ echohl Normal
+  if s:bad_input == s:cm.size() && has_key(g:multi_cursor_normal_maps, s:char[0])
+    " we couldn't replay it anywhere but we're told it's the beginning of a
+    " multi-character map like the `d` in `dw`
+    let s:retry_keys = s:char
+  else
+    let s:retry_keys = ""
+    if s:bad_input > 0
+      echohl ErrorMsg |
+            \ echo "Key '".s:char."' cannot be replayed at ".
+            \ s:bad_input." cursor location".(s:bad_input == 1 ? '' : 's') |
+            \ echohl Normal
+    endif
   endif
   let s:bad_input = 0
 endfunction
@@ -982,6 +1032,10 @@ function! s:end_latency_measure()
   let s:skip_latency_measure = 0
 endfunction
 
+function! s:last_char()
+  return s:char[len(s:char)-1]
+endfunction
+
 function! s:wait_for_user_input(mode)
   let s:from_mode = a:mode
   if empty(a:mode)
@@ -1001,7 +1055,38 @@ function! s:wait_for_user_input(mode)
 
   call s:end_latency_measure()
 
-  let s:char = s:get_char()
+  let s:char = s:retry_keys . s:saved_keys
+  if len(s:saved_keys) == 0
+    let s:char .= s:get_char()
+  else
+    let s:saved_keys = ""
+  endif
+
+  if s:from_mode ==# 'i' && has_key(g:multi_cursor_insert_maps, s:last_char())
+    let c = getchar(0)
+    let char_type = type(c)
+    let poll_count = 0
+    while char_type == 0 && c == 0 && poll_count < &timeoutlen
+      sleep 1m
+      let c = getchar(0)
+      let char_type = type(c)
+      let poll_count += 1
+    endwhile
+
+    if char_type == 0 && c != 0
+      let s:char .= nr2char(c)
+    elseif char_type == 1 " char with more than 8 bits (as string)
+      let s:char .= c
+    endif
+  elseif s:from_mode !=# 'i' && s:char[0] ==# ":"
+    call feedkeys(s:char)
+    call s:cm.reset(1, 1)
+    return
+  elseif s:from_mode ==# 'n'
+    while match(s:last_char(), "\\d") == 0
+      let s:char .= s:get_char()
+    endwhile
+  endif
 
   call s:start_latency_measure()
 
@@ -1013,11 +1098,11 @@ function! s:wait_for_user_input(mode)
   endif
 
   " If the key is a special key and we're in the right mode, handle it
-  if index(get(s:special_keys, s:from_mode, []), s:char) != -1
-    call s:handle_special_key(s:char, s:from_mode)
+  if index(get(s:special_keys, s:from_mode, []), s:last_char()) != -1
+    call s:handle_special_key(s:last_char(), s:from_mode)
     call s:skip_latency_measure()
   else
     call s:cm.start_loop()
-    call s:feedkeys("\<Plug>(i)")
+    call s:feedkeys("\<Plug>(multiple-cursors-input)")
   endif
 endfunction
diff --git a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
index a1de56e5..7c5237c0 100644
--- a/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
+++ b/sources_non_forked/vim-multiple-cursors/doc/multiple_cursors.txt
@@ -108,6 +108,21 @@ mode than for selecting the next location, do like the following: >
     let g:multi_cursor_start_key='<F6>'
 <
 
+*g:multi_cursor_start_word_key*
+When multicursor mode is started, it selects current word without
+boundaries, i.e. it behavies like `g*`. If you want to use word boundaries in
+Normal mode (as `*` does) but still have old behaviour up your sleeve, you can
+do the following: >
+
+    let g:multi_cursor_start_key='g<C-n>'
+    let g:multi_cursor_start_word_key='<C-n>'
+<
+
+In this configuration <C-n> will start multicursor mode using word boundaries
+(but only in Normal mode, as it does not make much sense to use it in Visual
+mode). Old behaviour without word boundaries is still available using
+g<C-n>.
+
 IMPORTANT: Please note that currently only single keystroes and special
 keys can be mapped. This contraint is also the reason why multikey commands
 such as `ciw` do not work and cause unexpected behavior in Normal mode. This
diff --git a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim b/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
index d8b83471..9a7be377 100644
--- a/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
+++ b/sources_non_forked/vim-multiple-cursors/plugin/multiple_cursors.vim
@@ -33,6 +33,9 @@ let s:settings = {
       \ 'debug_latency': 0,
       \ }
 
+let g:multi_cursor_insert_maps = get(g:, 'multi_cursor_insert_maps', {})
+let g:multi_cursor_normal_maps = get(g:, 'multi_cursor_normal_maps', {})
+
 let s:settings_if_default = {
       \ 'quit_key': '<Esc>',
       \ 'next_key': '<C-n>',
@@ -53,9 +56,17 @@ endif
 " External mappings
 if exists('g:multi_cursor_start_key')
   exec 'nnoremap <silent> '.g:multi_cursor_start_key.
-        \' :call multiple_cursors#new("n")<CR>'
+        \' :call multiple_cursors#new("n", 0)<CR>'
   exec 'xnoremap <silent> '.g:multi_cursor_start_key.
-        \' :<C-u>call multiple_cursors#new("v")<CR>'
+        \' :<C-u>call multiple_cursors#new("v", 0)<CR>'
+endif
+
+if exists('g:multi_cursor_start_word_key')
+  exec 'nnoremap <silent> '.g:multi_cursor_start_word_key.
+        \' :call multiple_cursors#new("n", 1)<CR>'
+  " In Visual mode word boundary is not used
+  exec 'xnoremap <silent> '.g:multi_cursor_start_word_key.
+        \' :<C-u>call multiple_cursors#new("v", 0)<CR>'
 endif
 
 " Commands
diff --git a/sources_non_forked/vim-repeat/autoload/repeat.vim b/sources_non_forked/vim-repeat/autoload/repeat.vim
index 18b12800..6acb48ee 100644
--- a/sources_non_forked/vim-repeat/autoload/repeat.vim
+++ b/sources_non_forked/vim-repeat/autoload/repeat.vim
@@ -55,6 +55,7 @@ let g:repeat_reg = ['', '']
 " Special function to avoid spurious repeats in a related, naturally repeating
 " mapping when your repeatable mapping doesn't increase b:changedtick.
 function! repeat#invalidate()
+    autocmd! repeat_custom_motion
     let g:repeat_tick = -1
 endfunction
 
@@ -97,7 +98,7 @@ endfunction
 
 function! repeat#wrap(command,count)
     let preserve = (g:repeat_tick == b:changedtick)
-    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo' ? 'zv' : '')
+    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo\|all' ? 'zv' : '')
     if preserve
         let g:repeat_tick = b:changedtick
     endif
diff --git a/sources_non_forked/vim-snipmate/autoload/snipMate.vim b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
index 15d4c300..38ff530d 100644
--- a/sources_non_forked/vim-snipmate/autoload/snipMate.vim
+++ b/sources_non_forked/vim-snipmate/autoload/snipMate.vim
@@ -106,12 +106,13 @@ fun! s:ProcessSnippet(snip)
 	let esc_bslash = '\%(\\\@<!\%(\\\\\)*\)\@<='
 
 	if exists('b:snipmate_content_visual')
-		let visual = b:snipmate_content_visual
+		let visual = substitute(b:snipmate_content_visual, "\n$", '', '')
 		unlet b:snipmate_content_visual
 	else
 		let visual = ''
 	endif
-	let snippet = substitute(snippet,'{VISUAL}', escape(visual,'%\'), 'g')
+	let snippet = substitute(snippet, '\n\(\t\+\).\{-\}\zs{VISUAL}',
+				\ substitute(escape(visual, '%\'), "\n", "\n\\\\1", 'g'), 'g')
 
 	" Evaluate eval (`...`) expressions.
 	" Backquotes prefixed with a backslash "\" are ignored.
diff --git a/sources_non_forked/vim-snippets/README.md b/sources_non_forked/vim-snippets/README.md
index bc9dd691..46cc3905 100644
--- a/sources_non_forked/vim-snippets/README.md
+++ b/sources_non_forked/vim-snippets/README.md
@@ -205,15 +205,17 @@ to maintain snippets for a language, please get in touch.
 Notes: People are interested in snippets - and their interest may wane again.
 This list is kept up-to-date on a best effort basis.
 
-* Python - [honza](http://github.com/honza)
-* Javascript - [honza](http://github.com/honza)
-* HTML Django - [honza](http://github.com/honza)
-* Markdown - [honza](http://github.com/honza)
-* Ruby - [taq](http://github.com/taq)
-* PHP - [chrisyue](http://github.com/chrisyue)
-* Scala - [gorodinskiy](https://github.com/gorodinskiy)
-* Falcon - [steveno](https://github.com/steveno)
+* Clojure - [lpil](https://github.com/lpil)
 * Elixir - [iurifq](https://github.com/iurifq)
+* Falcon - [steveno](https://github.com/steveno)
+* HTML Django - [honza](http://github.com/honza)
+* Javascript - [honza](http://github.com/honza)
+* Markdown - [honza](http://github.com/honza)
+* PHP - [chrisyue](http://github.com/chrisyue)
+* Python - [honza](http://github.com/honza)
+* Ruby - [taq](http://github.com/taq)
+* Rust - [lpil](https://github.com/lpil)
+* Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 License
 -------
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ada.snippets b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
index d33c7778..cc35c2c2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ada.snippets
@@ -11,10 +11,6 @@ def ada_case(word):
 			out = out + word[i]
 	return out
 
-def get_year():
-	import time
-	return time.strftime("%Y")
-
 endglobal
 
 snippet wi "with"
@@ -281,44 +277,4 @@ snippet newline "Ada.Text_IO.New_Line"
 Ada.Text_IO.New_Line(${1:1});$0
 endsnippet
 
-snippet gpl "GPL license header"
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU ${1}General Public License as published by
--- the Free Software Foundation; either version ${2:3} of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU $1General Public License for more details.
---
--- You should have received a copy of the GNU $1General Public License
--- along with this program; if not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${3:Author}, ${4:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
-snippet gplf "GPL file license header"
--- This file is part of ${1:Program-Name}.
--- 
--- $1 is free software: you can redistribute it and/or modify
--- it under the terms of the GNU ${2}General Public License as published by
--- the Free Software Foundation, either version ${3:3} of the License, or
--- (at your option) any later version.
--- 
--- $1 is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU $2General Public License for more details.
--- 
--- You should have received a copy of the GNU $2General Public License
--- along with $1. If not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${4:Author}, ${5:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/all.snippets b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
index f816ba40..e33d2c51 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/all.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/all.snippets
@@ -78,10 +78,12 @@ endglobal
 snippet box "A nice box with the current comment symbol" b
 `!p
 box = make_box(len(t[1]))
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]))
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 
@@ -89,10 +91,12 @@ snippet bbox "A nice box over the full width" b
 `!p
 width = int(vim.eval("&textwidth")) or 71
 box = make_box(len(t[1]), width)
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]), width)
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 
diff --git a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
index ae58c9f2..171f08c8 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/eruby.snippets
@@ -44,66 +44,13 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 endsnippet
 
 snippet ft "form_tag"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${5:update}'}${6:, {:${8:class} => '${9:form}'\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet end "end (ERB)"
-<% end -%>
-endsnippet
-
-snippet for "for loop (ERB)"
-<% if !${1:list}.blank? %>
-	<% for ${2:item} in ${1} %>
-		$3
-	<% end %>
-<% else %>
-	$4
-<% end %>
-
-endsnippet
-
-snippet ffcb "form_for check_box"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffff "form_for file_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffhf "form_for hidden_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffl "form_for label 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffpf "form_for password_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffrb "form_for radio_box 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
 snippet ffs "form_for submit 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffta "form_for text_area 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet fftf "form_for text_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet fields "fields_for"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-	$0
-`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f_fields_for (nff)"
@@ -279,10 +226,6 @@ snippet else "else (ERB)"
 	$0
 endsnippet
 
-snippet if "if (ERB)"
-<% if ${1:condition} %>$0
-endsnippet
-
 snippet lf "link_to_function"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to_function ${1:"${2:Greeting}"}, "${3:alert('Hello world!')}"$4`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/html.snippets b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
index 079db914..674985c7 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/html.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/html.snippets
@@ -191,7 +191,7 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 endsnippet
 
 snippet h1 "XHTML <h1>" w
-<h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
+<h1>$0</h1>
 endsnippet
 
 snippet head "XHTML <head>"
@@ -287,22 +287,4 @@ snippet movie "Embed QT movie (movie)" b
 	`!p x(snip)`>
 </object>
 endsnippet
-
-snippet html5 "HTML5 Template"
-<!DOCTYPE html>
-<html>
-<head>
-	<title>${1}</title>
-	<meta charset="utf-8" />
-</head>
-<body>
-	<header>
-		${2}
-	</header>
-	<footer>
-		${4}
-	</footer>
-</body>
-</html>
-endsnippet
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
index 5889e059..6c177bc1 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript.snippets
@@ -52,27 +52,18 @@ function ${1:function_name}(${2:argument}) {
 }
 endsnippet
 
+snippet vf "Function assigned to var"
+${1:var }${2:function_name} = function $2(${3}) {
+	${VISUAL}$0
+};
+endsnippet
+
 snippet iife "Immediately-Invoked Function Expression (iife)"
 (function (${1:argument}) {
 	${VISUAL}$0
 }(${2:$1}));
 endsnippet
 
-snippet ife "if ___ else"
-if (${1:condition}) {
-	${2://code}
-}
-else {
-	${3://code}
-}
-endsnippet
-
-snippet if "if"
-if (${1:condition}) {
-	${VISUAL}$0
-}
-endsnippet
-
 snippet timeout "setTimeout function"
 setTimeout(function() {
 	${VISUAL}$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
index 61b52293..91b59316 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/javascript_angular.snippets
@@ -19,49 +19,59 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+controller('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aconts "angular controller with scope" i
-controller('${1:name}', ['$scope', function($scope) {
+controller('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet adir "angular directive" i
-directive('${1:name}', ['${2:param_annotation}', function(${3:param}) {
-	$0
+directive('${1}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			${0}
+		}
+	};
 }]);
 endsnippet
 
 snippet adirs "angular directive with scope" i
-directive('${1:name}', ['$scope', function($scope) {
-	$0
+directive('${1}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			${0}
+		}
+	};
 }]);
 endsnippet
 
 snippet afact "angular factory" i
-factory('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+factory('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet afacts "angular factory with scope" i
-factory('${1:name}', ['$scope', function($scope) {
+factory('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aserv "angular service" i
-service('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+service('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aservs "angular service" i
-service('${1:name}', ['$scope', function($scope) {
+service('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
new file mode 100644
index 00000000..9f817a8d
--- /dev/null
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_laravel.snippets
@@ -0,0 +1,260 @@
+#resource controller
+snippet l_rsc "Laravel resource controller" b
+/*!
+ * \class       ${1:`!v expand('%:t:r')`}
+ *
+ * \author      ${2:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+class $1 {
+    public function index() {
+        ${3}
+    }
+    
+    public function create() {
+        ${4}
+    }
+    
+    public function store($id) {
+        ${5}
+    }
+    
+    public function show($id) {
+        ${6}
+    }
+    
+    public function edit($id) {
+        ${7}
+    }
+    
+    public function update($id) {
+        ${8}
+    }
+    
+    public function destroy($id) {
+        ${9}
+    }
+}
+endsnippet
+
+#service service provider
+snippet l_ssp "Laravel service provider for service" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Support\ServiceProvider;
+
+class $2 extends ServiceProvider {
+    
+    public function register() {
+        $this->app->bind('${4}Service', function ($app) {
+            return new ${5}(
+                $app->make('Repositories\\${6}Interface')
+            );
+        });
+    }
+}
+endsnippet
+
+#repository service provider
+snippet l_rsp "Laravel service provider for repository" b
+/*!
+ * \namespace   ${2:Repositories\\${1:}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $2;
+
+use Entities\\$1;
+use $2\\$1Repository;
+use Illuminate\Support\ServiceProvider;
+
+class $3 extends ServiceProvider {
+    /*!
+     * \var     defer
+     * \brief   Defer service
+     */
+    protected $defer = ${5:true};
+
+    public function register() {
+        $this->app->bind('$2\\$1Interface', function($app) {
+            return new $1Repository(new $1());
+        });
+    }
+
+    /*!
+     * \brief   If $defer == true need this fn
+     */ 
+    public function provides() {
+        return ['$2\\$1Interface'];
+    }
+}
+endsnippet
+
+#model
+snippet l_md "Laravel simple model" b
+/*!
+ * \namespace   ${1:Entities}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $2 extends \Eloquent {
+    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+    public $timestamps = '${5:false}';
+
+    protected $hidden  = array(${6});
+
+    protected $guarded = array(${7:'id'});
+}
+endsnippet
+
+#abstract repository
+snippet l_ar "Laravel abstract Repository" b
+/*!
+ * \namespace   ${1:Repositories}
+ * \class       ${2:`!v expand('%:t:r')`}
+ * \implements  ${3:BaseRepositoryInterface}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class $2 implements $3 {
+    protected $model;
+
+    /*!
+     * \fn      __construct
+     *
+     * \brief   Take the model
+     */
+
+    public function __construct(Model $model) {
+        $this->model = $model;
+    }
+
+    /*!
+     * \fn      all
+     *
+     * \return  Illuminate\Database\Eloquent\Collection
+     */
+    public function all($columns = array('*')) {
+        return $this->model->all()->toArray();
+    }
+
+    /*!
+     * \fn      create
+     *
+     * \return  Illuminate\Database\Eloquent\Model
+     */
+    public function create(array $attributes) {
+        return $this->model->create($attributes);
+    }
+
+    /*!
+     * \fn      destroy
+     *
+     * \return  int
+     */
+    public function destroy($ids) {
+        return $this->model->destroy($ids);
+    }
+
+    /*!
+     * \fn      find
+     *
+     * \return  mixed
+     */
+    public function find($id, $columns = array('*')) {
+        return $this->model->find($id, $columns);
+    }
+}
+endsnippet
+
+#repository
+snippet l_r "Laravel Repository" b
+/*!
+ * \namespace   ${1:Repositories\\${2}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ * \implements  ${4:BaseRepositoryInterface}
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $3 extends \\$1 implements $4 {
+    ${6}
+}
+endsnippet
+
+#service
+snippet l_s "Laravel Service" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use ${4:Repositories\\${5:Interface}};
+
+class $2 {
+    protected $${6:repo};
+    
+    /*!
+     * \fn      __construct
+     */
+    public function __construct($5 $repo) {
+        $this->$6 = $repo;
+    }
+}
+endsnippet
+
+#facade
+snippet l_f "Laravel Facade" b
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use \Illuminate\Support\Facades\Facade;
+
+class $2 extends Facade {
+    /*!
+     * \fn          getFacadeAccessor
+     *
+     * \return      string
+     */
+    protected static function getFacadeAccessor() { return '${5:${4}Service}'; }
+}
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
index 1a310a19..e928bb1e 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/php_phpunit.snippets
@@ -30,3 +30,9 @@ expects($this->${1:once}())
 	->with($this->equalTo(${3})${4})
 	->will($this->returnValue(${5}));
 endsnippet
+
+snippet testcmt "phpunit comment with group" b
+/**
+* @group ${1}
+*/
+endsnippet
diff --git a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
index 09a114f6..6114cfaf 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/ruby.snippets
@@ -5,267 +5,135 @@ snippet "^#!" "#!/usr/bin/env ruby" r
 $0
 endsnippet
 
-
 snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 # encoding: UTF-8
 $0
 endsnippet
 
-
-
-snippet If "<command> if <expression>"
-${1:command} if ${0:expression}
-endsnippet
-
-
-
-snippet Unless "<command> unless <expression>"
-${1:command} unless ${0:expression}
-endsnippet
-
-
-
-snippet if "if <condition> ... end"
-if ${1:condition}
-	${2:# TODO}
-end
-endsnippet
-
-
-
-snippet ife "if <condition> ... else ... end"
-if ${1:condition}
-	${2:# TODO}
-else
-	${3:# TODO}
-end
-endsnippet
-
-
-
-snippet ifee "if <condition> ... elseif <condition> ... else ... end"
-if ${1:condition}
-	${2:# TODO}
-elsif ${3:condition}
-	${4:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unless "unless <condition> ... end"
-unless ${1:condition}
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unlesse "unless <condition> ... else ... end"
-unless ${1:condition}
-	${2:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
-snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
-unless ${1:condition}
-	${2:# TODO}
-elsif ${3:condition}
-	${4:# TODO}
-else
-	${0:# TODO}
-end
-endsnippet
-
-
-
 snippet "\b(de)?f" "def <name>..." r
-def ${1:function_name}${2: ${3:*args}}
-	${0:# TODO}
+def ${1:function_name}${2:(${3:*args})}
+	$0
 end
 endsnippet
 
-
-
 snippet defi "def initialize ..."
-def initialize${1: ${2:*args}}
-	${0:# TODO}
+def initialize${1:(${2:*args})}
+	$0
 end
 endsnippet
 
-
-
 snippet defr "def <name> ... rescue ..."
-def ${1:function_name}${2: ${3:*args}}
-	${4:# TODO}
+def ${1:function_name}${2:(${3:*args})}
+	$4
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+(${1:from}..${2:to}).each { |${3:i}| $0 }
 endsnippet
 
-
-
-snippet for "(<from>..<to>).each do |<i>| <block> end"
-(${1:from}..${2:to}).each do |${3:i}|
-	${0:# TODO}
-end
-endsnippet
-
-
-
 snippet "(\S+)\.Merge!" ".merge!(<other_hash>) { |<key>,<oldval>,<newval>| <block> }" r
 `!p snip.rv=match.group(1)`.merge!(${1:other_hash}) { |${2:key},${3:oldval},${4:newval}| ${5:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.merge!" ".merge!(<other_hash>) do |<key>,<oldval>,<newval>| <block> end" r
 `!p snip.rv=match.group(1)`.merge!(${1:other_hash}) do |${2:key},${3:oldval},${4:newval}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Select" ".select { |<item>| <block>}" r
 `!p snip.rv=match.group(1)`.select { |${1:item}| ${2:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.select" ".select do |<item>| <block> end" r
 `!p snip.rv=match.group(1)`.select do |${1:item}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
 `!p snip.rv=match.group(1)`.each_key do |${1:key}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_value do |${1:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
-snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+snippet "(\S+)\.ea" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each { |${1:e}| $0 }
 endsnippet
 
-
-
-snippet each "<elements>.each do |<element>| <block> end"
-${1:elements}.each do |${2:${1/s$//}}|
-	${0:# TODO}
+snippet "(\S+)\.ead" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each do |${1:e}|
+	$0
 end
 endsnippet
 
-
-
 snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
 ${1:elements}.each_slice(${2:2}) do |${3:slice}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
-${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
+${1:elements}.each_slice(${2:2}) { |${3:slice}| $0 }
 endsnippet
 
-
-
-
 snippet "(\S+)\.Map" ".map { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.map { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -275,11 +143,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.map" ".map do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.map do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -290,12 +156,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Rev(erse)?_?each" ".reverse_each { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.reverse_each { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -305,11 +169,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.rev(erse)?_?each" ".reverse_each do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.reverse_each do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -320,12 +182,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each" ".each { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.each { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -335,11 +195,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each" ".each do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.each do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -350,13 +208,10 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
-
 snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
 `!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -366,11 +221,9 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3:# TODO} }$0
+`},${2:i}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
 `!p snip.rv=match.group(1)`.each_with_index do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -381,128 +234,94 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
-
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| $0 }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet "(\S+)\.sub" ".sub(<expression>) { <block> }" r
 `!p snip.rv=match.group(1)`.sub(${1:expression}) { ${2:"replace_with"} }
 endsnippet
 
-
-
 snippet "(\S+)\.gsub" ".gsub(<expression>) { <block> }" r
 `!p snip.rv=match.group(1)`.gsub(${1:expression}) { ${2:"replace_with"} }
 endsnippet
 
-
-
 snippet "(\S+)\.index" ".index { |item| <block> }" r
 `!p snip.rv=match.group(1)`.index { |${1:item}| ${2:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.Index" ".index do |item| ... end" r
 `!p snip.rv=match.group(1)`.index do |${1:item}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet do "do |<key>| ... end" i
 do |${1:args}|
 	$0
 end
 endsnippet
 
-
-
 snippet Do "do ... end" i
 do
 	$0
 end
 endsnippet
 
-
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet Until "begin ... end until <expression>"
 begin
-	${0:# TODO}
+	$0
 end until ${1:expression}
 endsnippet
 
-
-
 snippet while "while <expression> ... end"
 while ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet While "begin ... end while <expression>"
 begin
-	${0:# TODO}
+	$0
 end while ${1:expression}
 endsnippet
 
-
-
 snippet "\b(r|attr)" "attr_reader :<attr_names>" r
 attr_reader :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(w|attr)" "attr_writer :<attr_names>" r
 attr_writer :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(rw|attr)" "attr_accessor :<attr_names>" r
 attr_accessor :${0:attr_names}
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... end"
 begin
-	${1:# TODO}
+	$1
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... else ... ensure ... end"
 begin
 	${1:# Raise exception}
@@ -517,8 +336,6 @@ ensure
 end
 endsnippet
 
-
-
 snippet rescue
 rescue Exception => e
 	puts e.message
@@ -526,8 +343,6 @@ rescue Exception => e
 	${0:# Rescue}
 endsnippet
 
-
-
 snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
 case ${1:variable}
 when ${2:expression}
@@ -535,32 +350,24 @@ $0
 end
 endsnippet
 
-
-
 snippet alias "alias :<new_name> :<old_name>"
 alias :${1:new_name} :${2:old_name}
 endsnippet
 
-
-
 snippet class "class <class_name> def initialize ... end end"
 class ${1:class_name}
-	def initialize ${2:*args}
+	def initialize(${2:*args})
 		$0
 	end
 end
 endsnippet
 
-
-
 snippet module "module"
 module ${1:module_name}
 	$0
 end
 endsnippet
 
-
-
 snippet ###
 =begin
 	$0
diff --git a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
index 82a1abb8..ddb948f2 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/rust.snippets
@@ -10,43 +10,6 @@ fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 }
 endsnippet
 
-snippet test "Test function" b
-#[test]
-fn ${1:test_function_name}() {
-	${VISUAL}${0}
-}
-endsnippet
-
-
-snippet bench "Bench function" b
-#[bench]
-fn ${1:bench_function_name}(b: &mut test::Bencher) {
-	b.iter(|| {
-		${VISUAL}${0}
-	})
-}
-endsnippet
-
-snippet new "A new function" b
-pub fn new(${2}) -> ${1:Name} {
-	${VISUAL}${0}return $1 { ${3} };
-}
-endsnippet
-
-snippet main "The main function" b
-pub fn main() {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet let "A let statement" b
-let ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
-snippet lmut "let mut = .." b
-let mut ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
 snippet pri "print!(..)" b
 print!("${1}"${2/..*/, /}${2});
 endsnippet
@@ -67,130 +30,22 @@ macro_rules! ${1:name} (
 )
 endsnippet
 
-snippet ec "extern crate ..." b
-extern crate ${1:sync};
-endsnippet
-
-snippet ecl "...extern crate log;" b
-#![feature(phase)]
-#[phase(plugin, link)] extern crate log;
-endsnippet
-
 snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet crate "Create header information" b
-// Crate name
-#![crate_name = "${1:crate_name}"]
-
-// Additional metadata attributes
-#![desc = "${2:Descrption.}"]
-#![license = "${3:BSD}"]
-#![comment = "${4:Comment.}"]
-
-// Specify the output type
-#![crate_type = "${5:lib}"]
-endsnippet
-
-snippet allow "#[allow(..)]" b
-#[allow(${1:unused_variable})]
-endsnippet
-
-snippet feat "#![feature(..)]" b
-#![feature(${1:macro_rules})]
-endsnippet
-
-snippet der "#[deriving(..)]" b
-#[deriving(${1:Show})]
-endsnippet
-
-snippet attr "#[..]" b
-#[${1:inline}]
-endsnippet
-
-snippet opt "Option<..>"
-Option<${1:int}>
-endsnippet
-
-snippet res "Result<.., ..>"
-Result<${1:int}, ${2:()}>
-endsnippet
-
-snippet if "if .. (if)" b
-if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet el "else .. (el)"
-else {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet eli "else if .. (eli)"
-else if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ife "if .. else (ife)"
-if ${1} {
-	${2}
-} else {
-	${3}
-}
-endsnippet
-
-snippet mat "match"
-match ${1} {
-	${2} => ${3},
-}
-endsnippet
-
-snippet loop "loop {}" b
-loop {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet while "while .. {}" b
-while ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
 snippet for "for .. in .." b
-for ${1:i} in ${2:range(0u, 10)} {
+for ${1:i} in ${2:${3:0us}..${4:10}} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet spawn "spawn(proc() { .. });" b
-spawn(proc() {
-	${VISUAL}${0}
-});
-endsnippet
-
-snippet chan "A channel" b
-let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
-endsnippet
-
-snippet duplex "Duplex stream" b
-let (${1:from_child}, ${2:to_child}) = sync::duplex();
-endsnippet
-
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
-snippet fixme "FIXME comment"
-// FIXME: ${1}
-endsnippet
-
 snippet st "Struct" b
 struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 	${VISUAL}${0}
@@ -211,42 +66,4 @@ impl $1 {
 }
 endsnippet
 
-snippet enum "An enum" b
-enum ${1:Name} {
-	${VISUAL}${0},
-}
-endsnippet
-
-snippet type "A type" b
-type ${1:NewName} = ${VISUAL}${0};
-endsnippet
-
-snippet imp "An impl" b
-impl ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet drop "Drop implementation" b
-impl Drop for ${1:Name} {
-	fn drop(&mut self) {
-		${VISUAL}${0}
-	}
-}
-endsnippet
-
-snippet trait "Trait definition" b
-trait ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ss "A static string."
-static ${1}: &'static str = "${VISUAL}${0}";
-endsnippet
-
-snippet stat "A static variable."
-static ${1}: ${2:uint} = ${VISUAL}${0};
-endsnippet
-
 # vim:ft=snippets:
diff --git a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
index 406948c4..4c7e44b4 100644
--- a/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
+++ b/sources_non_forked/vim-snippets/UltiSnips/tex.snippets
@@ -14,6 +14,17 @@ $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
+snippet table "Table environment" b
+\begin{table}[${1:htpb}]
+	\centering
+	\caption{${2:caption}}
+	\label{tab:${3:label}}
+	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
+	$0${5/((?<=.)c|l|r)|./(?1: & )/g}
+	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+\end{table}
+endsnippet
+
 snippet fig "Figure environment" b
 \begin{figure}[${2:htpb}]
 	\centering
diff --git a/sources_non_forked/vim-snippets/snippets/_.snippets b/sources_non_forked/vim-snippets/snippets/_.snippets
index 85616018..b556554c 100644
--- a/sources_non_forked/vim-snippets/snippets/_.snippets
+++ b/sources_non_forked/vim-snippets/snippets/_.snippets
@@ -15,7 +15,7 @@ snippet lorem
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ snippet GPL2
 	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -51,7 +51,7 @@ snippet LGPL2
 	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ snippet GPL3
 	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -87,7 +87,7 @@ snippet LGPL3
 	${0}
 snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as
@@ -102,10 +102,19 @@ snippet AGPL3
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+	${0}
+snippet GMGPL linking exception
+	As a special exception, if other files instantiate generics from
+	this unit, or you link this unit with other files to produce an
+	executable, this unit does not by itself cause the resulting
+	executable to be covered by the GNU General Public License.
+	This exception does not however invalidate any other reasons why the
+	executable file might be covered by the GNU Public License.
+
 	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -135,7 +144,7 @@ snippet BSD2
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -163,7 +172,7 @@ snippet BSD3
 	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -194,7 +203,7 @@ snippet BSD4
 	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the "Software"),
@@ -217,7 +226,7 @@ snippet MIT
 	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${2:copyright holder}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -233,21 +242,20 @@ snippet APACHE
 
 	${0}
 snippet BEERWARE
-	${2:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${3:copyright holder}
+	${1:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
 
 	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
-	${1:`g:snips_author`} wrote this file. As long as you retain this notice you
+	$2 wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
 	this stuff is worth it, you can buy me a beer or coffee in return
 
 	${0}
-
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 					Version 2, December 2004
 
-	Copyright `strftime("%Y")` ${0:copyright holder}
+	Copyright `strftime("%Y")` ${0:`g:snips_author`}
 
 	Everyone is permitted to copy and distribute verbatim or modified
 	copies of this license document, and changing it is allowed as long
@@ -257,3 +265,11 @@ snippet WTFPL
 	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 	 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+	${0}
+snippet MPL2
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this
+	file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+	${0}
diff --git a/sources_non_forked/vim-snippets/snippets/actionscript.snippets b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
index 6b1d8ebe..b7aa7cb3 100644
--- a/sources_non_forked/vim-snippets/snippets/actionscript.snippets
+++ b/sources_non_forked/vim-snippets/snippets/actionscript.snippets
@@ -75,10 +75,6 @@ snippet do
 	do {
 		${0}
 	} while (${1:cond})
-snippet wh
-	while ${1:cond}{
-		${0}
-	}
 snippet for enumerate names
 	for (${1:var} in ${2:object}){
 		${0}
diff --git a/sources_non_forked/vim-snippets/snippets/ada.snippets b/sources_non_forked/vim-snippets/snippets/ada.snippets
index ce377b99..1039946f 100644
--- a/sources_non_forked/vim-snippets/snippets/ada.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ada.snippets
@@ -215,41 +215,3 @@ snippet getl Ada.Text_IO.Get_Line
 snippet newline Ada.Text_IO.New_Line
 	Ada.Text_IO.New_Line(${1:1});${0}
 
-snippet gpl GPL license header
-	-- This program is free software; you can redistribute it and/or modify
-	-- it under the terms of the GNU ${1}General Public License as published by
-	-- the Free Software Foundation; either version ${2:3} of the License, or
-	-- (at your option) any later version.
-	--
-	-- This program is distributed in the hope that it will be useful,
-	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	-- GNU $1General Public License for more details.
-	--
-	-- You should have received a copy of the GNU $1General Public License
-	-- along with this program; if not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${3:Author}, ${4:`strftime("%Y")`}
-
-	${0}
-
-snippet gplf GPL file license header
-	-- This file is part of ${1:Program-Name}.
-	--
-	-- $1 is free software: you can redistribute it and/or modify
-	-- it under the terms of the GNU ${2}General Public License as published by
-	-- the Free Software Foundation, either version ${3:3} of the License, or
-	-- (at your option) any later version.
-	-- 
-	-- $1 is distributed in the hope that it will be useful,
-	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	-- GNU $2General Public License for more details.
-	-- 
-	-- You should have received a copy of the GNU $2General Public License
-	-- along with $1. If not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${4:Author}, ${5:`strftime("%Y")`}
-
-	${0}
-
diff --git a/sources_non_forked/vim-snippets/snippets/awk.snippets b/sources_non_forked/vim-snippets/snippets/awk.snippets
new file mode 100644
index 00000000..32e56f2f
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/awk.snippets
@@ -0,0 +1,102 @@
+# cannot use /usr/bin/env because it does not support parameters (as -f)
+snippet #! #!/usr/bin/awk -f
+	#!/usr/bin/awk -f
+
+# @include is a gawk extension
+snippet inc @include
+	@include "${1}"${0}
+
+# @load is a gawk extension
+snippet loa @load
+	@load "${1}"${0}
+
+snippet beg BEGIN { ... }
+	BEGIN {
+		${0}
+	}
+
+# BEGINFILE is a gawk extension
+snippet begf BEGINFILE { ... }
+	BEGINFILE {
+		${0}
+	}
+
+snippet end END { ... }
+	END {
+		${0}
+	}
+
+# ENDFILE is a gawk extension
+snippet endf ENDFILE { ... }
+	ENDFILE {
+		${0}
+	}
+
+snippet pri print
+	print ${1:"${2}"}${0}
+
+snippet printf printf
+	printf("${1:%s}\n", ${2})${0}
+
+snippet ign IGNORECASE
+	IGNORECASE = ${1:1}
+
+snippet if if {...}
+	if (${1}) {
+		${0}
+	}
+
+snippet ife if ... else ...
+	if (${1}) {
+		${2}
+	} else {
+		${0}
+	}
+
+snippet eif else if ...
+	else if (${1}) {
+		${0}
+	}
+
+snippet el else {...}
+	else {
+		${0}
+	}
+
+snippet wh while
+	while (${1}) {
+		${2}
+	}
+
+snippet do do ... while
+	do {
+		${0}
+	} while (${1})
+
+snippet for for
+	for (${2:i} = 0; i < ${1:n}; ${3:++i}) {
+		${0}
+	}
+
+snippet fore for each
+	for (${1:i} in ${2:array}) {
+		${0}
+	}
+
+# the switch is a gawk extension
+snippet sw switch
+	switch (${1}) {
+	case ${2}:
+		${3}
+		break
+	default:
+		${0}
+		break
+	}
+
+# the switch is a gawk extension
+snippet case case
+	case ${1}:
+		${0}
+		break
+
diff --git a/sources_non_forked/vim-snippets/snippets/clojure.snippets b/sources_non_forked/vim-snippets/snippets/clojure.snippets
index 6fd653fc..152f896e 100644
--- a/sources_non_forked/vim-snippets/snippets/clojure.snippets
+++ b/sources_non_forked/vim-snippets/snippets/clojure.snippets
@@ -1,76 +1,73 @@
 snippet comm
 	(comment
-	  ${0}
-	  )
+		${0})
 snippet condp
 	(condp ${1:pred} ${2:expr}
-	  ${0})
+		${0})
 snippet def
 	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-	  ${0})
+		${0})
 snippet defmm
 	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defma
 	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defn
 	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
-	  ${0})
+		${0})
 snippet defp
 	(defprotocol ${1:name}
-	  ${0})
+		${0})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
-	  ${3:protocol}
-	  ${0})
+		${3:protocol}
+		${0})
 snippet deft
 	(deftest ${1:name}
-	    (is (= ${2:assertion})))
-	  ${0})
+		(is (= ${0:assertion})))
 snippet is
 	(is (= ${1} ${0}))
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
-	  ${3:Protocol}
-	  ${0})
+		${3:Protocol}
+		${0})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-	  ${0})
+		${0})
 snippet fn
 	(fn [${1:arg-list}] ${0})
 snippet if
 	(if ${1:test-expr}
-	  ${2:then-expr}
-	  ${0:else-expr})
+		${2:then-expr}
+		${0:else-expr})
 snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
 		(${0:else-expr}))
 snippet imp
 	(:import [${1:package}])
-	& {:keys [${1:keys}] :or {${0:defaults}}}
+		& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
 		${0})
 snippet letfn
-	(letfn [(${1:name) [${2:args}]
-	          ${0})])
+	(letfn [(${1:name}) [${2:args}]
+		${0})])
 snippet map
 	(map ${1:func} ${0:coll})
 snippet mapl
 	(map #(${1:lambda}) ${0:coll})
 snippet met
 	(${1:name} [${2:this} ${3:args}]
-	  ${0})
+		${0})
 snippet ns
-	(ns ${1:name}
-	  ${0})
+	(ns ${0:name})
 snippet dotimes
 	(dotimes [_ 10]
-	  (time
-	    (dotimes [_ ${1:times}]
-	      ${0})))
+		(time
+			(dotimes [_ ${1:times}]
+				${0})))
 snippet pmethod
 	(${1:name} [${2:this} ${0:args}])
 snippet refer
diff --git a/sources_non_forked/vim-snippets/snippets/codeigniter.snippets b/sources_non_forked/vim-snippets/snippets/codeigniter.snippets
new file mode 100644
index 00000000..7adf1e95
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/codeigniter.snippets
@@ -0,0 +1,218 @@
+# Based on nebjak/snipmate.vim/snippets/php.snippets
+
+# Controller
+snippet ci_controller
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName} extends CI_Controller
+	{
+		function __construct()
+		{
+			parent::__construct();
+			${2:// code...}
+		}
+
+		function ${3:index}()
+		{
+			${4:// code...}
+		}
+	}
+# Model
+snippet ci_model
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		function __construct()
+		{
+			parent::__construct();
+			${2:// code...}
+		}
+	} 
+snippet ci_model_crudl
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		private $table = '${2:table_name}';
+
+		function __construct()
+		{
+			parent::__construct();
+			${3:// code...}
+		}
+
+		// public create(data) {{{
+		/**
+		 * create
+		 *
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function create($data)
+		{
+			if($this->db->insert($table, $data))
+				return true;
+			else
+				return false;
+		}
+		// }}}
+
+		// public read(id) {{{
+		/**
+		 * read
+		 *
+		 * @param int $id
+		 * @access public
+		 * @return boolean
+		 */
+		public function read($id)
+		{
+			return $this->db->get_where($table, array('id', $id))->result();
+		}
+		// }}}
+
+		// public update(id,data) {{{
+		/**
+		 * update
+		 *
+		 * @param int $id
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function update($id, $data)
+		{
+			if($this->db->update($table, $data, array('id' => $id)))
+				return true;
+			else
+				return false;
+		}
+		// }}}
+
+		// public delete(id) {{{
+		/**
+		 * delete
+		 *
+		 * @param mixed $id (int o array of int)
+		 * @access public
+		 * @return boolean
+		 */
+		public function delete($id)
+		{
+			if(is_array($id))
+			{
+				$this->db->trans_start();
+				foreach($id as $elem)
+					$this->db->delete($table, array('id' => $elem));
+				$this->db->trans_complete();
+			}
+			else
+			{
+				if($this->db->delete($table, array('id' => $id)))
+					return true;
+				else
+					return false;
+			}
+		}
+		// }}}
+
+		// public listRows(limit=null,offset=0) {{{
+		/**
+		 * listRows
+		 *
+		 * @param int $limit
+		 * @param int $offset
+		 * @access public
+		 * @return boolean
+		 */
+		public function listRows($limit = null, $offset = 0)
+		{
+			if(!is_null($limit))
+				$this->db->limit($limit, $offset);
+			return $this->db->get($table)->result();
+		}
+		// }}}
+	}
+# Load view
+snippet ci_load-view
+	$this->load->view("${1:view_name}", $${2:data});${3}
+# DB Class snippets
+snippet ci_db-insert
+	$this->db->insert("${1:table}", $${2:data});${3}
+snippet ci_db-select
+	$this->db->select("${1:id, ...}");${2}
+snippet ci_db-from
+	$this->db->from("${1:table}");${2}
+snippet ci_db-join
+	$this->db->join("${1:table}", "${2:condition}", "${3:type}");${4}
+snippet ci_db-where
+	$this->db->where("${1:key}", "${2:value}");${3}
+snippet ci_db-or_where
+	$this->db->or_where("${1:key}", "${2:value}");${3}
+snippet ci_db-get
+	$this->db->get("${1:table}", ${2:limit}, ${3:offset});${4}
+snippet ci_db-delete
+	$this->db->delete("${1:table}", "${2:where}");${3}
+snippet ci_db-update
+	$this->db->update("${1:table}", $${2:set}, $${3:where});${4}
+# Input Class snippets
+snippet ci_input-post
+	$this->input->post("${1:index}");${2}
+snippet ci_input-get
+	$this->input->get("${1:index}");${2}
+snippet ci_input-cookie
+	$this->input->cookie("${1:index}");${2}
+snippet ci_input-server
+	$this->input->server("${1:index}");${2}
+snippet ci_input-user_agent
+	$this->input->user_agent();${1}
+snippet ci_input-is_ajax_request
+	$this->input->is_ajax_request();${1}
+snippet ci_input-is_cli_request
+	$this->input->is_cli_request();${1}
+# Form Validation Class and Form Helper snippets
+snippet ci_form_validation-set_rules
+	$this->form_validation->set_rules("${1:field}", "${2:label}", "${3:trim|required}");${4}
+snippet ci_form_open
+	form_open("${1:action}");${2}
+snippet ci_form_open_multipart
+	form_open_multipart("${1:action}");${2}
+snippet ci_form_hidden
+	form_hidden("${1:name}", "${2:value}");${3}
+snippet ci_form_input
+	form_input("${1:name}", "${2:value}");${3}
+snippet ci_form_password
+	form_password("${1:name}", "${2:value}");${3}
+snippet ci_form_upload
+	form_upload("${1:name}", "${2:value}");${3}
+snippet ci_form_textarea
+	form_textarea("${1:name}", "${2:value}");${3}
+snippet ci_form_dropdown
+	form_dropdown("${1:name}", $${2:options}, $${3:selected);${4}
+snippet ci_form_checkbox
+	form_checkbox("${1:name}", "${2:value}");${3}
+snippet ci_form_radio
+	form_radio("${1:name}", "${2:value}");${3}
+snippet ci_form_submit
+	form_submit("${1:name}", "${2:value}");${3}
+snippet ci_form_reset
+	form_reset("${1:name}", "${2:value}");${3}
+snippet ci_form_button
+	form_button("${1:name}", "${2:value}");${3}
+snippet ci_form_label
+	form_label("${1:label text}", "${2:id}");${3}
+snippet ci_form_close
+	form_close();${1}
+snippet ci_validation_errors
+	validation_errors();${1}
+# Session Class snippets
+snippet ci_session_userdata
+	$this->session->userdata("${1:item}");${2}
+snippet ci_session_set_userdata
+	$this->session->set_userdata($${1:array});${2}
+snippet ci_session_flashdata
+	$this->session->flashdata("${1:item}");${2}
+snippet ci_session_set_flashdata
+	$this->session->set_flashdata("${1:item}", "${2:value}");${3}
diff --git a/sources_non_forked/vim-snippets/snippets/fortran.snippets b/sources_non_forked/vim-snippets/snippets/fortran.snippets
new file mode 100644
index 00000000..c9ab0602
--- /dev/null
+++ b/sources_non_forked/vim-snippets/snippets/fortran.snippets
@@ -0,0 +1,93 @@
+snippet impl
+	implicit none
+		$0
+snippet prog
+	program ${1:main}
+		$0
+	end program $1
+snippet mod
+	module ${1:modulename}
+		$0
+	end module $1
+snippet proc
+	procedure ${1:name}
+		${0}
+	end procedure $1
+snippet iface
+	interface ${1:name}
+		${0}
+	end interface $1
+snippet doc
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	! File: ${2:`vim_snippets#Filename('$1')`}
+	! Author: `g:snips_author`
+	! Email: `g:snips_email`
+	! Github: `g:snips_github`
+	! Description: $1
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	$0
+# Variables definitions
+# Boolean
+snippet bool
+	logical :: $0
+# Integer
+snippet int
+	integer :: $0
+snippet real
+	real :: $0
+# Double Precision
+snippet double
+	double precision :: $0
+# Char
+snippet str
+	character(len=${1:*}) :: ${0:}
+# Types
+snippet type
+	type(${1:name})
+		$0
+	end type
+snippet const
+	${1:type}, parameter :: $2 = $0
+snippet arr
+	${1:type}, allocatable, dimension(${2::}) :: $0
+snippet intent
+	${1:type}, intent(inout) :: $0
+# Array
+snippet /
+	(/ $1 /) ${2:,&} $0
+snippet if
+	if (${1:condition}) then
+		$2
+	end if
+snippet case
+	select case (${1:expr})
+		case ($2)
+		case default
+			$3
+	end select $0
+snippet do
+	do ${1:i} = ${2:start},${3:end}, ${4:incr}
+		$4
+	end do
+snippet dow
+	do while (${1:condition})
+		$2
+	end do
+snippet sub
+	subroutine ${1:name}($2)
+		$0
+	end subroutine $1
+snippet func
+	function ${1:name}($2) result($3)
+		$0
+	end function $1
+snippet pr
+	write(*,*) $0
+snippet read
+	read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet write
+	write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet open
+	open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0
+snippet close
+	close ( unit = ${1:fp} ) $0
diff --git a/sources_non_forked/vim-snippets/snippets/go.snippets b/sources_non_forked/vim-snippets/snippets/go.snippets
index 8623eda2..af76e724 100644
--- a/sources_non_forked/vim-snippets/snippets/go.snippets
+++ b/sources_non_forked/vim-snippets/snippets/go.snippets
@@ -148,8 +148,8 @@ snippet fun
 	${0}
 # function on receiver
 snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5}
+	func (${1:receiver} ${2:type}) ${3:funcName}(${4}) ${5:error} {
+		${6}
 	}
 	${0}
 # log printf
@@ -173,6 +173,9 @@ snippet main
 # new
 snippet nw
 	new(${0:type})
+# package
+snippet pa
+	package ${1:main}
 # panic
 snippet pn
 	panic("${0:msg}")
diff --git a/sources_non_forked/vim-snippets/snippets/haskell.snippets b/sources_non_forked/vim-snippets/snippets/haskell.snippets
index 4fecc998..633c9aaf 100644
--- a/sources_non_forked/vim-snippets/snippets/haskell.snippets
+++ b/sources_non_forked/vim-snippets/snippets/haskell.snippets
@@ -2,6 +2,8 @@ snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet haddock
 	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet inline
+	{-# INLINE ${0:name} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}
diff --git a/sources_non_forked/vim-snippets/snippets/html.snippets b/sources_non_forked/vim-snippets/snippets/html.snippets
index 7cb33dde..dcc28e74 100644
--- a/sources_non_forked/vim-snippets/snippets/html.snippets
+++ b/sources_non_forked/vim-snippets/snippets/html.snippets
@@ -462,8 +462,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:link}
 		</head>
@@ -475,8 +475,8 @@ snippet html5l
 	<!DOCTYPE html>
 	<html lang="${1:es}">
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${3:link}
 		</head>
@@ -702,6 +702,10 @@ snippet output
 	<output>${0}</output>
 snippet p
 	<p>${0}</p>
+snippet p.
+	<p class="${1}">${0}</p>
+snippet p#
+	<p id="${1}">${0}</p>
 snippet param
 	<param name="${1}" value="${2}" />
 snippet pre
diff --git a/sources_non_forked/vim-snippets/snippets/markdown.snippets b/sources_non_forked/vim-snippets/snippets/markdown.snippets
index fd2f2971..d3667d05 100644
--- a/sources_non_forked/vim-snippets/snippets/markdown.snippets
+++ b/sources_non_forked/vim-snippets/snippets/markdown.snippets
@@ -2,26 +2,75 @@
 
 # Includes octopress (http://octopress.org/) snippets
 
-snippet [
-	[${1:text}](http://${2:address} "${0:title}")
-snippet [*
-	[${1:link}](${2:`@*`} "${3:title}")
+# The suffix `c` stands for "Clipboard".
 
+snippet [
+	[${1:text}](http://${2:address})
+snippet [*
+	[${1:link}](${2:`@*`})
+snippet [c
+	[${1:link}](${2:`@+`})
+snippet ["
+	[${1:text}](http://${2:address} "${3:title}")
+snippet ["*
+	[${1:link}](${2:`@*`} "${3:title}")
+snippet ["c
+	[${1:link}](${2:`@+`} "${3:title}")
 snippet [:
-	[${1:id}]: http://${2:url} "${0:title}"
+	[${1:id}]: http://${2:url}
+
 snippet [:*
-	[${1:id}]: ${2:`@*`} "${0:title}"
+	[${1:id}]: ${2:`@*`}
+
+snippet [:c
+	[${1:id}]: ${2:`@+`}
+
+snippet [:"
+	[${1:id}]: http://${2:url} "${3:title}"
+
+snippet [:"*
+	[${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet [:"c
+	[${1:id}]: ${2:`@+`} "${3:title}"
 
 snippet ![
-	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
+	![${1:alttext}](${2:/images/image.jpg})
 snippet ![*
+	![${1:alt}](${2:`@*`})
+snippet ![c
+	![${1:alt}](${2:`@+`})
+snippet !["
+	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
+snippet !["*
 	![${1:alt}](${2:`@*`} "${3:title}")
-
+snippet !["c
+	![${1:alt}](${2:`@+`} "${3:title}")
 snippet ![:
-	![${1:id}]: ${2:url} "${0:title}"
-snippet ![:*
-	![${1:id}]: ${2:`@*`} "${0:title}"
+	![${1:id}]: ${2:url}
 
+snippet ![:*
+	![${1:id}]: ${2:`@*`}
+
+snippet ![:"
+	![${1:id}]: ${2:url} "${3:title}"
+
+snippet ![:"*
+	![${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet ![:"c
+	![${1:id}]: ${2:`@+`} "${3:title}"
+
+snippet <
+	<http://${1:url}>
+snippet <*
+	<`@*`>
+snippet <c
+	<`@+`>
+snippet **
+	**${1:bold}**
+snippet __
+	__${1:bold}__
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
@@ -46,15 +95,16 @@ snippet blockquote-link
 	${0:quote}
 	{% endblockquote %}
 
-snippet bt-codeblock-short
-	```
-	${0:code_snippet}
-	```
+snippet ```
+	\`\`\`
+	${1:code}
+	\`\`\`
 
-snippet bt-codeblock-full
-	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${0:code_snippet}
-	```
+# Language.
+snippet ```l
+	\`\`\`${1:language}
+	${2:code}
+	\`\`\`
 
 snippet codeblock-short
 	{% codeblock %}
diff --git a/sources_non_forked/vim-snippets/snippets/python.snippets b/sources_non_forked/vim-snippets/snippets/python.snippets
index c221f466..77d74e4d 100644
--- a/sources_non_forked/vim-snippets/snippets/python.snippets
+++ b/sources_non_forked/vim-snippets/snippets/python.snippets
@@ -129,9 +129,16 @@ snippet pdb
 # ipython debugger (ipdb)
 snippet ipdb
 	import ipdb; ipdb.set_trace()
+# embed ipython itself
+snippet iem
+	import IPython; IPython.embed()
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# python_prompt_toolkit
+snippet ppt
+	from prompt_toolkit.contrib.repl import embed
+	embed(globals(), locals(), vi_mode=${1:default=False}, history_filename=${2:default=None})
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()
@@ -208,3 +215,9 @@ snippet kwg
 	self.${1:var_name} = kwargs.get('$1', ${2:None})
 snippet lkwg
 	${1:var_name} = kwargs.get('$1', ${2:None})
+snippet args
+	*args${1:,}${0}
+snippet kwargs
+	**kwargs${1:,}${0}
+snippet akw
+	*args, **kwargs${1:,}${0}
diff --git a/sources_non_forked/vim-snippets/snippets/ruby.snippets b/sources_non_forked/vim-snippets/snippets/ruby.snippets
index 7097c6d6..c4bcc43d 100644
--- a/sources_non_forked/vim-snippets/snippets/ruby.snippets
+++ b/sources_non_forked/vim-snippets/snippets/ruby.snippets
@@ -73,10 +73,32 @@ snippet ife
 snippet eif
 	elsif ${1:condition}
 		${0}
+snippet ifee
+	if ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
 snippet unless
 	unless ${1:condition}
 		${0}
 	end
+snippet unlesse
+	unless ${1:condition}
+		$2
+	else
+		$0
+	end
+snippet unlesee
+	unless ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
 snippet wh
 	while ${1:condition}
 		${0}
diff --git a/sources_non_forked/vim-snippets/snippets/rust.snippets b/sources_non_forked/vim-snippets/snippets/rust.snippets
index f135eb58..195f254a 100644
--- a/sources_non_forked/vim-snippets/snippets/rust.snippets
+++ b/sources_non_forked/vim-snippets/snippets/rust.snippets
@@ -4,11 +4,7 @@
 
 # Functions
 snippet fn
-	fn ${1:function_name}(${2}) {
-		${0}
-	}
-snippet fn-
-	fn ${1:function_name}(${2}) -> ${3} {
+	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
 snippet test
@@ -16,6 +12,13 @@ snippet test
 	fn ${1:test_function_name}() {
 		${0}
 	}
+snippet bench "Bench function" b
+	#[bench]
+	fn ${1:bench_function_name}(b: &mut test::Bencher) {
+		b.iter(|| {
+			${0}
+		})
+	}
 snippet new
 	pub fn new(${2}) -> ${1:Name} {
 		${0}return $1 { ${3} };
@@ -25,7 +28,9 @@ snippet main
 		${0}
 	}
 snippet let
-	let ${1:name}${3} = ${2};
+	let ${1:name: type} = ${2};
+snippet let
+	let mut ${1:name: type} = ${2};
 snippet pln
 	println!("${1}");
 snippet pln,
@@ -52,25 +57,48 @@ snippet allow
 	#[allow(${1:unused_variable})]
 snippet feat
 	#![feature(${1:macro_rules})]
+snippet der "#[deriving(..)]" b
+	#[deriving(${1:Show})]
+snippet attr "#[..]" b
+	#[${1:inline}]
+
 # Common types
 snippet opt
 	Option<${1:int}>
 snippet res
 	Result<${1:~str}, ${2:()}>
 snippet if
-	if ${1:/* condition */} {
+	if ${1} {
+		${0}
+	}
+snippet ife
+	if ${1} {
+		${2}
+	} else {
+		${0}
+	}
+snippet el
+	else {
+		${0}
+	}
+snippet eli
+	else if ${1} {
 		${0}
 	}
 snippet mat
 	match ${1} {
 		${2} => ${3},
 	}
+snippet loop "loop {}" b
+	loop {
+		${0}
+	}
 snippet while
 	while ${1:condition} {
 		${0}
 	}
 snippet for
-	for ${1:i} in ${2:range(0u, 10)} {
+	for ${1:i} in ${2:0u..10} {
 		${0}
 	}
 snippet spawn
@@ -83,12 +111,19 @@ snippet duplex
 	let (${1:from_child}, ${2:to_child}) = sync::duplex();
 # TODO commenting
 snippet todo
-	// [TODO]: ${1:Description}
+	// [TODO]: ${0:Description}
+snippet fixme "FIXME comment"
+	// FIXME: $0
+
 # Struct
 snippet st
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
+snippet stn
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
 
 	impl $1 {
 		pub fn new(${2}) -> $1 {
@@ -97,9 +132,11 @@ snippet st
 			};
 		}
 	}
+snippet typ
+	type ${1:NewName} = $0;
 # Enum
 snippet enum
-	enum ${1:enum_name} {
+	enum ${1:Name} {
 		${0},
 	}
 # Impl
@@ -122,4 +159,4 @@ snippet trait
 snippet ss
 	static ${1}: &'static str = "${0}";
 snippet stat
-	static ${1}: ${2:uint} = ${0};
+	static ${1}: ${2:usize} = ${0};
diff --git a/sources_non_forked/vim-snippets/snippets/scala.snippets b/sources_non_forked/vim-snippets/snippets/scala.snippets
index f824ee28..003081ef 100644
--- a/sources_non_forked/vim-snippets/snippets/scala.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scala.snippets
@@ -298,19 +298,25 @@ snippet scalatest
 	${0:import org.scalatest.FunSuite}
 #assert
 snippet assert
-	assert(${1:a}==${0:b})
+	assert(${1:a} === ${0:b})
 #ensuring(p 296)
 snippet ensuring
 	ifel ensuring(${1:a}==${0:b})
 #expect
 snippet expect
-	expect(${0:what}) {
+	expect(${1:what}) {
+		${0}
+	}
 #intercept
 snippet intercept
-	intercept[${0:IllegalArgumentException}] {
+	intercept[${1:IllegalArgumentException}] {
+		${0}
+	}
 #test
 snippet test
-	test("${0:description}") {
+	test("${1:description}") {
+		${0}
+	}
 #suite
 snippet suite
 	class ${0:name} extends Suite {
diff --git a/sources_non_forked/vim-snippets/snippets/scss.snippets b/sources_non_forked/vim-snippets/snippets/scss.snippets
index 6daee776..9a208cab 100644
--- a/sources_non_forked/vim-snippets/snippets/scss.snippets
+++ b/sources_non_forked/vim-snippets/snippets/scss.snippets
@@ -18,8 +18,14 @@ snippet if
 	@if ${1:condition} {
 		${0}
 	}
-snippet else
-	@else ${1:condition} {
+snippet ife
+	@if ${1:condition} {
+		${2}
+	} @else {
+		${0}
+	}
+snippet eif
+	@else if ${1:condition} {
 		${0}
 	}
 snippet for
diff --git a/sources_non_forked/vim-snippets/snippets/stylus.snippets b/sources_non_forked/vim-snippets/snippets/stylus.snippets
index 4a305702..d03d1781 100644
--- a/sources_non_forked/vim-snippets/snippets/stylus.snippets
+++ b/sources_non_forked/vim-snippets/snippets/stylus.snippets
@@ -1,993 +1,993 @@
 snippet !
-    !important
+		!important
 snippet bdi:m+
-    -moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
-    -moz-border-image ${0}
+		-moz-border-image ${0}
 snippet bdrz:m
-    -moz-border-radius ${0}
+		-moz-border-radius ${0}
 snippet bxsh:m+
-  -moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:m
-    -moz-box-shadow ${0}
+		-moz-box-shadow ${0}
 snippet bdi:w+
-    -webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:w
-    -webkit-border-image ${0}
+		-webkit-border-image ${0}
 snippet bdrz:w
-    -webkit-border-radius ${0}
+		-webkit-border-radius ${0}
 snippet bxsh:w+
-    -webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:w
-    -webkit-box-shadow ${0}
+		-webkit-box-shadow ${0}
 snippet @f
-    @font-face ${0}
+		@font-face ${0}
 snippet @i
-    @import '${0}'
+		@import '${0}'
 snippet @r
-    @require '${0}'
+		@require '${0}'
 snippet @m
-    @media ${1:screen}
+		@media ${1:screen}
 snippet @msmw
-    @media screen and (min-width: ${0}px)
+		@media screen and (min-width: ${0}px)
 snippet @ext
-    @extend .${1}
-    ${0}
+		@extend .${1}
+		${0}
 snippet bg+
-    background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+		background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
 snippet bga
-    background-attachment ${0}
+		background-attachment ${0}
 snippet bga:f
-    background-attachment fixed
+		background-attachment fixed
 snippet bga:s
-    background-attachment scroll
+		background-attachment scroll
 snippet bgbk
-    background-break ${0}
+		background-break ${0}
 snippet bgbk:bb
-    background-break bounding-box
+		background-break bounding-box
 snippet bgbk:c
-    background-break continuous
+		background-break continuous
 snippet bgbk:eb
-    background-break each-box
+		background-break each-box
 snippet bgcp
-    background-clip ${0}
+		background-clip ${0}
 snippet bgcp:bb
-    background-clip border-box
+		background-clip border-box
 snippet bgcp:cb
-    background-clip content-box
+		background-clip content-box
 snippet bgcp:nc
-    background-clip no-clip
+		background-clip no-clip
 snippet bgcp:pb
-    background-clip padding-box
+		background-clip padding-box
 snippet bgc
-    background-color ${0}
+		background-color ${0}
 snippet bgc:t
-    background-color transparent
+		background-color transparent
 snippet bgi
-    background-image url(${0})
+		background-image url(${0})
 snippet bgi:n
-    background-image none
+		background-image none
 snippet bgo
-    background-origin ${0}
+		background-origin ${0}
 snippet bgo:bb
-    background-origin border-box
+		background-origin border-box
 snippet bgo:cb
-    background-origin content-box
+		background-origin content-box
 snippet bgo:pb
-    background-origin padding-box
+		background-origin padding-box
 snippet bgpx
-    background-position-x ${0}
+		background-position-x ${0}
 snippet bgpy
-    background-position-y ${0}
+		background-position-y ${0}
 snippet bgp
-    background-position ${1:0} ${0:0}
+		background-position ${1:0} ${0:0}
 snippet bgr
-    background-repeat ${0}
+		background-repeat ${0}
 snippet bgr:n
-    background-repeat no-repeat
+		background-repeat no-repeat
 snippet bgr:x
-    background-repeat repeat-x
+		background-repeat repeat-x
 snippet bgr:y
-    background-repeat repeat-y
+		background-repeat repeat-y
 snippet bgr:r
-    background-repeat repeat
+		background-repeat repeat
 snippet bgz
-    background-size ${0}
+		background-size ${0}
 snippet bgz:a
-    background-size auto
+		background-size auto
 snippet bgz:ct
-    background-size contain
+		background-size contain
 snippet bgz:cv
-    background-size cover
+		background-size cover
 snippet bg
-    background ${0}
+		background ${0}
 snippet bg:ie
-    filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+		filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
 snippet bg:n
-    background none
+		background none
 snippet bd+
-    border ${1:1px} ${2:solid} ${0}
+		border ${1:1px} ${2:solid} ${0}
 snippet bdb+
-    border-bottom ${1:1px} ${2:solid} ${0}
+		border-bottom ${1:1px} ${2:solid} ${0}
 snippet bdbc
-    border-bottom-color ${0}
+		border-bottom-color ${0}
 snippet bdbi
-    border-bottom-image url(${0})
+		border-bottom-image url(${0})
 snippet bdbi:n
-    border-bottom-image none
+		border-bottom-image none
 snippet bdbli
-    border-bottom-left-image url(${0})
+		border-bottom-left-image url(${0})
 snippet bdbli:c
-    border-bottom-left-image continue
+		border-bottom-left-image continue
 snippet bdbli:n
-    border-bottom-left-image none
+		border-bottom-left-image none
 snippet bdblrz
-    border-bottom-left-radius ${0}
+		border-bottom-left-radius ${0}
 snippet bdbri
-    border-bottom-right-image url(${0})
+		border-bottom-right-image url(${0})
 snippet bdbri:c
-    border-bottom-right-image continue
+		border-bottom-right-image continue
 snippet bdbri:n
-    border-bottom-right-image none
+		border-bottom-right-image none
 snippet bdbrrz
-    border-bottom-right-radius ${0}
+		border-bottom-right-radius ${0}
 snippet bdbs
-    border-bottom-style ${0}
+		border-bottom-style ${0}
 snippet bdbs:n
-    border-bottom-style none
+		border-bottom-style none
 snippet bdbw
-    border-bottom-width ${0}
+		border-bottom-width ${0}
 snippet bdb
-    border-bottom ${0}
+		border-bottom ${0}
 snippet bdb:n
-    border-bottom none
+		border-bottom none
 snippet bdbk
-    border-break ${0}
+		border-break ${0}
 snippet bdbk:c
-    border-break close
+		border-break close
 snippet bdcl
-    border-collapse ${0}
+		border-collapse ${0}
 snippet bdcl:c
-    border-collapse collapse
+		border-collapse collapse
 snippet bdcl:s
-    border-collapse separate
+		border-collapse separate
 snippet bdc
-    border-color ${0}
+		border-color ${0}
 snippet bdci
-    border-corner-image url(${0})
+		border-corner-image url(${0})
 snippet bdci:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdci:n
-    border-corner-image none
+		border-corner-image none
 snippet bdf
-    border-fit ${0}
+		border-fit ${0}
 snippet bdf:c
-    border-fit clip
+		border-fit clip
 snippet bdf:of
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:ow
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:r
-    border-fit repeat
+		border-fit repeat
 snippet bdf:sc
-    border-fit scale
+		border-fit scale
 snippet bdf:sp
-    border-fit space
+		border-fit space
 snippet bdf:st
-    border-fit stretch
+		border-fit stretch
 snippet bdi
-    border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:n
-    border-image none
+		border-image none
 snippet bdl+
-    border-left ${1:1px} ${2:solid} ${0}
+		border-left ${1:1px} ${2:solid} ${0}
 snippet bdlc
-    border-left-color ${0}
+		border-left-color ${0}
 snippet bdli
-    border-left-image url(${0})
+		border-left-image url(${0})
 snippet bdli:n
-    border-left-image none
+		border-left-image none
 snippet bdls
-    border-left-style ${0}
+		border-left-style ${0}
 snippet bdls:n
-    border-left-style none
+		border-left-style none
 snippet bdlw
-    border-left-width ${0}
+		border-left-width ${0}
 snippet bdl
-    border-left ${0}
+		border-left ${0}
 snippet bdl:n
-    border-left none
+		border-left none
 snippet bdlt
-    border-length ${0}
+		border-length ${0}
 snippet bdlt:a
-    border-length auto
+		border-length auto
 snippet bdrz
-    border-radius ${0}
+		border-radius ${0}
 snippet bdr+
-    border-right ${1:1px} ${2:solid} ${0}
+		border-right ${1:1px} ${2:solid} ${0}
 snippet bdrc
-    border-right-color ${0}
+		border-right-color ${0}
 snippet bdri
-    border-right-image url(${0})
+		border-right-image url(${0})
 snippet bdri:n
-    border-right-image none
+		border-right-image none
 snippet bdrs
-    border-right-style ${0}
+		border-right-style ${0}
 snippet bdrs:n
-    border-right-style none
+		border-right-style none
 snippet bdrw
-    border-right-width ${0}
+		border-right-width ${0}
 snippet bdr
-    border-right ${0}
+		border-right ${0}
 snippet bdr:n
-    border-right none
+		border-right none
 snippet bdsp
-    border-spacing ${0}
+		border-spacing ${0}
 snippet bds
-    border-style ${0}
+		border-style ${0}
 snippet bds:ds
-    border-style dashed
+		border-style dashed
 snippet bds:dtds
-    border-style dot-dash
+		border-style dot-dash
 snippet bds:dtdtds
-    border-style dot-dot-dash
+		border-style dot-dot-dash
 snippet bds:dt
-    border-style dotted
+		border-style dotted
 snippet bds:db
-    border-style double
+		border-style double
 snippet bds:g
-    border-style groove
+		border-style groove
 snippet bds:h
-    border-style hidden
+		border-style hidden
 snippet bds:i
-    border-style inset
+		border-style inset
 snippet bds:n
-    border-style none
+		border-style none
 snippet bds:o
-    border-style outset
+		border-style outset
 snippet bds:r
-    border-style ridge
+		border-style ridge
 snippet bds:s
-    border-style solid
+		border-style solid
 snippet bds:w
-    border-style wave
+		border-style wave
 snippet bdt+
-    border-top ${1:1px} ${2:solid} ${0}
+		border-top ${1:1px} ${2:solid} ${0}
 snippet bdtc
-    border-top-color ${0}
+		border-top-color ${0}
 snippet bdti
-    border-top-image url(${0})
+		border-top-image url(${0})
 snippet bdti:n
-    border-top-image none
+		border-top-image none
 snippet bdtli
-    border-top-left-image url(${0})
+		border-top-left-image url(${0})
 snippet bdtli:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdtli:n
-    border-corner-image none
+		border-corner-image none
 snippet bdtlrz
-    border-top-left-radius ${0}
+		border-top-left-radius ${0}
 snippet bdtri
-    border-top-right-image url(${0})
+		border-top-right-image url(${0})
 snippet bdtri:c
-    border-top-right-image continue
+		border-top-right-image continue
 snippet bdtri:n
-    border-top-right-image none
+		border-top-right-image none
 snippet bdtrrz
-    border-top-right-radius ${0}
+		border-top-right-radius ${0}
 snippet bdts
-    border-top-style ${0}
+		border-top-style ${0}
 snippet bdts:n
-    border-top-style none
+		border-top-style none
 snippet bdtw
-    border-top-width ${0}
+		border-top-width ${0}
 snippet bdt
-    border-top ${0}
+		border-top ${0}
 snippet bdt:n
-    border-top none
+		border-top none
 snippet bdw
-    border-width ${0}
+		border-width ${0}
 snippet bd
-    border ${0}
+		border ${0}
 snippet bd:n
-    border none
+		border none
 snippet b
-    bottom ${0}
+		bottom ${0}
 snippet b:a
-    bottom auto
+		bottom auto
 snippet bxsh+
-    box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh
-    box-shadow ${0}
+		box-shadow ${0}
 snippet bxsh:n
-    box-shadow none
+		box-shadow none
 snippet bxz
-    box-sizing ${0}
+		box-sizing ${0}
 snippet bxz:bb
-    box-sizing border-box
+		box-sizing border-box
 snippet bxz:cb
-    box-sizing content-box
+		box-sizing content-box
 snippet cps
-    caption-side ${0}
+		caption-side ${0}
 snippet cps:b
-    caption-side bottom
+		caption-side bottom
 snippet cps:t
-    caption-side top
+		caption-side top
 snippet cl
-    clear ${0}
+		clear ${0}
 snippet cl:b
-    clear both
+		clear both
 snippet cl:l
-    clear left
+		clear left
 snippet cl:n
-    clear none
+		clear none
 snippet cl:r
-    clear right
+		clear right
 snippet cp
-    clip ${0}
+		clip ${0}
 snippet cp:a
-    clip auto
+		clip auto
 snippet cp:r
-    clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+		clip rect(${1:0} ${2:0} ${3:0} ${0:0})
 snippet c
-    color ${0}
+		color ${0}
 snippet ct
-    content ${0}
+		content ${0}
 snippet ct:a
-    content attr(${0})
+		content attr(${0})
 snippet ct:cq
-    content close-quote
+		content close-quote
 snippet ct:c
-    content counter(${0})
+		content counter(${0})
 snippet ct:cs
-    content counters(${0})
+		content counters(${0})
 snippet ct:ncq
-    content no-close-quote
+		content no-close-quote
 snippet ct:noq
-    content no-open-quote
+		content no-open-quote
 snippet ct:n
-    content normal
+		content normal
 snippet ct:oq
-    content open-quote
+		content open-quote
 snippet coi
-    counter-increment ${0}
+		counter-increment ${0}
 snippet cor
-    counter-reset ${0}
+		counter-reset ${0}
 snippet cur
-    cursor ${0}
+		cursor ${0}
 snippet cur:a
-    cursor auto
+		cursor auto
 snippet cur:c
-    cursor crosshair
+		cursor crosshair
 snippet cur:d
-    cursor default
+		cursor default
 snippet cur:ha
-    cursor hand
+		cursor hand
 snippet cur:he
-    cursor help
+		cursor help
 snippet cur:m
-    cursor move
+		cursor move
 snippet cur:p
-    cursor pointer
+		cursor pointer
 snippet cur:t
-    cursor text
+		cursor text
 snippet d
-    display ${0}
+		display ${0}
 snippet d:mib
-    display -moz-inline-box
+		display -moz-inline-box
 snippet d:mis
-    display -moz-inline-stack
+		display -moz-inline-stack
 snippet d:b
-    display block
+		display block
 snippet d:cp
-    display compact
+		display compact
 snippet d:ib
-    display inline-block
+		display inline-block
 snippet d:itb
-    display inline-table
+		display inline-table
 snippet d:i
-    display inline
+		display inline
 snippet d:li
-    display list-item
+		display list-item
 snippet d:n
-    display none
+		display none
 snippet d:ri
-    display run-in
+		display run-in
 snippet d:tbcp
-    display table-caption
+		display table-caption
 snippet d:tbc
-    display table-cell
+		display table-cell
 snippet d:tbclg
-    display table-column-group
+		display table-column-group
 snippet d:tbcl
-    display table-column
+		display table-column
 snippet d:tbfg
-    display table-footer-group
+		display table-footer-group
 snippet d:tbhg
-    display table-header-group
+		display table-header-group
 snippet d:tbrg
-    display table-row-group
+		display table-row-group
 snippet d:tbr
-    display table-row
+		display table-row
 snippet d:tb
-    display table
+		display table
 snippet ec
-    empty-cells ${0}
+		empty-cells ${0}
 snippet ec:h
-    empty-cells hide
+		empty-cells hide
 snippet ec:s
-    empty-cells show
+		empty-cells show
 snippet exp
-    expression()
+		expression()
 snippet fl
-    float ${0}
+		float ${0}
 snippet fl:l
-    float left
+		float left
 snippet fl:n
-    float none
+		float none
 snippet fl:r
-    float right
+		float right
 snippet f+
-    font ${1:1em} ${2:Arial},${0:sans-serif}
+		font ${1:1em} ${2:Arial},${0:sans-serif}
 snippet fef
-    font-effect ${0}
+		font-effect ${0}
 snippet fef:eb
-    font-effect emboss
+		font-effect emboss
 snippet fef:eg
-    font-effect engrave
+		font-effect engrave
 snippet fef:n
-    font-effect none
+		font-effect none
 snippet fef:o
-    font-effect outline
+		font-effect outline
 snippet femp
-    font-emphasize-position ${0}
+		font-emphasize-position ${0}
 snippet femp:a
-    font-emphasize-position after
+		font-emphasize-position after
 snippet femp:b
-    font-emphasize-position before
+		font-emphasize-position before
 snippet fems
-    font-emphasize-style ${0}
+		font-emphasize-style ${0}
 snippet fems:ac
-    font-emphasize-style accent
+		font-emphasize-style accent
 snippet fems:c
-    font-emphasize-style circle
+		font-emphasize-style circle
 snippet fems:ds
-    font-emphasize-style disc
+		font-emphasize-style disc
 snippet fems:dt
-    font-emphasize-style dot
+		font-emphasize-style dot
 snippet fems:n
-    font-emphasize-style none
+		font-emphasize-style none
 snippet fem
-    font-emphasize ${0}
+		font-emphasize ${0}
 snippet ff
-    font-family ${0}
+		font-family ${0}
 snippet ff:c
-    font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+		font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
 snippet ff:f
-    font-family ${0:Capitals,Impact},fantasy
+		font-family ${0:Capitals,Impact},fantasy
 snippet ff:m
-    font-family ${0:Monaco,'Courier New'},monospace
+		font-family ${0:Monaco,'Courier New'},monospace
 snippet ff:ss
-    font-family ${0:Helvetica,Arial},sans-serif
+		font-family ${0:Helvetica,Arial},sans-serif
 snippet ff:s
-    font-family ${0:Georgia,'Times New Roman'},serif
+		font-family ${0:Georgia,'Times New Roman'},serif
 snippet fza
-    font-size-adjust ${0}
+		font-size-adjust ${0}
 snippet fza:n
-    font-size-adjust none
+		font-size-adjust none
 snippet fz
-    font-size ${0}
+		font-size ${0}
 snippet fsm
-    font-smooth ${0}
+		font-smooth ${0}
 snippet fsm:aw
-    font-smooth always
+		font-smooth always
 snippet fsm:a
-    font-smooth auto
+		font-smooth auto
 snippet fsm:n
-    font-smooth never
+		font-smooth never
 snippet fst
-    font-stretch ${0}
+		font-stretch ${0}
 snippet fst:c
-    font-stretch condensed
+		font-stretch condensed
 snippet fst:e
-    font-stretch expanded
+		font-stretch expanded
 snippet fst:ec
-    font-stretch extra-condensed
+		font-stretch extra-condensed
 snippet fst:ee
-    font-stretch extra-expanded
+		font-stretch extra-expanded
 snippet fst:n
-    font-stretch normal
+		font-stretch normal
 snippet fst:sc
-    font-stretch semi-condensed
+		font-stretch semi-condensed
 snippet fst:se
-    font-stretch semi-expanded
+		font-stretch semi-expanded
 snippet fst:uc
-    font-stretch ultra-condensed
+		font-stretch ultra-condensed
 snippet fst:ue
-    font-stretch ultra-expanded
+		font-stretch ultra-expanded
 snippet fs
-    font-style ${0}
+		font-style ${0}
 snippet fs:i
-    font-style italic
+		font-style italic
 snippet fs:n
-    font-style normal
+		font-style normal
 snippet fs:o
-    font-style oblique
+		font-style oblique
 snippet fv
-    font-variant ${0}
+		font-variant ${0}
 snippet fv:n
-    font-variant normal
+		font-variant normal
 snippet fv:sc
-    font-variant small-caps
+		font-variant small-caps
 snippet fw
-    font-weight ${0}
+		font-weight ${0}
 snippet fw:b
-    font-weight bold
+		font-weight bold
 snippet fw:br
-    font-weight bolder
+		font-weight bolder
 snippet fw:lr
-    font-weight lighter
+		font-weight lighter
 snippet fw:n
-    font-weight normal
+		font-weight normal
 snippet f
-    font ${0}
+		font ${0}
 snippet h
-    height ${0}
+		height ${0}
 snippet h:a
-    height auto
+		height auto
 snippet l
-    left ${0}
+		left ${0}
 snippet l:a
-    left auto
+		left auto
 snippet lts
-    letter-spacing ${0}
+		letter-spacing ${0}
 snippet lh
-    line-height ${0}
+		line-height ${0}
 snippet lisi
-    list-style-image url(${0})
+		list-style-image url(${0})
 snippet lisi:n
-    list-style-image none
+		list-style-image none
 snippet lisp
-    list-style-position ${0}
+		list-style-position ${0}
 snippet lisp:i
-    list-style-position inside
+		list-style-position inside
 snippet lisp:o
-    list-style-position outside
+		list-style-position outside
 snippet list
-    list-style-type ${0}
+		list-style-type ${0}
 snippet list:c
-    list-style-type circle
+		list-style-type circle
 snippet list:dclz
-    list-style-type decimal-leading-zero
+		list-style-type decimal-leading-zero
 snippet list:dc
-    list-style-type decimal
+		list-style-type decimal
 snippet list:d
-    list-style-type disc
+		list-style-type disc
 snippet list:lr
-    list-style-type lower-roman
+		list-style-type lower-roman
 snippet list:n
-    list-style-type none
+		list-style-type none
 snippet list:s
-    list-style-type square
+		list-style-type square
 snippet list:ur
-    list-style-type upper-roman
+		list-style-type upper-roman
 snippet lis
-    list-style ${0}
+		list-style ${0}
 snippet lis:n
-    list-style none
+		list-style none
 snippet mb
-    margin-bottom ${0}
+		margin-bottom ${0}
 snippet mb:a
-    margin-bottom auto
+		margin-bottom auto
 snippet ml
-    margin-left ${0}
+		margin-left ${0}
 snippet ml:a
-    margin-left auto
+		margin-left auto
 snippet mr
-    margin-right ${0}
+		margin-right ${0}
 snippet mr:a
-    margin-right auto
+		margin-right auto
 snippet mt
-    margin-top ${0}
+		margin-top ${0}
 snippet mt:a
-    margin-top auto
+		margin-top auto
 snippet m
-    margin ${0}
+		margin ${0}
 snippet m:4
-    margin ${1:0} ${2:0} ${3:0} ${0:0}
+		margin ${1:0} ${2:0} ${3:0} ${0:0}
 snippet m:3
-    margin ${1:0} ${2:0} ${0:0}
+		margin ${1:0} ${2:0} ${0:0}
 snippet m:2
-    margin ${1:0} ${0:0}
+		margin ${1:0} ${0:0}
 snippet m:0
-    margin 0
+		margin 0
 snippet m:a
-    margin auto
+		margin auto
 snippet mah
-    max-height ${0}
+		max-height ${0}
 snippet mah:n
-    max-height none
+		max-height none
 snippet maw
-    max-width ${0}
+		max-width ${0}
 snippet maw:n
-    max-width none
+		max-width none
 snippet mih
-    min-height ${0}
+		min-height ${0}
 snippet miw
-    min-width ${0}
+		min-width ${0}
 snippet op
-    opacity ${0}
+		opacity ${0}
 snippet op:ie
-    filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+		filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
 snippet op:ms
-    -ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+		-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
 snippet orp
-    orphans ${0}
+		orphans ${0}
 snippet o+
-    outline ${1:1px} ${2:solid} ${0}
+		outline ${1:1px} ${2:solid} ${0}
 snippet oc
-    outline-color ${0}
+		outline-color ${0}
 snippet oc:i
-    outline-color invert
+		outline-color invert
 snippet oo
-    outline-offset ${0}
+		outline-offset ${0}
 snippet os
-    outline-style ${0}
+		outline-style ${0}
 snippet ow
-    outline-width ${0}
+		outline-width ${0}
 snippet o
-    outline ${0}
+		outline ${0}
 snippet o:n
-    outline none
+		outline none
 snippet ovs
-    overflow-style ${0}
+		overflow-style ${0}
 snippet ovs:a
-    overflow-style auto
+		overflow-style auto
 snippet ovs:mq
-    overflow-style marquee
+		overflow-style marquee
 snippet ovs:mv
-    overflow-style move
+		overflow-style move
 snippet ovs:p
-    overflow-style panner
+		overflow-style panner
 snippet ovs:s
-    overflow-style scrollbar
+		overflow-style scrollbar
 snippet ovx
-    overflow-x ${0}
+		overflow-x ${0}
 snippet ovx:a
-    overflow-x auto
+		overflow-x auto
 snippet ovx:h
-    overflow-x hidden
+		overflow-x hidden
 snippet ovx:s
-    overflow-x scroll
+		overflow-x scroll
 snippet ovx:v
-    overflow-x visible
+		overflow-x visible
 snippet ovy
-    overflow-y ${0}
+		overflow-y ${0}
 snippet ovy:a
-    overflow-y auto
+		overflow-y auto
 snippet ovy:h
-    overflow-y hidden
+		overflow-y hidden
 snippet ovy:s
-    overflow-y scroll
+		overflow-y scroll
 snippet ovy:v
-    overflow-y visible
+		overflow-y visible
 snippet ov
-    overflow ${0}
+		overflow ${0}
 snippet ov:a
-    overflow auto
+		overflow auto
 snippet ov:h
-    overflow hidden
+		overflow hidden
 snippet ov:s
-    overflow scroll
+		overflow scroll
 snippet ov:v
-    overflow visible
+		overflow visible
 snippet pb
-    padding-bottom ${0}
+		padding-bottom ${0}
 snippet pl
-    padding-left ${0}
+		padding-left ${0}
 snippet pr
-    padding-right ${0}
+		padding-right ${0}
 snippet pt
-    padding-top ${0}
+		padding-top ${0}
 snippet p
-    padding ${0}
+		padding ${0}
 snippet p:4
-    padding ${1:0} ${2:0} ${3:0} ${0:0}
+		padding ${1:0} ${2:0} ${3:0} ${0:0}
 snippet p:3
-    padding ${1:0} ${2:0} ${0:0}
+		padding ${1:0} ${2:0} ${0:0}
 snippet p:2
-    padding ${1:0} ${0:0}
+		padding ${1:0} ${0:0}
 snippet p:0
-    padding 0
+		padding 0
 snippet pgba
-    page-break-after ${0}
+		page-break-after ${0}
 snippet pgba:aw
-    page-break-after always
+		page-break-after always
 snippet pgba:a
-    page-break-after auto
+		page-break-after auto
 snippet pgba:l
-    page-break-after left
+		page-break-after left
 snippet pgba:r
-    page-break-after right
+		page-break-after right
 snippet pgbb
-    page-break-before ${0}
+		page-break-before ${0}
 snippet pgbb:aw
-    page-break-before always
+		page-break-before always
 snippet pgbb:a
-    page-break-before auto
+		page-break-before auto
 snippet pgbb:l
-    page-break-before left
+		page-break-before left
 snippet pgbb:r
-    page-break-before right
+		page-break-before right
 snippet pgbi
-    page-break-inside ${0}
+		page-break-inside ${0}
 snippet pgbi:a
-    page-break-inside auto
+		page-break-inside auto
 snippet pgbi:av
-    page-break-inside avoid
+		page-break-inside avoid
 snippet pos
-    position ${0}
+		position ${0}
 snippet pos:a
-    position absolute
+		position absolute
 snippet pos:f
-    position fixed
+		position fixed
 snippet pos:r
-    position relative
+		position relative
 snippet pos:s
-    position static
+		position static
 snippet q
-    quotes ${0}
+		quotes ${0}
 snippet q:en
-    quotes '\201C' '\201D' '\2018' '\2019'
+		quotes '\201C' '\201D' '\2018' '\2019'
 snippet q:n
-    quotes none
+		quotes none
 snippet q:ru
-    quotes '\00AB' '\00BB' '\201E' '\201C'
+		quotes '\00AB' '\00BB' '\201E' '\201C'
 snippet rz
-    resize ${0}
+		resize ${0}
 snippet rz:b
-    resize both
+		resize both
 snippet rz:h
-    resize horizontal
+		resize horizontal
 snippet rz:n
-    resize none
+		resize none
 snippet rz:v
-    resize vertical
+		resize vertical
 snippet r
-    right ${0}
+		right ${0}
 snippet r:a
-    right auto
+		right auto
 snippet tbl
-    table-layout ${0}
+		table-layout ${0}
 snippet tbl:a
-    table-layout auto
+		table-layout auto
 snippet tbl:f
-    table-layout fixed
+		table-layout fixed
 snippet tal
-    text-align-last ${0}
+		text-align-last ${0}
 snippet tal:a
-    text-align-last auto
+		text-align-last auto
 snippet tal:c
-    text-align-last center
+		text-align-last center
 snippet tal:l
-    text-align-last left
+		text-align-last left
 snippet tal:r
-    text-align-last right
+		text-align-last right
 snippet ta
-    text-align ${0}
+		text-align ${0}
 snippet ta:c
-    text-align center
+		text-align center
 snippet ta:l
-    text-align left
+		text-align left
 snippet ta:r
-    text-align right
+		text-align right
 snippet td
-    text-decoration ${0}
+		text-decoration ${0}
 snippet td:l
-    text-decoration line-through
+		text-decoration line-through
 snippet td:n
-    text-decoration none
+		text-decoration none
 snippet td:o
-    text-decoration overline
+		text-decoration overline
 snippet td:u
-    text-decoration underline
+		text-decoration underline
 snippet te
-    text-emphasis ${0}
+		text-emphasis ${0}
 snippet te:ac
-    text-emphasis accent
+		text-emphasis accent
 snippet te:a
-    text-emphasis after
+		text-emphasis after
 snippet te:b
-    text-emphasis before
+		text-emphasis before
 snippet te:c
-    text-emphasis circle
+		text-emphasis circle
 snippet te:ds
-    text-emphasis disc
+		text-emphasis disc
 snippet te:dt
-    text-emphasis dot
+		text-emphasis dot
 snippet te:n
-    text-emphasis none
+		text-emphasis none
 snippet th
-    text-height ${0}
+		text-height ${0}
 snippet th:a
-    text-height auto
+		text-height auto
 snippet th:f
-    text-height font-size
+		text-height font-size
 snippet th:m
-    text-height max-size
+		text-height max-size
 snippet th:t
-    text-height text-size
+		text-height text-size
 snippet ti
-    text-indent ${0}
+		text-indent ${0}
 snippet ti:-
-    text-indent -9999px
+		text-indent -9999px
 snippet tj
-    text-justify ${0}
+		text-justify ${0}
 snippet tj:a
-    text-justify auto
+		text-justify auto
 snippet tj:d
-    text-justify distribute
+		text-justify distribute
 snippet tj:ic
-    text-justify inter-cluster
+		text-justify inter-cluster
 snippet tj:ii
-    text-justify inter-ideograph
+		text-justify inter-ideograph
 snippet tj:iw
-    text-justify inter-word
+		text-justify inter-word
 snippet tj:k
-    text-justify kashida
+		text-justify kashida
 snippet tj:t
-    text-justify tibetan
+		text-justify tibetan
 snippet to+
-    text-outline ${1:0} ${2:0} ${0}
+		text-outline ${1:0} ${2:0} ${0}
 snippet to
-    text-outline ${0}
+		text-outline ${0}
 snippet to:n
-    text-outline none
+		text-outline none
 snippet tr
-    text-replace ${0}
+		text-replace ${0}
 snippet tr:n
-    text-replace none
+		text-replace none
 snippet tsh+
-    text-shadow ${1:0} ${2:0} ${3:0} ${0}
+		text-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet tsh
-    text-shadow ${0}
+		text-shadow ${0}
 snippet tsh:n
-    text-shadow none
+		text-shadow none
 snippet tt
-    text-transform ${0}
+		text-transform ${0}
 snippet tt:c
-    text-transform capitalize
+		text-transform capitalize
 snippet tt:l
-    text-transform lowercase
+		text-transform lowercase
 snippet tt:n
-    text-transform none
+		text-transform none
 snippet tt:u
-    text-transform uppercase
+		text-transform uppercase
 snippet tw
-    text-wrap ${0}
+		text-wrap ${0}
 snippet tw:no
-    text-wrap none
+		text-wrap none
 snippet tw:n
-    text-wrap normal
+		text-wrap normal
 snippet tw:s
-    text-wrap suppress
+		text-wrap suppress
 snippet tw:u
-    text-wrap unrestricted
+		text-wrap unrestricted
 snippet t
-    top ${0}
+		top ${0}
 snippet t:a
-    top auto
+		top auto
 snippet va
-    vertical-align ${0}
+		vertical-align ${0}
 snippet va:bl
-    vertical-align baseline
+		vertical-align baseline
 snippet va:b
-    vertical-align bottom
+		vertical-align bottom
 snippet va:m
-    vertical-align middle
+		vertical-align middle
 snippet va:sub
-    vertical-align sub
+		vertical-align sub
 snippet va:sup
-    vertical-align super
+		vertical-align super
 snippet va:tb
-    vertical-align text-bottom
+		vertical-align text-bottom
 snippet va:tt
-    vertical-align text-top
+		vertical-align text-top
 snippet va:t
-    vertical-align top
+		vertical-align top
 snippet v
-    visibility ${0}
+		visibility ${0}
 snippet v:c
-    visibility collapse
+		visibility collapse
 snippet v:h
-    visibility hidden
+		visibility hidden
 snippet v:v
-    visibility visible
+		visibility visible
 snippet whsc
-    white-space-collapse ${0}
+		white-space-collapse ${0}
 snippet whsc:ba
-    white-space-collapse break-all
+		white-space-collapse break-all
 snippet whsc:bs
-    white-space-collapse break-strict
+		white-space-collapse break-strict
 snippet whsc:k
-    white-space-collapse keep-all
+		white-space-collapse keep-all
 snippet whsc:l
-    white-space-collapse loose
+		white-space-collapse loose
 snippet whsc:n
-    white-space-collapse normal
+		white-space-collapse normal
 snippet whs
-    white-space ${0}
+		white-space ${0}
 snippet whs:n
-    white-space normal
+		white-space normal
 snippet whs:nw
-    white-space nowrap
+		white-space nowrap
 snippet whs:pl
-    white-space pre-line
+		white-space pre-line
 snippet whs:pw
-    white-space pre-wrap
+		white-space pre-wrap
 snippet whs:p
-    white-space pre
+		white-space pre
 snippet wid
-    widows ${0}
+		widows ${0}
 snippet w
-    width ${0}
+		width ${0}
 snippet w:a
-    width auto
+		width auto
 snippet wob
-    word-break ${0}
+		word-break ${0}
 snippet wob:ba
-    word-break break-all
+		word-break break-all
 snippet wob:bs
-    word-break break-strict
+		word-break break-strict
 snippet wob:k
-    word-break keep-all
+		word-break keep-all
 snippet wob:l
-    word-break loose
+		word-break loose
 snippet wob:n
-    word-break normal
+		word-break normal
 snippet wos
-    word-spacing ${0}
+		word-spacing ${0}
 snippet wow
-    word-wrap ${0}
+		word-wrap ${0}
 snippet wow:no
-    word-wrap none
+		word-wrap none
 snippet wow:n
-    word-wrap normal
+		word-wrap normal
 snippet wow:s
-    word-wrap suppress
+		word-wrap suppress
 snippet wow:u
-    word-wrap unrestricted
+		word-wrap unrestricted
 snippet z
-    z-index ${0}
+		z-index ${0}
 snippet z:a
-    z-index auto
+		z-index auto
 snippet zoo
-    zoom 1
+		zoom 1
 snippet :h
-    :hover
+		:hover
 snippet :fc
-    :first-child
+		:first-child
 snippet :lc
-    :last-child
+		:last-child
 snippet :nc
-    :nth-child(${0})
+		:nth-child(${0})
 snippet :nlc
-    :nth-last-child(${0})
+		:nth-last-child(${0})
 snippet :oc
-    :only-child
+		:only-child
 snippet :a
-    :after
+		:after
 snippet :b
-    :before
+		:before
 snippet ::a
-    ::after
+		::after
 snippet ::b
-    ::before
+		::before
 snippet if
-    if ${0}
+		if ${0}
 snippet mix
-    ${1}(${0})
+		${1}(${0})
 snippet for
-    for ${1:i} in ${0}
+		for ${1:i} in ${0}
 snippet keyf
-    @keyframes ${0}
+		@keyframes ${0}