updated .tmux.conf
Merge branch 'master' of github.com:BenDoan/dotfiles