merge master branch.

zsh/zshrc

@@ -17,8 +17,9 @@ if [[ -d $HOME/.oh-my-zsh ]]; then
   # Set name of the theme to load.
   ZSH_THEME="robbyrussell"
 
-  # Default plugins.
-  plugins=(git ruby)
+  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+  # Example format: plugins=(rails git textmate ruby lighthouse)
+  plugins=(vi-mode git rvm ruby rails autojump bundler gem gnu-utils heroku rake redis-cli zsh-syntax-highlighting history-substring-search)
 
   # source every zsh file in user's custom/zsh/before. This is useful for setting theme and plugins.
   if [[ -d $yadr/custom/zsh/ ]]; then
@@ -63,10 +64,3 @@ if [[ -a ~/.secrets ]] then
   source ~/.secrets
 fi
 
-# Speed up git completion
-# http://talkings.org/post/5236392664/zsh-and-slow-git-completion
-__git_files () {
-  _wanted files expl 'local files' _files
-}
-
-export PATH=/usr/local/bin:$PATH