[Fix #713] Set prompt theme off in unsupported terminal
Use short apothegms only in fortune
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zlogin