Update bashrc and tmux.conf
Updating and merging latest changes