diff --git a/zshrc b/zshrc
index b456699..66af5c2 100644
--- a/zshrc
+++ b/zshrc
@@ -1,5 +1,5 @@
 # Path to your oh-my-zsh installation.
-export ZSH=$HOME/.oh-my-zsh
+    export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
@@ -52,11 +52,10 @@ ZSH_THEME="agnoster"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(git)
-#plugins=(git ssh-agent)
 
 # User configuration
 
-export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
+# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
 # export MANPATH="/usr/local/man:$MANPATH"
 
 source $ZSH/oh-my-zsh.sh
@@ -85,6 +84,14 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-if [[ -f $HOME/.bash_aliases ]]; then
-    source ~/.bash_aliases
+
+# Ctrl-R
+bindkey '^R' history-incremental-search-backward
+
+# Don't share history
+setopt append_history no_inc_append_history no_share_history
+
+if [[ -f $HOME/.zshrc.local ]]; then
+    source ~/.zshrc.local
 fi
+