better vim and zsh xterm and tmux titles
Merge branch 'master' into ccap