tmux updates
Merge branch 'master' of github.com:gjvc/etc

Conflicts:
	pkg/tmux/dot-tmux.conf