Revert "Revert "Revert "tmux conf"""

This reverts commit 855db2a384cdc455d5d33047d0b697d53136b4fa.
horus stuff
Merge branch 'master' into horus