Now using Oj for JSON conversion.
Merge branch 'master' into staging
Merge branch 'staging' into prod