add vim configs -- yes i have joined the cult of vim

26 files changed, 1681 insertions, 0 deletions

diff --git a/.vim/bundle/vim-airline/autoload/airline/themes.vim b/.vim/bundle/vim-airline/autoload/airline/themes.vim
new file mode 100644
index 0000000..07e0324
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/badwolf.vim b/.vim/bundle/vim-airline/autoload/airline/themes/badwolf.vim
new file mode 100644
index 0000000..41a25d1
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/base16.vim b/.vim/bundle/vim-airline/autoload/airline/themes/base16.vim
new file mode 100644
index 0000000..469435e
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/bubblegum.vim b/.vim/bundle/vim-airline/autoload/airline/themes/bubblegum.vim
new file mode 100644
index 0000000..d18e032
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/dark.vim b/.vim/bundle/vim-airline/autoload/airline/themes/dark.vim
new file mode 100644
index 0000000..217b2f1
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/hybrid.vim b/.vim/bundle/vim-airline/autoload/airline/themes/hybrid.vim
new file mode 100644
index 0000000..b0df844
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/jellybeans.vim b/.vim/bundle/vim-airline/autoload/airline/themes/jellybeans.vim
new file mode 100644
index 0000000..201068c
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/kalisi.vim b/.vim/bundle/vim-airline/autoload/airline/themes/kalisi.vim
new file mode 100644
index 0000000..4ff94f5
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/kolor.vim b/.vim/bundle/vim-airline/autoload/airline/themes/kolor.vim
new file mode 100644
index 0000000..e61f56f
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/laederon.vim b/.vim/bundle/vim-airline/autoload/airline/themes/laederon.vim
new file mode 100644
index 0000000..115c107
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/light.vim b/.vim/bundle/vim-airline/autoload/airline/themes/light.vim
new file mode 100644
index 0000000..d9fe844
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/lucius.vim b/.vim/bundle/vim-airline/autoload/airline/themes/lucius.vim
new file mode 100644
index 0000000..e386900
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/luna.vim b/.vim/bundle/vim-airline/autoload/airline/themes/luna.vim
new file mode 100644
index 0000000..879d862
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/molokai.vim b/.vim/bundle/vim-airline/autoload/airline/themes/molokai.vim
new file mode 100644
index 0000000..1998f00
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/monochrome.vim b/.vim/bundle/vim-airline/autoload/airline/themes/monochrome.vim
new file mode 100644
index 0000000..7dd1a17
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/murmur.vim b/.vim/bundle/vim-airline/autoload/airline/themes/murmur.vim
new file mode 100644
index 0000000..adebf3b
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/powerlineish.vim b/.vim/bundle/vim-airline/autoload/airline/themes/powerlineish.vim
new file mode 100644
index 0000000..d550e11
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/serene.vim b/.vim/bundle/vim-airline/autoload/airline/themes/serene.vim
new file mode 100644
index 0000000..9191c07
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/simple.vim b/.vim/bundle/vim-airline/autoload/airline/themes/simple.vim
new file mode 100644
index 0000000..a111a1c
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/sol.vim b/.vim/bundle/vim-airline/autoload/airline/themes/sol.vim
new file mode 100644
index 0000000..89ea505
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/solarized.vim b/.vim/bundle/vim-airline/autoload/airline/themes/solarized.vim
new file mode 100644
index 0000000..30ba47e
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/tomorrow.vim b/.vim/bundle/vim-airline/autoload/airline/themes/tomorrow.vim
new file mode 100644
index 0000000..f382fc1
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/ubaryd.vim b/.vim/bundle/vim-airline/autoload/airline/themes/ubaryd.vim
new file mode 100644
index 0000000..70232ef
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/understated.vim b/.vim/bundle/vim-airline/autoload/airline/themes/understated.vim
new file mode 100644
index 0000000..b3e7917
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/wombat.vim b/.vim/bundle/vim-airline/autoload/airline/themes/wombat.vim
new file mode 100644
index 0000000..39fdc4c
--- /dev/null
+++ b/.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/bundle/vim-airline/autoload/airline/themes/zenburn.vim b/.vim/bundle/vim-airline/autoload/airline/themes/zenburn.vim
new file mode 100644
index 0000000..9883c21
--- /dev/null
+++ b/.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()
+