Added hostname to tmux status line
Merged in upstream changes