Some fixes

Signed-off-by: Christoph Kassen <christoph@kassen.name>
Merge branch 'master' of github.com:ckassen/prezto

Signed-off-by: Christoph Kassen <christoph@kassen.name>

Conflicts:
	runcoms/zlogin