Merge branch 'master' into datarestructure

main.py

@@ -12,14 +12,13 @@ filemap = {
     "config": ["config.json", "configuration", "json"],
     "help": ["help.json", "command help", "json"],
     "counters": ["counters.json", "counters file", "json"],
-    "masterbuf": ["masterbuf.json", "master buffer", "json"],
     "monitor": ["monitor.json", "monitoring database", "json"],
     "tokens": ["tokens.json", "authentication tokens", "json"],
     "aliasdata": ["aliasdata.json", "data for alias generation", "json"],
 
     # Binary (pickle) configs
     "network": ["network.dat", "network list", "pickle"]
-    }
+}
 
 connections = {}
 relayConnections = {}