Update prompt
Merge branch 'master' of https://github.com/mhowell/oh-my-zsh

Conflicts:
	themes/matt.zsh-theme