tmux.conf: set lock
Merge branch 'master' of github.com:tgulacsi/gthomas-bashrc

Conflicts:
	dotfiles/tmux.conf