melded .bashrc's.  Used most of the differences from the #! version.