Update branch and fix conflicts.

src/main.js

@@ -25,7 +25,7 @@ Vue.use(VueRouter)
 Vue.use(VueTimeago, {
   locale: 'en-US',
   locales: {
-    'en-US': require('vue-timeago/locales/en-US.json')
+    'en-US': require('../static/timeago.json')
   }
 })
 
@@ -34,6 +34,8 @@ const persistedStateOptions = {
     'config.hideAttachments',
     'config.hideAttachmentsInConv',
     'config.hideNsfw',
+    'config.autoLoad',
+    'config.hoverPreview',
     'config.muteWords',
     'statuses.notifications',
     'users.users'