tmux is better
Merge branch 'master' into eclim