Updated .vimrc

20 files changed, 2839 insertions, 1 deletions

diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
deleted file mode 160000
-Subproject 0b28e334e65b6628b0a61c412fcb45204a2f2ba
diff --git a/vim/.vim/bundle/Vundle.vim/.gitignore b/vim/.vim/bundle/Vundle.vim/.gitignore
new file mode 100644
index 0000000..f276604
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/.gitignore
@@ -0,0 +1,2 @@
+doc/tags
+.netrwhist
diff --git a/vim/.vim/bundle/Vundle.vim/CONTRIBUTING.md b/vim/.vim/bundle/Vundle.vim/CONTRIBUTING.md
new file mode 100644
index 0000000..2162ffc
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/CONTRIBUTING.md
@@ -0,0 +1,111 @@
+Pull Requests
+=============
+
+1. Please squash your commits to minimize the log pollution. This is more of a convenience for the maintainer who pulls. If you are unfamiliar, see [here](http://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/).
+
+2. Clearly describe what you aim to fix or add to Vundle.
+
+3. Try to minimize code changes and use existing style/functions.
+
+Issues
+======
+
+## Check For Answers
+
+Before submitting an issue, be sure to check the following places for answers.
+
+1. Vundle docs at [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt).
+
+2. The [FAQ](https://github.com/gmarik/Vundle.vim/search).
+
+3. [Search](https://github.com/gmarik/Vundle.vim/search) the repository for related issues.
+
+## Try To Eliminate Your Vimrc
+
+In order to make sure it isn't just `.vimrc` replace your own config file with the [minimal vimrc](https://github.com/gmarik/Vundle.vim/blob/master/test/minirc.vim). Clear out bundles and then try to reproduce.
+
+If the problem stops, likely there is an issue in your user configuration. You can incrementally add back your user changes to the minimal file testing the bug each time. This will allow you to slowly bisect the issue. You may want to test one plugin at a time.
+
+If you can still reproduce the problem, try to find the smallest `.vimrc` config file that creates the problem to include later.
+
+## Guidelines
+
+To better respond to issues please follow these general guidelines when explaining the problem.
+
+1. Clearly describe what the error is, if relevant attach output/screenshots.
+
+2. Describe how developers can reproduce the bug, the steps should be from starting Vim.
+
+3. Include your OS, version and architecture. For example, Windows 7 64, Kubuntu 13.04 32, etc...
+
+4. If relevant to reproducing the bug, include the smallest subset of your `.vimrc` that causes the issue. Put this in code tags.
+
+5. At the end of your issue, please put the output of `vim --version` in code tags.
+
+## Example Post
+
+I am using Vim on Kubuntu 13.04 64 bit and I get the following error... (add further explanation here)
+
+To reproduce the bug, use the vimrc file below and run `:BundleInstall`... (continue with steps)
+
+Vimrc:
+```
+set nocompatible
+syntax on
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim/
+call vundle#rc()
+Bundle 'gmarik/Vundle.vim'
+Bundle 'relevant/plugin'
+filetype plugin indent on
+
+.... more user configs here...
+```
+
+Vim Version:
+```
+VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Aug 15 2013 10:58:39)
+Included patches: 1-5
+Modified by pkg-vim-maintainers@lists.alioth.debian.org
+Compiled by buildd@
+Huge version with GTK2 GUI.  Features included (+) or not (-):
++arabic          +file_in_path    +mouse_sgr       +tag_binary
++autocmd         +find_in_path    -mouse_sysmouse  +tag_old_static
++balloon_eval    +float           +mouse_urxvt     -tag_any_white
++browse          +folding         +mouse_xterm     +tcl
+++builtin_terms  -footer          +multi_byte      +terminfo
++byte_offset     +fork()          +multi_lang      +termresponse
++cindent         +gettext         -mzscheme        +textobjects
++clientserver    -hangul_input    +netbeans_intg   +title
++clipboard       +iconv           +path_extra      +toolbar
++cmdline_compl   +insert_expand   +perl            +user_commands
++cmdline_hist    +jumplist        +persistent_undo +vertsplit
++cmdline_info    +keymap          +postscript      +virtualedit
++comments        +langmap         +printer         +visual
++conceal         +libcall         +profile         +visualextra
++cryptv          +linebreak       +python          +viminfo
++cscope          +lispindent      -python3         +vreplace
++cursorbind      +listcmds        +quickfix        +wildignore
++cursorshape     +localmap        +reltime         +wildmenu
++dialog_con_gui  +lua             +rightleft       +windows
++diff            +menu            +ruby            +writebackup
++digraphs        +mksession       +scrollbind      +X11
++dnd             +modify_fname    +signs           -xfontset
+-ebcdic          +mouse           +smartindent     +xim
++emacs_tags      +mouseshape      -sniff           +xsmp_interact
++eval            +mouse_dec       +startuptime     +xterm_clipboard
++ex_extra        +mouse_gpm       +statusline      -xterm_save
++extra_search    -mouse_jsbterm   -sun_workshop
++farsi           +mouse_netterm   +syntax
+   system vimrc file: "$VIM/vimrc"
+     user vimrc file: "$HOME/.vimrc"
+ 2nd user vimrc file: "~/.vim/vimrc"
+      user exrc file: "$HOME/.exrc"
+  system gvimrc file: "$VIM/gvimrc"
+    user gvimrc file: "$HOME/.gvimrc"
+2nd user gvimrc file: "~/.vim/gvimrc"
+    system menu file: "$VIMRUNTIME/menu.vim"
+  fall-back for $VIM: "/usr/share/vim"
+Compilation: gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/harfbuzz     -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1     -I/usr/include/tcl8.5  -D_REENTRANT=1  -D_THREAD_SAFE=1  -D_LARGEFILE64_SOURCE=1
+Linking: gcc   -L. -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic -Wl,-E  -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,--as-needed -o vim   -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0   -lSM -lICE -lXpm -lXt -lX11 -lXdmcp -lSM -lICE  -lm -ltinfo -lnsl  -lselinux  -lacl -lattr -lgpm -ldl  -L/usr/lib -llua5.1 -Wl,-E  -fstack-protector -L/usr/local/lib  -L/usr/lib/perl/5.14/CORE -lperl -ldl -lm -lpthread -lcrypt -L/usr/lib/python2.7/config-x86_64-linux-gnu -lpython2.7 -lpthread -ldl -lutil -lm -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions  -L/usr/lib/x86_64-linux-gnu -ltcl8.5 -ldl -lpthread -lieee -lm -lruby-1.9.1 -lpthread -lrt -ldl -lcrypt -lm  -L/usr/lib
+```
diff --git a/vim/.vim/bundle/Vundle.vim/LICENSE-MIT.txt b/vim/.vim/bundle/Vundle.vim/LICENSE-MIT.txt
new file mode 100644
index 0000000..003904d
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/LICENSE-MIT.txt
@@ -0,0 +1,7 @@
+Copyright (C) 2010 http://github.com/gmarik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vim/.vim/bundle/Vundle.vim/README.md b/vim/.vim/bundle/Vundle.vim/README.md
new file mode 100644
index 0000000..13d4eb6
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/README.md
@@ -0,0 +1,158 @@
+## [Help Maintain Vundle](https://github.com/gmarik/Vundle.vim/issues/383)
+
+## About
+
+[Vundle] is short for _Vim bundle_ and is a [Vim] plugin manager.
+
+[Vundle] allows you to...
+
+* keep track of and [configure] your plugins right in the `.vimrc`
+* [install] configured plugins (a.k.a. scripts/bundle)
+* [update] configured plugins
+* [search] by name all available [Vim scripts]
+* [clean] unused plugins up
+* run the above actions in a *single keypress* with [interactive mode]
+
+[Vundle] automatically...
+
+* manages the [runtime path] of your installed scripts
+* regenerates [help tags] after installing and updating
+
+[Vundle] is undergoing an [interface change], please stay up to date to get latest changes.
+
+[![Gitter-chat](https://badges.gitter.im/gmarik/Vundle.vim.png)](https://gitter.im/gmarik/Vundle.vim) for discussion and support.
+
+![Vundle-installer](http://i.imgur.com/Rueh7Cc.png)
+
+## Quick Start
+
+1. Introduction:
+
+   Installation requires [Git] and triggers [`git clone`] for each configured repository to `~/.vim/bundle/` by default.
+   Curl is required for search.
+
+   If you are using Windows, go directly to [Windows setup]. If you run into any issues, please consult the [FAQ].
+   See [Tips] for some advanced configurations.
+
+2. Set up [Vundle]:
+
+   `$ git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
+
+3. Configure Plugins:
+
+   Put this at the top of your `.vimrc` to use Vundle. Remove plugins you don't need, they are for illustration purposes.
+
+   ```vim
+   set nocompatible              " be iMproved, required
+   filetype off                  " required
+
+   " set the runtime path to include Vundle and initialize
+   set rtp+=~/.vim/bundle/Vundle.vim
+   call vundle#begin()
+   " alternatively, pass a path where Vundle should install plugins
+   "call vundle#begin('~/some/path/here')
+
+   " let Vundle manage Vundle, required
+   Plugin 'gmarik/Vundle.vim'
+
+   " The following are examples of different formats supported.
+   " Keep Plugin commands between vundle#begin/end.
+   " plugin on GitHub repo
+   Plugin 'tpope/vim-fugitive'
+   " plugin from http://vim-scripts.org/vim/scripts.html
+   Plugin 'L9'
+   " Git plugin not hosted on GitHub
+   Plugin 'git://git.wincent.com/command-t.git'
+   " git repos on your local machine (i.e. when working on your own plugin)
+   Plugin 'file:///home/gmarik/path/to/plugin'
+   " The sparkup vim script is in a subdirectory of this repo called vim.
+   " Pass the path to set the runtimepath properly.
+   Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
+   " Avoid a name conflict with L9
+   Plugin 'user/L9', {'name': 'newL9'}
+
+   " All of your Plugins must be added before the following line
+   call vundle#end()            " required
+   filetype plugin indent on    " required
+   " To ignore plugin indent changes, instead use:
+   "filetype plugin on
+   "
+   " Brief help
+   " :PluginList       - lists configured plugins
+   " :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
+   " :PluginSearch foo - searches for foo; append `!` to refresh local cache
+   " :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
+   "
+   " see :h vundle for more details or wiki for FAQ
+   " Put your non-Plugin stuff after this line
+   ```
+
+4. Install Plugins:
+
+   Launch `vim` and run `:PluginInstall`
+
+   To install from command line: `vim +PluginInstall +qall`
+
+## Docs
+
+See the [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt) Vimdoc for more details.
+
+## Changelog
+
+See the [changelog](https://github.com/gmarik/Vundle.vim/blob/master/changelog.md).
+
+## People Using Vundle
+
+see [Examples](https://github.com/gmarik/Vundle.vim/wiki/Examples)
+
+## Contributors
+
+see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributors)
+
+*Thank you!*
+
+## Inspiration & Ideas
+
+* [pathogen.vim](http://github.com/tpope/vim-pathogen/)
+* [Bundler](https://github.com/bundler/bundler)
+* [Scott Bronson](http://github.com/bronson)
+
+## Also
+
+* Vundle was developed and tested with [Vim] 7.3 on OS X, Linux and Windows
+* Vundle tries to be as [KISS](http://en.wikipedia.org/wiki/KISS_principle) as possible
+
+## TODO:
+[Vundle] is a work in progress, so any ideas and patches are appreciated.
+
+* ✓ activate newly added bundles on `.vimrc` reload or after `:PluginInstall`
+* ✓ use preview window for search results
+* ✓ Vim documentation
+* ✓ put Vundle in `bundles/` too (will fix Vundle help)
+* ✓ tests
+* ✓ improve error handling
+* allow specifying revision/version?
+* handle dependencies
+* show description in search results
+* search by description as well
+* make it rock!
+
+[Vundle]:http://github.com/gmarik/Vundle.vim
+[Windows setup]:https://github.com/gmarik/Vundle.vim/wiki/Vundle-for-Windows
+[FAQ]:https://github.com/gmarik/Vundle.vim/wiki
+[Tips]:https://github.com/gmarik/Vundle.vim/wiki/Tips-and-Tricks
+[Vim]:http://www.vim.org
+[Git]:http://git-scm.com
+[`git clone`]:http://gitref.org/creating/#clone
+
+[Vim scripts]:http://vim-scripts.org/vim/scripts.html
+[help tags]:http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags
+[runtime path]:http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27
+
+[configure]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
+[install]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
+[update]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
+[search]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
+[clean]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
+[interactive mode]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
+[interface change]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
diff --git a/vim/.vim/bundle/Vundle.vim/autoload/vundle.vim b/vim/.vim/bundle/Vundle.vim/autoload/vundle.vim
new file mode 100644
index 0000000..2939048
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/autoload/vundle.vim
@@ -0,0 +1,83 @@
+" Vundle        is a shortcut for Vim Bundle and Is a simple plugin manager for Vim
+" Author:       gmarik
+" HomePage:     http://github.com/gmarik/Vundle.vim
+" Readme:       http://github.com/gmarik/Vundle.vim/blob/master/README.md
+" Version:      0.10.2
+
+" Plugin Commands
+com! -nargs=+  -bar   Plugin
+\ call vundle#config#bundle(<args>)
+
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete PluginInstall
+\ call vundle#installer#new('!' == '<bang>', <q-args>)
+
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete PluginSearch
+\ call vundle#scripts#all('!' == '<bang>', <q-args>)
+
+com! -nargs=0 -bang PluginList
+\ call vundle#installer#list('!' == '<bang>')
+
+com! -nargs=? -bang   PluginClean
+\ call vundle#installer#clean('!' == '<bang>')
+
+com! -nargs=0         PluginDocs
+\ call vundle#installer#helptags(g:bundles)
+
+" Aliases
+com! PluginUpdate PluginInstall!
+
+" Vundle Aliases
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleInstall PluginInstall<bang> <args>
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleSearch  PluginSearch<bang> <args>
+com! -nargs=? -bang                                          VundleClean   PluginClean<bang>
+com! -nargs=0                                                VundleDocs    PluginDocs
+com!                                                         VundleUpdate  PluginInstall!
+
+" Deprecated Commands
+com! -nargs=+                                                Bundle        call vundle#config#bundle(<args>)
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleInstall PluginInstall<bang> <args>
+com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleSearch  PluginSearch<bang> <args>
+com! -nargs=0 -bang                                          BundleList    PluginList<bang>
+com! -nargs=? -bang                                          BundleClean   PluginClean<bang>
+com! -nargs=0                                                BundleDocs    PluginDocs
+com!                                                         BundleUpdate  PluginInstall!
+
+" Set up the signs used in the installer window. (See :help signs)
+if (has('signs'))
+  sign define Vu_error    text=!  texthl=Error
+  sign define Vu_active   text=>  texthl=Comment
+  sign define Vu_todate   text=.  texthl=Comment
+  sign define Vu_new      text=+  texthl=Comment
+  sign define Vu_updated  text=*  texthl=Comment
+  sign define Vu_deleted  text=-  texthl=Comment
+  sign define Vu_helptags text=*  texthl=Comment
+  sign define Vu_pinned   text==  texthl=Comment
+endif
+
+" Set up Vundle.  This function has to be called from the users vimrc file.
+" This will force Vim to source this file as a side effect which wil define
+" the :Plugin command.  After calling this function the user can use the
+" :Plugin command in the vimrc.  It is not possible to do this automatically
+" because when loading the vimrc file no plugins where loaded yet.
+func! vundle#rc(...) abort
+  let g:bundle_dir = len(a:000) > 0 ? expand(a:1, 1) : expand('$HOME/.vim/bundle', 1)
+  let g:updated_bundles = []
+  let g:vundle_log = []
+  let g:vundle_changelog = ['Updated Plugins:']
+  call vundle#config#init()
+endf
+
+" Alternative to vundle#rc, offers speed up by modifying rtp only when end()
+" called later.
+func! vundle#begin(...) abort
+  let g:vundle_lazy_load = 1
+  call call('vundle#rc', a:000)
+endf
+
+" Finishes putting plugins on the rtp.
+func! vundle#end(...) abort
+  unlet g:vundle_lazy_load
+  call vundle#config#activate_bundles()
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/vim/.vim/bundle/Vundle.vim/autoload/vundle/config.vim b/vim/.vim/bundle/Vundle.vim/autoload/vundle/config.vim
new file mode 100644
index 0000000..5ecb30b
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/autoload/vundle/config.vim
@@ -0,0 +1,278 @@
+" ---------------------------------------------------------------------------
+" Add a plugin to the runtimepath.
+"
+" arg    -- a string specifying the plugin
+" ...    -- a dictionary of options for the plugin
+" return -- the return value from vundle#config#init_bundle()
+" ---------------------------------------------------------------------------
+func! vundle#config#bundle(arg, ...)
+  let bundle = vundle#config#init_bundle(a:arg, a:000)
+  if !s:check_bundle_name(bundle)
+    return
+  endif
+  if exists('g:vundle_lazy_load') && g:vundle_lazy_load
+    call add(g:bundles, bundle)
+  else
+    call s:rtp_rm_a()
+    call add(g:bundles, bundle)
+    call s:rtp_add_a()
+    call s:rtp_add_defaults()
+  endif
+  return bundle
+endf
+
+
+" ---------------------------------------------------------------------------
+"  When lazy bundle load is used (begin/end functions), add all configured
+"  bundles to runtimepath and reorder appropriately.
+" ---------------------------------------------------------------------------
+func! vundle#config#activate_bundles()
+  call s:rtp_add_a()
+  call s:rtp_add_defaults()
+endf
+
+
+" ---------------------------------------------------------------------------
+" Initialize Vundle.
+"
+" Start a new bundles list and make sure the runtimepath does not contain
+" directories from a previous call. In theory, this should only be called
+" once.
+" ---------------------------------------------------------------------------
+func! vundle#config#init()
+  if !exists('g:bundles') | let g:bundles = [] | endif
+  call s:rtp_rm_a()
+  let g:bundles = []
+  let g:bundle_names = {}
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add a list of bundles to the runtimepath and source them.
+"
+" bundles -- a list of bundle objects
+" ---------------------------------------------------------------------------
+func! vundle#config#require(bundles) abort
+  for b in a:bundles
+    call s:rtp_add(b.rtpath)
+    call s:rtp_add(g:bundle_dir)
+    " TODO: it has to be relative rtpath, not bundle.name
+    exec 'runtime! '.b.name.'/plugin/*.vim'
+    exec 'runtime! '.b.name.'/after/*.vim'
+    call s:rtp_rm(g:bundle_dir)
+  endfor
+  call s:rtp_add_defaults()
+endf
+
+
+" ---------------------------------------------------------------------------
+" Create a bundle object from a bundle specification.
+"
+" name   -- the bundle specification as a string
+" opts   -- the options dictionary from then bundle definition
+" return -- an initialized bundle object
+" ---------------------------------------------------------------------------
+func! vundle#config#init_bundle(name, opts)
+  if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
+    echo "Spurious leading and/or trailing whitespace found in plugin spec '" . a:name . "'"
+  endif
+  let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')), 'keep')
+  let b = extend(opts, copy(s:bundle))
+  let b.rtpath = s:rtpath(opts)
+  return b
+endf
+
+
+" ---------------------------------------------------------------------------
+" Check if the current bundle name has already been used in this running
+" instance and show an error to that effect.
+"
+" bundle -- a bundle object whose name is to be checked
+" return -- 0 if the bundle's name has been seen before, 1 otherwise
+" ---------------------------------------------------------------------------
+funct! s:check_bundle_name(bundle)
+  if has_key(g:bundle_names, a:bundle.name)
+    echoerr 'Vundle error: Name collision for Plugin ' . a:bundle.name_spec .
+          \ '. Plugin ' . g:bundle_names[a:bundle.name] .
+          \ ' previously used the name "' . a:bundle.name . '"' .
+          \ '. Skipping Plugin ' . a:bundle.name_spec . '.'
+    return 0
+  endif
+  let g:bundle_names[a:bundle.name] = a:bundle.name_spec
+  return 1
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the options which can be supplied with the bundle specification.
+" Corresponding documentation: vundle-plugins-configure
+"
+" opts   -- a dictionary with the user supplied options for the bundle
+" return -- a dictionary with the user supplied options for the bundle, this
+"           will be merged with a s:bundle object into one dictionary.
+" ---------------------------------------------------------------------------
+func! s:parse_options(opts)
+  " TODO: improve this
+  if len(a:opts) != 1 | return {} | endif
+
+  if type(a:opts[0]) == type({})
+    return a:opts[0]
+  else
+    return {'rev': a:opts[0]}
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the plugin specification.  Corresponding documentation:
+" vundle-plugins-uris
+"
+" arg    -- the string supplied to identify the plugin
+" return -- a dictionary with the folder name (key 'name') and the uri (key
+"           'uri') for cloning the plugin  and the original argument (key
+"           'name_spec')
+" ---------------------------------------------------------------------------
+func! s:parse_name(arg)
+  let arg = a:arg
+  let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'https'
+
+  if    arg =~? '^\s*\(gh\|github\):\S\+'
+  \  || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$'
+    let uri = git_proto.'://github.com/'.split(arg, ':')[-1]
+    if uri !~? '\.git$'
+      let uri .= '.git'
+    endif
+    let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i')
+  elseif arg =~? '^\s*\(git@\|git://\)\S\+'
+  \   || arg =~? '\(file\|https\?\)://'
+  \   || arg =~? '\.git\s*$'
+    let uri = arg
+    let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1]
+  else
+    let name = arg
+    let uri  = git_proto.'://github.com/vim-scripts/'.name.'.git'
+  endif
+  return {'name': name, 'uri': uri, 'name_spec': arg }
+endf
+
+
+" ---------------------------------------------------------------------------
+"  Modify the runtimepath, after all bundles have been added, so that the
+"  directories that were in the default runtimepath appear first in the list
+"  (with their 'after' directories last).
+" ---------------------------------------------------------------------------
+func! s:rtp_add_defaults()
+  let current = &rtp
+  set rtp&vim
+  let default = &rtp
+  let &rtp = current
+  let default_rtp_items = split(default, ',')
+  if !empty(default_rtp_items)
+    let first_item = fnameescape(default_rtp_items[0])
+    exec 'set rtp-=' . first_item
+    exec 'set rtp^=' . first_item
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Remove all paths for the plugins which are managed by Vundle from the
+" runtimepath.
+" ---------------------------------------------------------------------------
+func! s:rtp_rm_a()
+  let paths = map(copy(g:bundles), 'v:val.rtpath')
+  let prepends = join(paths, ',')
+  let appends = join(paths, '/after,').'/after'
+  exec 'set rtp-='.fnameescape(prepends)
+  exec 'set rtp-='.fnameescape(appends)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add all paths for the plugins which are managed by Vundle to the
+" runtimepath.
+" ---------------------------------------------------------------------------
+func! s:rtp_add_a()
+  let paths = map(copy(g:bundles), 'v:val.rtpath')
+  let prepends = join(paths, ',')
+  let appends = join(paths, '/after,').'/after'
+  exec 'set rtp^='.fnameescape(prepends)
+  exec 'set rtp+='.fnameescape(appends)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Remove a directory and the corresponding 'after' directory from runtimepath.
+"
+" dir    -- the directory name to be removed as a string.  The corresponding
+"           'after' directory will also be removed.
+" ---------------------------------------------------------------------------
+func! s:rtp_rm(dir) abort
+  exec 'set rtp-='.fnameescape(expand(a:dir, 1))
+  exec 'set rtp-='.fnameescape(expand(a:dir.'/after', 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add a directory and the corresponding 'after' directory to runtimepath.
+"
+" dir    -- the directory name to be added as a string.  The corresponding
+"           'after' directory will also be added.
+" ---------------------------------------------------------------------------
+func! s:rtp_add(dir) abort
+  exec 'set rtp^='.fnameescape(expand(a:dir, 1))
+  exec 'set rtp+='.fnameescape(expand(a:dir.'/after', 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Expand and simplify a path.
+"
+" path   -- the path to expand as a string
+" return -- the expanded and simplified path
+" ---------------------------------------------------------------------------
+func! s:expand_path(path) abort
+  return simplify(expand(a:path, 1))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Find the actual path inside a bundle directory to be added to the
+" runtimepath.  It might be provided by the user with the 'rtp' option.
+" Corresponding documentation: vundle-plugins-configure
+"
+" opts   -- a bundle dict
+" return -- expanded path to the corresponding plugin directory
+" ---------------------------------------------------------------------------
+func! s:rtpath(opts)
+  return has_key(a:opts, 'rtp') ? s:expand_path(a:opts.path().'/'.a:opts.rtp) : a:opts.path()
+endf
+
+
+" ---------------------------------------------------------------------------
+" a bundle 'object'
+" ---------------------------------------------------------------------------
+let s:bundle = {}
+
+
+" ---------------------------------------------------------------------------
+" Return the absolute path to the directory inside the bundle directory
+" (prefix) where thr bundle will be cloned.
+"
+" return -- the target location to clone this bundle to
+" ---------------------------------------------------------------------------
+func! s:bundle.path()
+  return s:expand_path(g:bundle_dir.'/'.self.name)
+endf
+
+
+" ---------------------------------------------------------------------------
+"  Determine if the bundle has the pinned attribute set in the config
+"
+"  return -- 1 if the bundle is pinned, 0 otherwise
+" ---------------------------------------------------------------------------
+func! s:bundle.is_pinned()
+  return get(self, 'pinned')
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/vim/.vim/bundle/Vundle.vim/autoload/vundle/installer.vim b/vim/.vim/bundle/Vundle.vim/autoload/vundle/installer.vim
new file mode 100644
index 0000000..614b64b
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/autoload/vundle/installer.vim
@@ -0,0 +1,534 @@
+" ---------------------------------------------------------------------------
+" Try to clone all new bundles given (or all bundles in g:bundles by default)
+" to g:bundle_dir.  If a:bang is 1 it will also update all plugins (git pull).
+"
+" bang   -- 1 or 0
+" ...    -- any number of bundle specifications (separate arguments)
+" ---------------------------------------------------------------------------
+func! vundle#installer#new(bang, ...) abort
+  let bundles = (a:1 == '') ?
+        \ g:bundles :
+        \ map(copy(a:000), 'vundle#config#bundle(v:val, {})')
+
+  let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec'))
+  call vundle#scripts#view('Installer',['" Installing plugins to '.expand(g:bundle_dir, 1)], names +  ['Helptags'])
+
+  " This calls 'add' as a normal mode command. This is a buffer local mapping
+  " defined in vundle#scripts#view(). The mapping will call a buffer local
+  " command InstallPlugin which in turn will call vundle#installer#run() with
+  " vundle#installer#install().
+  call s:process(a:bang, (a:bang ? 'add!' : 'add'))
+
+  call vundle#config#require(bundles)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Iterate over all lines in a Vundle window and execute the given command for
+" every line.  Used by the installation and cleaning functions.
+"
+" bang   -- not used (FIXME)
+" cmd    -- the (normal mode) command to execute for every line as a string
+" ---------------------------------------------------------------------------
+func! s:process(bang, cmd)
+  let msg = ''
+
+  redraw
+  sleep 1m
+
+  let lines = (getline('.','$')[0:-2])
+
+  for line in lines
+    redraw
+
+    exec ':norm '.a:cmd
+
+    if 'error' == g:vundle_last_status
+      let msg = 'With errors; press l to view log'
+    endif
+
+    if 'updated' == g:vundle_last_status && empty(msg)
+      let msg = 'Plugins updated; press u to view changelog'
+    endif
+
+    " goto next one
+    exec ':+1'
+
+    setl nomodified
+  endfor
+
+  redraw
+  echo 'Done! '.msg
+endf
+
+
+" ---------------------------------------------------------------------------
+" Call another function in the different Vundle windows.
+"
+" func_name -- the function to call
+" name      -- the bundle name to call func_name for (string)
+" ...       -- the argument to be used when calling func_name (only the first
+"              optional argument will be used)
+" return    -- the status returned by the call to func_name
+" ---------------------------------------------------------------------------
+func! vundle#installer#run(func_name, name, ...) abort
+  let n = a:name
+
+  echo 'Processing '.n
+  call s:sign('active')
+
+  sleep 1m
+
+  let status = call(a:func_name, a:1)
+
+  call s:sign(status)
+
+  redraw
+
+  if 'new' == status
+    echo n.' installed'
+  elseif 'updated' == status
+    echo n.' updated'
+  elseif 'todate' == status
+    echo n.' already installed'
+  elseif 'deleted' == status
+    echo n.' deleted'
+  elseif 'helptags' == status
+    echo n.' regenerated'
+  elseif 'pinned' == status
+    echo n.' pinned'
+  elseif 'error' == status
+    echohl Error
+    echo 'Error processing '.n
+    echohl None
+    sleep 1
+  else
+    throw 'whoops, unknown status:'.status
+  endif
+
+  let g:vundle_last_status = status
+
+  return status
+endf
+
+
+" ---------------------------------------------------------------------------
+" Put a sign on the current line, indicating the status of the installation
+" step.
+"
+" status -- string describing the status
+" ---------------------------------------------------------------------------
+func! s:sign(status)
+  if (!has('signs'))
+    return
+  endif
+
+  exe ":sign place ".line('.')." line=".line('.')." name=Vu_". a:status ." buffer=" . bufnr("%")
+endf
+
+
+" ---------------------------------------------------------------------------
+" Install a plugin, then add it to the runtimepath and source it.
+"
+" bang   -- 1 or 0, passed directly to vundle#installer#install()
+" name   -- the name of a bundle (string)
+" return -- the return value from vundle#installer#install()
+" ---------------------------------------------------------------------------
+func! vundle#installer#install_and_require(bang, name) abort
+  let result = vundle#installer#install(a:bang, a:name)
+  let b = vundle#config#bundle(a:name, {})
+  call vundle#installer#helptags([b])
+  call vundle#config#require([b])
+  return result
+endf
+
+
+" ---------------------------------------------------------------------------
+" Install or update a bundle given by its name.
+"
+" bang   -- 1 or 0, passed directly to s:sync()
+" name   -- the name of a bundle (string)
+" return -- the return value from s:sync()
+" ---------------------------------------------------------------------------
+func! vundle#installer#install(bang, name) abort
+  if !isdirectory(g:bundle_dir) | call mkdir(g:bundle_dir, 'p') | endif
+
+  let n = substitute(a:name,"['".'"]\+','','g')
+  let matched = filter(copy(g:bundles), 'v:val.name_spec == n')
+
+  if len(matched) > 0
+    let b = matched[0]
+  else
+    let b = vundle#config#init_bundle(a:name, {})
+  endif
+
+  return s:sync(a:bang, b)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Call :helptags for all bundles in g:bundles.
+"
+" return -- 'error' if an error occurred, else return 'helptags'
+" ---------------------------------------------------------------------------
+func! vundle#installer#docs() abort
+  let error_count = vundle#installer#helptags(g:bundles)
+  if error_count > 0
+      return 'error'
+  endif
+  return 'helptags'
+endf
+
+
+" ---------------------------------------------------------------------------
+" Call :helptags for a list of bundles.
+"
+" bundles -- a list of bundle dictionaries for which :helptags should be
+"            called.
+" return  -- the number of directories where :helptags failed
+" ---------------------------------------------------------------------------
+func! vundle#installer#helptags(bundles) abort
+  let bundle_dirs = map(copy(a:bundles),'v:val.rtpath')
+  let help_dirs = filter(bundle_dirs, 's:has_doc(v:val)')
+
+  call s:log('')
+  call s:log('Helptags:')
+
+  let statuses = map(copy(help_dirs), 's:helptags(v:val)')
+  let errors = filter(statuses, 'v:val == 0')
+
+  call s:log('Helptags: '.len(help_dirs).' plugins processed')
+
+  return len(errors)
+endf
+
+
+" ---------------------------------------------------------------------------
+" List all installed plugins.
+" Corresponding documentation: vundle-plugins-list
+"
+" bang   -- not used
+" ---------------------------------------------------------------------------
+func! vundle#installer#list(bang) abort
+  let bundles = vundle#scripts#bundle_names(map(copy(g:bundles), 'v:val.name_spec'))
+  call vundle#scripts#view('list', ['" My Plugins'], bundles)
+  redraw
+  echo len(g:bundles).' plugins configured'
+endf
+
+
+" ---------------------------------------------------------------------------
+" List and remove all directories in the bundle directory which are not
+" activated (added to the bundle list).
+"
+" bang   -- 0 if the user should be asked to confirm every deletion, 1 if they
+"           should be removed unconditionally
+" ---------------------------------------------------------------------------
+func! vundle#installer#clean(bang) abort
+  let bundle_dirs = map(copy(g:bundles), 'v:val.path()')
+  let all_dirs = (v:version > 702 || (v:version == 702 && has("patch51")))
+  \   ? split(globpath(g:bundle_dir, '*', 1), "\n")
+  \   : split(globpath(g:bundle_dir, '*'), "\n")
+  let x_dirs = filter(all_dirs, '0 > index(bundle_dirs, v:val)')
+
+  if empty(x_dirs)
+    let headers = ['" All clean!']
+    let names = []
+  else
+    let headers = ['" Removing Plugins:']
+    let names = vundle#scripts#bundle_names(map(copy(x_dirs), 'fnamemodify(v:val, ":t")'))
+  end
+
+  call vundle#scripts#view('clean', headers, names)
+  redraw
+
+  if (a:bang || empty(names))
+    call s:process(a:bang, 'D')
+  else
+    call inputsave()
+    let response = input('Continue? [Y/n]: ')
+    call inputrestore()
+    if (response =~? 'y' || response == '')
+      call s:process(a:bang, 'D')
+    endif
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Delete to directory for a plugin.
+"
+" bang     -- not used
+" dir_name -- the bundle directory to be deleted (as a string)
+" return   -- 'error' if an error occurred, 'deleted' if the plugin folder was
+"             successfully deleted
+" ---------------------------------------------------------------------------
+func! vundle#installer#delete(bang, dir_name) abort
+
+  let cmd = ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh'))) ?
+  \           'rmdir /S /Q' :
+  \           'rm -rf'
+
+  let bundle = vundle#config#init_bundle(a:dir_name, {})
+  let cmd .= ' '.vundle#installer#shellesc(bundle.path())
+
+  let out = s:system(cmd)
+
+  call s:log('')
+  call s:log('Plugin '.a:dir_name)
+  call s:log(cmd, '$ ')
+  call s:log(out, '> ')
+
+  if 0 != v:shell_error
+    return 'error'
+  else
+    return 'deleted'
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Check if a bundled plugin has any documentation.
+"
+" rtp    -- a path (string) where the plugin is installed
+" return -- 1 if some documentation was found, 0 otherwise
+" ---------------------------------------------------------------------------
+func! s:has_doc(rtp) abort
+  return isdirectory(a:rtp.'/doc')
+  \   && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags'))
+  \   && (v:version > 702 || (v:version == 702 && has("patch51")))
+  \     ? !(empty(glob(a:rtp.'/doc/*.txt', 1)) && empty(glob(a:rtp.'/doc/*.??x', 1)))
+  \     : !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x')))
+endf
+
+
+" ---------------------------------------------------------------------------
+" Update the helptags for a plugin.
+"
+" rtp    -- the path to the plugin's root directory (string)
+" return -- 1 if :helptags succeeded, 0 otherwise
+" ---------------------------------------------------------------------------
+func! s:helptags(rtp) abort
+  " it is important to keep trailing slash here
+  let doc_path = resolve(a:rtp . '/doc/')
+  call s:log(':helptags '.doc_path)
+  try
+    execute 'helptags ' . doc_path
+  catch
+    call s:log("> Error running :helptags ".doc_path)
+    return 0
+  endtry
+  return 1
+endf
+
+
+" ---------------------------------------------------------------------------
+" Get the URL for the remote called 'origin' on the repository that
+" corresponds to a given bundle.
+"
+" bundle -- a bundle object to check the repository for
+" return -- the URL for the origin remote (string)
+" ---------------------------------------------------------------------------
+func! s:get_current_origin_url(bundle) abort
+  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
+  let cmd = vundle#installer#shellesc_cd(cmd)
+  let out = s:strip(s:system(cmd))
+  return out
+endf
+
+
+" ---------------------------------------------------------------------------
+" Get a short sha of the HEAD of the repository for a given bundle
+"
+" bundle -- a bundle object
+" return -- A 15 character log sha for the current HEAD
+" ---------------------------------------------------------------------------
+func! s:get_current_sha(bundle)
+  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
+  let cmd = vundle#installer#shellesc_cd(cmd)
+  let out = s:system(cmd)[0:15]
+  return out
+endf
+
+
+" ---------------------------------------------------------------------------
+" Create the appropriate sync command to run according to the current state of
+" the local repository (clone, pull, reset, etc).
+"
+" In the case of a pull (update), also return the current sha, so that we can
+" later check that there has been an upgrade.
+"
+" bang   -- 0 if only new plugins should be installed, 1 if existing plugins
+"           should be updated
+" bundle -- a bundle object to create the sync command for
+" return -- A list containing the command to run and the sha for the current
+"           HEAD
+" ---------------------------------------------------------------------------
+func! s:make_sync_command(bang, bundle) abort
+  let git_dir = expand(a:bundle.path().'/.git/', 1)
+  if isdirectory(git_dir) || filereadable(expand(a:bundle.path().'/.git', 1))
+
+    let current_origin_url = s:get_current_origin_url(a:bundle)
+    if current_origin_url != a:bundle.uri
+      call s:log('Plugin URI change detected for Plugin ' . a:bundle.name)
+      call s:log('>  Plugin ' . a:bundle.name . ' old URI: ' . current_origin_url)
+      call s:log('>  Plugin ' . a:bundle.name . ' new URI: ' . a:bundle.uri)
+      " Directory names match but the origin remotes are not the same
+      let cmd_parts = [
+                  \ 'cd '.vundle#installer#shellesc(a:bundle.path()) ,
+                  \ 'git remote set-url origin ' . vundle#installer#shellesc(a:bundle.uri),
+                  \ 'git fetch',
+                  \ 'git reset --hard origin/HEAD',
+                  \ 'git submodule update --init --recursive',
+                  \ ]
+      let cmd = join(cmd_parts, ' && ')
+      let cmd = vundle#installer#shellesc_cd(cmd)
+      let initial_sha = ''
+      return [cmd, initial_sha]
+    endif
+
+    if !(a:bang)
+      " The repo exists, and no !, so leave as it is.
+      return ['', '']
+    endif
+
+    let cmd_parts = [
+                \ 'cd '.vundle#installer#shellesc(a:bundle.path()),
+                \ 'git pull',
+                \ 'git submodule update --init --recursive',
+                \ ]
+    let cmd = join(cmd_parts, ' && ')
+    let cmd = vundle#installer#shellesc_cd(cmd)
+
+    let initial_sha = s:get_current_sha(a:bundle)
+  else
+    let cmd = 'git clone --recursive '.vundle#installer#shellesc(a:bundle.uri).' '.vundle#installer#shellesc(a:bundle.path())
+    let initial_sha = ''
+  endif
+  return [cmd, initial_sha]
+endf
+
+
+" ---------------------------------------------------------------------------
+" Install or update a given bundle object with git.
+"
+" bang   -- 0 if only new plugins should be installed, 1 if existing plugins
+"           should be updated
+" bundle -- a bundle object (dictionary)
+" return -- a string indicating the status of the bundle installation:
+"            - todate  : Nothing was updated or the repository was up to date
+"            - new     : The plugin was newly installed
+"            - updated : Some changes where pulled via git
+"            - error   : An error occurred in the shell command
+"            - pinned  : The bundle is marked as pinned
+" ---------------------------------------------------------------------------
+func! s:sync(bang, bundle) abort
+  " Do not sync if this bundle is pinned
+  if a:bundle.is_pinned()
+    return 'pinned'
+  endif
+
+  let [ cmd, initial_sha ] = s:make_sync_command(a:bang, a:bundle)
+  if empty(cmd)
+      return 'todate'
+  endif
+
+  let out = s:system(cmd)
+  call s:log('')
+  call s:log('Plugin '.a:bundle.name_spec)
+  call s:log(cmd, '$ ')
+  call s:log(out, '> ')
+
+  if 0 != v:shell_error
+    return 'error'
+  end
+
+  if empty(initial_sha)
+    return 'new'
+  endif
+
+  let updated_sha = s:get_current_sha(a:bundle)
+
+  if initial_sha == updated_sha
+    return 'todate'
+  endif
+
+  call add(g:updated_bundles, [initial_sha, updated_sha, a:bundle])
+  return 'updated'
+endf
+
+
+" ---------------------------------------------------------------------------
+" Escape special characters in a string to be able to use it as a shell
+" command with system().
+"
+" cmd    -- the string holding the shell command
+" return -- a string with the relevant characters escaped
+" ---------------------------------------------------------------------------
+func! vundle#installer#shellesc(cmd) abort
+  if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
+    return '"' . substitute(a:cmd, '"', '\\"', 'g') . '"'
+  endif
+  return shellescape(a:cmd)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Fix a cd shell command to be used on Windows.
+"
+" cmd    -- the command to be fixed (string)
+" return -- the fixed command (string)
+" ---------------------------------------------------------------------------
+func! vundle#installer#shellesc_cd(cmd) abort
+  if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
+    let cmd = substitute(a:cmd, '^cd ','cd /d ','')  " add /d switch to change drives
+    return cmd
+  else
+    return a:cmd
+  endif
+endf
+
+
+" ---------------------------------------------------------------------------
+" Make a system call.  This can be used to change the way system calls
+" are made during developing, without searching the whole code base for
+" actual system() calls.
+"
+" cmd    -- the command passed to system() (string)
+" return -- the return value from system()
+" ---------------------------------------------------------------------------
+func! s:system(cmd) abort
+  return system(a:cmd)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Add a log message to Vundle's internal logging variable.
+"
+" str    -- the log message (string)
+" prefix -- optional prefix for multi-line entries (string)
+" return -- a:str
+" ---------------------------------------------------------------------------
+func! s:log(str, ...) abort
+  let prefix = a:0 > 0 ? a:1 : ''
+  let fmt = '%Y-%m-%d %H:%M:%S'
+  let lines = split(a:str, '\n', 1)
+  let time = strftime(fmt)
+  for line in lines
+      call add(g:vundle_log, '['. time .'] '. prefix . line)
+  endfor
+  return a:str
+endf
+
+
+" ---------------------------------------------------------------------------
+" Remove leading and trailing whitespace from a string
+"
+" str    -- The string to rid of trailing and leading spaces
+" return -- A string stripped of side spaces
+" ---------------------------------------------------------------------------
+func! s:strip(str)
+  return substitute(a:str, '\%^\_s*\(.\{-}\)\_s*\%$', '\1', '')
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/vim/.vim/bundle/Vundle.vim/autoload/vundle/scripts.vim b/vim/.vim/bundle/Vundle.vim/autoload/vundle/scripts.vim
new file mode 100644
index 0000000..d7409a1
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/autoload/vundle/scripts.vim
@@ -0,0 +1,257 @@
+" ---------------------------------------------------------------------------
+" Search the database from vim-script.org for a matching plugin.  If no
+" argument is given, list all plugins. This function is used by the :Plugins
+" and :PluginSearch commands.
+"
+" bang -- if 1 refresh the script name cache, if 0 don't
+" ...  -- a plugin name to search for
+" ---------------------------------------------------------------------------
+func! vundle#scripts#all(bang, ...)
+  let b:match = ''
+  let info = ['"Keymap: i - Install plugin; c - Cleanup; s - Search; R - Reload list']
+  let matches = s:load_scripts(a:bang)
+  if !empty(a:1)
+    let matches = filter(matches, 'v:val =~? "'.escape(a:1,'"').'"')
+    let info += ['"Search results for: '.a:1]
+    " TODO: highlight matches
+    let b:match = a:1
+  endif
+  call vundle#scripts#view('search',info, vundle#scripts#bundle_names(reverse(matches)))
+  redraw
+  echo len(matches).' plugins found'
+endf
+
+
+" ---------------------------------------------------------------------------
+" Repeat the search for bundles.
+" ---------------------------------------------------------------------------
+func! vundle#scripts#reload() abort
+  silent exec ':PluginSearch! '.(exists('b:match') ? b:match : '')
+  redraw
+endf
+
+
+" ---------------------------------------------------------------------------
+" Complete names for bundles in the command line.
+"
+" a, c, d -- see :h command-completion-custom
+" return  -- all valid plugin names from vim-scripts.org as completion
+"            candidates, see also :h command-completion-custom
+" ---------------------------------------------------------------------------
+func! vundle#scripts#complete(a,c,d)
+  return join(s:load_scripts(0),"\n")
+endf
+
+
+" ---------------------------------------------------------------------------
+" View the logfile after an update or installation.
+" ---------------------------------------------------------------------------
+func! s:view_log()
+  if !exists('g:vundle_log_file')
+    let g:vundle_log_file = tempname()
+  endif
+
+  call writefile(g:vundle_log, g:vundle_log_file)
+  execute 'silent pedit ' . g:vundle_log_file
+
+  wincmd P | wincmd H
+endf
+
+
+" ---------------------------------------------------------------------------
+" Parse the output from git log after an update to create a change log for the
+" user.
+" ---------------------------------------------------------------------------
+func! s:create_changelog() abort
+  for bundle_data in g:updated_bundles
+    let initial_sha = bundle_data[0]
+    let updated_sha = bundle_data[1]
+    let bundle      = bundle_data[2]
+
+    let cmd = 'cd '.vundle#installer#shellesc(bundle.path()).
+          \              ' && git log --pretty=format:"%s   %an, %ar" --graph '.
+          \               initial_sha.'..'.updated_sha
+
+    let cmd = vundle#installer#shellesc_cd(cmd)
+
+    let updates = system(cmd)
+
+    call add(g:vundle_changelog, '')
+    call add(g:vundle_changelog, 'Updated Plugin: '.bundle.name)
+
+    if bundle.uri =~ "https://github.com"
+      call add(g:vundle_changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha)
+    endif
+
+    for update in split(updates, '\n')
+      let update = substitute(update, '\s\+$', '', '')
+      call add(g:vundle_changelog, '  '.update)
+    endfor
+  endfor
+endf
+
+
+" ---------------------------------------------------------------------------
+" View the change log after an update or installation.
+" ---------------------------------------------------------------------------
+func! s:view_changelog()
+  call s:create_changelog()
+
+  if !exists('g:vundle_changelog_file')
+    let g:vundle_changelog_file = tempname()
+  endif
+
+  call writefile(g:vundle_changelog, g:vundle_changelog_file)
+  execute 'silent pedit ' . g:vundle_changelog_file
+
+  wincmd P | wincmd H
+endf
+
+
+" ---------------------------------------------------------------------------
+" Create a list of 'Plugin ...' lines from a list of bundle names.
+"
+" names  -- a list of names (strings) of plugins
+" return -- a list of 'Plugin ...' lines suitable to be written to a buffer
+" ---------------------------------------------------------------------------
+func! vundle#scripts#bundle_names(names)
+  return map(copy(a:names), ' printf("Plugin ' ."'%s'".'", v:val) ')
+endf
+
+
+" ---------------------------------------------------------------------------
+" Open a buffer to display information to the user.  Several special commands
+" are defined in the new buffer.
+"
+" title   -- a title for the new buffer
+" headers -- a list of header lines to be displayed at the top of the buffer
+" results -- the main information to be displayed in the buffer (list of
+"            strings)
+" ---------------------------------------------------------------------------
+func! vundle#scripts#view(title, headers, results)
+  if exists('g:vundle_view') && bufloaded(g:vundle_view)
+    exec g:vundle_view.'bd!'
+  endif
+
+  exec 'silent pedit [Vundle] '.a:title
+
+  wincmd P | wincmd H
+
+  let g:vundle_view = bufnr('%')
+  "
+  " make buffer modifiable
+  " to append without errors
+  set modifiable
+
+  call append(0, a:headers + a:results)
+
+  setl buftype=nofile
+  setl noswapfile
+
+  setl cursorline
+  setl nonu ro noma
+  if (exists('&relativenumber')) | setl norelativenumber | endif
+
+  setl ft=vundle
+  setl syntax=vim
+  syn keyword vimCommand Plugin
+  syn keyword vimCommand Bundle
+  syn keyword vimCommand Helptags
+
+  com! -buffer -bang -nargs=1 DeletePlugin
+    \ call vundle#installer#run('vundle#installer#delete', split(<q-args>,',')[0], ['!' == '<bang>', <args>])
+
+  com! -buffer -bang -nargs=? InstallAndRequirePlugin
+    \ call vundle#installer#run('vundle#installer#install_and_require', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
+
+  com! -buffer -bang -nargs=? InstallPlugin
+    \ call vundle#installer#run('vundle#installer#install', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
+
+  com! -buffer -bang -nargs=0 InstallHelptags
+    \ call vundle#installer#run('vundle#installer#docs', 'helptags', [])
+
+  com! -buffer -nargs=0 VundleLog call s:view_log()
+
+  com! -buffer -nargs=0 VundleChangelog call s:view_changelog()
+
+  nnoremap <buffer> q :silent bd!<CR>
+  nnoremap <buffer> D :exec 'Delete'.getline('.')<CR>
+
+  nnoremap <buffer> add  :exec 'Install'.getline('.')<CR>
+  nnoremap <buffer> add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+
+  nnoremap <buffer> i :exec 'InstallAndRequire'.getline('.')<CR>
+  nnoremap <buffer> I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
+
+  nnoremap <buffer> l :VundleLog<CR>
+  nnoremap <buffer> u :VundleChangelog<CR>
+  nnoremap <buffer> h :h vundle<CR>
+  nnoremap <buffer> ? :norm h<CR>
+
+  nnoremap <buffer> c :PluginClean<CR>
+  nnoremap <buffer> C :PluginClean!<CR>
+
+  nnoremap <buffer> s :PluginSearch
+  nnoremap <buffer> R :call vundle#scripts#reload()<CR>
+
+  " goto first line after headers
+  exec ':'.(len(a:headers) + 1)
+endf
+
+
+" ---------------------------------------------------------------------------
+" Load the plugin database from vim-scripts.org .
+"
+" to     -- the filename (string) to save the database to
+" return -- 0 on success, 1 if an error occurred
+" ---------------------------------------------------------------------------
+func! s:fetch_scripts(to)
+  let scripts_dir = fnamemodify(expand(a:to, 1), ":h")
+  if !isdirectory(scripts_dir)
+    call mkdir(scripts_dir, "p")
+  endif
+
+  let l:vim_scripts_json = 'http://vim-scripts.org/api/scripts.json'
+  if executable("curl")
+    let cmd = 'curl --fail -s -o '.vundle#installer#shellesc(a:to).' '.l:vim_scripts_json
+  elseif executable("wget")
+    let temp = vundle#installer#shellesc(tempname())
+    let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.vundle#installer#shellesc(a:to)
+    if (has('win32') || has('win64'))
+      let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag
+      let cmd = vundle#installer#shellesc(cmd)
+    end
+  else
+    echoerr 'Error curl or wget is not available!'
+    return 1
+  endif
+
+  call system(cmd)
+
+  if (0 != v:shell_error)
+    echoerr 'Error fetching scripts!'
+    return v:shell_error
+  endif
+  return 0
+endf
+
+
+" ---------------------------------------------------------------------------
+" Load the plugin database and return a list of all plugins.
+"
+" bang   -- if 1 download the redatabase, else only download if it is not
+"           readable on disk (i.e. does not exist)
+" return -- a list of strings, these are the names (valid bundle
+"           specifications) of all plugins from vim-scripts.org
+" ---------------------------------------------------------------------------
+func! s:load_scripts(bang)
+  let f = expand(g:bundle_dir.'/.vundle/script-names.vim-scripts.org.json', 1)
+  if a:bang || !filereadable(f)
+    if 0 != s:fetch_scripts(f)
+      return []
+    end
+  endif
+  return eval(readfile(f, 'b')[0])
+endf
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/vim/.vim/bundle/Vundle.vim/changelog.md b/vim/.vim/bundle/Vundle.vim/changelog.md
new file mode 100644
index 0000000..b620840
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/changelog.md
@@ -0,0 +1,22 @@
+Change Log
+==========
+F = Feature, B = Bug Fix, D = Doc Change
+
+### Version 0.10.2
+
+- B: #430 Put user script directories before system directories in rtp
+- B: #455 Rename functions that start with `g:` + lowercase letter (Vim patch 7.4.264)
+
+### Version 0.10.1
+- B: #451 Escape spaces when handling rtp directories
+
+### Version 0.10
+- F: #415 Support plugin pinning (for non-git repos & preventing updates)
+- F: #440 Detect plugin name collisions
+- F: #418 Deferred rtp manipulation (speeds up start)
+- B: #418 Leave default rtp directories (i.e. ~/.vim) where they should be
+- B: #429 Fix newline character in log
+- B: #440 Detect changed remotes & update repos
+- D: #435 Image update in README.md
+- D: #419 Add function documentation
+- D: #436 Rename vundle to Vundle.vim, add modelines, quickstart update
diff --git a/vim/.vim/bundle/Vundle.vim/doc/vundle.txt b/vim/.vim/bundle/Vundle.vim/doc/vundle.txt
new file mode 100644
index 0000000..198584b
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/doc/vundle.txt
@@ -0,0 +1,397 @@
+*vundle.txt*          Vundle, a plug-in manager for Vim.             *vundle*
+
+                              VUNDLE MANUAL
+
+1. About Vundle                                    |vundle-about|
+2. Quick Start                                     |vundle-quickstart|
+3. Plugins                                         |vundle-plugins|
+  3.1. Configuring Plugins                         |vundle-plugins-configure|
+  3.2. Supported URIs                              |vundle-plugins-uris|
+  3.3. Installing Plugins                          |vundle-plugins-install|
+  3.4. Updating Plugins                            |vundle-plugins-update|
+  3.5. Searching Plugins                           |vundle-plugins-search|
+  3.6. Listing Plugins                             |vundle-plugins-list|
+  3.7. Cleaning Up                                 |vundle-plugins-cleanup|
+4. Interactive Mode                                |vundle-interactive|
+5. Key Mappings                                    |vundle-keymappings|
+6. Options                                         |vundle-options|
+7. Plugin Interface Change                         |vundle-interface-change|
+
+=============================================================================
+1. ABOUT VUNDLE ~
+                                                               *vundle-about*
+
+Vundle is short for Vim bundle and is a Vim plugin manager.
+
+Vundle allows you to...
+
+  - keep track of and configure your scripts right in the `.vimrc`
+  - install configured scripts (a.k.a. bundle)
+  - update configured scripts
+  - search by name all available Vim scripts
+  - clean unused scripts up
+  - run the above actions in a single keypress with interactive mode
+
+Vundle automatically...
+
+  - manages the runtime path of your installed scripts
+  - regenerates help tags after installing and updating
+
+Vundle's search uses http://vim-scripts.org to provide a list of all
+available Vim scripts.
+
+Vundle is undergoing an interface change, see |vundle-interface-change| for
+more information.
+
+=============================================================================
+2. QUICK START ~
+                                                          *vundle-quickstart*
+
+1. Introduction:
+
+  Installation requires `Git` and triggers git clone for each configured
+  repository to `~/.vim/bundle/` by default. Curl is required for search.
+
+                                                             *vundle-windows*
+  If you are using Windows, see instructions on the Wiki
+  https://github.com/gmarik/Vundle.vim/wiki/Vundle-for-Windows.
+
+                                                                 *vundle-faq*
+  If you run into any issues, please consult the FAQ at
+  https://github.com/gmarik/Vundle.vim/wiki
+
+2. Setup Vundle:
+>
+  git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+<
+3. Configure bundles:
+
+  Put this at the top of your `.vimrc` to use Vundle. Remove bundles you
+  don't need, they are for illustration purposes.
+>
+    set nocompatible              " be iMproved, required
+    filetype off                  " required
+
+    " set the runtime path to include Vundle and initialize
+    set rtp+=~/.vim/bundle/Vundle.vim
+    call vundle#begin()
+    " alternatively, pass a path where Vundle should install plugins
+    "call vundle#begin('~/some/path/here')
+
+    " let Vundle manage Vundle, required
+    Plugin 'gmarik/Vundle.vim'
+
+    " The following are examples of different formats supported.
+    " Keep Plugin commands between vundle#begin/end.
+    " plugin on GitHub repo
+    Plugin 'tpope/vim-fugitive'
+    " plugin from http://vim-scripts.org/vim/scripts.html
+    Plugin 'L9'
+    " Git plugin not hosted on GitHub
+    Plugin 'git://git.wincent.com/command-t.git'
+    " git repos on your local machine (i.e. when working on your own plugin)
+    Plugin 'file:///home/gmarik/path/to/plugin'
+    " The sparkup vim script is in a subdirectory of this repo called vim.
+    " Pass the path to set the runtimepath properly.
+    Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
+    " Avoid a name conflict with L9
+    Plugin 'user/L9', {'name': 'newL9'}
+
+    " All of your Plugins must be added before the following line
+    call vundle#end()            " required
+    filetype plugin indent on    " required
+    " To ignore plugin indent changes, instead use:
+    "filetype plugin on
+    "
+    " Brief help
+    " :PluginList          - list configured plugins
+    " :PluginInstall(!)    - install (update) plugins
+    " :PluginSearch(!) foo - search (or refresh cache first) for foo
+    " :PluginClean(!)      - confirm (or auto-approve) removal of unused plugins
+    "
+    " see :h vundle for more details or wiki for FAQ
+    " Put your non-Plugin stuff after this line
+
+4. Install configured bundles:
+
+  Launch vim and run
+>
+    :PluginInstall
+<
+  To install from command line:
+>
+    vim +PluginInstall +qall
+
+=============================================================================
+3. PLUGINS ~
+                                                             *vundle-plugins*
+
+3.1 CONFIGURING PLUGINS ~
+                                         *vundle-plugins-configure* *:Plugin*
+
+Vundle tracks what plugins you want configured by the `Plugin` commands in your
+`.vimrc`. Each `Plugin` command tells Vundle to activate the script on startup
+adding it to your |runtimepath|. Commenting out or removing the line will
+disable the `Plugin`.
+
+Each `Plugin` command takes a URI pointing to the script. No comments should
+follow on the same line as the command. Example:
+>
+  Plugin 'git_URI'
+
+The `Plugin` command can optionally take a second argument after the URI. It
+has to be a dictionary, separated from the URI by a comma. Each key-value pair
+in the dictionary is a configuration option.
+
+The following per-script configuration options are available.
+
+The 'rtp' option
+----------------
+
+Specifies a directory inside the repository (relative path from the root of
+the repository) where the vim plugin resides. It determines the path that will
+be added to the |runtimepath|.
+
+For example:
+>
+  Plugin 'git_URI', {'rtp': 'some/subdir/'}
+
+This can be used with git repositories that put the vim plugin inside a
+subdirectory.
+
+The 'name' option
+-----------------
+
+The name of the directory that will hold the local clone of the configured
+script.
+
+For example:
+>
+  Plugin 'git_URI', {'name': 'newPluginName'}
+
+This can be used to prevent name collisions between plugins that Vundle would
+otherwise try to clone into the same directory. It also provides an additional
+level of customisation.
+
+The 'pinned' option
+-------------------
+
+A flag that, when set to a value of 1, tells Vundle not to perform any git
+operations on the plugin, while still adding the existing plugin under the
+`bundles` directories to the |runtimepath|.
+
+For example:
+>
+  Plugin 'mylocalplugin', {'pinned': 1}
+
+This allows the users to include, with Vundle, plugins tracked with version
+control systems other than git, but the user is responsible for cloning and
+keeping up to date. It also allows the users to stay in the current version of
+a plugin that might have previously been updated by Vundle.
+
+Please note that the URI will be treated the same as for any other plugins, so
+only the last part of it will be added to the |runtimepath|. The user is
+advised to use this flag only with single word URIs to avoid confusion.
+
+3.2 SUPPORTED URIS ~
+                                                        *vundle-plugins-uris*
+
+`Vundle` integrates very well with both GitHub and vim-scripts.org
+(http://vim-scripts.org/vim/scripts.html) allowing short URIs. It also allows
+the use of any URI `git` recognizes. In all of the following cases (except
+local) the 'https' protocol is used, see Vundle's options to override this.
+
+More information on `git`'s protocols can be found at:
+http://git-scm.com/book/ch4-1.html
+
+GitHub
+------
+GitHub is used when a user/repo is passed to `Plugin`.
+>
+  Plugin 'gmarik/Vundle.vim' => https://github.com/gmarik/Vundle.vim
+
+Vim Scripts
+-----------
+Any single word without a slash '/' is assumed to be from Vim Scripts.
+>
+  Plugin 'ctrlp.vim' => https://github.com/vim-scripts/ctrlp.vim
+
+Other Git URIs
+--------------
+No modification is performed on valid URIs that point outside the above
+URLs.
+>
+  Plugin 'git://git.wincent.com/command-t.git'
+
+Local Plugins
+-------------
+The git protocol supports local installation using the 'file://' protocol.
+This is handy when developing plugins locally. Follow the protocol with an
+absolute path to the script directory.
+>
+  Plugin 'file:///path/from/root/to/plugin'
+
+3.3 INSTALLING PLUGINS ~
+                                    *vundle-plugins-install* *:PluginInstall*
+>
+  :PluginInstall
+
+Will install all plugins configured in your `.vimrc`. Newly installed
+plugins will be automatically enabled. Some plugins may require extra steps
+such as compilation or external programs, refer to their documentation.
+
+PluginInstall allows installation of plugins by name:
+>
+  :PluginInstall unite.vim
+
+Installs and activates unite.vim. You can use Tab to auto-complete known
+script names. Note that the installation just described isn't permanent. To
+finish, you must put `Plugin 'unite.vim'` at the appropriate place in your
+`.vimrc` to tell Vundle to load the plugin at startup.
+
+After installing plugins press 'l' (lowercase 'L') to see the log of commands
+if any errors occurred.
+
+3.4 UPDATING PLUGINS ~
+                    *vundle-plugins-update* *:PluginUpdate* *:PluginInstall!*
+>
+  :PluginInstall!   " NOTE: bang(!)
+or >
+  :PluginUpdate
+
+Installs or updates the configured plugins. Press 'u' after updates complete
+to see the change log of all updated bundles. Press 'l' (lowercase 'L') to
+see the log of commands if any errors occurred.
+
+3.5 SEARCHING PLUGINS ~
+                                      *vundle-plugins-search* *:PluginSearch*
+>
+  :PluginSearch
+
+Search requires that `curl` be available on the system. The command searches
+Vim Scripts (http://vim-scripts.org/vim/scripts.html) for matching
+plugins. Results display in a new split window. For example:
+>
+  PluginSearch foo
+
+displays:
+>
+  "Search results for: foo
+  Plugin 'MarkdownFootnotes'
+  Plugin 'VimFootnotes'
+  Plugin 'foo.vim'
+<
+                                                             *:PluginSearch!*
+Alternatively, you can refresh the script list before searching by adding a
+bang to the command.
+>
+  :PluginSearch! foo
+
+If the command is run without argument:
+>
+  :PluginSearch!
+
+it will display all known plugins in the new split.
+
+3.6 LISTING BUNDLES ~
+                                          *vundle-plugins-list* *:PluginList*
+>
+  :PluginList
+
+Displays a list of installed bundles.
+
+3.7 CLEANING UP ~
+                                      *vundle-plugins-cleanup* *:PluginClean*
+>
+  :PluginClean
+
+Requests confirmation for the removal of all plugins no longered configured
+in your `.vimrc` but present in your bundle installation directory
+(default: `.vim/bundle/`).
+
+                                                              *:PluginClean!*
+>
+  :PluginClean!
+
+Automatically confirm removal of unused bundles.
+
+=============================================================================
+4. INTERACTIVE MODE ~
+                                                         *vundle-interactive*
+
+Vundle provides a simple interactive mode to help you explore new plugins
+easily.  Interactive mode is available after any command that lists `Plugins`
+such as PluginSearch, PluginList or Plugins. For instance:
+>
+  :PluginSearch! unite
+
+Searches for plugins matching 'unite' and yields a split window with:
+>
+  "Keymap: i - Install bundle; c - Cleanup; s - Search; R - Reload list
+  "Search results for: unite
+  Plugin 'unite-scriptenames'
+  Plugin 'unite.vim'
+  Plugin 'unite-yarm'
+  Plugin 'unite-gem'
+  Plugin 'unite-locate'
+  Plugin 'unite-font'
+  Plugin 'unite-colorscheme'
+
+To install a bundle, move your cursor to the Plugin of interest and then
+select a command. To install 'unite.vim' put your cursor on the line and
+then push `i`. For a more complete list see |vundle-keymappings|. After
+unite.vim is installed the `:Unite file` command should be available.
+
+Note: Interactive installation doesn't update your `.vimrc`.
+
+=============================================================================
+5. KEY MAPPINGS ~
+                                                         *vundle-keymappings*
+
+KEY | DESCRIPTION
+----|-------------------------- >
+ i  |  run :PluginInstall with name taken from line cursor is positioned on
+ I  |  same as i, but runs :PluginInstall! to update bundle
+ D  |  delete selected bundle (be careful not to remove local modifications)
+ c  |  run :PluginClean
+ s  |  run :PluginSearch
+ R  |  fetch fresh script list from server
+
+=============================================================================
+6. OPTIONS ~
+                                                             *vundle-options*
+>
+  let g:vundle_default_git_proto = 'git'
+<
+  This option makes Vundle use `git` instead of `https` when building
+  absolute URIs. For example:
+>
+    Plugin 'sjl/gundo.vim' -> git@github.com:sjl/gundo.git
+
+=============================================================================
+7. VUNDLE INTERFACE CHANGE ~
+                        *vundle-interface-change* *:Bundle* *:BundleInstall!*
+                *:BundleUpdate* *:BundleSearch* *:BundleList* *:BundleClean!*
+                            *:VundleInstall!* *:VundleUpdate* *:VundleSearch*
+                                                *:VundleList* *:VundleClean!*
+
+  In order to bring in new changes, Vundle is adopting a new interface.
+  Going forward we will support primarily the Plugin namespace, additionally
+  for convenience we will also alias some commands to the Vundle namespace.
+  The following table summarizes the interface changes.
+
+  Deprecated Names  | New Names
+  -----------------------------
+  Bundle            | Plugin
+  BundleInstall(!)  | PluginInstall(!), VundleInstall(!)
+  BundleUpdate      | PluginUpdate, VundleUpdate
+  BundleSearch(!)   | PluginSearch(!), VundleSearch(!)
+  BundleClean       | PluginClean(!), VundleClean(!)
+  BundleList        | PluginList
+
+  Note: The Bundle commands will be deprecated. You may continue using them,
+  but they may not get all future updates. For instance, we have enabled
+  comments on Plugin lines but not Bundle, since it requires a change in
+  command declaration.
+
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78 ft=help norl:
diff --git a/vim/.vim/bundle/Vundle.vim/test/files/test.erl b/vim/.vim/bundle/Vundle.vim/test/files/test.erl
new file mode 100644
index 0000000..1672953
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/test/files/test.erl
@@ -0,0 +1,20 @@
+-module(mmc_logmon_sup).
+-behaviour(supervisor).
+-export([init/1]).
+
+init(_) ->
+    {ok, {
+        {one_for_one, 5, 1},
+        [
+            {listener,
+                {aaa, start_link, []},
+                permanent, 100, worker,
+                [aaa]
+            },
+            {server,
+                {bbb, start_link, []},
+                permanent, 100, worker,
+                [bbb]
+            }
+        ]
+    }}.
diff --git a/vim/.vim/bundle/Vundle.vim/test/minirc.vim b/vim/.vim/bundle/Vundle.vim/test/minirc.vim
new file mode 100644
index 0000000..3c24395
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/test/minirc.vim
@@ -0,0 +1,8 @@
+set nocompatible
+syntax on
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim/
+call vundle#rc()
+Bundle 'gmarik/Vundle.vim'
+filetype plugin indent on
+
diff --git a/vim/.vim/bundle/Vundle.vim/test/vimrc b/vim/.vim/bundle/Vundle.vim/test/vimrc
new file mode 100644
index 0000000..d8455a7
--- /dev/null
+++ b/vim/.vim/bundle/Vundle.vim/test/vimrc
@@ -0,0 +1,81 @@
+" vim -u test/vimrc
+set nocompatible
+
+set nowrap
+
+let bundle_dir = '/tmp/vundle-test/bundles/'
+" let src = 'http://github.com/gmarik/vundle.git'
+
+" Vundle Options
+" let g:vundle_default_git_proto = 'git'
+
+silent execute '!mkdir -p '.bundle_dir
+silent execute '!ln -f -s ~/.vim/bundle/Vundle.vim '.bundle_dir
+
+filetype off
+syntax on
+
+runtime macros/matchit.vim
+
+" This test should be executed in "test" directory
+exec 'set rtp^='.bundle_dir.'Vundle.vim/'
+
+call vundle#rc(bundle_dir)
+
+
+Plugin 'molokai' " vim-scripts name
+
+" github username with dashes
+Bundle 'vim-scripts/ragtag.vim'
+
+" original repo
+Bundle 'altercation/vim-colors-solarized'
+" with extension
+Bundle 'nelstrom/vim-mac-classic-theme.git'
+"
+"  invalid uri
+"Bundle 'nonexistinguser/yupppierepo.git'
+
+" full uri
+Bundle 'https://github.com/vim-scripts/vim-game-of-life'
+" full uri
+Bundle 'git@github.com:gmarik/ingretu.git'
+" short uri
+Bundle 'gh:gmarik/snipmate.vim.git'
+Bundle 'github:mattn/gist-vim.git'
+
+" local uri stuff
+Bundle '~/Dropbox/.gitrepos/utilz.vim.git'
+" Bundle 'file://Dropbox/.gitrepos/utilz.vim.git'
+
+" with options
+Bundle 'rstacruz/sparkup.git', {'rtp': 'vim/'}
+Bundle 'matchit.zip', {'name': 'matchit'}
+
+" Camel case
+Bundle 'vim-scripts/RubySinatra'
+
+" syntax issue #203
+Bundle 'jimenezrick/vimerl'
+
+" Static bundle: Same name as a valid vim-scripts bundle
+Bundle 'latte', {'pinned' : 1}
+if !isdirectory(expand(bundle_dir) . '/latte')
+  call mkdir(expand(bundle_dir) . '/latte', 'p')
+endif
+
+
+filetype plugin indent on      " Automatically detect file types.
+
+set wildignore+=doc            " should not break helptags
+set wildignore+=.git           " should not break clone
+set wildignore+=.git/*         " should not break clone
+set wildignore+=*/.git/*
+" TODO: helptags fails with this
+" set wildignore+=doc/*        " should not break clone
+" set wildignore+=*/doc/*
+
+au VimEnter * BundleInstall
+
+" e test/files/erlang.erl
+" vim: set expandtab sts=2 ts=2 sw=2 tw=78:
diff --git a/vim/.vim/bundle/emmet-vim b/vim/.vim/bundle/emmet-vim
deleted file mode 160000
-Subproject e1f2f00a5ce5c60c13b38e89f31fae30ebb8df8
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
deleted file mode 160000
-Subproject 3b98a7fcae8f9fff356907171f0406ff8cd2892
diff --git a/vim/.vim/bundle/vim-go b/vim/.vim/bundle/vim-go
deleted file mode 160000
-Subproject f3b757d4150cbe018a8a02ef1c484f161dde968
diff --git a/vim/.vim/colors b/vim/.vim/colors
new file mode 160000
+Subproject 6c6677492d6dc21bcd652cbdd07d5f0d84bc3b7
diff --git a/vim/.vim/plugin/nginx.vim b/vim/.vim/plugin/nginx.vim
new file mode 100644
index 0000000..444d96e
--- /dev/null
+++ b/vim/.vim/plugin/nginx.vim
@@ -0,0 +1,836 @@
+" Vim syntax file
+" Language: nginx.conf
+
+if exists("b:current_syntax")
+  finish
+end
+
+setlocal iskeyword+=.
+setlocal iskeyword+=/
+setlocal iskeyword+=:
+
+syn match ngxVariable '\$\(\w\+\|{\w\+}\)'
+syn match ngxVariableBlock '\$\(\w\+\|{\w\+}\)' contained
+syn match ngxVariableString '\$\(\w\+\|{\w\+}\)' contained
+syn region ngxBlock start=+^+ end=+{+ skip=+\${+ contains=ngxComment,ngxDirectiveBlock,ngxVariableBlock,ngxString oneline
+syn region ngxString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+ contains=ngxVariableString
+syn match ngxComment ' *#.*$'
+
+syn keyword ngxBoolean on
+syn keyword ngxBoolean off
+
+syn keyword ngxDirectiveBlock http         contained
+syn keyword ngxDirectiveBlock mail         contained
+syn keyword ngxDirectiveBlock events       contained
+syn keyword ngxDirectiveBlock server       contained
+syn keyword ngxDirectiveBlock types        contained
+syn keyword ngxDirectiveBlock location     contained
+syn keyword ngxDirectiveBlock upstream     contained
+syn keyword ngxDirectiveBlock charset_map  contained
+syn keyword ngxDirectiveBlock limit_except contained
+syn keyword ngxDirectiveBlock if           contained
+syn keyword ngxDirectiveBlock geo          contained
+syn keyword ngxDirectiveBlock map          contained
+syn keyword ngxDirectiveBlock split_clients contained
+
+syn keyword ngxDirectiveImportant include
+syn keyword ngxDirectiveImportant root
+syn keyword ngxDirectiveImportant server
+syn keyword ngxDirectiveImportant server_name
+syn keyword ngxDirectiveImportant listen
+syn keyword ngxDirectiveImportant internal
+syn keyword ngxDirectiveImportant proxy_pass
+syn keyword ngxDirectiveImportant memcached_pass
+syn keyword ngxDirectiveImportant fastcgi_pass
+syn keyword ngxDirectiveImportant scgi_pass
+syn keyword ngxDirectiveImportant uwsgi_pass
+syn keyword ngxDirectiveImportant try_files
+
+syn keyword ngxDirectiveControl break
+syn keyword ngxDirectiveControl return
+syn keyword ngxDirectiveControl rewrite
+syn keyword ngxDirectiveControl set
+
+syn keyword ngxDirectiveError error_page
+syn keyword ngxDirectiveError post_action
+
+syn keyword ngxDirectiveDeprecated connections
+syn keyword ngxDirectiveDeprecated imap
+syn keyword ngxDirectiveDeprecated limit_zone
+syn keyword ngxDirectiveDeprecated open_file_cache_retest
+syn keyword ngxDirectiveDeprecated optimize_server_names
+syn keyword ngxDirectiveDeprecated satisfy_any
+syn keyword ngxDirectiveDeprecated so_keepalive
+
+syn keyword ngxDirective accept_mutex
+syn keyword ngxDirective accept_mutex_delay
+syn keyword ngxDirective acceptex_read
+syn keyword ngxDirective access_log
+syn keyword ngxDirective add_after_body
+syn keyword ngxDirective add_before_body
+syn keyword ngxDirective add_header
+syn keyword ngxDirective addition_types
+syn keyword ngxDirective aio
+syn keyword ngxDirective alias
+syn keyword ngxDirective allow
+syn keyword ngxDirective ancient_browser
+syn keyword ngxDirective ancient_browser_value
+syn keyword ngxDirective auth_basic
+syn keyword ngxDirective auth_basic_user_file
+syn keyword ngxDirective auth_http
+syn keyword ngxDirective auth_http_header
+syn keyword ngxDirective auth_http_timeout
+syn keyword ngxDirective auth_request
+syn keyword ngxDirective auth_request_set
+syn keyword ngxDirective autoindex
+syn keyword ngxDirective autoindex_exact_size
+syn keyword ngxDirective autoindex_localtime
+syn keyword ngxDirective charset
+syn keyword ngxDirective charset_types
+syn keyword ngxDirective chunked_transfer_encoding
+syn keyword ngxDirective client_body_buffer_size
+syn keyword ngxDirective client_body_in_file_only
+syn keyword ngxDirective client_body_in_single_buffer
+syn keyword ngxDirective client_body_temp_path
+syn keyword ngxDirective client_body_timeout
+syn keyword ngxDirective client_header_buffer_size
+syn keyword ngxDirective client_header_timeout
+syn keyword ngxDirective client_max_body_size
+syn keyword ngxDirective connection_pool_size
+syn keyword ngxDirective create_full_put_path
+syn keyword ngxDirective daemon
+syn keyword ngxDirective dav_access
+syn keyword ngxDirective dav_methods
+syn keyword ngxDirective debug_connection
+syn keyword ngxDirective debug_points
+syn keyword ngxDirective default_type
+syn keyword ngxDirective degradation
+syn keyword ngxDirective degrade
+syn keyword ngxDirective deny
+syn keyword ngxDirective devpoll_changes
+syn keyword ngxDirective devpoll_events
+syn keyword ngxDirective directio
+syn keyword ngxDirective directio_alignment
+syn keyword ngxDirective disable_symlinks
+syn keyword ngxDirective empty_gif
+syn keyword ngxDirective env
+syn keyword ngxDirective epoll_events
+syn keyword ngxDirective error_log
+syn keyword ngxDirective etag
+syn keyword ngxDirective eventport_events
+syn keyword ngxDirective expires
+syn keyword ngxDirective fastcgi_bind
+syn keyword ngxDirective fastcgi_buffer_size
+syn keyword ngxDirective fastcgi_buffering
+syn keyword ngxDirective fastcgi_buffers
+syn keyword ngxDirective fastcgi_busy_buffers_size
+syn keyword ngxDirective fastcgi_cache
+syn keyword ngxDirective fastcgi_cache_bypass
+syn keyword ngxDirective fastcgi_cache_key
+syn keyword ngxDirective fastcgi_cache_lock
+syn keyword ngxDirective fastcgi_cache_lock_timeout
+syn keyword ngxDirective fastcgi_cache_methods
+syn keyword ngxDirective fastcgi_cache_min_uses
+syn keyword ngxDirective fastcgi_cache_path
+syn keyword ngxDirective fastcgi_cache_revalidate
+syn keyword ngxDirective fastcgi_cache_use_stale
+syn keyword ngxDirective fastcgi_cache_valid
+syn keyword ngxDirective fastcgi_catch_stderr
+syn keyword ngxDirective fastcgi_connect_timeout
+syn keyword ngxDirective fastcgi_force_ranges
+syn keyword ngxDirective fastcgi_hide_header
+syn keyword ngxDirective fastcgi_ignore_client_abort
+syn keyword ngxDirective fastcgi_ignore_headers
+syn keyword ngxDirective fastcgi_index
+syn keyword ngxDirective fastcgi_intercept_errors
+syn keyword ngxDirective fastcgi_keep_conn
+syn keyword ngxDirective fastcgi_max_temp_file_size
+syn keyword ngxDirective fastcgi_next_upstream
+syn keyword ngxDirective fastcgi_next_upstream_timeout
+syn keyword ngxDirective fastcgi_next_upstream_tries
+syn keyword ngxDirective fastcgi_no_cache
+syn keyword ngxDirective fastcgi_param
+syn keyword ngxDirective fastcgi_pass_header
+syn keyword ngxDirective fastcgi_pass_request_body
+syn keyword ngxDirective fastcgi_pass_request_headers
+syn keyword ngxDirective fastcgi_read_timeout
+syn keyword ngxDirective fastcgi_send_lowat
+syn keyword ngxDirective fastcgi_send_timeout
+syn keyword ngxDirective fastcgi_split_path_info
+syn keyword ngxDirective fastcgi_store
+syn keyword ngxDirective fastcgi_store_access
+syn keyword ngxDirective fastcgi_temp_file_write_size
+syn keyword ngxDirective fastcgi_temp_path
+syn keyword ngxDirective flv
+syn keyword ngxDirective geoip_city
+syn keyword ngxDirective geoip_country
+syn keyword ngxDirective geoip_org
+syn keyword ngxDirective geoip_proxy
+syn keyword ngxDirective geoip_proxy_recursive
+syn keyword ngxDirective google_perftools_profiles
+syn keyword ngxDirective gunzip
+syn keyword ngxDirective gunzip_buffers
+syn keyword ngxDirective gzip
+syn keyword ngxDirective gzip_buffers
+syn keyword ngxDirective gzip_comp_level
+syn keyword ngxDirective gzip_disable
+syn keyword ngxDirective gzip_hash
+syn keyword ngxDirective gzip_http_version
+syn keyword ngxDirective gzip_min_length
+syn keyword ngxDirective gzip_no_buffer
+syn keyword ngxDirective gzip_proxied
+syn keyword ngxDirective gzip_static
+syn keyword ngxDirective gzip_types
+syn keyword ngxDirective gzip_vary
+syn keyword ngxDirective gzip_window
+syn keyword ngxDirective hash
+syn keyword ngxDirective if_modified_since
+syn keyword ngxDirective ignore_invalid_headers
+syn keyword ngxDirective image_filter
+syn keyword ngxDirective image_filter_buffer
+syn keyword ngxDirective image_filter_interlace
+syn keyword ngxDirective image_filter_jpeg_quality
+syn keyword ngxDirective image_filter_sharpen
+syn keyword ngxDirective image_filter_transparency
+syn keyword ngxDirective imap_auth
+syn keyword ngxDirective imap_capabilities
+syn keyword ngxDirective imap_client_buffer
+syn keyword ngxDirective index
+syn keyword ngxDirective iocp_threads
+syn keyword ngxDirective ip_hash
+syn keyword ngxDirective keepalive
+syn keyword ngxDirective keepalive_disable
+syn keyword ngxDirective keepalive_requests
+syn keyword ngxDirective keepalive_timeout
+syn keyword ngxDirective kqueue_changes
+syn keyword ngxDirective kqueue_events
+syn keyword ngxDirective large_client_header_buffers
+syn keyword ngxDirective least_conn
+syn keyword ngxDirective limit_conn
+syn keyword ngxDirective limit_conn_log_level
+syn keyword ngxDirective limit_conn_status
+syn keyword ngxDirective limit_conn_zone
+syn keyword ngxDirective limit_rate
+syn keyword ngxDirective limit_rate_after
+syn keyword ngxDirective limit_req
+syn keyword ngxDirective limit_req_log_level
+syn keyword ngxDirective limit_req_status
+syn keyword ngxDirective limit_req_zone
+syn keyword ngxDirective lingering_close
+syn keyword ngxDirective lingering_time
+syn keyword ngxDirective lingering_timeout
+syn keyword ngxDirective lock_file
+syn keyword ngxDirective log_format
+syn keyword ngxDirective log_not_found
+syn keyword ngxDirective log_subrequest
+syn keyword ngxDirective map_hash_bucket_size
+syn keyword ngxDirective map_hash_max_size
+syn keyword ngxDirective master_process
+syn keyword ngxDirective max_ranges
+syn keyword ngxDirective memcached_bind
+syn keyword ngxDirective memcached_buffer_size
+syn keyword ngxDirective memcached_connect_timeout
+syn keyword ngxDirective memcached_gzip_flag
+syn keyword ngxDirective memcached_next_upstream
+syn keyword ngxDirective memcached_next_upstream_timeout
+syn keyword ngxDirective memcached_next_upstream_tries
+syn keyword ngxDirective memcached_read_timeout
+syn keyword ngxDirective memcached_send_timeout
+syn keyword ngxDirective merge_slashes
+syn keyword ngxDirective min_delete_depth
+syn keyword ngxDirective modern_browser
+syn keyword ngxDirective modern_browser_value
+syn keyword ngxDirective mp4
+syn keyword ngxDirective mp4_buffer_size
+syn keyword ngxDirective mp4_max_buffer_size
+syn keyword ngxDirective msie_padding
+syn keyword ngxDirective msie_refresh
+syn keyword ngxDirective multi_accept
+syn keyword ngxDirective mysql_test
+syn keyword ngxDirective open_file_cache
+syn keyword ngxDirective open_file_cache_errors
+syn keyword ngxDirective open_file_cache_events
+syn keyword ngxDirective open_file_cache_min_uses
+syn keyword ngxDirective open_file_cache_valid
+syn keyword ngxDirective open_log_file_cache
+syn keyword ngxDirective output_buffers
+syn keyword ngxDirective override_charset
+syn keyword ngxDirective pcre_jit
+syn keyword ngxDirective perl
+syn keyword ngxDirective perl_modules
+syn keyword ngxDirective perl_require
+syn keyword ngxDirective perl_set
+syn keyword ngxDirective pid
+syn keyword ngxDirective pop3_auth
+syn keyword ngxDirective pop3_capabilities
+syn keyword ngxDirective port_in_redirect
+syn keyword ngxDirective post_acceptex
+syn keyword ngxDirective postpone_gzipping
+syn keyword ngxDirective postpone_output
+syn keyword ngxDirective protocol
+syn keyword ngxDirective proxy
+syn keyword ngxDirective proxy_bind
+syn keyword ngxDirective proxy_buffer
+syn keyword ngxDirective proxy_buffer_size
+syn keyword ngxDirective proxy_buffering
+syn keyword ngxDirective proxy_buffers
+syn keyword ngxDirective proxy_busy_buffers_size
+syn keyword ngxDirective proxy_cache
+syn keyword ngxDirective proxy_cache_bypass
+syn keyword ngxDirective proxy_cache_key
+syn keyword ngxDirective proxy_cache_lock
+syn keyword ngxDirective proxy_cache_lock_timeout
+syn keyword ngxDirective proxy_cache_methods
+syn keyword ngxDirective proxy_cache_min_uses
+syn keyword ngxDirective proxy_cache_path
+syn keyword ngxDirective proxy_cache_revalidate
+syn keyword ngxDirective proxy_cache_use_stale
+syn keyword ngxDirective proxy_cache_valid
+syn keyword ngxDirective proxy_connect_timeout
+syn keyword ngxDirective proxy_cookie_domain
+syn keyword ngxDirective proxy_cookie_path
+syn keyword ngxDirective proxy_force_ranges
+syn keyword ngxDirective proxy_headers_hash_bucket_size
+syn keyword ngxDirective proxy_headers_hash_max_size
+syn keyword ngxDirective proxy_hide_header
+syn keyword ngxDirective proxy_http_version
+syn keyword ngxDirective proxy_ignore_client_abort
+syn keyword ngxDirective proxy_ignore_headers
+syn keyword ngxDirective proxy_intercept_errors
+syn keyword ngxDirective proxy_max_temp_file_size
+syn keyword ngxDirective proxy_method
+syn keyword ngxDirective proxy_next_upstream
+syn keyword ngxDirective proxy_next_upstream_timeout
+syn keyword ngxDirective proxy_next_upstream_tries
+syn keyword ngxDirective proxy_no_cache
+syn keyword ngxDirective proxy_pass_error_message
+syn keyword ngxDirective proxy_pass_header
+syn keyword ngxDirective proxy_pass_request_body
+syn keyword ngxDirective proxy_pass_request_headers
+syn keyword ngxDirective proxy_read_timeout
+syn keyword ngxDirective proxy_redirect
+syn keyword ngxDirective proxy_send_lowat
+syn keyword ngxDirective proxy_send_timeout
+syn keyword ngxDirective proxy_set_body
+syn keyword ngxDirective proxy_set_header
+syn keyword ngxDirective proxy_ssl_ciphers
+syn keyword ngxDirective proxy_ssl_crl
+syn keyword ngxDirective proxy_ssl_name
+syn keyword ngxDirective proxy_ssl_protocols
+syn keyword ngxDirective proxy_ssl_server_name
+syn keyword ngxDirective proxy_ssl_session_reuse
+syn keyword ngxDirective proxy_ssl_trusted_certificate
+syn keyword ngxDirective proxy_ssl_verify
+syn keyword ngxDirective proxy_ssl_verify_depth
+syn keyword ngxDirective proxy_store
+syn keyword ngxDirective proxy_store_access
+syn keyword ngxDirective proxy_temp_file_write_size
+syn keyword ngxDirective proxy_temp_path
+syn keyword ngxDirective proxy_timeout
+syn keyword ngxDirective random_index
+syn keyword ngxDirective read_ahead
+syn keyword ngxDirective real_ip_header
+syn keyword ngxDirective real_ip_recursive
+syn keyword ngxDirective recursive_error_pages
+syn keyword ngxDirective referer_hash_bucket_size
+syn keyword ngxDirective referer_hash_max_size
+syn keyword ngxDirective request_pool_size
+syn keyword ngxDirective reset_timedout_connection
+syn keyword ngxDirective resolver
+syn keyword ngxDirective resolver_timeout
+syn keyword ngxDirective rewrite_log
+syn keyword ngxDirective rtsig_overflow_events
+syn keyword ngxDirective rtsig_overflow_test
+syn keyword ngxDirective rtsig_overflow_threshold
+syn keyword ngxDirective rtsig_signo
+syn keyword ngxDirective satisfy
+syn keyword ngxDirective scgi_bind
+syn keyword ngxDirective scgi_buffer_size
+syn keyword ngxDirective scgi_buffering
+syn keyword ngxDirective scgi_buffers
+syn keyword ngxDirective scgi_busy_buffers_size
+syn keyword ngxDirective scgi_cache
+syn keyword ngxDirective scgi_cache_bypass
+syn keyword ngxDirective scgi_cache_key
+syn keyword ngxDirective scgi_cache_lock
+syn keyword ngxDirective scgi_cache_lock_timeout
+syn keyword ngxDirective scgi_cache_methods
+syn keyword ngxDirective scgi_cache_min_uses
+syn keyword ngxDirective scgi_cache_path
+syn keyword ngxDirective scgi_cache_revalidate
+syn keyword ngxDirective scgi_cache_use_stale
+syn keyword ngxDirective scgi_cache_valid
+syn keyword ngxDirective scgi_connect_timeout
+syn keyword ngxDirective scgi_force_ranges
+syn keyword ngxDirective scgi_hide_header
+syn keyword ngxDirective scgi_ignore_client_abort
+syn keyword ngxDirective scgi_ignore_headers
+syn keyword ngxDirective scgi_intercept_errors
+syn keyword ngxDirective scgi_max_temp_file_size
+syn keyword ngxDirective scgi_next_upstream
+syn keyword ngxDirective scgi_next_upstream_timeout
+syn keyword ngxDirective scgi_next_upstream_tries
+syn keyword ngxDirective scgi_no_cache
+syn keyword ngxDirective scgi_param
+syn keyword ngxDirective scgi_pass_header
+syn keyword ngxDirective scgi_pass_request_body
+syn keyword ngxDirective scgi_pass_request_headers
+syn keyword ngxDirective scgi_read_timeout
+syn keyword ngxDirective scgi_send_timeout
+syn keyword ngxDirective scgi_store
+syn keyword ngxDirective scgi_store_access
+syn keyword ngxDirective scgi_temp_file_write_size
+syn keyword ngxDirective scgi_temp_path
+syn keyword ngxDirective secure_link
+syn keyword ngxDirective secure_link_md5
+syn keyword ngxDirective secure_link_secret
+syn keyword ngxDirective send_lowat
+syn keyword ngxDirective send_timeout
+syn keyword ngxDirective sendfile
+syn keyword ngxDirective sendfile_max_chunk
+syn keyword ngxDirective server_name_in_redirect
+syn keyword ngxDirective server_names_hash_bucket_size
+syn keyword ngxDirective server_names_hash_max_size
+syn keyword ngxDirective server_tokens
+syn keyword ngxDirective set_real_ip_from
+syn keyword ngxDirective smtp_auth
+syn keyword ngxDirective smtp_capabilities
+syn keyword ngxDirective smtp_client_buffer
+syn keyword ngxDirective smtp_greeting_delay
+syn keyword ngxDirective source_charset
+syn keyword ngxDirective spdy_chunk_size
+syn keyword ngxDirective spdy_headers_comp
+syn keyword ngxDirective spdy_keepalive_timeout
+syn keyword ngxDirective spdy_max_concurrent_streams
+syn keyword ngxDirective spdy_pool_size
+syn keyword ngxDirective spdy_recv_buffer_size
+syn keyword ngxDirective spdy_recv_timeout
+syn keyword ngxDirective spdy_streams_index_size
+syn keyword ngxDirective ssi
+syn keyword ngxDirective ssi_ignore_recycled_buffers
+syn keyword ngxDirective ssi_last_modified
+syn keyword ngxDirective ssi_min_file_chunk
+syn keyword ngxDirective ssi_silent_errors
+syn keyword ngxDirective ssi_types
+syn keyword ngxDirective ssi_value_length
+syn keyword ngxDirective ssl
+syn keyword ngxDirective ssl_buffer_size
+syn keyword ngxDirective ssl_certificate
+syn keyword ngxDirective ssl_certificate_key
+syn keyword ngxDirective ssl_ciphers
+syn keyword ngxDirective ssl_client_certificate
+syn keyword ngxDirective ssl_crl
+syn keyword ngxDirective ssl_dhparam
+syn keyword ngxDirective ssl_ecdh_curve
+syn keyword ngxDirective ssl_engine
+syn keyword ngxDirective ssl_password_file
+syn keyword ngxDirective ssl_prefer_server_ciphers
+syn keyword ngxDirective ssl_protocols
+syn keyword ngxDirective ssl_session_cache
+syn keyword ngxDirective ssl_session_ticket_key
+syn keyword ngxDirective ssl_session_tickets
+syn keyword ngxDirective ssl_session_timeout
+syn keyword ngxDirective ssl_stapling
+syn keyword ngxDirective ssl_stapling_file
+syn keyword ngxDirective ssl_stapling_responder
+syn keyword ngxDirective ssl_stapling_verify
+syn keyword ngxDirective ssl_trusted_certificate
+syn keyword ngxDirective ssl_verify_client
+syn keyword ngxDirective ssl_verify_depth
+syn keyword ngxDirective starttls
+syn keyword ngxDirective stub_status
+syn keyword ngxDirective sub_filter
+syn keyword ngxDirective sub_filter_last_modified
+syn keyword ngxDirective sub_filter_once
+syn keyword ngxDirective sub_filter_types
+syn keyword ngxDirective tcp_nodelay
+syn keyword ngxDirective tcp_nopush
+syn keyword ngxDirective thread_stack_size
+syn keyword ngxDirective timeout
+syn keyword ngxDirective timer_resolution
+syn keyword ngxDirective types_hash_bucket_size
+syn keyword ngxDirective types_hash_max_size
+syn keyword ngxDirective underscores_in_headers
+syn keyword ngxDirective uninitialized_variable_warn
+syn keyword ngxDirective use
+syn keyword ngxDirective user
+syn keyword ngxDirective userid
+syn keyword ngxDirective userid_domain
+syn keyword ngxDirective userid_expires
+syn keyword ngxDirective userid_mark
+syn keyword ngxDirective userid_name
+syn keyword ngxDirective userid_p3p
+syn keyword ngxDirective userid_path
+syn keyword ngxDirective userid_service
+syn keyword ngxDirective uwsgi_bind
+syn keyword ngxDirective uwsgi_buffer_size
+syn keyword ngxDirective uwsgi_buffering
+syn keyword ngxDirective uwsgi_buffers
+syn keyword ngxDirective uwsgi_busy_buffers_size
+syn keyword ngxDirective uwsgi_cache
+syn keyword ngxDirective uwsgi_cache_bypass
+syn keyword ngxDirective uwsgi_cache_key
+syn keyword ngxDirective uwsgi_cache_lock
+syn keyword ngxDirective uwsgi_cache_lock_timeout
+syn keyword ngxDirective uwsgi_cache_methods
+syn keyword ngxDirective uwsgi_cache_min_uses
+syn keyword ngxDirective uwsgi_cache_path
+syn keyword ngxDirective uwsgi_cache_revalidate
+syn keyword ngxDirective uwsgi_cache_use_stale
+syn keyword ngxDirective uwsgi_cache_valid
+syn keyword ngxDirective uwsgi_connect_timeout
+syn keyword ngxDirective uwsgi_force_ranges
+syn keyword ngxDirective uwsgi_hide_header
+syn keyword ngxDirective uwsgi_ignore_client_abort
+syn keyword ngxDirective uwsgi_ignore_headers
+syn keyword ngxDirective uwsgi_intercept_errors
+syn keyword ngxDirective uwsgi_max_temp_file_size
+syn keyword ngxDirective uwsgi_modifier1
+syn keyword ngxDirective uwsgi_modifier2
+syn keyword ngxDirective uwsgi_next_upstream
+syn keyword ngxDirective uwsgi_next_upstream_timeout
+syn keyword ngxDirective uwsgi_next_upstream_tries
+syn keyword ngxDirective uwsgi_no_cache
+syn keyword ngxDirective uwsgi_param
+syn keyword ngxDirective uwsgi_pass_header
+syn keyword ngxDirective uwsgi_pass_request_body
+syn keyword ngxDirective uwsgi_pass_request_headers
+syn keyword ngxDirective uwsgi_read_timeout
+syn keyword ngxDirective uwsgi_send_timeout
+syn keyword ngxDirective uwsgi_ssl_ciphers
+syn keyword ngxDirective uwsgi_ssl_crl
+syn keyword ngxDirective uwsgi_ssl_name
+syn keyword ngxDirective uwsgi_ssl_protocols
+syn keyword ngxDirective uwsgi_ssl_server_name
+syn keyword ngxDirective uwsgi_ssl_session_reuse
+syn keyword ngxDirective uwsgi_ssl_trusted_certificate
+syn keyword ngxDirective uwsgi_ssl_verify
+syn keyword ngxDirective uwsgi_ssl_verify_depth
+syn keyword ngxDirective uwsgi_store
+syn keyword ngxDirective uwsgi_store_access
+syn keyword ngxDirective uwsgi_string
+syn keyword ngxDirective uwsgi_temp_file_write_size
+syn keyword ngxDirective uwsgi_temp_path
+syn keyword ngxDirective valid_referers
+syn keyword ngxDirective variables_hash_bucket_size
+syn keyword ngxDirective variables_hash_max_size
+syn keyword ngxDirective worker_aio_requests
+syn keyword ngxDirective worker_connections
+syn keyword ngxDirective worker_cpu_affinity
+syn keyword ngxDirective worker_priority
+syn keyword ngxDirective worker_processes
+syn keyword ngxDirective worker_rlimit_core
+syn keyword ngxDirective worker_rlimit_nofile
+syn keyword ngxDirective worker_rlimit_sigpending
+syn keyword ngxDirective worker_threads
+syn keyword ngxDirective working_directory
+syn keyword ngxDirective xclient
+syn keyword ngxDirective xml_entities
+syn keyword ngxDirective xslt_last_modified
+syn keyword ngxDirective xslt_param
+syn keyword ngxDirective xslt_string_param
+syn keyword ngxDirective xslt_stylesheet
+syn keyword ngxDirective xslt_types
+
+" 3rd party module list:
+" http://wiki.nginx.org/Nginx3rdPartyModules
+
+" Accept Language Module <http://wiki.nginx.org/NginxAcceptLanguageModule>
+" Parses the Accept-Language header and gives the most suitable locale from a list of supported locales.
+syn keyword ngxDirectiveThirdParty set_from_accept_language
+
+" Access Key Module <http://wiki.nginx.org/NginxHttpAccessKeyModule>
+" Denies access unless the request URL contains an access key.
+syn keyword ngxDirectiveThirdParty accesskey
+syn keyword ngxDirectiveThirdParty accesskey_arg
+syn keyword ngxDirectiveThirdParty accesskey_hashmethod
+syn keyword ngxDirectiveThirdParty accesskey_signature
+
+" Auth PAM Module <http://web.iti.upv.es/~sto/nginx/>
+" HTTP Basic Authentication using PAM.
+syn keyword ngxDirectiveThirdParty auth_pam
+syn keyword ngxDirectiveThirdParty auth_pam_service_name
+
+" Cache Purge Module <http://labs.frickle.com/nginx_ngx_cache_purge/>
+" Module adding ability to purge content from FastCGI and proxy caches.
+syn keyword ngxDirectiveThirdParty fastcgi_cache_purge
+syn keyword ngxDirectiveThirdParty proxy_cache_purge
+
+" Chunkin Module <http://wiki.nginx.org/NginxHttpChunkinModule>
+" HTTP 1.1 chunked-encoding request body support for Nginx.
+syn keyword ngxDirectiveThirdParty chunkin
+syn keyword ngxDirectiveThirdParty chunkin_keepalive
+syn keyword ngxDirectiveThirdParty chunkin_max_chunks_per_buf
+syn keyword ngxDirectiveThirdParty chunkin_resume
+
+" Circle GIF Module <http://wiki.nginx.org/NginxHttpCircleGifModule>
+" Generates simple circle images with the colors and size specified in the URL.
+syn keyword ngxDirectiveThirdParty circle_gif
+syn keyword ngxDirectiveThirdParty circle_gif_max_radius
+syn keyword ngxDirectiveThirdParty circle_gif_min_radius
+syn keyword ngxDirectiveThirdParty circle_gif_step_radius
+
+" Drizzle Module <http://github.com/chaoslawful/drizzle-nginx-module>
+" Make nginx talk directly to mysql, drizzle, and sqlite3 by libdrizzle.
+syn keyword ngxDirectiveThirdParty drizzle_connect_timeout
+syn keyword ngxDirectiveThirdParty drizzle_dbname
+syn keyword ngxDirectiveThirdParty drizzle_keepalive
+syn keyword ngxDirectiveThirdParty drizzle_module_header
+syn keyword ngxDirectiveThirdParty drizzle_pass
+syn keyword ngxDirectiveThirdParty drizzle_query
+syn keyword ngxDirectiveThirdParty drizzle_recv_cols_timeout
+syn keyword ngxDirectiveThirdParty drizzle_recv_rows_timeout
+syn keyword ngxDirectiveThirdParty drizzle_send_query_timeout
+syn keyword ngxDirectiveThirdParty drizzle_server
+
+" Echo Module <http://wiki.nginx.org/NginxHttpEchoModule>
+" Brings 'echo', 'sleep', 'time', 'exec' and more shell-style goodies to Nginx config file.
+syn keyword ngxDirectiveThirdParty echo
+syn keyword ngxDirectiveThirdParty echo_after_body
+syn keyword ngxDirectiveThirdParty echo_before_body
+syn keyword ngxDirectiveThirdParty echo_blocking_sleep
+syn keyword ngxDirectiveThirdParty echo_duplicate
+syn keyword ngxDirectiveThirdParty echo_end
+syn keyword ngxDirectiveThirdParty echo_exec
+syn keyword ngxDirectiveThirdParty echo_flush
+syn keyword ngxDirectiveThirdParty echo_foreach_split
+syn keyword ngxDirectiveThirdParty echo_location
+syn keyword ngxDirectiveThirdParty echo_location_async
+syn keyword ngxDirectiveThirdParty echo_read_request_body
+syn keyword ngxDirectiveThirdParty echo_request_body
+syn keyword ngxDirectiveThirdParty echo_reset_timer
+syn keyword ngxDirectiveThirdParty echo_sleep
+syn keyword ngxDirectiveThirdParty echo_subrequest
+syn keyword ngxDirectiveThirdParty echo_subrequest_async
+
+" Events Module <http://docs.dutov.org/nginx_modules_events_en.html>
+" Privides options for start/stop events.
+syn keyword ngxDirectiveThirdParty on_start
+syn keyword ngxDirectiveThirdParty on_stop
+
+" EY Balancer Module <http://github.com/ry/nginx-ey-balancer>
+" Adds a request queue to Nginx that allows the limiting of concurrent requests passed to the upstream.
+syn keyword ngxDirectiveThirdParty max_connections
+syn keyword ngxDirectiveThirdParty max_connections_max_queue_length
+syn keyword ngxDirectiveThirdParty max_connections_queue_timeout
+
+" Fancy Indexes Module <https://connectical.com/projects/ngx-fancyindex/wiki>
+" Like the built-in autoindex module, but fancier.
+syn keyword ngxDirectiveThirdParty fancyindex
+syn keyword ngxDirectiveThirdParty fancyindex_exact_size
+syn keyword ngxDirectiveThirdParty fancyindex_footer
+syn keyword ngxDirectiveThirdParty fancyindex_header
+syn keyword ngxDirectiveThirdParty fancyindex_localtime
+syn keyword ngxDirectiveThirdParty fancyindex_readme
+syn keyword ngxDirectiveThirdParty fancyindex_readme_mode
+
+" GeoIP Module (DEPRECATED) <http://wiki.nginx.org/NginxHttp3rdPartyGeoIPModule>
+" Country code lookups via the MaxMind GeoIP API.
+syn keyword ngxDirectiveThirdParty geoip_country_file
+
+" Headers More Module <http://wiki.nginx.org/NginxHttpHeadersMoreModule>
+" Set and clear input and output headers...more than "add"!
+syn keyword ngxDirectiveThirdParty more_clear_headers
+syn keyword ngxDirectiveThirdParty more_clear_input_headers
+syn keyword ngxDirectiveThirdParty more_set_headers
+syn keyword ngxDirectiveThirdParty more_set_input_headers
+
+" HTTP Push Module <http://pushmodule.slact.net/>
+" Turn Nginx into an adept long-polling HTTP Push (Comet) server.
+syn keyword ngxDirectiveThirdParty push_buffer_size
+syn keyword ngxDirectiveThirdParty push_listener
+syn keyword ngxDirectiveThirdParty push_message_timeout
+syn keyword ngxDirectiveThirdParty push_queue_messages
+syn keyword ngxDirectiveThirdParty push_sender
+
+" HTTP Redis Module <http://people.FreeBSD.ORG/~osa/ngx_http_redis-0.3.1.tar.gz>>
+" Redis <http://code.google.com/p/redis/> support.>
+syn keyword ngxDirectiveThirdParty redis_bind
+syn keyword ngxDirectiveThirdParty redis_buffer_size
+syn keyword ngxDirectiveThirdParty redis_connect_timeout
+syn keyword ngxDirectiveThirdParty redis_next_upstream
+syn keyword ngxDirectiveThirdParty redis_pass
+syn keyword ngxDirectiveThirdParty redis_read_timeout
+syn keyword ngxDirectiveThirdParty redis_send_timeout
+
+" HTTP JavaScript Module <http://wiki.github.com/kung-fu-tzu/ngx_http_js_module>
+" Embedding SpiderMonkey. Nearly full port on Perl module.
+syn keyword ngxDirectiveThirdParty js
+syn keyword ngxDirectiveThirdParty js_filter
+syn keyword ngxDirectiveThirdParty js_filter_types
+syn keyword ngxDirectiveThirdParty js_load
+syn keyword ngxDirectiveThirdParty js_maxmem
+syn keyword ngxDirectiveThirdParty js_require
+syn keyword ngxDirectiveThirdParty js_set
+syn keyword ngxDirectiveThirdParty js_utf8
+
+" Log Request Speed <http://wiki.nginx.org/NginxHttpLogRequestSpeed>
+" Log the time it took to process each request.
+syn keyword ngxDirectiveThirdParty log_request_speed_filter
+syn keyword ngxDirectiveThirdParty log_request_speed_filter_timeout
+
+" Memc Module <http://wiki.nginx.org/NginxHttpMemcModule>
+" An extended version of the standard memcached module that supports set, add, delete, and many more memcached commands.
+syn keyword ngxDirectiveThirdParty memc_buffer_size
+syn keyword ngxDirectiveThirdParty memc_cmds_allowed
+syn keyword ngxDirectiveThirdParty memc_connect_timeout
+syn keyword ngxDirectiveThirdParty memc_flags_to_last_modified
+syn keyword ngxDirectiveThirdParty memc_next_upstream
+syn keyword ngxDirectiveThirdParty memc_pass
+syn keyword ngxDirectiveThirdParty memc_read_timeout
+syn keyword ngxDirectiveThirdParty memc_send_timeout
+syn keyword ngxDirectiveThirdParty memc_upstream_fail_timeout
+syn keyword ngxDirectiveThirdParty memc_upstream_max_fails
+
+" Mogilefs Module <http://www.grid.net.ru/nginx/mogilefs.en.html>
+" Implements a MogileFS client, provides a replace to the Perlbal reverse proxy of the original MogileFS.
+syn keyword ngxDirectiveThirdParty mogilefs_connect_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_domain
+syn keyword ngxDirectiveThirdParty mogilefs_methods
+syn keyword ngxDirectiveThirdParty mogilefs_noverify
+syn keyword ngxDirectiveThirdParty mogilefs_pass
+syn keyword ngxDirectiveThirdParty mogilefs_read_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
+syn keyword ngxDirectiveThirdParty mogilefs_tracker
+
+" MP4 Streaming Lite Module <http://wiki.nginx.org/NginxMP4StreamingLite>
+" Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
+syn keyword ngxDirectiveThirdParty mp4
+
+" Nginx Notice Module <http://xph.us/software/nginx-notice/>
+" Serve static file to POST requests.
+syn keyword ngxDirectiveThirdParty notice
+syn keyword ngxDirectiveThirdParty notice_type
+
+" Phusion Passenger <http://www.modrails.com/documentation.html>
+" Easy and robust deployment of Ruby on Rails application on Apache and Nginx webservers.
+syn keyword ngxDirectiveThirdParty passenger_base_uri
+syn keyword ngxDirectiveThirdParty passenger_default_user
+syn keyword ngxDirectiveThirdParty passenger_enabled
+syn keyword ngxDirectiveThirdParty passenger_log_level
+syn keyword ngxDirectiveThirdParty passenger_max_instances_per_app
+syn keyword ngxDirectiveThirdParty passenger_max_pool_size
+syn keyword ngxDirectiveThirdParty passenger_pool_idle_time
+syn keyword ngxDirectiveThirdParty passenger_root
+syn keyword ngxDirectiveThirdParty passenger_ruby
+syn keyword ngxDirectiveThirdParty passenger_use_global_queue
+syn keyword ngxDirectiveThirdParty passenger_user_switching
+syn keyword ngxDirectiveThirdParty rack_env
+syn keyword ngxDirectiveThirdParty rails_app_spawner_idle_time
+syn keyword ngxDirectiveThirdParty rails_env
+syn keyword ngxDirectiveThirdParty rails_framework_spawner_idle_time
+syn keyword ngxDirectiveThirdParty rails_spawn_method
+
+" RDS JSON Module <http://github.com/agentzh/rds-json-nginx-module>
+" Help ngx_drizzle and other DBD modules emit JSON data.
+syn keyword ngxDirectiveThirdParty rds_json
+syn keyword ngxDirectiveThirdParty rds_json_content_type
+syn keyword ngxDirectiveThirdParty rds_json_format
+syn keyword ngxDirectiveThirdParty rds_json_ret
+
+" RRD Graph Module <http://wiki.nginx.org/NginxNgx_rrd_graph>
+" This module provides an HTTP interface to RRDtool's graphing facilities.
+syn keyword ngxDirectiveThirdParty rrd_graph
+syn keyword ngxDirectiveThirdParty rrd_graph_root
+
+" Secure Download <http://wiki.nginx.org/NginxHttpSecureDownload>
+" Create expiring links.
+syn keyword ngxDirectiveThirdParty secure_download
+syn keyword ngxDirectiveThirdParty secure_download_fail_location
+syn keyword ngxDirectiveThirdParty secure_download_path_mode
+syn keyword ngxDirectiveThirdParty secure_download_secret
+
+" SlowFS Cache Module <http://labs.frickle.com/nginx_ngx_slowfs_cache/>
+" Module adding ability to cache static files.
+syn keyword ngxDirectiveThirdParty slowfs_big_file_size
+syn keyword ngxDirectiveThirdParty slowfs_cache
+syn keyword ngxDirectiveThirdParty slowfs_cache_key
+syn keyword ngxDirectiveThirdParty slowfs_cache_min_uses
+syn keyword ngxDirectiveThirdParty slowfs_cache_path
+syn keyword ngxDirectiveThirdParty slowfs_cache_purge
+syn keyword ngxDirectiveThirdParty slowfs_cache_valid
+syn keyword ngxDirectiveThirdParty slowfs_temp_path
+
+" Strip Module <http://wiki.nginx.org/NginxHttpStripModule>
+" Whitespace remover.
+syn keyword ngxDirectiveThirdParty strip
+
+" Substitutions Module <http://wiki.nginx.org/NginxHttpSubsModule>
+" A filter module which can do both regular expression and fixed string substitutions on response bodies.
+syn keyword ngxDirectiveThirdParty subs_filter
+syn keyword ngxDirectiveThirdParty subs_filter_types
+
+" Supervisord Module <http://labs.frickle.com/nginx_ngx_supervisord/>
+" Module providing nginx with API to communicate with supervisord and manage (start/stop) backends on-demand.
+syn keyword ngxDirectiveThirdParty supervisord
+syn keyword ngxDirectiveThirdParty supervisord_inherit_backend_status
+syn keyword ngxDirectiveThirdParty supervisord_name
+syn keyword ngxDirectiveThirdParty supervisord_start
+syn keyword ngxDirectiveThirdParty supervisord_stop
+
+" Upload Module <http://www.grid.net.ru/nginx/upload.en.html>
+" Parses multipart/form-data allowing arbitrary handling of uploaded files.
+syn keyword ngxDirectiveThirdParty upload_aggregate_form_field
+syn keyword ngxDirectiveThirdParty upload_buffer_size
+syn keyword ngxDirectiveThirdParty upload_cleanup
+syn keyword ngxDirectiveThirdParty upload_limit_rate
+syn keyword ngxDirectiveThirdParty upload_max_file_size
+syn keyword ngxDirectiveThirdParty upload_max_output_body_len
+syn keyword ngxDirectiveThirdParty upload_max_part_header_len
+syn keyword ngxDirectiveThirdParty upload_pass
+syn keyword ngxDirectiveThirdParty upload_pass_args
+syn keyword ngxDirectiveThirdParty upload_pass_form_field
+syn keyword ngxDirectiveThirdParty upload_set_form_field
+syn keyword ngxDirectiveThirdParty upload_store
+syn keyword ngxDirectiveThirdParty upload_store_access
+
+" Upload Progress Module <http://wiki.nginx.org/NginxHttpUploadProgressModule>
+" Tracks and reports upload progress.
+syn keyword ngxDirectiveThirdParty report_uploads
+syn keyword ngxDirectiveThirdParty track_uploads
+syn keyword ngxDirectiveThirdParty upload_progress
+syn keyword ngxDirectiveThirdParty upload_progress_content_type
+syn keyword ngxDirectiveThirdParty upload_progress_header
+syn keyword ngxDirectiveThirdParty upload_progress_json_output
+syn keyword ngxDirectiveThirdParty upload_progress_template
+
+" Upstream Fair Balancer <http://wiki.nginx.org/NginxHttpUpstreamFairModule>
+" Sends an incoming request to the least-busy backend server, rather than distributing requests round-robin.
+syn keyword ngxDirectiveThirdParty fair
+syn keyword ngxDirectiveThirdParty upstream_fair_shm_size
+
+" Upstream Consistent Hash <http://wiki.nginx.org/NginxHttpUpstreamConsistentHash>
+" Select backend based on Consistent hash ring.
+syn keyword ngxDirectiveThirdParty consistent_hash
+
+" Upstream Hash Module <http://wiki.nginx.org/NginxHttpUpstreamRequestHashModule>
+" Provides simple upstream load distribution by hashing a configurable variable.
+syn keyword ngxDirectiveThirdParty hash
+syn keyword ngxDirectiveThirdParty hash_again
+
+" XSS Module <http://github.com/agentzh/xss-nginx-module>
+" Native support for cross-site scripting (XSS) in an nginx.
+syn keyword ngxDirectiveThirdParty xss_callback_arg
+syn keyword ngxDirectiveThirdParty xss_get
+syn keyword ngxDirectiveThirdParty xss_input_types
+syn keyword ngxDirectiveThirdParty xss_output_type
+
+" highlight
+
+hi link ngxComment Comment
+hi link ngxVariable Identifier
+hi link ngxVariableBlock Identifier
+hi link ngxVariableString PreProc
+hi link ngxBlock Normal
+hi link ngxString String
+
+hi link ngxBoolean Boolean
+hi link ngxDirectiveBlock Statement
+hi link ngxDirectiveImportant Type
+hi link ngxDirectiveControl Keyword
+hi link ngxDirectiveError Constant
+hi link ngxDirectiveDeprecated Error
+hi link ngxDirective Identifier
+hi link ngxDirectiveThirdParty Special
+
+let b:current_syntax = "nginx"
diff --git a/vim/.vimrc b/vim/.vimrc
index d0d714e..46b4703 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -5,10 +5,43 @@ filetype off                  " required
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()"
 
+" Manage Plugins
 Plugin 'gmarik/Vundle.vim'
+" Autocompletion
+Plugin 'Valloric/YouCompleteMe'
+" Displays Tagbar for Code
+Plugin 'majutsushi/tagbar'
+" Golang
 Plugin 'fatih/vim-go'
+
 Plugin 'mattn/emmet-vim'
+" Filebrowser
 Plugin 'scrooloose/nerdtree'
+" Open new files in a new tab
+Plugin 'jistr/vim-nerdtree-tabs'
+" Better handling for buffers (opened Files)
+Plugin 'vim-scripts/minibufexpl.vim'
+" Displays colors in CSS files
+Plugin 'ap/vim-css-color'
+" More colorschemes available
+Plugin 'flazz/vim-colorschemes'
+" Autocompletion for HTML5
+Plugin 'othree/html5.vim'
+" Better syntax for JavaScript
+Plugin 'pangloss/vim-javascript'
+" PHP autocompletion
+Plugin 'shawncplus/phpcomplete.vim'
+" Git integration
+Plugin 'tpope/vim-fugitive'
+" Dim inactive Windows
+Plugin 'blueyed/vim-diminactive'
+" Displays cursor line
+let g:cursorcross_no_map_BS=1 "Stop annoying message on startup
+Plugin 'mtth/cursorcross.vim'
+" Zoom in windows
+Plugin 'vim-scripts/ZoomWin'
+" Debugger
+Plugin 'joonty/vdebug'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -23,7 +56,9 @@ set showmatch
 set autoindent		"auto einrücken
 set scrolloff=4		"scrollt schon 4 Zeilen vor Ende
 set matchpairs=(:),{:},[:],<:>
-set background=dark
+set t_Co=256
+let g:rehash256 = 1
+colorscheme molokai
 
 syntax enable
 set encoding=utf8
@@ -47,3 +82,12 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree
 autocmd VimEnter * wincmd p
 " Toggle NERDtree
 map <C-n> :NERDTreeToggle<CR>
+
+" Toggle Tarbar with F9
+nnoremap <silent> <F9> :TagbarToggle<CR>
+" start Tagbar on vim start 
+" autocmd vimenter * Tagbar
+" autocmd VimEnter * wincmd p
+
+" Must be at the end
+set background=dark