Merged in a few GPI changes to bashrc