Rearrange Bash profile stuff

Mostly this is so that on systems where there's already a .bashrc, the
.profile is still read, and also if the existing .bashrc defines a PS1
then it'll be used instead of using the same one on all systems.