update tmux.conf
Merge branch 'master' of github.com:ngs/dotfiles

Conflicts:
	rc.d/tmux.conf