Now using Oj for JSON conversion.
Typhoeus only. Rails 4.0.3.
Updated bundle: ocean-rails 2.7.1.
Revert "Updated bundle: ocean-rails 2.7.1."

This reverts commit ec6f134858d10c2c0d75773e175d21fe26de41bb.
due to breaking changes
Revert "Typhoeus only. Rails 4.0.3."

This reverts commit 0d3b5a07950cd7353f5dfa552ec782493f6cd481.
due to breaking changes
Revert "Now using Oj for JSON conversion."

This reverts commit c48a7251e9349030f9616dc0a48a948e7c30b00c.
due to breaking changes
Merge remote-tracking branch 'upstream/master'