Add .tmux.conf
Merge branch 'master' into osx_detune
Merge branch 'master' into osx_detune
Minor fixes and cleanup