Moving bash_profile stuff into bashrc
Cleaning up merge conflict