Prompt tweak.
Merge branch 'master' of github.com:jchappell82/oh-my-zsh

Conflicts:
	themes/prose.zsh-theme