Pull in the custom configuration concept from dhh/custom_configuration
Merge branch 'master' of github.com:rails/rails