Subtler working dir status colors
Merge branch 'master' into unicode-not-powerline

Conflicts:
	bashline.sh