diff --git a/vim/.netrwhist b/vim/.netrwhist
index 70e437d..1c45f59 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,11 +1,9 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =9
-let g:netrw_dirhist_1='/Users/mileszs/code/hg-technologies/warmup-ninja'
-let g:netrw_dirhist_2='/Users/mileszs/code/hg-technologies/warmup-ninja/test'
-let g:netrw_dirhist_3='/Users/mileszs/code/hg-technologies/warmup-ninja/test/api'
-let g:netrw_dirhist_4='/Users/mileszs/code/hg-technologies/warmup-ninja/test/api/hg_ninja'
-let g:netrw_dirhist_5='/Users/mileszs/code/mobi/devpool/app'
-let g:netrw_dirhist_6='/Users/mileszs/code/indyhackers.org/app/assets/stylesheets'
-let g:netrw_dirhist_7='/Users/mileszs/code/hg-technologies/warmup-ninja/app/api/hg_ninja'
-let g:netrw_dirhist_8='/Users/mileszs/code/hg-technologies/warmup.ninja-chrome/src/sources'
-let g:netrw_dirhist_9='/Users/mileszs/code/hg-technologies/warmup-ninja/app/assets/stylesheets'
+let g:netrw_dirhist_cnt =7
+let g:netrw_dirhist_1='/Users/mileszs/.gem/ruby/2.2.3/gems'
+let g:netrw_dirhist_2='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0'
+let g:netrw_dirhist_3='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0/lib'
+let g:netrw_dirhist_4='/Users/mileszs/.gem/ruby/2.2.3/gems/factory_girl-4.5.0/lib/factory_girl'
+let g:netrw_dirhist_5='/Users/mileszs/code/springbuk/springbuk/app/assets/stylesheets/application'
+let g:netrw_dirhist_6='/Users/mileszs/code/springbuk'
+let g:netrw_dirhist_7='/Users/mileszs/code/amedco/amedco-workshop-evaluator/app/assets/javascripts'
diff --git a/vim/bundle/dash.vim b/vim/bundle/dash.vim
new file mode 160000
index 0000000..4b01b6c
--- /dev/null
+++ b/vim/bundle/dash.vim
@@ -0,0 +1 @@
+Subproject commit 4b01b6cd20fb77089b4222133c791602d140d901
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
new file mode 160000
index 0000000..cc440f1
--- /dev/null
+++ b/vim/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit cc440f1b40adcdc0a5aabbc786a8d1750eefd3ee
diff --git a/vim/bundle/vim-elixir b/vim/bundle/vim-elixir
new file mode 160000
index 0000000..85593b1
--- /dev/null
+++ b/vim/bundle/vim-elixir
@@ -0,0 +1 @@
+Subproject commit 85593b118bae081538943640648e5d57f22f0aba
diff --git a/vim/bundle/vim-indent-guides b/vim/bundle/vim-indent-guides
new file mode 160000
index 0000000..49bde6f
--- /dev/null
+++ b/vim/bundle/vim-indent-guides
@@ -0,0 +1 @@
+Subproject commit 49bde6fa30648345ffabfe55b3a095a293568a2e
diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired
new file mode 160000
index 0000000..11dc568
--- /dev/null
+++ b/vim/bundle/vim-unimpaired
@@ -0,0 +1 @@
+Subproject commit 11dc568dbfd7a56866a4354c737515769f08e9fe
diff --git a/vimrc b/vimrc
index 3a17380..9967d21 100644
--- a/vimrc
+++ b/vimrc
@@ -18,6 +18,7 @@ Plugin 'gmarik/Vundle.vim'
 " Keep Plugin commands between vundle#begin/end.
 " plugin on GitHub repo
 
+Plugin 'tpope/vim-unimpaired'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-rails'
 Plugin 'tpope/vim-rake'
@@ -54,6 +55,10 @@ Plugin 'tomtom/tlib_vim'
 Plugin 'garbas/vim-snipmate'
 Plugin 'mileszs/vim-react-snippets'
 Plugin 'mxw/vim-jsx'
+Plugin 'nathanaelkane/vim-indent-guides'
+Plugin 'rizzatti/dash.vim'
+Plugin 'scrooloose/syntastic'
+Plugin 'elixir-lang/vim-elixir'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -101,6 +106,8 @@ set incsearch     " search as you type
 set ignorecase
 set smartcase     " case-smart searching
 
+set colorcolumn=80
+
 " File-type highlighting and configuration
 syntax on
 filetype plugin on
@@ -192,8 +199,7 @@ let g:rails_projections = {
       \ }
 
 let g:rspec_runner = "os_x_iterm"
-let g:rspec_command = "!zeus rspec {spec}"
-" let g:rspec_command = "Dispatch rspec {spec}"
+let g:rspec_command = "Dispatch rspec {spec}"
 
 " RSpec.vim mappings
 " map <Leader>t :call RunCurrentSpecFile()<CR>
@@ -211,5 +217,19 @@ nmap <silent> ss :sp<CR>
 " AutoClose remapping
 nmap <Leader>x <Plug>ToggleAutoCloseMappings
 
+"Map esc to jj
+inoremap jj <esc>
+
+" Configure Syntastic for linter checks
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 2
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+let g:syntastic_enable_rubocop_checker = 1
+
 " github
 source /Users/mileszs/.vimgithubrc
diff --git a/zsh/git.sh b/zsh/git.sh
index 59f67b3..6ea18d3 100644
--- a/zsh/git.sh
+++ b/zsh/git.sh
@@ -25,6 +25,7 @@ alias gm='git merge'
 alias gp='git pull'
 alias gpa='git pull --all'
 alias gpp='gp && git push origin `current_git_branch`'
+alias push='git push origin `current_git_branch`'
 alias gprp='gp && rake && gpp'
 alias gri='git rebase -i origin/master^'
 alias grc='git rebase --continue'
@@ -60,6 +61,8 @@ alias gw='git whatchanged'
 alias gnext='git checkout $(git rev-list HEAD..master | tail -n 1)'
 alias gprev='git checkout HEAD~1'
 
+alias refetch='git fetch && git reset --hard FETCH_HEAD'
+
 # Heroku
 alias pushroku='git push heroku master'
 
diff --git a/zshrc b/zshrc
index bdb6ccf..cec498e 100644
--- a/zshrc
+++ b/zshrc
@@ -45,6 +45,8 @@ bindkey -M viins '^B' push-line-or-edit
 bindkey -M vicmd '^[OA' vi-up-line-or-history
 # change the shortcut for expand alias
 bindkey -M viins '^X' _expand_alias
+# restore history search ability using Ctrl-R
+bindkey "^R" history-incremental-search-backward
 
 # edit current command in $EDITOR
 autoload -U edit-command-line