[Fix #713] Set prompt theme off in unsupported terminal
Use short apothegms only in fortune
update setupvtune alias
Merge branch 'master' of github.com:jsholmes/prezto
Merge remote-tracking branch 'upstream/master'