From b5ee1cca928871d4ab2c4492de79bdf69205e309 Mon Sep 17 00:00:00 2001
From: CCOSTAN <carlo@ipm.com>
Date: Mon, 13 Feb 2017 20:39:53 +0000
Subject: [PATCH] Updating some of the language formatting.

---
 .HA_VERSION                       |  2 +-
 automation/Speech/home_today.yaml | 23 ++++++++++++-----------
 automation/late_night_helper.yaml |  8 +-------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.HA_VERSION b/.HA_VERSION
index 095a1087..fc250eb0 100755
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.38.0
\ No newline at end of file
+0.38.2
\ No newline at end of file
diff --git a/automation/Speech/home_today.yaml b/automation/Speech/home_today.yaml
index 6edf5f59..635a58f8 100755
--- a/automation/Speech/home_today.yaml
+++ b/automation/Speech/home_today.yaml
@@ -17,25 +17,26 @@
         value1: >
           "Welcome Home {{ trigger.entity_id.split('.')[1]|replace('_', ' ') }}. Here is what's going on around the house right now:
           {%if now().strftime("%a") == 'Wed' or now().strftime("%a") == 'Sun'%}
-          Today is {{now().strftime("%A")}} and {{now().strftime("%A")}} is garbage day.  Please be sure to tell the kids to take out the trash.
+            Today is {{now().strftime("%A")}} and {{now().strftime("%A")}} is garbage day.  Please be sure to tell the kids to take out the trash.
           {%endif%}
           Inside the house, it is {{ states.climate.downstairs.attributes["current_temperature"]}} degrees with around {{states('sensor.downstairs_thermostat_humidity')}} percent humidity. Outside, it is going to be {{states('sensor.dark_sky_minutely_summary')}} 
           {% if is_state('cover.garadget_large', 'open') -%}
-          Also, The Large Garage Door is still open 
+            Also, The Large Garage Door is still open 
           {% endif -%}
           {% if is_state('cover.garadget_small', 'open') -%}
-          {% if is_state('cover.garadget_large', 'open') -%}and
-          {%- endif %} The small Garage Door is still open.
+            {% if is_state('cover.garadget_large', 'open') -%}and
+            {%- endif %} The small Garage Door is still open.
           {% endif %}
           . There are 
           {% for state in states.light if state.state == 'on' -%}
-          {%- if loop.last -%}
-          {{ loop.index }}
-          {%- endif -%}
+            {%- if loop.last -%}
+              {{ loop.index }}
+            {%- endif -%}
           {%- endfor %}  lights on right now."
           {% set comma = joiner(', ') %} The 
           {% for group in states.group|groupby('state') -%}
-          {%- for entity in group.list if entity.state == 'on' and entity.name.split(' ')[1]|lower == 'lights' and entity.name.split(' ')[0]|lower != 'all' and entity.name.split(' ')[0]|lower != 'interior' -%}
-          {{ comma() }}{{ entity.name }}
-          {%- endfor -%}
-          {%- endfor %}.
\ No newline at end of file
+            {%- for entity in group.list if entity.state == 'off' and entity.name.split(' ')[1]|lower == 'lights' and entity.name.split(' ')[0]|lower != 'all' and entity.name.split(' ')[0]|lower != 'interior' -%}
+            {{ ' and' if loop.last and not loop.first else comma() }}
+            {{ entity.name }}
+            {%- endfor -%}
+          {%- endfor %}
\ No newline at end of file
diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index aee40d93..860a33ac 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -7,13 +7,7 @@
       entity_id: 
         - binary_sensor.upstairs_away_mode
         - binary_sensor.downstairs_away_mode
-      state: 'off'
-    - platform: state
-      entity_id: 
-        - binary_sensor.sleepnumber_carlo_carlo_is_in_bed
-        - binary_sensor.sleepnumber_carlo_stacey_is_in_bed
-      state: 'on'
-      for: '00:05:00'      
+      state: 'off'    
     - platform: state
       entity_id: group.family
       state: home