Merge local zsh configuration
More local configuration
Update zsh configuration
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zshenv
	runcoms/zshrc