new bash PS1
minor bash prompt tweak
tweak prompt
Merge branch 'master' of gitlab.booxdev.com:taowu/dotfiles

Conflicts:
	bashrc
	vimrc.local
Merge branch 'master' of github.com:metaphox/dotfiles

Conflicts:
	bash_profile