Rails 4.0.4. Typhoeus only.
Updated bundle: ocean-rails 2.7.1.
Merge branch 'master' into staging