Fixing tmux.conf for Mac OS X
Merge branch 'dev' of github.com:andschwa/dotfiles into dev
Revert "Fixing tmux.conf for Mac OS X"

This reverts commit 6ca323a4b5b64c418c4c055c66410fe67f75e417.