Updated to Rails 4.1 and new ocean-rails.
Merge branch 'master' into staging