mixed changes on mbp

Conflicts:
	zsh/prezto
mixed changes on mbp