No own prezto fork anymore
Merge commit '5ae9433'

Conflicts:
	zprezto