update .tmux.conf
Merge branch 'master' of github.com:Odinman/home
update .tmux.conf