Made sure that history searching with CTRL+r is available.
Merge branch 'master' of github.com:JCook21/dotfiles

Conflicts:
	.zshrc