Update notes about tmux in the readme
Merge branch 'master' into tentative-changes