Cleaning up .bashrc and .bash_profile, consolidating profile files for ubuntu and osx