Clean up and reorg bash profile, readme.
Merge master commit 'bb2ef966e955a462c7985aed801c1f23d49cef77' into bsd

# Via TK
* commit 'bb2ef966e955a462c7985aed801c1f23d49cef77':
  Clean up and reorg bash profile, readme.

Conflicts:
	.bash_profile