Merged some changes with local .bashrc