Updated readme
Added tmux configuration
Merge branch 'master' into tim-kopp-settings

Added tmux stuff
Added my tmux config