Merge branch 'master' of github.com:benbeltran/dotfiles

diff --cc vimrc
Simple merge

diff --cc zshrc
index b649043af06893b2c4faa60de907242903c0c2d9,a18d2846b498133d44e88c327a7800b725203e4f..29ae3acfd6c3cd5b37fba9e8cda65b59984810e3
--- 1/zshrc
--- 2/zshrc
+++ b/zshrc
@@@ -55,8 -55,10 +55,11 @@@ alias rspec="rspec --color
  
  #Screeninator and RVM scripts
  [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 +[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
  
+ bindkey -v
+ bindkey '^R' history-incremental-pattern-search-backward
+ 
  #
  # End of the custom things from my bash profile.
  # There's probably a more "zsh-ish" way of doing these, but I have no time.