using Fog.wait_for for more control

@server.wait_for does not allow us to catch excon errors due to the way fog works.

this gives us better control with catching excon connection errors.

also fixed a timeout error catching bug as i was catching the wrong class
Merge branch 'master' into bluebox-production-org