diff --git a/brew b/brew
index 5620c63..1681b62 100755
--- a/brew
+++ b/brew
@@ -62,6 +62,7 @@ brew install readline
 brew install reattach-to-user-namespace
 brew install ruby-install
 brew install teensy_loader_cli
+brew install tesseract
 brew install the_platinum_searcher
 brew install the_silver_searcher
 brew install tmux
@@ -72,9 +73,4 @@ brew install xz
 
 brew install https://raw.github.com/falsecz/homebrew-misc/master/Formula/git-wtf.rb
 
-# At the end, because they require user intervention
-brew install mongodb
-brew install postgresql
-brew install redis
-
 brew cleanup
diff --git a/cask b/cask
index 977e78c..229c5d4 100755
--- a/cask
+++ b/cask
@@ -20,6 +20,7 @@ if [ -x "$brew_path" ] ; then
   installcask bettertouchtool
   installcask crashplan
   installcask dbvisualizer
+  installcask discord
   installcask docker-toolbox
   installcask dropbox
   installcask gitter
diff --git a/link/.ruby-version b/link/.ruby-version
index 2972947..81af5fe 100644
--- a/link/.ruby-version
+++ b/link/.ruby-version
@@ -1 +1 @@
-ruby-2.1
+ruby-2.3
diff --git a/link/.tmux.conf b/link/.tmux.conf
index 1a074dc..8a9fbd4 100644
--- a/link/.tmux.conf
+++ b/link/.tmux.conf
@@ -76,13 +76,14 @@ bind-key C-j command-prompt -p "join pane from:"  "join-pane -s '%%'"
 bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
 bind-key C-b break-pane -t :
 
-# Setup 'v' to begin selection as in Vim
-bind-key -t vi-copy v begin-selection
-bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+# Copy/paste like vim -- Updated for 2.4
+bind-key -Tcopy-mode-vi v send -X begin-selection
+bind-key -Tcopy-mode-vi y send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
+bind-key -Tcopy-mode-vi Escape send -X cancel
+bind-key -Tcopy-mode-vi V send -X rectangle-toggle
 
-# Update default binding of `Enter` to also use copy-pipe
-unbind -t vi-copy Enter
-bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
+unbind -Tcopy-mode-vi Enter
+bind-key -Tcopy-mode-vi Enter send -X copy-pipe-and-cancel "reattach-to-user-namespace pbcopy"
 
 #### COLOUR
 
diff --git a/link/.zshrc b/link/.zshrc
index 83032ed..e8b40b1 100644
--- a/link/.zshrc
+++ b/link/.zshrc
@@ -11,8 +11,32 @@
 # fi
 
 # Source antigen
-source $(brew --prefix)/share/antigen/antigen.zsh
-source ~/.antigen.zsh
+# source $(brew --prefix)/share/antigen/antigen.zsh
+# source ~/.antigen.zsh
+
+# load zgen
+source "${HOME}/.zgen/zgen.zsh"
+
+if ! zgen saved; then
+  # specify plugins here
+  zgen oh-my-zsh
+
+  # generate the init script from plugins above
+  zgen oh-my-zsh plugins/git
+  zgen oh-my-zsh plugins/sudo
+  zgen oh-my-zsh plugins/command-not-found
+
+  zgen load https://gist.github.com/3750104.git agnoster
+
+  zgen load zsh-users/zsh-syntax-highlighting
+  zgen load zsh-users/zsh-history-substring-search
+  zgen load zsh-users/zsh-autosuggestions
+
+  zgen oh-my-zsh plugins/brew
+  zgen oh-my-zsh plugins/osx
+
+  zgen save
+fi
 
 # Run all files in dotfiles source directory
 if [[ -d "$HOME/dotfiles/source" ]]; then
@@ -35,10 +59,8 @@ fi
 # Customize to your needs...
 
 export NVM_DIR="/Users/tedkulp/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$(brew --prefix nvm)/nvm.sh" ] && . "$(brew --prefix nvm)/nvm.sh"  # This loads nvm
 
 # setopt no_complete_aliases
 
 test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_integration.zsh
-
-export HOMEBREW_GITHUB_API_TOKEN=80ad9e8581e2506efeaedaa079ae02b50add8821
diff --git a/link/vim-config b/link/vim-config
index 521a385..ec4522e 160000
--- a/link/vim-config
+++ b/link/vim-config
@@ -1 +1 @@
-Subproject commit 521a3850ea7cb5f9fbc72045296f1f2df1cbbbec
+Subproject commit ec4522e806661b243f61150dacf1eb5855f69221