Misc changes and cleanup of split .bashrc