Downgraded the ocean-rails gem to ~>2.0.
Merge branch 'master' into staging