Simplify server startup for tests.

Separate the concerns of starting the webserver, starting the email
server, and starting zombie instances.
Fix test.common.await
Merge branch 'master' of vagrant:intertwinkles