Ditched oh my zsh for prezto
Merge branch 'master' of https://github.com/bhrutledge/dotfiles

Conflicts:
	zshrc