Simplify multiplexer auto-start tests
Merge branch 'master' of github.com:sorin-ionescu/prezto

Conflicts:
	modules/screen/init.zsh
	modules/tmux/init.zsh
update completion submodule