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
Merge branch 'master' into bluebox-production-org