Pulling in some bashrc changes from trusty branch