Add tmux.conf.local
Merge pull request #156 from slam/tmux_local

Add tmux.conf.local
Merge remote-tracking branch 'upstream/master'
move tmux.conf changes to tmux.conf.local