Merge branch 'master' into dev

plejd/README.md

@@ -55,7 +55,6 @@ mqtt:
   broker: [point to your broker IP]
   username: [username of mqtt broker]
   password: !secret mqtt_password
-  client_id: mqtt
   discovery: true
   discovery_prefix: homeassistant
   birth_message: 

plejd/config.json

@@ -32,4 +32,4 @@
     "mqttPassword": "str",
     "includeRoomsAsLights": "bool"
   }
-}
+}