Fix breaking changes in mbsync config

mbsync/.mbsyncrc

@@ -16,20 +16,36 @@ Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/Inbox/
 
 Channel sync-gmail-default
-Master :gmail-remote:
-Slave :gmail-local:
+Far :gmail-remote:
+Near :gmail-local:
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel sync-gmail-sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:sent
+Far :gmail-remote:"[Gmail]/Sent Mail"
+Near :gmail-local:sent
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel sync-gmail-trash
-Master :gmail-remote:"[Gmail]/Bin"
-Slave :gmail-local:trash
+Far :gmail-remote:"[Gmail]/Bin"
+Near :gmail-local:trash
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel sync-gmail-junk
-Master :gmail-remote:"[Gmail]/Spam"
-Slave :gmail-local:junk
+Far :gmail-remote:"[Gmail]/Spam"
+Near :gmail-local:junk
+Create Both
+Expunge Both
+SyncState *
+
 
 # Get all the channels together into a group.
 Group gmail
@@ -38,10 +54,6 @@ Channel sync-gmail-sent
 Channel sync-gmail-trash
 Channel sync-gmail-junk
 
-Create Both
-Expunge Both
-SyncState *
-
 IMAPAccount uni
 Host correo.ugr.es
 User akasroua@correo.ugr.es
@@ -59,20 +71,36 @@ Path ~/.mail/uni/
 Inbox ~/.mail/uni/INBOX/
 
 Channel uni-default
-Master :uni-remote:
-Slave :uni-local:
+Far :uni-remote:
+Near :uni-local:
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel uni-sent
-Master :uni-remote:"Sent"
-Slave :uni-local:sent
+Far :uni-remote:"Sent"
+Near :uni-local:sent
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel uni-trash
-Master :uni-remote:"Trash"
-Slave :uni-local:trash
+Far :uni-remote:"Trash"
+Near :uni-local:trash
+Create Both
+Expunge Both
+SyncState *
+
 
 Channel uni-archive
-Master :uni-remote:"BUZONdeEntradaUGR"
-Slave :uni-local:archive
+Far :uni-remote:"BUZONdeEntradaUGR"
+Near :uni-local:archive
+Create Both
+Expunge Both
+SyncState *
+
 
 # Get all the channels together into a group.
 Group uni
@@ -80,7 +108,3 @@ Channel uni-default
 Channel uni-sent
 Channel uni-trash
 Channel uni-archive
-
-Create Both
-Expunge Both
-SyncState *