diff --git a/Rakefile b/Rakefile
index 676dbc1..c0445bf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,8 @@ require 'rake'
 require 'fileutils'
 require File.join(File.dirname(__FILE__), 'bin', 'yadr', 'vundle')
 
+# TODO install for vim_instant_markdown
+
 desc "Hook our dotfiles into system-standard positions."
 task :install => [:submodule_init, :submodules] do
   puts
@@ -47,8 +49,9 @@ end
 task :install_ycm do
   if want_to_install?('YouCompleteMe')
     run %{
+      sudo apt install cmake -y
       cd $HOME/.vim/bundle/YouCompleteMe/
-      ./install.sh
+      ./install.py
     }
   end
 end
diff --git a/ruby/gemrc b/ruby/gemrc
index 7a046c1..2b3103c 100644
--- a/ruby/gemrc
+++ b/ruby/gemrc
@@ -1,8 +1,10 @@
 ---
-:update_sources: true
+:backtrace: false
+:bulk_threshold: 1000
 :sources:
 - http://rubygems.org
-:benchmark: false
-:backtrace: false
+- https://gems.ruby-china.org/
+:update_sources: true
 :verbose: true
-gem: --no-document
+benchmark: false
+gem: "--no-document"
diff --git a/vim/UltiSnips/javascript.snippets b/vim/UltiSnips/javascript.snippets
index 12f8a7b..2d00894 100644
--- a/vim/UltiSnips/javascript.snippets
+++ b/vim/UltiSnips/javascript.snippets
@@ -1,21 +1,19 @@
-snippet react "React template" b
-import React, {Component, PropTypes} from 'react'
-import {connect} from 'react-redux'
+snippet reactComponent "React template" b
+import React, { Component } from 'react'
 
-class ${1:C} extends Component {
+export default class extends Component {
   render () {
   }
 }
+endsnippet
 
-$1.propTypes = {
-  self: PropTypes.object,
-  location: PropTypes.object
-}
+snippet reactConnect "React template" b
+import component from './component'
+import { connect } from 'react-redux'
 
-export default connect((state, ownProps) => {
-  return {
-  }
-})($1)
+export default connect((state, ownProps) => ({
+}), {
+})(component)
 endsnippet
 
 snippet TODO "Javascript Todo" b
diff --git a/vim/settings/ctrlp.vim b/vim/settings/ctrlp.vim
index 6642a09..d0ab3fc 100644
--- a/vim/settings/ctrlp.vim
+++ b/vim/settings/ctrlp.vim
@@ -3,8 +3,7 @@ if exists("g:ctrlp_user_command")
 endif
 if executable('ag')
   " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
-  let g:ctrlp_user_command =
-    \ 'ag %s --files-with-matches -g "" --ignore "\.git$\|\.hg$\|\.svn$"'
+  let g:ctrlp_user_command = 'ag %s --files-with-matches -g "" --ignore "\.git$\|\.hg$\|\.svn$"'
 
   " ag is fast enough that CtrlP doesn't need to cache
   let g:ctrlp_use_caching = 0
diff --git a/vim/settings/markdown.vim b/vim/settings/markdown.vim
index 6fa25f2..d6d662b 100644
--- a/vim/settings/markdown.vim
+++ b/vim/settings/markdown.vim
@@ -1,4 +1,5 @@
-let g:instant_markdown_slow = 0
+let g:instant_markdown_slow = 1
+let g:instant_markdown_autostart = 1
 augroup filetype_markdown
   autocmd!
   autocmd FileType mkd setlocal spell
diff --git a/vim/settings/path.vim b/vim/settings/path.vim
index 1ca1161..867c31e 100644
--- a/vim/settings/path.vim
+++ b/vim/settings/path.vim
@@ -1,4 +1,9 @@
 " Set the shell to bash so we inherit its path, to make sure
 " we inherit its path. This affects :Rtags finding the right
 " path to homebrewed ctags rather than the XCode version of ctags
-set shell=/usr/bin/zsh\ -l
+if has('win32')
+elseif has('mac')
+  set shell=/usr/local/bin/zsh\ -l
+elseif has('unix')
+  set shell=/usr/bin/zsh\ -l
+endif
diff --git a/vim/settings/yadr-appearance.vim b/vim/settings/yadr-appearance.vim
index ccf0ab5..02a0d5a 100644
--- a/vim/settings/yadr-appearance.vim
+++ b/vim/settings/yadr-appearance.vim
@@ -1,31 +1,31 @@
-" Make it beautiful - colors and fonts
+"" Make it beautiful - colors and fonts
 
-if has("gui_running")
-  "tell the term has 256 colors
-  set t_Co=256
+"if has("gui_running")
+  ""tell the term has 256 colors
+  "set t_Co=256
 
-  " Show tab number (useful for Cmd-1, Cmd-2.. mapping)
-  " For some reason this doesn't work as a regular set command,
-  " (the numbers don't show up) so I made it a VimEnter event
-  autocmd VimEnter * set guitablabel=%N:\ %t\ %M
+  "" Show tab number (useful for Cmd-1, Cmd-2.. mapping)
+  "" For some reason this doesn't work as a regular set command,
+  "" (the numbers don't show up) so I made it a VimEnter event
+  "autocmd VimEnter * set guitablabel=%N:\ %t\ %M
 
-  set lines=60
-  set columns=190
+  "set lines=60
+  "set columns=190
 
-  if has("gui_gtk2")
-    set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
-  else
-    set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
-  end
-else
-  let g:CSApprox_loaded = 1
+  "if has("gui_gtk2")
+    "set guifont=Inconsolata\ XL\ 12,Inconsolata\ 15,Monaco\ 12
+  "else
+    "set guifont=Inconsolata\ XL:h17,Inconsolata:h20,Monaco:h17
+  "end
+"else
+  "let g:CSApprox_loaded = 1
 
-  " For people using a terminal that is not Solarized
-  if exists("g:yadr_using_unsolarized_terminal")
-    let g:solarized_termcolors=256
-    let g:solarized_termtrans=1
-  end
-endif
+  "" For people using a terminal that is not Solarized
+  "if exists("g:yadr_using_unsolarized_terminal")
+    "let g:solarized_termcolors=256
+    "let g:solarized_termtrans=1
+  "end
+"endif
 
-colorscheme solarized
-set background=dark
+"colorscheme solarized
+"set background=dark
diff --git a/vim/settings/yadr-keymap.vim b/vim/settings/yadr-keymap.vim
index 0ef2566..a46d816 100644
--- a/vim/settings/yadr-keymap.vim
+++ b/vim/settings/yadr-keymap.vim
@@ -185,3 +185,5 @@ nmap <leader>ej :tabedit ~/.jshintrc<cr>'tzo
 " move around compile errors
 nnoremap <leader>n :cnext<cr>
 nnoremap <leader>p :cprevious<cr>
+
+nnoremap <leader>l :redraw!<cr>
diff --git a/vim/vundles.vim b/vim/vundles.vim
index c402973..8ea3e36 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -22,6 +22,7 @@ Bundle "gmarik/vundle"
 " ~/.vim/vundles/ to edit them:
 runtime ruby.vundle
 runtime languages.vundle
+runtime markdown.vundle
 runtime git.vundle
 runtime appearance.vundle
 runtime textobjects.vundle
diff --git a/vim/vundles/appearance.vundle b/vim/vundles/appearance.vundle
index e2b706c..e1cbd5f 100644
--- a/vim/vundles/appearance.vundle
+++ b/vim/vundles/appearance.vundle
@@ -1,5 +1,4 @@
 Bundle "chrisbra/color_highlight.git"
-Bundle "skwp/vim-colors-solarized"
 Bundle "itchyny/lightline.vim"
 Bundle "jby/tmux.vim.git"
 Bundle "morhetz/gruvbox"
diff --git a/vim/vundles/languages.vundle b/vim/vundles/languages.vundle
index e2d574b..0ee96a3 100644
--- a/vim/vundles/languages.vundle
+++ b/vim/vundles/languages.vundle
@@ -5,10 +5,7 @@ Bundle 'scrooloose/syntastic.git'
 Bundle 'skwp/vim-html-escape'
 Bundle 'ternjs/tern_for_vim'
 Bundle 'jparise/vim-graphql'
-Bundle 'plasticboy/vim-markdown'
-Bundle 'suan/vim-instant-markdown'
 Bundle 'evanmiller/nginx-vim-syntax'
 Bundle 'derekwyatt/vim-scala'
-Bundle 'ktvoelker/sbt-vim'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'klen/python-mode'
diff --git a/vim/vundles/markdown.vundle b/vim/vundles/markdown.vundle
new file mode 100644
index 0000000..b3e91ce
--- /dev/null
+++ b/vim/vundles/markdown.vundle
@@ -0,0 +1,2 @@
+Bundle 'tpope/vim-markdown'
+Bundle 'suan/vim-instant-markdown'
diff --git a/zsh/key-bindings.zsh b/zsh/key-bindings.zsh
index 8141096..37a423b 100644
--- a/zsh/key-bindings.zsh
+++ b/zsh/key-bindings.zsh
@@ -13,6 +13,8 @@ bindkey -M viins '^s'    history-incremental-pattern-search-forward
 bindkey -M viins '^p'    up-line-or-history
 bindkey -M viins '^n'    down-line-or-history
 bindkey -M viins '^y'    yank
+bindkey -M viins '^f'    forward-char
+bindkey -M viins '^b'    backward-char
 bindkey -M viins '^w'    backward-kill-word
 bindkey -M viins '^u'    backward-kill-line
 bindkey -M viins '^?'    backward-delete-char
@@ -35,6 +37,8 @@ bindkey -M vicmd '^s'    history-incremental-pattern-search-forward
 bindkey -M vicmd '^p'    up-line-or-history
 bindkey -M vicmd '^n'    down-line-or-history
 bindkey -M vicmd '^y'    yank
+bindkey -M vicmd '^f'    forward-char
+bindkey -M vicmd '^b'    backward-char
 bindkey -M vicmd '^w'    backward-kill-word
 bindkey -M vicmd '^u'    backward-kill-line
 bindkey -M vicmd '/'     vi-history-search-forward