merged in standard Gentoo .bashrc & .bash_profile
changed prompt to be bolder, more readable.
added keychain code
Merge branch 'master' of macmini:git/dotfiles

Conflicts:
	bashrc
profile now has Darwin & Linux specific sections