[Commit changes before upgrade]
Merge branch 'master' of https://github.com/loranger/prezto

Conflicts:
	modules/prompt/functions/prompt_loranger_setup
[Commit changes before upgrade]
Merge branch 'master' of github.com:MrJuliuss/prezto