Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

config/example.application.yml

@@ -57,6 +57,8 @@ standard_settings: &standard_settings
   gpx_image_dir: "/home/osm/images"
   # Location of data for file columns
   #file_column_root: ""
+  # List of memcache servers to use for caching
+  #memcache_servers: []
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
   # URL of Nominatim instance to use for geocoding
@@ -73,7 +75,6 @@ development:
 
 production:
   <<: *standard_settings
-  require_terms_seen: false
 
 test:
   <<: *standard_settings