updated zshrc
Merge branch 'master' of github.com:BenDoan/dotfiles

Conflicts:
	.vim/.netrwhist
	.zshrc
edited vimrc ctrlp bindings