Allow local configuration for tmux
Merge pull request #394 from treppo/master

Allow users to overwrite the tmux configuration
Resolved conflict