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

diff --combined vimrc
index 8b575bc3a0d7462397e5b129ffd9c70b05b4169a,5ce3d57965845933decc73e23c4f237acb08a446..b0c9df9699e6a16b13aff39390d5ee244a57dae6
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -80,6 -80,7 +80,7 @@@ set backspace=indent,eol,star
  
  " load the plugin and indent settings for the detected filetype
  filetype plugin indent on
+ filetype plugin on
  
  " Opens an edit command with the path of the currently edited file filled in
  " Normal mode: <Leader>e
@@@ -160,6 -161,3 +161,6 @@@ set foldlevel=
  
  " powerline stuff
  let g:Powerline_symbols = 'fancy'
 +
 +" node cleaning
 +let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'

diff --combined zshrc
index b649043af06893b2c4faa60de907242903c0c2d9,a18d2846b498133d44e88c327a7800b725203e4f..29ae3acfd6c3cd5b37fba9e8cda65b59984810e3
--- 1/zshrc
--- 2/zshrc
+++ b/zshrc
@@@ -17,14 -17,14 +17,14 @@@ export ZSH_THEME="ben-prose
  # DISABLE_LS_COLORS="true"
  
  # Uncomment following line if you want to disable autosetting terminal title.
- # DISABLE_AUTO_TITLE="true"
+ DISABLE_AUTO_TITLE="true"
  
  # Uncomment following line if you want disable red dots displayed while waiting for completion
  # DISABLE_COMPLETION_WAITING_DOTS="true"
  
  # 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=(git brew bundler cap gem osx rails3 rvm dircycle)
+ plugins=(git brew bundler cap gem osx rails3 rvm dircycle command-coloring npm)
  
  source $ZSH/oh-my-zsh.sh
  
@@@ -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.