Revise tmux-line
Merge branch 'master' into mac