Updated bashrc settings.
Merged with remote changes