Merge .tmux-osx.conf into .tmux.conf