Move the interactive guard from .bashrc to .bash_profile.
Move environment variables used interactively from .bash_profile .bashrc.  Rearrange slightly.