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

Conflicts:
	themes/prose.zsh-theme
Prompt tweak.
Hack to not break in a virtualenv.
Remove double virtualenv.
Add another theme.
Merge branch 'master' of github.com:jchappell82/oh-my-zsh
Merge branch 'master' into server