.bash_prompt: Avoid double-escaping ANSI codes

Fixes #399 and closes #402.
.bash_prompt: Add back escape sequences

Fixes #403.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .bash_prompt: Add back escape sequences
  .bash_prompt: Avoid double-escaping ANSI codes

Conflicts:
	.bash_prompt