Update .tmux.conf for OS X
Merge remote-tracking branch 'origin/master'
Ignore .AppleDouble