Updated .tmux.conf
Merge branch 'master' into basalt