Merge branch 'master' into datarestructure

conf/example/config.json

@@ -15,19 +15,15 @@
     "RedisSocket": "/tmp/redis.sock",
     "UsePassword": true,
     "ConnectOnCreate": false,
-    "Notifications": {
-        "Highlight": true,
-        "Connection": true,
-        "Query": true
-    },
-    "Compat": {
-        "ZNC": true
-    },
     "Dist": {
         "Enabled": true,
         "SendOutput": false,
         "File": "conf/dist.sh"
     },
+    "Toggles": {
+        "Who": false,
+        "CycleChans": true
+    },
     "Password": "s",
     "Tweaks": {
         "ZNC": {
@@ -42,6 +38,5 @@
             "Factor": 2.718281828459045,
             "Jitter": 0.11962656472
         }
-    },
-    "Master": [null, null]
+    }
 }

conf/help.json

@@ -3,8 +3,7 @@
     "logout": "logout",
     "del": "del <network> <relay>",
     "mod": "mod <network> <variable> <value>",
-    "get": "get <name>",
-    "key": "key <master|list|add|del|except|unexcept|listexcept|monitor> [<name>] [<target>] [<key...>] [<on|off>]",
+    "get": "get <name> <variable>",
     "who": "who <query>",
     "join": "join <network> <relay> <channel> [<key>]",
     "part": "part <network> <relay> <channel>",

conf/masterbuf.json

@@ -0,0 +1 @@
+[]