Delete old configs.
.xscreensaver too
Source .bashrc.localonly if we see it.

Plus some other minor updates to .bashrc and .bash_profile.