Raise a new timeout error with useful info, instead of logging a msg and then CanceledError (with no further info) separately
Convert CancelledError to TimedOutError in timeout_deferred
retry_deferred also accepts a description
Change wait_for_active and verified_delete to just log the TimedOutError
Do not use a separate class to store a single variable, as per @dreid's suggestion
Refactor some test harnessing
Merge branch 'master' into auto-488-better-timeout-logging

Conflicts:
	otter/worker/launch_server_v1.py
Better storage of timed-out state, as per @dreid's suggestions
Change the default timeout for verified delete
Merge pull request #343 from rackerlabs/auto-488-better-timeout-logging

Remove useless CancelledError logging