Merge remote-tracking branch 'origin/develop' into xap

keyboards/ergodox_ez/base/keyboard.json

@@ -2,5 +2,11 @@
     "keyboard_name": "ErgoDox EZ",
     "usb": {
         "pid": "0x4974"
+    },
+    "features": {
+        "bootmagic": false,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true
     }
 }