Updated bashrc.

* Removed .bashrc_default stuff.
* Made BETTER_PS1 and LIVE_TERM_TITLE defaults only (can override).
Merge branch 'master' into mac
Added Mac proxy stuff to bham-proxy.
Merge branch 'master' into mac

Conflicts:
	bin/bham-proxy