Add new config for rails 3.1

to make nag message go away. We're not doing anything with locales at
present.
Merge branch 'master' into gemify_point_in_time