Clean-up .bash_profile.  Fix logic in .bashrc.