Removed old settings
Revert "Removed old settings"

This reverts commit be8eeeb2ca45fc95c4426de269af6a9aa1935a98.
Merge branch 'master' of git://github.com/dtw/dotfiles
Added tmux.conf