Sync with upstream

22ef6f9

automations/kitchen-light-timeout.yaml

 alias: Turn off kitchen light after no motion
 trigger:
   - platform: state
-    entity_id: binary_sensor.kitchen
+    entity_id: switch.kitchen
     to: 'on'
 condition:
-  condition: or
+  condition: and
   conditions:
     - condition: state
-      entity_id: switch.kitchen
+      entity_id: binary_sensor.kitchen
       state: 'on'
 action:
   service: homeassistant.turn_on

configuration.yaml

@@ -32,9 +32,18 @@ updater:
 # Enables the frontend
 frontend:
 
+# Set recorder options
+recorder:
+  # purge_days: 365
+  db_url: !secret mysql_recorder
+
 # Enables support for tracking state changes over time.
 history:
 
+# Save events to logentries service
+logentries:
+  token: !secret logentries_token
+
 # Discover some devices automatically
 discovery:
 

scripts.yaml

@@ -143,7 +143,7 @@ kitchen_light_timeout:
   alias: "Turn off kitchen light after 15 minutes of inactivity"
   sequence:
     - delay:
-        minutes: 15
+        minutes: 5
     - service: switch.turn_off
       data:
         entity_id: switch.kitchen

secrets.yaml

@@ -11,3 +11,5 @@ gravatar_chris:
 gravatar_chris_2:
 wunderground_key:
 wunderground_pws_id:
+logentries_token:
+mysql_recorder: