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

Conflicts:
	runcoms/zshenv
	runcoms/zshrc