Add heroku specific settings for rails 4.0.0
Merge branch 'admin/heroku-routing' into next
Merge branch 'next'