Merge upstream!! #64 <3 <3

config/settings.yml

@@ -10,14 +10,17 @@ defaults: &defaults
   site_title: 'dev.glitch.social'
   site_description: ''
   site_extended_description: ''
+  site_terms: ''
   site_contact_username: ''
   site_contact_email: ''
   open_registrations: true
   closed_registrations_message: ''
   open_deletion: true
+  timeline_preview: true
   boost_modal: false
-  auto_play_gif: true
+  auto_play_gif: false
   delete_modal: true
+  system_font_ui: false
   notification_emails:
     follow: false
     reblog: false