Update tmux conf
Merge branch 'update-tmux'