Merge branch 'master' of github.com:aarongut/dotfiles into material

Conflicts:
	.vimrc

.vimrc

@@ -19,8 +19,15 @@ set smartindent
 set showcmd
 set laststatus=2
 set noshowmode
+set title
+
+" Search betterer
 set incsearch
 colorscheme materialbox
+set hlsearch
+set ignorecase
+set smartcase
+
 set background=dark
 
 execute pathogen#infect()

.zshrc

@@ -2,6 +2,12 @@ autoload -U colors && colors
 
 source ~/.git-prompt.sh
 
+if [[ -f .zshrc_local ]]
+then
+  source .zshrc_local
+else
+fi
+
 export PATH=$PATH:/opt/cc0/bin:~/bin:/opt/android-studio/bin:/opt/smlnj/bin
 export EDITOR=vim
 export CLICOLOR=1