Onward and upward with zsh
Merge branch 'master' of https://github.com/jleen-sfdc/dotfiles into jleen-sfdc-master

Conflicts:
	zsh/zshrc