Merge in some .bashrc changes