Fixed tmux.conf syntax
Merge pull request #575 from jby/fix_tmux_conf_syntax

Fixed tmux.conf syntax after PR #565
Merge remote-tracking branch 'skwp/master'

* skwp/master:
  Fixed tmux.conf syntax

Conflicts:
	tmux/tmux.conf