only exit if $TMUX is unset
Merge branch 'master' into servy

Conflicts:
	.zshrc