Fixed up cross-platform crud developing in .bash_profile
Merge branch 'master' of http://github.com/NickCody/dotfiles

Conflicts:
	dotbash_profile
	dotbashrc