update .tmux.conf
Merge branch 'master' of github.com:xsc/.dotfiles