Make this easier to use.l
Fix a couple bugs I put in before.
Merge branch 'reusable-conch-test-server' into flocker-deploy-ssh-config-71
mess up the tests a bunch

this is what happens when you don't make APIs asynchronous, folks.

also run a bunch of child processes, wee.