updated repo to manage dotfiles via gnu stow, the symlink farm manager. happy birthday commit! :birthday: :sparkles:

60 files changed, 4038 insertions, 0 deletions

diff --git a/vim/.vim/bundle/vim-airline/autoload/airline.vim b/vim/.vim/bundle/vim-airline/autoload/airline.vim
new file mode 100644
index 0000000..de66fba
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline.vim
@@ -0,0 +1,170 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
+
+let s:sections = ['a','b','c','gutter','x','y','z','warning']
+let s:inactive_funcrefs = []
+
+function! airline#add_statusline_func(name)
+  call airline#add_statusline_funcref(function(a:name))
+endfunction
+
+function! airline#add_statusline_funcref(function)
+  if index(g:airline_statusline_funcrefs, a:function) >= 0
+    echohl WarningMsg
+    echo 'The airline statusline funcref '.string(a:function).' has already been added.'
+    echohl NONE
+    return
+  endif
+  call add(g:airline_statusline_funcrefs, a:function)
+endfunction
+
+function! airline#remove_statusline_func(name)
+  let i = index(g:airline_statusline_funcrefs, function(a:name))
+  if i > -1
+    call remove(g:airline_statusline_funcrefs, i)
+  endif
+endfunction
+
+function! airline#add_inactive_statusline_func(name)
+  call add(s:inactive_funcrefs, function(a:name))
+endfunction
+
+function! airline#load_theme()
+  if exists('*airline#themes#{g:airline_theme}#refresh')
+    call airline#themes#{g:airline_theme}#refresh()
+  endif
+
+  let palette = g:airline#themes#{g:airline_theme}#palette
+  call airline#themes#patch(palette)
+
+  if exists('g:airline_theme_patch_func')
+    let Fn = function(g:airline_theme_patch_func)
+    call Fn(palette)
+  endif
+
+  call airline#highlighter#load_theme()
+  call airline#extensions#load_theme()
+endfunction
+
+function! airline#switch_theme(name)
+  try
+    let palette = g:airline#themes#{a:name}#palette "also lazy loads the theme
+    let g:airline_theme = a:name
+  catch
+    echohl WarningMsg | echo 'The specified theme cannot be found.' | echohl NONE
+    if exists('g:airline_theme')
+      return
+    else
+      let g:airline_theme = 'dark'
+    endif
+  endtry
+
+  let w:airline_lastmode = ''
+  call airline#update_statusline()
+  call airline#load_theme()
+
+  " this is required to prevent clobbering the startup info message, i don't know why...
+  call airline#check_mode(winnr())
+endfunction
+
+function! airline#switch_matching_theme()
+  if exists('g:colors_name')
+    try
+      let palette = g:airline#themes#{g:colors_name}#palette
+      call airline#switch_theme(g:colors_name)
+      return 1
+    catch
+      for map in items(g:airline_theme_map)
+        if match(g:colors_name, map[0]) > -1
+          call airline#switch_theme(map[1])
+          return 1
+        endif
+      endfor
+    endtry
+  endif
+  return 0
+endfunction
+
+function! airline#update_statusline()
+  for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    call setwinvar(nr, 'airline_active', 0)
+    let context = { 'winnr': nr, 'active': 0, 'bufnr': winbufnr(nr) }
+    call s:invoke_funcrefs(context, s:inactive_funcrefs)
+  endfor
+
+  unlet! w:airline_render_left
+  unlet! w:airline_render_right
+  for section in s:sections
+    unlet! w:airline_section_{section}
+  endfor
+
+  let w:airline_active = 1
+  let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) }
+  call s:invoke_funcrefs(context, g:airline_statusline_funcrefs)
+endfunction
+
+let s:contexts = {}
+let s:core_funcrefs = [
+      \ function('airline#extensions#apply'),
+      \ function('airline#extensions#default#apply') ]
+function! s:invoke_funcrefs(context, funcrefs)
+  let builder = airline#builder#new(a:context)
+  let err = airline#util#exec_funcrefs(a:funcrefs + s:core_funcrefs, builder, a:context)
+  if err == 1
+    let a:context.line = builder.build()
+    let s:contexts[a:context.winnr] = a:context
+    call setwinvar(a:context.winnr, '&statusline', '%!airline#statusline('.a:context.winnr.')')
+  endif
+endfunction
+
+function! airline#statusline(winnr)
+  if has_key(s:contexts, a:winnr)
+    return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
+  endif
+
+  " in rare circumstances this happens...see #276
+  return ''
+endfunction
+
+function! airline#check_mode(winnr)
+  let context = s:contexts[a:winnr]
+
+  if get(w:, 'airline_active', 1)
+    let l:m = mode()
+    if l:m ==# "i"
+      let l:mode = ['insert']
+    elseif l:m ==# "R"
+      let l:mode = ['replace']
+    elseif l:m =~# '\v(v|V||s|S|)'
+      let l:mode = ['visual']
+    else
+      let l:mode = ['normal']
+    endif
+    let w:airline_current_mode = get(g:airline_mode_map, l:m, l:m)
+  else
+    let l:mode = ['inactive']
+    let w:airline_current_mode = get(g:airline_mode_map, '__')
+  endif
+
+  if g:airline_detect_modified
+    if &modified
+      call add(l:mode, 'modified')
+    endif
+  endif
+
+  if g:airline_detect_paste && &paste
+    call add(l:mode, 'paste')
+  endif
+
+  let mode_string = join(l:mode)
+  if get(w:, 'airline_lastmode', '') != mode_string
+    call airline#highlighter#highlight_modified_inactive(context.bufnr)
+    call airline#highlighter#highlight(l:mode)
+    let w:airline_lastmode = mode_string
+  endif
+
+  return ''
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/builder.vim b/vim/.vim/bundle/vim-airline/autoload/airline/builder.vim
new file mode 100644
index 0000000..d03af12
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/builder.vim
@@ -0,0 +1,74 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:prototype = {}
+
+function! s:prototype.split(...)
+  let self._side = 0
+  let self._line .= '%#'.self._curgroup.'#'.(a:0 ? a:1 : '%=')
+endfunction
+
+function! s:prototype.add_section_spaced(group, contents)
+  call self.add_section(a:group, (g:airline_symbols.space).a:contents.(g:airline_symbols.space))
+endfunction
+
+function! s:prototype.add_section(group, contents)
+  if self._curgroup != ''
+    if self._curgroup == a:group
+      let self._line .= self._side ? self._context.left_alt_sep : self._context.right_alt_sep
+    else
+      call airline#highlighter#add_separator(self._curgroup, a:group, self._side)
+      let self._line .= '%#'.self._curgroup.'_to_'.a:group.'#'
+      let self._line .= self._side ? self._context.left_sep : self._context.right_sep
+    endif
+  endif
+
+  if self._curgroup != a:group
+    let self._line .= '%#'.a:group.'#'
+  endif
+
+  if self._context.active
+    let contents = []
+    let content_parts = split(a:contents, '__accent')
+    for cpart in content_parts
+      let accent = matchstr(cpart, '_\zs[^#]*\ze')
+      call add(contents, cpart)
+    endfor
+    let line = join(contents, a:group)
+    let line = substitute(line, '__restore__', a:group, 'g')
+  else
+    let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
+    let line = substitute(line, '%#__restore__#', '', 'g')
+  endif
+
+  let self._line .= line
+  let self._curgroup = a:group
+endfunction
+
+function! s:prototype.add_raw(text)
+  let self._line .= a:text
+endfunction
+
+function! s:prototype.build()
+  if !self._context.active
+    let self._line = substitute(self._line, '%#.\{-}\ze#', '\0_inactive', 'g')
+  endif
+  return self._line
+endfunction
+
+function! airline#builder#new(context)
+  let builder = copy(s:prototype)
+  let builder._context = a:context
+  let builder._side = 1
+  let builder._curgroup = ''
+  let builder._line = ''
+
+  call extend(builder._context, {
+        \ 'left_sep': g:airline_left_sep,
+        \ 'left_alt_sep': g:airline_left_alt_sep,
+        \ 'right_sep': g:airline_right_sep,
+        \ 'right_alt_sep': g:airline_right_alt_sep,
+        \ }, 'keep')
+  return builder
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/debug.vim b/vim/.vim/bundle/vim-airline/autoload/airline/debug.vim
new file mode 100644
index 0000000..28424a6
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/debug.vim
@@ -0,0 +1,50 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#debug#profile1()
+  profile start airline-profile-switch.log
+  profile func *
+  profile file *
+  split
+  for i in range(1, 1000)
+    wincmd w
+    redrawstatus
+  endfor
+  profile pause
+  noautocmd qall!
+endfunction
+
+function! airline#debug#profile2()
+  profile start airline-profile-cursor.log
+  profile func *
+  profile file *
+  edit blank
+  call setline(1, 'all your base are belong to us')
+  call setline(2, 'all your base are belong to us')
+  let positions = [[1,2], [2,2], [1,2], [1,1]]
+  for i in range(1, 1000)
+    for pos in positions
+      call cursor(pos[0], pos[1])
+      redrawstatus
+    endfor
+  endfor
+  profile pause
+  noautocmd qall!
+endfunction
+
+function! airline#debug#profile3()
+  profile start airline-profile-mode.log
+  profile func *
+  profile file *
+
+  for i in range(1000)
+    startinsert
+    redrawstatus
+    stopinsert
+    redrawstatus
+  endfor
+
+  profile pause
+  noautocmd qall!
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/deprecation.vim b/vim/.vim/bundle/vim-airline/autoload/airline/deprecation.vim
new file mode 100644
index 0000000..cf7e787
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/deprecation.vim
@@ -0,0 +1,32 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#deprecation#check()
+  if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
+    echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
+  endif
+
+  let tests = [
+        \ [ 'g:airline_paste_symbol', 'g:airline_symbols.paste' ],
+        \ [ 'g:airline_readonly_symbol', 'g:airline_symbols.readonly' ],
+        \ [ 'g:airline_linecolumn_prefix', 'g:airline_symbols.linenr' ],
+        \ [ 'g:airline_branch_prefix', 'g:airline_symbols.branch' ],
+        \ [ 'g:airline_branch_empty_message', 'g:airline#extensions#branch#empty_message' ],
+        \ [ 'g:airline_detect_whitespace', 'g:airline#extensions#whitespace#enabled|show_message' ],
+        \ [ 'g:airline_enable_hunks', 'g:airline#extensions#hunks#enabled' ],
+        \ [ 'g:airline_enable_tagbar', 'g:airline#extensions#tagbar#enabled' ],
+        \ [ 'g:airline_enable_csv', 'g:airline#extensions#csv#enabled' ],
+        \ [ 'g:airline_enable_branch', 'g:airline#extensions#branch#enabled' ],
+        \ [ 'g:airline_enable_bufferline', 'g:airline#extensions#bufferline#enabled' ],
+        \ [ 'g:airline_enable_syntastic', 'g:airline#extensions#syntastic#enabled' ],
+        \ [ 'g:airline_enable_eclim', 'g:airline#extensions#eclim#enabled' ],
+        \ ]
+  for test in tests
+    if exists(test[0])
+      let max = winwidth(0) - 16
+      let msg = printf('The variable %s is deprecated and may not work in the future. It has been replaced with %s. Please read the documentation.', test[0], test[1])
+      echom msg[:max].'...'
+    endif
+  endfor
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions.vim
new file mode 100644
index 0000000..461d1c3
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions.vim
@@ -0,0 +1,234 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:ext = {}
+let s:ext._theme_funcrefs = []
+
+function! s:ext.add_statusline_func(name) dict
+  call airline#add_statusline_func(a:name)
+endfunction
+function! s:ext.add_statusline_funcref(function) dict
+  call airline#add_statusline_funcref(a:function)
+endfunction
+function! s:ext.add_inactive_statusline_func(name) dict
+  call airline#add_inactive_statusline_func(a:name)
+endfunction
+function! s:ext.add_theme_func(name) dict
+  call add(self._theme_funcrefs, function(a:name))
+endfunction
+
+let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
+
+let s:filetype_overrides = {
+      \ 'nerdtree': [ 'NERD', '' ],
+      \ 'gundo': [ 'Gundo', '' ],
+      \ 'diff': [ 'diff', '' ],
+      \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
+      \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
+      \ 'startify': [ 'startify', '' ],
+      \ }
+
+let s:filetype_regex_overrides = {}
+
+function! s:check_defined_section(name)
+  if !exists('w:airline_section_{a:name}')
+    let w:airline_section_{a:name} = g:airline_section_{a:name}
+  endif
+endfunction
+
+function! airline#extensions#append_to_section(name, value)
+  call <sid>check_defined_section(a:name)
+  let w:airline_section_{a:name} .= a:value
+endfunction
+
+function! airline#extensions#prepend_to_section(name, value)
+  call <sid>check_defined_section(a:name)
+  let w:airline_section_{a:name} = a:value . w:airline_section_{a:name}
+endfunction
+
+function! airline#extensions#apply_left_override(section1, section2)
+  let w:airline_section_a = a:section1
+  let w:airline_section_b = a:section2
+  let w:airline_section_c = airline#section#create(['readonly'])
+  let w:airline_render_left = 1
+  let w:airline_render_right = 0
+endfunction
+
+let s:active_winnr = -1
+function! airline#extensions#apply(...)
+  let s:active_winnr = winnr()
+
+  if s:is_excluded_window()
+    return -1
+  endif
+
+  if &buftype == 'help'
+    call airline#extensions#apply_left_override('Help', '%f')
+    let w:airline_section_x = ''
+    let w:airline_section_y = ''
+    let w:airline_render_right = 1
+  endif
+
+  if &previewwindow
+    let w:airline_section_a = 'Preview'
+    let w:airline_section_b = ''
+    let w:airline_section_c = bufname(winbufnr(winnr()))
+  endif
+
+  if has_key(s:filetype_overrides, &ft)
+    let args = s:filetype_overrides[&ft]
+    call airline#extensions#apply_left_override(args[0], args[1])
+  endif
+
+  for item in items(s:filetype_regex_overrides)
+    if match(&ft, item[0]) >= 0
+      call airline#extensions#apply_left_override(item[1][0], item[1][1])
+    endif
+  endfor
+endfunction
+
+function! s:is_excluded_window()
+  for matchft in g:airline_exclude_filetypes
+    if matchft ==# &ft
+      return 1
+    endif
+  endfor
+
+  for matchw in g:airline_exclude_filenames
+    if matchstr(expand('%'), matchw) ==# matchw
+      return 1
+    endif
+  endfor
+
+  if g:airline_exclude_preview && &previewwindow
+    return 1
+  endif
+
+  return 0
+endfunction
+
+function! airline#extensions#load_theme()
+  call airline#util#exec_funcrefs(s:ext._theme_funcrefs, g:airline#themes#{g:airline_theme}#palette)
+endfunction
+
+function! s:sync_active_winnr()
+  if exists('#airline') && winnr() != s:active_winnr
+    call airline#update_statusline()
+  endif
+endfunction
+
+function! airline#extensions#load()
+  " non-trivial number of external plugins use eventignore=all, so we need to account for that
+  autocmd CursorMoved * call <sid>sync_active_winnr()
+
+  call airline#extensions#quickfix#init(s:ext)
+
+  if get(g:, 'loaded_unite', 0)
+    call airline#extensions#unite#init(s:ext)
+  endif
+
+  if exists(':NetrwSettings')
+    call airline#extensions#netrw#init(s:ext)
+  endif
+
+  if get(g:, 'loaded_vimfiler', 0)
+    let g:vimfiler_force_overwrite_statusline = 0
+  endif
+
+  if get(g:, 'loaded_ctrlp', 0)
+    call airline#extensions#ctrlp#init(s:ext)
+  endif
+
+  if get(g:, 'command_t_loaded', 0)
+    call airline#extensions#commandt#init(s:ext)
+  endif
+
+  if exists(':UndotreeToggle')
+    call airline#extensions#undotree#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#hunks#enabled', 1) && get(g:, 'airline_enable_hunks', 1))
+        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter'))
+    call airline#extensions#hunks#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#tagbar#enabled', 1) && get(g:, 'airline_enable_tagbar', 1))
+        \ && exists(':TagbarToggle')
+    call airline#extensions#tagbar#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#csv#enabled', 1) && get(g:, 'airline_enable_csv', 1))
+        \ && (get(g:, 'loaded_csv', 0) || exists(':Table'))
+    call airline#extensions#csv#init(s:ext)
+  endif
+
+  if exists(':VimShell')
+    let s:filetype_overrides['vimshell'] = ['vimshell','%{vimshell#get_status_string()}']
+    let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
+  endif
+
+  if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1))
+        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
+        \     (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
+    call airline#extensions#branch#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#bufferline#enabled', 1) && get(g:, 'airline_enable_bufferline', 1))
+        \ && exists('*bufferline#get_status_string')
+    call airline#extensions#bufferline#init(s:ext)
+  endif
+
+  if get(g:, 'virtualenv_loaded', 0) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
+    call airline#extensions#virtualenv#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
+    call airline#extensions#eclim#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
+        \ && exists(':SyntasticCheck')
+    call airline#extensions#syntastic#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#whitespace#enabled', 1) && get(g:, 'airline_detect_whitespace', 1))
+    call airline#extensions#whitespace#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#tabline#enabled', 0)
+    call airline#extensions#tabline#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#tmuxline#enabled', 1) && exists(':Tmuxline')
+    call airline#extensions#tmuxline#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#promptline#enabled', 1) && exists(':PromptlineSnapshot') && len(get(g:, 'airline#extensions#promptline#snapshot_file', ''))
+    call airline#extensions#promptline#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#nrrwrgn#enabled', 1) && exists(':NR') == 2
+      call airline#extensions#nrrwrgn#init(s:ext)
+  endif
+
+  if !get(g:, 'airline#extensions#disable_rtp_load', 0)
+    " load all other extensions, which are not part of the default distribution.
+    " (autoload/airline/extensions/*.vim outside of our s:script_path).
+    for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
+      " we have to check both resolved and unresolved paths, since it's possible
+      " that they might not get resolved properly (see #187)
+      if stridx(tolower(resolve(fnamemodify(file, ':p'))), s:script_path) < 0
+            \ && stridx(tolower(fnamemodify(file, ':p')), s:script_path) < 0
+        let name = fnamemodify(file, ':t:r')
+        if !get(g:, 'airline#extensions#'.name.'#enabled', 1)
+          continue
+        endif
+        try
+          call airline#extensions#{name}#init(s:ext)
+        catch
+        endtry
+      endif
+    endfor
+  endif
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/branch.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/branch.vim
new file mode 100644
index 0000000..ceaa44b
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/branch.vim
@@ -0,0 +1,108 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:has_fugitive = exists('*fugitive#head')
+let s:has_lawrencium = exists('*lawrencium#statusline')
+let s:has_vcscommand = get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')
+
+if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
+  finish
+endif
+
+let s:git_dirs = {}
+function! s:get_git_branch(path)
+  if has_key(s:git_dirs, a:path)
+    return s:git_dirs[a:path]
+  endif
+
+  let dir = fugitive#extract_git_dir(a:path)
+  if empty(dir)
+    let name = ''
+  else
+    try
+      let line = join(readfile(dir . '/HEAD'))
+      let name = strpart(line, 16)
+    catch
+      let name = ''
+    endtry
+  endif
+
+  let s:git_dirs[a:path] = name
+  return name
+endfunction
+
+function! airline#extensions#branch#head()
+  if exists('b:airline_head') && !empty(b:airline_head)
+    return b:airline_head
+  endif
+
+  let b:airline_head = ''
+
+  if s:has_fugitive && !exists('b:mercurial_dir')
+    let b:airline_head = fugitive#head()
+
+    if empty(b:airline_head) && !exists('b:git_dir')
+      let b:airline_head = s:get_git_branch(expand("%:p:h"))
+    endif
+  endif
+
+  if empty(b:airline_head)
+    if s:has_lawrencium
+      let b:airline_head = lawrencium#statusline()
+    endif
+  endif
+
+  if empty(b:airline_head)
+    if s:has_vcscommand
+      call VCSCommandEnableBufferSetup()
+      if exists('b:VCSCommandBufferInfo')
+        let b:airline_head = get(b:VCSCommandBufferInfo, 0, '')
+      endif
+    endif
+  endif
+
+  if empty(b:airline_head) || !s:check_in_path()
+    let b:airline_head = ''
+  endif
+
+  return b:airline_head
+endfunction
+
+function! airline#extensions#branch#get_head()
+  let head = airline#extensions#branch#head()
+  let empty_message = get(g:, 'airline#extensions#branch#empty_message',
+      \ get(g:, 'airline_branch_empty_message', ''))
+  let symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
+  return empty(head)
+        \ ? empty_message
+        \ : printf('%s%s', empty(symbol) ? '' : symbol.(g:airline_symbols.space), head)
+endfunction
+
+function! s:check_in_path()
+  if !exists('b:airline_branch_path')
+    let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
+    let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
+
+    if !filereadable(root) "not a file
+      " if .git is a directory, it's the old submodule format
+      if match(root, '\.git$') >= 0
+        let root = expand(fnamemodify(root, ':h'))
+      else
+        " else it's the newer format, and we need to guesstimate
+        let pattern = '\.git\(\\\|\/\)modules\(\\\|\/\)'
+        if match(root, pattern) >= 0
+          let root = substitute(root, pattern, '', '')
+        endif
+    endif
+
+    let b:airline_file_in_root = stridx(bufferpath, root) > -1
+  endif
+  return b:airline_file_in_root
+endfunction
+
+function! airline#extensions#branch#init(ext)
+  call airline#parts#define_function('branch', 'airline#extensions#branch#get_head')
+
+  autocmd BufReadPost * unlet! b:airline_file_in_root
+  autocmd CursorHold,ShellCmdPost,CmdwinLeave * unlet! b:airline_head
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/bufferline.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/bufferline.vim
new file mode 100644
index 0000000..6dc97fe
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/bufferline.vim
@@ -0,0 +1,23 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists('*bufferline#get_status_string')
+  finish
+endif
+
+let s:overwrite = get(g:, 'airline#extensions#bufferline#overwrite_variables', 1)
+
+function! airline#extensions#bufferline#init(ext)
+  if s:overwrite
+    highlight bufferline_selected gui=bold cterm=bold term=bold
+    highlight link bufferline_selected_inactive airline_c_inactive
+    let g:bufferline_inactive_highlight = 'airline_c'
+    let g:bufferline_active_highlight = 'bufferline_selected'
+    let g:bufferline_active_buffer_left = ''
+    let g:bufferline_active_buffer_right = ''
+    let g:bufferline_separator = g:airline_symbols.space
+  endif
+
+  call airline#parts#define_raw('file', '%{bufferline#refresh_status()}'.bufferline#get_status_string())
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/commandt.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/commandt.vim
new file mode 100644
index 0000000..e549f27
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/commandt.vim
@@ -0,0 +1,16 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'command_t_loaded', 0)
+  finish
+endif
+
+function! airline#extensions#commandt#apply(...)
+  if bufname('%') ==# 'GoToFile'
+    call airline#extensions#apply_left_override('CommandT', '')
+  endif
+endfunction
+
+function! airline#extensions#commandt#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#commandt#apply')
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/csv.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/csv.vim
new file mode 100644
index 0000000..2c296ab
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/csv.vim
@@ -0,0 +1,31 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_csv', 0) && !exists(':Table')
+  finish
+endif
+
+let s:column_display = get(g:, 'airline#extensions#csv#column_display', 'Number')
+
+function! airline#extensions#csv#get_column()
+  if exists('*CSV_WCol')
+    if s:column_display ==# 'Name'
+      return '['.CSV_WCol('Name').CSV_WCol().']'
+    else
+      return '['.CSV_WCol().']'
+    endif
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#csv#apply(...)
+  if &ft ==# "csv"
+    call airline#extensions#prepend_to_section('gutter',
+          \ g:airline_left_alt_sep.' %{airline#extensions#csv#get_column()}')
+  endif
+endfunction
+
+function! airline#extensions#csv#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#csv#apply')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim
new file mode 100644
index 0000000..11a8922
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -0,0 +1,77 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:color_template = get(g:, 'airline#extensions#ctrlp#color_template', 'insert')
+
+function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
+  return {
+        \ 'CtrlPdark'   : a:dark,
+        \ 'CtrlPlight'  : a:light,
+        \ 'CtrlPwhite'  : a:white,
+        \ 'CtrlParrow1' : [ a:light[1] , a:white[1] , a:light[3] , a:white[3] , ''     ] ,
+        \ 'CtrlParrow2' : [ a:white[1] , a:light[1] , a:white[3] , a:light[3] , ''     ] ,
+        \ 'CtrlParrow3' : [ a:light[1] , a:dark[1]  , a:light[3] , a:dark[3]  , ''     ] ,
+        \ }
+endfunction
+
+function! airline#extensions#ctrlp#load_theme(palette)
+  if exists('a:palette.ctrlp')
+    let theme = a:palette.ctrlp
+  else
+    let s:color_template = has_key(a:palette, s:color_template) ? s:color_template : 'insert'
+    let theme = airline#extensions#ctrlp#generate_color_map(
+          \ a:palette[s:color_template]['airline_c'],
+          \ a:palette[s:color_template]['airline_b'],
+          \ a:palette[s:color_template]['airline_a'])
+  endif
+  for key in keys(theme)
+    call airline#highlighter#exec(key, theme[key])
+  endfor
+endfunction
+
+" Arguments: focus, byfname, regexp, prv, item, nxt, marked
+function! airline#extensions#ctrlp#ctrlp_airline(...)
+  let b = airline#builder#new({'active': 1})
+  if a:3
+    call b.add_section_spaced('CtrlPlight', 'regex')
+  endif
+  if get(g:, 'airline#extensions#ctrlp#show_adjacent_modes', 1)
+    call b.add_section_spaced('CtrlPlight', a:4)
+    call b.add_section_spaced('CtrlPwhite', a:5)
+    call b.add_section_spaced('CtrlPlight', a:6)
+  else
+    call b.add_section_spaced('CtrlPwhite', a:5)
+  endif
+  call b.add_section_spaced('CtrlPdark', a:7)
+  call b.split()
+  call b.add_raw('%#CtrlPdark#'.a:1.(g:airline_symbols.space))
+  call b.add_section_spaced('CtrlPdark', a:2)
+  call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
+  return b.build()
+endfunction
+
+" Argument: len
+function! airline#extensions#ctrlp#ctrlp_airline_status(...)
+  let len = '%#CtrlPdark# '.a:1
+  let dir = '%=%<%#CtrlParrow3#'.g:airline_right_sep.'%#CtrlPlight# '.getcwd().' %*'
+  return len.dir
+endfunction
+
+function! airline#extensions#ctrlp#apply(...)
+  " disable statusline overwrite if ctrlp already did it
+  return match(&statusline, 'CtrlPwhite') >= 0 ? -1 : 0
+endfunction
+
+function! airline#extensions#ctrlp#init(ext)
+  let g:ctrlp_status_func = {
+        \ 'main': 'airline#extensions#ctrlp#ctrlp_airline',
+        \ 'prog': 'airline#extensions#ctrlp#ctrlp_airline_status',
+        \ }
+  call a:ext.add_statusline_func('airline#extensions#ctrlp#apply')
+  call a:ext.add_theme_func('airline#extensions#ctrlp#load_theme')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/default.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/default.vim
new file mode 100644
index 0000000..d01349d
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/default.vim
@@ -0,0 +1,77 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
+      \ 'b': 79,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ })
+let s:layout = get(g:, 'airline#extensions#default#layout', [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'warning' ]
+      \ ])
+
+function! s:get_section(winnr, key, ...)
+  if has_key(s:section_truncate_width, a:key)
+    if winwidth(a:winnr) < s:section_truncate_width[a:key]
+      return ''
+    endif
+  endif
+  let spc = g:airline_symbols.space
+  let text = airline#util#getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key})
+  let [prefix, suffix] = [get(a:000, 0, '%('.spc), get(a:000, 1, spc.'%)')]
+  return empty(text) ? '' : prefix.text.suffix
+endfunction
+
+function! s:build_sections(builder, context, keys)
+  for key in a:keys
+    if key == 'warning' && !a:context.active
+      continue
+    endif
+    call s:add_section(a:builder, a:context, key)
+  endfor
+endfunction
+
+if v:version >= 704 || (v:version >= 703 && has('patch81'))
+  function s:add_section(builder, context, key)
+    " i have no idea why the warning section needs special treatment, but it's
+    " needed to prevent separators from showing up
+    if a:key == 'warning'
+      call a:builder.add_raw('%(')
+    endif
+    call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    if a:key == 'warning'
+      call a:builder.add_raw('%)')
+    endif
+  endfunction
+else
+  " older version don't like the use of %(%)
+  function s:add_section(builder, context, key)
+    if a:key == 'warning'
+      call a:builder.add_raw('%#airline_warning#'.s:get_section(a:context.winnr, a:key))
+    else
+      call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    endif
+  endfunction
+endif
+
+function! airline#extensions#default#apply(builder, context)
+  let winnr = a:context.winnr
+  let active = a:context.active
+
+  if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
+    call <sid>build_sections(a:builder, a:context, s:layout[0])
+  else
+    call a:builder.add_section('airline_c'.(a:context.bufnr), ' %f%m ')
+  endif
+
+  call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
+
+  if airline#util#getwinvar(winnr, 'airline_render_right', 1)
+    call <sid>build_sections(a:builder, a:context, s:layout[1])
+  endif
+
+  return 1
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/eclim.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/eclim.vim
new file mode 100644
index 0000000..18cbae5
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/eclim.vim
@@ -0,0 +1,41 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':ProjectCreate')
+  finish
+endif
+
+function! airline#extensions#eclim#creat_line(...)
+  if &filetype == "tree"
+    let builder = a:1
+    call builder.add_section('airline_a', ' Project ')
+    call builder.add_section('airline_b', ' %f ')
+    call builder.add_section('airline_c', '')
+  return 1
+  endif
+endfunction
+
+function! airline#extensions#eclim#get_warnings()
+  let eclimList = eclim#display#signs#GetExisting()
+
+  if !empty(eclimList)
+    " Remove any non-eclim signs (see eclim#display#signs#Update)
+      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\|info\\|warning\\)$"')
+
+    if !empty(eclimList)
+      let errorsLine = eclimList[0]['line']
+      let errorsNumber = len(eclimList)
+      let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
+      if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+        return errors.(g:airline_symbols.space)
+      endif
+    endif
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#eclim#init(ext)
+  call airline#parts#define_function('eclim', 'airline#extensions#eclim#get_warnings')
+  call a:ext.add_statusline_func('airline#extensions#eclim#creat_line')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/example.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/example.vim
new file mode 100644
index 0000000..4a1932d
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/example.vim
@@ -0,0 +1,54 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" we don't actually want this loaded :P
+finish
+
+" Due to some potential rendering issues, the use of the `space` variable is
+" recommended.
+let s:spc = g:airline_symbols.space
+
+" Extension specific variables can be defined the usual fashion.
+if !exists('g:airline#extensions#example#number_of_cats')
+  let g:airline#extensions#example#number_of_cats = 42
+endif
+
+" First we define an init function that will be invoked from extensions.vim
+function! airline#extensions#example#init(ext)
+
+  " Here we define a new part for the plugin.  This allows users to place this
+  " extension in arbitrary locations.
+  call airline#parts#define_raw('cats', '%{airline#extensions#example#get_cats()}')
+
+  " Next up we add a funcref so that we can run some code prior to the
+  " statusline getting modifed.
+  call a:ext.add_statusline_func('airline#extensions#example#apply')
+
+  " You can also add a funcref for inactive statuslines.
+  " call a:ext.add_inactive_statusline_func('airline#extensions#example#unapply')
+endfunction
+
+" This function will be invoked just prior to the statusline getting modified.
+function! airline#extensions#example#apply(...)
+  " First we check for the filetype.
+  if &filetype == "nyancat"
+
+    " Let's say we want to append to section_c, first we check if there's
+    " already a window-local override, and if not, create it off of the global
+    " section_c.
+    let w:airline_section_c = get(w:, 'airline_section_c', g:airline_section_c)
+
+    " Then we just append this extenion to it, optionally using separators.
+    let w:airline_section_c .= s:spc.g:airline_left_alt_sep.s:spc.'%{airline#extensions#example#get_cats()}'
+  endif
+endfunction
+
+" Finally, this function will be invoked from the statusline.
+function! airline#extensions#example#get_cats()
+  let cats = ''
+  for i in range(1, g:airline#extensions#example#number_of_cats)
+    let cats .= ' (,,,)=(^.^)=(,,,) '
+  endfor
+  return cats
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/hunks.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/hunks.vim
new file mode 100644
index 0000000..6827f5d
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/hunks.vim
@@ -0,0 +1,67 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0)
+  finish
+endif
+
+let s:non_zero_only = get(g:, 'airline#extensions#hunks#non_zero_only', 0)
+let s:hunk_symbols = get(g:, 'airline#extensions#hunks#hunk_symbols', ['+', '~', '-'])
+
+function! s:get_hunks_signify()
+  let hunks = sy#repo#get_stats()
+  if hunks[0] >= 0
+    return hunks
+  endif
+  return []
+endfunction
+
+function! s:is_branch_empty()
+  return exists('*airline#extensions#branch#head') && empty(airline#extensions#branch#head())
+endfunction
+
+function! s:get_hunks_gitgutter()
+  if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
+    return ''
+  endif
+  return GitGutterGetHunkSummary()
+endfunction
+
+function! s:get_hunks_empty()
+  return ''
+endfunction
+
+let s:source_func = ''
+function! s:get_hunks()
+  if empty(s:source_func)
+    if get(g:, 'loaded_signify', 0)
+      let s:source_func = 's:get_hunks_signify'
+    elseif exists('*GitGutterGetHunkSummary')
+      let s:source_func = 's:get_hunks_gitgutter'
+    else
+      let s:source_func = 's:get_hunks_empty'
+    endif
+  endif
+  return {s:source_func}()
+endfunction
+
+function! airline#extensions#hunks#get_hunks()
+  if !get(w:, 'airline_active', 0)
+    return ''
+  endif
+  let hunks = s:get_hunks()
+  let string = ''
+  if !empty(hunks)
+    for i in [0, 1, 2]
+      if s:non_zero_only == 0 || hunks[i] > 0
+        let string .= printf('%s%s ', s:hunk_symbols[i], hunks[i])
+      endif
+    endfor
+  endif
+  return string
+endfunction
+
+function! airline#extensions#hunks#init(ext)
+  call airline#parts#define_function('hunks', 'airline#extensions#hunks#get_hunks')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/netrw.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/netrw.vim
new file mode 100644
index 0000000..debb088
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/netrw.vim
@@ -0,0 +1,32 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':NetrwSettings')
+  finish
+endif
+
+function! airline#extensions#netrw#apply(...)
+  if &ft == 'netrw'
+    let spc = g:airline_symbols.space
+
+    call a:1.add_section('airline_a', spc.'netrw'.spc)
+    if exists('*airline#extensions#branch#get_head')
+      call a:1.add_section('airline_b', spc.'%{airline#extensions#branch#get_head()}'.spc)
+    endif
+    call a:1.add_section('airline_c', spc.'%f'.spc)
+    call a:1.split()
+    call a:1.add_section('airline_y', spc.'%{airline#extensions#netrw#sortstring()}'.spc)
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#netrw#init(ext)
+  let g:netrw_force_overwrite_statusline = 0
+  call a:ext.add_statusline_func('airline#extensions#netrw#apply')
+endfunction
+
+
+function! airline#extensions#netrw#sortstring()
+  let order = (g:netrw_sort_direction =~ 'n') ? '+' : '-'
+  return g:netrw_sort_by . (g:airline_symbols.space) . '[' . order . ']'
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim
new file mode 100644
index 0000000..2281598
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim
@@ -0,0 +1,24 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_nrrw_rgn', 0)
+  finish
+endif
+
+function! airline#extensions#nrrwrgn#apply(...)
+  if exists(":WidenRegion") == 2
+    let spc = g:airline_symbols.space
+    call a:1.add_section('airline_a', printf('%s[Narrowed%s#%d]', spc, spc, b:nrrw_instn))
+    if exists('*airline#extensions#branch#get_head')
+      call a:1.add_section('airline_b', spc.'%{airline#extensions#branch#get_head()}'.spc)
+    endif
+    let bufname=(get(b:, 'orig_buf', 0) ? bufname(b:orig_buf) : substitute(bufname('%'), '^Nrrwrgn_\zs.*\ze_\d\+$', submatch(0), ''))
+    call a:1.add_section('airline_c', spc.bufname.spc)
+    call a:1.split()
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#nrrwrgn#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#nrrwrgn#apply')
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/promptline.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/promptline.vim
new file mode 100644
index 0000000..50b9708
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/promptline.vim
@@ -0,0 +1,33 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':PromptlineSnapshot')
+  finish
+endif
+
+if !exists('airline#extensions#promptline#snapshot_file') || !len('airline#extensions#promptline#snapshot_file')
+  finish
+endif
+
+let s:prompt_snapshot_file = get(g:, 'airline#extensions#promptline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#promptline#color_template', 'normal')
+
+function! airline#extensions#promptline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#promptline#set_prompt_colors')
+endfunction
+
+function! airline#extensions#promptline#set_prompt_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  if !has_key(g:, 'promptline_symbols')
+    let g:promptline_symbols = {
+          \ 'left'           : g:airline_left_sep,
+          \ 'right'          : g:airline_right_sep,
+          \ 'left_alt'       : g:airline_left_alt_sep,
+          \ 'right_alt'      : g:airline_right_alt_sep}
+  endif
+
+  let promptline_theme = promptline#api#create_theme_from_airline(mode_palette)
+  call promptline#api#create_snapshot_with_theme(s:prompt_snapshot_file, promptline_theme)
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/quickfix.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/quickfix.vim
new file mode 100644
index 0000000..8efc527
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -0,0 +1,37 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
+let g:airline#extensions#quickfix#location_text = 'Location'
+
+function! airline#extensions#quickfix#apply(...)
+  if &buftype == 'quickfix'
+    let w:airline_section_a = s:get_text()
+    let w:airline_section_b = '%{get(w:, "quickfix_title", "")}'
+    let w:airline_section_c = ''
+    let w:airline_section_x = ''
+  endif
+endfunction
+
+function! airline#extensions#quickfix#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#quickfix#apply')
+endfunction
+
+function! s:get_text()
+  redir => buffers
+  silent ls
+  redir END
+
+  let nr = bufnr('%')
+  for buf in split(buffers, '\n')
+    if match(buf, '\v^\s*'.nr) > -1
+      if match(buf, '\[Quickfix List\]') > -1
+        return g:airline#extensions#quickfix#quickfix_text
+      else
+        return g:airline#extensions#quickfix#location_text
+      endif
+    endif
+  endfor
+  return ''
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/syntastic.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/syntastic.vim
new file mode 100644
index 0000000..f7179af
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/syntastic.vim
@@ -0,0 +1,19 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':SyntasticCheck')
+  finish
+endif
+
+function! airline#extensions#syntastic#get_warnings()
+  let errors = SyntasticStatuslineFlag()
+  if strlen(errors) > 0
+    return errors.(g:airline_symbols.space)
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#syntastic#init(ext)
+  call airline#parts#define_function('syntastic', 'airline#extensions#syntastic#get_warnings')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline.vim
new file mode 100644
index 0000000..ec75db7
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline.vim
@@ -0,0 +1,278 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
+let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
+
+let s:builder_context = {
+      \ 'active'        : 1,
+      \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
+      \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
+      \ }
+if get(g:, 'airline_powerline_fonts', 0)
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , "\ue0b0")
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , "\ue0b1")
+else
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
+endif
+
+let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
+let s:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
+let s:spc = g:airline_symbols.space
+
+function! airline#extensions#tabline#init(ext)
+  if has('gui_running')
+    set guioptions-=e
+  endif
+
+  autocmd User AirlineToggledOn call s:toggle_on()
+  autocmd User AirlineToggledOff call s:toggle_off()
+  autocmd BufDelete * let s:current_bufnr = -1
+
+  call s:toggle_on()
+  call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
+endfunction
+
+function! s:toggle_off()
+  if exists('s:original_tabline')
+    let &tabline = s:original_tabline
+    let &showtabline = s:original_showtabline
+  endif
+endfunction
+
+function! s:toggle_on()
+  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
+
+  set tabline=%!airline#extensions#tabline#get()
+  if s:buf_min_count <= 0 && s:tab_min_count <= 1
+    set showtabline=2
+  else
+    augroup airline_tabline
+      autocmd!
+      if s:show_buffers == 1
+        autocmd CursorMoved * call <sid>on_cursormove(s:buf_min_count, len(s:get_buffer_list()))
+      else
+        autocmd TabEnter * call <sid>on_cursormove(s:tab_min_count, tabpagenr('$'))
+      endif
+    augroup END
+  endif
+endfunction
+
+function! airline#extensions#tabline#load_theme(palette)
+  let colors    = get(a:palette, 'tabline', {})
+  let l:tab     = get(colors, 'airline_tab', a:palette.normal.airline_b)
+  let l:tabsel  = get(colors, 'airline_tabsel', a:palette.normal.airline_a)
+  let l:tabtype = get(colors, 'airline_tabtype', a:palette.visual.airline_a)
+  let l:tabfill = get(colors, 'airline_tabfill', a:palette.normal.airline_c)
+  let l:tabmod  = get(colors, 'airline_tabmod', a:palette.insert.airline_a)
+  let l:tabhid  = get(colors, 'airline_tabhid', a:palette.normal.airline_c)
+  call airline#highlighter#exec('airline_tab', l:tab)
+  call airline#highlighter#exec('airline_tabsel', l:tabsel)
+  call airline#highlighter#exec('airline_tabtype', l:tabtype)
+  call airline#highlighter#exec('airline_tabfill', l:tabfill)
+  call airline#highlighter#exec('airline_tabmod', l:tabmod)
+  call airline#highlighter#exec('airline_tabhid', l:tabhid)
+endfunction
+
+function! s:on_cursormove(min_count, total_count)
+  if a:total_count >= a:min_count
+    if &showtabline != 2
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction
+
+function! airline#extensions#tabline#get()
+  if s:show_buffers && tabpagenr('$') == 1
+    return s:get_buffers()
+  else
+    return s:get_tabs()
+  endif
+endfunction
+
+function! airline#extensions#tabline#title(n)
+  let buflist = tabpagebuflist(a:n)
+  let winnr = tabpagewinnr(a:n)
+  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+endfunction
+
+function! airline#extensions#tabline#get_buffer_name(nr)
+  return airline#extensions#tabline#{s:formatter}#format(a:nr, get(s:, 'current_buffer_list', s:get_buffer_list()))
+endfunction
+
+function! s:get_buffer_list()
+  let buffers = []
+  let cur = bufnr('%')
+  for nr in range(1, bufnr('$'))
+    if buflisted(nr) && bufexists(nr)
+      for ex in s:excludes
+        if match(bufname(nr), ex)
+          continue
+        endif
+      endfor
+      if getbufvar(nr, 'current_syntax') == 'qf'
+        continue
+      endif
+      call add(buffers, nr)
+    endif
+  endfor
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
+function! s:get_visible_buffers()
+  let buffers = s:get_buffer_list()
+  let cur = bufnr('%')
+
+  let total_width = 0
+  let max_width = 0
+
+  for nr in buffers
+    let width = len(airline#extensions#tabline#get_buffer_name(nr)) + 4
+    let total_width += width
+    let max_width = max([max_width, width])
+  endfor
+
+  " only show current and surrounding buffers if there are too many buffers
+  let position  = index(buffers, cur)
+  let vimwidth = &columns
+  if total_width > vimwidth && position > -1
+    let buf_count = len(buffers)
+
+    " determine how many buffers to show based on the longest buffer width,
+    " use one on the right side and put the rest on the left
+    let buf_max   = vimwidth / max_width
+    let buf_right = 1
+    let buf_left  = max([0, buf_max - buf_right])
+
+    let start = max([0, position - buf_left])
+    let end   = min([buf_count, position + buf_right])
+
+    " fill up available space on the right
+    if position < buf_left
+      let end += (buf_left - position)
+    endif
+
+    " fill up available space on the left
+    if end > buf_count - 1 - buf_right
+      let start -= max([0, buf_right - (buf_count - 1 - position)])
+    endif
+
+    let buffers = eval('buffers[' . start . ':' . end . ']')
+
+    if start > 0
+      call insert(buffers, -1, 0)
+    endif
+
+    if end < buf_count - 1
+      call add(buffers, -1)
+    endif
+  endif
+
+  return buffers
+endfunction
+
+let s:current_bufnr = -1
+let s:current_tabnr = -1
+let s:current_tabline = ''
+let s:current_modified = 0
+function! s:get_buffers()
+  let cur = bufnr('%')
+  if cur == s:current_bufnr
+    if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let b = airline#builder#new(s:builder_context)
+  let tab_bufs = tabpagebuflist(tabpagenr())
+  for nr in s:get_visible_buffers()
+    if nr < 0
+      call b.add_raw('%#airline_tabhid#...')
+      continue
+    endif
+    if cur == nr
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod'
+      else
+        let group = 'airline_tabsel'
+      endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      if index(tab_bufs, nr) > -1
+        let group = 'airline_tab'
+      else
+        let group = 'airline_tabhid'
+      endif
+    endif
+    call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabtype', ' buffers ')
+
+  let s:current_bufnr = cur
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
+
+function! s:get_tabs()
+  let curbuf = bufnr('%')
+  let curtab = tabpagenr()
+  if curbuf == s:current_bufnr && curtab == s:current_tabnr
+    if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let b = airline#builder#new(s:builder_context)
+  for i in range(1, tabpagenr('$'))
+    if i == curtab
+      let group = 'airline_tabsel'
+      if g:airline_detect_modified
+        for bi in tabpagebuflist(i)
+          if getbufvar(bi, '&modified')
+            let group = 'airline_tabmod'
+          endif
+        endfor
+      endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      let group = 'airline_tab'
+    endif
+    let val = '%('
+    if s:show_tab_nr
+      if s:tab_nr_type == 0
+        let val .= ' %{len(tabpagebuflist('.i.'))}'
+      else
+        let val .= (g:airline_symbols.space).i
+      endif
+    endif
+    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+
+  call b.add_raw('%T')
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  if s:show_tab_type
+    call b.add_section('airline_tabtype', ' tabs ')
+  endif
+
+  let s:current_bufnr = curbuf
+  let s:current_tabnr = curtab
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/default.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/default.vim
new file mode 100644
index 0000000..4f1ed40
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/default.vim
@@ -0,0 +1,35 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
+let s:fnamecollapse = get(g:, 'airline#extensions#tabline#fnamecollapse', 1)
+let s:buf_nr_format = get(g:, 'airline#extensions#tabline#buffer_nr_format', '%s: ')
+let s:buf_nr_show = get(g:, 'airline#extensions#tabline#buffer_nr_show', 0)
+let s:buf_modified_symbol = g:airline_symbols.modified
+
+function! airline#extensions#tabline#default#format(bufnr, buffers)
+  let _ = ''
+
+  let name = bufname(a:bufnr)
+  if empty(name)
+    let _ .= '[No Name]'
+  else
+    if s:fnamecollapse
+      let _ .= substitute(fnamemodify(name, s:fmod), '\v\w\zs.{-}\ze(\\|/)', '', 'g')
+    else
+      let _ .= fnamemodify(name, s:fmod)
+    endif
+  endif
+
+  return airline#extensions#tabline#default#wrap_name(a:bufnr, _)
+endfunction
+
+function! airline#extensions#tabline#default#wrap_name(bufnr, buffer_name)
+  let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
+  let _ .= substitute(a:buffer_name, '\\', '/', 'g')
+
+  if getbufvar(a:bufnr, '&modified') == 1
+    let _ .= s:buf_modified_symbol
+  endif
+  return _
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
new file mode 100644
index 0000000..e4a790d
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail.vim
@@ -0,0 +1,27 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#extensions#tabline#unique_tail#format(bufnr, buffers)
+  let duplicates = {}
+  let tails = {}
+  let map = {}
+  for nr in a:buffers
+    let name = bufname(nr)
+    if empty(name)
+      let map[nr] = '[No Name]'
+    else
+      let tail = fnamemodify(name, ':t')
+      if has_key(tails, tail)
+        let duplicates[nr] = nr
+      endif
+      let tails[tail] = 1
+      let map[nr] = airline#extensions#tabline#default#wrap_name(nr, tail)
+    endif
+  endfor
+
+  for nr in values(duplicates)
+    let map[nr] = airline#extensions#tabline#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+  endfor
+
+  return map[a:bufnr]
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
new file mode 100644
index 0000000..6b13dcf
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -0,0 +1,89 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:skip_symbol = '…'
+
+function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
+  if len(a:buffers) <= 1 " don't need to compare bufnames if has less than one buffer opened
+    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
+  endif
+
+  let curbuf_tail = fnamemodify(bufname(a:bufnr), ':t')
+  let do_deduplicate = 0
+  let path_tokens = {}
+
+  for nr in a:buffers
+    let name = bufname(nr)
+    if !empty(name) && nr != a:bufnr && fnamemodify(name, ':t') == curbuf_tail
+      let do_deduplicate = 1
+      let tokens = reverse(split(substitute(fnamemodify(name, ':p:.:h'), '\\', '/', 'g'), '/'))
+      let token_index = 0
+      for token in tokens
+        if token == '' | continue | endif
+        if token == '.' | break | endif
+        if !has_key(path_tokens, token_index)
+          let path_tokens[token_index] = {}
+        endif
+        let path_tokens[token_index][token] = 1
+        let token_index += 1
+      endfor
+    endif
+  endfor
+
+  if do_deduplicate == 1
+    let path = []
+    let token_index = 0
+    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:.:h'), '\\', '/', 'g'), '/'))
+      if token == '.' | break | endif
+      let duplicated = 0
+      let uniq = 1
+      let single = 1
+      if has_key(path_tokens, token_index)
+        let duplicated = 1
+        if len(keys(path_tokens[token_index])) > 1 | let single = 0 | endif
+        if has_key(path_tokens[token_index], token) | let uniq = 0 | endif
+      endif
+      call insert(path, {'token': token, 'duplicated': duplicated, 'uniq': uniq, 'single': single})
+      let token_index += 1
+    endfor
+
+    let buf_name = [curbuf_tail]
+    let has_uniq = 0
+    let has_skipped = 0
+    for token1 in reverse(path)
+      if !token1['duplicated'] && len(buf_name) > 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if has_uniq == 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if token1['uniq'] == 0 && token1['single'] == 1
+        let has_skipped = 1
+      else
+        if has_skipped == 1
+          call insert(buf_name, s:skip_symbol)
+          let has_skipped = 0
+        endif
+        call insert(buf_name, token1['token'])
+      endif
+
+      if token1['uniq'] == 1
+        let has_uniq = 1
+      endif
+    endfor
+
+    if has_skipped == 1
+      call insert(buf_name, s:skip_symbol)
+    endif
+
+    return airline#extensions#tabline#default#wrap_name(a:bufnr, join(buf_name, '/'))
+  else
+    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
+  endif
+endfunction
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tagbar.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tagbar.vim
new file mode 100644
index 0000000..56919a8
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -0,0 +1,45 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':TagbarToggle')
+  finish
+endif
+
+let s:flags = get(g:, 'airline#extensions#tagbar#flags', '')
+let s:spc = g:airline_symbols.space
+
+" Arguments: current, sort, fname
+function! airline#extensions#tagbar#get_status(...)
+  let builder = airline#builder#new({ 'active': a:1 })
+  call builder.add_section('airline_a', s:spc.'Tagbar'.s:spc)
+  call builder.add_section('airline_b', s:spc.a:2.s:spc)
+  call builder.add_section('airline_c', s:spc.a:3.s:spc)
+  return builder.build()
+endfunction
+
+function! airline#extensions#tagbar#inactive_apply(...)
+  if getwinvar(a:2.winnr, '&filetype') == 'tagbar'
+    return -1
+  endif
+endfunction
+
+let s:airline_tagbar_last_lookup_time = 0
+let s:airline_tagbar_last_lookup_val = ''
+function! airline#extensions#tagbar#currenttag()
+  if get(w:, 'airline_active', 0)
+    if s:airline_tagbar_last_lookup_time != localtime()
+      let s:airline_tagbar_last_lookup_val = tagbar#currenttag('%s', '', s:flags)
+      let s:airline_tagbar_last_lookup_time = localtime()
+    endif
+    return s:airline_tagbar_last_lookup_val
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#tagbar#init(ext)
+  call a:ext.add_inactive_statusline_func('airline#extensions#tagbar#inactive_apply')
+  let g:tagbar_status_func = 'airline#extensions#tagbar#get_status'
+
+  call airline#parts#define_function('tagbar', 'airline#extensions#tagbar#currenttag')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim
new file mode 100644
index 0000000..363709b
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim
@@ -0,0 +1,26 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':Tmuxline')
+  finish
+endif
+
+let s:tmuxline_snapshot_file = get(g:, 'airline#extensions#tmuxline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#tmuxline#color_template', 'normal')
+
+function! airline#extensions#tmuxline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#tmuxline#set_tmux_colors')
+endfunction
+
+function! airline#extensions#tmuxline#set_tmux_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  let tmuxline_theme = tmuxline#api#create_theme_from_airline(mode_palette)
+  call tmuxline#api#set_theme(tmuxline_theme)
+
+  if strlen(s:tmuxline_snapshot_file)
+    call tmuxline#api#snapshot(s:tmuxline_snapshot_file)
+  endif
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/undotree.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/undotree.vim
new file mode 100644
index 0000000..f577ffd
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/undotree.vim
@@ -0,0 +1,27 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':UndotreeToggle')
+  finish
+endif
+
+function! airline#extensions#undotree#apply(...)
+  if exists('t:undotree')
+    if &ft == 'undotree'
+      if exists('*t:undotree.GetStatusLine')
+        call airline#extensions#apply_left_override('undo', '%{t:undotree.GetStatusLine()}')
+      else
+        call airline#extensions#apply_left_override('undotree', '%f')
+      endif
+    endif
+
+    if &ft == 'diff' && exists('*t:diffpanel.GetStatusLine')
+      call airline#extensions#apply_left_override('diff', '%{t:diffpanel.GetStatusLine()}')
+    endif
+  endif
+endfunction
+
+function! airline#extensions#undotree#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#undotree#apply')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/unite.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/unite.vim
new file mode 100644
index 0000000..d230b6f
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/unite.vim
@@ -0,0 +1,23 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_unite', 0)
+  finish
+endif
+
+function! airline#extensions#unite#apply(...)
+  if &ft == 'unite'
+    call a:1.add_section('airline_a', ' Unite ')
+    call a:1.add_section('airline_b', ' %{get(unite#get_context(), "buffer_name", "")} ')
+    call a:1.add_section('airline_c', ' %{unite#get_status_string()} ')
+    call a:1.split()
+    call a:1.add_section('airline_y', ' %{get(unite#get_context(), "real_buffer_name", "")} ')
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#unite#init(ext)
+  let g:unite_force_overwrite_statusline = 0
+  call a:ext.add_statusline_func('airline#extensions#unite#apply')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim
new file mode 100644
index 0000000..f070c47
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -0,0 +1,20 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'virtualenv_loaded', 0)
+  finish
+endif
+
+let s:spc = g:airline_symbols.space
+
+function! airline#extensions#virtualenv#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#virtualenv#apply')
+endfunction
+
+function! airline#extensions#virtualenv#apply(...)
+  if &filetype =~ "python"
+    call airline#extensions#append_to_section('x',
+          \ s:spc.g:airline_right_alt_sep.s:spc.'%{virtualenv#statusline()}')
+  endif
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/extensions/whitespace.vim b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/whitespace.vim
new file mode 100644
index 0000000..8657412
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -0,0 +1,103 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
+
+" for backwards compatibility
+if exists('g:airline_detect_whitespace')
+  let s:show_message = g:airline_detect_whitespace == 1
+else
+  let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1)
+endif
+
+let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace)
+let s:default_checks = ['indent', 'trailing']
+
+let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
+let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
+let s:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)
+
+let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
+
+let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
+
+function! s:check_mixed_indent()
+  if s:indent_algo == 1
+    " [<tab>]<space><tab>
+    " spaces before or between tabs are not allowed
+    let t_s_t = '(^\t* +\t\s*\S)'
+    " <tab>(<space> x count)
+    " count of spaces at the end of tabs should be less then tabstop value
+    let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
+    return search('\v' . t_s_t . '|' . t_l_s, 'nw')
+  else
+    return search('\v(^\t+ +)|(^ +\t+)', 'nw')
+  endif
+endfunction
+
+function! airline#extensions#whitespace#check()
+  if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
+    return ''
+  endif
+
+  if !exists('b:airline_whitespace_check')
+    let b:airline_whitespace_check = ''
+    let checks = get(g:, 'airline#extensions#whitespace#checks', s:default_checks)
+
+    let trailing = 0
+    if index(checks, 'trailing') > -1
+      let trailing = search('\s$', 'nw')
+    endif
+
+    let mixed = 0
+    if index(checks, 'indent') > -1
+      let mixed = s:check_mixed_indent()
+    endif
+
+    if trailing != 0 || mixed != 0
+      let b:airline_whitespace_check = s:symbol
+      if s:show_message
+        if trailing != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:trailing_format, trailing)
+        endif
+        if mixed != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixed)
+        endif
+      endif
+    endif
+  endif
+  return b:airline_whitespace_check
+endfunction!
+
+function! airline#extensions#whitespace#toggle()
+  if s:enabled
+    augroup airline_whitespace
+      autocmd!
+    augroup END
+    augroup! airline_whitespace
+    let s:enabled = 0
+  else
+    call airline#extensions#whitespace#init()
+    let s:enabled = 1
+  endif
+
+  if exists("g:airline#extensions#whitespace#enabled")
+    let g:airline#extensions#whitespace#enabled = s:enabled
+    if s:enabled && match(g:airline_section_warning, '#whitespace#check') < 0
+      let g:airline_section_warning .= airline#section#create(['whitespace'])
+      call airline#update_statusline()
+    endif
+  endif
+  echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
+endfunction
+
+function! airline#extensions#whitespace#init(...)
+  call airline#parts#define_function('whitespace', 'airline#extensions#whitespace#check')
+
+  unlet! b:airline_whitespace_check
+  augroup airline_whitespace
+    autocmd!
+    autocmd CursorHold,BufWritePost * unlet! b:airline_whitespace_check
+  augroup END
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/highlighter.vim b/vim/.vim/bundle/vim-airline/autoload/airline/highlighter.vim
new file mode 100644
index 0000000..65a95cc
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/highlighter.vim
@@ -0,0 +1,156 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
+let s:separators = {}
+let s:accents = {}
+
+function! s:gui2cui(rgb, fallback)
+  if a:rgb == ''
+    return a:fallback
+  endif
+  let rgb = map(matchlist(a:rgb, '#\(..\)\(..\)\(..\)')[1:3], '0 + ("0x".v:val)')
+  let rgb = [rgb[0] > 127 ? 4 : 0, rgb[1] > 127 ? 2 : 0, rgb[2] > 127 ? 1 : 0]
+  return rgb[0]+rgb[1]+rgb[2]
+endfunction
+
+function! s:get_syn(group, what)
+  " need to pass in mode, known to break on 7.3.547
+  let mode = has('gui_running') ? 'gui' : 'cterm'
+  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
+  if empty(color) || color == -1
+    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
+  endif
+  if empty(color) || color == -1
+    if has('gui_running')
+      let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
+    else
+      let color = a:what ==# 'fg' ? 0 : 1
+    endif
+  endif
+  return color
+endfunction
+
+function! s:get_array(fg, bg, opts)
+  let fg = a:fg
+  let bg = a:bg
+  return has('gui_running')
+        \ ? [ fg, bg, '', '', join(a:opts, ',') ]
+        \ : [ '', '', fg, bg, join(a:opts, ',') ]
+endfunction
+
+function! airline#highlighter#get_highlight(group, ...)
+  let fg = s:get_syn(a:group, 'fg')
+  let bg = s:get_syn(a:group, 'bg')
+  let reverse = synIDattr(synIDtrans(hlID(a:group)), 'reverse', has('gui_running') ? 'gui' : 'term')
+  return reverse ? s:get_array(bg, fg, a:000) : s:get_array(fg, bg, a:000)
+endfunction
+
+function! airline#highlighter#get_highlight2(fg, bg, ...)
+  let fg = s:get_syn(a:fg[0], a:fg[1])
+  let bg = s:get_syn(a:bg[0], a:bg[1])
+  return s:get_array(fg, bg, a:000)
+endfunction
+
+function! airline#highlighter#exec(group, colors)
+  let colors = a:colors
+  if s:is_win32term
+    let colors[2] = s:gui2cui(get(colors, 0, ''), get(colors, 2, ''))
+    let colors[3] = s:gui2cui(get(colors, 1, ''), get(colors, 3, ''))
+  endif
+  exec printf('hi %s %s %s %s %s %s %s %s',
+        \ a:group,
+        \ get(colors, 0, '') != '' ? 'guifg='.colors[0] : '',
+        \ get(colors, 1, '') != '' ? 'guibg='.colors[1] : '',
+        \ get(colors, 2, '') != '' ? 'ctermfg='.colors[2] : '',
+        \ get(colors, 3, '') != '' ? 'ctermbg='.colors[3] : '',
+        \ get(colors, 4, '') != '' ? 'gui='.colors[4] : '',
+        \ get(colors, 4, '') != '' ? 'cterm='.colors[4] : '',
+        \ get(colors, 4, '') != '' ? 'term='.colors[4] : '')
+endfunction
+
+function! s:exec_separator(dict, from, to, inverse, suffix)
+  let l:from = airline#themes#get_highlight(a:from.a:suffix)
+  let l:to = airline#themes#get_highlight(a:to.a:suffix)
+  let group = a:from.'_to_'.a:to.a:suffix
+  if a:inverse
+    let colors = [ l:from[1], l:to[1], l:from[3], l:to[3] ]
+  else
+    let colors = [ l:to[1], l:from[1], l:to[3], l:from[3] ]
+  endif
+  let a:dict[group] = colors
+  call airline#highlighter#exec(group, colors)
+endfunction
+
+function! airline#highlighter#load_theme()
+  for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
+  endfor
+  call airline#highlighter#highlight(['inactive'])
+  call airline#highlighter#highlight(['normal'])
+endfunction
+
+function! airline#highlighter#add_separator(from, to, inverse)
+  let s:separators[a:from.a:to] = [a:from, a:to, a:inverse]
+  call <sid>exec_separator({}, a:from, a:to, a:inverse, '')
+endfunction
+
+function! airline#highlighter#add_accent(accent)
+  let s:accents[a:accent] = 1
+endfunction
+
+function! airline#highlighter#highlight_modified_inactive(bufnr)
+  if getbufvar(a:bufnr, '&modified')
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c : []
+  else
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive.airline_c : []
+  endif
+
+  if !empty(colors)
+    call airline#highlighter#exec('airline_c'.(a:bufnr).'_inactive', colors)
+  endif
+endfunction
+
+function! airline#highlighter#highlight(modes)
+  let p = g:airline#themes#{g:airline_theme}#palette
+
+  " draw the base mode, followed by any overrides
+  let mapped = map(a:modes, 'v:val == a:modes[0] ? v:val : a:modes[0]."_".v:val')
+  let suffix = a:modes[0] == 'inactive' ? '_inactive' : ''
+  for mode in mapped
+    if exists('g:airline#themes#{g:airline_theme}#palette[mode]')
+      let dict = g:airline#themes#{g:airline_theme}#palette[mode]
+      for kvp in items(dict)
+        let mode_colors = kvp[1]
+        call airline#highlighter#exec(kvp[0].suffix, mode_colors)
+
+        for accent in keys(s:accents)
+          if !has_key(p.accents, accent)
+            continue
+          endif
+          let colors = copy(mode_colors)
+          if p.accents[accent][0] != ''
+            let colors[0] = p.accents[accent][0]
+          endif
+          if p.accents[accent][2] != ''
+            let colors[2] = p.accents[accent][2]
+          endif
+          if len(colors) >= 5
+            let colors[4] = get(p.accents[accent], 4, '')
+          else
+            call add(colors, get(p.accents[accent], 4, ''))
+          endif
+          call airline#highlighter#exec(kvp[0].suffix.'_'.accent, colors)
+        endfor
+      endfor
+
+      " TODO: optimize this
+      for sep in items(s:separators)
+        call <sid>exec_separator(dict, sep[1][0], sep[1][1], sep[1][2], suffix)
+      endfor
+    endif
+  endfor
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/init.vim b/vim/.vim/bundle/vim-airline/autoload/airline/init.vim
new file mode 100644
index 0000000..a60774d
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/init.vim
@@ -0,0 +1,113 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! s:check_defined(variable, default)
+  if !exists(a:variable)
+    let {a:variable} = a:default
+  endif
+endfunction
+
+let s:loaded = 0
+function! airline#init#bootstrap()
+  if s:loaded
+    return
+  endif
+  let s:loaded = 1
+
+  let g:airline#init#bootstrapping = 1
+
+  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b0":">")
+  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b1":">")
+  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b2":"<")
+  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b3":"<")
+  call s:check_defined('g:airline_detect_modified', 1)
+  call s:check_defined('g:airline_detect_paste', 1)
+  call s:check_defined('g:airline_detect_iminsert', 0)
+  call s:check_defined('g:airline_inactive_collapse', 1)
+  call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
+  call s:check_defined('g:airline_exclude_filetypes', [])
+  call s:check_defined('g:airline_exclude_preview', 0)
+
+  call s:check_defined('g:airline_mode_map', {})
+  call extend(g:airline_mode_map, {
+        \ '__' : '------',
+        \ 'n'  : 'NORMAL',
+        \ 'i'  : 'INSERT',
+        \ 'R'  : 'REPLACE',
+        \ 'v'  : 'VISUAL',
+        \ 'V'  : 'V-LINE',
+        \ 'c'  : 'COMMAND',
+        \ '' : 'V-BLOCK',
+        \ 's'  : 'SELECT',
+        \ 'S'  : 'S-LINE',
+        \ '' : 'S-BLOCK',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_theme_map', {})
+  call extend(g:airline_theme_map, {
+        \ 'Tomorrow.*': 'tomorrow',
+        \ 'base16.*': 'base16',
+        \ 'mo[l|n]okai': 'molokai',
+        \ 'wombat.*': 'wombat',
+        \ '.*zenburn.*': 'zenburn',
+        \ '.*solarized.*': 'solarized',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_symbols', {})
+  call extend(g:airline_symbols, {
+        \ 'paste': get(g:, 'airline_paste_symbol', 'PASTE'),
+        \ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a2" : 'RO'),
+        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? "\u2739" : '!',
+        \ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a1" : ':' ),
+        \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a0" : ''),
+        \ 'modified': '+',
+        \ 'space': ' ',
+        \ }, 'keep')
+
+  call airline#parts#define('mode', {
+        \ 'function': 'airline#parts#mode',
+        \ 'accent': 'bold',
+        \ })
+  call airline#parts#define_function('iminsert', 'airline#parts#iminsert')
+  call airline#parts#define_function('paste', 'airline#parts#paste')
+  call airline#parts#define_function('filetype', 'airline#parts#filetype')
+  call airline#parts#define('readonly', {
+        \ 'function': 'airline#parts#readonly',
+        \ 'accent': 'red',
+        \ })
+  call airline#parts#define_raw('file', '%f%m')
+  call airline#parts#define_raw('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
+  call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
+  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace'])
+
+  unlet g:airline#init#bootstrapping
+endfunction
+
+function! airline#init#sections()
+  let spc = g:airline_symbols.space
+  if !exists('g:airline_section_a')
+    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'iminsert'])
+  endif
+  if !exists('g:airline_section_b')
+    let g:airline_section_b = airline#section#create(['hunks', 'branch'])
+  endif
+  if !exists('g:airline_section_c')
+    let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
+  endif
+  if !exists('g:airline_section_gutter')
+    let g:airline_section_gutter = airline#section#create(['%='])
+  endif
+  if !exists('g:airline_section_x')
+    let g:airline_section_x = airline#section#create_right(['tagbar', 'filetype'])
+  endif
+  if !exists('g:airline_section_y')
+    let g:airline_section_y = airline#section#create_right(['ffenc'])
+  endif
+  if !exists('g:airline_section_z')
+    let g:airline_section_z = airline#section#create(['%3p%%'.spc, 'linenr', ':%3c '])
+  endif
+  if !exists('g:airline_section_warning')
+    let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
+  endif
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/parts.vim b/vim/.vim/bundle/vim-airline/autoload/airline/parts.vim
new file mode 100644
index 0000000..b0356b1
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/parts.vim
@@ -0,0 +1,79 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:parts = {}
+
+" PUBLIC API {{{
+
+function! airline#parts#define(key, config)
+  let s:parts[a:key] = get(s:parts, a:key, {})
+  if exists('g:airline#init#bootstrapping')
+    call extend(s:parts[a:key], a:config, 'keep')
+  else
+    call extend(s:parts[a:key], a:config, 'force')
+  endif
+endfunction
+
+function! airline#parts#define_function(key, name)
+  call airline#parts#define(a:key, { 'function': a:name })
+endfunction
+
+function! airline#parts#define_text(key, text)
+  call airline#parts#define(a:key, { 'text': a:text })
+endfunction
+
+function! airline#parts#define_raw(key, raw)
+  call airline#parts#define(a:key, { 'raw': a:raw })
+endfunction
+
+function! airline#parts#define_minwidth(key, width)
+  call airline#parts#define(a:key, { 'minwidth': a:width })
+endfunction
+
+function! airline#parts#define_condition(key, predicate)
+  call airline#parts#define(a:key, { 'condition': a:predicate })
+endfunction
+
+function! airline#parts#define_accent(key, accent)
+  call airline#parts#define(a:key, { 'accent': a:accent })
+endfunction
+
+function! airline#parts#define_empty(keys)
+  for key in a:keys
+    call airline#parts#define_raw(key, '')
+  endfor
+endfunction
+
+function! airline#parts#get(key)
+  return get(s:parts, a:key, {})
+endfunction
+
+" }}}
+
+function! airline#parts#mode()
+  return get(w:, 'airline_current_mode', '')
+endfunction
+
+function! airline#parts#paste()
+  return g:airline_detect_paste && &paste ? g:airline_symbols.paste : ''
+endfunction
+
+function! airline#parts#iminsert()
+  if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name')
+    return toupper(b:keymap_name)
+  endif
+  return ''
+endfunction
+
+function! airline#parts#readonly()
+  return &readonly ? g:airline_symbols.readonly : ''
+endfunction
+
+function! airline#parts#filetype()
+  return &filetype
+endfunction
+
+function! airline#parts#ffenc()
+  return printf('%s%s', &fenc, strlen(&ff) > 0 ? '['.&ff.']' : '')
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/section.vim b/vim/.vim/bundle/vim-airline/autoload/airline/section.vim
new file mode 100644
index 0000000..0baf077
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/section.vim
@@ -0,0 +1,73 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+function! s:wrap_accent(part, value)
+  if exists('a:part.accent')
+    call airline#highlighter#add_accent(a:part.accent)
+    return '%#__accent_'.(a:part.accent).'#'.a:value.'%#__restore__#'
+  endif
+  return a:value
+endfunction
+
+function! s:create(parts, append)
+  let _ = ''
+  for idx in range(len(a:parts))
+    let part = airline#parts#get(a:parts[idx])
+    let val = ''
+
+    if exists('part.function')
+      let func = (part.function).'()'
+    elseif exists('part.text')
+      let func = '"'.(part.text).'"'
+    else
+      if a:append > 0 && idx != 0
+        let val .= s:spc.g:airline_left_alt_sep.s:spc
+      endif
+      if a:append < 0 && idx != 0
+        let val = s:spc.g:airline_right_alt_sep.s:spc.val
+      endif
+      if exists('part.raw')
+        let _ .= s:wrap_accent(part, val.(part.raw))
+        continue
+      else
+        let _ .= s:wrap_accent(part, val.a:parts[idx])
+        continue
+      endif
+    endif
+
+    let minwidth = get(part, 'minwidth', 0)
+
+    if a:append > 0 && idx != 0
+      let partval = printf('%%{airline#util#append(%s,%s)}', func, minwidth)
+    elseif a:append < 0 && idx != len(a:parts) - 1
+      let partval = printf('%%{airline#util#prepend(%s,%s)}', func, minwidth)
+    else
+      let partval = printf('%%{airline#util#wrap(%s,%s)}', func, minwidth)
+    endif
+
+    if exists('part.condition')
+      let partval = substitute(partval, '{', '{'.(part.condition).' ? ', '')
+      let partval = substitute(partval, '}', ' : ""}', '')
+    endif
+
+    let val .= s:wrap_accent(part, partval)
+    let _ .= val
+  endfor
+  return _
+endfunction
+
+function! airline#section#create(parts)
+  return s:create(a:parts, 0)
+endfunction
+
+function! airline#section#create_left(parts)
+  return s:create(a:parts, 1)
+endfunction
+
+function! airline#section#create_right(parts)
+  return s:create(a:parts, -1)
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes.vim
new file mode 100644
index 0000000..07e0324
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes.vim
@@ -0,0 +1,67 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" generates a dictionary which defines the colors for each highlight group
+function! airline#themes#generate_color_map(sect1, sect2, sect3, ...)
+  let palette = {
+        \ 'airline_a': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , get(a:sect1 , 4 , '') ] ,
+        \ 'airline_b': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , get(a:sect2 , 4 , '') ] ,
+        \ 'airline_c': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , get(a:sect3 , 4 , '') ] ,
+        \ }
+
+  if a:0 > 0
+    call extend(palette, {
+          \ 'airline_x': [ a:1[0] , a:1[1] , a:1[2] , a:1[3] , get(a:1 , 4 , '' ) ] ,
+          \ 'airline_y': [ a:2[0] , a:2[1] , a:2[2] , a:2[3] , get(a:2 , 4 , '' ) ] ,
+          \ 'airline_z': [ a:3[0] , a:3[1] , a:3[2] , a:3[3] , get(a:3 , 4 , '' ) ] ,
+          \ })
+  else
+    call extend(palette, {
+          \ 'airline_x': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , '' ] ,
+          \ 'airline_y': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , '' ] ,
+          \ 'airline_z': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , '' ] ,
+          \ })
+  endif
+
+  return palette
+endfunction
+
+function! airline#themes#get_highlight(group, ...)
+  return call('airline#highlighter#get_highlight', [a:group] + a:000)
+endfunction
+
+function! airline#themes#get_highlight2(fg, bg, ...)
+  return call('airline#highlighter#get_highlight2', [a:fg, a:bg] + a:000)
+endfunction
+
+function! airline#themes#patch(palette)
+  for mode in keys(a:palette)
+    if !has_key(a:palette[mode], 'airline_warning')
+      let a:palette[mode]['airline_warning'] = [ '#000000', '#df5f00', 232, 166 ]
+    endif
+  endfor
+
+  let a:palette.accents = get(a:palette, 'accents', {})
+  let a:palette.accents.bold = [ '', '', '', '', 'bold' ]
+  let a:palette.accents.italic = [ '', '', '', '', 'italic' ]
+
+  if !has_key(a:palette.accents, 'red')
+    let a:palette.accents.red = [ '#ff0000' , '' , 160 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'green')
+    let a:palette.accents.green = [ '#008700' , '' , 22  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'blue')
+    let a:palette.accents.blue = [ '#005fff' , '' , 27  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'yellow')
+    let a:palette.accents.yellow = [ '#dfff00' , '' , 190 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'orange')
+    let a:palette.accents.orange = [ '#df5f00' , '' , 166 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'purple')
+    let a:palette.accents.purple = [ '#af00df' , '' , 128 , '' ]
+  endif
+endfunction
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/badwolf.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/badwolf.vim
new file mode 100644
index 0000000..41a25d1
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/badwolf.vim
@@ -0,0 +1,52 @@
+let s:N1 = [ '#141413' , '#aeee00' , 232 , 154 ] " blackestgravel & lime
+let s:N2 = [ '#f4cf86' , '#45413b' , 222 , 238 ] " dirtyblonde    & deepgravel
+let s:N3 = [ '#8cffba' , '#242321' , 121 , 235 ] " saltwatertaffy & darkgravel
+let s:N4 = [ '#666462' , 241 ]                   " mediumgravel
+
+let s:I1 = [ '#141413' , '#0a9dff' , 232 , 39  ] " blackestgravel & tardis
+let s:I2 = [ '#f4cf86' , '#005fff' , 222 , 27  ] " dirtyblonde    & facebook
+let s:I3 = [ '#0a9dff' , '#242321' , 39  , 235 ] " tardis         & darkgravel
+
+let s:V1 = [ '#141413' , '#ffa724' , 232 , 214 ] " blackestgravel & orange
+let s:V2 = [ '#000000' , '#fade3e' , 16  , 221 ] " coal           & dalespale
+let s:V3 = [ '#000000' , '#b88853' , 16  , 137 ] " coal           & toffee
+let s:V4 = [ '#c7915b' , 173 ]                   " coffee
+
+let s:PA = [ '#f4cf86' , 222 ]                   " dirtyblonde
+let s:RE = [ '#ff9eb8' , 211 ]                   " dress
+
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+
+let g:airline#themes#badwolf#palette = {}
+
+let g:airline#themes#badwolf#palette.accents = {
+      \ 'red': [ '#ff2c4b' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#badwolf#palette.normal_modified = {
+      \ 'airline_b': [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#badwolf#palette.insert_modified = {
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
+let g:airline#themes#badwolf#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.replace = copy(airline#themes#badwolf#palette.insert)
+let g:airline#themes#badwolf#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#badwolf#palette.replace_modified = g:airline#themes#badwolf#palette.insert_modified
+
+
+let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#badwolf#palette.visual_modified = {
+      \ 'airline_c': [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#badwolf#palette.inactive_modified = {
+      \ 'airline_c': [ s:V1[1]   , ''        , s:V1[3]   , ''        , ''     ] }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/base16.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/base16.vim
new file mode 100644
index 0000000..469435e
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/base16.vim
@@ -0,0 +1,107 @@
+if get(g:, 'airline#themes#base16#constant', 0)
+  let g:airline#themes#base16#palette = {}
+
+  " Color palette
+  let s:gui_dark_gray = '#202020'
+  let s:cterm_dark_gray = 234
+  let s:gui_med_gray_hi = '#303030'
+  let s:cterm_med_gray_hi = 236
+  let s:gui_med_gray_lo = '#3a3a3a'
+  let s:cterm_med_gray_lo = 237
+  let s:gui_light_gray = '#505050'
+  let s:cterm_light_gray = 239
+  let s:gui_green = '#99cc99'
+  let s:cterm_green = 151
+  let s:gui_blue = '#6a9fb5'
+  let s:cterm_blue = 67
+  let s:gui_purple = '#aa759f'
+  let s:cterm_purple = 139
+  let s:gui_orange = '#d28445'
+  let s:cterm_orange = 173
+  let s:gui_red = '#ac4142'
+  let s:cterm_red = 131
+  let s:gui_pink = '#d7afd7'
+  let s:cterm_pink = 182
+
+  " Normal mode
+  let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
+  let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
+  let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#base16#palette.normal_modified = {
+        \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
+        \ }
+
+  " Insert mode
+  let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
+  let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
+  let g:airline#themes#base16#palette.insert_modified = copy(g:airline#themes#base16#palette.normal_modified)
+  let g:airline#themes#base16#palette.insert_paste = {
+        \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
+        \ }
+
+  " Replace mode
+  let g:airline#themes#base16#palette.replace = {
+        \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
+        \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
+        \ }
+  let g:airline#themes#base16#palette.replace_modified = copy(g:airline#themes#base16#palette.insert_modified)
+
+  " Visual mode
+  let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
+  let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
+  let g:airline#themes#base16#palette.visual_modified = copy(g:airline#themes#base16#palette.insert_modified)
+
+  " Inactive window
+  let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
+  let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#base16#palette.inactive_modified = {
+        \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+        \ }
+else
+  function! airline#themes#base16#refresh()
+    let g:airline#themes#base16#palette = {}
+
+    let g:airline#themes#base16#palette.accents = {
+          \ 'red': airline#themes#get_highlight('Constant'),
+          \ }
+
+    let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
+    let s:N2 = airline#themes#get_highlight('Visual')
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let group = airline#themes#get_highlight('vimCommand')
+    let g:airline#themes#base16#palette.normal_modified = {
+          \ 'statusline': [ group[0], '', group[2], '', '' ]
+          \ }
+
+    let s:I1 = airline#themes#get_highlight2(['DiffAdded', 'bg'], ['DiffAdded', 'fg'], 'bold')
+    let s:I2 = airline#themes#get_highlight2(['DiffAdded', 'fg'], ['Normal', 'bg'])
+    let s:I3 = s:N3
+    let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#base16#palette.insert_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:R1 = airline#themes#get_highlight2(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#base16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#base16#palette.replace_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
+    let s:V3 = s:N3
+    let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#base16#palette.visual_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
+    let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#base16#palette.inactive_modified = {
+          \ 'airline_c': [ group[0], '', group[2], '', '' ]
+          \ }
+  endfunction
+  call airline#themes#base16#refresh()
+endif
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/bubblegum.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/bubblegum.vim
new file mode 100644
index 0000000..d18e032
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/bubblegum.vim
@@ -0,0 +1,62 @@
+" Color palette
+let s:gui_dark_gray = '#303030'
+let s:cterm_dark_gray = 236
+let s:gui_med_gray_hi = '#444444'
+let s:cterm_med_gray_hi = 238
+let s:gui_med_gray_lo = '#3a3a3a'
+let s:cterm_med_gray_lo = 237
+let s:gui_light_gray = '#b2b2b2'
+let s:cterm_light_gray = 249
+let s:gui_green = '#afd787'
+let s:cterm_green = 150
+let s:gui_blue = '#87afd7'
+let s:cterm_blue = 110
+let s:gui_purple = '#afafd7'
+let s:cterm_purple = 146
+let s:gui_orange = '#d7af5f'
+let s:cterm_orange = 179
+let s:gui_red = '#d78787'
+let s:cterm_red = 174
+let s:gui_pink = '#d7afd7'
+let s:cterm_pink = 182
+
+let g:airline#themes#bubblegum#palette = {}
+
+" Normal mode
+let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
+let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
+let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#bubblegum#palette.normal_modified = {
+      \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
+      \ }
+
+" Insert mode
+let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
+let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
+let g:airline#themes#bubblegum#palette.insert_modified = copy(g:airline#themes#bubblegum#palette.normal_modified)
+let g:airline#themes#bubblegum#palette.insert_paste = {
+      \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
+      \ }
+
+" Replace mode
+let g:airline#themes#bubblegum#palette.replace = {
+      \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
+      \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
+      \ }
+let g:airline#themes#bubblegum#palette.replace_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
+
+" Visual mode
+let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
+let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
+let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
+
+" Inactive window
+let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
+let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#bubblegum#palette.inactive_modified = {
+      \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+      \ }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/dark.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/dark.vim
new file mode 100644
index 0000000..217b2f1
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/dark.vim
@@ -0,0 +1,102 @@
+" Each theme is contained in its own file and declares variables scoped to the
+" file.  These variables represent the possible "modes" that airline can
+" detect.  The mode is the return value of mode(), which gets converted to a
+" readable string.  The following is a list currently supported modes: normal,
+" insert, replace, visual, and inactive.
+"
+" Each mode can also have overrides.  These are small changes to the mode that
+" don't require a completely different look.  "modified" and "paste" are two
+" such supported overrides.  These are simply suffixed to the major mode,
+" separated by an underscore.  For example, "normal_modified" would be normal
+" mode where the current buffer is modified.
+"
+" The theming algorithm is a 2-pass system where the mode will draw over all
+" parts of the statusline, and then the override is applied after.  This means
+" it is possible to specify a subset of the theme in overrides, as it will
+" simply overwrite the previous colors.  If you want simultaneous overrides,
+" then they will need to change different parts of the statusline so they do
+" not conflict with each other.
+"
+" First, let's define an empty dictionary and assign it to the "palette"
+" variable. The # is a separator that maps with the directory structure. If
+" you get this wrong, Vim will complain loudly.
+let g:airline#themes#dark#palette = {}
+
+" First let's define some arrays. The s: is just a VimL thing for scoping the
+" variables to the current script. Without this, these variables would be
+" declared globally. Now let's declare some colors for normal mode and add it
+" to the dictionary.  The array is in the format:
+" [ guifg, guibg, ctermfg, ctermbg, opts ]. See "help attr-list" for valid
+" values for the "opt" value.
+let s:N1   = [ '#00005f' , '#dfff00' , 17  , 190 ]
+let s:N2   = [ '#ffffff' , '#444444' , 255 , 238 ]
+let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
+let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+" Here we define overrides for when the buffer is modified.  This will be
+" applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
+" declared.
+let g:airline#themes#dark#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
+let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
+let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
+let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#dark#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#dark#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#dark#palette.replace = copy(g:airline#themes#dark#palette.insert)
+let g:airline#themes#dark#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palette.insert_modified
+
+
+let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
+let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
+let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
+let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#dark#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
+let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
+let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
+let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#dark#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+" Accents are used to give parts within a section a slightly different look or
+" color. Here we are defining a "red" accent, which is used by the 'readonly'
+" part by default. Only the foreground colors are specified, so the background
+" colors are automatically extracted from the underlying section colors. What
+" this means is that regardless of which section the part is defined in, it
+" will be red instead of the section's foreground color. You can also have
+" multiple parts with accents within a section.
+let g:airline#themes#dark#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+
+" Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
+" variable so that related functionality is loaded iff the user is using
+" ctrlp. Note that this is optional, and if you do not define ctrlp colors
+" they will be chosen automatically from the existing palette.
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#dark#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
+      \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
+      \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/hybrid.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/hybrid.vim
new file mode 100644
index 0000000..b0df844
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/hybrid.vim
@@ -0,0 +1,58 @@
+" vim-airline companion theme of Hybrid
+" (https://github.com/w0ng/vim-hybrid)
+
+let g:airline#themes#hybrid#palette = {}
+
+function! airline#themes#hybrid#refresh()
+    let s:N1 = airline#themes#get_highlight('DiffAdd')
+    let s:N2 = airline#themes#get_highlight('CursorLine')
+    let s:N3 = airline#themes#get_highlight('PMenu')
+    let g:airline#themes#hybrid#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let modified_group = airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.normal_modified = {
+                \ 'airline_c': airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+                \ }
+
+    let warning_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.normal.airline_warning = warning_group
+    let g:airline#themes#hybrid#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffText', 'bg'], 'bold')
+    let s:I2 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellLocal', 'bg'], 'bold')
+    let s:I3 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellCap', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#hybrid#palette.insert_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.insert.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.insert_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#hybrid#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let replace_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.replace_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.replace.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.replace_modified.airline_warning = g:airline#themes#hybrid#palette.replace_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight2(['Text', 'fg'], ['Folded', 'bg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffDelete', 'bg'], 'bold')
+    let s:V3 = airline#themes#get_highlight2(['Text', 'fg'], ['Error', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#hybrid#palette.visual_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.visual.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.visual_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#hybrid#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#hybrid#palette.inactive_modified = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#hybrid#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#hybrid#refresh()
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/jellybeans.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/jellybeans.vim
new file mode 100644
index 0000000..201068c
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/jellybeans.vim
@@ -0,0 +1,52 @@
+let g:airline#themes#jellybeans#palette = {}
+
+" The name of the function must be 'refresh'.
+function! airline#themes#jellybeans#refresh()
+  " This theme is an example of how to use helper functions to extract highlight
+  " values from the corresponding colorscheme. It was written in a hurry, so it
+  " is very minimalistic. If you are a jellybeans user and want to make updates,
+  " please send pull requests.
+
+  " Here are examples where the entire highlight group is copied and an airline
+  " compatible color array is generated.
+  let s:N1 = airline#themes#get_highlight('DbgCurrent', 'bold')
+  let s:N2 = airline#themes#get_highlight('Folded')
+  let s:N3 = airline#themes#get_highlight('NonText')
+
+  let g:airline#themes#jellybeans#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#jellybeans#palette.normal_modified = {
+        \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
+        \ }
+
+  let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
+  let s:I2 = s:N2
+  let s:I3 = s:N3
+  let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#jellybeans#palette.insert_modified = g:airline#themes#jellybeans#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#jellybeans#palette.replace_modified = g:airline#themes#jellybeans#palette.normal_modified
+
+  " Sometimes you want to mix and match colors from different groups, you can do
+  " that with this method.
+  let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold')
+  let s:V2 = s:N2
+  let s:V3 = s:N3
+  let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#jellybeans#palette.visual_modified = g:airline#themes#jellybeans#palette.normal_modified
+
+  " And of course, you can always do it manually as well.
+  let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
+  let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified
+endfunction
+
+call airline#themes#jellybeans#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/kalisi.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/kalisi.vim
new file mode 100644
index 0000000..4ff94f5
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/kalisi.vim
@@ -0,0 +1,57 @@
+"
+" Colorscheme: Kalisi for airline. Inspired by powerline.
+" 06.02.2014 Arthur Jaron
+" hifreeo@gmail.com
+" 
+
+" Insert mode                                    
+let s:I1 = [ '#ffffff' , '#e80000' , 23  , 231 ] 
+let s:I2 = [ '#c5c5c5' , '#901010' , 74  , 31  ] 
+let s:I3 = [ '#c5c5c5' , '#500000' , 117 , 24  ] 
+
+" Visual mode                                    
+let s:V1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] 
+let s:V2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] 
+let s:V3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] 
+
+" Replace mode
+let s:R1 = [ '#8e00da' , '#ffffff' , 23  , 231 ] 
+let s:R2 = [ '#8e00da' , '#ce99ff' , 74  , 31  ] 
+let s:R3 = [ '#ce99ff' , '#8e00da' , 117 , 24  ] 
+
+let g:airline#themes#kalisi#palette = {}
+
+function! airline#themes#kalisi#refresh()
+
+  " Normal mode
+  let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
+  let s:N2 = [ '#afd700' , '#005f00' , 247 , 236 ]
+  let s:N3 = airline#themes#get_highlight('StatusLine')
+
+  " Tabline Plugin
+  let g:airline#themes#kalisi#palette.tabline = {
+        \ 'airline_tab':  ['#A6DB29', '#005f00',  231, 29, ''],
+        \ 'airline_tabsel':  ['#404042', '#A6DB29',  231, 36, ''],
+        \ 'airline_tabtype':  ['#afd700', '#005f00',  231, 36, ''],
+        \ 'airline_tabfill':  ['#ffffff', '#000000',  231, 23, ''],
+        \ 'airline_tabhid':  ['#c5c5c5', '#404042',  231, 88, ''],
+        \ 'airline_tabmod':  ['#ffffff', '#F1266F',  231, 88, ''],
+        \ }
+
+  let g:airline#themes#kalisi#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#kalisi#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#kalisi#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#kalisi#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+  " Inactive Mode
+  " let s:IA = [ '#c5c5c5' , '#505052' , 239 , 234 , '' ]
+  let s:IA = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#kalisi#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#kalisi#palette.inactive_modified = {
+        \ 'statusline': [ '#F1266F' , '' , '53' , '' , '' ] ,
+        \ }
+
+endfunction
+
+call airline#themes#kalisi#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/kolor.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/kolor.vim
new file mode 100644
index 0000000..e61f56f
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/kolor.vim
@@ -0,0 +1,59 @@
+let g:airline#themes#kolor#palette = {}
+
+let s:N1 = [ '#e2e2e2' , '#4f3598' , 254 , 56  ]
+let s:N2 = [ '#ff5fd7' , '#242322' , 206 , 234 ]
+let s:N3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+
+let g:airline#themes#kolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#kolor#palette.normal_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#4f3598' , 254     , 56      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#242322' , '#7eaefd' , 234 , 111 ]
+let s:I2 = [ '#75d7d8' , '#242322' , 80  , 234 ]
+let s:I3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#kolor#palette.insert_modified = {
+      \ 'airline_c': [ '#242322' , '#7eaefd' , 234     , 111     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.replace = copy(g:airline#themes#kolor#palette.insert)
+let g:airline#themes#kolor#palette.replace.airline_a = [ s:I2[0]   , '#005154' , s:I2[2] , 23      , ''     ]
+let g:airline#themes#kolor#palette.replace_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#005154' , 254 , 23  , '' ] ,
+      \ }
+
+
+let s:V1 = [ '#242322' , '#e6987a' , 234 , 180 ]
+let s:V2 = [ '#dbc570' , '#242322' , 186 , 234 ]
+let s:V3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#kolor#palette.visual_modified = {
+      \ 'airline_c': [ '#242322' , '#e6987a' , 234     , 180      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let s:IA2 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 ]
+let s:IA3 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let g:airline#themes#kolor#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#kolor#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.accents = {
+      \ 'red': [ '#d96e8a' , '' , 168 , ''  ]
+      \ }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#kolor#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#e2e2e2' , '#4a4a4a' , 254 , 238 , ''     ],
+      \ [ '#e2e2e2' , '#242322' , 254 , 234 , ''     ],
+      \ [ '#e2e2e2' , '#4f3598' , 254 , 56  , 'bold' ])
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/laederon.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/laederon.vim
new file mode 100644
index 0000000..115c107
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/laederon.vim
@@ -0,0 +1,62 @@
+" vim-airline companion theme of Laederon
+" (https://github.com/Donearm/Laederon)
+
+" Normal mode
+let s:N1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ] " blackestgravel & snow
+let s:N2 = [ '#ffffff' , '#44403a' , 255, 238 ] " snow & deepgravel
+let s:N3 = [ '#90a680' , '#2e2d2a' , 64, 235 ] " dilutedpaint & darkgravel
+let s:N4 = [ '#777470' , 240 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#1693a5' , 232 , 62 ] " blackestgravel & crystallake
+let s:I2 = [ '#515744' , '#44403a' , 101 , 238 ] " lichen & deepgravel
+let s:I3 = [ '#1693a5' , '#2e2d2a' , 39 , 235 ] " crystallake & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1a1a18' , '#ab3e5d' , 232 , 161 ] " blackestgravel & raspberry
+let s:V2 = [ '#000000' , '#908571' , 16 , 252 ] " coal & winterterrain
+let s:V3 = [ '#ab3e5d' , '#8c7f77' , 161 , 245 ] " raspberry & wetcoldterrain
+let s:V4 = [ '#515744' , 101 ] " lichen
+
+" Replace mode
+let s:RE = [ '#233e09' , 22 ] " oakleaf
+
+" Paste mode
+let s:PA = [ '#ab3e5d' , 161 ] " raspberry
+
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3], s:N3[3] , '' ]
+
+
+let g:airline#themes#laederon#palette = {}
+
+let g:airline#themes#laederon#palette.accents = {
+      \ 'red': [ '#ef393d' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#laederon#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#laederon#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#laederon#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#laederon#palette.replace = copy(airline#themes#laederon#palette.insert)
+let g:airline#themes#laederon#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#laederon#palette.replace_modified = g:airline#themes#laederon#palette.insert_modified
+
+
+let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#laederon#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+
+let g:airline#themes#laederon#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#laederon#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/light.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/light.vim
new file mode 100644
index 0000000..d9fe844
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/light.vim
@@ -0,0 +1,45 @@
+let g:airline#themes#light#palette = {}
+
+let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27  ]
+let s:N2 = [ '#000087' , '#00dfff' , 18  , 45  ]
+let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
+let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#light#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#005f00' , '#00df87' , 22  , 42  ]
+let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
+let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#light#palette.insert_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+let g:airline#themes#light#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#light#palette.replace = copy(g:airline#themes#light#palette.insert)
+let g:airline#themes#light#palette.replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
+let g:airline#themes#light#palette.replace_modified = g:airline#themes#light#palette.insert_modified
+
+
+let s:V1 = [ '#ffffff' , '#ff5f00' , 255 , 202 ]
+let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
+let s:V3 = [ '#df5f00' , '#ffff87' , 166 , 228 ]
+let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#light#palette.visual_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#666666' , '#b2b2b2' , 242 , 249 , '' ]
+let s:IA2 = [ '#8a8a8a' , '#d0d0d0' , 245 , 252 , '' ]
+let s:IA3 = [ '#a8a8a8' , '#ffffff' , 248 , 255 , '' ]
+let g:airline#themes#light#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#light#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000' , ''        , 160     , ''      , ''     ] ,
+      \ }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/lucius.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/lucius.vim
new file mode 100644
index 0000000..e386900
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/lucius.vim
@@ -0,0 +1,56 @@
+let g:airline#themes#lucius#palette = {}
+
+function! airline#themes#lucius#refresh()
+
+    let s:N1 = airline#themes#get_highlight('StatusLine')
+    let s:N2 = airline#themes#get_highlight('Folded')
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#lucius#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let modified_group = airline#themes#get_highlight('Statement')
+    let g:airline#themes#lucius#palette.normal_modified = {
+                \ 'airline_c': [modified_group[0], '', modified_group[2], '', '']
+                \ }
+
+    let warning_group = airline#themes#get_highlight('DiffDelete')
+    let g:airline#themes#lucius#palette.normal.airline_warning = warning_group
+    let g:airline#themes#lucius#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight('DiffAdd')
+    let s:I2 = s:N2
+    let s:I3 = s:N3
+    let g:airline#themes#lucius#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#lucius#palette.insert_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.insert.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.insert_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#lucius#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#lucius#palette.replace_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.replace.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.replace_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight('Cursor')
+    let s:V2 = s:N2
+    let s:V3 = s:N3
+    let g:airline#themes#lucius#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#lucius#palette.visual_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.visual.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.visual_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#lucius#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#lucius#palette.inactive_modified = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#lucius#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#lucius#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/luna.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/luna.vim
new file mode 100644
index 0000000..879d862
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/luna.vim
@@ -0,0 +1,92 @@
+" vim-airline companion theme of Luna
+" (https://github.com/Pychimp/vim-luna)
+
+let g:airline#themes#luna#palette = {}
+
+let g:airline#themes#luna#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
+
+
+let s:N1 = [ '#ffffff' , '#005252' , 231  , 36 ]
+let s:N2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
+let s:N3 = [ '#ffffff' , '#002b2b' , 231  , 23 ]
+let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#luna#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#ffffff' , '#789f00' , 231 , 106 ]
+let s:I2 = [ '#ffffff' , '#003f3f' , 231 , 29  ]
+let s:I3 = [ '#ffffff' , '#002b2b' , 231 , 23  ]
+let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#luna#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
+      \ }
+let g:airline#themes#luna#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#luna#palette.replace = copy(g:airline#themes#luna#palette.insert)
+let g:airline#themes#luna#palette.replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
+let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palette.insert_modified
+
+let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
+let s:V2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
+let s:V3 = [ '#ffffff' , '#002b2b' , 231  , 23  ]
+let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#luna#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
+      \ }
+
+let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]
+let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#luna#palette.inactive_modified = {
+      \ 'airline_c': [ '#e20000' , ''        , 166      , ''      , ''     ] ,
+      \ }
+
+let g:airline#themes#luna#palette.tabline = {
+      \ 'airline_tab':  ['#2aa198', '#003f3f',  231, 29, ''],
+      \ 'airline_tabsel':  ['#ffffff', '#2e8b57',  231, 36, ''],
+      \ 'airline_tabtype':  ['#ffffff', '#005252',  231, 36, ''],
+      \ 'airline_tabfill':  ['#ffffff', '#002b2b',  231, 23, ''],
+      \ 'airline_tabmod':  ['#ffffff', '#780000',  231, 88, ''],
+      \ }
+
+let s:WI = [ '#ffffff', '#5f0000', 231, 88 ]
+let g:airline#themes#luna#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#luna#palette.normal_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#ffffff' , '#002b2b' , 231 , 23 , ''     ] ,
+      \ [ '#ffffff' , '#005252' , 231 , 36 , ''     ] ,
+      \ [ '#ffffff' , '#973d45' , 231 , 95 , ''     ] )
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/molokai.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/molokai.vim
new file mode 100644
index 0000000..1998f00
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/molokai.vim
@@ -0,0 +1,65 @@
+let g:airline#themes#molokai#palette = {}
+
+let g:airline#themes#molokai#palette.accents = {
+      \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
+      \ }
+
+
+" Normal mode
+let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
+let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16  ] " info
+let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67  ] " statusline
+
+let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#molokai#palette.normal_modified = {
+      \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
+      \ }
+
+
+" Insert mode
+let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
+let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
+let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
+
+let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#molokai#palette.insert_modified = {
+      \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
+      \ }
+
+
+" Replace mode
+let g:airline#themes#molokai#palette.replace = copy(g:airline#themes#molokai#palette.insert)
+let g:airline#themes#molokai#palette.replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
+let g:airline#themes#molokai#palette.replace_modified = {
+      \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
+      \ }
+
+
+" Visual mode
+let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
+let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
+let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
+
+let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#molokai#palette.visual_modified = {
+      \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
+      \ }
+
+
+" Inactive
+let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
+let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#molokai#palette.inactive_modified = {
+      \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
+      \ }
+
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#molokai#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#f8f8f0' , '#465457' , 253 , 67  , ''     ] ,
+      \ [ '#f8f8f0' , '#232526' , 253 , 16  , ''     ] ,
+      \ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] )
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/monochrome.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/monochrome.vim
new file mode 100644
index 0000000..7dd1a17
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/monochrome.vim
@@ -0,0 +1,15 @@
+let g:airline#themes#monochrome#palette = {}
+
+function! airline#themes#monochrome#refresh()
+  let s:SL = airline#themes#get_highlight('StatusLine')
+  let g:airline#themes#monochrome#palette.normal = airline#themes#generate_color_map(s:SL, s:SL, s:SL)
+  let g:airline#themes#monochrome#palette.insert = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.replace = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.visual = g:airline#themes#monochrome#palette.normal
+
+  let s:SLNC = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#monochrome#palette.inactive = airline#themes#generate_color_map(s:SLNC, s:SLNC, s:SLNC)
+endfunction
+
+call airline#themes#monochrome#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/murmur.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/murmur.vim
new file mode 100644
index 0000000..adebf3b
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/murmur.vim
@@ -0,0 +1,46 @@
+let g:airline#themes#murmur#palette = {}
+
+let s:termbg = 237  " Background for branch and file format blocks
+let s:termbg2= 234  " Background for middle block
+let s:normalbg= 27  " Background for normal mode and file position blocks
+let s:insertbg= 70  " Background for insert mode and file position blocks
+let s:visualbg= 166 " Background for visual mode and file position blocks
+let s:replacebg=88  " Background for replace mode and file position blocks
+let s:alert= 88     " Modefied file alert color
+
+let s:BB = ['#AFAF87', '#5F5F5F', 144, s:termbg] " Branch and file format blocks
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, s:normalbg]   " Outside blocks in normal mode
+let s:N2 = ['#AFAF87', '#5F5F5F', 39, s:termbg2]    " Middle block
+let g:airline#themes#murmur#palette.normal = airline#themes#generate_color_map(s:N1, s:BB, s:N2)
+let g:airline#themes#murmur#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, s:insertbg]         " Outside blocks in insert mode
+let s:I2 = ['#AFAF87', '#5F5F5F', s:insertbg, s:termbg2]  " Middle block
+let g:airline#themes#murmur#palette.insert = airline#themes#generate_color_map(s:I1, s:BB, s:I2)
+let g:airline#themes#murmur#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', s:alert, s:termbg2, 'bold'] ,}
+
+let s:R1 = ['#FFFFFF', '#870000', 15, s:replacebg]  " Outside blocks in replace mode
+let s:R2 = ['#AFAF87', '#5F5F5F', 255, s:termbg2]   " Middle block
+let g:airline#themes#murmur#palette.replace = airline#themes#generate_color_map(s:R1, s:BB, s:R2)
+let g:airline#themes#murmur#palette.replace_modified = {'airline_c': ['#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, s:visualbg]         " Outside blocks in visual mode
+let s:V2 = ['#AFAF87', '#5F5F5F', s:visualbg, s:termbg2]  " Middle block
+let g:airline#themes#murmur#palette.visual = airline#themes#generate_color_map(s:V1, s:BB, s:V2)
+let g:airline#themes#murmur#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+" Inactive mode
+let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let g:airline#themes#murmur#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" CtrlP plugin colors
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#murmur#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ ['#FFFFFF', '#5F87FF', 15, s:normalbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 144, s:termbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 39, s:termbg2, 'bold'])
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/powerlineish.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/powerlineish.vim
new file mode 100644
index 0000000..d550e11
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/powerlineish.vim
@@ -0,0 +1,46 @@
+" Theme to mimic the default colorscheme of powerline
+" Not 100% the same so it's powerline... ish.
+"
+" Differences from default powerline:
+" * Paste indicator isn't colored different
+" * Far right hand section matches the color of the mode indicator
+"
+" Differences from other airline themes:
+" * No color differences when you're in a modified buffer
+" * Visual mode only changes the mode section. Otherwise
+"   it appears the same as normal mode
+
+" Normal mode                                    " fg             & bg
+let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ] " darkestgreen   & brightgreen
+let s:N2 = [ '#9e9e9e' , '#303030' , 247 , 236 ] " gray8          & gray2
+let s:N3 = [ '#ffffff' , '#121212' , 231 , 233 ] " white          & gray4
+
+" Insert mode                                    " fg             & bg
+let s:I1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] " darkestcyan    & white
+let s:I2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] " darkcyan       & darkblue
+let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] " mediumcyan     & darkestblue
+
+" Visual mode                                    " fg             & bg
+let s:V1 = [ '#080808' , '#ffaf00' , 232 , 214 ] " gray3          & brightestorange
+
+" Replace mode                                   " fg             & bg
+let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
+
+let g:airline#themes#powerlineish#palette = {}
+
+let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#powerlineish#palette.insert_replace = {
+      \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
+
+let g:airline#themes#powerlineish#palette.visual = {
+      \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
+
+let g:airline#themes#powerlineish#palette.replace = copy(airline#themes#powerlineish#palette.normal)
+let g:airline#themes#powerlineish#palette.replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
+
+
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/serene.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/serene.vim
new file mode 100644
index 0000000..9191c07
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/serene.vim
@@ -0,0 +1,41 @@
+let g:airline#themes#serene#palette = {}
+
+let s:guibg = '#080808'
+let s:termbg = 232
+let s:termsep = 236
+let s:guisep = '#303030'
+
+let s:N1 = [ '#00dfff' , s:guibg , 45  , s:termbg ]
+let s:N2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:N3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+
+let g:airline#themes#serene#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#serene#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ }
+
+let s:I1 = [ '#5fff00' , s:guibg , 82  , s:termbg ]
+let s:I2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:I3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+let g:airline#themes#serene#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#serene#palette.insert_modified = copy(g:airline#themes#serene#palette.normal_modified)
+let g:airline#themes#serene#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+let g:airline#themes#serene#palette.replace = {
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ }
+let g:airline#themes#serene#palette.replace_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:V1 = [ '#dfdf00' , s:guibg , 184 , s:termbg ]
+let s:V2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:V3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+let g:airline#themes#serene#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#serene#palette.visual_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
+let s:IA2 = [ '#4e4e4e' , s:guisep , 239 , s:termsep , '' ]
+let g:airline#themes#serene#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
+let g:airline#themes#serene#palette.inactive_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/simple.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/simple.vim
new file mode 100644
index 0000000..a111a1c
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/simple.vim
@@ -0,0 +1,46 @@
+let g:airline#themes#simple#palette = {}
+
+let s:guibg = '#080808'
+let s:guibg2 = '#1c1c1c'
+let s:termbg = 232
+let s:termbg2= 234
+
+let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
+let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
+let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#simple#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ }
+
+
+let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
+let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#simple#palette.insert_modified = copy(g:airline#themes#simple#palette.normal_modified)
+let g:airline#themes#simple#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#simple#palette.replace = {
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ }
+let g:airline#themes#simple#palette.replace_modified = copy(g:airline#themes#simple#palette.normal_modified)
+
+
+let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
+let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simple#palette.normal_modified)
+
+
+let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
+let s:IA2 = [ '#4e4e4e' , s:guibg2 , 239 , s:termbg2 , '' ]
+let g:airline#themes#simple#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
+let g:airline#themes#simple#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000', '', 160, '', '' ] ,
+      \ }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/sol.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/sol.vim
new file mode 100644
index 0000000..89ea505
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/sol.vim
@@ -0,0 +1,90 @@
+" vim-airline companion theme of Sol
+" (https://github.com/Pychimp/vim-sol)
+
+let g:airline#themes#sol#palette = {}
+
+let g:airline#themes#sol#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#343434' , '#a0a0a0' , 237 , 248 ]
+let s:N2 = [ '#343434' , '#b3b3b3' , 237 , 250 ]
+let s:N3 = [ '#343434' , '#c7c7c7' , 237 , 252 ]
+let g:airline#themes#sol#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#sol#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#ff6868' , 237 , 209 , '' ] ,
+      \ }
+
+
+let s:I1 = [ '#eeeeee' , '#09643f' , 255 , 30  ]
+let s:I2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:I3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#sol#palette.insert_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+let g:airline#themes#sol#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#09643f' , s:I1[2] , 30 , '' ] ,
+      \ }
+
+
+let g:airline#themes#sol#palette.replace = copy(g:airline#themes#sol#palette.insert)
+let g:airline#themes#sol#palette.replace.airline_a = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace.airline_z = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace_modified = g:airline#themes#sol#palette.insert_modified
+
+let s:V1 = [ '#ffff9a' , '#ff6003' , 222 , 202 ]
+let s:V2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:V3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#sol#palette.visual_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+
+let s:IA = [ '#777777' , '#c7c7c7' , 244 , 251 , '' ]
+let g:airline#themes#sol#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#sol#palette.inactive_modified = {
+      \ 'airline_c': [ '#ff3535' , '' , 203 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#sol#palette.tabline = {
+      \ 'airline_tab':      ['#343434', '#b3b3b3',  237, 250, ''],
+      \ 'airline_tabsel':   ['#ffffff', '#004b9a',  231, 31 , ''],
+      \ 'airline_tabtype':  ['#343434', '#a0a0a0',  237, 248, ''],
+      \ 'airline_tabfill':  ['#343434', '#c7c7c7',  237, 251, ''],
+      \ 'airline_tabmod':   ['#343434', '#ffdbc7',  237, 216, ''],
+      \ }
+
+let s:WI = [ '#eeeeee', '#e33900', 255, 166 ]
+let g:airline#themes#sol#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#sol#palette.normal_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#sol#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#343434' , '#c7c7c7' , 237 , 251 , ''     ] ,
+      \ [ '#343434' , '#b3b3b3' , 237 , 250 , ''     ] ,
+      \ [ '#eeeeee' , '#007fff' , 255 , 27  , ''     ] )
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/solarized.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/solarized.vim
new file mode 100644
index 0000000..30ba47e
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/solarized.vim
@@ -0,0 +1,176 @@
+let g:airline#themes#solarized#palette = {}
+
+function! airline#themes#solarized#refresh()
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Options
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  let s:background  = get(g:, 'airline_solarized_bg', &background)
+  let s:ansi_colors = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0
+  let s:tty         = &t_Co == 8
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Colors
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Base colors
+  let s:base03  = {'t': s:ansi_colors ?   8 : (s:tty ? '0' : 234), 'g': '#002b36'}
+  let s:base02  = {'t': s:ansi_colors ? '0' : (s:tty ? '0' : 235), 'g': '#073642'}
+  let s:base01  = {'t': s:ansi_colors ?  10 : (s:tty ? '0' : 240), 'g': '#586e75'}
+  let s:base00  = {'t': s:ansi_colors ?  11 : (s:tty ? '7' : 241), 'g': '#657b83'}
+  let s:base0   = {'t': s:ansi_colors ?  12 : (s:tty ? '7' : 244), 'g': '#839496'}
+  let s:base1   = {'t': s:ansi_colors ?  14 : (s:tty ? '7' : 245), 'g': '#93a1a1'}
+  let s:base2   = {'t': s:ansi_colors ?   7 : (s:tty ? '7' : 254), 'g': '#eee8d5'}
+  let s:base3   = {'t': s:ansi_colors ?  15 : (s:tty ? '7' : 230), 'g': '#fdf6e3'}
+  let s:yellow  = {'t': s:ansi_colors ?   3 : (s:tty ? '3' : 136), 'g': '#b58900'}
+  let s:orange  = {'t': s:ansi_colors ?   9 : (s:tty ? '1' : 166), 'g': '#cb4b16'}
+  let s:red     = {'t': s:ansi_colors ?   1 : (s:tty ? '1' : 160), 'g': '#dc322f'}
+  let s:magenta = {'t': s:ansi_colors ?   5 : (s:tty ? '5' : 125), 'g': '#d33682'}
+  let s:violet  = {'t': s:ansi_colors ?  13 : (s:tty ? '5' : 61 ), 'g': '#6c71c4'}
+  let s:blue    = {'t': s:ansi_colors ?   4 : (s:tty ? '4' : 33 ), 'g': '#268bd2'}
+  let s:cyan    = {'t': s:ansi_colors ?   6 : (s:tty ? '6' : 37 ), 'g': '#2aa198'}
+  let s:green   = {'t': s:ansi_colors ?   2 : (s:tty ? '2' : 64 ), 'g': '#859900'}
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Simple mappings
+  " NOTE: These are easily tweakable mappings. The actual mappings get
+  " the specific gui and terminal colors from the base color dicts.
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Normal mode
+  if s:background == 'dark'
+    let s:N1 = [s:base3, s:base1, 'bold']
+    let s:N2 = [s:base2, (s:tty ? s:base01 : s:base00), '']
+    let s:N3 = [s:base01, s:base02, '']
+  else
+    let s:N1 = [s:base2, s:base00, 'bold']
+    let s:N2 = [(s:tty ? s:base01 : s:base2), s:base1, '']
+    let s:N3 = [s:base1, s:base2, '']
+  endif
+  let s:NF = [s:orange, s:N3[1], '']
+  let s:NW = [s:base3, s:orange, '']
+  if s:background == 'dark'
+    let s:NM = [s:base1, s:N3[1], '']
+    let s:NMi = [s:base2, s:N3[1], '']
+  else
+    let s:NM = [s:base01, s:N3[1], '']
+    let s:NMi = [s:base02, s:N3[1], '']
+  endif
+
+  " Insert mode
+  let s:I1 = [s:N1[0], s:yellow, 'bold']
+  let s:I2 = s:N2
+  let s:I3 = s:N3
+  let s:IF = s:NF
+  let s:IM = s:NM
+
+  " Visual mode
+  let s:V1 = [s:N1[0], s:magenta, 'bold']
+  let s:V2 = s:N2
+  let s:V3 = s:N3
+  let s:VF = s:NF
+  let s:VM = s:NM
+
+  " Replace mode
+  let s:R1 = [s:N1[0], s:red, '']
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let s:RM = s:NM
+  let s:RF = s:NF
+
+  " Inactive, according to VertSplit in solarized
+  " (bg dark: base00; bg light: base0)
+  if s:background == 'dark'
+    let s:IA = [s:base02, s:base00, '']
+  else
+    let s:IA = [s:base2, s:base0, '']
+  endif
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Actual mappings
+  " WARNING: Don't modify this section unless necessary.
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  let s:NFa = [s:NF[0].g, s:NF[1].g, s:NF[0].t, s:NF[1].t, s:NF[2]]
+  let s:IFa = [s:IF[0].g, s:IF[1].g, s:IF[0].t, s:IF[1].t, s:IF[2]]
+  let s:VFa = [s:VF[0].g, s:VF[1].g, s:VF[0].t, s:VF[1].t, s:VF[2]]
+  let s:RFa = [s:RF[0].g, s:RF[1].g, s:RF[0].t, s:RF[1].t, s:RF[2]]
+
+  let g:airline#themes#solarized#palette.accents = {
+        \ 'red': s:NFa,
+        \ }
+
+  let g:airline#themes#solarized#palette.inactive = airline#themes#generate_color_map(
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]])
+  let g:airline#themes#solarized#palette.inactive_modified = {
+        \ 'airline_c': [s:NMi[0].g, '', s:NMi[0].t, '', s:NMi[2]]}
+
+  let g:airline#themes#solarized#palette.normal = airline#themes#generate_color_map(
+        \ [s:N1[0].g, s:N1[1].g, s:N1[0].t, s:N1[1].t, s:N1[2]],
+        \ [s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]],
+        \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]])
+
+  let g:airline#themes#solarized#palette.normal.airline_warning = [
+        \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
+
+  let g:airline#themes#solarized#palette.normal_modified = {
+        \ 'airline_c': [s:NM[0].g, s:NM[1].g,
+        \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
+
+  let g:airline#themes#solarized#palette.normal_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.insert = airline#themes#generate_color_map(
+        \ [s:I1[0].g, s:I1[1].g, s:I1[0].t, s:I1[1].t, s:I1[2]],
+        \ [s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]],
+        \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]])
+
+  let g:airline#themes#solarized#palette.insert.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.insert_modified = {
+        \ 'airline_c': [s:IM[0].g, s:IM[1].g,
+        \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
+
+  let g:airline#themes#solarized#palette.insert_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.visual = airline#themes#generate_color_map(
+        \ [s:V1[0].g, s:V1[1].g, s:V1[0].t, s:V1[1].t, s:V1[2]],
+        \ [s:V2[0].g, s:V2[1].g, s:V2[0].t, s:V2[1].t, s:V2[2]],
+        \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]])
+
+  let g:airline#themes#solarized#palette.visual.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.visual_modified = {
+        \ 'airline_c': [s:VM[0].g, s:VM[1].g,
+        \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
+
+  let g:airline#themes#solarized#palette.visual_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace = airline#themes#generate_color_map(
+        \ [s:R1[0].g, s:R1[1].g, s:R1[0].t, s:R1[1].t, s:R1[2]],
+        \ [s:R2[0].g, s:R2[1].g, s:R2[0].t, s:R2[1].t, s:R2[2]],
+        \ [s:R3[0].g, s:R3[1].g, s:R3[0].t, s:R3[1].t, s:R3[2]])
+
+  let g:airline#themes#solarized#palette.replace.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace_modified = {
+        \ 'airline_c': [s:RM[0].g, s:RM[1].g,
+        \ s:RM[0].t, s:RM[1].t, s:RM[2]]}
+
+  let g:airline#themes#solarized#palette.replace_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.tabline = {}
+
+  let g:airline#themes#solarized#palette.tabline.airline_tab = [
+        \ s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]]
+
+  let g:airline#themes#solarized#palette.tabline.airline_tabtype = [
+        \ s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]]
+endfunction
+
+call airline#themes#solarized#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/tomorrow.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/tomorrow.vim
new file mode 100644
index 0000000..f382fc1
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/tomorrow.vim
@@ -0,0 +1,44 @@
+let g:airline#themes#tomorrow#palette = {}
+
+function! airline#themes#tomorrow#refresh()
+  let g:airline#themes#tomorrow#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Directory', 'fg'], 'bold')
+  let s:N2 = airline#themes#get_highlight('Pmenu')
+  let s:N3 = airline#themes#get_highlight('CursorLine')
+  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+  let group = airline#themes#get_highlight('vimCommand')
+  let g:airline#themes#tomorrow#palette.normal_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+
+  let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
+  let s:I3 = s:N3
+  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#tomorrow#palette.insert_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight('Error', 'bold')
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#tomorrow#palette.replace_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
+  let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
+  let s:V3 = s:N3
+  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#tomorrow#palette.visual_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
+  let g:airline#themes#tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#tomorrow#palette.inactive_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+endfunction
+
+call airline#themes#tomorrow#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/ubaryd.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/ubaryd.vim
new file mode 100644
index 0000000..70232ef
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/ubaryd.vim
@@ -0,0 +1,64 @@
+" vim-airline companion theme of Ubaryd
+" (https://github.com/Donearm/Ubaryd)
+
+" Normal mode
+let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
+let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
+let s:N3 = [ '#b88853' , '#242321' , 137, 235 ] " toffee & darkgravel
+let s:N4 = [ '#857f78' , 243 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#fade3e' , 232 , 221 ] " blackestgravel & warmcorn
+let s:I2 = [ '#c7b386' , '#45413b' , 252 , 238 ] " bleaksand & deepgravel
+let s:I3 = [ '#f4cf86' , '#242321' , 222 , 235 ] " lighttannedskin & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1c1b1a' , '#9a4820' , 233 , 88 ] " blackgravel & warmadobe
+let s:V2 = [ '#000000' , '#88633f' , 16 , 95 ] " coal & cappuccino
+let s:V3 = [ '#88633f' , '#c7b386' , 95 , 252 ] " cappuccino & bleaksand
+let s:V4 = [ '#c14c3d' , 160 ] " tannedumbrella
+
+" Replace mode
+let s:RE = [ '#c7915b' , 173 ] " nut
+
+" Paste mode
+let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
+
+let s:IA = [ s:N2[1], s:N3[1], s:N2[3], s:N3[3], '' ]	
+
+let g:airline#themes#ubaryd#palette = {}
+
+let g:airline#themes#ubaryd#palette.accents = {
+      \ 'red': [ '#ff7400' , '' , 196 , '' , '' ],
+      \ }
+
+let g:airline#themes#ubaryd#palette.inactive = {
+      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#ubaryd#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#ubaryd#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#ubaryd#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.replace = copy(airline#themes#ubaryd#palette.insert)
+let g:airline#themes#ubaryd#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#ubaryd#palette.replace_modified = g:airline#themes#ubaryd#palette.insert_modified
+
+
+let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#ubaryd#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+let g:airline#themes#ubaryd#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#ubaryd#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/understated.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/understated.vim
new file mode 100644
index 0000000..b3e7917
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/understated.vim
@@ -0,0 +1,43 @@
+let g:airline#themes#understated#palette = {}
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69]  " Outside blocks in normal mode (mode and file position)
+let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+
+let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position)
+let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+let g:airline#themes#understated#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,}
+
+let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, '']
+let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130]
+let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59]
+let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59]
+let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#080808', '#FFAF00', 232, 214]
+let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,}
+
+let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']}
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#understated#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ ['#FFFFFF', '#1C1C1C', 15, 234, '' ],
+      \ ['#FFFFFF', '#262626', 15, 235, '' ],
+      \ ['#FFFFFF', '#303030', 15, 236, 'bold'])
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/wombat.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/wombat.vim
new file mode 100644
index 0000000..39fdc4c
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/wombat.vim
@@ -0,0 +1,90 @@
+" vim-airline companion theme of Wombat
+" looks great with wombat256 vim colorscheme
+
+" Normal mode
+"          [ guifg, guibg, ctermfg, ctermbg, opts ]
+let s:N1 = [ '#141413' , '#CAE682' , 232 , 192 ] " mode
+let s:N2 = [ '#CAE682' , '#32322F' , 192 , 236 ] " info
+let s:N3 = [ '#CAE682' , '#242424' , 192 , 234 ] " statusline
+let s:N4 = [ '#86CD74' , 113 ]                   " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 227 ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 227 , 236 ]
+let s:I3 = [ '#FDE76E' , '#242424' , 227 , 234 ]
+let s:I4 = [ '#FADE3E' , 221 ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 153 ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 153 , 236 ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 153 , 234 ]
+let s:V4 = [ '#7CB0E6' , 111 ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 173 ]
+let s:R2 = [ '#E5786D' , '#32322F' , 173 , 236 ]
+let s:R3 = [ '#E5786D' , '#242424' , 173 , 234 ]
+let s:R4 = [ '#E55345' , 203 ]
+
+" Paste mode
+let s:PA = [ '#94E42C' , 47 ]
+
+" Info modified
+let s:IM = [ '#40403C' , 238 ]
+
+" Inactive mode
+let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
+
+let g:airline#themes#wombat#palette = {}
+
+let g:airline#themes#wombat#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
+
+let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#wombat#palette.normal_modified = {
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#wombat#palette.insert_modified = {
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#wombat#palette.visual_modified = {
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#wombat#palette.replace_modified = {
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.insert_paste = {
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#wombat#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#wombat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
+      \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
+      \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/themes/zenburn.vim b/vim/.vim/bundle/vim-airline/autoload/airline/themes/zenburn.vim
new file mode 100644
index 0000000..9883c21
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/themes/zenburn.vim
@@ -0,0 +1,44 @@
+let g:airline#themes#zenburn#palette = {}
+
+function! airline#themes#zenburn#refresh()
+  let g:airline#themes#zenburn#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let s:N1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Folded', 'fg'], 'bold')
+  let s:N2 = airline#themes#get_highlight('Folded')
+  let s:N3 = airline#themes#get_highlight('NonText')
+
+  let g:airline#themes#zenburn#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let s:Nmod = airline#themes#get_highlight('Comment')
+  let g:airline#themes#zenburn#palette.normal_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+
+  let s:I1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['String', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['String', 'fg'], ['Folded', 'bg'])
+  let s:I3 = s:N3
+  let g:airline#themes#zenburn#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#zenburn#palette.insert_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Comment', 'fg'], 'bold')
+  let s:R2 = airline#themes#get_highlight2(['Comment', 'fg'], ['Folded', 'bg'])
+  let s:R3 = s:N3
+  let g:airline#themes#zenburn#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#zenburn#palette.replace_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:V1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Identifier', 'fg'], 'bold')
+  let s:V2 = airline#themes#get_highlight2(['Identifier', 'fg'], ['Folded', 'bg'])
+  let s:V3 = s:N3
+  let g:airline#themes#zenburn#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#zenburn#palette.visual_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:IA = airline#themes#get_highlight('NonText')
+  let g:airline#themes#zenburn#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#zenburn#palette.inactive_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+endfunction
+
+call airline#themes#zenburn#refresh()
+
diff --git a/vim/.vim/bundle/vim-airline/autoload/airline/util.vim b/vim/.vim/bundle/vim-airline/autoload/airline/util.vim
new file mode 100644
index 0000000..a04bd0b
--- /dev/null
+++ b/vim/.vim/bundle/vim-airline/autoload/airline/util.vim
@@ -0,0 +1,64 @@
+" MIT License. Copyright (c) 2013-2014 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+function! airline#util#wrap(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return a:text
+endfunction
+
+function! airline#util#append(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  let prefix = s:spc == "\ua0" ? s:spc : s:spc.s:spc
+  return empty(a:text) ? '' : prefix.g:airline_left_alt_sep.s:spc.a:text
+endfunction
+
+function! airline#util#prepend(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return empty(a:text) ? '' : a:text.s:spc.g:airline_right_alt_sep.s:spc
+endfunction
+
+if v:version >= 704
+  function! airline#util#getwinvar(winnr, key, def)
+    return getwinvar(a:winnr, a:key, a:def)
+  endfunction
+else
+  function! airline#util#getwinvar(winnr, key, def)
+    let winvals = getwinvar(a:winnr, '')
+    return get(winvals, a:key, a:def)
+  endfunction
+endif
+
+if v:version >= 704
+  function! airline#util#exec_funcrefs(list, ...)
+    for Fn in a:list
+      let code = call(Fn, a:000)
+      if code != 0
+        return code
+      endif
+    endfor
+    return 0
+  endfunction
+else
+  function! airline#util#exec_funcrefs(list, ...)
+    " for 7.2; we cannot iterate the list, hence why we use range()
+    " for 7.3-[97, 328]; we cannot reuse the variable, hence the {}
+    for i in range(0, len(a:list) - 1)
+      let Fn{i} = a:list[i]
+      let code = call(Fn{i}, a:000)
+      if code != 0
+        return code
+      endif
+    endfor
+    return 0
+  endfunction
+endif
+