Added tmux.conf
Merge remote branch 'origin/asimov' into asimov