prompt - minor redesign of prompt.
Merge from sibling 'master' into 'eway'.

Conflicts:
	.bash.d/prompt