diff --git a/vim/.vim/bundle/commentary b/vim/.vim/bundle/commentary
index be79030..f8238d7 160000
--- a/vim/.vim/bundle/commentary
+++ b/vim/.vim/bundle/commentary
@@ -1 +1 @@
-Subproject commit be79030b3e8c0ee3c5f45b4333919e4830531e80
+Subproject commit f8238d70f873969fb41bf6a6b07ca63a4c0b82b1
diff --git a/vim/.vim/bundle/eunuch b/vim/.vim/bundle/eunuch
index dcd29a0..33e875b 160000
--- a/vim/.vim/bundle/eunuch
+++ b/vim/.vim/bundle/eunuch
@@ -1 +1 @@
-Subproject commit dcd29a00eb708be211d856afd3fddfbff7bc6208
+Subproject commit 33e875b31c8b811a0a47908884a5e2339106bbe8
diff --git a/vim/.vim/bundle/filetype-nix b/vim/.vim/bundle/filetype-nix
index b06cccd..a3eed01 160000
--- a/vim/.vim/bundle/filetype-nix
+++ b/vim/.vim/bundle/filetype-nix
@@ -1 +1 @@
-Subproject commit b06cccd8ff61149b13d3fc8b7e0d06caa55c9888
+Subproject commit a3eed01f4de995a51dfdd06287e44fcb231f6adf
diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive
index 4f24757..27a5c3a 160000
--- a/vim/.vim/bundle/fugitive
+++ b/vim/.vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 4f24757df2a57fc01900334114b1790fcb75ad54
+Subproject commit 27a5c3abd211c2784513dab4db082fa414ad0967
diff --git a/vim/.vim/bundle/pathogen b/vim/.vim/bundle/pathogen
index 020ab25..c6bc424 160000
--- a/vim/.vim/bundle/pathogen
+++ b/vim/.vim/bundle/pathogen
@@ -1 +1 @@
-Subproject commit 020ab25c38f62627c1dab6c7a851176c6ad309f9
+Subproject commit c6bc42404597c718e4a032a98e21e63321cbb05a
diff --git a/vim/.vim/bundle/sleuth b/vim/.vim/bundle/sleuth
index 2826bc1..ea3f065 160000
--- a/vim/.vim/bundle/sleuth
+++ b/vim/.vim/bundle/sleuth
@@ -1 +1 @@
-Subproject commit 2826bc17ef1820f68dfe6e43574a567e3c67a56d
+Subproject commit ea3f065f23cd0592062b8226c8fef08b6af3b459
diff --git a/vim/.vim/bundle/slime b/vim/.vim/bundle/slime
index 7d03749..a811392 160000
--- a/vim/.vim/bundle/slime
+++ b/vim/.vim/bundle/slime
@@ -1 +1 @@
-Subproject commit 7d0374935e7bd4a3a3c2c5d7ac7d70c2650b89ae
+Subproject commit a81139239d6447b1c021e4873e6a14b47f32b65a
diff --git a/vim/.vim/bundle/snipmate b/vim/.vim/bundle/snipmate
index f1432b6..b80367f 160000
--- a/vim/.vim/bundle/snipmate
+++ b/vim/.vim/bundle/snipmate
@@ -1 +1 @@
-Subproject commit f1432b6022c9815cd89b9197b06e3efdc3596b78
+Subproject commit b80367fefc2188c9d6c4a9eb1830360b09e13476
diff --git a/vim/.vim/bundle/snipmate-addon-mw-utils b/vim/.vim/bundle/snipmate-addon-mw-utils
index 0c5612f..6aaf4fe 160000
--- a/vim/.vim/bundle/snipmate-addon-mw-utils
+++ b/vim/.vim/bundle/snipmate-addon-mw-utils
@@ -1 +1 @@
-Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
+Subproject commit 6aaf4fee472db7cbec6d2c8eea69fdf3a8f8a75d
diff --git a/vim/.vim/bundle/snipmate-tlib b/vim/.vim/bundle/snipmate-tlib
index c14442d..a071b6d 160000
--- a/vim/.vim/bundle/snipmate-tlib
+++ b/vim/.vim/bundle/snipmate-tlib
@@ -1 +1 @@
-Subproject commit c14442db8c019c73e1c5717fde10e157950152b6
+Subproject commit a071b6d41b20069a3520e0d101194a752968973b
diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab
index cdaa5c2..40fe711 160000
--- a/vim/.vim/bundle/supertab
+++ b/vim/.vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit cdaa5c27c5a7f8b08a43d0b2e65929512299e33a
+Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
diff --git a/vim/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar
index 959f487..56399f4 160000
--- a/vim/.vim/bundle/tagbar
+++ b/vim/.vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit 959f48798136bfd4ce60075d3c86c580fcf5e5c5
+Subproject commit 56399f446c64d187c106e112afa4d97985508eba
diff --git a/vim/.vim/bundle/vinegar b/vim/.vim/bundle/vinegar
index bd7f7b7..fcce70f 160000
--- a/vim/.vim/bundle/vinegar
+++ b/vim/.vim/bundle/vinegar
@@ -1 +1 @@
-Subproject commit bd7f7b7929260072864462c04dde3b9f4c5e0d23
+Subproject commit fcce70f1403ba4101668a4c960c577bddbd00f06
diff --git a/vim/.vim/colors/monokai.vim b/vim/.vim/colors/monokai.vim
new file mode 100755
index 0000000..1b4f167
--- /dev/null
+++ b/vim/.vim/colors/monokai.vim
@@ -0,0 +1,109 @@
+" Vim color file
+" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration)
+
+set background=dark
+highlight clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+set t_Co=256
+let g:colors_name = "monokai"
+
+hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE
+hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
+hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
+hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
+hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
+hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE
+hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE
+hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline
+hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold
+hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE
+hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
+hi IncSearch term=reverse cterm=reverse ctermfg=193 ctermbg=16 gui=reverse guifg=#C4BE89 guibg=#000000
+hi Search term=reverse cterm=NONE ctermfg=231 ctermbg=24 gui=NONE guifg=#f8f8f2 guibg=#204a87
+hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE
+hi SignColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
+hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE
+hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
+hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold
+hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE
+hi DiffChange ctermfg=NONE ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE
+hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold
+hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
+hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
+hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
+hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE
+hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE
+hi SpecialComment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
+hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE
+hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
+hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold
+hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold
+hi Type ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
+hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
+hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
+hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
+hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
+hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi htmlTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi htmlEndTag ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
+hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
+hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
+hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
+hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
+hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
+hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
+hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
+hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE