Merge pull request #18481 from home-assistant/rc

0.82.1
Bumped version to 0.82.1
2026-01-21 23:17:00 +01:00 · 2018-11-15 14:25:56 +01:00 · 2018-11-15 14:01:21 +01:00 · 2018-11-15 14:01:15 +01:00 · 2018-11-15 14:01:14 +01:00 · 2018-11-15 14:01:14 +01:00
889 changed files with 41808 additions and 20614 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -76,16 +76,13 @@ omit =
    homeassistant/components/daikin.py
    homeassistant/components/*/daikin.py

-    homeassistant/components/deconz/*
-    homeassistant/components/*/deconz.py
-
    homeassistant/components/digital_ocean.py
    homeassistant/components/*/digital_ocean.py

    homeassistant/components/dominos.py

-	homeassistant/components/doorbird.py
-	homeassistant/components/*/doorbird.py
+    homeassistant/components/doorbird.py
+    homeassistant/components/*/doorbird.py

    homeassistant/components/dweet.py
    homeassistant/components/*/dweet.py
@@ -102,6 +99,9 @@ omit =
    homeassistant/components/egardia.py
    homeassistant/components/*/egardia.py

+    homeassistant/components/elkm1/*
+    homeassistant/components/*/elkm1.py
+
    homeassistant/components/enocean.py
    homeassistant/components/*/enocean.py

@@ -126,6 +126,9 @@ omit =
    homeassistant/components/google.py
    homeassistant/components/*/google.py

+    homeassistant/components/greeneye_monitor.py
+    homeassistant/components/sensor/greeneye_monitor.py
+
    homeassistant/components/habitica/*
    homeassistant/components/*/habitica.py

@@ -206,7 +209,6 @@ omit =
    homeassistant/components/lutron_caseta.py
    homeassistant/components/*/lutron_caseta.py

-    homeassistant/components/mailgun.py
    homeassistant/components/*/mailgun.py

    homeassistant/components/matrix.py
@@ -245,6 +247,9 @@ omit =
    homeassistant/components/opencv.py
    homeassistant/components/*/opencv.py

+    homeassistant/components/opentherm_gw/*
+    homeassistant/components/*/opentherm_gw.py
+
    homeassistant/components/openuv/__init__.py
    homeassistant/components/*/openuv.py

@@ -284,6 +289,12 @@ omit =
    homeassistant/components/scsgate.py
    homeassistant/components/*/scsgate.py

+    homeassistant/components/sense.py
+    homeassistant/components/*/sense.py
+
+    homeassistant/components/simplisafe/__init__.py
+    homeassistant/components/*/simplisafe.py
+
    homeassistant/components/sisyphus.py
    homeassistant/components/*/sisyphus.py

@@ -325,7 +336,6 @@ omit =
    homeassistant/components/tradfri.py
    homeassistant/components/*/tradfri.py

-    homeassistant/components/twilio.py
    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twilio_call.py

@@ -379,7 +389,7 @@ omit =
    homeassistant/components/zigbee.py
    homeassistant/components/*/zigbee.py

-    homeassistant/components/zoneminder.py
+    homeassistant/components/zoneminder/*
    homeassistant/components/*/zoneminder.py

    homeassistant/components/tuya.py
@@ -395,7 +405,6 @@ omit =
    homeassistant/components/alarm_control_panel/ifttt.py
    homeassistant/components/alarm_control_panel/manual_mqtt.py
    homeassistant/components/alarm_control_panel/nx584.py
-    homeassistant/components/alarm_control_panel/simplisafe.py
    homeassistant/components/alarm_control_panel/totalconnect.py
    homeassistant/components/alarm_control_panel/yale_smart_alarm.py
    homeassistant/components/apiai.py
@@ -426,7 +435,6 @@ omit =
    homeassistant/components/camera/xeoma.py
    homeassistant/components/camera/xiaomi.py
    homeassistant/components/camera/yi.py
-    homeassistant/components/climate/econet.py
    homeassistant/components/climate/ephember.py
    homeassistant/components/climate/eq3btsmart.py
    homeassistant/components/climate/flexit.py
@@ -434,8 +442,8 @@ omit =
    homeassistant/components/climate/homematic.py
    homeassistant/components/climate/honeywell.py
    homeassistant/components/climate/knx.py
+    homeassistant/components/climate/mill.py
    homeassistant/components/climate/oem.py
-    homeassistant/components/climate/opentherm_gw.py
    homeassistant/components/climate/proliphix.py
    homeassistant/components/climate/radiotherm.py
    homeassistant/components/climate/sensibo.py
@@ -451,7 +459,6 @@ omit =
    homeassistant/components/cover/myq.py
    homeassistant/components/cover/opengarage.py
    homeassistant/components/cover/rpi_gpio.py
-    homeassistant/components/cover/ryobi_gdo.py
    homeassistant/components/cover/scsgate.py
    homeassistant/components/device_tracker/actiontec.py
    homeassistant/components/device_tracker/aruba.py
@@ -461,6 +468,7 @@ omit =
    homeassistant/components/device_tracker/bluetooth_le_tracker.py
    homeassistant/components/device_tracker/bluetooth_tracker.py
    homeassistant/components/device_tracker/bt_home_hub_5.py
+    homeassistant/components/device_tracker/bt_smarthub.py
    homeassistant/components/device_tracker/cisco_ios.py
    homeassistant/components/device_tracker/ddwrt.py
    homeassistant/components/device_tracker/freebox.py
@@ -478,6 +486,7 @@ omit =
    homeassistant/components/device_tracker/netgear.py
    homeassistant/components/device_tracker/nmap_tracker.py
    homeassistant/components/device_tracker/ping.py
+    homeassistant/components/device_tracker/quantum_gateway.py
    homeassistant/components/device_tracker/ritassist.py
    homeassistant/components/device_tracker/sky_hub.py
    homeassistant/components/device_tracker/snmp.py
@@ -493,6 +502,7 @@ omit =
    homeassistant/components/emoncms_history.py
    homeassistant/components/emulated_hue/upnp.py
    homeassistant/components/fan/mqtt.py
+    homeassistant/components/fan/wemo.py
    homeassistant/components/folder_watcher.py
    homeassistant/components/foursquare.py
    homeassistant/components/goalfeed.py
@@ -500,6 +510,7 @@ omit =
    homeassistant/components/image_processing/dlib_face_detect.py
    homeassistant/components/image_processing/dlib_face_identify.py
    homeassistant/components/image_processing/seven_segments.py
+    homeassistant/components/image_processing/tensorflow.py
    homeassistant/components/keyboard_remote.py
    homeassistant/components/keyboard.py
    homeassistant/components/light/avion.py
@@ -561,6 +572,7 @@ omit =
    homeassistant/components/media_player/itunes.py
    homeassistant/components/media_player/kodi.py
    homeassistant/components/media_player/lg_netcast.py
+    homeassistant/components/media_player/lg_soundbar.py    
    homeassistant/components/media_player/liveboxplaytv.py
    homeassistant/components/media_player/mediaroom.py
    homeassistant/components/media_player/mpchc.py
@@ -604,6 +616,7 @@ omit =
    homeassistant/components/notify/gntp.py
    homeassistant/components/notify/group.py
    homeassistant/components/notify/hipchat.py
+    homeassistant/components/notify/homematic.py
    homeassistant/components/notify/instapush.py
    homeassistant/components/notify/kodi.py
    homeassistant/components/notify/lannouncer.py
@@ -636,6 +649,7 @@ omit =
    homeassistant/components/remember_the_milk/__init__.py
    homeassistant/components/remote/harmony.py
    homeassistant/components/remote/itach.py
+    homeassistant/components/route53.py
    homeassistant/components/scene/hunterdouglas_powerview.py
    homeassistant/components/scene/lifx_cloud.py
    homeassistant/components/sensor/airvisual.py
@@ -712,6 +726,7 @@ omit =
    homeassistant/components/sensor/luftdaten.py
    homeassistant/components/sensor/lyft.py
    homeassistant/components/sensor/magicseaweed.py
+    homeassistant/components/sensor/meteo_france.py
    homeassistant/components/sensor/metoffice.py
    homeassistant/components/sensor/miflora.py
    homeassistant/components/sensor/mitemp_bt.py
@@ -747,8 +762,8 @@ omit =
    homeassistant/components/sensor/radarr.py
    homeassistant/components/sensor/rainbird.py
    homeassistant/components/sensor/ripple.py
+    homeassistant/components/sensor/rtorrent.py
    homeassistant/components/sensor/scrape.py
-    homeassistant/components/sensor/sense.py
    homeassistant/components/sensor/sensehat.py
    homeassistant/components/sensor/serial_pm.py
    homeassistant/components/sensor/serial.py
@@ -776,6 +791,7 @@ omit =
    homeassistant/components/sensor/tank_utility.py
    homeassistant/components/sensor/ted5000.py
    homeassistant/components/sensor/temper.py
+    homeassistant/components/sensor/thermoworks_smoke.py
    homeassistant/components/sensor/time_date.py
    homeassistant/components/sensor/torque.py
    homeassistant/components/sensor/trafikverket_weatherstation.py
@@ -816,6 +832,7 @@ omit =
    homeassistant/components/switch/pulseaudio_loopback.py
    homeassistant/components/switch/rainbird.py
    homeassistant/components/switch/rest.py
+    homeassistant/components/switch/recswitch.py
    homeassistant/components/switch/rpi_rf.py
    homeassistant/components/switch/snmp.py
    homeassistant/components/switch/switchbot.py
@@ -832,6 +849,7 @@ omit =
    homeassistant/components/tts/picotts.py
    homeassistant/components/vacuum/mqtt.py
    homeassistant/components/vacuum/roomba.py
+    homeassistant/components/water_heater/econet.py
    homeassistant/components/watson_iot.py
    homeassistant/components/weather/bom.py
    homeassistant/components/weather/buienradar.py
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -0,0 +1,10 @@
+# .readthedocs.yml
+
+build:
+  image: latest
+
+python:
+  version: 3.6
+  setup_py_install: true
+
+requirements_file: requirements_docs.txt
--- a/145
+++ b/145
@@ -2,62 +2,75 @@
 # when the code that they own is touched.
 # https://github.com/blog/2392-introducing-code-owners

+# Home Assistant Core
 setup.py @home-assistant/core
 homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
 homeassistant/components/api.py @home-assistant/core
+homeassistant/components/auth/* @home-assistant/core
 homeassistant/components/automation/* @home-assistant/core
+homeassistant/components/cloud/* @home-assistant/core
+homeassistant/components/config/* @home-assistant/core
 homeassistant/components/configurator.py @home-assistant/core
-homeassistant/components/group.py @home-assistant/core
+homeassistant/components/conversation/* @home-assistant/core
+homeassistant/components/frontend/* @home-assistant/core
+homeassistant/components/group/* @home-assistant/core
 homeassistant/components/history.py @home-assistant/core
 homeassistant/components/http/* @home-assistant/core
 homeassistant/components/input_*.py @home-assistant/core
 homeassistant/components/introduction.py @home-assistant/core
 homeassistant/components/logger.py @home-assistant/core
+homeassistant/components/lovelace/* @home-assistant/core
 homeassistant/components/mqtt/* @home-assistant/core
 homeassistant/components/panel_custom.py @home-assistant/core
 homeassistant/components/panel_iframe.py @home-assistant/core
-homeassistant/components/persistent_notification.py @home-assistant/core
+homeassistant/components/onboarding/* @home-assistant/core
+homeassistant/components/persistent_notification/* @home-assistant/core
 homeassistant/components/scene/__init__.py @home-assistant/core
 homeassistant/components/scene/hass.py @home-assistant/core
 homeassistant/components/script.py @home-assistant/core
 homeassistant/components/shell_command.py @home-assistant/core
 homeassistant/components/sun.py @home-assistant/core
 homeassistant/components/updater.py @home-assistant/core
-homeassistant/components/weblink.py @home-assistant/core
+homeassistant/components/weblink/* @home-assistant/core
 homeassistant/components/websocket_api.py @home-assistant/core
-homeassistant/components/zone.py @home-assistant/core
+homeassistant/components/zone/* @home-assistant/core

-# HomeAssistant developer Teams
+# Home Assistant Developer Teams
 Dockerfile @home-assistant/docker
 virtualization/Docker/* @home-assistant/docker

 homeassistant/components/zwave/* @home-assistant/z-wave
 homeassistant/components/*/zwave.py @home-assistant/z-wave

-homeassistant/components/hassio.py @home-assistant/hassio
+homeassistant/components/hassio/* @home-assistant/hassio

-# Individual components
+# Individual platforms
 homeassistant/components/alarm_control_panel/egardia.py @jeroenterheerdt
 homeassistant/components/alarm_control_panel/manual_mqtt.py @colinodell
-homeassistant/components/alarm_control_panel/simplisafe.py @bachya
 homeassistant/components/binary_sensor/hikvision.py @mezz64
-homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
+homeassistant/components/binary_sensor/threshold.py @fabaff
 homeassistant/components/camera/yi.py @bachya
 homeassistant/components/climate/ephember.py @ttroy50
 homeassistant/components/climate/eq3btsmart.py @rytilahti
+homeassistant/components/climate/mill.py @danielhiversen
 homeassistant/components/climate/sensibo.py @andrey-git
+homeassistant/components/cover/brunt.py @eavanvalkenburg
 homeassistant/components/cover/group.py @cdce8p
 homeassistant/components/cover/template.py @PhracturedBlue
+homeassistant/components/device_tracker/asuswrt.py @kennedyshead
 homeassistant/components/device_tracker/automatic.py @armills
 homeassistant/components/device_tracker/huawei_router.py @abmantis
+homeassistant/components/device_tracker/quantum_gateway.py @cisasteelersfan
 homeassistant/components/device_tracker/tile.py @bachya
+homeassistant/components/device_tracker/bt_smarthub.py @jxwolstenholme
 homeassistant/components/history_graph.py @andrey-git
-homeassistant/components/light/lifx.py @amelchio
+homeassistant/components/influx.py @fabaff
 homeassistant/components/light/lifx_legacy.py @amelchio
 homeassistant/components/light/tplink.py @rytilahti
 homeassistant/components/light/yeelight.py @rytilahti
+homeassistant/components/light/yeelightsunflower.py @lindsaymarkward
 homeassistant/components/lock/nello.py @pschmitt
 homeassistant/components/lock/nuki.py @pschmitt
 homeassistant/components/media_player/emby.py @mezz64
@@ -65,74 +78,178 @@ homeassistant/components/media_player/kodi.py @armills
 homeassistant/components/media_player/liveboxplaytv.py @pschmitt
 homeassistant/components/media_player/mediaroom.py @dgomes
 homeassistant/components/media_player/monoprice.py @etsinko
+homeassistant/components/media_player/mpd.py @fabaff
 homeassistant/components/media_player/sonos.py @amelchio
 homeassistant/components/media_player/xiaomi_tv.py @fattdev
 homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
+homeassistant/components/no_ip.py @fabaff
+homeassistant/components/notify/file.py @fabaff
+homeassistant/components/notify/flock.py @fabaff
+homeassistant/components/notify/instapush.py @fabaff
+homeassistant/components/notify/mastodon.py @fabaff
+homeassistant/components/notify/smtp.py @fabaff
+homeassistant/components/notify/syslog.py @fabaff
+homeassistant/components/notify/xmpp.py @fabaff
+homeassistant/components/notify/yessssms.py @flowolf
 homeassistant/components/plant.py @ChristianKuehnel
 homeassistant/components/scene/lifx_cloud.py @amelchio
 homeassistant/components/sensor/airvisual.py @bachya
+homeassistant/components/sensor/alpha_vantage.py @fabaff
+homeassistant/components/sensor/bitcoin.py @fabaff
+homeassistant/components/sensor/cpuspeed.py @fabaff
+homeassistant/components/sensor/cups.py @fabaff
+homeassistant/components/sensor/darksky.py @fabaff
+homeassistant/components/sensor/file.py @fabaff
 homeassistant/components/sensor/filter.py @dgomes
+homeassistant/components/sensor/fixer.py @fabaff
 homeassistant/components/sensor/gearbest.py @HerrHofrat
+homeassistant/components/sensor/gitter.py @fabaff
+homeassistant/components/sensor/glances.py @fabaff
+homeassistant/components/sensor/gpsd.py @fabaff
 homeassistant/components/sensor/irish_rail_transport.py @ttroy50
 homeassistant/components/sensor/jewish_calendar.py @tsvi
+homeassistant/components/sensor/linux_battery.py @fabaff
+homeassistant/components/sensor/luftdaten.py @fabaff
 homeassistant/components/sensor/miflora.py @danielhiversen @ChristianKuehnel
+homeassistant/components/sensor/min_max.py @fabaff
+homeassistant/components/sensor/moon.py @fabaff
+homeassistant/components/sensor/netdata.py @fabaff
 homeassistant/components/sensor/nsw_fuel_station.py @nickw444
+homeassistant/components/sensor/pi_hole.py @fabaff
 homeassistant/components/sensor/pollen.py @bachya
+homeassistant/components/sensor/pvoutput.py @fabaff
 homeassistant/components/sensor/qnap.py @colinodell
+homeassistant/components/sensor/scrape.py @fabaff
+homeassistant/components/sensor/serial.py @fabaff
+homeassistant/components/sensor/shodan.py @fabaff
 homeassistant/components/sensor/sma.py @kellerza
 homeassistant/components/sensor/sql.py @dgomes
+homeassistant/components/sensor/statistics.py @fabaff
+homeassistant/components/sensor/swiss*.py @fabaff
 homeassistant/components/sensor/sytadin.py @gautric
+homeassistant/components/sensor/time_data.py @fabaff
+homeassistant/components/sensor/version.py @fabaff
 homeassistant/components/sensor/waqi.py @andrey-git
+homeassistant/components/sensor/worldclock.py @fabaff
+homeassistant/components/shiftr.py @fabaff
+homeassistant/components/spaceapi.py @fabaff
 homeassistant/components/switch/tplink.py @rytilahti
 homeassistant/components/vacuum/roomba.py @pschmitt
+homeassistant/components/weather/__init__.py @fabaff
+homeassistant/components/weather/darksky.py @fabaff
+homeassistant/components/weather/demo.py @fabaff
+homeassistant/components/weather/met.py @danielhiversen
+homeassistant/components/weather/openweathermap.py @fabaff
 homeassistant/components/xiaomi_aqara.py @danielhiversen @syssi

+# A
+homeassistant/components/arduino.py @fabaff
+homeassistant/components/*/arduino.py @fabaff
+homeassistant/components/*/arest.py @fabaff
 homeassistant/components/*/axis.py @kane610
+
+# B
 homeassistant/components/blink/* @fronzbot
 homeassistant/components/*/blink.py @fronzbot
+homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/broadlink.py @danielhiversen
+
+# C
+homeassistant/components/counter/* @fabaff
+
+# D
 homeassistant/components/*/deconz.py @kane610
+homeassistant/components/digital_ocean.py @fabaff
+homeassistant/components/*/digital_ocean.py @fabaff
+homeassistant/components/dweet.py @fabaff
+homeassistant/components/*/dweet.py @fabaff
+
+# E
 homeassistant/components/ecovacs.py @OverloadUT
 homeassistant/components/*/ecovacs.py @OverloadUT
-homeassistant/components/edp_redy.py @abmantis
 homeassistant/components/*/edp_redy.py @abmantis
+homeassistant/components/edp_redy.py @abmantis
 homeassistant/components/eight_sleep.py @mezz64
 homeassistant/components/*/eight_sleep.py @mezz64
+
+# H
 homeassistant/components/hive.py @Rendili @KJonline
 homeassistant/components/*/hive.py @Rendili @KJonline
 homeassistant/components/homekit/* @cdce8p
 homeassistant/components/huawei_lte.py @scop
 homeassistant/components/*/huawei_lte.py @scop
+
+# K
 homeassistant/components/knx.py @Julius2342
 homeassistant/components/*/knx.py @Julius2342
 homeassistant/components/konnected.py @heythisisnate
 homeassistant/components/*/konnected.py @heythisisnate
+
+# L
+homeassistant/components/lifx.py @amelchio
+homeassistant/components/*/lifx.py @amelchio
+
+# M
 homeassistant/components/matrix.py @tinloaf
 homeassistant/components/*/matrix.py @tinloaf
+homeassistant/components/melissa.py @kennedyshead
+homeassistant/components/*/melissa.py @kennedyshead
+homeassistant/components/*/mystrom.py @fabaff
+
+# O
 homeassistant/components/openuv/* @bachya
 homeassistant/components/*/openuv.py @bachya
+
+# Q
 homeassistant/components/qwikswitch.py @kellerza
 homeassistant/components/*/qwikswitch.py @kellerza
+
+# R
 homeassistant/components/rainmachine/* @bachya
 homeassistant/components/*/rainmachine.py @bachya
+homeassistant/components/*/random.py @fabaff
 homeassistant/components/*/rfxtrx.py @danielhiversen
+
+# S
+homeassistant/components/simplisafe/* @bachya
+homeassistant/components/*/simplisafe.py @bachya
+
+# T
 homeassistant/components/tahoma.py @philklei
 homeassistant/components/*/tahoma.py @philklei
-homeassistant/components/tesla.py @zabuldon
-homeassistant/components/*/tesla.py @zabuldon
 homeassistant/components/tellduslive.py @molobrakos @fredrike
 homeassistant/components/*/tellduslive.py @molobrakos @fredrike
+homeassistant/components/tesla.py @zabuldon
+homeassistant/components/*/tesla.py @zabuldon
+homeassistant/components/thethingsnetwork.py @fabaff
+homeassistant/components/*/thethingsnetwork.py @fabaff
 homeassistant/components/tibber/* @danielhiversen
 homeassistant/components/*/tibber.py @danielhiversen
+homeassistant/components/tradfri/* @ggravlingen
 homeassistant/components/*/tradfri.py @ggravlingen
+
+# U
+homeassistant/components/unifi.py @kane610
+homeassistant/components/switch/unifi.py @kane610
 homeassistant/components/upcloud.py @scop
 homeassistant/components/*/upcloud.py @scop
+
+# V
 homeassistant/components/velux.py @Julius2342
 homeassistant/components/*/velux.py @Julius2342
+
+# W
+homeassistant/components/wemo.py @sqldiablo
+homeassistant/components/*/wemo.py @sqldiablo
+
+# X
 homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi
 homeassistant/components/*/xiaomi_miio.py @rytilahti @syssi
-homeassistant/components/zoneminder.py @rohankapoorcom
+
+# Z
+homeassistant/components/zoneminder/ @rohankapoorcom
 homeassistant/components/*/zoneminder.py @rohankapoorcom

+# Other code
 homeassistant/scripts/check_config.py @kellerza
--- a/3
+++ b/3
@@ -11,6 +11,7 @@ LABEL maintainer="Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>"
 #ENV INSTALL_FFMPEG no
 #ENV INSTALL_LIBCEC no
 #ENV INSTALL_SSOCR no
+#ENV INSTALL_DLIB no
 #ENV INSTALL_IPERF3 no

 VOLUME /config
@@ -27,7 +28,7 @@ COPY requirements_all.txt requirements_all.txt
 # Uninstall enum34 because some dependencies install it but breaks Python 3.4+.
 # See PR #8103 for more info.
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop cchardet cython
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop cchardet cython tensorflow

 # Copy source
 COPY . .
--- a/homeassistant/auth/init.py
+++ b/homeassistant/auth/init.py
@@ -16,6 +16,9 @@ from . import auth_store, models
 from .mfa_modules import auth_mfa_module_from_config, MultiFactorAuthModule
 from .providers import auth_provider_from_config, AuthProvider, LoginFlow

+EVENT_USER_ADDED = 'user_added'
+EVENT_USER_REMOVED = 'user_removed'
+
 _LOGGER = logging.getLogger(__name__)
 _MfaModuleDict = Dict[str, MultiFactorAuthModule]
 _ProviderKey = Tuple[str, Optional[str]]
@@ -126,23 +129,38 @@ class AuthManager:

    async def async_create_system_user(self, name: str) -> models.User:
        """Create a system user."""
-        return await self._store.async_create_user(
+        user = await self._store.async_create_user(
            name=name,
            system_generated=True,
            is_active=True,
+            groups=[],
        )

+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user
+
    async def async_create_user(self, name: str) -> models.User:
        """Create a user."""
+        group = (await self._store.async_get_groups())[0]
        kwargs = {
            'name': name,
            'is_active': True,
+            'groups': [group]
        }  # type: Dict[str, Any]

        if await self._user_should_be_owner():
            kwargs['is_owner'] = True

-        return await self._store.async_create_user(**kwargs)
+        user = await self._store.async_create_user(**kwargs)
+
+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user

    async def async_get_or_create_user(self, credentials: models.Credentials) \
            -> models.User:
@@ -162,12 +180,18 @@ class AuthManager:
        info = await auth_provider.async_user_meta_for_credentials(
            credentials)

-        return await self._store.async_create_user(
+        user = await self._store.async_create_user(
            credentials=credentials,
            name=info.name,
            is_active=info.is_active,
        )

+        self.hass.bus.async_fire(EVENT_USER_ADDED, {
+            'user_id': user.id
+        })
+
+        return user
+
    async def async_link_user(self, user: models.User,
                              credentials: models.Credentials) -> None:
        """Link credentials to an existing user."""
@@ -185,6 +209,10 @@ class AuthManager:

        await self._store.async_remove_user(user)

+        self.hass.bus.async_fire(EVENT_USER_REMOVED, {
+            'user_id': user.id
+        })
+
    async def async_activate_user(self, user: models.User) -> None:
        """Activate a user."""
        await self._store.async_activate_user(user)
@@ -314,7 +342,6 @@ class AuthManager:
        """Create a new access token."""
        self._store.async_log_refresh_token_usage(refresh_token, remote_ip)

-        # pylint: disable=no-self-use
        now = dt_util.utcnow()
        return jwt.encode({
            'iss': refresh_token.id,
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -10,9 +10,11 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.util import dt as dt_util

 from . import models
+from .permissions import DEFAULT_POLICY

 STORAGE_VERSION = 1
 STORAGE_KEY = 'auth'
+INITIAL_GROUP_NAME = 'All Access'


 class AuthStore:
@@ -28,9 +30,18 @@ class AuthStore:
        """Initialize the auth store."""
        self.hass = hass
        self._users = None  # type: Optional[Dict[str, models.User]]
+        self._groups = None  # type: Optional[Dict[str, models.Group]]
        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY,
                                                 private=True)

+    async def async_get_groups(self) -> List[models.Group]:
+        """Retrieve all users."""
+        if self._groups is None:
+            await self._async_load()
+            assert self._groups is not None
+
+        return list(self._groups.values())
+
    async def async_get_users(self) -> List[models.User]:
        """Retrieve all users."""
        if self._users is None:
@@ -51,14 +62,20 @@ class AuthStore:
            self, name: Optional[str], is_owner: Optional[bool] = None,
            is_active: Optional[bool] = None,
            system_generated: Optional[bool] = None,
-            credentials: Optional[models.Credentials] = None) -> models.User:
+            credentials: Optional[models.Credentials] = None,
+            groups: Optional[List[models.Group]] = None) -> models.User:
        """Create a new user."""
        if self._users is None:
            await self._async_load()
-            assert self._users is not None
+
+        assert self._users is not None
+        assert self._groups is not None

        kwargs = {
-            'name': name
+            'name': name,
+            # Until we get group management, we just put everyone in the
+            # same group.
+            'groups': groups or [],
        }  # type: Dict[str, Any]

        if is_owner is not None:
@@ -219,19 +236,40 @@ class AuthStore:
            return

        users = OrderedDict()  # type: Dict[str, models.User]
+        groups = OrderedDict()  # type: Dict[str, models.Group]

        # When creating objects we mention each attribute explicetely. This
        # prevents crashing if user rolls back HA version after a new property
        # was added.

+        for group_dict in data.get('groups', []):
+            groups[group_dict['id']] = models.Group(
+                name=group_dict['name'],
+                id=group_dict['id'],
+                policy=group_dict.get('policy', DEFAULT_POLICY),
+            )
+
+        migrate_group = None
+
+        if not groups:
+            migrate_group = models.Group(
+                name=INITIAL_GROUP_NAME,
+                policy=DEFAULT_POLICY
+            )
+            groups[migrate_group.id] = migrate_group
+
        for user_dict in data['users']:
            users[user_dict['id']] = models.User(
                name=user_dict['name'],
+                groups=[groups[group_id] for group_id
+                        in user_dict.get('group_ids', [])],
                id=user_dict['id'],
                is_owner=user_dict['is_owner'],
                is_active=user_dict['is_active'],
                system_generated=user_dict['system_generated'],
            )
+            if migrate_group is not None and not user_dict['system_generated']:
+                users[user_dict['id']].groups = [migrate_group]

        for cred_dict in data['credentials']:
            users[cred_dict['user_id']].credentials.append(models.Credentials(
@@ -286,6 +324,7 @@ class AuthStore:
            )
            users[rt_dict['user_id']].refresh_tokens[token.id] = token

+        self._groups = groups
        self._users = users

    @callback
@@ -300,10 +339,12 @@ class AuthStore:
    def _data_to_save(self) -> Dict:
        """Return the data to store."""
        assert self._users is not None
+        assert self._groups is not None

        users = [
            {
                'id': user.id,
+                'group_ids': [group.id for group in user.groups],
                'is_owner': user.is_owner,
                'is_active': user.is_active,
                'name': user.name,
@@ -312,6 +353,18 @@ class AuthStore:
            for user in self._users.values()
        ]

+        groups = []
+        for group in self._groups.values():
+            g_dict = {
+                'name': group.name,
+                'id': group.id,
+            }  # type: Dict[str, Any]
+
+            if group.policy is not DEFAULT_POLICY:
+                g_dict['policy'] = group.policy
+
+            groups.append(g_dict)
+
        credentials = [
            {
                'id': credential.id,
@@ -348,6 +401,7 @@ class AuthStore:

        return {
            'users': users,
+            'groups': groups,
            'credentials': credentials,
            'refresh_tokens': refresh_tokens,
        }
@@ -355,3 +409,14 @@ class AuthStore:
    def _set_defaults(self) -> None:
        """Set default values for auth store."""
        self._users = OrderedDict()  # type: Dict[str, models.User]
+
+        # Add default group
+        all_access_group = models.Group(
+            name=INITIAL_GROUP_NAME,
+            policy=DEFAULT_POLICY,
+        )
+
+        groups = OrderedDict()  # type: Dict[str, models.Group]
+        groups[all_access_group.id] = all_access_group
+
+        self._groups = groups
--- a/homeassistant/auth/mfa_modules/init.py
+++ b/homeassistant/auth/mfa_modules/init.py
@@ -104,7 +104,7 @@ class SetupFlow(data_entry_flow.FlowHandler):
            -> Dict[str, Any]:
        """Handle the first step of setup flow.

-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
        Return self.async_create_entry(data={'result': result}) if finish.
        """
        errors = {}  # type: Dict[str, str]
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -176,7 +176,7 @@ class TotpSetupFlow(SetupFlow):
            -> Dict[str, Any]:
        """Handle the first step of setup flow.

-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
        Return self.async_create_entry(data={'result': result}) if finish.
        """
        import pyotp
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -7,6 +7,7 @@ import attr

 from homeassistant.util import dt as dt_util

+from . import permissions as perm_mdl
 from .util import generate_secret

 TOKEN_TYPE_NORMAL = 'normal'
@@ -14,6 +15,15 @@ TOKEN_TYPE_SYSTEM = 'system'
 TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = 'long_lived_access_token'


+@attr.s(slots=True)
+class Group:
+    """A group."""
+
+    name = attr.ib(type=str)  # type: Optional[str]
+    policy = attr.ib(type=perm_mdl.PolicyType)
+    id = attr.ib(type=str, factory=lambda: uuid.uuid4().hex)
+
+
@attr.s(slots=True)
 class User:
    """A user."""
@@ -24,6 +34,8 @@ class User:
    is_active = attr.ib(type=bool, default=False)
    system_generated = attr.ib(type=bool, default=False)

+    groups = attr.ib(type=List, factory=list, cmp=False)  # type: List[Group]
+
    # List of credentials of a user.
    credentials = attr.ib(
        type=list, factory=list, cmp=False
@@ -34,6 +46,28 @@ class User:
        type=dict, factory=dict, cmp=False
    )  # type: Dict[str, RefreshToken]

+    _permissions = attr.ib(
+        type=perm_mdl.PolicyPermissions,
+        init=False,
+        cmp=False,
+        default=None,
+    )
+
+    @property
+    def permissions(self) -> perm_mdl.AbstractPermissions:
+        """Return permissions object for user."""
+        if self.is_owner:
+            return perm_mdl.OwnerPermissions
+
+        if self._permissions is not None:
+            return self._permissions
+
+        self._permissions = perm_mdl.PolicyPermissions(
+            perm_mdl.merge_policies([
+                group.policy for group in self.groups]))
+
+        return self._permissions
+

@attr.s(slots=True)
 class RefreshToken:
--- a/homeassistant/auth/permissions/init.py
+++ b/homeassistant/auth/permissions/init.py
@@ -0,0 +1,97 @@
+"""Permissions for Home Assistant."""
+import logging
+from typing import (  # noqa: F401
+    cast, Any, Callable, Dict, List, Mapping, Set, Tuple, Union)
+
+import voluptuous as vol
+
+from homeassistant.core import State
+
+from .common import CategoryType, PolicyType
+from .entities import ENTITY_POLICY_SCHEMA, compile_entities
+from .merge import merge_policies  # noqa
+
+
+# Default policy if group has no policy applied.
+DEFAULT_POLICY = {
+    "entities": True
+}  # type: PolicyType
+
+CAT_ENTITIES = 'entities'
+
+POLICY_SCHEMA = vol.Schema({
+    vol.Optional(CAT_ENTITIES): ENTITY_POLICY_SCHEMA
+})
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AbstractPermissions:
+    """Default permissions class."""
+
+    def check_entity(self, entity_id: str, key: str) -> bool:
+        """Test if we can access entity."""
+        raise NotImplementedError
+
+    def filter_states(self, states: List[State]) -> List[State]:
+        """Filter a list of states for what the user is allowed to see."""
+        raise NotImplementedError
+
+
+class PolicyPermissions(AbstractPermissions):
+    """Handle permissions."""
+
+    def __init__(self, policy: PolicyType) -> None:
+        """Initialize the permission class."""
+        self._policy = policy
+        self._compiled = {}  # type: Dict[str, Callable[..., bool]]
+
+    def check_entity(self, entity_id: str, key: str) -> bool:
+        """Test if we can access entity."""
+        func = self._policy_func(CAT_ENTITIES, compile_entities)
+        return func(entity_id, (key,))
+
+    def filter_states(self, states: List[State]) -> List[State]:
+        """Filter a list of states for what the user is allowed to see."""
+        func = self._policy_func(CAT_ENTITIES, compile_entities)
+        keys = ('read',)
+        return [entity for entity in states if func(entity.entity_id, keys)]
+
+    def _policy_func(self, category: str,
+                     compile_func: Callable[[CategoryType], Callable]) \
+            -> Callable[..., bool]:
+        """Get a policy function."""
+        func = self._compiled.get(category)
+
+        if func:
+            return func
+
+        func = self._compiled[category] = compile_func(
+            self._policy.get(category))
+
+        _LOGGER.debug("Compiled %s func: %s", category, func)
+
+        return func
+
+    def __eq__(self, other: Any) -> bool:
+        """Equals check."""
+        # pylint: disable=protected-access
+        return (isinstance(other, PolicyPermissions) and
+                other._policy == self._policy)
+
+
+class _OwnerPermissions(AbstractPermissions):
+    """Owner permissions."""
+
+    # pylint: disable=no-self-use
+
+    def check_entity(self, entity_id: str, key: str) -> bool:
+        """Test if we can access entity."""
+        return True
+
+    def filter_states(self, states: List[State]) -> List[State]:
+        """Filter a list of states for what the user is allowed to see."""
+        return states
+
+
+OwnerPermissions = _OwnerPermissions()  # pylint: disable=invalid-name
--- a/homeassistant/auth/permissions/common.py
+++ b/homeassistant/auth/permissions/common.py
@@ -0,0 +1,33 @@
+"""Common code for permissions."""
+from typing import (  # noqa: F401
+    Mapping, Union, Any)
+
+# MyPy doesn't support recursion yet. So writing it out as far as we need.
+
+ValueType = Union[
+    # Example: entities.all = { read: true, control: true }
+    Mapping[str, bool],
+    bool,
+    None
+]
+
+SubCategoryType = Union[
+    # Example: entities.domains = { light: … }
+    Mapping[str, ValueType],
+    bool,
+    None
+]
+
+CategoryType = Union[
+    # Example: entities.domains
+    Mapping[str, SubCategoryType],
+    # Example: entities.all
+    Mapping[str, ValueType],
+    bool,
+    None
+]
+
+# Example: { entities: … }
+PolicyType = Mapping[str, CategoryType]
+
+SUBCAT_ALL = 'all'
--- a/homeassistant/auth/permissions/entities.py
+++ b/homeassistant/auth/permissions/entities.py
@@ -0,0 +1,149 @@
+"""Entity permissions."""
+from functools import wraps
+from typing import (  # noqa: F401
+    Callable, Dict, List, Tuple, Union)
+
+import voluptuous as vol
+
+from .common import CategoryType, ValueType, SUBCAT_ALL
+
+
+POLICY_READ = 'read'
+POLICY_CONTROL = 'control'
+POLICY_EDIT = 'edit'
+
+SINGLE_ENTITY_SCHEMA = vol.Any(True, vol.Schema({
+    vol.Optional(POLICY_READ): True,
+    vol.Optional(POLICY_CONTROL): True,
+    vol.Optional(POLICY_EDIT): True,
+}))
+
+ENTITY_DOMAINS = 'domains'
+ENTITY_ENTITY_IDS = 'entity_ids'
+
+ENTITY_VALUES_SCHEMA = vol.Any(True, vol.Schema({
+    str: SINGLE_ENTITY_SCHEMA
+}))
+
+ENTITY_POLICY_SCHEMA = vol.Any(True, vol.Schema({
+    vol.Optional(SUBCAT_ALL): SINGLE_ENTITY_SCHEMA,
+    vol.Optional(ENTITY_DOMAINS): ENTITY_VALUES_SCHEMA,
+    vol.Optional(ENTITY_ENTITY_IDS): ENTITY_VALUES_SCHEMA,
+}))
+
+
+def _entity_allowed(schema: ValueType, keys: Tuple[str]) \
+        -> Union[bool, None]:
+    """Test if an entity is allowed based on the keys."""
+    if schema is None or isinstance(schema, bool):
+        return schema
+    assert isinstance(schema, dict)
+    return schema.get(keys[0])
+
+
+def compile_entities(policy: CategoryType) \
+        -> Callable[[str, Tuple[str]], bool]:
+    """Compile policy into a function that tests policy."""
+    # None, Empty Dict, False
+    if not policy:
+        def apply_policy_deny_all(entity_id: str, keys: Tuple[str]) -> bool:
+            """Decline all."""
+            return False
+
+        return apply_policy_deny_all
+
+    if policy is True:
+        def apply_policy_allow_all(entity_id: str, keys: Tuple[str]) -> bool:
+            """Approve all."""
+            return True
+
+        return apply_policy_allow_all
+
+    assert isinstance(policy, dict)
+
+    domains = policy.get(ENTITY_DOMAINS)
+    entity_ids = policy.get(ENTITY_ENTITY_IDS)
+    all_entities = policy.get(SUBCAT_ALL)
+
+    funcs = []  # type: List[Callable[[str, Tuple[str]], Union[None, bool]]]
+
+    # The order of these functions matter. The more precise are at the top.
+    # If a function returns None, they cannot handle it.
+    # If a function returns a boolean, that's the result to return.
+
+    # Setting entity_ids to a boolean is final decision for permissions
+    # So return right away.
+    if isinstance(entity_ids, bool):
+        def allowed_entity_id_bool(entity_id: str, keys: Tuple[str]) -> bool:
+            """Test if allowed entity_id."""
+            return entity_ids  # type: ignore
+
+        return allowed_entity_id_bool
+
+    if entity_ids is not None:
+        def allowed_entity_id_dict(entity_id: str, keys: Tuple[str]) \
+                -> Union[None, bool]:
+            """Test if allowed entity_id."""
+            return _entity_allowed(
+                entity_ids.get(entity_id), keys)  # type: ignore
+
+        funcs.append(allowed_entity_id_dict)
+
+    if isinstance(domains, bool):
+        def allowed_domain_bool(entity_id: str, keys: Tuple[str]) \
+                -> Union[None, bool]:
+            """Test if allowed domain."""
+            return domains
+
+        funcs.append(allowed_domain_bool)
+
+    elif domains is not None:
+        def allowed_domain_dict(entity_id: str, keys: Tuple[str]) \
+                -> Union[None, bool]:
+            """Test if allowed domain."""
+            domain = entity_id.split(".", 1)[0]
+            return _entity_allowed(domains.get(domain), keys)  # type: ignore
+
+        funcs.append(allowed_domain_dict)
+
+    if isinstance(all_entities, bool):
+        def allowed_all_entities_bool(entity_id: str, keys: Tuple[str]) \
+                -> Union[None, bool]:
+            """Test if allowed domain."""
+            return all_entities
+        funcs.append(allowed_all_entities_bool)
+
+    elif all_entities is not None:
+        def allowed_all_entities_dict(entity_id: str, keys: Tuple[str]) \
+                -> Union[None, bool]:
+            """Test if allowed domain."""
+            return _entity_allowed(all_entities, keys)
+        funcs.append(allowed_all_entities_dict)
+
+    # Can happen if no valid subcategories specified
+    if not funcs:
+        def apply_policy_deny_all_2(entity_id: str, keys: Tuple[str]) -> bool:
+            """Decline all."""
+            return False
+
+        return apply_policy_deny_all_2
+
+    if len(funcs) == 1:
+        func = funcs[0]
+
+        @wraps(func)
+        def apply_policy_func(entity_id: str, keys: Tuple[str]) -> bool:
+            """Apply a single policy function."""
+            return func(entity_id, keys) is True
+
+        return apply_policy_func
+
+    def apply_policy_funcs(entity_id: str, keys: Tuple[str]) -> bool:
+        """Apply several policy functions."""
+        for func in funcs:
+            result = func(entity_id, keys)
+            if result is not None:
+                return result
+        return False
+
+    return apply_policy_funcs
--- a/homeassistant/auth/permissions/merge.py
+++ b/homeassistant/auth/permissions/merge.py
@@ -0,0 +1,65 @@
+"""Merging of policies."""
+from typing import (  # noqa: F401
+    cast, Dict, List, Set)
+
+from .common import PolicyType, CategoryType
+
+
+def merge_policies(policies: List[PolicyType]) -> PolicyType:
+    """Merge policies."""
+    new_policy = {}  # type: Dict[str, CategoryType]
+    seen = set()  # type: Set[str]
+    for policy in policies:
+        for category in policy:
+            if category in seen:
+                continue
+            seen.add(category)
+            new_policy[category] = _merge_policies([
+                policy.get(category) for policy in policies])
+    cast(PolicyType, new_policy)
+    return new_policy
+
+
+def _merge_policies(sources: List[CategoryType]) -> CategoryType:
+    """Merge a policy."""
+    # When merging policies, the most permissive wins.
+    # This means we order it like this:
+    # True > Dict > None
+    #
+    # True: allow everything
+    # Dict: specify more granular permissions
+    # None: no opinion
+    #
+    # If there are multiple sources with a dict as policy, we recursively
+    # merge each key in the source.
+
+    policy = None  # type: CategoryType
+    seen = set()  # type: Set[str]
+    for source in sources:
+        if source is None:
+            continue
+
+        # A source that's True will always win. Shortcut return.
+        if source is True:
+            return True
+
+        assert isinstance(source, dict)
+
+        if policy is None:
+            policy = cast(CategoryType, {})
+
+        assert isinstance(policy, dict)
+
+        for key in source:
+            if key in seen:
+                continue
+            seen.add(key)
+
+            key_sources = []
+            for src in sources:
+                if isinstance(src, dict):
+                    key_sources.append(src.get(key))
+
+            policy[key] = _merge_policies(key_sources)
+
+    return policy
--- a/homeassistant/auth/providers/init.py
+++ b/homeassistant/auth/providers/init.py
@@ -179,7 +179,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
            -> Dict[str, Any]:
        """Handle the first step of login flow.

-        Return self.async_show_form(step_id='init') if user_input == None.
+        Return self.async_show_form(step_id='init') if user_input is None.
        Return await self.async_finish(flow_result) if login init step pass.
        """
        raise NotImplementedError
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -12,6 +12,8 @@ import itertools as it
 import logging
 from typing import Awaitable

+import voluptuous as vol
+
 import homeassistant.core as ha
 import homeassistant.config as conf_util
 from homeassistant.exceptions import HomeAssistantError
@@ -21,11 +23,16 @@ from homeassistant.const import (
    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
    SERVICE_HOMEASSISTANT_STOP, SERVICE_HOMEASSISTANT_RESTART,
    RESTART_EXIT_CODE)
+from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

 SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
 SERVICE_CHECK_CONFIG = 'check_config'
+SERVICE_UPDATE_ENTITY = 'update_entity'
+SCHEMA_UPDATE_ENTITY = vol.Schema({
+    ATTR_ENTITY_ID: cv.entity_ids
+})


 def is_on(hass, entity_id=None):
@@ -133,12 +140,23 @@ async def async_setup(hass: ha.HomeAssistant, config: dict) -> Awaitable[bool]:
        if call.service == SERVICE_HOMEASSISTANT_RESTART:
            hass.async_create_task(hass.async_stop(RESTART_EXIT_CODE))

+    async def async_handle_update_service(call):
+        """Service handler for updating an entity."""
+        tasks = [hass.helpers.entity_component.async_update_entity(entity)
+                 for entity in call.data[ATTR_ENTITY_ID]]
+
+        if tasks:
+            await asyncio.wait(tasks)
+
    hass.services.async_register(
        ha.DOMAIN, SERVICE_HOMEASSISTANT_STOP, async_handle_core_service)
    hass.services.async_register(
        ha.DOMAIN, SERVICE_HOMEASSISTANT_RESTART, async_handle_core_service)
    hass.services.async_register(
        ha.DOMAIN, SERVICE_CHECK_CONFIG, async_handle_core_service)
+    hass.services.async_register(
+        ha.DOMAIN, SERVICE_UPDATE_ENTITY, async_handle_update_service,
+        schema=SCHEMA_UPDATE_ENTITY)

    async def async_handle_reload_config(call):
        """Service handler for reloading core config."""
--- a/homeassistant/components/abode.py
+++ b/homeassistant/components/abode.py
@@ -18,7 +18,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity

-REQUIREMENTS = ['abodepy==0.13.1']
+REQUIREMENTS = ['abodepy==0.14.0']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/alarm_control_panel/elkm1.py
+++ b/homeassistant/components/alarm_control_panel/elkm1.py
@@ -0,0 +1,204 @@
+"""
+Each ElkM1 area will be created as a separate alarm_control_panel in HASS.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.elkm1/
+"""
+
+import voluptuous as vol
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.const import (
+    ATTR_CODE, ATTR_ENTITY_ID, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_NIGHT, STATE_ALARM_ARMING, STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
+from homeassistant.components.elkm1 import (
+    DOMAIN as ELK_DOMAIN, create_elk_entities, ElkEntity)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect, async_dispatcher_send)
+
+DEPENDENCIES = [ELK_DOMAIN]
+
+SIGNAL_ARM_ENTITY = 'elkm1_arm'
+SIGNAL_DISPLAY_MESSAGE = 'elkm1_display_message'
+
+ELK_ALARM_SERVICE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID, default=[]): cv.entity_ids,
+    vol.Required(ATTR_CODE): vol.All(vol.Coerce(int), vol.Range(0, 999999)),
+})
+
+DISPLAY_MESSAGE_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID, default=[]): cv.entity_ids,
+    vol.Optional('clear', default=2): vol.In([0, 1, 2]),
+    vol.Optional('beep', default=False): cv.boolean,
+    vol.Optional('timeout', default=0): vol.Range(min=0, max=65535),
+    vol.Optional('line1', default=''): cv.string,
+    vol.Optional('line2', default=''): cv.string,
+})
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the ElkM1 alarm platform."""
+    if discovery_info is None:
+        return
+
+    elk = hass.data[ELK_DOMAIN]['elk']
+    entities = create_elk_entities(hass, elk.areas, 'area', ElkArea, [])
+    async_add_entities(entities, True)
+
+    def _dispatch(signal, entity_ids, *args):
+        for entity_id in entity_ids:
+            async_dispatcher_send(
+                hass, '{}_{}'.format(signal, entity_id), *args)
+
+    def _arm_service(service):
+        entity_ids = service.data.get(ATTR_ENTITY_ID, [])
+        arm_level = _arm_services().get(service.service)
+        args = (arm_level, service.data.get(ATTR_CODE))
+        _dispatch(SIGNAL_ARM_ENTITY, entity_ids, *args)
+
+    for service in _arm_services():
+        hass.services.async_register(
+            alarm.DOMAIN, service, _arm_service, ELK_ALARM_SERVICE_SCHEMA)
+
+    def _display_message_service(service):
+        entity_ids = service.data.get(ATTR_ENTITY_ID, [])
+        data = service.data
+        args = (data['clear'], data['beep'], data['timeout'],
+                data['line1'], data['line2'])
+        _dispatch(SIGNAL_DISPLAY_MESSAGE, entity_ids, *args)
+
+    hass.services.async_register(
+        alarm.DOMAIN, 'elkm1_alarm_display_message',
+        _display_message_service, DISPLAY_MESSAGE_SERVICE_SCHEMA)
+
+
+def _arm_services():
+    from elkm1_lib.const import ArmLevel
+
+    return {
+        'elkm1_alarm_arm_vacation': ArmLevel.ARMED_VACATION.value,
+        'elkm1_alarm_arm_home_instant': ArmLevel.ARMED_STAY_INSTANT.value,
+        'elkm1_alarm_arm_night_instant': ArmLevel.ARMED_NIGHT_INSTANT.value,
+    }
+
+
+class ElkArea(ElkEntity, alarm.AlarmControlPanel):
+    """Representation of an Area / Partition within the ElkM1 alarm panel."""
+
+    def __init__(self, element, elk, elk_data):
+        """Initialize Area as Alarm Control Panel."""
+        super().__init__(element, elk, elk_data)
+        self._changed_by_entity_id = ''
+        self._state = None
+
+    async def async_added_to_hass(self):
+        """Register callback for ElkM1 changes."""
+        await super().async_added_to_hass()
+        for keypad in self._elk.keypads:
+            keypad.add_callback(self._watch_keypad)
+        async_dispatcher_connect(
+            self.hass, '{}_{}'.format(SIGNAL_ARM_ENTITY, self.entity_id),
+            self._arm_service)
+        async_dispatcher_connect(
+            self.hass, '{}_{}'.format(SIGNAL_DISPLAY_MESSAGE, self.entity_id),
+            self._display_message)
+
+    def _watch_keypad(self, keypad, changeset):
+        if keypad.area != self._element.index:
+            return
+        if changeset.get('last_user') is not None:
+            self._changed_by_entity_id = self.hass.data[
+                ELK_DOMAIN]['keypads'].get(keypad.index, '')
+            self.async_schedule_update_ha_state(True)
+
+    @property
+    def code_format(self):
+        """Return the alarm code format."""
+        return '^[0-9]{4}([0-9]{2})?$'
+
+    @property
+    def state(self):
+        """Return the state of the element."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Attributes of the area."""
+        from elkm1_lib.const import AlarmState, ArmedStatus, ArmUpState
+
+        attrs = self.initial_attrs()
+        elmt = self._element
+        attrs['is_exit'] = elmt.is_exit
+        attrs['timer1'] = elmt.timer1
+        attrs['timer2'] = elmt.timer2
+        if elmt.armed_status is not None:
+            attrs['armed_status'] = \
+                ArmedStatus(elmt.armed_status).name.lower()
+        if elmt.arm_up_state is not None:
+            attrs['arm_up_state'] = ArmUpState(elmt.arm_up_state).name.lower()
+        if elmt.alarm_state is not None:
+            attrs['alarm_state'] = AlarmState(elmt.alarm_state).name.lower()
+        attrs['changed_by_entity_id'] = self._changed_by_entity_id
+        return attrs
+
+    def _element_changed(self, element, changeset):
+        from elkm1_lib.const import ArmedStatus
+
+        elk_state_to_hass_state = {
+            ArmedStatus.DISARMED.value: STATE_ALARM_DISARMED,
+            ArmedStatus.ARMED_AWAY.value: STATE_ALARM_ARMED_AWAY,
+            ArmedStatus.ARMED_STAY.value: STATE_ALARM_ARMED_HOME,
+            ArmedStatus.ARMED_STAY_INSTANT.value: STATE_ALARM_ARMED_HOME,
+            ArmedStatus.ARMED_TO_NIGHT.value: STATE_ALARM_ARMED_NIGHT,
+            ArmedStatus.ARMED_TO_NIGHT_INSTANT.value: STATE_ALARM_ARMED_NIGHT,
+            ArmedStatus.ARMED_TO_VACATION.value: STATE_ALARM_ARMED_AWAY,
+        }
+
+        if self._element.alarm_state is None:
+            self._state = None
+        elif self._area_is_in_alarm_state():
+            self._state = STATE_ALARM_TRIGGERED
+        elif self._entry_exit_timer_is_running():
+            self._state = STATE_ALARM_ARMING \
+                if self._element.is_exit else STATE_ALARM_PENDING
+        else:
+            self._state = elk_state_to_hass_state[self._element.armed_status]
+
+    def _entry_exit_timer_is_running(self):
+        return self._element.timer1 > 0 or self._element.timer2 > 0
+
+    def _area_is_in_alarm_state(self):
+        from elkm1_lib.const import AlarmState
+
+        return self._element.alarm_state >= AlarmState.FIRE_ALARM.value
+
+    async def async_alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._element.disarm(int(code))
+
+    async def async_alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        from elkm1_lib.const import ArmLevel
+
+        self._element.arm(ArmLevel.ARMED_STAY.value, int(code))
+
+    async def async_alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        from elkm1_lib.const import ArmLevel
+
+        self._element.arm(ArmLevel.ARMED_AWAY.value, int(code))
+
+    async def async_alarm_arm_night(self, code=None):
+        """Send arm night command."""
+        from elkm1_lib.const import ArmLevel
+
+        self._element.arm(ArmLevel.ARMED_NIGHT.value, int(code))
+
+    async def _arm_service(self, arm_level, code):
+        self._element.arm(arm_level, code)
+
+    async def _display_message(self, clear, beep, timeout, line1, line2):
+        """Display a message on all keypads for the area."""
+        self._element.display_message(clear, beep, timeout, line1, line2)
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -21,6 +21,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import track_point_in_time
 import homeassistant.util.dt as dt_util
+from homeassistant.helpers.restore_state import async_get_last_state

 _LOGGER = logging.getLogger(__name__)

@@ -306,3 +307,10 @@ class ManualAlarm(alarm.AlarmControlPanel):
            state_attr[ATTR_POST_PENDING_STATE] = self._state

        return state_attr
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added to hass."""
+        state = await async_get_last_state(self.hass, self.entity_id)
+        if state:
+            self._state = state.state
+            self._state_ts = state.last_updated
--- a/homeassistant/components/alarm_control_panel/services.yaml
+++ b/homeassistant/components/alarm_control_panel/services.yaml
@@ -79,3 +79,55 @@ ifttt_push_alarm_state:
    state:
      description: The state to which the alarm control panel has to be set.
      example: 'armed_night'
+
+elkm1_alarm_arm_vacation:
+  description: Arm the ElkM1 in vacation mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_arm_home_instant:
+  description: Arm the ElkM1 in home instant mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_arm_night_instant:
+  description: Arm the ElkM1 in night instant mode.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm.
+      example: 'alarm_control_panel.main'
+    code:
+      description: An code to arm the alarm control panel.
+      example: 1234
+
+elkm1_alarm_display_message:
+  description: Display a message on all of the ElkM1 keypads for an area.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to display messages on.
+      example: 'alarm_control_panel.main'
+    clear:
+      description: 0=clear message, 1=clear message with * key, 2=Display until timeout; default 2
+      example: 1
+    beep:
+      description: 0=no beep, 1=beep; default 0
+      example: 1
+    timeout:
+      description: Time to display message, 0=forever, max 65535, default 0
+      example: 4242
+    line1:
+      description: Up to 16 characters of text (truncated if too long). Default blank.
+      example: The answer to life,
+    line2:
+      description: Up to 16 characters of text (truncated if too long). Default blank.
+      example: the universe, and everything.
--- a/homeassistant/components/alarm_control_panel/simplisafe.py
+++ b/homeassistant/components/alarm_control_panel/simplisafe.py
@@ -1,5 +1,5 @@
 """
-Interfaces with SimpliSafe alarm control panel.
+This platform provides alarm control functionality for SimpliSafe.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.simplisafe/
@@ -7,86 +7,44 @@ https://home-assistant.io/components/alarm_control_panel.simplisafe/
 import logging
 import re

-import voluptuous as vol
-
-from homeassistant.components.alarm_control_panel import (
-    PLATFORM_SCHEMA, AlarmControlPanel)
+from homeassistant.components.alarm_control_panel import AlarmControlPanel
+from homeassistant.components.simplisafe.const import (
+    DATA_CLIENT, DOMAIN, TOPIC_UPDATE)
 from homeassistant.const import (
-    CONF_CODE, CONF_NAME, CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
-from homeassistant.helpers import aiohttp_client, config_validation as cv
-from homeassistant.util.json import load_json, save_json
-
-REQUIREMENTS = ['simplisafe-python==3.1.2']
+    CONF_CODE, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect

 _LOGGER = logging.getLogger(__name__)

-ATTR_ALARM_ACTIVE = "alarm_active"
-ATTR_TEMPERATURE = "temperature"
-
-DATA_FILE = '.simplisafe'
-
-DEFAULT_NAME = 'SimpliSafe'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_CODE): cv.string,
-})
+ATTR_ALARM_ACTIVE = 'alarm_active'
+ATTR_TEMPERATURE = 'temperature'


 async def async_setup_platform(
        hass, config, async_add_entities, discovery_info=None):
-    """Set up the SimpliSafe platform."""
-    from simplipy import API
-    from simplipy.errors import SimplipyError
+    """Set up a SimpliSafe alarm control panel based on existing config."""
+    pass

-    username = config[CONF_USERNAME]
-    password = config[CONF_PASSWORD]
-    name = config.get(CONF_NAME)
-    code = config.get(CONF_CODE)

-    websession = aiohttp_client.async_get_clientsession(hass)
-
-    config_data = await hass.async_add_executor_job(
-        load_json, hass.config.path(DATA_FILE))
-
-    try:
-        if config_data:
-            try:
-                simplisafe = await API.login_via_token(
-                    config_data['refresh_token'], websession)
-                _LOGGER.debug('Logging in with refresh token')
-            except SimplipyError:
-                _LOGGER.info('Refresh token expired; attempting credentials')
-                simplisafe = await API.login_via_credentials(
-                    username, password, websession)
-        else:
-            simplisafe = await API.login_via_credentials(
-                username, password, websession)
-            _LOGGER.debug('Logging in with credentials')
-    except SimplipyError as err:
-        _LOGGER.error("There was an error during setup: %s", err)
-        return
-
-    config_data = {'refresh_token': simplisafe.refresh_token}
-    await hass.async_add_executor_job(
-        save_json, hass.config.path(DATA_FILE), config_data)
-
-    systems = await simplisafe.get_systems()
-    async_add_entities(
-        [SimpliSafeAlarm(system, name, code) for system in systems], True)
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up a SimpliSafe alarm control panel based on a config entry."""
+    systems = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id]
+    async_add_entities([
+        SimpliSafeAlarm(system, entry.data.get(CONF_CODE))
+        for system in systems
+    ], True)


 class SimpliSafeAlarm(AlarmControlPanel):
    """Representation of a SimpliSafe alarm."""

-    def __init__(self, system, name, code):
+    def __init__(self, system, code):
        """Initialize the SimpliSafe alarm."""
+        self._async_unsub_dispatcher_connect = None
        self._attrs = {}
-        self._code = str(code) if code else None
-        self._name = name
+        self._code = code
        self._system = system
        self._state = None

@@ -98,9 +56,7 @@ class SimpliSafeAlarm(AlarmControlPanel):
    @property
    def name(self):
        """Return the name of the device."""
-        if self._name:
-            return self._name
-        return 'Alarm {}'.format(self._system.system_id)
+        return self._system.address

    @property
    def code_format(self):
@@ -128,6 +84,21 @@ class SimpliSafeAlarm(AlarmControlPanel):
            _LOGGER.warning("Wrong code entered for %s", state)
        return check

+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        @callback
+        def update():
+            """Update the state."""
+            self.async_schedule_update_ha_state(True)
+
+        self._async_unsub_dispatcher_connect = async_dispatcher_connect(
+            self.hass, TOPIC_UPDATE, update)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Disconnect dispatcher listener when removed."""
+        if self._async_unsub_dispatcher_connect:
+            self._async_unsub_dispatcher_connect()
+
    async def async_alarm_disarm(self, code=None):
        """Send disarm command."""
        if not self._validate_code(code, 'disarming'):
@@ -151,22 +122,24 @@ class SimpliSafeAlarm(AlarmControlPanel):

    async def async_update(self):
        """Update alarm status."""
-        await self._system.update()
+        from simplipy.system import SystemStates

-        if self._system.state == self._system.SystemStates.off:
-            self._state = STATE_ALARM_DISARMED
-        elif self._system.state in (
-                self._system.SystemStates.home,
-                self._system.SystemStates.home_count):
-            self._state = STATE_ALARM_ARMED_HOME
-        elif self._system.state in (
-                self._system.SystemStates.away,
-                self._system.SystemStates.away_count,
-                self._system.SystemStates.exit_delay):
-            self._state = STATE_ALARM_ARMED_AWAY
-        else:
-            self._state = None
+        await self._system.update()

        self._attrs[ATTR_ALARM_ACTIVE] = self._system.alarm_going_off
        if self._system.temperature:
            self._attrs[ATTR_TEMPERATURE] = self._system.temperature
+
+        if self._system.state == SystemStates.error:
+            return
+
+        if self._system.state == SystemStates.off:
+            self._state = STATE_ALARM_DISARMED
+        elif self._system.state in (SystemStates.home,
+                                    SystemStates.home_count):
+            self._state = STATE_ALARM_ARMED_HOME
+        elif self._system.state in (SystemStates.away, SystemStates.away_count,
+                                    SystemStates.exit_delay):
+            self._state = STATE_ALARM_ARMED_AWAY
+        else:
+            self._state = None
--- a/homeassistant/components/alarm_control_panel/totalconnect.py
+++ b/homeassistant/components/alarm_control_panel/totalconnect.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
    STATE_ALARM_ARMED_CUSTOM_BYPASS)


-REQUIREMENTS = ['total_connect_client==0.18']
+REQUIREMENTS = ['total_connect_client==0.20']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/alert.py
+++ b/homeassistant/components/alert.py
@@ -24,23 +24,25 @@ _LOGGER = logging.getLogger(__name__)
 DOMAIN = 'alert'
 ENTITY_ID_FORMAT = DOMAIN + '.{}'

-CONF_DONE_MESSAGE = 'done_message'
 CONF_CAN_ACK = 'can_acknowledge'
 CONF_NOTIFIERS = 'notifiers'
 CONF_REPEAT = 'repeat'
 CONF_SKIP_FIRST = 'skip_first'
+CONF_ALERT_MESSAGE = 'message'
+CONF_DONE_MESSAGE = 'done_message'

 DEFAULT_CAN_ACK = True
 DEFAULT_SKIP_FIRST = False

 ALERT_SCHEMA = vol.Schema({
    vol.Required(CONF_NAME): cv.string,
-    vol.Optional(CONF_DONE_MESSAGE): cv.string,
    vol.Required(CONF_ENTITY_ID): cv.entity_id,
    vol.Required(CONF_STATE, default=STATE_ON): cv.string,
    vol.Required(CONF_REPEAT): vol.All(cv.ensure_list, [vol.Coerce(float)]),
    vol.Required(CONF_CAN_ACK, default=DEFAULT_CAN_ACK): cv.boolean,
    vol.Required(CONF_SKIP_FIRST, default=DEFAULT_SKIP_FIRST): cv.boolean,
+    vol.Optional(CONF_ALERT_MESSAGE): cv.template,
+    vol.Optional(CONF_DONE_MESSAGE): cv.template,
    vol.Required(CONF_NOTIFIERS): cv.ensure_list})

 CONFIG_SCHEMA = vol.Schema({
@@ -62,31 +64,47 @@ def is_on(hass, entity_id):

 async def async_setup(hass, config):
    """Set up the Alert component."""
-    alerts = config.get(DOMAIN)
-    all_alerts = {}
+    entities = []
+
+    for object_id, cfg in config[DOMAIN].items():
+        if not cfg:
+            cfg = {}
+
+        name = cfg.get(CONF_NAME)
+        watched_entity_id = cfg.get(CONF_ENTITY_ID)
+        alert_state = cfg.get(CONF_STATE)
+        repeat = cfg.get(CONF_REPEAT)
+        skip_first = cfg.get(CONF_SKIP_FIRST)
+        message_template = cfg.get(CONF_ALERT_MESSAGE)
+        done_message_template = cfg.get(CONF_DONE_MESSAGE)
+        notifiers = cfg.get(CONF_NOTIFIERS)
+        can_ack = cfg.get(CONF_CAN_ACK)
+
+        entities.append(Alert(hass, object_id, name,
+                              watched_entity_id, alert_state, repeat,
+                              skip_first, message_template,
+                              done_message_template, notifiers,
+                              can_ack))
+
+    if not entities:
+        return False

    async def async_handle_alert_service(service_call):
        """Handle calls to alert services."""
        alert_ids = service.extract_entity_ids(hass, service_call)

        for alert_id in alert_ids:
-            alert = all_alerts[alert_id]
-            alert.async_set_context(service_call.context)
-            if service_call.service == SERVICE_TURN_ON:
-                await alert.async_turn_on()
-            elif service_call.service == SERVICE_TOGGLE:
-                await alert.async_toggle()
-            else:
-                await alert.async_turn_off()
+            for alert in entities:
+                if alert.entity_id != alert_id:
+                    continue

-    # Setup alerts
-    for entity_id, alert in alerts.items():
-        entity = Alert(hass, entity_id,
-                       alert[CONF_NAME], alert.get(CONF_DONE_MESSAGE),
-                       alert[CONF_ENTITY_ID], alert[CONF_STATE],
-                       alert[CONF_REPEAT], alert[CONF_SKIP_FIRST],
-                       alert[CONF_NOTIFIERS], alert[CONF_CAN_ACK])
-        all_alerts[entity.entity_id] = entity
+                alert.async_set_context(service_call.context)
+                if service_call.service == SERVICE_TURN_ON:
+                    await alert.async_turn_on()
+                elif service_call.service == SERVICE_TOGGLE:
+                    await alert.async_toggle()
+                else:
+                    await alert.async_turn_off()

    # Setup service calls
    hass.services.async_register(
@@ -99,7 +117,7 @@ async def async_setup(hass, config):
        DOMAIN, SERVICE_TOGGLE, async_handle_alert_service,
        schema=ALERT_SERVICE_SCHEMA)

-    tasks = [alert.async_update_ha_state() for alert in all_alerts.values()]
+    tasks = [alert.async_update_ha_state() for alert in entities]
    if tasks:
        await asyncio.wait(tasks, loop=hass.loop)

@@ -109,16 +127,25 @@ async def async_setup(hass, config):
 class Alert(ToggleEntity):
    """Representation of an alert."""

-    def __init__(self, hass, entity_id, name, done_message, watched_entity_id,
-                 state, repeat, skip_first, notifiers, can_ack):
+    def __init__(self, hass, entity_id, name, watched_entity_id,
+                 state, repeat, skip_first, message_template,
+                 done_message_template, notifiers, can_ack):
        """Initialize the alert."""
        self.hass = hass
        self._name = name
        self._alert_state = state
        self._skip_first = skip_first
+
+        self._message_template = message_template
+        if self._message_template is not None:
+            self._message_template.hass = hass
+
+        self._done_message_template = done_message_template
+        if self._done_message_template is not None:
+            self._done_message_template.hass = hass
+
        self._notifiers = notifiers
        self._can_ack = can_ack
-        self._done_message = done_message

        self._delay = [timedelta(minutes=val) for val in repeat]
        self._next_delay = 0
@@ -184,7 +211,7 @@ class Alert(ToggleEntity):
        self._cancel()
        self._ack = False
        self._firing = False
-        if self._done_message and self._send_done_message:
+        if self._send_done_message:
            await self._notify_done_message()
        self.async_schedule_update_ha_state()

@@ -204,18 +231,31 @@ class Alert(ToggleEntity):
        if not self._ack:
            _LOGGER.info("Alerting: %s", self._name)
            self._send_done_message = True
-            for target in self._notifiers:
-                await self.hass.services.async_call(
-                    DOMAIN_NOTIFY, target, {ATTR_MESSAGE: self._name})
+
+            if self._message_template is not None:
+                message = self._message_template.async_render()
+            else:
+                message = self._name
+
+            await self._send_notification_message(message)
        await self._schedule_notify()

    async def _notify_done_message(self, *args):
        """Send notification of complete alert."""
-        _LOGGER.info("Alerting: %s", self._done_message)
+        _LOGGER.info("Alerting: %s", self._done_message_template)
        self._send_done_message = False
+
+        if self._done_message_template is None:
+            return
+
+        message = self._done_message_template.async_render()
+
+        await self._send_notification_message(message)
+
+    async def _send_notification_message(self, message):
        for target in self._notifiers:
            await self.hass.services.async_call(
-                DOMAIN_NOTIFY, target, {ATTR_MESSAGE: self._done_message})
+                DOMAIN_NOTIFY, target, {ATTR_MESSAGE: message})

    async def async_turn_on(self, **kwargs):
        """Async Unacknowledge alert."""
--- a/homeassistant/components/alexa/smart_home.py
+++ b/homeassistant/components/alexa/smart_home.py
--- a/homeassistant/components/apcupsd.py
+++ b/homeassistant/components/apcupsd.py
@@ -49,10 +49,9 @@ def setup(hass, config):

    # It doesn't really matter why we're not able to get the status, just that
    # we can't.
-    # pylint: disable=broad-except
    try:
        DATA.update(no_throttle=True)
-    except Exception:
+    except Exception:  # pylint: disable=broad-except
        _LOGGER.exception("Failure while testing APCUPSd status retrieval.")
        return False
    return True
--- a/homeassistant/components/apple_tv.py
+++ b/homeassistant/components/apple_tv.py
@@ -163,7 +163,7 @@ async def async_setup(hass, config):

    async def atv_discovered(service, info):
        """Set up an Apple TV that was auto discovered."""
-        await _setup_atv(hass, {
+        await _setup_atv(hass, config, {
            CONF_NAME: info['name'],
            CONF_HOST: info['host'],
            CONF_LOGIN_ID: info['properties']['hG'],
@@ -172,7 +172,7 @@ async def async_setup(hass, config):

    discovery.async_listen(hass, SERVICE_APPLE_TV, atv_discovered)

-    tasks = [_setup_atv(hass, conf) for conf in config.get(DOMAIN, [])]
+    tasks = [_setup_atv(hass, config, conf) for conf in config.get(DOMAIN, [])]
    if tasks:
        await asyncio.wait(tasks, loop=hass.loop)

@@ -187,7 +187,7 @@ async def async_setup(hass, config):
    return True


-async def _setup_atv(hass, atv_config):
+async def _setup_atv(hass, hass_config, atv_config):
    """Set up an Apple TV."""
    import pyatv
    name = atv_config.get(CONF_NAME)
@@ -212,10 +212,10 @@ async def _setup_atv(hass, atv_config):
    }

    hass.async_create_task(discovery.async_load_platform(
-        hass, 'media_player', DOMAIN, atv_config))
+        hass, 'media_player', DOMAIN, atv_config, hass_config))

    hass.async_create_task(discovery.async_load_platform(
-        hass, 'remote', DOMAIN, atv_config))
+        hass, 'remote', DOMAIN, atv_config, hass_config))


 class AppleTVPowerManager:
--- a/homeassistant/components/arlo.py
+++ b/homeassistant/components/arlo.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.dispatcher import dispatcher_send

-REQUIREMENTS = ['pyarlo==0.2.0']
+REQUIREMENTS = ['pyarlo==0.2.2']

 _LOGGER = logging.getLogger(__name__)

@@ -81,7 +81,7 @@ def setup(hass, config):

    def hub_refresh(event_time):
        """Call ArloHub to refresh information."""
-        _LOGGER.info("Updating Arlo Hub component")
+        _LOGGER.debug("Updating Arlo Hub component")
        hass.data[DATA_ARLO].update(update_cameras=True,
                                    update_base_station=True)
        dispatcher_send(hass, SIGNAL_UPDATE_ARLO)
--- a/homeassistant/components/asterisk_mbox.py
+++ b/homeassistant/components/asterisk_mbox.py
@@ -31,7 +31,7 @@ CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.Schema({
        vol.Required(CONF_HOST): cv.string,
        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Required(CONF_PORT): int,
+        vol.Required(CONF_PORT): cv.port,
    }),
 }, extra=vol.ALLOW_EXTRA)

--- a/homeassistant/components/august.py
+++ b/homeassistant/components/august.py
@@ -4,7 +4,6 @@ Support for August devices.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/august/
 """
-
 import logging
 from datetime import timedelta

@@ -124,6 +123,7 @@ def setup_august(hass, config, api, authenticator):

        return True
    if state == AuthenticationState.BAD_PASSWORD:
+        _LOGGER.error("Invalid password provided")
        return False
    if state == AuthenticationState.REQUIRES_VALIDATION:
        request_configuration(hass, config, api, authenticator)
@@ -165,6 +165,7 @@ class AugustData:
        self._doorbell_detail_by_id = {}
        self._lock_status_by_id = {}
        self._lock_detail_by_id = {}
+        self._door_state_by_id = {}
        self._activities_by_id = {}

    @property
@@ -184,6 +185,7 @@ class AugustData:

    def get_device_activities(self, device_id, *activity_types):
        """Return a list of activities."""
+        _LOGGER.debug("Getting device activities")
        self._update_device_activities()

        activities = self._activities_by_id.get(device_id, [])
@@ -199,6 +201,7 @@ class AugustData:
    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def _update_device_activities(self, limit=ACTIVITY_FETCH_LIMIT):
        """Update data object with latest from August API."""
+        _LOGGER.debug("Updating device activities")
        for house_id in self.house_ids:
            activities = self._api.get_house_activities(self._access_token,
                                                        house_id,
@@ -218,14 +221,30 @@ class AugustData:
    def _update_doorbells(self):
        detail_by_id = {}

+        _LOGGER.debug("Start retrieving doorbell details")
        for doorbell in self._doorbells:
-            detail_by_id[doorbell.device_id] = self._api.get_doorbell_detail(
-                self._access_token, doorbell.device_id)
+            _LOGGER.debug("Updating status for %s",
+                          doorbell.device_name)
+            try:
+                detail_by_id[doorbell.device_id] =\
+                    self._api.get_doorbell_detail(
+                        self._access_token, doorbell.device_id)
+            except RequestException as ex:
+                _LOGGER.error("Request error trying to retrieve doorbell"
+                              " status for %s. %s", doorbell.device_name, ex)
+                detail_by_id[doorbell.device_id] = None
+            except Exception:
+                detail_by_id[doorbell.device_id] = None
+                raise

+        _LOGGER.debug("Completed retrieving doorbell details")
        self._doorbell_detail_by_id = detail_by_id

    def get_lock_status(self, lock_id):
-        """Return lock status."""
+        """Return status if the door is locked or unlocked.
+
+        This is status for the lock itself.
+        """
        self._update_locks()
        return self._lock_status_by_id.get(lock_id)

@@ -234,17 +253,69 @@ class AugustData:
        self._update_locks()
        return self._lock_detail_by_id.get(lock_id)

+    def get_door_state(self, lock_id):
+        """Return status if the door is open or closed.
+
+        This is the status from the door sensor.
+        """
+        self._update_doors()
+        return self._door_state_by_id.get(lock_id)
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def _update_doors(self):
+        state_by_id = {}
+
+        _LOGGER.debug("Start retrieving door status")
+        for lock in self._locks:
+            _LOGGER.debug("Updating status for %s",
+                          lock.device_name)
+
+            try:
+                state_by_id[lock.device_id] = self._api.get_lock_door_status(
+                    self._access_token, lock.device_id)
+            except RequestException as ex:
+                _LOGGER.error("Request error trying to retrieve door"
+                              " status for %s. %s", lock.device_name, ex)
+                state_by_id[lock.device_id] = None
+            except Exception:
+                state_by_id[lock.device_id] = None
+                raise
+
+        _LOGGER.debug("Completed retrieving door status")
+        self._door_state_by_id = state_by_id
+
    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def _update_locks(self):
        status_by_id = {}
        detail_by_id = {}

+        _LOGGER.debug("Start retrieving locks status")
        for lock in self._locks:
-            status_by_id[lock.device_id] = self._api.get_lock_status(
-                self._access_token, lock.device_id)
-            detail_by_id[lock.device_id] = self._api.get_lock_detail(
-                self._access_token, lock.device_id)
+            _LOGGER.debug("Updating status for %s",
+                          lock.device_name)
+            try:
+                status_by_id[lock.device_id] = self._api.get_lock_status(
+                    self._access_token, lock.device_id)
+            except RequestException as ex:
+                _LOGGER.error("Request error trying to retrieve door"
+                              " status for %s. %s", lock.device_name, ex)
+                status_by_id[lock.device_id] = None
+            except Exception:
+                status_by_id[lock.device_id] = None
+                raise

+            try:
+                detail_by_id[lock.device_id] = self._api.get_lock_detail(
+                    self._access_token, lock.device_id)
+            except RequestException as ex:
+                _LOGGER.error("Request error trying to retrieve door"
+                              " details for %s. %s", lock.device_name, ex)
+                detail_by_id[lock.device_id] = None
+            except Exception:
+                detail_by_id[lock.device_id] = None
+                raise
+
+        _LOGGER.debug("Completed retrieving locks status")
        self._lock_status_by_id = status_by_id
        self._lock_detail_by_id = detail_by_id

--- a/homeassistant/components/auth/.translations/pt-BR.json
+++ b/homeassistant/components/auth/.translations/pt-BR.json
@@ -1,5 +1,12 @@
 {
    "mfa_setup": {
+        "notify": {
+            "step": {
+                "setup": {
+                    "title": "Verificar a configura\u00e7\u00e3o"
+                }
+            }
+        },
        "totp": {
            "error": {
                "invalid_code": "C\u00f3digo inv\u00e1lido, por favor tente novamente. Se voc\u00ea obtiver este erro de forma consistente, certifique-se de que o rel\u00f3gio do sistema Home Assistant esteja correto."
--- a/homeassistant/components/auth/.translations/pt.json
+++ b/homeassistant/components/auth/.translations/pt.json
@@ -10,22 +10,22 @@
            "step": {
                "init": {
                    "description": "Por favor, selecione um dos servi\u00e7os de notifica\u00e7\u00e3o:",
-                    "title": "Configurar uma palavra passe entregue pela componente de notifica\u00e7\u00e3o"
+                    "title": "Configurar uma palavra-passe entregue pela componente de notifica\u00e7\u00e3o"
                },
                "setup": {
-                    "description": "Foi enviada uma palavra passe atrav\u00e9s de **notify.{notify_service}**. Por favor, insira-a:",
+                    "description": "Foi enviada uma palavra-passe atrav\u00e9s de **notify.{notify_service}**. Por favor, insira-a:",
                    "title": "Verificar a configura\u00e7\u00e3o"
                }
            },
-            "title": "Notificar palavra passe de uso \u00fanico"
+            "title": "Notificar palavra-passe de uso \u00fanico"
        },
        "totp": {
            "error": {
-                "invalid_code": "C\u00f3digo inv\u00e1lido, por favor, tente novamente. Se receber este erro constantemente, por favor, certifique-se de que o rel\u00f3gio do sistema que hospeda o Home Assistent \u00e9 preciso."
+                "invalid_code": "C\u00f3digo inv\u00e1lido, por favor, tente novamente. Se receber este erro constantemente, por favor, certifique-se de que o rel\u00f3gio do sistema que hospeda o Home Assistant \u00e9 preciso."
            },
            "step": {
                "init": {
-                    "description": "Para ativar a autentica\u00e7\u00e3o com dois fatores utilizando passwords unicas temporais (OTP), ler o c\u00f3digo QR com a sua aplica\u00e7\u00e3o de autentica\u00e7\u00e3o. Se voc\u00ea n\u00e3o tiver uma, recomendamos [Google Authenticator](https://support.google.com/accounts/answer/1066447) ou [Authy](https://authy.com/).\n\n{qr_code}\n\nDepois de ler o c\u00f3digo, introduza o c\u00f3digo de seis d\u00edgitos fornecido pela sua aplica\u00e7\u00e3o para verificar a configura\u00e7\u00e3o. Se tiver problemas a ler o c\u00f3digo QR, fa\u00e7a uma configura\u00e7\u00e3o manual com o c\u00f3digo **`{c\u00f3digo}`**.",
+                    "description": "Para ativar a autentica\u00e7\u00e3o com dois fatores utilizando palavras-passe de uso \u00fanico (OTP), ler o c\u00f3digo QR com a sua aplica\u00e7\u00e3o de autentica\u00e7\u00e3o. Se n\u00e3o tiver uma, recomendamos [Google Authenticator](https://support.google.com/accounts/answer/1066447) ou [Authy](https://authy.com/).\n\n{qr_code}\n\nDepois de ler o c\u00f3digo, introduza o c\u00f3digo de seis d\u00edgitos fornecido pela sua aplica\u00e7\u00e3o para verificar a configura\u00e7\u00e3o. Se tiver problemas a ler o c\u00f3digo QR, fa\u00e7a uma configura\u00e7\u00e3o manual com o c\u00f3digo **`{code}`**.",
                    "title": "Configurar autentica\u00e7\u00e3o com dois fatores usando TOTP"
                }
            },
--- a/homeassistant/components/auth/.translations/ro.json
+++ b/homeassistant/components/auth/.translations/ro.json
@@ -0,0 +1,34 @@
+{
+    "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Nu sunt disponibile servicii de notificare."
+            },
+            "error": {
+                "invalid_code": "Cod invalid, va rugam incercati din nou."
+            },
+            "step": {
+                "init": {
+                    "description": "Selecta\u021bi unul dintre serviciile de notificare:",
+                    "title": "Configura\u021bi o parol\u0103 unic\u0103 livrat\u0103 de o component\u0103 de notificare"
+                },
+                "setup": {
+                    "description": "O parol\u0103 unic\u0103 a fost trimis\u0103 prin **notify.{notify_service}**. Introduce\u021bi parola mai jos:",
+                    "title": "Verifica\u021bi configurarea"
+                }
+            },
+            "title": "Notifica\u021bi o parol\u0103 unic\u0103"
+        },
+        "totp": {
+            "error": {
+                "invalid_code": "Cod invalid, va rugam incercati din nou. Dac\u0103 primi\u021bi aceast\u0103 eroare \u00een mod consecvent, asigura\u021bi-v\u0103 c\u0103 ceasul sistemului dvs. Home Assistant este corect."
+            },
+            "step": {
+                "init": {
+                    "title": "Configura\u021bi autentificarea cu doi factori utiliz\u00e2nd TOTP"
+                }
+            },
+            "title": "TOTP"
+        }
+    }
+}
--- a/homeassistant/components/auth/init.py
+++ b/homeassistant/components/auth/init.py
@@ -129,6 +129,7 @@ from homeassistant.auth.models import User, Credentials, \
    TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN
 from homeassistant.components import websocket_api
 from homeassistant.components.http import KEY_REAL_IP
+from homeassistant.components.http.auth import async_sign_path
 from homeassistant.components.http.ban import log_invalid_auth
 from homeassistant.components.http.data_validator import RequestDataValidator
 from homeassistant.components.http.view import HomeAssistantView
@@ -169,6 +170,14 @@ SCHEMA_WS_DELETE_REFRESH_TOKEN = \
        vol.Required('refresh_token_id'): str,
    })

+WS_TYPE_SIGN_PATH = 'auth/sign_path'
+SCHEMA_WS_SIGN_PATH = \
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
+        vol.Required('type'): WS_TYPE_SIGN_PATH,
+        vol.Required('path'): str,
+        vol.Optional('expires', default=30): int,
+    })
+
 RESULT_TYPE_CREDENTIALS = 'credentials'
 RESULT_TYPE_USER = 'user'

@@ -201,6 +210,11 @@ async def async_setup(hass, config):
        websocket_delete_refresh_token,
        SCHEMA_WS_DELETE_REFRESH_TOKEN
    )
+    hass.components.websocket_api.async_register_command(
+        WS_TYPE_SIGN_PATH,
+        websocket_sign_path,
+        SCHEMA_WS_SIGN_PATH
+    )

    await login_flow.async_setup(hass, store_result)
    await mfa_setup_flow.async_setup(hass)
@@ -424,54 +438,46 @@ def _create_auth_code_store():


@websocket_api.ws_require_user()
-@callback
-def websocket_current_user(
+@websocket_api.async_response
+async def websocket_current_user(
        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
    """Return the current user."""
-    async def async_get_current_user(user):
-        """Get current user."""
-        enabled_modules = await hass.auth.async_get_enabled_mfa(user)
+    user = connection.user
+    enabled_modules = await hass.auth.async_get_enabled_mfa(user)

-        connection.send_message(
-            websocket_api.result_message(msg['id'], {
-                'id': user.id,
-                'name': user.name,
-                'is_owner': user.is_owner,
-                'credentials': [{'auth_provider_type': c.auth_provider_type,
-                                 'auth_provider_id': c.auth_provider_id}
-                                for c in user.credentials],
-                'mfa_modules': [{
-                    'id': module.id,
-                    'name': module.name,
-                    'enabled': module.id in enabled_modules,
-                } for module in hass.auth.auth_mfa_modules],
-            }))
-
-    hass.async_create_task(async_get_current_user(connection.user))
+    connection.send_message(
+        websocket_api.result_message(msg['id'], {
+            'id': user.id,
+            'name': user.name,
+            'is_owner': user.is_owner,
+            'credentials': [{'auth_provider_type': c.auth_provider_type,
+                             'auth_provider_id': c.auth_provider_id}
+                            for c in user.credentials],
+            'mfa_modules': [{
+                'id': module.id,
+                'name': module.name,
+                'enabled': module.id in enabled_modules,
+            } for module in hass.auth.auth_mfa_modules],
+        }))


@websocket_api.ws_require_user()
-@callback
-def websocket_create_long_lived_access_token(
+@websocket_api.async_response
+async def websocket_create_long_lived_access_token(
        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
    """Create or a long-lived access token."""
-    async def async_create_long_lived_access_token(user):
-        """Create or a long-lived access token."""
-        refresh_token = await hass.auth.async_create_refresh_token(
-            user,
-            client_name=msg['client_name'],
-            client_icon=msg.get('client_icon'),
-            token_type=TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
-            access_token_expiration=timedelta(days=msg['lifespan']))
+    refresh_token = await hass.auth.async_create_refresh_token(
+        connection.user,
+        client_name=msg['client_name'],
+        client_icon=msg.get('client_icon'),
+        token_type=TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN,
+        access_token_expiration=timedelta(days=msg['lifespan']))

-        access_token = hass.auth.async_create_access_token(
-            refresh_token)
+    access_token = hass.auth.async_create_access_token(
+        refresh_token)

-        connection.send_message(
-            websocket_api.result_message(msg['id'], access_token))
-
-    hass.async_create_task(
-        async_create_long_lived_access_token(connection.user))
+    connection.send_message(
+        websocket_api.result_message(msg['id'], access_token))


@websocket_api.ws_require_user()
@@ -494,22 +500,28 @@ def websocket_refresh_tokens(


@websocket_api.ws_require_user()
-@callback
-def websocket_delete_refresh_token(
+@websocket_api.async_response
+async def websocket_delete_refresh_token(
        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
    """Handle a delete refresh token request."""
-    async def async_delete_refresh_token(user, refresh_token_id):
-        """Delete a refresh token."""
-        refresh_token = connection.user.refresh_tokens.get(refresh_token_id)
+    refresh_token = connection.user.refresh_tokens.get(msg['refresh_token_id'])

-        if refresh_token is None:
-            return websocket_api.error_message(
-                msg['id'], 'invalid_token_id', 'Received invalid token')
+    if refresh_token is None:
+        return websocket_api.error_message(
+            msg['id'], 'invalid_token_id', 'Received invalid token')

-        await hass.auth.async_remove_refresh_token(refresh_token)
+    await hass.auth.async_remove_refresh_token(refresh_token)

-        connection.send_message(
-            websocket_api.result_message(msg['id'], {}))
+    connection.send_message(
+        websocket_api.result_message(msg['id'], {}))

-    hass.async_create_task(
-        async_delete_refresh_token(connection.user, msg['refresh_token_id']))
+
+@websocket_api.ws_require_user()
+@callback
+def websocket_sign_path(
+        hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg):
+    """Handle a sign path request."""
+    connection.send_message(websocket_api.result_message(msg['id'], {
+        'path': async_sign_path(hass, connection.refresh_token_id, msg['path'],
+                                timedelta(seconds=msg['expires']))
+        }))
--- a/homeassistant/components/automation/geo_location.py
+++ b/homeassistant/components/automation/geo_location.py
@@ -0,0 +1,74 @@
+"""
+Offer geo location automation rules.
+
+For more details about this automation trigger, please refer to the
+documentation at
+https://home-assistant.io/docs/automation/trigger/#geo-location-trigger
+"""
+import voluptuous as vol
+
+from homeassistant.components.geo_location import DOMAIN
+from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_EVENT, CONF_PLATFORM, CONF_SOURCE, CONF_ZONE, EVENT_STATE_CHANGED)
+from homeassistant.helpers import (
+    condition, config_validation as cv)
+from homeassistant.helpers.config_validation import entity_domain
+
+EVENT_ENTER = 'enter'
+EVENT_LEAVE = 'leave'
+DEFAULT_EVENT = EVENT_ENTER
+
+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'geo_location',
+    vol.Required(CONF_SOURCE): cv.string,
+    vol.Required(CONF_ZONE): entity_domain('zone'),
+    vol.Required(CONF_EVENT, default=DEFAULT_EVENT):
+        vol.Any(EVENT_ENTER, EVENT_LEAVE),
+})
+
+
+def source_match(state, source):
+    """Check if the state matches the provided source."""
+    return state and state.attributes.get('source') == source
+
+
+async def async_trigger(hass, config, action):
+    """Listen for state changes based on configuration."""
+    source = config.get(CONF_SOURCE).lower()
+    zone_entity_id = config.get(CONF_ZONE)
+    trigger_event = config.get(CONF_EVENT)
+
+    @callback
+    def state_change_listener(event):
+        """Handle specific state changes."""
+        # Skip if the event is not a geo_location entity.
+        if not event.data.get('entity_id').startswith(DOMAIN):
+            return
+        # Skip if the event's source does not match the trigger's source.
+        from_state = event.data.get('old_state')
+        to_state = event.data.get('new_state')
+        if not source_match(from_state, source) \
+           and not source_match(to_state, source):
+            return
+
+        zone_state = hass.states.get(zone_entity_id)
+        from_match = condition.zone(hass, zone_state, from_state)
+        to_match = condition.zone(hass, zone_state, to_state)
+
+        # pylint: disable=too-many-boolean-expressions
+        if trigger_event == EVENT_ENTER and not from_match and to_match or \
+           trigger_event == EVENT_LEAVE and from_match and not to_match:
+            hass.async_run_job(action({
+                'trigger': {
+                    'platform': 'geo_location',
+                    'source': source,
+                    'entity_id': event.data.get('entity_id'),
+                    'from_state': from_state,
+                    'to_state': to_state,
+                    'zone': zone_state,
+                    'event': trigger_event,
+                },
+            }, context=event.context))
+
+    return hass.bus.async_listen(EVENT_STATE_CHANGED, state_change_listener)
--- a/homeassistant/components/automation/webhook.py
+++ b/homeassistant/components/automation/webhook.py
@@ -11,13 +11,12 @@ from aiohttp import hdrs
 import voluptuous as vol

 from homeassistant.core import callback
-from homeassistant.const import CONF_PLATFORM
+from homeassistant.const import CONF_PLATFORM, CONF_WEBHOOK_ID
 import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ('webhook',)

 _LOGGER = logging.getLogger(__name__)
-CONF_WEBHOOK_ID = 'webhook_id'

 TRIGGER_SCHEMA = vol.Schema({
    vol.Required(CONF_PLATFORM): 'webhook',
--- a/homeassistant/components/axis/init.py
+++ b/homeassistant/components/axis/init.py
@@ -10,24 +10,21 @@ import voluptuous as vol

 from homeassistant.components.discovery import SERVICE_AXIS
 from homeassistant.const import (
-    ATTR_LOCATION, ATTR_TRIPPED, CONF_EVENT, CONF_HOST, CONF_INCLUDE,
+    ATTR_LOCATION, CONF_EVENT, CONF_HOST, CONF_INCLUDE,
    CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_TRIGGER_TIME, CONF_USERNAME,
    EVENT_HOMEASSISTANT_STOP)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.entity import Entity
 from homeassistant.util.json import load_json, save_json

-REQUIREMENTS = ['axis==14']
+REQUIREMENTS = ['axis==16']

 _LOGGER = logging.getLogger(__name__)

 DOMAIN = 'axis'
 CONFIG_FILE = 'axis.conf'

-AXIS_DEVICES = {}
-
 EVENT_TYPES = ['motion', 'vmd3', 'pir', 'sound',
               'daynight', 'tampering', 'input']

@@ -38,6 +35,7 @@ AXIS_INCLUDE = EVENT_TYPES + PLATFORMS
 AXIS_DEFAULT_HOST = '192.168.0.90'
 AXIS_DEFAULT_USERNAME = 'root'
 AXIS_DEFAULT_PASSWORD = 'pass'
+DEFAULT_PORT = 80

 DEVICE_SCHEMA = vol.Schema({
    vol.Required(CONF_INCLUDE):
@@ -47,7 +45,7 @@ DEVICE_SCHEMA = vol.Schema({
    vol.Optional(CONF_USERNAME, default=AXIS_DEFAULT_USERNAME): cv.string,
    vol.Optional(CONF_PASSWORD, default=AXIS_DEFAULT_PASSWORD): cv.string,
    vol.Optional(CONF_TRIGGER_TIME, default=0): cv.positive_int,
-    vol.Optional(CONF_PORT, default=80): cv.positive_int,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(ATTR_LOCATION, default=''): cv.string,
 })

@@ -98,8 +96,6 @@ def request_configuration(hass, config, name, host, serialnumber):
            return False

        if setup_device(hass, config, device_config):
-            del device_config['events']
-            del device_config['signal']
            config_file = load_json(hass.config.path(CONFIG_FILE))
            config_file[serialnumber] = dict(device_config)
            save_json(hass.config.path(CONFIG_FILE), config_file)
@@ -145,9 +141,11 @@ def request_configuration(hass, config, name, host, serialnumber):

 def setup(hass, config):
    """Set up for Axis devices."""
+    hass.data[DOMAIN] = {}
+
    def _shutdown(call):
        """Stop the event stream on shutdown."""
-        for serialnumber, device in AXIS_DEVICES.items():
+        for serialnumber, device in hass.data[DOMAIN].items():
            _LOGGER.info("Stopping event stream for %s.", serialnumber)
            device.stop()

@@ -159,7 +157,7 @@ def setup(hass, config):
        name = discovery_info['hostname']
        serialnumber = discovery_info['properties']['macaddress']

-        if serialnumber not in AXIS_DEVICES:
+        if serialnumber not in hass.data[DOMAIN]:
            config_file = load_json(hass.config.path(CONFIG_FILE))
            if serialnumber in config_file:
                # Device config previously saved to file
@@ -177,7 +175,7 @@ def setup(hass, config):
                request_configuration(hass, config, name, host, serialnumber)
        else:
            # Device already registered, but on a different IP
-            device = AXIS_DEVICES[serialnumber]
+            device = hass.data[DOMAIN][serialnumber]
            device.config.host = host
            dispatcher_send(hass, DOMAIN + '_' + device.name + '_new_ip', host)

@@ -194,7 +192,7 @@ def setup(hass, config):

    def vapix_service(call):
        """Service to send a message."""
-        for _, device in AXIS_DEVICES.items():
+        for device in hass.data[DOMAIN].values():
            if device.name == call.data[CONF_NAME]:
                response = device.vapix.do_request(
                    call.data[SERVICE_CGI],
@@ -213,7 +211,7 @@ def setup(hass, config):

 def setup_device(hass, config, device_config):
    """Set up an Axis device."""
-    from axis import AxisDevice
+    import axis

    def signal_callback(action, event):
        """Call to configure events when initialized on event stream."""
@@ -228,18 +226,32 @@ def setup_device(hass, config, device_config):
            discovery.load_platform(
                hass, component, DOMAIN, event_config, config)

-    event_types = list(filter(lambda x: x in device_config[CONF_INCLUDE],
-                              EVENT_TYPES))
-    device_config['events'] = event_types
-    device_config['signal'] = signal_callback
-    device = AxisDevice(hass.loop, **device_config)
-    device.name = device_config[CONF_NAME]
+    event_types = [
+        event
+        for event in device_config[CONF_INCLUDE]
+        if event in EVENT_TYPES
+    ]

-    if device.serial_number is None:
-        # If there is no serial number a connection could not be made
-        _LOGGER.error("Couldn't connect to %s", device_config[CONF_HOST])
+    device = axis.AxisDevice(
+        loop=hass.loop, host=device_config[CONF_HOST],
+        username=device_config[CONF_USERNAME],
+        password=device_config[CONF_PASSWORD],
+        port=device_config[CONF_PORT], web_proto='http',
+        event_types=event_types, signal=signal_callback)
+
+    try:
+        hass.data[DOMAIN][device.vapix.serial_number] = device
+
+    except axis.Unauthorized:
+        _LOGGER.error("Credentials for %s are faulty",
+                      device_config[CONF_HOST])
        return False

+    except axis.RequestError:
+        return False
+
+    device.name = device_config[CONF_NAME]
+
    for component in device_config[CONF_INCLUDE]:
        if component == 'camera':
            camera_config = {
@@ -252,51 +264,6 @@ def setup_device(hass, config, device_config):
            discovery.load_platform(
                hass, component, DOMAIN, camera_config, config)

-    AXIS_DEVICES[device.serial_number] = device
    if event_types:
        hass.add_job(device.start)
    return True
-
-
-class AxisDeviceEvent(Entity):
-    """Representation of a Axis device event."""
-
-    def __init__(self, event_config):
-        """Initialize the event."""
-        self.axis_event = event_config[CONF_EVENT]
-        self._name = '{}_{}_{}'.format(
-            event_config[CONF_NAME], self.axis_event.event_type,
-            self.axis_event.id)
-        self.location = event_config[ATTR_LOCATION]
-        self.axis_event.callback = self._update_callback
-
-    def _update_callback(self):
-        """Update the sensor's state, if needed."""
-        self.schedule_update_ha_state(True)
-
-    @property
-    def name(self):
-        """Return the name of the event."""
-        return self._name
-
-    @property
-    def device_class(self):
-        """Return the class of the event."""
-        return self.axis_event.event_class
-
-    @property
-    def should_poll(self):
-        """Return the polling state. No polling needed."""
-        return False
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes of the event."""
-        attr = {}
-
-        tripped = self.axis_event.is_tripped
-        attr[ATTR_TRIPPED] = 'True' if tripped else 'False'
-
-        attr[ATTR_LOCATION] = self.location
-
-        return attr
--- a/homeassistant/components/axis/services.yaml
+++ b/homeassistant/components/axis/services.yaml
@@ -0,0 +1,15 @@
+vapix_call:
+  description: Configure device using Vapix parameter management.
+  fields:
+    name:
+      description: Name of device to Configure. [Required]
+      example: M1065-W
+    cgi:
+      description: Which cgi to call on device. [Optional] Default is 'param.cgi'
+      example: 'applications/control.cgi'
+    action:
+      description: What type of call. [Optional] Default is 'update'
+      example: 'start'
+    param:
+      description: What parameter to operate on. [Required]
+      example: 'package=VideoMotionDetection'
--- a/homeassistant/components/binary_sensor/august.py
+++ b/homeassistant/components/binary_sensor/august.py
@@ -4,19 +4,30 @@ Support for August binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.august/
 """
+import logging
 from datetime import timedelta, datetime

 from homeassistant.components.august import DATA_AUGUST
 from homeassistant.components.binary_sensor import (BinarySensorDevice)

+_LOGGER = logging.getLogger(__name__)
+
 DEPENDENCIES = ['august']

 SCAN_INTERVAL = timedelta(seconds=5)


+def _retrieve_door_state(data, lock):
+    """Get the latest state of the DoorSense sensor."""
+    return data.get_door_state(lock.device_id)
+
+
 def _retrieve_online_state(data, doorbell):
    """Get the latest state of the sensor."""
    detail = data.get_doorbell_detail(doorbell.device_id)
+    if detail is None:
+        return None
+
    return detail.is_online


@@ -46,7 +57,11 @@ def _activity_time_based_state(data, doorbell, activity_types):


 # Sensor types: Name, device_class, state_provider
-SENSOR_TYPES = {
+SENSOR_TYPES_DOOR = {
+    'door_open': ['Open', 'door', _retrieve_door_state],
+}
+
+SENSOR_TYPES_DOORBELL = {
    'doorbell_ding': ['Ding', 'occupancy', _retrieve_ding_state],
    'doorbell_motion': ['Motion', 'motion', _retrieve_motion_state],
    'doorbell_online': ['Online', 'connectivity', _retrieve_online_state],
@@ -58,22 +73,51 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    data = hass.data[DATA_AUGUST]
    devices = []

+    from august.lock import LockDoorStatus
+    for door in data.locks:
+        for sensor_type in SENSOR_TYPES_DOOR:
+            state_provider = SENSOR_TYPES_DOOR[sensor_type][2]
+            if state_provider(data, door) is LockDoorStatus.UNKNOWN:
+                _LOGGER.debug(
+                    "Not adding sensor class %s for lock %s ",
+                    SENSOR_TYPES_DOOR[sensor_type][1], door.device_name
+                )
+                continue
+
+            _LOGGER.debug(
+                "Adding sensor class %s for %s",
+                SENSOR_TYPES_DOOR[sensor_type][1], door.device_name
+            )
+            devices.append(AugustDoorBinarySensor(data, sensor_type, door))
+
    for doorbell in data.doorbells:
-        for sensor_type in SENSOR_TYPES:
-            devices.append(AugustBinarySensor(data, sensor_type, doorbell))
+        for sensor_type in SENSOR_TYPES_DOORBELL:
+            _LOGGER.debug("Adding doorbell sensor class %s for %s",
+                          SENSOR_TYPES_DOORBELL[sensor_type][1],
+                          doorbell.device_name)
+            devices.append(
+                AugustDoorbellBinarySensor(data, sensor_type,
+                                           doorbell)
+            )

    add_entities(devices, True)


-class AugustBinarySensor(BinarySensorDevice):
-    """Representation of an August binary sensor."""
+class AugustDoorBinarySensor(BinarySensorDevice):
+    """Representation of an August Door binary sensor."""

-    def __init__(self, data, sensor_type, doorbell):
+    def __init__(self, data, sensor_type, door):
        """Initialize the sensor."""
        self._data = data
        self._sensor_type = sensor_type
-        self._doorbell = doorbell
+        self._door = door
        self._state = None
+        self._available = False
+
+    @property
+    def available(self):
+        """Return the availability of this sensor."""
+        return self._available

    @property
    def is_on(self):
@@ -83,15 +127,58 @@ class AugustBinarySensor(BinarySensorDevice):
    @property
    def device_class(self):
        """Return the class of this device, from component DEVICE_CLASSES."""
-        return SENSOR_TYPES[self._sensor_type][1]
+        return SENSOR_TYPES_DOOR[self._sensor_type][1]
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return "{} {}".format(self._door.device_name,
+                              SENSOR_TYPES_DOOR[self._sensor_type][0])
+
+    def update(self):
+        """Get the latest state of the sensor."""
+        state_provider = SENSOR_TYPES_DOOR[self._sensor_type][2]
+        self._state = state_provider(self._data, self._door)
+        self._available = self._state is not None
+
+        from august.lock import LockDoorStatus
+        self._state = self._state == LockDoorStatus.OPEN
+
+
+class AugustDoorbellBinarySensor(BinarySensorDevice):
+    """Representation of an August binary sensor."""
+
+    def __init__(self, data, sensor_type, doorbell):
+        """Initialize the sensor."""
+        self._data = data
+        self._sensor_type = sensor_type
+        self._doorbell = doorbell
+        self._state = None
+        self._available = False
+
+    @property
+    def available(self):
+        """Return the availability of this sensor."""
+        return self._available
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of this device, from component DEVICE_CLASSES."""
+        return SENSOR_TYPES_DOORBELL[self._sensor_type][1]

    @property
    def name(self):
        """Return the name of the binary sensor."""
        return "{} {}".format(self._doorbell.device_name,
-                              SENSOR_TYPES[self._sensor_type][0])
+                              SENSOR_TYPES_DOORBELL[self._sensor_type][0])

    def update(self):
        """Get the latest state of the sensor."""
-        state_provider = SENSOR_TYPES[self._sensor_type][2]
+        state_provider = SENSOR_TYPES_DOORBELL[self._sensor_type][2]
        self._state = state_provider(self._data, self._doorbell)
+        self._available = self._state is not None
--- a/homeassistant/components/binary_sensor/axis.py
+++ b/homeassistant/components/binary_sensor/axis.py
@@ -7,10 +7,11 @@ https://home-assistant.io/components/binary_sensor.axis/
 from datetime import timedelta
 import logging

-from homeassistant.components.axis import AxisDeviceEvent
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import CONF_TRIGGER_TIME
-from homeassistant.helpers.event import track_point_in_utc_time
+from homeassistant.const import (
+    ATTR_LOCATION, CONF_EVENT, CONF_NAME, CONF_TRIGGER_TIME)
+from homeassistant.core import callback
+from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow

 DEPENDENCIES = ['axis']
@@ -20,48 +21,71 @@ _LOGGER = logging.getLogger(__name__)

 def setup_platform(hass, config, add_entities, discovery_info=None):
    """Set up the Axis binary devices."""
-    add_entities([AxisBinarySensor(hass, discovery_info)], True)
+    add_entities([AxisBinarySensor(discovery_info)], True)


-class AxisBinarySensor(AxisDeviceEvent, BinarySensorDevice):
+class AxisBinarySensor(BinarySensorDevice):
    """Representation of a binary Axis event."""

-    def __init__(self, hass, event_config):
+    def __init__(self, event_config):
        """Initialize the Axis binary sensor."""
-        self.hass = hass
-        self._state = False
-        self._delay = event_config[CONF_TRIGGER_TIME]
-        self._timer = None
-        AxisDeviceEvent.__init__(self, event_config)
+        self.axis_event = event_config[CONF_EVENT]
+        self.device_name = event_config[CONF_NAME]
+        self.location = event_config[ATTR_LOCATION]
+        self.delay = event_config[CONF_TRIGGER_TIME]
+        self.remove_timer = None
+
+    async def async_added_to_hass(self):
+        """Subscribe sensors events."""
+        self.axis_event.callback = self._update_callback
+
+    def _update_callback(self):
+        """Update the sensor's state, if needed."""
+        if self.remove_timer is not None:
+            self.remove_timer()
+            self.remove_timer = None
+
+        if self.delay == 0 or self.is_on:
+            self.schedule_update_ha_state()
+        else:  # Run timer to delay updating the state
+            @callback
+            def _delay_update(now):
+                """Timer callback for sensor update."""
+                _LOGGER.debug("%s called delayed (%s sec) update",
+                              self.name, self.delay)
+                self.async_schedule_update_ha_state()
+                self.remove_timer = None
+
+            self.remove_timer = async_track_point_in_utc_time(
+                self.hass, _delay_update,
+                utcnow() + timedelta(seconds=self.delay))

    @property
    def is_on(self):
        """Return true if event is active."""
-        return self._state
+        return self.axis_event.is_tripped

-    def update(self):
-        """Get the latest data and update the state."""
-        self._state = self.axis_event.is_tripped
+    @property
+    def name(self):
+        """Return the name of the event."""
+        return '{}_{}_{}'.format(
+            self.device_name, self.axis_event.event_type, self.axis_event.id)

-    def _update_callback(self):
-        """Update the sensor's state, if needed."""
-        self.update()
+    @property
+    def device_class(self):
+        """Return the class of the event."""
+        return self.axis_event.event_class

-        if self._timer is not None:
-            self._timer()
-            self._timer = None
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False

-        if self._delay > 0 and not self.is_on:
-            # Set timer to wait until updating the state
-            def _delay_update(now):
-                """Timer callback for sensor update."""
-                _LOGGER.debug("%s called delayed (%s sec) update",
-                              self._name, self._delay)
-                self.schedule_update_ha_state()
-                self._timer = None
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes of the event."""
+        attr = {}

-            self._timer = track_point_in_utc_time(
-                self.hass, _delay_update,
-                utcnow() + timedelta(seconds=self._delay))
-        else:
-            self.schedule_update_ha_state()
+        attr[ATTR_LOCATION] = self.location
+
+        return attr
--- a/homeassistant/components/binary_sensor/bloomsky.py
+++ b/homeassistant/components/binary_sensor/bloomsky.py
@@ -50,6 +50,12 @@ class BloomSkySensor(BinarySensorDevice):
        self._sensor_name = sensor_name
        self._name = '{} {}'.format(device['DeviceName'], sensor_name)
        self._state = None
+        self._unique_id = '{}-{}'.format(self._device_id, self._sensor_name)
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id

    @property
    def name(self):
--- a/homeassistant/components/binary_sensor/bmw_connected_drive.py
+++ b/homeassistant/components/binary_sensor/bmw_connected_drive.py
@@ -8,6 +8,7 @@ import logging

 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN
+from homeassistant.const import LENGTH_KILOMETERS

 DEPENDENCIES = ['bmw_connected_drive']

@@ -117,7 +118,8 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
            result['lights_parking'] = vehicle_state.parking_lights.value
        elif self._attribute == 'condition_based_services':
            for report in vehicle_state.condition_based_services:
-                result.update(self._format_cbs_report(report))
+                result.update(
+                    self._format_cbs_report(report))
        elif self._attribute == 'check_control_messages':
            check_control_messages = vehicle_state.check_control_messages
            if not check_control_messages:
@@ -175,8 +177,7 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
            self._state = (vehicle_state._attributes['connectionStatus'] ==
                           'CONNECTED')

-    @staticmethod
-    def _format_cbs_report(report):
+    def _format_cbs_report(self, report):
        result = {}
        service_type = report.service_type.lower().replace('_', ' ')
        result['{} status'.format(service_type)] = report.state.value
@@ -184,8 +185,10 @@ class BMWConnectedDriveSensor(BinarySensorDevice):
            result['{} date'.format(service_type)] = \
                report.due_date.strftime('%Y-%m-%d')
        if report.due_distance is not None:
-            result['{} distance'.format(service_type)] = \
-                '{} km'.format(report.due_distance)
+            distance = round(self.hass.config.units.length(
+                report.due_distance, LENGTH_KILOMETERS))
+            result['{} distance'.format(service_type)] = '{} {}'.format(
+                distance, self.hass.config.units.length_unit)
        return result

    def update_callback(self):
--- a/homeassistant/components/binary_sensor/deconz.py
+++ b/homeassistant/components/binary_sensor/deconz.py
@@ -7,7 +7,7 @@ https://home-assistant.io/components/binary_sensor.deconz/
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.deconz.const import (
    ATTR_DARK, ATTR_ON, CONF_ALLOW_CLIP_SENSOR, DOMAIN as DATA_DECONZ,
-    DATA_DECONZ_ID, DATA_DECONZ_UNSUB, DECONZ_DOMAIN)
+    DECONZ_DOMAIN)
 from homeassistant.const import ATTR_BATTERY_LEVEL
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
@@ -36,10 +36,10 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                entities.append(DeconzBinarySensor(sensor))
        async_add_entities(entities, True)

-    hass.data[DATA_DECONZ_UNSUB].append(
+    hass.data[DATA_DECONZ].listeners.append(
        async_dispatcher_connect(hass, 'deconz_new_sensor', async_add_sensor))

-    async_add_sensor(hass.data[DATA_DECONZ].sensors.values())
+    async_add_sensor(hass.data[DATA_DECONZ].api.sensors.values())


 class DeconzBinarySensor(BinarySensorDevice):
@@ -52,7 +52,8 @@ class DeconzBinarySensor(BinarySensorDevice):
    async def async_added_to_hass(self):
        """Subscribe sensors events."""
        self._sensor.register_async_callback(self.async_update_callback)
-        self.hass.data[DATA_DECONZ_ID][self.entity_id] = self._sensor.deconz_id
+        self.hass.data[DATA_DECONZ].deconz_ids[self.entity_id] = \
+            self._sensor.deconz_id

    async def async_will_remove_from_hass(self) -> None:
        """Disconnect sensor object when removed."""
@@ -127,7 +128,7 @@ class DeconzBinarySensor(BinarySensorDevice):
                self._sensor.uniqueid.count(':') != 7):
            return None
        serial = self._sensor.uniqueid.split('-', 1)[0]
-        bridgeid = self.hass.data[DATA_DECONZ].config.bridgeid
+        bridgeid = self.hass.data[DATA_DECONZ].api.config.bridgeid
        return {
            'connections': {(CONNECTION_ZIGBEE, serial)},
            'identifiers': {(DECONZ_DOMAIN, serial)},
--- a/homeassistant/components/binary_sensor/ffmpeg_motion.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_motion.py
@@ -49,10 +49,6 @@ async def async_setup_platform(hass, config, async_add_entities,
                               discovery_info=None):
    """Set up the FFmpeg binary motion sensor."""
    manager = hass.data[DATA_FFMPEG]
-
-    if not await manager.async_run_test(config.get(CONF_INPUT)):
-        return
-
    entity = FFmpegMotion(hass, manager, config)
    async_add_entities([entity])

--- a/homeassistant/components/binary_sensor/ffmpeg_noise.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_noise.py
@@ -46,10 +46,6 @@ async def async_setup_platform(hass, config, async_add_entities,
                               discovery_info=None):
    """Set up the FFmpeg noise binary sensor."""
    manager = hass.data[DATA_FFMPEG]
-
-    if not await manager.async_run_test(config.get(CONF_INPUT)):
-        return
-
    entity = FFmpegNoise(hass, manager, config)
    async_add_entities([entity])

--- a/homeassistant/components/binary_sensor/knx.py
+++ b/homeassistant/components/binary_sensor/knx.py
@@ -69,7 +69,7 @@ def async_add_entities_discovery(hass, discovery_info, async_add_entities):
    entities = []
    for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
        device = hass.data[DATA_KNX].xknx.devices[device_name]
-        entities.append(KNXBinarySensor(hass, device))
+        entities.append(KNXBinarySensor(device))
    async_add_entities(entities)


@@ -87,7 +87,7 @@ def async_add_entities_config(hass, config, async_add_entities):
        reset_after=config.get(CONF_RESET_AFTER))
    hass.data[DATA_KNX].xknx.devices.add(binary_sensor)

-    entity = KNXBinarySensor(hass, binary_sensor)
+    entity = KNXBinarySensor(binary_sensor)
    automations = config.get(CONF_AUTOMATION)
    if automations is not None:
        for automation in automations:
@@ -103,11 +103,9 @@ def async_add_entities_config(hass, config, async_add_entities):
 class KNXBinarySensor(BinarySensorDevice):
    """Representation of a KNX binary sensor."""

-    def __init__(self, hass, device):
+    def __init__(self, device):
        """Initialize of KNX binary sensor."""
        self.device = device
-        self.hass = hass
-        self.async_register_callbacks()
        self.automations = []

    @callback
@@ -118,6 +116,10 @@ class KNXBinarySensor(BinarySensorDevice):
            await self.async_update_ha_state()
        self.device.register_device_updated_cb(after_update_callback)

+    async def async_added_to_hass(self):
+        """Store register state change callback."""
+        self.async_register_callbacks()
+
    @property
    def name(self):
        """Return the name of the KNX device."""
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -15,19 +15,21 @@ from homeassistant.components.binary_sensor import (
    BinarySensorDevice, DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
    CONF_FORCE_UPDATE, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON,
-    CONF_PAYLOAD_OFF, CONF_DEVICE_CLASS)
+    CONF_PAYLOAD_OFF, CONF_DEVICE_CLASS, CONF_DEVICE)
 from homeassistant.components.mqtt import (
    ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_AVAILABILITY_TOPIC,
    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
-    MqttAvailability, MqttDiscoveryUpdate)
+    MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo)
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+import homeassistant.helpers.event as evt
 from homeassistant.helpers.typing import HomeAssistantType, ConfigType

 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = 'MQTT Binary sensor'
+CONF_OFF_DELAY = 'off_delay'
 CONF_UNIQUE_ID = 'unique_id'
 DEFAULT_PAYLOAD_OFF = 'OFF'
 DEFAULT_PAYLOAD_ON = 'ON'
@@ -41,9 +43,12 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
    vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
+    vol.Optional(CONF_OFF_DELAY):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
    # Integrations shouldn't never expose unique_id through configuration
    # this here is an exception because MQTT is a msg transport, not a protocol
    vol.Optional(CONF_UNIQUE_ID): cv.string,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)


@@ -80,28 +85,32 @@ async def _async_setup_entity(hass, config, async_add_entities,
        config.get(CONF_DEVICE_CLASS),
        config.get(CONF_QOS),
        config.get(CONF_FORCE_UPDATE),
+        config.get(CONF_OFF_DELAY),
        config.get(CONF_PAYLOAD_ON),
        config.get(CONF_PAYLOAD_OFF),
        config.get(CONF_PAYLOAD_AVAILABLE),
        config.get(CONF_PAYLOAD_NOT_AVAILABLE),
        value_template,
        config.get(CONF_UNIQUE_ID),
+        config.get(CONF_DEVICE),
        discovery_hash,
    )])


 class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
-                       BinarySensorDevice):
+                       MqttEntityDeviceInfo, BinarySensorDevice):
    """Representation a binary sensor that is updated by MQTT."""

    def __init__(self, name, state_topic, availability_topic, device_class,
-                 qos, force_update, payload_on, payload_off, payload_available,
-                 payload_not_available, value_template,
-                 unique_id: Optional[str], discovery_hash):
+                 qos, force_update, off_delay, payload_on, payload_off,
+                 payload_available, payload_not_available, value_template,
+                 unique_id: Optional[str], device_config: Optional[ConfigType],
+                 discovery_hash):
        """Initialize the MQTT binary sensor."""
        MqttAvailability.__init__(self, availability_topic, qos,
                                  payload_available, payload_not_available)
        MqttDiscoveryUpdate.__init__(self, discovery_hash)
+        MqttEntityDeviceInfo.__init__(self, device_config)
        self._name = name
        self._state = None
        self._state_topic = state_topic
@@ -110,9 +119,11 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
        self._payload_off = payload_off
        self._qos = qos
        self._force_update = force_update
+        self._off_delay = off_delay
        self._template = value_template
        self._unique_id = unique_id
        self._discovery_hash = discovery_hash
+        self._delay_listener = None

    async def async_added_to_hass(self):
        """Subscribe mqtt events."""
@@ -120,7 +131,14 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
        await MqttDiscoveryUpdate.async_added_to_hass(self)

        @callback
-        def state_message_received(topic, payload, qos):
+        def off_delay_listener(now):
+            """Switch device off after a delay."""
+            self._delay_listener = None
+            self._state = False
+            self.async_schedule_update_ha_state()
+
+        @callback
+        def state_message_received(_topic, payload, _qos):
            """Handle a new received MQTT state message."""
            if self._template is not None:
                payload = self._template.async_render_with_possible_json_value(
@@ -135,6 +153,14 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
                                self._name, self._state_topic)
                return

+            if self._delay_listener is not None:
+                self._delay_listener()
+                self._delay_listener = None
+
+            if (self._state and self._off_delay is not None):
+                self._delay_listener = evt.async_call_later(
+                    self.hass, self._off_delay, off_delay_listener)
+
            self.async_schedule_update_ha_state()

        await mqtt.async_subscribe(
--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -7,45 +7,33 @@ https://home-assistant.io/components/binary_sensor.octoprint/
 import logging

 import requests
-import voluptuous as vol

-from homeassistant.const import CONF_NAME, CONF_MONITORED_CONDITIONS
-from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA)
-import homeassistant.helpers.config_validation as cv
+from homeassistant.components.octoprint import (BINARY_SENSOR_TYPES,
+                                                DOMAIN as COMPONENT_DOMAIN)
+from homeassistant.components.binary_sensor import BinarySensorDevice

 _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['octoprint']
-DOMAIN = "octoprint"
-DEFAULT_NAME = 'OctoPrint'
-
-SENSOR_TYPES = {
-    # API Endpoint, Group, Key, unit
-    'Printing': ['printer', 'state', 'printing', None],
-    'Printing Error': ['printer', 'state', 'error', None]
-}
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
-        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})


 def setup_platform(hass, config, add_entities, discovery_info=None):
    """Set up the available OctoPrint binary sensors."""
-    octoprint_api = hass.data[DOMAIN]["api"]
-    name = config.get(CONF_NAME)
-    monitored_conditions = config.get(
-        CONF_MONITORED_CONDITIONS, SENSOR_TYPES.keys())
+    if discovery_info is None:
+        return
+
+    name = discovery_info['name']
+    base_url = discovery_info['base_url']
+    monitored_conditions = discovery_info['sensors']
+    octoprint_api = hass.data[COMPONENT_DOMAIN][base_url]

    devices = []
    for octo_type in monitored_conditions:
        new_sensor = OctoPrintBinarySensor(
-            octoprint_api, octo_type, SENSOR_TYPES[octo_type][2],
-            name, SENSOR_TYPES[octo_type][3], SENSOR_TYPES[octo_type][0],
-            SENSOR_TYPES[octo_type][1], 'flags')
+            octoprint_api, octo_type, BINARY_SENSOR_TYPES[octo_type][2],
+            name, BINARY_SENSOR_TYPES[octo_type][3],
+            BINARY_SENSOR_TYPES[octo_type][0],
+            BINARY_SENSOR_TYPES[octo_type][1], 'flags')
        devices.append(new_sensor)
    add_entities(devices, True)

--- a/homeassistant/components/binary_sensor/opentherm_gw.py
+++ b/homeassistant/components/binary_sensor/opentherm_gw.py
@@ -0,0 +1,145 @@
+"""
+Support for OpenTherm Gateway binary sensors.
+
+For more details about this platform, please refer to the documentation at
+http://home-assistant.io/components/binary_sensor.opentherm_gw/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, ENTITY_ID_FORMAT)
+from homeassistant.components.opentherm_gw import (
+    DATA_GW_VARS, DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import async_generate_entity_id
+
+DEVICE_CLASS_COLD = 'cold'
+DEVICE_CLASS_HEAT = 'heat'
+DEVICE_CLASS_PROBLEM = 'problem'
+
+DEPENDENCIES = ['opentherm_gw']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the OpenTherm Gateway binary sensors."""
+    if discovery_info is None:
+        return
+    gw_vars = hass.data[DATA_OPENTHERM_GW][DATA_GW_VARS]
+    sensor_info = {
+        # [device_class, friendly_name]
+        gw_vars.DATA_MASTER_CH_ENABLED: [
+            None, "Thermostat Central Heating Enabled"],
+        gw_vars.DATA_MASTER_DHW_ENABLED: [
+            None, "Thermostat Hot Water Enabled"],
+        gw_vars.DATA_MASTER_COOLING_ENABLED: [
+            None, "Thermostat Cooling Enabled"],
+        gw_vars.DATA_MASTER_OTC_ENABLED: [
+            None, "Thermostat Outside Temperature Correction Enabled"],
+        gw_vars.DATA_MASTER_CH2_ENABLED: [
+            None, "Thermostat Central Heating 2 Enabled"],
+        gw_vars.DATA_SLAVE_FAULT_IND: [
+            DEVICE_CLASS_PROBLEM, "Boiler Fault Indication"],
+        gw_vars.DATA_SLAVE_CH_ACTIVE: [
+            DEVICE_CLASS_HEAT, "Boiler Central Heating Status"],
+        gw_vars.DATA_SLAVE_DHW_ACTIVE: [
+            DEVICE_CLASS_HEAT, "Boiler Hot Water Status"],
+        gw_vars.DATA_SLAVE_FLAME_ON: [
+            DEVICE_CLASS_HEAT, "Boiler Flame Status"],
+        gw_vars.DATA_SLAVE_COOLING_ACTIVE: [
+            DEVICE_CLASS_COLD, "Boiler Cooling Status"],
+        gw_vars.DATA_SLAVE_CH2_ACTIVE: [
+            DEVICE_CLASS_HEAT, "Boiler Central Heating 2 Status"],
+        gw_vars.DATA_SLAVE_DIAG_IND: [
+            DEVICE_CLASS_PROBLEM, "Boiler Diagnostics Indication"],
+        gw_vars.DATA_SLAVE_DHW_PRESENT: [None, "Boiler Hot Water Present"],
+        gw_vars.DATA_SLAVE_CONTROL_TYPE: [None, "Boiler Control Type"],
+        gw_vars.DATA_SLAVE_COOLING_SUPPORTED: [None, "Boiler Cooling Support"],
+        gw_vars.DATA_SLAVE_DHW_CONFIG: [
+            None, "Boiler Hot Water Configuration"],
+        gw_vars.DATA_SLAVE_MASTER_LOW_OFF_PUMP: [
+            None, "Boiler Pump Commands Support"],
+        gw_vars.DATA_SLAVE_CH2_PRESENT: [
+            None, "Boiler Central Heating 2 Present"],
+        gw_vars.DATA_SLAVE_SERVICE_REQ: [
+            DEVICE_CLASS_PROBLEM, "Boiler Service Required"],
+        gw_vars.DATA_SLAVE_REMOTE_RESET: [None, "Boiler Remote Reset Support"],
+        gw_vars.DATA_SLAVE_LOW_WATER_PRESS: [
+            DEVICE_CLASS_PROBLEM, "Boiler Low Water Pressure"],
+        gw_vars.DATA_SLAVE_GAS_FAULT: [
+            DEVICE_CLASS_PROBLEM, "Boiler Gas Fault"],
+        gw_vars.DATA_SLAVE_AIR_PRESS_FAULT: [
+            DEVICE_CLASS_PROBLEM, "Boiler Air Pressure Fault"],
+        gw_vars.DATA_SLAVE_WATER_OVERTEMP: [
+            DEVICE_CLASS_PROBLEM, "Boiler Water Overtemperature"],
+        gw_vars.DATA_REMOTE_TRANSFER_DHW: [
+            None, "Remote Hot Water Setpoint Transfer Support"],
+        gw_vars.DATA_REMOTE_TRANSFER_MAX_CH: [
+            None, "Remote Maximum Central Heating Setpoint Write Support"],
+        gw_vars.DATA_REMOTE_RW_DHW: [
+            None, "Remote Hot Water Setpoint Write Support"],
+        gw_vars.DATA_REMOTE_RW_MAX_CH: [
+            None, "Remote Central Heating Setpoint Write Support"],
+        gw_vars.DATA_ROVRD_MAN_PRIO: [
+            None, "Remote Override Manual Change Priority"],
+        gw_vars.DATA_ROVRD_AUTO_PRIO: [
+            None, "Remote Override Program Change Priority"],
+        gw_vars.OTGW_GPIO_A_STATE: [None, "Gateway GPIO A State"],
+        gw_vars.OTGW_GPIO_B_STATE: [None, "Gateway GPIO B State"],
+        gw_vars.OTGW_IGNORE_TRANSITIONS: [None, "Gateway Ignore Transitions"],
+        gw_vars.OTGW_OVRD_HB: [None, "Gateway Override High Byte"],
+    }
+    sensors = []
+    for var in discovery_info:
+        device_class = sensor_info[var][0]
+        friendly_name = sensor_info[var][1]
+        entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, var, hass=hass)
+        sensors.append(OpenThermBinarySensor(entity_id, var, device_class,
+                                             friendly_name))
+    async_add_entities(sensors)
+
+
+class OpenThermBinarySensor(BinarySensorDevice):
+    """Represent an OpenTherm Gateway binary sensor."""
+
+    def __init__(self, entity_id, var, device_class, friendly_name):
+        """Initialize the binary sensor."""
+        self.entity_id = entity_id
+        self._var = var
+        self._state = None
+        self._device_class = device_class
+        self._friendly_name = friendly_name
+
+    async def async_added_to_hass(self):
+        """Subscribe to updates from the component."""
+        _LOGGER.debug(
+            "Added OpenTherm Gateway binary sensor %s", self._friendly_name)
+        async_dispatcher_connect(self.hass, SIGNAL_OPENTHERM_GW_UPDATE,
+                                 self.receive_report)
+
+    async def receive_report(self, status):
+        """Handle status updates from the component."""
+        self._state = bool(status.get(self._var))
+        self.async_schedule_update_ha_state()
+
+    @property
+    def name(self):
+        """Return the friendly name."""
+        return self._friendly_name
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of this device."""
+        return self._device_class
+
+    @property
+    def should_poll(self):
+        """Return False because entity pushes its state."""
+        return False
--- a/homeassistant/components/binary_sensor/openuv.py
+++ b/homeassistant/components/binary_sensor/openuv.py
@@ -50,12 +50,12 @@ class OpenUvBinarySensor(OpenUvEntity, BinarySensorDevice):
        """Initialize the sensor."""
        super().__init__(openuv)

+        self._async_unsub_dispatcher_connect = None
        self._entry_id = entry_id
        self._icon = icon
        self._latitude = openuv.client.latitude
        self._longitude = openuv.client.longitude
        self._name = name
-        self._dispatch_remove = None
        self._sensor_type = sensor_type
        self._state = None

@@ -80,16 +80,20 @@ class OpenUvBinarySensor(OpenUvEntity, BinarySensorDevice):
        return '{0}_{1}_{2}'.format(
            self._latitude, self._longitude, self._sensor_type)

-    @callback
-    def _update_data(self):
-        """Update the state."""
-        self.async_schedule_update_ha_state(True)
-
    async def async_added_to_hass(self):
        """Register callbacks."""
-        self._dispatch_remove = async_dispatcher_connect(
-            self.hass, TOPIC_UPDATE, self._update_data)
-        self.async_on_remove(self._dispatch_remove)
+        @callback
+        def update():
+            """Update the state."""
+            self.async_schedule_update_ha_state(True)
+
+        self._async_unsub_dispatcher_connect = async_dispatcher_connect(
+            self.hass, TOPIC_UPDATE, update)
+
+    async def async_will_remove_from_hass(self):
+        """Disconnect dispatcher listener when removed."""
+        if self._async_unsub_dispatcher_connect:
+            self._async_unsub_dispatcher_connect()

    async def async_update(self):
        """Update the state."""
--- a/homeassistant/components/binary_sensor/pilight.py
+++ b/homeassistant/components/binary_sensor/pilight.py
@@ -37,8 +37,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_VARIABLE): cv.string,
    vol.Required(CONF_PAYLOAD): vol.Schema(dict),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PAYLOAD_ON, default='on'): cv.string,
-    vol.Optional(CONF_PAYLOAD_OFF, default='off'): cv.string,
+    vol.Optional(CONF_PAYLOAD_ON, default='on'): vol.Any(
+        cv.positive_int, cv.small_float, cv.string),
+    vol.Optional(CONF_PAYLOAD_OFF, default='off'): vol.Any(
+        cv.positive_int, cv.small_float, cv.string),
    vol.Optional(CONF_DISARM_AFTER_TRIGGER, default=False): cv.boolean,
    vol.Optional(CONF_RESET_DELAY_SEC, default=30): cv.positive_int
 })
--- a/homeassistant/components/binary_sensor/ping.py
+++ b/homeassistant/components/binary_sensor/ping.py
@@ -4,19 +4,18 @@ Tracks the latency of a host by sending ICMP echo requests (ping).
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.ping/
 """
-import asyncio
-from datetime import timedelta
 import logging
-import re
 import subprocess
+import re
 import sys
+from datetime import timedelta

 import voluptuous as vol

-from homeassistant.components.binary_sensor import (
-    PLATFORM_SCHEMA, BinarySensorDevice)
-from homeassistant.const import CONF_HOST, CONF_NAME
 import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import CONF_NAME, CONF_HOST

 _LOGGER = logging.getLogger(__name__)

@@ -49,14 +48,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-async def async_setup_platform(
-        hass, config, async_add_entities, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
    """Set up the Ping Binary sensor."""
    name = config.get(CONF_NAME)
    host = config.get(CONF_HOST)
    count = config.get(CONF_PING_COUNT)

-    async_add_entities([PingBinarySensor(name, PingData(host, count))], True)
+    add_entities([PingBinarySensor(name, PingData(host, count))], True)


 class PingBinarySensor(BinarySensorDevice):
@@ -93,9 +91,9 @@ class PingBinarySensor(BinarySensorDevice):
                ATTR_ROUND_TRIP_TIME_MIN: self.ping.data['min'],
            }

-    async def async_update(self):
+    def update(self):
        """Get the latest data."""
-        await self.ping.update()
+        self.ping.update()


 class PingData:
@@ -116,13 +114,12 @@ class PingData:
                'ping', '-n', '-q', '-c', str(self._count), '-W1',
                self._ip_address]

-    async def ping(self):
+    def ping(self):
        """Send ICMP echo request and return details if success."""
-        pinger = await asyncio.create_subprocess_shell(
-            ' '.join(self._ping_cmd), stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+        pinger = subprocess.Popen(
+            self._ping_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        try:
-            out = await pinger.communicate()
+            out = pinger.communicate()
            _LOGGER.debug("Output is %s", str(out))
            if sys.platform == 'win32':
                match = WIN32_PING_MATCHER.search(str(out).split('\n')[-1])
@@ -131,8 +128,7 @@ class PingData:
                    'min': rtt_min,
                    'avg': rtt_avg,
                    'max': rtt_max,
-                    'mdev': '',
-                }
+                    'mdev': ''}
            if 'max/' not in str(out):
                match = PING_MATCHER_BUSYBOX.search(str(out).split('\n')[-1])
                rtt_min, rtt_avg, rtt_max = match.groups()
@@ -140,20 +136,18 @@ class PingData:
                    'min': rtt_min,
                    'avg': rtt_avg,
                    'max': rtt_max,
-                    'mdev': '',
-                }
+                    'mdev': ''}
            match = PING_MATCHER.search(str(out).split('\n')[-1])
            rtt_min, rtt_avg, rtt_max, rtt_mdev = match.groups()
            return {
                'min': rtt_min,
                'avg': rtt_avg,
                'max': rtt_max,
-                'mdev': rtt_mdev,
-            }
+                'mdev': rtt_mdev}
        except (subprocess.CalledProcessError, AttributeError):
            return False

-    async def update(self):
+    def update(self):
        """Retrieve the latest details from the host."""
-        self.data = await self.ping()
+        self.data = self.ping()
        self.available = bool(self.data)
--- a/homeassistant/components/binary_sensor/rflink.py
+++ b/homeassistant/components/binary_sensor/rflink.py
@@ -0,0 +1,105 @@
+"""
+Support for Rflink binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.rflink/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import (
+    DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA, BinarySensorDevice)
+from homeassistant.components.rflink import (
+    CONF_ALIASES, CONF_DEVICES, RflinkDevice)
+from homeassistant.const import (
+    CONF_FORCE_UPDATE, CONF_NAME, CONF_DEVICE_CLASS)
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.event as evt
+
+CONF_OFF_DELAY = 'off_delay'
+DEFAULT_FORCE_UPDATE = False
+
+DEPENDENCIES = ['rflink']
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_DEVICES, default={}): {
+        cv.string: vol.Schema({
+            vol.Optional(CONF_NAME): cv.string,
+            vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+            vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE):
+                cv.boolean,
+            vol.Optional(CONF_OFF_DELAY): cv.positive_int,
+            vol.Optional(CONF_ALIASES, default=[]):
+                vol.All(cv.ensure_list, [cv.string]),
+        })
+    },
+}, extra=vol.ALLOW_EXTRA)
+
+
+def devices_from_config(domain_config):
+    """Parse configuration and add Rflink sensor devices."""
+    devices = []
+    for device_id, config in domain_config[CONF_DEVICES].items():
+        device = RflinkBinarySensor(device_id, **config)
+        devices.append(device)
+
+    return devices
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the Rflink platform."""
+    async_add_entities(devices_from_config(config))
+
+
+class RflinkBinarySensor(RflinkDevice, BinarySensorDevice):
+    """Representation of an Rflink binary sensor."""
+
+    def __init__(self, device_id, device_class=None,
+                 force_update=None, off_delay=None,
+                 **kwargs):
+        """Handle sensor specific args and super init."""
+        self._state = None
+        self._device_class = device_class
+        self._force_update = force_update
+        self._off_delay = off_delay
+        self._delay_listener = None
+        super().__init__(device_id, **kwargs)
+
+    def _handle_event(self, event):
+        """Domain specific event handler."""
+        command = event['command']
+        if command == 'on':
+            self._state = True
+        elif command == 'off':
+            self._state = False
+
+        if (self._state and self._off_delay is not None):
+            def off_delay_listener(now):
+                """Switch device off after a delay."""
+                self._delay_listener = None
+                self._state = False
+                self.async_schedule_update_ha_state()
+
+            if self._delay_listener is not None:
+                self._delay_listener()
+            self._delay_listener = evt.async_call_later(
+                self.hass, self._off_delay, off_delay_listener)
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor."""
+        return self._device_class
+
+    @property
+    def force_update(self):
+        """Force update."""
+        return self._force_update
--- a/homeassistant/components/binary_sensor/ring.py
+++ b/homeassistant/components/binary_sensor/ring.py
@@ -73,6 +73,7 @@ class RingBinarySensor(BinarySensorDevice):
                                      SENSOR_TYPES.get(self._sensor_type)[0])
        self._device_class = SENSOR_TYPES.get(self._sensor_type)[2]
        self._state = None
+        self._unique_id = '{}-{}'.format(self._data.id, self._sensor_type)

    @property
    def name(self):
@@ -89,6 +90,11 @@ class RingBinarySensor(BinarySensorDevice):
        """Return the class of the binary sensor."""
        return self._device_class

+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
    @property
    def device_state_attributes(self):
        """Return the state attributes."""
--- a/homeassistant/components/binary_sensor/sense.py
+++ b/homeassistant/components/binary_sensor/sense.py
@@ -0,0 +1,116 @@
+"""
+Support for monitoring a Sense energy sensor device.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.sense/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.sense import SENSE_DATA
+
+DEPENDENCIES = ['sense']
+
+_LOGGER = logging.getLogger(__name__)
+
+BIN_SENSOR_CLASS = 'power'
+MDI_ICONS = {'ac': 'air-conditioner',
+             'aquarium': 'fish',
+             'car': 'car-electric',
+             'computer': 'desktop-classic',
+             'cup': 'coffee',
+             'dehumidifier': 'water-off',
+             'dishes': 'dishwasher',
+             'drill': 'toolbox',
+             'fan': 'fan',
+             'freezer': 'fridge-top',
+             'fridge': 'fridge-bottom',
+             'game': 'gamepad-variant',
+             'garage': 'garage',
+             'grill': 'stove',
+             'heat': 'fire',
+             'heater': 'radiatior',
+             'humidifier': 'water',
+             'kettle': 'kettle',
+             'leafblower': 'leaf',
+             'lightbulb': 'lightbulb',
+             'media_console': 'set-top-box',
+             'modem': 'router-wireless',
+             'outlet': 'power-socket-us',
+             'papershredder': 'shredder',
+             'printer': 'printer',
+             'pump': 'water-pump',
+             'settings': 'settings',
+             'skillet': 'pot',
+             'smartcamera': 'webcam',
+             'socket': 'power-plug',
+             'sound': 'speaker',
+             'stove': 'stove',
+             'trash': 'trash-can',
+             'tv': 'television',
+             'vacuum': 'robot-vacuum',
+             'washer': 'washing-machine'}
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Sense sensor."""
+    if discovery_info is None:
+        return
+
+    data = hass.data[SENSE_DATA]
+
+    sense_devices = data.get_discovered_device_data()
+    devices = [SenseDevice(data, device) for device in sense_devices]
+    add_entities(devices)
+
+
+def sense_to_mdi(sense_icon):
+    """Convert sense icon to mdi icon."""
+    return 'mdi:' + MDI_ICONS.get(sense_icon, 'power-plug')
+
+
+class SenseDevice(BinarySensorDevice):
+    """Implementation of a Sense energy device binary sensor."""
+
+    def __init__(self, data, device):
+        """Initialize the sensor."""
+        self._name = device['name']
+        self._id = device['id']
+        self._icon = sense_to_mdi(device['icon'])
+        self._data = data
+        self._state = False
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return self._name
+
+    @property
+    def unique_id(self):
+        """Return the id of the binary sensor."""
+        return self._id
+
+    @property
+    def icon(self):
+        """Return the icon of the binary sensor."""
+        return self._icon
+
+    @property
+    def device_class(self):
+        """Return the device class of the binary sensor."""
+        return BIN_SENSOR_CLASS
+
+    def update(self):
+        """Retrieve latest state."""
+        from sense_energy.sense_api import SenseAPITimeoutException
+        try:
+            self._data.get_realtime()
+        except SenseAPITimeoutException:
+            _LOGGER.error("Timeout retrieving data")
+            return
+        self._state = self._name in self._data.active_devices
--- a/homeassistant/components/binary_sensor/template.py
+++ b/homeassistant/components/binary_sensor/template.py
@@ -15,7 +15,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import (
    ATTR_FRIENDLY_NAME, ATTR_ENTITY_ID, CONF_VALUE_TEMPLATE,
    CONF_ICON_TEMPLATE, CONF_ENTITY_PICTURE_TEMPLATE,
-    CONF_SENSORS, CONF_DEVICE_CLASS, EVENT_HOMEASSISTANT_START)
+    CONF_SENSORS, CONF_DEVICE_CLASS, EVENT_HOMEASSISTANT_START, MATCH_ALL)
 from homeassistant.exceptions import TemplateError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
@@ -55,22 +55,37 @@ async def async_setup_platform(hass, config, async_add_entities,
        icon_template = device_config.get(CONF_ICON_TEMPLATE)
        entity_picture_template = device_config.get(
            CONF_ENTITY_PICTURE_TEMPLATE)
-        entity_ids = (device_config.get(ATTR_ENTITY_ID) or
-                      value_template.extract_entities())
+        entity_ids = set()
+        manual_entity_ids = device_config.get(ATTR_ENTITY_ID)
+
+        for template in (
+                value_template,
+                icon_template,
+                entity_picture_template,
+        ):
+            if template is None:
+                continue
+            template.hass = hass
+
+            if manual_entity_ids is not None:
+                continue
+
+            template_entity_ids = template.extract_entities()
+            if template_entity_ids == MATCH_ALL:
+                entity_ids = MATCH_ALL
+            elif entity_ids != MATCH_ALL:
+                entity_ids |= set(template_entity_ids)
+
+        if manual_entity_ids is not None:
+            entity_ids = manual_entity_ids
+        elif entity_ids != MATCH_ALL:
+            entity_ids = list(entity_ids)
+
        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
        device_class = device_config.get(CONF_DEVICE_CLASS)
        delay_on = device_config.get(CONF_DELAY_ON)
        delay_off = device_config.get(CONF_DELAY_OFF)

-        if value_template is not None:
-            value_template.hass = hass
-
-        if icon_template is not None:
-            icon_template.hass = hass
-
-        if entity_picture_template is not None:
-            entity_picture_template.hass = hass
-
        sensors.append(
            BinarySensorTemplate(
                hass, device, friendly_name, device_class, value_template,
--- a/homeassistant/components/binary_sensor/trend.py
+++ b/homeassistant/components/binary_sensor/trend.py
@@ -15,14 +15,14 @@ from homeassistant.components.binary_sensor import (
    BinarySensorDevice)
 from homeassistant.const import (
    ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME, CONF_DEVICE_CLASS, CONF_ENTITY_ID,
-    CONF_FRIENDLY_NAME, STATE_UNKNOWN)
+    CONF_FRIENDLY_NAME, STATE_UNKNOWN, CONF_SENSORS)
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.util import utcnow

-REQUIREMENTS = ['numpy==1.15.1']
+REQUIREMENTS = ['numpy==1.15.3']

 _LOGGER = logging.getLogger(__name__)

@@ -38,7 +38,6 @@ CONF_INVERT = 'invert'
 CONF_MAX_SAMPLES = 'max_samples'
 CONF_MIN_GRADIENT = 'min_gradient'
 CONF_SAMPLE_DURATION = 'sample_duration'
-CONF_SENSORS = 'sensors'

 SENSOR_SCHEMA = vol.Schema({
    vol.Required(CONF_ENTITY_ID): cv.entity_id,
@@ -78,9 +77,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
            )
    if not sensors:
        _LOGGER.error("No sensors added")
-        return False
+        return
    add_entities(sensors)
-    return True


 class SensorTrend(BinarySensorDevice):
--- a/homeassistant/components/binary_sensor/workday.py
+++ b/homeassistant/components/binary_sensor/workday.py
@@ -14,15 +14,16 @@ from homeassistant.const import CONF_NAME, WEEKDAYS
 from homeassistant.components.binary_sensor import BinarySensorDevice
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['holidays==0.9.7']
+REQUIREMENTS = ['holidays==0.9.8']

 _LOGGER = logging.getLogger(__name__)

 # List of all countries currently supported by holidays
 # There seems to be no way to get the list out at runtime
 ALL_COUNTRIES = [
-    'Argentina', 'AR', 'Australia', 'AU', 'Austria', 'AT', 'Belarus', 'BY'
-    'Belgium', 'BE', 'Canada', 'CA', 'Colombia', 'CO', 'Czech', 'CZ',
+    'Argentina', 'AR', 'Australia', 'AU', 'Austria', 'AT',
+    'Brazil', 'BR', 'Belarus', 'BY', 'Belgium', 'BE',
+    'Canada', 'CA', 'Colombia', 'CO', 'Croatia', 'HR', 'Czech', 'CZ',
    'Denmark', 'DK', 'England', 'EuropeanCentralBank', 'ECB', 'TAR',
    'Finland', 'FI', 'France', 'FRA', 'Germany', 'DE', 'Hungary', 'HU',
    'India', 'IND', 'Ireland', 'Isle of Man', 'Italy', 'IT', 'Japan', 'JP',
@@ -30,7 +31,7 @@ ALL_COUNTRIES = [
    'Northern Ireland', 'Norway', 'NO', 'Polish', 'PL', 'Portugal', 'PT',
    'PortugalExt', 'PTE', 'Scotland', 'Slovenia', 'SI', 'Slovakia', 'SK',
    'South Africa', 'ZA', 'Spain', 'ES', 'Sweden', 'SE', 'Switzerland', 'CH',
-    'UnitedKingdom', 'UK', 'UnitedStates', 'US', 'Wales',
+    'Ukraine', 'UA', 'UnitedKingdom', 'UK', 'UnitedStates', 'US', 'Wales',
 ]

 ALLOWED_DAYS = WEEKDAYS + ['holiday']
--- a/homeassistant/components/binary_sensor/xiaomi_aqara.py
+++ b/homeassistant/components/binary_sensor/xiaomi_aqara.py
@@ -4,6 +4,8 @@ import logging
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.xiaomi_aqara import (PY_XIAOMI_GATEWAY,
                                                   XiaomiDevice)
+from homeassistant.core import callback
+from homeassistant.helpers.event import async_call_later

 _LOGGER = logging.getLogger(__name__)

@@ -36,21 +38,24 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
            elif model in ['natgas', 'sensor_natgas']:
                devices.append(XiaomiNatgasSensor(device, gateway))
            elif model in ['switch', 'sensor_switch',
-                           'sensor_switch.aq2', 'sensor_switch.aq3']:
+                           'sensor_switch.aq2', 'sensor_switch.aq3',
+                           'remote.b1acn01']:
                if 'proto' not in device or int(device['proto'][0:1]) == 1:
                    data_key = 'status'
                else:
                    data_key = 'button_0'
                devices.append(XiaomiButton(device, 'Switch', data_key,
                                            hass, gateway))
-            elif model in ['86sw1', 'sensor_86sw1', 'sensor_86sw1.aq1']:
+            elif model in ['86sw1', 'sensor_86sw1', 'sensor_86sw1.aq1',
+                           'remote.b186acn01']:
                if 'proto' not in device or int(device['proto'][0:1]) == 1:
                    data_key = 'channel_0'
                else:
                    data_key = 'button_0'
                devices.append(XiaomiButton(device, 'Wall Switch', data_key,
                                            hass, gateway))
-            elif model in ['86sw2', 'sensor_86sw2', 'sensor_86sw2.aq1']:
+            elif model in ['86sw2', 'sensor_86sw2', 'sensor_86sw2.aq1',
+                           'remote.b286acn01']:
                if 'proto' not in device or int(device['proto'][0:1]) == 1:
                    data_key_left = 'channel_0'
                    data_key_right = 'channel_1'
@@ -65,6 +70,12 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                                            'dual_channel', hass, gateway))
            elif model in ['cube', 'sensor_cube', 'sensor_cube.aqgl01']:
                devices.append(XiaomiCube(device, hass, gateway))
+            elif model in ['vibration', 'vibration.aq1']:
+                devices.append(XiaomiVibration(device, 'Vibration',
+                                               'status', gateway))
+            else:
+                _LOGGER.warning('Unmapped Device Model %s', model)
+
    add_entities(devices)


@@ -144,6 +155,7 @@ class XiaomiMotionSensor(XiaomiBinarySensor):
        """Initialize the XiaomiMotionSensor."""
        self._hass = hass
        self._no_motion_since = 0
+        self._unsub_set_no_motion = None
        if 'proto' not in device or int(device['proto'][0:1]) == 1:
            data_key = 'status'
        else:
@@ -158,6 +170,13 @@ class XiaomiMotionSensor(XiaomiBinarySensor):
        attrs.update(super().device_state_attributes)
        return attrs

+    @callback
+    def _async_set_no_motion(self, now):
+        """Set state to False."""
+        self._unsub_set_no_motion = None
+        self._state = False
+        self.async_schedule_update_ha_state()
+
    def parse_data(self, data, raw_data):
        """Parse data sent by gateway."""
        if raw_data['cmd'] == 'heartbeat':
@@ -179,11 +198,20 @@ class XiaomiMotionSensor(XiaomiBinarySensor):
            return False

        if value == MOTION:
-            self._should_poll = True
-            if self.entity_id is not None:
-                self._hass.bus.fire('motion', {
-                    'entity_id': self.entity_id
-                })
+            if self._data_key == 'motion_status':
+                if self._unsub_set_no_motion:
+                    self._unsub_set_no_motion()
+                self._unsub_set_no_motion = async_call_later(
+                    self._hass,
+                    180,
+                    self._async_set_no_motion
+                )
+            else:
+                self._should_poll = True
+                if self.entity_id is not None:
+                    self._hass.bus.fire('motion', {
+                        'entity_id': self.entity_id
+                    })

            self._no_motion_since = 0
            if self._state:
@@ -311,6 +339,41 @@ class XiaomiSmokeSensor(XiaomiBinarySensor):
            return False


+class XiaomiVibration(XiaomiBinarySensor):
+    """Representation of a Xiaomi Vibration Sensor."""
+
+    def __init__(self, device, name, data_key, xiaomi_hub):
+        """Initialize the XiaomiVibration."""
+        self._last_action = None
+        super().__init__(device, name, xiaomi_hub, data_key, None)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attrs = {ATTR_LAST_ACTION: self._last_action}
+        attrs.update(super().device_state_attributes)
+        return attrs
+
+    def parse_data(self, data, raw_data):
+        """Parse data sent by gateway."""
+        value = data.get(self._data_key)
+        if value is None:
+            return False
+
+        if value not in ('vibrate', 'tilt', 'free_fall'):
+            _LOGGER.warning("Unsupported movement_type detected: %s",
+                            value)
+            return False
+
+        self.hass.bus.fire('xiaomi_aqara.movement', {
+            'entity_id': self.entity_id,
+            'movement_type': value
+        })
+        self._last_action = value
+
+        return True
+
+
 class XiaomiButton(XiaomiBinarySensor):
    """Representation of a Xiaomi Button."""

--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -13,7 +13,7 @@ _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['zha']

-# ZigBee Cluster Library Zone Type to Home Assistant device class
+# Zigbee Cluster Library Zone Type to Home Assistant device class
 CLASS_MAPPING = {
    0x000d: 'motion',
    0x0015: 'opening',
@@ -145,7 +145,7 @@ class Remote(zha.Entity, BinarySensorDevice):
    _domain = DOMAIN

    class OnOffListener:
-        """Listener for the OnOff ZigBee cluster."""
+        """Listener for the OnOff Zigbee cluster."""

        def __init__(self, entity):
            """Initialize OnOffListener."""
@@ -170,7 +170,7 @@ class Remote(zha.Entity, BinarySensorDevice):
            pass

    class LevelListener:
-        """Listener for the LevelControl ZigBee cluster."""
+        """Listener for the LevelControl Zigbee cluster."""

        def __init__(self, entity):
            """Initialize LevelListener."""
@@ -253,5 +253,9 @@ class Remote(zha.Entity, BinarySensorDevice):
        """Retrieve latest state."""
        from zigpy.zcl.clusters.general import OnOff
        result = await zha.safe_read(
-            self._endpoint.out_clusters[OnOff.cluster_id], ['on_off'])
+            self._endpoint.out_clusters[OnOff.cluster_id],
+            ['on_off'],
+            allow_cache=False,
+            only_cache=(not self._initialized)
+        )
        self._state = result.get('on_off', self._state)
--- a/homeassistant/components/binary_sensor/zigbee.py
+++ b/homeassistant/components/binary_sensor/zigbee.py
@@ -1,5 +1,5 @@
 """
-Contains functionality to use a ZigBee device as a binary sensor.
+Contains functionality to use a Zigbee device as a binary sensor.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.zigbee/
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({


 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the ZigBee binary sensor platform."""
+    """Set up the Zigbee binary sensor platform."""
    add_entities(
        [ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))], True)

--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -7,10 +7,11 @@ https://home-assistant.io/components/binary_sensor.zwave/
 import logging
 import datetime
 import homeassistant.util.dt as dt_util
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.components import zwave
-from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
-    async_setup_platform, workaround)
+from homeassistant.components.zwave import workaround
 from homeassistant.components.binary_sensor import (
    DOMAIN,
    BinarySensorDevice)
@@ -19,6 +20,23 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = []


+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Old method of setting up Z-Wave binary sensors."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Z-Wave binary sensors from Config Entry."""
+    @callback
+    def async_add_binary_sensor(binary_sensor):
+        """Add Z-Wave  binary sensor."""
+        async_add_entities([binary_sensor])
+
+    async_dispatcher_connect(hass, 'zwave_new_binary_sensor',
+                             async_add_binary_sensor)
+
+
 def get_device(values, **kwargs):
    """Create Z-Wave entity device."""
    device_mapping = workaround.get_device_mapping(values.primary)
--- a/homeassistant/components/blink/init.py
+++ b/homeassistant/components/blink/init.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
    CONF_BINARY_SENSORS, CONF_SENSORS, CONF_FILENAME,
    CONF_MONITORED_CONDITIONS, TEMP_FAHRENHEIT)

-REQUIREMENTS = ['blinkpy==0.10.0']
+REQUIREMENTS = ['blinkpy==0.10.1']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/bloomsky.py
+++ b/homeassistant/components/bloomsky.py
@@ -54,7 +54,7 @@ class BloomSky:
    """Handle all communication with the BloomSky API."""

    # API documentation at http://weatherlution.com/bloomsky-api/
-    API_URL = 'https://api.bloomsky.com/api/skydata'
+    API_URL = 'http://api.bloomsky.com/api/skydata'

    def __init__(self, api_key):
        """Initialize the BookSky."""
--- a/homeassistant/components/bmw_connected_drive/init.py
+++ b/homeassistant/components/bmw_connected_drive/init.py
@@ -9,7 +9,7 @@ import logging

 import voluptuous as vol

-from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
+from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD)
 from homeassistant.helpers import discovery
 from homeassistant.helpers.event import track_utc_time_change
 import homeassistant.helpers.config_validation as cv
@@ -85,6 +85,7 @@ def setup_account(account_config: dict, hass, name: str) \
    password = account_config[CONF_PASSWORD]
    region = account_config[CONF_REGION]
    read_only = account_config[CONF_READ_ONLY]
+
    _LOGGER.debug('Adding new account %s', name)
    cd_account = BMWConnectedDriveAccount(username, password, region, name,
                                          read_only)
--- a/homeassistant/components/calendar/google.py
+++ b/homeassistant/components/calendar/google.py
@@ -68,6 +68,7 @@ class GoogleCalendarData:
        self.event = None

    def _prepare_query(self):
+        # pylint: disable=import-error
        from httplib2 import ServerNotFoundError

        try:
--- a/homeassistant/components/calendar/todoist.py
+++ b/homeassistant/components/calendar/todoist.py
@@ -518,6 +518,8 @@ class TodoistProjectData:
    def update(self):
        """Get the latest data."""
        if self._id is None:
+            self._api.reset_state()
+            self._api.sync()
            project_task_data = [
                task for task in self._api.state[TASKS]
                if not self._project_id_whitelist or
@@ -527,6 +529,7 @@ class TodoistProjectData:

        # If we have no data, we can just return right away.
        if not project_task_data:
+            _LOGGER.debug("No data for %s", self._name)
            self.event = None
            return True

@@ -541,6 +544,8 @@ class TodoistProjectData:

        if not project_tasks:
            # We had no valid tasks
+            _LOGGER.debug("No valid tasks for %s", self._name)
+            self.event = None
            return True

        # Make sure the task collection is reset to prevent an
--- a/homeassistant/components/camera/init.py
+++ b/homeassistant/components/camera/init.py
@@ -299,7 +299,8 @@ class Camera(Entity):
        a direct stream from the camera.
        This method must be run in the event loop.
        """
-        await self.handle_async_still_stream(request, self.frame_interval)
+        return await self.handle_async_still_stream(
+            request, self.frame_interval)

    @property
    def state(self):
--- a/homeassistant/components/camera/amcrest.py
+++ b/homeassistant/components/camera/amcrest.py
@@ -59,8 +59,7 @@ class AmcrestCam(Camera):
        """Return an MJPEG stream."""
        # The snapshot implementation is handled by the parent class
        if self._stream_source == STREAM_SOURCE_LIST['snapshot']:
-            await super().handle_async_mjpeg_stream(request)
-            return
+            return await super().handle_async_mjpeg_stream(request)

        if self._stream_source == STREAM_SOURCE_LIST['mjpeg']:
            # stream an MJPEG image stream directly from the camera
@@ -69,20 +68,22 @@ class AmcrestCam(Camera):
            stream_coro = websession.get(
                streaming_url, auth=self._token, timeout=TIMEOUT)

-            await async_aiohttp_proxy_web(self.hass, request, stream_coro)
+            return await async_aiohttp_proxy_web(
+                self.hass, request, stream_coro)

-        else:
-            # streaming via fmpeg
-            from haffmpeg import CameraMjpeg
+        # streaming via ffmpeg
+        from haffmpeg import CameraMjpeg

-            streaming_url = self._camera.rtsp_url(typeno=self._resolution)
-            stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
-            await stream.open_camera(
-                streaming_url, extra_cmd=self._ffmpeg_arguments)
+        streaming_url = self._camera.rtsp_url(typeno=self._resolution)
+        stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
+        await stream.open_camera(
+            streaming_url, extra_cmd=self._ffmpeg_arguments)

-            await async_aiohttp_proxy_stream(
+        try:
+            return await async_aiohttp_proxy_stream(
                self.hass, request, stream,
                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
            await stream.close()

    @property
--- a/homeassistant/components/camera/arlo.py
+++ b/homeassistant/components/camera/arlo.py
@@ -101,10 +101,12 @@ class ArloCam(Camera):
        await stream.open_camera(
            video.video_url, extra_cmd=self._ffmpeg_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()

    @property
    def name(self):
--- a/homeassistant/components/camera/bloomsky.py
+++ b/homeassistant/components/camera/bloomsky.py
@@ -53,6 +53,11 @@ class BloomSkyCamera(Camera):

        return self._last_image

+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._id
+
    @property
    def name(self):
        """Return the name of this BloomSky device."""
--- a/homeassistant/components/camera/canary.py
+++ b/homeassistant/components/camera/canary.py
@@ -98,10 +98,12 @@ class CanaryCamera(Camera):
            self._live_stream_session.live_stream_url,
            extra_cmd=self._ffmpeg_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()

    @Throttle(MIN_TIME_BETWEEN_SESSION_RENEW)
    def renew_live_stream_session(self):
--- a/homeassistant/components/camera/ffmpeg.py
+++ b/homeassistant/components/camera/ffmpeg.py
@@ -32,8 +32,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 async def async_setup_platform(hass, config, async_add_entities,
                               discovery_info=None):
    """Set up a FFmpeg camera."""
-    if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_INPUT)):
-        return
    async_add_entities([FFmpegCamera(hass, config)])


--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -134,8 +134,7 @@ class MjpegCamera(Camera):
        """Generate an HTTP MJPEG stream from the camera."""
        # aiohttp don't support DigestAuth -> Fallback
        if self._authentication == HTTP_DIGEST_AUTHENTICATION:
-            await super().handle_async_mjpeg_stream(request)
-            return
+            return await super().handle_async_mjpeg_stream(request)

        # connect to stream
        websession = async_get_clientsession(self.hass)
--- a/homeassistant/components/camera/neato.py
+++ b/homeassistant/components/camera/neato.py
@@ -63,3 +63,8 @@ class NeatoCleaningMap(Camera):
    def name(self):
        """Return the name of this camera."""
        return self._robot_name
+
+    @property
+    def unique_id(self):
+        """Return unique ID."""
+        return self._robot_serial
--- a/homeassistant/components/camera/onvif.py
+++ b/homeassistant/components/camera/onvif.py
@@ -74,9 +74,6 @@ SERVICE_PTZ_SCHEMA = vol.Schema({

 def setup_platform(hass, config, add_entities, discovery_info=None):
    """Set up a ONVIF camera."""
-    if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_HOST)):
-        return
-
    def handle_ptz(service):
        """Handle PTZ service call."""
        pan = service.data.get(ATTR_PAN, None)
@@ -93,8 +90,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
        for camera in target_cameras:
            camera.perform_ptz(pan, tilt, zoom)

-    hass.services.async_register(DOMAIN, SERVICE_PTZ, handle_ptz,
-                                 schema=SERVICE_PTZ_SCHEMA)
+    hass.services.register(DOMAIN, SERVICE_PTZ, handle_ptz,
+                           schema=SERVICE_PTZ_SCHEMA)
    add_entities([ONVIFHassCamera(hass, config)])


@@ -221,10 +218,12 @@ class ONVIFHassCamera(Camera):
        await stream.open_camera(
            self._input, extra_cmd=self._ffmpeg_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()

    @property
    def name(self):
--- a/homeassistant/components/camera/ring.py
+++ b/homeassistant/components/camera/ring.py
@@ -97,6 +97,11 @@ class RingCam(Camera):
        """Return the name of this camera."""
        return self._name

+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._camera.id
+
    @property
    def device_state_attributes(self):
        """Return the state attributes."""
@@ -134,10 +139,12 @@ class RingCam(Camera):
        await stream.open_camera(
            self._video_url, extra_cmd=self._ffmpeg_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()

    @property
    def should_poll(self):
--- a/homeassistant/components/camera/synology.py
+++ b/homeassistant/components/camera/synology.py
@@ -92,7 +92,7 @@ class SynologyCamera(Camera):
        websession = async_get_clientsession(self.hass, self._verify_ssl)
        stream_coro = websession.get(streaming_url)

-        await async_aiohttp_proxy_web(self.hass, request, stream_coro)
+        return await async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
--- a/homeassistant/components/camera/xiaomi.py
+++ b/homeassistant/components/camera/xiaomi.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_HOST): cv.string,
    vol.Required(CONF_MODEL): vol.Any(MODEL_YI,
                                      MODEL_XIAOFANG),
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
    vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
    vol.Required(CONF_PASSWORD): cv.string,
@@ -158,7 +158,9 @@ class XiaomiCamera(Camera):
        await stream.open_camera(
            self._last_url, extra_cmd=self._extra_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -32,7 +32,7 @@ CONF_FFMPEG_ARGUMENTS = 'ffmpeg_arguments'
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_NAME): cv.string,
    vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
    vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
    vol.Required(CONF_PASSWORD): cv.string,
@@ -144,7 +144,9 @@ class YiCamera(Camera):
        await stream.open_camera(
            self._last_url, extra_cmd=self._extra_arguments)

-        await async_aiohttp_proxy_stream(
-            self.hass, request, stream,
-            'multipart/x-mixed-replace;boundary=ffserver')
-        await stream.close()
+        try:
+            return await async_aiohttp_proxy_stream(
+                self.hass, request, stream,
+                'multipart/x-mixed-replace;boundary=ffserver')
+        finally:
+            await stream.close()
--- a/homeassistant/components/cast/.translations/pt.json
+++ b/homeassistant/components/cast/.translations/pt.json
@@ -7,9 +7,9 @@
        "step": {
            "confirm": {
                "description": "Deseja configurar o Google Cast?",
-                "title": ""
+                "title": "Google Cast"
            }
        },
-        "title": ""
+        "title": "Google Cast"
    }
 }
--- a/homeassistant/components/cast/.translations/ro.json
+++ b/homeassistant/components/cast/.translations/ro.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Nu s-au g\u0103sit dispozitive Google Cast \u00een re\u021bea.",
+            "single_instance_allowed": "Este necesar\u0103 o singur\u0103 configura\u021bie a serviciului Google Cast."
+        },
+        "step": {
+            "confirm": {
+                "description": "Dori\u021bi s\u0103 configura\u021bi Google Cast?",
+                "title": "Google Cast"
+            }
+        },
+        "title": "Google Cast"
+    }
+}
--- a/homeassistant/components/climate/init.py
+++ b/homeassistant/components/climate/init.py
@@ -48,11 +48,6 @@ STATE_MANUAL = 'manual'
 STATE_DRY = 'dry'
 STATE_FAN_ONLY = 'fan_only'
 STATE_ECO = 'eco'
-STATE_ELECTRIC = 'electric'
-STATE_PERFORMANCE = 'performance'
-STATE_HIGH_DEMAND = 'high_demand'
-STATE_HEAT_PUMP = 'heat_pump'
-STATE_GAS = 'gas'

 SUPPORT_TARGET_TEMPERATURE = 1
 SUPPORT_TARGET_TEMPERATURE_HIGH = 2
--- a/homeassistant/components/climate/daikin.py
+++ b/homeassistant/components/climate/daikin.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
    ATTR_TEMPERATURE, CONF_HOST, CONF_NAME, TEMP_CELSIUS)
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['pydaikin==0.4']
+REQUIREMENTS = ['pydaikin==0.6']

 _LOGGER = logging.getLogger(__name__)

@@ -40,6 +40,15 @@ HA_STATE_TO_DAIKIN = {
    STATE_OFF: 'off',
 }

+DAIKIN_TO_HA_STATE = {
+    'fan': STATE_FAN_ONLY,
+    'dry': STATE_DRY,
+    'cool': STATE_COOL,
+    'hot': STATE_HEAT,
+    'auto': STATE_AUTO,
+    'off': STATE_OFF,
+}
+
 HA_ATTR_TO_DAIKIN = {
    ATTR_OPERATION_MODE: 'mode',
    ATTR_FAN_MODE: 'f_rate',
@@ -75,9 +84,7 @@ class DaikinClimate(ClimateDevice):
        self._api = api
        self._force_refresh = False
        self._list = {
-            ATTR_OPERATION_MODE: list(
-                map(str.title, set(HA_STATE_TO_DAIKIN.values()))
-            ),
+            ATTR_OPERATION_MODE: list(HA_STATE_TO_DAIKIN),
            ATTR_FAN_MODE: list(
                map(
                    str.title,
@@ -136,11 +143,11 @@ class DaikinClimate(ClimateDevice):
        elif key == ATTR_OPERATION_MODE:
            # Daikin can return also internal states auto-1 or auto-7
            # and we need to translate them as AUTO
-            value = re.sub(
-                '[^a-z]',
-                '',
-                self._api.device.represent(daikin_attr)[1]
-            ).title()
+            daikin_mode = re.sub(
+                '[^a-z]', '',
+                self._api.device.represent(daikin_attr)[1])
+            ha_mode = DAIKIN_TO_HA_STATE.get(daikin_mode)
+            value = ha_mode

        if value is None:
            _LOGGER.error("Invalid value requested for key %s", key)
@@ -167,7 +174,9 @@ class DaikinClimate(ClimateDevice):

            daikin_attr = HA_ATTR_TO_DAIKIN.get(attr)
            if daikin_attr is not None:
-                if value.title() in self._list[attr]:
+                if attr == ATTR_OPERATION_MODE:
+                    values[daikin_attr] = HA_STATE_TO_DAIKIN[value]
+                elif value in self._list[attr]:
                    values[daikin_attr] = value.lower()
                else:
                    _LOGGER.error("Invalid value %s for %s", attr, value)
--- a/homeassistant/components/climate/dyson.py
+++ b/homeassistant/components/climate/dyson.py
@@ -0,0 +1,176 @@
+"""
+Support for Dyson Pure Hot+Cool link fan.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.dyson/
+"""
+import logging
+
+from homeassistant.components.dyson import DYSON_DEVICES
+from homeassistant.components.climate import (
+    ClimateDevice, STATE_HEAT, STATE_COOL, STATE_IDLE,
+    SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE)
+from homeassistant.const import TEMP_CELSIUS, ATTR_TEMPERATURE
+
+_LOGGER = logging.getLogger(__name__)
+
+STATE_DIFFUSE = "Diffuse Mode"
+STATE_FOCUS = "Focus Mode"
+FAN_LIST = [STATE_FOCUS, STATE_DIFFUSE]
+OPERATION_LIST = [STATE_HEAT, STATE_COOL]
+
+SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
+                 | SUPPORT_OPERATION_MODE)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the Dyson fan components."""
+    if discovery_info is None:
+        return
+
+    from libpurecoollink.dyson_pure_hotcool_link import DysonPureHotCoolLink
+    # Get Dyson Devices from parent component.
+    add_devices(
+        [DysonPureHotCoolLinkDevice(device)
+         for device in hass.data[DYSON_DEVICES]
+         if isinstance(device, DysonPureHotCoolLink)]
+    )
+
+
+class DysonPureHotCoolLinkDevice(ClimateDevice):
+    """Representation of a Dyson climate fan."""
+
+    def __init__(self, device):
+        """Initialize the fan."""
+        self._device = device
+        self._current_temp = None
+
+    async def async_added_to_hass(self):
+        """Call when entity is added to hass."""
+        self.hass.async_add_job(self._device.add_message_listener,
+                                self.on_message)
+
+    def on_message(self, message):
+        """Call when new messages received from the climate."""
+        from libpurecoollink.dyson_pure_state import DysonPureHotCoolState
+
+        if isinstance(message, DysonPureHotCoolState):
+            _LOGGER.debug("Message received for climate device %s : %s",
+                          self.name, message)
+            self.schedule_update_ha_state()
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def supported_features(self):
+        """Return the list of supported features."""
+        return SUPPORT_FLAGS
+
+    @property
+    def name(self):
+        """Return the display name of this climate."""
+        return self._device.name
+
+    @property
+    def temperature_unit(self):
+        """Return the unit of measurement."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        if self._device.environmental_state:
+            temperature_kelvin = self._device.environmental_state.temperature
+            if temperature_kelvin != 0:
+                self._current_temp = float("{0:.1f}".format(
+                    temperature_kelvin - 273))
+        return self._current_temp
+
+    @property
+    def target_temperature(self):
+        """Return the target temperature."""
+        heat_target = int(self._device.state.heat_target) / 10
+        return int(heat_target - 273)
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        if self._device.environmental_state:
+            if self._device.environmental_state.humidity == 0:
+                return None
+            return self._device.environmental_state.humidity
+        return None
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        from libpurecoollink.const import HeatMode, HeatState
+        if self._device.state.heat_mode == HeatMode.HEAT_ON.value:
+            if self._device.state.heat_state == HeatState.HEAT_STATE_ON.value:
+                return STATE_HEAT
+            return STATE_IDLE
+        return STATE_COOL
+
+    @property
+    def operation_list(self):
+        """Return the list of available operation modes."""
+        return OPERATION_LIST
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        from libpurecoollink.const import FocusMode
+        if self._device.state.focus_mode == FocusMode.FOCUS_ON.value:
+            return STATE_FOCUS
+        return STATE_DIFFUSE
+
+    @property
+    def fan_list(self):
+        """Return the list of available fan modes."""
+        return FAN_LIST
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        target_temp = kwargs.get(ATTR_TEMPERATURE)
+        if target_temp is None:
+            return
+        target_temp = int(target_temp)
+        _LOGGER.debug("Set %s temperature %s", self.name, target_temp)
+        # Limit the target temperature into acceptable range.
+        target_temp = min(self.max_temp, target_temp)
+        target_temp = max(self.min_temp, target_temp)
+        from libpurecoollink.const import HeatTarget, HeatMode
+        self._device.set_configuration(
+            heat_target=HeatTarget.celsius(target_temp),
+            heat_mode=HeatMode.HEAT_ON)
+
+    def set_fan_mode(self, fan_mode):
+        """Set new fan mode."""
+        _LOGGER.debug("Set %s focus mode %s", self.name, fan_mode)
+        from libpurecoollink.const import FocusMode
+        if fan_mode == STATE_FOCUS:
+            self._device.set_configuration(focus_mode=FocusMode.FOCUS_ON)
+        elif fan_mode == STATE_DIFFUSE:
+            self._device.set_configuration(focus_mode=FocusMode.FOCUS_OFF)
+
+    def set_operation_mode(self, operation_mode):
+        """Set operation mode."""
+        _LOGGER.debug("Set %s heat mode %s", self.name, operation_mode)
+        from libpurecoollink.const import HeatMode
+        if operation_mode == STATE_HEAT:
+            self._device.set_configuration(heat_mode=HeatMode.HEAT_ON)
+        elif operation_mode == STATE_COOL:
+            self._device.set_configuration(heat_mode=HeatMode.HEAT_OFF)
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return 1
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return 37
--- a/homeassistant/components/climate/elkm1.py
+++ b/homeassistant/components/climate/elkm1.py
@@ -0,0 +1,193 @@
+"""
+Support for control of Elk-M1 connected thermostats.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.elkm1/
+"""
+from homeassistant.components.climate import (
+    ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW, PRECISION_WHOLE, STATE_AUTO,
+    STATE_COOL, STATE_FAN_ONLY, STATE_HEAT, STATE_IDLE, SUPPORT_AUX_HEAT,
+    SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE_HIGH,
+    SUPPORT_TARGET_TEMPERATURE_LOW, ClimateDevice)
+from homeassistant.components.elkm1 import (
+    DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities)
+from homeassistant.const import STATE_ON
+
+DEPENDENCIES = [ELK_DOMAIN]
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Create the Elk-M1 thermostat platform."""
+    if discovery_info is None:
+        return
+
+    elk = hass.data[ELK_DOMAIN]['elk']
+    async_add_entities(create_elk_entities(
+        hass, elk.thermostats, 'thermostat', ElkThermostat, []), True)
+
+
+class ElkThermostat(ElkEntity, ClimateDevice):
+    """Representation of an Elk-M1 Thermostat."""
+
+    def __init__(self, element, elk, elk_data):
+        """Initialize climate entity."""
+        super().__init__(element, elk, elk_data)
+        self._state = None
+
+    @property
+    def supported_features(self):
+        """Return the list of supported features."""
+        return (SUPPORT_OPERATION_MODE | SUPPORT_FAN_MODE | SUPPORT_AUX_HEAT
+                | SUPPORT_TARGET_TEMPERATURE_HIGH
+                | SUPPORT_TARGET_TEMPERATURE_LOW)
+
+    @property
+    def temperature_unit(self):
+        """Return the temperature unit."""
+        return self._temperature_unit
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._element.current_temp
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we are trying to reach."""
+        from elkm1_lib.const import ThermostatMode
+        if (self._element.mode == ThermostatMode.HEAT.value) or (
+                self._element.mode == ThermostatMode.EMERGENCY_HEAT.value):
+            return self._element.heat_setpoint
+        if self._element.mode == ThermostatMode.COOL.value:
+            return self._element.cool_setpoint
+        return None
+
+    @property
+    def target_temperature_high(self):
+        """Return the high target temperature."""
+        return self._element.cool_setpoint
+
+    @property
+    def target_temperature_low(self):
+        """Return the low target temperature."""
+        return self._element.heat_setpoint
+
+    @property
+    def target_temperature_step(self):
+        """Return the supported step of target temperature."""
+        return 1
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return self._element.humidity
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        return self._state
+
+    @property
+    def operation_list(self):
+        """Return the list of available operation modes."""
+        return [STATE_IDLE, STATE_HEAT, STATE_COOL, STATE_AUTO, STATE_FAN_ONLY]
+
+    @property
+    def precision(self):
+        """Return the precision of the system."""
+        return PRECISION_WHOLE
+
+    @property
+    def is_aux_heat_on(self):
+        """Return if aux heater is on."""
+        from elkm1_lib.const import ThermostatMode
+        return self._element.mode == ThermostatMode.EMERGENCY_HEAT.value
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature supported."""
+        return 1
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature supported."""
+        return 99
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        from elkm1_lib.const import ThermostatFan
+        if self._element.fan == ThermostatFan.AUTO.value:
+            return STATE_AUTO
+        if self._element.fan == ThermostatFan.ON.value:
+            return STATE_ON
+        return None
+
+    def _elk_set(self, mode, fan):
+        from elkm1_lib.const import ThermostatSetting
+        if mode is not None:
+            self._element.set(ThermostatSetting.MODE.value, mode)
+        if fan is not None:
+            self._element.set(ThermostatSetting.FAN.value, fan)
+
+    async def async_set_operation_mode(self, operation_mode):
+        """Set thermostat operation mode."""
+        from elkm1_lib.const import ThermostatFan, ThermostatMode
+        settings = {
+            STATE_IDLE: (ThermostatMode.OFF.value, ThermostatFan.AUTO.value),
+            STATE_HEAT: (ThermostatMode.HEAT.value, None),
+            STATE_COOL: (ThermostatMode.COOL.value, None),
+            STATE_AUTO: (ThermostatMode.AUTO.value, None),
+            STATE_FAN_ONLY: (ThermostatMode.OFF.value, ThermostatFan.ON.value)
+        }
+        self._elk_set(settings[operation_mode][0], settings[operation_mode][1])
+
+    async def async_turn_aux_heat_on(self):
+        """Turn auxiliary heater on."""
+        from elkm1_lib.const import ThermostatMode
+        self._elk_set(ThermostatMode.EMERGENCY_HEAT.value, None)
+
+    async def async_turn_aux_heat_off(self):
+        """Turn auxiliary heater off."""
+        from elkm1_lib.const import ThermostatMode
+        self._elk_set(ThermostatMode.HEAT.value, None)
+
+    @property
+    def fan_list(self):
+        """Return the list of available fan modes."""
+        return [STATE_AUTO, STATE_ON]
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set new target fan mode."""
+        from elkm1_lib.const import ThermostatFan
+        if fan_mode == STATE_AUTO:
+            self._elk_set(None, ThermostatFan.AUTO.value)
+        elif fan_mode == STATE_ON:
+            self._elk_set(None, ThermostatFan.ON.value)
+
+    async def async_set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        from elkm1_lib.const import ThermostatSetting
+        low_temp = kwargs.get(ATTR_TARGET_TEMP_LOW)
+        high_temp = kwargs.get(ATTR_TARGET_TEMP_HIGH)
+        if low_temp is not None:
+            self._element.set(
+                ThermostatSetting.HEAT_SETPOINT.value, round(low_temp))
+        if high_temp is not None:
+            self._element.set(
+                ThermostatSetting.COOL_SETPOINT.value, round(high_temp))
+
+    def _element_changed(self, element, changeset):
+        from elkm1_lib.const import ThermostatFan, ThermostatMode
+        mode_to_state = {
+            ThermostatMode.OFF.value: STATE_IDLE,
+            ThermostatMode.COOL.value: STATE_COOL,
+            ThermostatMode.HEAT.value: STATE_HEAT,
+            ThermostatMode.EMERGENCY_HEAT.value: STATE_HEAT,
+            ThermostatMode.AUTO.value: STATE_AUTO,
+        }
+        self._state = mode_to_state.get(self._element.mode)
+        if self._state == STATE_IDLE and \
+                self._element.fan == ThermostatFan.ON.value:
+            self._state = STATE_FAN_ONLY
--- a/homeassistant/components/climate/eq3btsmart.py
+++ b/homeassistant/components/climate/eq3btsmart.py
@@ -10,12 +10,13 @@ import voluptuous as vol

 from homeassistant.components.climate import (
    STATE_ON, STATE_OFF, STATE_AUTO, PLATFORM_SCHEMA, ClimateDevice,
-    SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE, SUPPORT_AWAY_MODE)
+    SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE, SUPPORT_AWAY_MODE,
+    SUPPORT_ON_OFF)
 from homeassistant.const import (
    CONF_MAC, CONF_DEVICES, TEMP_CELSIUS, ATTR_TEMPERATURE, PRECISION_HALVES)
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['python-eq3bt==0.1.9', 'construct==2.9.41']
+REQUIREMENTS = ['python-eq3bt==0.1.9', 'construct==2.9.45']

 _LOGGER = logging.getLogger(__name__)

@@ -39,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })

 SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
-                 SUPPORT_AWAY_MODE)
+                 SUPPORT_AWAY_MODE | SUPPORT_ON_OFF)


 def setup_platform(hass, config, add_entities, discovery_info=None):
@@ -53,14 +54,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
    add_entities(devices)


-# pylint: disable=import-error
 class EQ3BTSmartThermostat(ClimateDevice):
    """Representation of an eQ-3 Bluetooth Smart thermostat."""

    def __init__(self, _mac, _name):
        """Initialize the thermostat."""
        # We want to avoid name clash with this module.
-        import eq3bt as eq3
+        import eq3bt as eq3  # pylint: disable=import-error

        self.modes = {
            eq3.Mode.Open: STATE_ON,
@@ -151,6 +151,14 @@ class EQ3BTSmartThermostat(ClimateDevice):
        """Return if we are away."""
        return self.current_operation == STATE_AWAY

+    def turn_on(self):
+        """Turn device on."""
+        self.set_operation_mode(STATE_AUTO)
+
+    def turn_off(self):
+        """Turn device off."""
+        self.set_operation_mode(STATE_OFF)
+
    @property
    def min_temp(self):
        """Return the minimum temperature."""
@@ -176,7 +184,7 @@ class EQ3BTSmartThermostat(ClimateDevice):

    def update(self):
        """Update the data from the thermostat."""
-        from bluepy.btle import BTLEException
+        from bluepy.btle import BTLEException  # pylint: disable=import-error
        try:
            self._thermostat.update()
        except BTLEException as ex:
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -232,11 +232,11 @@ class GenericThermostat(ClimateDevice):
        if operation_mode == STATE_HEAT:
            self._current_operation = STATE_HEAT
            self._enabled = True
-            await self._async_control_heating()
+            await self._async_control_heating(force=True)
        elif operation_mode == STATE_COOL:
            self._current_operation = STATE_COOL
            self._enabled = True
-            await self._async_control_heating()
+            await self._async_control_heating(force=True)
        elif operation_mode == STATE_OFF:
            self._current_operation = STATE_OFF
            self._enabled = False
@@ -262,7 +262,7 @@ class GenericThermostat(ClimateDevice):
        if temperature is None:
            return
        self._target_temp = temperature
-        await self._async_control_heating()
+        await self._async_control_heating(force=True)
        await self.async_update_ha_state()

    @property
@@ -307,7 +307,7 @@ class GenericThermostat(ClimateDevice):
        except ValueError as ex:
            _LOGGER.error("Unable to update from sensor: %s", ex)

-    async def _async_control_heating(self, time=None):
+    async def _async_control_heating(self, time=None, force=False):
        """Check if we need to turn heating on or off."""
        async with self._temp_lock:
            if not self._active and None not in (self._cur_temp,
@@ -320,16 +320,21 @@ class GenericThermostat(ClimateDevice):
            if not self._active or not self._enabled:
                return

-            if self.min_cycle_duration:
-                if self._is_device_active:
-                    current_state = STATE_ON
-                else:
-                    current_state = STATE_OFF
-                long_enough = condition.state(
-                    self.hass, self.heater_entity_id, current_state,
-                    self.min_cycle_duration)
-                if not long_enough:
-                    return
+            if not force and time is None:
+                # If the `force` argument is True, we
+                # ignore `min_cycle_duration`.
+                # If the `time` argument is not none, we were invoked for
+                # keep-alive purposes, and `min_cycle_duration` is irrelevant.
+                if self.min_cycle_duration:
+                    if self._is_device_active:
+                        current_state = STATE_ON
+                    else:
+                        current_state = STATE_OFF
+                    long_enough = condition.state(
+                        self.hass, self.heater_entity_id, current_state,
+                        self.min_cycle_duration)
+                    if not long_enough:
+                        return

            too_cold = \
                self._target_temp - self._cur_temp >= self._cold_tolerance
@@ -380,15 +385,19 @@ class GenericThermostat(ClimateDevice):

    async def async_turn_away_mode_on(self):
        """Turn away mode on by setting it on away hold indefinitely."""
+        if self._is_away:
+            return
        self._is_away = True
        self._saved_target_temp = self._target_temp
        self._target_temp = self._away_temp
-        await self._async_control_heating()
+        await self._async_control_heating(force=True)
        await self.async_update_ha_state()

    async def async_turn_away_mode_off(self):
        """Turn away off."""
+        if not self._is_away:
+            return
        self._is_away = False
        self._target_temp = self._saved_target_temp
-        await self._async_control_heating()
+        await self._async_control_heating(force=True)
        await self.async_update_ha_state()
--- a/homeassistant/components/climate/knx.py
+++ b/homeassistant/components/climate/knx.py
@@ -75,7 +75,7 @@ def async_add_entities_discovery(hass, discovery_info, async_add_entities):
    entities = []
    for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
        device = hass.data[DATA_KNX].xknx.devices[device_name]
-        entities.append(KNXClimate(hass, device))
+        entities.append(KNXClimate(device))
    async_add_entities(entities)


@@ -110,17 +110,15 @@ def async_add_entities_config(hass, config, async_add_entities):
        group_address_operation_mode_comfort=config.get(
            CONF_OPERATION_MODE_COMFORT_ADDRESS))
    hass.data[DATA_KNX].xknx.devices.add(climate)
-    async_add_entities([KNXClimate(hass, climate)])
+    async_add_entities([KNXClimate(climate)])


 class KNXClimate(ClimateDevice):
    """Representation of a KNX climate device."""

-    def __init__(self, hass, device):
+    def __init__(self, device):
        """Initialize of a KNX climate device."""
        self.device = device
-        self.hass = hass
-        self.async_register_callbacks()

    @property
    def supported_features(self):
@@ -137,6 +135,10 @@ class KNXClimate(ClimateDevice):
            await self.async_update_ha_state()
        self.device.register_device_updated_cb(after_update_callback)

+    async def async_added_to_hass(self):
+        """Store register state change callback."""
+        self.async_register_callbacks()
+
    @property
    def name(self):
        """Return the name of the KNX device."""
--- a/homeassistant/components/climate/melissa.py
+++ b/homeassistant/components/climate/melissa.py
@@ -34,10 +34,11 @@ FAN_MODES = [
 ]


-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
    """Iterate through and add all Melissa devices."""
    api = hass.data[DATA_MELISSA]
-    devices = api.fetch_devices().values()
+    devices = (await api.async_fetch_devices()).values()

    all_devices = []

@@ -46,7 +47,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
            all_devices.append(MelissaClimate(
                api, device['serial_number'], device))

-    add_entities(all_devices)
+    async_add_entities(all_devices)


 class MelissaClimate(ClimateDevice):
@@ -142,48 +143,48 @@ class MelissaClimate(ClimateDevice):
        """Return the list of supported features."""
        return SUPPORT_FLAGS

-    def set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs):
        """Set new target temperature."""
        temp = kwargs.get(ATTR_TEMPERATURE)
-        self.send({self._api.TEMP: temp})
+        await self.async_send({self._api.TEMP: temp})

-    def set_fan_mode(self, fan_mode):
+    async def async_set_fan_mode(self, fan_mode):
        """Set fan mode."""
        melissa_fan_mode = self.hass_fan_to_melissa(fan_mode)
-        self.send({self._api.FAN: melissa_fan_mode})
+        await self.async_send({self._api.FAN: melissa_fan_mode})

-    def set_operation_mode(self, operation_mode):
+    async def async_set_operation_mode(self, operation_mode):
        """Set operation mode."""
        mode = self.hass_mode_to_melissa(operation_mode)
-        self.send({self._api.MODE: mode})
+        await self.async_send({self._api.MODE: mode})

-    def turn_on(self):
+    async def async_turn_on(self):
        """Turn on device."""
-        self.send({self._api.STATE: self._api.STATE_ON})
+        await self.async_send({self._api.STATE: self._api.STATE_ON})

-    def turn_off(self):
+    async def async_turn_off(self):
        """Turn off device."""
-        self.send({self._api.STATE: self._api.STATE_OFF})
+        await self.async_send({self._api.STATE: self._api.STATE_OFF})

-    def send(self, value):
+    async def async_send(self, value):
        """Send action to service."""
        try:
            old_value = self._cur_settings.copy()
            self._cur_settings.update(value)
        except AttributeError:
            old_value = None
-        if not self._api.send(self._serial_number, self._cur_settings):
+        if not await self._api.async_send(
+                self._serial_number, self._cur_settings):
            self._cur_settings = old_value
-            return False
-        return True

-    def update(self):
+    async def async_update(self):
        """Get latest data from Melissa."""
        try:
-            self._data = self._api.status(cached=True)[self._serial_number]
-            self._cur_settings = self._api.cur_settings(
+            self._data = (await self._api.async_status(cached=True))[
+                self._serial_number]
+            self._cur_settings = (await self._api.async_cur_settings(
                self._serial_number
-            )['controller']['_relation']['command_log']
+            ))['controller']['_relation']['command_log']
        except KeyError:
            _LOGGER.warning(
                'Unable to update entity %s', self.entity_id)
--- a/homeassistant/components/climate/mill.py
+++ b/homeassistant/components/climate/mill.py
@@ -0,0 +1,216 @@
+"""
+Support for mill wifi-enabled home heaters.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.mill/
+"""
+
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.climate import (
+    ClimateDevice, DOMAIN, PLATFORM_SCHEMA, STATE_HEAT,
+    SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE,
+    SUPPORT_ON_OFF, SUPPORT_OPERATION_MODE)
+from homeassistant.const import (
+    ATTR_TEMPERATURE, CONF_PASSWORD, CONF_USERNAME,
+    STATE_ON, STATE_OFF, TEMP_CELSIUS)
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+REQUIREMENTS = ['millheater==0.2.2']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_AWAY_TEMP = 'away_temp'
+ATTR_COMFORT_TEMP = 'comfort_temp'
+ATTR_ROOM_NAME = 'room_name'
+ATTR_SLEEP_TEMP = 'sleep_temp'
+MAX_TEMP = 35
+MIN_TEMP = 5
+SERVICE_SET_ROOM_TEMP = 'mill_set_room_temperature'
+
+SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE |
+                 SUPPORT_FAN_MODE | SUPPORT_ON_OFF |
+                 SUPPORT_OPERATION_MODE)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+})
+
+SET_ROOM_TEMP_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ROOM_NAME): cv.string,
+    vol.Optional(ATTR_AWAY_TEMP): cv.positive_int,
+    vol.Optional(ATTR_COMFORT_TEMP): cv.positive_int,
+    vol.Optional(ATTR_SLEEP_TEMP): cv.positive_int,
+})
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the Mill heater."""
+    from mill import Mill
+    mill_data_connection = Mill(config[CONF_USERNAME],
+                                config[CONF_PASSWORD],
+                                websession=async_get_clientsession(hass))
+    if not await mill_data_connection.connect():
+        _LOGGER.error("Failed to connect to Mill")
+        return
+
+    await mill_data_connection.find_all_heaters()
+
+    dev = []
+    for heater in mill_data_connection.heaters.values():
+        dev.append(MillHeater(heater, mill_data_connection))
+    async_add_entities(dev)
+
+    async def set_room_temp(service):
+        """Set room temp."""
+        room_name = service.data.get(ATTR_ROOM_NAME)
+        sleep_temp = service.data.get(ATTR_SLEEP_TEMP)
+        comfort_temp = service.data.get(ATTR_COMFORT_TEMP)
+        away_temp = service.data.get(ATTR_AWAY_TEMP)
+        await mill_data_connection.set_room_temperatures_by_name(room_name,
+                                                                 sleep_temp,
+                                                                 comfort_temp,
+                                                                 away_temp)
+
+    hass.services.async_register(DOMAIN, SERVICE_SET_ROOM_TEMP,
+                                 set_room_temp, schema=SET_ROOM_TEMP_SCHEMA)
+
+
+class MillHeater(ClimateDevice):
+    """Representation of a Mill Thermostat device."""
+
+    def __init__(self, heater, mill_data_connection):
+        """Initialize the thermostat."""
+        self._heater = heater
+        self._conn = mill_data_connection
+
+    @property
+    def supported_features(self):
+        """Return the list of supported features."""
+        return SUPPORT_FLAGS
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._heater.device_status == 0  # weird api choice
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._heater.device_id
+
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._heater.name
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self._heater.room:
+            room = self._heater.room.name
+        else:
+            room = "Independent device"
+        return {
+            "room": room,
+            "open_window": self._heater.open_window,
+            "heating": self._heater.is_heating,
+            "controlled_by_tibber": self._heater.tibber_control,
+        }
+
+    @property
+    def temperature_unit(self):
+        """Return the unit of measurement which this thermostat uses."""
+        return TEMP_CELSIUS
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._heater.set_temp
+
+    @property
+    def target_temperature_step(self):
+        """Return the supported step of target temperature."""
+        return 1
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._heater.current_temp
+
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return STATE_ON if self._heater.fan_status == 1 else STATE_OFF
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return [STATE_ON, STATE_OFF]
+
+    @property
+    def is_on(self):
+        """Return true if heater is on."""
+        return self._heater.power_status == 1
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        return MIN_TEMP
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        return MAX_TEMP
+
+    @property
+    def current_operation(self):
+        """Return current operation."""
+        return STATE_HEAT if self.is_on else STATE_OFF
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return [STATE_HEAT, STATE_OFF]
+
+    async def async_set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if temperature is None:
+            return
+        await self._conn.set_heater_temp(self._heater.device_id,
+                                         int(temperature))
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set new target fan mode."""
+        fan_status = 1 if fan_mode == STATE_ON else 0
+        await self._conn.heater_control(self._heater.device_id,
+                                        fan_status=fan_status)
+
+    async def async_turn_on(self):
+        """Turn Mill unit on."""
+        await self._conn.heater_control(self._heater.device_id,
+                                        power_status=1)
+
+    async def async_turn_off(self):
+        """Turn Mill unit off."""
+        await self._conn.heater_control(self._heater.device_id,
+                                        power_status=0)
+
+    async def async_update(self):
+        """Retrieve latest state."""
+        self._heater = await self._conn.update_device(self._heater.device_id)
+
+    async def async_set_operation_mode(self, operation_mode):
+        """Set operation mode."""
+        if operation_mode == STATE_HEAT:
+            await self.async_turn_on()
+        elif operation_mode == STATE_OFF:
+            await self.async_turn_off()
+        else:
+            _LOGGER.error("Unrecognized operation mode: %s", operation_mode)
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -75,6 +75,7 @@ CONF_SEND_IF_OFF = 'send_if_off'

 CONF_MIN_TEMP = 'min_temp'
 CONF_MAX_TEMP = 'max_temp'
+CONF_TEMP_STEP = 'temp_step'

 SCHEMA_BASE = CLIMATE_PLATFORM_SCHEMA.extend(MQTT_BASE_PLATFORM_SCHEMA.schema)
 PLATFORM_SCHEMA = SCHEMA_BASE.extend({
@@ -124,7 +125,8 @@ PLATFORM_SCHEMA = SCHEMA_BASE.extend({
    vol.Optional(CONF_PAYLOAD_OFF, default="OFF"): cv.string,

    vol.Optional(CONF_MIN_TEMP, default=DEFAULT_MIN_TEMP): vol.Coerce(float),
-    vol.Optional(CONF_MAX_TEMP, default=DEFAULT_MAX_TEMP): vol.Coerce(float)
+    vol.Optional(CONF_MAX_TEMP, default=DEFAULT_MAX_TEMP): vol.Coerce(float),
+    vol.Optional(CONF_TEMP_STEP, default=1.0): vol.Coerce(float)

 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)

@@ -213,6 +215,7 @@ async def _async_setup_entity(hass, config, async_add_entities,
            config.get(CONF_PAYLOAD_NOT_AVAILABLE),
            config.get(CONF_MIN_TEMP),
            config.get(CONF_MAX_TEMP),
+            config.get(CONF_TEMP_STEP),
            discovery_hash,
        )])

@@ -226,7 +229,7 @@ class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
                 current_swing_mode, current_operation, aux, send_if_off,
                 payload_on, payload_off, availability_topic,
                 payload_available, payload_not_available,
-                 min_temp, max_temp, discovery_hash):
+                 min_temp, max_temp, temp_step, discovery_hash):
        """Initialize the climate device."""
        MqttAvailability.__init__(self, availability_topic, qos,
                                  payload_available, payload_not_available)
@@ -237,19 +240,26 @@ class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
        self._value_templates = value_templates
        self._qos = qos
        self._retain = retain
-        self._target_temperature = target_temperature
+        # set to None in non-optimistic mode
+        self._target_temperature = self._current_fan_mode = \
+            self._current_operation = self._current_swing_mode = None
+        if self._topic[CONF_TEMPERATURE_STATE_TOPIC] is None:
+            self._target_temperature = target_temperature
        self._unit_of_measurement = hass.config.units.temperature_unit
        self._away = away
        self._hold = hold
        self._current_temperature = None
-        self._current_fan_mode = current_fan_mode
-        self._current_operation = current_operation
+        if self._topic[CONF_FAN_MODE_STATE_TOPIC] is None:
+            self._current_fan_mode = current_fan_mode
+        if self._topic[CONF_MODE_STATE_TOPIC] is None:
+            self._current_operation = current_operation
        self._aux = aux
-        self._current_swing_mode = current_swing_mode
+        if self._topic[CONF_SWING_MODE_STATE_TOPIC] is None:
+            self._current_swing_mode = current_swing_mode
        self._fan_list = fan_mode_list
        self._operation_list = mode_list
        self._swing_list = swing_mode_list
-        self._target_temperature_step = 1
+        self._target_temperature_step = temp_step
        self._send_if_off = send_if_off
        self._payload_on = payload_on
        self._payload_off = payload_off
--- a/homeassistant/components/climate/opentherm_gw.py
+++ b/homeassistant/components/climate/opentherm_gw.py
@@ -1,34 +1,23 @@
 """
-Support for OpenTherm Gateway devices.
+Support for OpenTherm Gateway climate devices.

-For more details about this component, please refer to the documentation at
+For more details about this platform, please refer to the documentation at
 http://home-assistant.io/components/climate.opentherm_gw/
 """
 import logging

-import voluptuous as vol
-
-from homeassistant.components.climate import (ClimateDevice, PLATFORM_SCHEMA,
-                                              STATE_IDLE, STATE_HEAT,
-                                              STATE_COOL,
+from homeassistant.components.climate import (ClimateDevice, STATE_IDLE,
+                                              STATE_HEAT, STATE_COOL,
                                              SUPPORT_TARGET_TEMPERATURE)
-from homeassistant.const import (ATTR_TEMPERATURE, CONF_DEVICE, CONF_NAME,
-                                 PRECISION_HALVES, PRECISION_TENTHS,
-                                 TEMP_CELSIUS, PRECISION_WHOLE)
-import homeassistant.helpers.config_validation as cv
+from homeassistant.components.opentherm_gw import (
+    CONF_FLOOR_TEMP, CONF_PRECISION, DATA_DEVICE, DATA_GW_VARS,
+    DATA_OPENTHERM_GW, SIGNAL_OPENTHERM_GW_UPDATE)
+from homeassistant.const import (ATTR_TEMPERATURE, CONF_NAME, PRECISION_HALVES,
+                                 PRECISION_TENTHS, PRECISION_WHOLE,
+                                 TEMP_CELSIUS)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect

-REQUIREMENTS = ['pyotgw==0.1b0']
-
-CONF_FLOOR_TEMP = "floor_temperature"
-CONF_PRECISION = 'precision'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_DEVICE): cv.string,
-    vol.Optional(CONF_NAME, default="OpenTherm Gateway"): cv.string,
-    vol.Optional(CONF_PRECISION): vol.In([PRECISION_TENTHS, PRECISION_HALVES,
-                                          PRECISION_WHOLE]),
-    vol.Optional(CONF_FLOOR_TEMP, default=False): cv.boolean,
-})
+DEPENDENCIES = ['opentherm_gw']

 SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE)
 _LOGGER = logging.getLogger(__name__)
@@ -37,19 +26,17 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_platform(hass, config, async_add_entities,
                               discovery_info=None):
    """Set up the opentherm_gw device."""
-    gateway = OpenThermGateway(config)
+    gateway = OpenThermGateway(hass, discovery_info)
    async_add_entities([gateway])


 class OpenThermGateway(ClimateDevice):
    """Representation of a climate device."""

-    def __init__(self, config):
-        """Initialize the sensor."""
-        import pyotgw
-        self.pyotgw = pyotgw
-        self.gateway = self.pyotgw.pyotgw()
-        self._device = config[CONF_DEVICE]
+    def __init__(self, hass, config):
+        """Initialize the device."""
+        self._gateway = hass.data[DATA_OPENTHERM_GW][DATA_DEVICE]
+        self._gw_vars = hass.data[DATA_OPENTHERM_GW][DATA_GW_VARS]
        self.friendly_name = config.get(CONF_NAME)
        self.floor_temp = config.get(CONF_FLOOR_TEMP)
        self.temp_precision = config.get(CONF_PRECISION)
@@ -63,40 +50,38 @@ class OpenThermGateway(ClimateDevice):

    async def async_added_to_hass(self):
        """Connect to the OpenTherm Gateway device."""
-        await self.gateway.connect(self.hass.loop, self._device)
-        self.gateway.subscribe(self.receive_report)
-        _LOGGER.debug("Connected to %s on %s", self.friendly_name,
-                      self._device)
+        _LOGGER.debug("Added device %s", self.friendly_name)
+        async_dispatcher_connect(self.hass, SIGNAL_OPENTHERM_GW_UPDATE,
+                                 self.receive_report)

    async def receive_report(self, status):
        """Receive and handle a new report from the Gateway."""
-        _LOGGER.debug("Received report: %s", status)
-        ch_active = status.get(self.pyotgw.DATA_SLAVE_CH_ACTIVE)
-        flame_on = status.get(self.pyotgw.DATA_SLAVE_FLAME_ON)
-        cooling_active = status.get(self.pyotgw.DATA_SLAVE_COOLING_ACTIVE)
+        ch_active = status.get(self._gw_vars.DATA_SLAVE_CH_ACTIVE)
+        flame_on = status.get(self._gw_vars.DATA_SLAVE_FLAME_ON)
+        cooling_active = status.get(self._gw_vars.DATA_SLAVE_COOLING_ACTIVE)
        if ch_active and flame_on:
            self._current_operation = STATE_HEAT
        elif cooling_active:
            self._current_operation = STATE_COOL
        else:
            self._current_operation = STATE_IDLE
-        self._current_temperature = status.get(self.pyotgw.DATA_ROOM_TEMP)
+        self._current_temperature = status.get(self._gw_vars.DATA_ROOM_TEMP)

-        temp = status.get(self.pyotgw.DATA_ROOM_SETPOINT_OVRD)
+        temp = status.get(self._gw_vars.DATA_ROOM_SETPOINT_OVRD)
        if temp is None:
-            temp = status.get(self.pyotgw.DATA_ROOM_SETPOINT)
+            temp = status.get(self._gw_vars.DATA_ROOM_SETPOINT)
        self._target_temperature = temp

        # GPIO mode 5: 0 == Away
        # GPIO mode 6: 1 == Away
-        gpio_a_state = status.get(self.pyotgw.OTGW_GPIO_A)
+        gpio_a_state = status.get(self._gw_vars.OTGW_GPIO_A)
        if gpio_a_state == 5:
            self._away_mode_a = 0
        elif gpio_a_state == 6:
            self._away_mode_a = 1
        else:
            self._away_mode_a = None
-        gpio_b_state = status.get(self.pyotgw.OTGW_GPIO_B)
+        gpio_b_state = status.get(self._gw_vars.OTGW_GPIO_B)
        if gpio_b_state == 5:
            self._away_mode_b = 0
        elif gpio_b_state == 6:
@@ -104,11 +89,11 @@ class OpenThermGateway(ClimateDevice):
        else:
            self._away_mode_b = None
        if self._away_mode_a is not None:
-            self._away_state_a = (status.get(self.pyotgw.OTGW_GPIO_A_STATE) ==
-                                  self._away_mode_a)
+            self._away_state_a = (status.get(
+                self._gw_vars.OTGW_GPIO_A_STATE) == self._away_mode_a)
        if self._away_mode_b is not None:
-            self._away_state_b = (status.get(self.pyotgw.OTGW_GPIO_B_STATE) ==
-                                  self._away_mode_b)
+            self._away_state_b = (status.get(
+                self._gw_vars.OTGW_GPIO_B_STATE) == self._away_mode_b)
        self.async_schedule_update_ha_state()

    @property
@@ -170,7 +155,7 @@ class OpenThermGateway(ClimateDevice):
        """Set new target temperature."""
        if ATTR_TEMPERATURE in kwargs:
            temp = float(kwargs[ATTR_TEMPERATURE])
-            self._target_temperature = await self.gateway.set_target_temp(
+            self._target_temperature = await self._gateway.set_target_temp(
                temp)
            self.async_schedule_update_ha_state()

--- a/homeassistant/components/climate/services.yaml
+++ b/homeassistant/components/climate/services.yaml
@@ -116,6 +116,22 @@ ecobee_resume_program:
      description: Resume all events and return to the scheduled program. This default to false which removes only the top event.
      example: true

+mill_set_room_temperature:
+  description: Set Mill room temperatures.
+  fields:
+    room_name:
+      description: Name of room to change.
+      example: 'kitchen'
+    away_temp:
+      description: Away temp.
+      example: 12
+    comfort_temp:
+      description: Comfort temp.
+      example: 22
+    sleep_temp:
+      description: Sleep temp.
+      example: 17
+
 nuheat_resume_program:
  description: Resume the programmed schedule.
  fields:
@@ -123,26 +139,6 @@ nuheat_resume_program:
      description: Name(s) of entities to change.
      example: 'climate.kitchen'

-econet_add_vacation:
-  description: Add a vacation to your water heater.
-  fields:
-    entity_id:
-      description: Name(s) of entities to change.
-      example: 'climate.water_heater'
-    start_date:
-      description: The timestamp of when the vacation should start. (Optional, defaults to now)
-      example: 1513186320
-    end_date:
-      description: The timestamp of when the vacation should end.
-      example: 1513445520
-
-econet_delete_vacation:
-  description: Delete your existing vacation from your water heater.
-  fields:
-    entity_id:
-      description: Name(s) of entities to change.
-      example: 'climate.water_heater'
-
 sensibo_assume_state:
  description: Set Sensibo device to external state.
  fields:
--- a/homeassistant/components/climate/toon.py
+++ b/homeassistant/components/climate/toon.py
@@ -8,7 +8,7 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.toon/
 """
 from homeassistant.components.climate import (
-    ATTR_TEMPERATURE, STATE_COOL, STATE_ECO, STATE_HEAT, STATE_PERFORMANCE,
+    ATTR_TEMPERATURE, STATE_COOL, STATE_ECO, STATE_HEAT, STATE_AUTO,
    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, ClimateDevice)
 import homeassistant.components.toon as toon_main
 from homeassistant.const import TEMP_CELSIUS
@@ -34,7 +34,7 @@ class ThermostatDevice(ClimateDevice):
        self._temperature = None
        self._setpoint = None
        self._operation_list = [
-            STATE_PERFORMANCE,
+            STATE_AUTO,
            STATE_HEAT,
            STATE_ECO,
            STATE_COOL,
@@ -84,7 +84,7 @@ class ThermostatDevice(ClimateDevice):
    def set_operation_mode(self, operation_mode):
        """Set new operation mode."""
        toonlib_values = {
-            STATE_PERFORMANCE: 'Comfort',
+            STATE_AUTO: 'Comfort',
            STATE_HEAT: 'Home',
            STATE_ECO: 'Away',
            STATE_COOL: 'Sleep',
--- a/homeassistant/components/climate/tuya.py
+++ b/homeassistant/components/climate/tuya.py
@@ -7,8 +7,7 @@ https://home-assistant.io/components/climate.tuya/

 from homeassistant.components.climate import (
    ATTR_TEMPERATURE, ENTITY_ID_FORMAT, STATE_AUTO, STATE_COOL, STATE_ECO,
-    STATE_ELECTRIC, STATE_FAN_ONLY, STATE_GAS, STATE_HEAT, STATE_HEAT_PUMP,
-    STATE_HIGH_DEMAND, STATE_PERFORMANCE, SUPPORT_FAN_MODE, SUPPORT_ON_OFF,
+    STATE_FAN_ONLY, STATE_HEAT, SUPPORT_FAN_MODE, SUPPORT_ON_OFF,
    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, ClimateDevice)
 from homeassistant.components.fan import SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH
 from homeassistant.components.tuya import DATA_TUYA, TuyaDevice
@@ -23,13 +22,8 @@ HA_STATE_TO_TUYA = {
    STATE_AUTO: 'auto',
    STATE_COOL: 'cold',
    STATE_ECO: 'eco',
-    STATE_ELECTRIC: 'electric',
    STATE_FAN_ONLY: 'wind',
-    STATE_GAS: 'gas',
    STATE_HEAT: 'hot',
-    STATE_HEAT_PUMP: 'heat_pump',
-    STATE_HIGH_DEMAND: 'high_demand',
-    STATE_PERFORMANCE: 'performance',
 }

 TUYA_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_TUYA.items()}
--- a/homeassistant/components/climate/vera.py
+++ b/homeassistant/components/climate/vera.py
@@ -8,9 +8,12 @@ import logging

 from homeassistant.util import convert
 from homeassistant.components.climate import (
-    ClimateDevice, ENTITY_ID_FORMAT, SUPPORT_TARGET_TEMPERATURE,
+    ClimateDevice, STATE_AUTO, STATE_COOL,
+    STATE_HEAT, ENTITY_ID_FORMAT, SUPPORT_TARGET_TEMPERATURE,
    SUPPORT_OPERATION_MODE, SUPPORT_FAN_MODE)
 from homeassistant.const import (
+    STATE_ON,
+    STATE_OFF,
    TEMP_FAHRENHEIT,
    TEMP_CELSIUS,
    ATTR_TEMPERATURE)
@@ -22,8 +25,8 @@ DEPENDENCIES = ['vera']

 _LOGGER = logging.getLogger(__name__)

-OPERATION_LIST = ['Heat', 'Cool', 'Auto Changeover', 'Off']
-FAN_OPERATION_LIST = ['On', 'Auto', 'Cycle']
+OPERATION_LIST = [STATE_HEAT, STATE_COOL, STATE_AUTO, STATE_OFF]
+FAN_OPERATION_LIST = [STATE_ON, STATE_AUTO]

 SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                 SUPPORT_FAN_MODE)
@@ -54,13 +57,13 @@ class VeraThermostat(VeraDevice, ClimateDevice):
        """Return current operation ie. heat, cool, idle."""
        mode = self.vera_device.get_hvac_mode()
        if mode == 'HeatOn':
-            return OPERATION_LIST[0]  # heat
+            return OPERATION_LIST[0]  # Heat
        if mode == 'CoolOn':
-            return OPERATION_LIST[1]  # cool
+            return OPERATION_LIST[1]  # Cool
        if mode == 'AutoChangeOver':
-            return OPERATION_LIST[2]  # auto
+            return OPERATION_LIST[2]  # Auto
        if mode == 'Off':
-            return OPERATION_LIST[3]  # off
+            return OPERATION_LIST[3]  # Off
        return 'Off'

    @property
@@ -76,8 +79,6 @@ class VeraThermostat(VeraDevice, ClimateDevice):
            return FAN_OPERATION_LIST[0]  # on
        if mode == "Auto":
            return FAN_OPERATION_LIST[1]  # auto
-        if mode == "PeriodicOn":
-            return FAN_OPERATION_LIST[2]  # cycle
        return "Auto"

    @property
@@ -89,10 +90,8 @@ class VeraThermostat(VeraDevice, ClimateDevice):
        """Set new target temperature."""
        if fan_mode == FAN_OPERATION_LIST[0]:
            self.vera_device.fan_on()
-        elif fan_mode == FAN_OPERATION_LIST[1]:
+        else:
            self.vera_device.fan_auto()
-        elif fan_mode == FAN_OPERATION_LIST[2]:
-            return self.vera_device.fan_cycle()

    @property
    def current_power_w(self):
--- a/homeassistant/components/climate/wink.py
+++ b/homeassistant/components/climate/wink.py
@@ -1,5 +1,5 @@
 """
-Support for Wink thermostats, Air Conditioners, and Water Heaters.
+Support for Wink thermostats and Air Conditioners.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.wink/
@@ -8,9 +8,9 @@ import logging

 from homeassistant.components.climate import (
    ATTR_CURRENT_HUMIDITY, ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW,
-    ATTR_TEMPERATURE, STATE_AUTO, STATE_COOL, STATE_ECO, STATE_ELECTRIC,
-    STATE_FAN_ONLY, STATE_GAS, STATE_HEAT, STATE_HEAT_PUMP, STATE_HIGH_DEMAND,
-    STATE_PERFORMANCE, SUPPORT_AUX_HEAT, SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE,
+    ATTR_TEMPERATURE, STATE_AUTO, STATE_COOL, STATE_ECO,
+    STATE_FAN_ONLY, STATE_HEAT, SUPPORT_AUX_HEAT,
+    SUPPORT_AWAY_MODE, SUPPORT_FAN_MODE,
    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
    SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_TARGET_TEMPERATURE_LOW,
    ClimateDevice)
@@ -24,11 +24,9 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_ECO_TARGET = 'eco_target'
 ATTR_EXTERNAL_TEMPERATURE = 'external_temperature'
 ATTR_OCCUPIED = 'occupied'
-ATTR_RHEEM_TYPE = 'rheem_type'
 ATTR_SCHEDULE_ENABLED = 'schedule_enabled'
 ATTR_SMART_TEMPERATURE = 'smart_temperature'
 ATTR_TOTAL_CONSUMPTION = 'total_consumption'
-ATTR_VACATION_MODE = 'vacation_mode'
 ATTR_HEAT_ON = 'heat_on'
 ATTR_COOL_ON = 'cool_on'

@@ -42,14 +40,9 @@ HA_STATE_TO_WINK = {
    STATE_AUTO: 'auto',
    STATE_COOL: 'cool_only',
    STATE_ECO: 'eco',
-    STATE_ELECTRIC: 'electric_only',
    STATE_FAN_ONLY: 'fan_only',
-    STATE_GAS: 'gas',
    STATE_HEAT: 'heat_only',
-    STATE_HEAT_PUMP: 'heat_pump',
-    STATE_HIGH_DEMAND: 'high_demand',
    STATE_OFF: 'off',
-    STATE_PERFORMANCE: 'performance',
 }

 WINK_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_WINK.items()}
@@ -62,9 +55,6 @@ SUPPORT_FLAGS_THERMOSTAT = (
 SUPPORT_FLAGS_AC = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                    SUPPORT_FAN_MODE)

-SUPPORT_FLAGS_HEATER = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
-                        SUPPORT_AWAY_MODE)
-

 def setup_platform(hass, config, add_entities, discovery_info=None):
    """Set up the Wink climate devices."""
@@ -77,10 +67,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
        _id = climate.object_id() + climate.name()
        if _id not in hass.data[DOMAIN]['unique_ids']:
            add_entities([WinkAC(climate, hass)])
-    for water_heater in pywink.get_water_heaters():
-        _id = water_heater.object_id() + water_heater.name()
-        if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_entities([WinkWaterHeater(water_heater, hass)])


 class WinkThermostat(WinkDevice, ClimateDevice):
@@ -504,93 +490,3 @@ class WinkAC(WinkDevice, ClimateDevice):
        elif fan_mode == SPEED_HIGH:
            speed = 1.0
        self.wink.set_ac_fan_speed(speed)
-
-
-class WinkWaterHeater(WinkDevice, ClimateDevice):
-    """Representation of a Wink water heater."""
-
-    @property
-    def supported_features(self):
-        """Return the list of supported features."""
-        return SUPPORT_FLAGS_HEATER
-
-    @property
-    def temperature_unit(self):
-        """Return the unit of measurement."""
-        # The Wink API always returns temp in Celsius
-        return TEMP_CELSIUS
-
-    @property
-    def device_state_attributes(self):
-        """Return the optional device state attributes."""
-        data = {}
-        data[ATTR_VACATION_MODE] = self.wink.vacation_mode_enabled()
-        data[ATTR_RHEEM_TYPE] = self.wink.rheem_type()
-
-        return data
-
-    @property
-    def current_operation(self):
-        """
-        Return current operation one of the following.
-
-        ["eco", "performance", "heat_pump",
-        "high_demand", "electric_only", "gas]
-        """
-        if not self.wink.is_on():
-            current_op = STATE_OFF
-        else:
-            current_op = WINK_STATE_TO_HA.get(self.wink.current_mode())
-            if current_op is None:
-                current_op = STATE_UNKNOWN
-        return current_op
-
-    @property
-    def operation_list(self):
-        """List of available operation modes."""
-        op_list = ['off']
-        modes = self.wink.modes()
-        for mode in modes:
-            if mode == 'aux':
-                continue
-            ha_mode = WINK_STATE_TO_HA.get(mode)
-            if ha_mode is not None:
-                op_list.append(ha_mode)
-            else:
-                error = "Invalid operation mode mapping. " + mode + \
-                    " doesn't map. Please report this."
-                _LOGGER.error(error)
-        return op_list
-
-    def set_temperature(self, **kwargs):
-        """Set new target temperature."""
-        target_temp = kwargs.get(ATTR_TEMPERATURE)
-        self.wink.set_temperature(target_temp)
-
-    def set_operation_mode(self, operation_mode):
-        """Set operation mode."""
-        op_mode_to_set = HA_STATE_TO_WINK.get(operation_mode)
-        self.wink.set_operation_mode(op_mode_to_set)
-
-    @property
-    def target_temperature(self):
-        """Return the temperature we try to reach."""
-        return self.wink.current_set_point()
-
-    def turn_away_mode_on(self):
-        """Turn away on."""
-        self.wink.set_vacation_mode(True)
-
-    def turn_away_mode_off(self):
-        """Turn away off."""
-        self.wink.set_vacation_mode(False)
-
-    @property
-    def min_temp(self):
-        """Return the minimum temperature."""
-        return self.wink.min_set_point()
-
-    @property
-    def max_temp(self):
-        """Return the maximum temperature."""
-        return self.wink.max_set_point()
--- a/homeassistant/components/climate/zhong_hong.py
+++ b/homeassistant/components/climate/zhong_hong.py
@@ -18,21 +18,23 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import (async_dispatcher_connect,
                                              async_dispatcher_send)

+REQUIREMENTS = ['zhong_hong_hvac==1.0.9']
+
 _LOGGER = logging.getLogger(__name__)

 CONF_GATEWAY_ADDRRESS = 'gateway_address'

-REQUIREMENTS = ['zhong_hong_hvac==1.0.9']
+DEFAULT_PORT = 9999
+DEFAULT_GATEWAY_ADDRRESS = 1
+
 SIGNAL_DEVICE_ADDED = 'zhong_hong_device_added'
 SIGNAL_ZHONG_HONG_HUB_START = 'zhong_hong_hub_start'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST):
-    cv.string,
-    vol.Optional(CONF_PORT, default=9999):
-    vol.Coerce(int),
-    vol.Optional(CONF_GATEWAY_ADDRRESS, default=1):
-    vol.Coerce(int),
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    vol.Optional(CONF_GATEWAY_ADDRRESS, default=DEFAULT_GATEWAY_ADDRRESS):
+        cv.positive_int,
 })


--- a/homeassistant/components/climate/zwave.py
+++ b/homeassistant/components/climate/zwave.py
@@ -6,14 +6,15 @@ https://home-assistant.io/components/climate.zwave/
 """
 # Because we do not compile openzwave on CI
 import logging
+from homeassistant.core import callback
 from homeassistant.components.climate import (
    DOMAIN, ClimateDevice, STATE_AUTO, STATE_COOL, STATE_HEAT,
    SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE,
    SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE)
-from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
-    ZWaveDeviceEntity, async_setup_platform)
+from homeassistant.components.zwave import ZWaveDeviceEntity
 from homeassistant.const import (
    STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect

 _LOGGER = logging.getLogger(__name__)

@@ -42,6 +43,22 @@ STATE_MAPPINGS = {
 }


+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Old method of setting up Z-Wave climate devices."""
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Z-Wave Climate device from Config Entry."""
+    @callback
+    def async_add_climate(climate):
+        """Add Z-Wave Climate Device."""
+        async_add_entities([climate])
+
+    async_dispatcher_connect(hass, 'zwave_new_climate', async_add_climate)
+
+
 def get_device(hass, values, **kwargs):
    """Create Z-Wave entity device."""
    temp_unit = hass.config.units.temperature_unit
--- a/homeassistant/components/cloud/init.py
+++ b/homeassistant/components/cloud/init.py
@@ -4,20 +4,16 @@ Component to integrate the Home Assistant cloud.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/cloud/
 """
-import asyncio
 from datetime import datetime, timedelta
 import json
 import logging
 import os

-import aiohttp
-import async_timeout
 import voluptuous as vol

 from homeassistant.const import (
    EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE, CONF_NAME)
 from homeassistant.helpers import entityfilter, config_validation as cv
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util import dt as dt_util
 from homeassistant.components.alexa import smart_home as alexa_sh
 from homeassistant.components.google_assistant import helpers as ga_h
@@ -126,10 +122,9 @@ class Cloud:
        self.hass = hass
        self.mode = mode
        self.alexa_config = alexa
-        self._google_actions = google_actions
+        self.google_actions_user_conf = google_actions
        self._gactions_config = None
        self._prefs = None
-        self.jwt_keyset = None
        self.id_token = None
        self.access_token = None
        self.refresh_token = None
@@ -162,7 +157,7 @@ class Cloud:
    @property
    def subscription_expired(self):
        """Return a boolean if the subscription has expired."""
-        return dt_util.utcnow() > self.expiration_date + timedelta(days=3)
+        return dt_util.utcnow() > self.expiration_date + timedelta(days=7)

    @property
    def expiration_date(self):
@@ -185,7 +180,7 @@ class Cloud:
    def gactions_config(self):
        """Return the Google Assistant config."""
        if self._gactions_config is None:
-            conf = self._google_actions
+            conf = self.google_actions_user_conf

            def should_expose(entity):
                """If an entity should be exposed."""
@@ -262,13 +257,6 @@ class Cloud:
            }
        self._prefs = prefs

-        success = await self._fetch_jwt_keyset()
-
-        # Fetching keyset can fail if internet is not up yet.
-        if not success:
-            self.hass.helpers.event.async_call_later(5, self.async_start)
-            return
-
        def load_config():
            """Load config."""
            # Ensure config dir exists
@@ -288,14 +276,6 @@ class Cloud:
        if info is None:
            return

-        # Validate tokens
-        try:
-            for token in 'id_token', 'access_token':
-                self._decode_claims(info[token])
-        except ValueError as err:  # Raised when token is invalid
-            _LOGGER.warning("Found invalid token %s: %s", token, err)
-            return
-
        self.id_token = info['id_token']
        self.access_token = info['access_token']
        self.refresh_token = info['refresh_token']
@@ -311,49 +291,7 @@ class Cloud:
            self._prefs[STORAGE_ENABLE_ALEXA] = alexa_enabled
        await self._store.async_save(self._prefs)

-    async def _fetch_jwt_keyset(self):
-        """Fetch the JWT keyset for the Cognito instance."""
-        session = async_get_clientsession(self.hass)
-        url = ("https://cognito-idp.us-east-1.amazonaws.com/"
-               "{}/.well-known/jwks.json".format(self.user_pool_id))
-
-        try:
-            with async_timeout.timeout(10, loop=self.hass.loop):
-                req = await session.get(url)
-                self.jwt_keyset = await req.json()
-
-            return True
-
-        except (asyncio.TimeoutError, aiohttp.ClientError) as err:
-            _LOGGER.error("Error fetching Cognito keyset: %s", err)
-            return False
-
-    def _decode_claims(self, token):
+    def _decode_claims(self, token):  # pylint: disable=no-self-use
        """Decode the claims in a token."""
-        from jose import jwt, exceptions as jose_exceptions
-        try:
-            header = jwt.get_unverified_header(token)
-        except jose_exceptions.JWTError as err:
-            raise ValueError(str(err)) from None
-        kid = header.get('kid')
-
-        if kid is None:
-            raise ValueError("No kid in header")
-
-        # Locate the key for this kid
-        key = None
-        for key_dict in self.jwt_keyset['keys']:
-            if key_dict['kid'] == kid:
-                key = key_dict
-                break
-        if not key:
-            raise ValueError(
-                "Unable to locate kid ({}) in keyset".format(kid))
-
-        try:
-            return jwt.decode(
-                token, key, audience=self.cognito_client_id, options={
-                    'verify_exp': False,
-                })
-        except jose_exceptions.JWTError as err:
-            raise ValueError(str(err)) from None
+        from jose import jwt
+        return jwt.get_unverified_claims(token)
--- a/homeassistant/components/cloud/auth_api.py
+++ b/homeassistant/components/cloud/auth_api.py
@@ -113,6 +113,24 @@ def check_token(cloud):
        raise _map_aws_exception(err)


+def renew_access_token(cloud):
+    """Renew access token."""
+    from botocore.exceptions import ClientError
+
+    cognito = _cognito(
+        cloud,
+        access_token=cloud.access_token,
+        refresh_token=cloud.refresh_token)
+
+    try:
+        cognito.renew_access_token()
+        cloud.id_token = cognito.id_token
+        cloud.access_token = cognito.access_token
+        cloud.write_user_info()
+    except ClientError as err:
+        raise _map_aws_exception(err)
+
+
 def _authenticate(cloud, email, password):
    """Log in and return an authenticated Cognito instance."""
    from botocore.exceptions import ClientError
@@ -126,7 +144,7 @@ def _authenticate(cloud, email, password):
        cognito.authenticate(password=password)
        return cognito

-    except ForceChangePasswordException as err:
+    except ForceChangePasswordException:
        raise PasswordChangeRequired

    except ClientError as err:
--- a/Show More
+++ b/Show More