modz
Merge branch 'master' of https://github.com/0xANDREW/prezto

Conflicts:
	runcoms/zshenv
	runcoms/zshrc