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