Handle client disconnects
Simplify code a great deal
fixup! Handle client disconnects
Upgrade marionette dependency to above 0.7.1.1

This contains the wait module which is needed by some tests.
Merge pull request #54 from andreastt/ato/upgrade_marionette

Upgrade marionette dependency to above 0.7.1.1