my modification
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zlogin
	runcoms/zshrc