update config
Merge branch 'proper-rails4-config'

* proper-rails4-config:
  update config