made .tmux.conf have C-b as prefix for local
Merge branch 'master' into server