update celluloid, and remove simplestates
Update travis-support.

Includes fix for the logging format.
Merge branch 'master' into jk_update_celluloid
bundle update from fresh to remove the mdi deps

and also get the latest travis-build
updated travis-build

and also exxon it seems
small active support and rspec update
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-com