Setup tmux as an xterm terminal.
Merge branch 'emacs-update' into ubuntu