Merge pull request #6384 from home-assistant/release-0-39-3

0.39.3
Version bump to 0.39.3
2026-01-08 00:28:31 +01:00 · 2017-03-03 19:24:29 -08:00 · 2017-03-03 13:15:07 -08:00 · 2017-03-03 13:13:04 -08:00 · 2017-03-01 12:43:00 -08:00 · 2017-03-01 09:29:34 -08:00
744 changed files with 41400 additions and 8251 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,6 +5,7 @@ omit =
    homeassistant/__main__.py
    homeassistant/scripts/*.py
    homeassistant/helpers/typing.py
+    homeassistant/helpers/signal.py

    # omit pieces of code that rely on external devices being present
    homeassistant/components/apcupsd.py
@@ -13,6 +14,9 @@ omit =
    homeassistant/components/arduino.py
    homeassistant/components/*/arduino.py

+    homeassistant/components/bbb_gpio.py
+    homeassistant/components/*/bbb_gpio.py
+
    homeassistant/components/bloomsky.py
    homeassistant/components/*/bloomsky.py

@@ -34,12 +38,21 @@ omit =
    homeassistant/components/insteon_hub.py
    homeassistant/components/*/insteon_hub.py

+    homeassistant/components/insteon_local.py
+    homeassistant/components/*/insteon_local.py
+
+    homeassistant/components/insteon_plm.py
+    homeassistant/components/*/insteon_plm.py
+
    homeassistant/components/ios.py
    homeassistant/components/*/ios.py

    homeassistant/components/isy994.py
    homeassistant/components/*/isy994.py

+    homeassistant/components/lutron.py
+    homeassistant/components/*/lutron.py
+
    homeassistant/components/modbus.py
    homeassistant/components/*/modbus.py

@@ -78,6 +91,9 @@ omit =
    homeassistant/components/verisure.py
    homeassistant/components/*/verisure.py

+    homeassistant/components/volvooncall.py
+    homeassistant/components/*/volvooncall.py
+
    homeassistant/components/*/webostv.py

    homeassistant/components/wemo.py
@@ -107,27 +123,30 @@ omit =
    homeassistant/components/knx.py
    homeassistant/components/*/knx.py

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

    homeassistant/components/mochad.py
    homeassistant/components/*/mochad.py

+    homeassistant/components/zabbix.py
+    homeassistant/components/*/zabbix.py
+
    homeassistant/components/alarm_control_panel/alarmdotcom.py
    homeassistant/components/alarm_control_panel/concord232.py
    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/alarm_control_panel/simplisafe.py
+    homeassistant/components/apiai.py
    homeassistant/components/binary_sensor/arest.py
    homeassistant/components/binary_sensor/concord232.py
    homeassistant/components/binary_sensor/flic.py
    homeassistant/components/binary_sensor/hikvision.py
+    homeassistant/components/binary_sensor/iss.py
    homeassistant/components/binary_sensor/rest.py
    homeassistant/components/browser.py
    homeassistant/components/camera/amcrest.py
    homeassistant/components/camera/bloomsky.py
+    homeassistant/components/camera/ffmpeg.py
    homeassistant/components/camera/foscam.py
    homeassistant/components/camera/mjpeg.py
    homeassistant/components/camera/rpi_camera.py
@@ -136,10 +155,12 @@ omit =
    homeassistant/components/climate/heatmiser.py
    homeassistant/components/climate/homematic.py
    homeassistant/components/climate/knx.py
+    homeassistant/components/climate/oem.py
    homeassistant/components/climate/proliphix.py
    homeassistant/components/climate/radiotherm.py
    homeassistant/components/cover/garadget.py
    homeassistant/components/cover/homematic.py
+    homeassistant/components/cover/myq.py
    homeassistant/components/cover/rpi_gpio.py
    homeassistant/components/cover/scsgate.py
    homeassistant/components/cover/wink.py
@@ -154,17 +175,21 @@ omit =
    homeassistant/components/device_tracker/fritz.py
    homeassistant/components/device_tracker/gpslogger.py
    homeassistant/components/device_tracker/icloud.py
+    homeassistant/components/device_tracker/linksys_ap.py
    homeassistant/components/device_tracker/luci.py
    homeassistant/components/device_tracker/netgear.py
    homeassistant/components/device_tracker/nmap_tracker.py
+    homeassistant/components/device_tracker/ping.py
+    homeassistant/components/device_tracker/sky_hub.py
    homeassistant/components/device_tracker/snmp.py
    homeassistant/components/device_tracker/swisscom.py
    homeassistant/components/device_tracker/thomson.py
    homeassistant/components/device_tracker/tomato.py
+    homeassistant/components/device_tracker/tado.py
    homeassistant/components/device_tracker/tplink.py
+    homeassistant/components/device_tracker/trackr.py
    homeassistant/components/device_tracker/ubus.py
-    homeassistant/components/device_tracker/volvooncall.py
-    homeassistant/components/discovery.py
+    homeassistant/components/device_tracker/xiaomi.py
    homeassistant/components/downloader.py
    homeassistant/components/emoncms_history.py
    homeassistant/components/emulated_hue/upnp.py
@@ -176,19 +201,29 @@ omit =
    homeassistant/components/joaoapps_join.py
    homeassistant/components/keyboard.py
    homeassistant/components/keyboard_remote.py
+    homeassistant/components/light/avion.py
    homeassistant/components/light/blinksticklight.py
+    homeassistant/components/light/decora.py
    homeassistant/components/light/flux_led.py
    homeassistant/components/light/hue.py
    homeassistant/components/light/hyperion.py
    homeassistant/components/light/lifx.py
    homeassistant/components/light/limitlessled.py
    homeassistant/components/light/osramlightify.py
+    homeassistant/components/light/tikteck.py
    homeassistant/components/light/x10.py
    homeassistant/components/light/yeelight.py
+    homeassistant/components/light/yeelightsunflower.py
+    homeassistant/components/light/piglow.py
+    homeassistant/components/light/zengge.py
    homeassistant/components/lirc.py
+    homeassistant/components/lock/nuki.py
+    homeassistant/components/media_player/anthemav.py
+    homeassistant/components/media_player/apple_tv.py
    homeassistant/components/media_player/aquostv.py
    homeassistant/components/media_player/braviatv.py
    homeassistant/components/media_player/cast.py
+    homeassistant/components/media_player/clementine.py
    homeassistant/components/media_player/cmus.py
    homeassistant/components/media_player/denon.py
    homeassistant/components/media_player/denonavr.py
@@ -197,12 +232,17 @@ omit =
    homeassistant/components/media_player/emby.py
    homeassistant/components/media_player/firetv.py
    homeassistant/components/media_player/gpmdp.py
+    homeassistant/components/media_player/gstreamer.py
+    homeassistant/components/media_player/hdmi_cec.py
    homeassistant/components/media_player/itunes.py
    homeassistant/components/media_player/kodi.py
    homeassistant/components/media_player/lg_netcast.py
+    homeassistant/components/media_player/liveboxplaytv.py
    homeassistant/components/media_player/mpchc.py
    homeassistant/components/media_player/mpd.py
+    homeassistant/components/media_player/nad.py
    homeassistant/components/media_player/onkyo.py
+    homeassistant/components/media_player/openhome.py
    homeassistant/components/media_player/panasonic_viera.py
    homeassistant/components/media_player/pandora.py
    homeassistant/components/media_player/philips_js.py
@@ -219,13 +259,17 @@ omit =
    homeassistant/components/notify/aws_lambda.py
    homeassistant/components/notify/aws_sns.py
    homeassistant/components/notify/aws_sqs.py
+    homeassistant/components/notify/discord.py
+    homeassistant/components/notify/facebook.py
    homeassistant/components/notify/free_mobile.py
    homeassistant/components/notify/gntp.py
    homeassistant/components/notify/group.py
    homeassistant/components/notify/instapush.py
    homeassistant/components/notify/joaoapps_join.py
    homeassistant/components/notify/kodi.py
+    homeassistant/components/notify/lannouncer.py
    homeassistant/components/notify/llamalab_automate.py
+    homeassistant/components/notify/mailgun.py
    homeassistant/components/notify/matrix.py
    homeassistant/components/notify/message_bird.py
    homeassistant/components/notify/nfandroidtv.py
@@ -233,6 +277,7 @@ omit =
    homeassistant/components/notify/pushbullet.py
    homeassistant/components/notify/pushetta.py
    homeassistant/components/notify/pushover.py
+    homeassistant/components/notify/pushsafer.py
    homeassistant/components/notify/rest.py
    homeassistant/components/notify/sendgrid.py
    homeassistant/components/notify/simplepush.py
@@ -242,18 +287,21 @@ omit =
    homeassistant/components/notify/telegram.py
    homeassistant/components/notify/telstra.py
    homeassistant/components/notify/twilio_sms.py
+    homeassistant/components/notify/twilio_call.py
    homeassistant/components/notify/twitter.py
    homeassistant/components/notify/xmpp.py
    homeassistant/components/nuimo_controller.py
-    homeassistant/components/openalpr.py
    homeassistant/components/remote/harmony.py
+    homeassistant/components/remote/itach.py
    homeassistant/components/scene/hunterdouglas_powerview.py
+    homeassistant/components/sensor/amcrest.py
    homeassistant/components/sensor/arest.py
    homeassistant/components/sensor/arwn.py
    homeassistant/components/sensor/bbox.py
    homeassistant/components/sensor/bitcoin.py
    homeassistant/components/sensor/bom.py
    homeassistant/components/sensor/broadlink.py
+    homeassistant/components/sensor/dublin_bus_transport.py
    homeassistant/components/sensor/coinmarketcap.py
    homeassistant/components/sensor/cpuspeed.py
    homeassistant/components/sensor/cups.py
@@ -263,13 +311,17 @@ omit =
    homeassistant/components/sensor/dht.py
    homeassistant/components/sensor/dovado.py
    homeassistant/components/sensor/dte_energy_bridge.py
+    homeassistant/components/sensor/ebox.py
    homeassistant/components/sensor/efergy.py
    homeassistant/components/sensor/eliqonline.py
    homeassistant/components/sensor/emoncms.py
    homeassistant/components/sensor/fastdotcom.py
+    homeassistant/components/sensor/fedex.py
+    homeassistant/components/sensor/fido.py
    homeassistant/components/sensor/fitbit.py
    homeassistant/components/sensor/fixer.py
    homeassistant/components/sensor/fritzbox_callmonitor.py
+    homeassistant/components/sensor/fritzbox_netmonitor.py
    homeassistant/components/sensor/glances.py
    homeassistant/components/sensor/google_travel_time.py
    homeassistant/components/sensor/gpsd.py
@@ -277,6 +329,7 @@ omit =
    homeassistant/components/sensor/haveibeenpwned.py
    homeassistant/components/sensor/hddtemp.py
    homeassistant/components/sensor/hp_ilo.py
+    homeassistant/components/sensor/hydroquebec.py
    homeassistant/components/sensor/imap.py
    homeassistant/components/sensor/imap_email_content.py
    homeassistant/components/sensor/influxdb.py
@@ -292,15 +345,20 @@ omit =
    homeassistant/components/sensor/nzbget.py
    homeassistant/components/sensor/ohmconnect.py
    homeassistant/components/sensor/onewire.py
+    homeassistant/components/sensor/openevse.py
    homeassistant/components/sensor/openexchangerates.py
    homeassistant/components/sensor/openweathermap.py
    homeassistant/components/sensor/pi_hole.py
    homeassistant/components/sensor/plex.py
+    homeassistant/components/sensor/pocketcasts.py
    homeassistant/components/sensor/pvoutput.py
+    homeassistant/components/sensor/qnap.py
    homeassistant/components/sensor/sabnzbd.py
    homeassistant/components/sensor/scrape.py
    homeassistant/components/sensor/sensehat.py
    homeassistant/components/sensor/serial_pm.py
+    homeassistant/components/sensor/skybeacon.py
+    homeassistant/components/sensor/sma.py
    homeassistant/components/sensor/snmp.py
    homeassistant/components/sensor/sonarr.py
    homeassistant/components/sensor/speedtest.py
@@ -317,6 +375,8 @@ omit =
    homeassistant/components/sensor/transmission.py
    homeassistant/components/sensor/twitch.py
    homeassistant/components/sensor/uber.py
+    homeassistant/components/sensor/ups.py
+    homeassistant/components/sensor/usps.py
    homeassistant/components/sensor/vasttrafik.py
    homeassistant/components/sensor/waqi.py
    homeassistant/components/sensor/xbox_live.py
@@ -329,8 +389,11 @@ omit =
    homeassistant/components/switch/digitalloggers.py
    homeassistant/components/switch/dlink.py
    homeassistant/components/switch/edimax.py
+    homeassistant/components/switch/fritzdect.py
+    homeassistant/components/switch/hdmi_cec.py
    homeassistant/components/switch/hikvisioncam.py
    homeassistant/components/switch/hook.py
+    homeassistant/components/switch/kankun.py
    homeassistant/components/switch/mystrom.py
    homeassistant/components/switch/netio.py
    homeassistant/components/switch/orvibo.py
@@ -341,8 +404,12 @@ omit =
    homeassistant/components/switch/tplink.py
    homeassistant/components/switch/transmission.py
    homeassistant/components/switch/wake_on_lan.py
+    homeassistant/components/telegram_webhooks.py
    homeassistant/components/thingspeak.py
+    homeassistant/components/tts/amazon_polly.py
+    homeassistant/components/tts/picotts.py
    homeassistant/components/upnp.py
+    homeassistant/components/weather/bom.py
    homeassistant/components/weather/openweathermap.py
    homeassistant/components/zeroconf.py

--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,5 +26,5 @@ If the code does not interact with devices:
  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
  - [ ] Tests have been added to verify that the new code works.

-[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L16
-[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L51
+[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L14
+[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L54
--- a/.ignore
+++ b/.ignore
@@ -0,0 +1,6 @@
+# Patterns matched in this file will be ignored by supported search utilities
+
+# Ignore generated html and javascript files
+/homeassistant/components/frontend/www_static/*.html
+/homeassistant/components/frontend/www_static/*.js
+/homeassistant/components/frontend/www_static/panels/*.html
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,16 @@ matrix:
      env: TOXENV=requirements
    - python: "3.4.2"
      env: TOXENV=lint
-    - python: "3.5"
-      env: TOXENV=typing
+    # - python: "3.5"
+    #   env: TOXENV=typing
    - python: "3.5"
      env: TOXENV=py35
-  allow_failures:
-    - python: "3.5"
-      env: TOXENV=typing
+    - python: "3.6"
+      env: TOXENV=py36
+  # allow_failures:
+  #   - python: "3.5"
+  #     env: TOXENV=typing
+
 cache:
  directories:
    - $HOME/.cache/pip
--- a/CLA.md
+++ b/CLA.md
@@ -0,0 +1,39 @@
+# Contributor License Agreement
+
+```
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the Apache 2.0 license; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the Apache 2.0 license; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it) is maintained indefinitely
+    and may be redistributed consistent with this project or the open
+    source license(s) involved.
+```
+
+## Attribution
+
+The text of this license is available under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/).  It is based on the Linux [Developer Certificate Of Origin](http://elinux.org/Developer_Certificate_Of_Origin), but is modified to explicitly use the Apache 2.0 license
+and not mention sign-off.
+
+## Signing
+
+To sign this CLA you must first submit a pull request to a repository under the Home Assistant organization.
+
+## Adoption
+
+This Contributor License Agreement (CLA) was first announced on January 21st, 2017 in [this][cla-blog] blog post and adopted January 28th, 2017.
+
+[cla-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,80 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [safety@home-assistant.io][email]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available [here][version].
+
+## Adoption
+
+This Code of Conduct was first adopted January 21st, 2017 and announced in [this][coc-blog] blog post.
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
+[email]: mailto:safety@home-assistant.io
+[coc-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Everybody is invited and welcome to contribute to Home Assistant. There is a lot

 The process is straight-forward.

- - Read [How to get faster PR reviews](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md) by Kubernetes (but skip step 0)
+ - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md) by Kubernetes (but skip step 0)
 - Fork the Home Assistant [git repository](https://github.com/home-assistant/home-assistant).
 - Write the code for your device, notification service, sensor, or IoT thing.
 - Ensure tests work.
--- a/30
+++ b/30
@@ -1,31 +1,29 @@
 FROM python:3.5
 MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>

+# Uncomment any of the following lines to disable the installation.
+#ENV INSTALL_TELLSTICK no
+#ENV INSTALL_OPENALPR no
+#ENV INSTALL_FFMPEG no
+#ENV INSTALL_OPENZWAVE no
+#ENV INSTALL_LIBCEC no
+#ENV INSTALL_PHANTOMJS no
+
 VOLUME /config

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

-RUN pip3 install --no-cache-dir colorlog cython
-
-# For the nmap tracker, bluetooth tracker, Z-Wave, tellstick
-RUN echo "deb http://download.telldus.com/debian/ stable main" >> /etc/apt/sources.list.d/telldus.list && \
-    wget -qO - http://download.telldus.se/debian/telldus-public.key | apt-key add - && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo libglib2.0-dev bluetooth libbluetooth-dev \
-            libtelldus-core2 && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-COPY script/build_python_openzwave script/build_python_openzwave
-RUN script/build_python_openzwave && \
-  mkdir -p /usr/local/share/python-openzwave && \
-  ln -sf /usr/src/app/build/python-openzwave/openzwave/config /usr/local/share/python-openzwave/config
+# Copy build scripts
+COPY virtualization/Docker/ virtualization/Docker/
+RUN virtualization/Docker/setup_docker_prereqs

+# Install hass component dependencies
 COPY requirements_all.txt requirements_all.txt
 RUN pip3 install --no-cache-dir -r requirements_all.txt && \
-    pip3 install mysqlclient psycopg2 uvloop
+    pip3 install --no-cache-dir mysqlclient psycopg2 uvloop

 # Copy source
 COPY . .

-CMD [ "python", "-m", "homeassistant", "--config", "/config" ]
+CMD [ "python", "-m", "homeassistant", "--config", "/config" ]
--- a/20
+++ b/20
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Paulus Schoutsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,194 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,8 @@ Examples of devices Home Assistant can interface with:
   `Netgear <http://netgear.com>`__,
   `DD-WRT <http://www.dd-wrt.com/site/index>`__,
   `TPLink <http://www.tp-link.us/>`__,
-   `ASUSWRT <http://event.asus.com/2013/nw/ASUSWRT/>`__ and any SNMP
+   `ASUSWRT <http://event.asus.com/2013/nw/ASUSWRT/>`__,
+   `Xiaomi <http://miwifi.com/>`__ and any SNMP
   capable Linksys WAP/WRT
 -  `Philips Hue <http://meethue.com>`__ lights,
   `WeMo <http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/>`__
@@ -74,7 +75,8 @@ Build home automation on top of your devices:
   `Instapush <https://instapush.im>`__, `Notify My Android
   (NMA) <http://www.notifymyandroid.com/>`__,
   `PushBullet <https://www.pushbullet.com/>`__,
-   `PushOver <https://pushover.net/>`__, `Slack <https://slack.com/>`__,
+   `PushOver <https://pushover.net/>`__,
+   `Slack <https://slack.com/>`__,
   `Telegram <https://telegram.org/>`__, `Join <http://joaoapps.com/join/>`__, and `Jabber
   (XMPP) <http://xmpp.org>`__

@@ -86,7 +88,7 @@ components <https://home-assistant.io/developers/creating_components/>`__.

 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help
-section <https://home-assistant.io/help/>`__ how to reach us.
+section <https://home-assistant.io/help/>`__ of our website for further help and information.

 .. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
   :target: https://travis-ci.org/home-assistant/home-assistant
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -356,7 +356,8 @@ def try_to_restart() -> None:

 def main() -> int:
    """Start Home Assistant."""
-    monkey_patch_asyncio()
+    if sys.version_info[:3] < (3, 5, 3):
+        monkey_patch_asyncio()

    validate_python()

--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -16,6 +16,7 @@ import homeassistant.components as core_components
 from homeassistant.components import persistent_notification
 import homeassistant.config as conf_util
 import homeassistant.core as core
+from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 import homeassistant.loader as loader
 import homeassistant.util.package as pkg_util
 from homeassistant.util.async import (
@@ -26,6 +27,7 @@ from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
    event_decorators, service, config_per_platform, extract_domain_configs)
+from homeassistant.helpers.signal import async_register_signal_handling

 _LOGGER = logging.getLogger(__name__)

@@ -165,7 +167,7 @@ def _async_setup_component(hass: core.HomeAssistant,
            loader.set_component(domain, None)
            return False

-        hass.config.components.append(component.DOMAIN)
+        hass.config.components.add(component.DOMAIN)

        hass.bus.async_fire(
            EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN}
@@ -297,6 +299,10 @@ def async_prepare_setup_platform(hass: core.HomeAssistant, config, domain: str,

    # Load dependencies
    for component in getattr(platform, 'DEPENDENCIES', []):
+        if component in loader.DEPENDENCY_BLACKLIST:
+            raise HomeAssistantError(
+                '{} is not allowed to be a dependency.'.format(component))
+
        res = yield from async_setup_component(hass, component, config)
        if not res:
            _LOGGER.error(
@@ -385,7 +391,7 @@ def async_from_config_dict(config: Dict[str, Any],
        None, conf_util.process_ha_config_upgrade, hass)

    if enable_log:
-        enable_logging(hass, verbose, log_rotate_days)
+        async_enable_logging(hass, verbose, log_rotate_days)

    hass.config.skip_pip = skip_pip
    if skip_pip:
@@ -395,6 +401,10 @@ def async_from_config_dict(config: Dict[str, Any],
    if not loader.PREPARED:
        yield from hass.loop.run_in_executor(None, loader.prepare, hass)

+    # Merge packages
+    conf_util.merge_packages_config(
+        config, core_config.get(conf_util.CONF_PACKAGES, {}))
+
    # Make a copy because we are mutating it.
    # Use OrderedDict in case original one was one.
    # Convert values to dictionaries if they are None
@@ -424,13 +434,20 @@ def async_from_config_dict(config: Dict[str, Any],
    service.HASS = hass

    # Setup the components
+    dependency_blacklist = loader.DEPENDENCY_BLACKLIST - set(components)
+
    for domain in loader.load_order_components(components):
+        if domain in dependency_blacklist:
+            raise HomeAssistantError(
+                '{} is not allowed to be a dependency'.format(domain))
+
        yield from _async_setup_component(hass, domain, config)

    setup_lock.release()

    yield from hass.async_stop_track_tasks()

+    async_register_signal_handling(hass)
    return hass


@@ -482,7 +499,7 @@ def async_from_config_file(config_path: str,
    yield from hass.loop.run_in_executor(
        None, mount_local_lib_path, config_dir)

-    enable_logging(hass, verbose, log_rotate_days)
+    async_enable_logging(hass, verbose, log_rotate_days)

    try:
        config_dict = yield from hass.loop.run_in_executor(
@@ -497,15 +514,18 @@ def async_from_config_file(config_path: str,
    return hass


-def enable_logging(hass: core.HomeAssistant, verbose: bool=False,
-                   log_rotate_days=None) -> None:
+@core.callback
+def async_enable_logging(hass: core.HomeAssistant, verbose: bool=False,
+                         log_rotate_days=None) -> None:
    """Setup the logging.

-    Async friendly.
+    This method must be run in the event loop.
    """
    logging.basicConfig(level=logging.INFO)
-    fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
-           "[%(name)s] %(message)s%(reset)s")
+    fmt = ("%(asctime)s %(levelname)s (%(threadName)s) "
+           "[%(name)s] %(message)s")
+    colorfmt = "%(log_color)s{}%(reset)s".format(fmt)
+    datefmt = '%y-%m-%d %H:%M:%S'

    # suppress overly verbose logs from libraries that aren't helpful
    logging.getLogger("requests").setLevel(logging.WARNING)
@@ -515,8 +535,8 @@ def enable_logging(hass: core.HomeAssistant, verbose: bool=False,
    try:
        from colorlog import ColoredFormatter
        logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
-            fmt,
-            datefmt='%y-%m-%d %H:%M:%S',
+            colorfmt,
+            datefmt=datefmt,
            reset=True,
            log_colors={
                'DEBUG': 'cyan',
@@ -529,10 +549,6 @@ def enable_logging(hass: core.HomeAssistant, verbose: bool=False,
    except ImportError:
        pass

-    # AsyncHandler allready exists?
-    if hass.data.get(core.DATA_ASYNCHANDLER):
-        return
-
    # Log errors to a file if we have write access to file or config dir
    err_log_path = hass.config.path(ERROR_LOG_FILENAME)
    err_path_exists = os.path.isfile(err_log_path)
@@ -550,12 +566,18 @@ def enable_logging(hass: core.HomeAssistant, verbose: bool=False,
                err_log_path, mode='w', delay=True)

        err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
-        err_handler.setFormatter(
-            logging.Formatter('%(asctime)s %(name)s: %(message)s',
-                              datefmt='%y-%m-%d %H:%M:%S'))
+        err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))

        async_handler = AsyncHandler(hass.loop, err_handler)
-        hass.data[core.DATA_ASYNCHANDLER] = async_handler
+
+        @asyncio.coroutine
+        def async_stop_async_handler(event):
+            """Cleanup async handler."""
+            logging.getLogger('').removeHandler(async_handler)
+            yield from async_handler.async_close(blocking=True)
+
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_CLOSE, async_stop_async_handler)

        logger = logging.getLogger('')
        logger.addHandler(async_handler)
@@ -606,7 +628,7 @@ def async_log_exception(ex, domain, config, hass):
        message += '{}.'.format(humanize_error(config, ex))

    domain_config = config.get(domain, config)
-    message += " (See {}:{}). ".format(
+    message += " (See {}, line {}). ".format(
        getattr(domain_config, '__config_file__', '?'),
        getattr(domain_config, '__line__', '?'))

--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -12,14 +12,19 @@ import itertools as it
 import logging

 import homeassistant.core as ha
+import homeassistant.config as conf_util
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.service import extract_entity_ids
 from homeassistant.loader import get_component
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE)
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
+    SERVICE_HOMEASSISTANT_STOP, SERVICE_HOMEASSISTANT_RESTART,
+    RESTART_EXIT_CODE)

 _LOGGER = logging.getLogger(__name__)

 SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
+SERVICE_CHECK_CONFIG = 'check_config'


 def is_on(hass, entity_id=None):
@@ -75,6 +80,21 @@ def toggle(hass, entity_id=None, **service_data):
    hass.services.call(ha.DOMAIN, SERVICE_TOGGLE, service_data)


+def stop(hass):
+    """Stop Home Assistant."""
+    hass.services.call(ha.DOMAIN, SERVICE_HOMEASSISTANT_STOP)
+
+
+def restart(hass):
+    """Stop Home Assistant."""
+    hass.services.call(ha.DOMAIN, SERVICE_HOMEASSISTANT_RESTART)
+
+
+def check_config(hass):
+    """Check the config files."""
+    hass.services.call(ha.DOMAIN, SERVICE_CHECK_CONFIG)
+
+
 def reload_core_config(hass):
    """Reload the core config."""
    hass.services.call(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG)
@@ -84,7 +104,7 @@ def reload_core_config(hass):
 def async_setup(hass, config):
    """Setup general services related to Home Assistant."""
    @asyncio.coroutine
-    def handle_turn_service(service):
+    def async_handle_turn_service(service):
        """Method to handle calls to homeassistant.turn_on/off."""
        entity_ids = extract_entity_ids(hass, service)

@@ -122,18 +142,45 @@ def async_setup(hass, config):
        yield from asyncio.wait(tasks, loop=hass.loop)

    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_OFF, handle_turn_service)
+        ha.DOMAIN, SERVICE_TURN_OFF, async_handle_turn_service)
    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TURN_ON, handle_turn_service)
+        ha.DOMAIN, SERVICE_TURN_ON, async_handle_turn_service)
    hass.services.async_register(
-        ha.DOMAIN, SERVICE_TOGGLE, handle_turn_service)
+        ha.DOMAIN, SERVICE_TOGGLE, async_handle_turn_service)

    @asyncio.coroutine
-    def handle_reload_config(call):
-        """Service handler for reloading core config."""
-        from homeassistant.exceptions import HomeAssistantError
-        from homeassistant import config as conf_util
+    def async_handle_core_service(call):
+        """Service handler for handling core services."""
+        if call.service == SERVICE_HOMEASSISTANT_STOP:
+            hass.async_add_job(hass.async_stop())
+            return

+        try:
+            errors = yield from conf_util.async_check_ha_config_file(hass)
+        except HomeAssistantError:
+            return
+
+        if errors:
+            notif = get_component('persistent_notification')
+            _LOGGER.error(errors)
+            notif.async_create(
+                hass, "Config error. See dev-info panel for details.",
+                "Config validating", "{0}.check_config".format(ha.DOMAIN))
+            return
+
+        if call.service == SERVICE_HOMEASSISTANT_RESTART:
+            hass.async_add_job(hass.async_stop(RESTART_EXIT_CODE))
+
+    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)
+
+    @asyncio.coroutine
+    def async_handle_reload_config(call):
+        """Service handler for reloading core config."""
        try:
            conf = yield from conf_util.async_hass_config_yaml(hass)
        except HomeAssistantError as err:
@@ -144,6 +191,6 @@ def async_setup(hass, config):
            hass, conf.get(ha.DOMAIN) or {})

    hass.services.async_register(
-        ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG, handle_reload_config)
+        ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG, async_handle_reload_config)

    return True
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel/
 """
 import asyncio
+from datetime import timedelta
 import logging
 import os

@@ -20,7 +21,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent

 DOMAIN = 'alarm_control_panel'
-SCAN_INTERVAL = 30
+SCAN_INTERVAL = timedelta(seconds=30)
 ATTR_CHANGED_BY = 'changed_by'

 ENTITY_ID_FORMAT = DOMAIN + '.{}'
@@ -115,7 +116,7 @@ def async_setup(hass, config):
            update_coro = hass.loop.create_task(
                alarm.async_update_ha_state(True))
            if hasattr(alarm, 'async_update'):
-                update_tasks.append(hass.loop.create_task(update_coro))
+                update_tasks.append(update_coro)
            else:
                yield from update_coro

@@ -152,40 +153,48 @@ class AlarmControlPanel(Entity):
        """Send disarm command."""
        raise NotImplementedError()

-    @asyncio.coroutine
    def async_alarm_disarm(self, code=None):
-        """Send disarm command."""
-        yield from self.hass.loop.run_in_executor(
+        """Send disarm command.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
            None, self.alarm_disarm, code)

    def alarm_arm_home(self, code=None):
        """Send arm home command."""
        raise NotImplementedError()

-    @asyncio.coroutine
    def async_alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        yield from self.hass.loop.run_in_executor(
+        """Send arm home command.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
            None, self.alarm_arm_home, code)

    def alarm_arm_away(self, code=None):
        """Send arm away command."""
        raise NotImplementedError()

-    @asyncio.coroutine
    def async_alarm_arm_away(self, code=None):
-        """Send arm away command."""
-        yield from self.hass.loop.run_in_executor(
+        """Send arm away command.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
            None, self.alarm_arm_away, code)

    def alarm_trigger(self, code=None):
        """Send alarm trigger command."""
        raise NotImplementedError()

-    @asyncio.coroutine
    def async_alarm_trigger(self, code=None):
-        """Send alarm trigger command."""
-        yield from self.hass.loop.run_in_executor(
+        """Send alarm trigger command.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
            None, self.alarm_trigger, code)

    @property
--- a/homeassistant/components/alarm_control_panel/concord232.py
+++ b/homeassistant/components/alarm_control_panel/concord232.py
@@ -5,6 +5,7 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.concord232/
 """
 import datetime
+from datetime import timedelta
 import logging

 import requests
@@ -25,7 +26,7 @@ DEFAULT_HOST = 'localhost'
 DEFAULT_NAME = 'CONCORD232'
 DEFAULT_PORT = 5007

-SCAN_INTERVAL = 1
+SCAN_INTERVAL = timedelta(seconds=1)

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
--- a/homeassistant/components/alarm_control_panel/envisalink.py
+++ b/homeassistant/components/alarm_control_panel/envisalink.py
@@ -4,16 +4,20 @@ Support for Envisalink-based alarm control panels (Honeywell/DSC).
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.envisalink/
 """
-from os import path
+import asyncio
 import logging
+import os
+
 import voluptuous as vol

+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 import homeassistant.components.alarm_control_panel as alarm
 import homeassistant.helpers.config_validation as cv
 from homeassistant.config import load_yaml_config_file
 from homeassistant.components.envisalink import (
-    EVL_CONTROLLER, EnvisalinkDevice, PARTITION_SCHEMA, CONF_CODE, CONF_PANIC,
-    CONF_PARTITIONNAME, SIGNAL_PARTITION_UPDATE, SIGNAL_KEYPAD_UPDATE)
+    DATA_EVL, EnvisalinkDevice, PARTITION_SCHEMA, CONF_CODE, CONF_PANIC,
+    CONF_PARTITIONNAME, SIGNAL_KEYPAD_UPDATE, SIGNAL_PARTITION_UPDATE)
 from homeassistant.const import (
    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
    STATE_UNKNOWN, STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, ATTR_ENTITY_ID)
@@ -22,8 +26,6 @@ _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['envisalink']

-DEVICES = []
-
 SERVICE_ALARM_KEYPRESS = 'envisalink_alarm_keypress'
 ATTR_KEYPRESS = 'keypress'
 ALARM_KEYPRESS_SCHEMA = vol.Schema({
@@ -32,68 +34,72 @@ ALARM_KEYPRESS_SCHEMA = vol.Schema({
 })


-def alarm_keypress_handler(service):
-    """Map services to methods on Alarm."""
-    entity_ids = service.data.get(ATTR_ENTITY_ID)
-    keypress = service.data.get(ATTR_KEYPRESS)
-
-    _target_devices = [device for device in DEVICES
-                       if device.entity_id in entity_ids]
-
-    for device in _target_devices:
-        EnvisalinkAlarm.alarm_keypress(device, keypress)
-
-
-# pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices, discovery_info=None):
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Perform the setup for Envisalink alarm panels."""
-    _configured_partitions = discovery_info['partitions']
-    _code = discovery_info[CONF_CODE]
-    _panic_type = discovery_info[CONF_PANIC]
-    for part_num in _configured_partitions:
-        _device_config_data = PARTITION_SCHEMA(
-            _configured_partitions[part_num])
-        _device = EnvisalinkAlarm(
-            part_num,
-            _device_config_data[CONF_PARTITIONNAME],
-            _code,
-            _panic_type,
-            EVL_CONTROLLER.alarm_state['partition'][part_num],
-            EVL_CONTROLLER)
-        DEVICES.append(_device)
+    configured_partitions = discovery_info['partitions']
+    code = discovery_info[CONF_CODE]
+    panic_type = discovery_info[CONF_PANIC]

-    add_devices(DEVICES)
+    devices = []
+    for part_num in configured_partitions:
+        device_config_data = PARTITION_SCHEMA(configured_partitions[part_num])
+        device = EnvisalinkAlarm(
+            hass,
+            part_num,
+            device_config_data[CONF_PARTITIONNAME],
+            code,
+            panic_type,
+            hass.data[DATA_EVL].alarm_state['partition'][part_num],
+            hass.data[DATA_EVL]
+        )
+        devices.append(device)
+
+    yield from async_add_devices(devices)
+
+    @callback
+    def alarm_keypress_handler(service):
+        """Map services to methods on Alarm."""
+        entity_ids = service.data.get(ATTR_ENTITY_ID)
+        keypress = service.data.get(ATTR_KEYPRESS)
+
+        target_devices = [device for device in devices
+                          if device.entity_id in entity_ids]
+
+        for device in target_devices:
+            device.async_alarm_keypress(keypress)

    # Register Envisalink specific services
-    descriptions = load_yaml_config_file(
-        path.join(path.dirname(__file__), 'services.yaml'))
+    descriptions = yield from hass.loop.run_in_executor(
+        None, load_yaml_config_file, os.path.join(
+            os.path.dirname(__file__), 'services.yaml'))
+
+    hass.services.async_register(
+        alarm.DOMAIN, SERVICE_ALARM_KEYPRESS, alarm_keypress_handler,
+        descriptions.get(SERVICE_ALARM_KEYPRESS), schema=ALARM_KEYPRESS_SCHEMA)

-    hass.services.register(alarm.DOMAIN, SERVICE_ALARM_KEYPRESS,
-                           alarm_keypress_handler,
-                           descriptions.get(SERVICE_ALARM_KEYPRESS),
-                           schema=ALARM_KEYPRESS_SCHEMA)
    return True


 class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
    """Representation of an Envisalink-based alarm panel."""

-    def __init__(self, partition_number, alarm_name, code, panic_type, info,
-                 controller):
+    def __init__(self, hass, partition_number, alarm_name, code, panic_type,
+                 info, controller):
        """Initialize the alarm panel."""
-        from pydispatch import dispatcher
        self._partition_number = partition_number
        self._code = code
        self._panic_type = panic_type
-        _LOGGER.debug("Setting up alarm: %s", alarm_name)
-        EnvisalinkDevice.__init__(self, alarm_name, info, controller)
-        dispatcher.connect(
-            self._update_callback, signal=SIGNAL_PARTITION_UPDATE,
-            sender=dispatcher.Any)
-        dispatcher.connect(
-            self._update_callback, signal=SIGNAL_KEYPAD_UPDATE,
-            sender=dispatcher.Any)

+        _LOGGER.debug("Setting up alarm: %s", alarm_name)
+        super().__init__(alarm_name, info, controller)
+
+        async_dispatcher_connect(
+            hass, SIGNAL_KEYPAD_UPDATE, self._update_callback)
+        async_dispatcher_connect(
+            hass, SIGNAL_PARTITION_UPDATE, self._update_callback)
+
+    @callback
    def _update_callback(self, partition):
        """Update HA state, if needed."""
        if partition is None or int(partition) == self._partition_number:
@@ -126,39 +132,44 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
            state = STATE_ALARM_DISARMED
        return state

-    def alarm_disarm(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_disarm(self, code=None):
        """Send disarm command."""
        if code:
-            EVL_CONTROLLER.disarm_partition(str(code),
-                                            self._partition_number)
+            self.hass.data[DATA_EVL].disarm_partition(
+                str(code), self._partition_number)
        else:
-            EVL_CONTROLLER.disarm_partition(str(self._code),
-                                            self._partition_number)
+            self.hass.data[DATA_EVL].disarm_partition(
+                str(self._code), self._partition_number)

-    def alarm_arm_home(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_arm_home(self, code=None):
        """Send arm home command."""
        if code:
-            EVL_CONTROLLER.arm_stay_partition(str(code),
-                                              self._partition_number)
+            self.hass.data[DATA_EVL].arm_stay_partition(
+                str(code), self._partition_number)
        else:
-            EVL_CONTROLLER.arm_stay_partition(str(self._code),
-                                              self._partition_number)
+            self.hass.data[DATA_EVL].arm_stay_partition(
+                str(self._code), self._partition_number)

-    def alarm_arm_away(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_arm_away(self, code=None):
        """Send arm away command."""
        if code:
-            EVL_CONTROLLER.arm_away_partition(str(code),
-                                              self._partition_number)
+            self.hass.data[DATA_EVL].arm_away_partition(
+                str(code), self._partition_number)
        else:
-            EVL_CONTROLLER.arm_away_partition(str(self._code),
-                                              self._partition_number)
+            self.hass.data[DATA_EVL].arm_away_partition(
+                str(self._code), self._partition_number)

-    def alarm_trigger(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_trigger(self, code=None):
        """Alarm trigger command. Will be used to trigger a panic alarm."""
-        EVL_CONTROLLER.panic_alarm(self._panic_type)
+        self.hass.data[DATA_EVL].panic_alarm(self._panic_type)

-    def alarm_keypress(self, keypress=None):
+    @callback
+    def async_alarm_keypress(self, keypress=None):
        """Send custom keypress."""
        if keypress:
-            EVL_CONTROLLER.keypresses_to_partition(self._partition_number,
-                                                   keypress)
+            self.hass.data[DATA_EVL].keypresses_to_partition(
+                self._partition_number, keypress)
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -4,10 +4,12 @@ This platform enables the possibility to control a MQTT alarm.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.mqtt/
 """
+import asyncio
 import logging

 import voluptuous as vol

+from homeassistant.core import callback
 import homeassistant.components.alarm_control_panel as alarm
 import homeassistant.components.mqtt as mqtt
 from homeassistant.const import (
@@ -41,10 +43,10 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 })


-def setup_platform(hass, config, add_devices, discovery_info=None):
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Setup the MQTT platform."""
-    add_devices([MqttAlarm(
-        hass,
+    yield from async_add_devices([MqttAlarm(
        config.get(CONF_NAME),
        config.get(CONF_STATE_TOPIC),
        config.get(CONF_COMMAND_TOPIC),
@@ -58,11 +60,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class MqttAlarm(alarm.AlarmControlPanel):
    """Representation of a MQTT alarm status."""

-    def __init__(self, hass, name, state_topic, command_topic, qos,
-                 payload_disarm, payload_arm_home, payload_arm_away, code):
+    def __init__(self, name, state_topic, command_topic, qos, payload_disarm,
+                 payload_arm_home, payload_arm_away, code):
        """Initalize the MQTT alarm panel."""
        self._state = STATE_UNKNOWN
-        self._hass = hass
        self._name = name
        self._state_topic = state_topic
        self._command_topic = command_topic
@@ -72,6 +73,12 @@ class MqttAlarm(alarm.AlarmControlPanel):
        self._payload_arm_away = payload_arm_away
        self._code = code

+    def async_added_to_hass(self):
+        """Subscribe mqtt events.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        @callback
        def message_received(topic, payload, qos):
            """A new MQTT message has been received."""
            if payload not in (STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
@@ -80,9 +87,10 @@ class MqttAlarm(alarm.AlarmControlPanel):
                _LOGGER.warning('Received unexpected payload: %s', payload)
                return
            self._state = payload
-            self.update_ha_state()
+            self.hass.async_add_job(self.async_update_ha_state())

-        mqtt.subscribe(hass, self._state_topic, message_received, self._qos)
+        return mqtt.async_subscribe(
+            self.hass, self._state_topic, message_received, self._qos)

    @property
    def should_poll(self):
@@ -104,26 +112,38 @@ class MqttAlarm(alarm.AlarmControlPanel):
        """One or more characters if code is defined."""
        return None if self._code is None else '.+'

-    def alarm_disarm(self, code=None):
-        """Send disarm command."""
+    @asyncio.coroutine
+    def async_alarm_disarm(self, code=None):
+        """Send disarm command.
+
+        This method is a coroutine.
+        """
        if not self._validate_code(code, 'disarming'):
            return
-        mqtt.publish(self.hass, self._command_topic,
-                     self._payload_disarm, self._qos)
+        mqtt.async_publish(
+            self.hass, self._command_topic, self._payload_disarm, self._qos)

-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
+    @asyncio.coroutine
+    def async_alarm_arm_home(self, code=None):
+        """Send arm home command.
+
+        This method is a coroutine.
+        """
        if not self._validate_code(code, 'arming home'):
            return
-        mqtt.publish(self.hass, self._command_topic,
-                     self._payload_arm_home, self._qos)
+        mqtt.async_publish(
+            self.hass, self._command_topic, self._payload_arm_home, self._qos)

-    def alarm_arm_away(self, code=None):
-        """Send arm away command."""
+    @asyncio.coroutine
+    def async_alarm_arm_away(self, code=None):
+        """Send arm away command.
+
+        This method is a coroutine.
+        """
        if not self._validate_code(code, 'arming away'):
            return
-        mqtt.publish(self.hass, self._command_topic,
-                     self._payload_arm_away, self._qos)
+        mqtt.async_publish(
+            self.hass, self._command_topic, self._payload_arm_away, self._qos)

    def _validate_code(self, code, state):
        """Validate given code."""
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
    STATE_UNKNOWN, CONF_NAME, CONF_HOST, CONF_PORT)
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['pynx584==0.2']
+REQUIREMENTS = ['pynx584==0.4']

 _LOGGER = logging.getLogger(__name__)

@@ -86,9 +86,11 @@ class NX584Alarm(alarm.AlarmControlPanel):
            _LOGGER.error('Unable to connect to %(host)s: %(reason)s',
                          dict(host=self._url, reason=ex))
            self._state = STATE_UNKNOWN
+            zones = []
        except IndexError:
            _LOGGER.error('nx584 reports no partitions')
            self._state = STATE_UNKNOWN
+            zones = []

        bypassed = False
        for zone in zones:
--- a/homeassistant/components/alarm_control_panel/simplisafe.py
+++ b/homeassistant/components/alarm_control_panel/simplisafe.py
@@ -12,16 +12,19 @@ import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
    CONF_PASSWORD, CONF_USERNAME, STATE_UNKNOWN, CONF_CODE, CONF_NAME,
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    EVENT_HOMEASSISTANT_STOP)
 import homeassistant.helpers.config_validation as cv
+import homeassistant.loader as loader

-REQUIREMENTS = ['https://github.com/w1ll1am23/simplisafe-python/archive/'
-                '586fede0e85fd69e56e516aaa8e97eb644ca8866.zip#'
-                'simplisafe-python==0.0.1']
+REQUIREMENTS = ['simplisafe-python==1.0.2']

 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = 'SimpliSafe'
+DOMAIN = 'simplisafe'
+NOTIFICATION_ID = 'simplisafe_notification'
+NOTIFICATION_TITLE = 'SimpliSafe Setup'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_PASSWORD): cv.string,
@@ -33,33 +36,44 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up the SimpliSafe platform."""
+    from simplipy.api import SimpliSafeApiInterface, get_systems
    name = config.get(CONF_NAME)
    code = config.get(CONF_CODE)
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

-    add_devices([SimpliSafeAlarm(name, username, password, code)])
+    persistent_notification = loader.get_component('persistent_notification')
+    simplisafe = SimpliSafeApiInterface()
+    status = simplisafe.set_credentials(username, password)
+    if status:
+        hass.data[DOMAIN] = simplisafe
+        locations = get_systems(simplisafe)
+        for location in locations:
+            add_devices([SimpliSafeAlarm(location, name, code)])
+    else:
+        message = 'Failed to log into SimpliSafe. Check credentials.'
+        _LOGGER.error(message)
+        persistent_notification.create(
+            hass, message,
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+        return False
+
+    def logout(event):
+        """Logout of the SimpliSafe API."""
+        hass.data[DOMAIN].logout()
+
+    hass.bus.listen(EVENT_HOMEASSISTANT_STOP, logout)


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

-    def __init__(self, name, username, password, code):
+    def __init__(self, simplisafe, name, code):
        """Initialize the SimpliSafe alarm."""
-        from simplisafe import SimpliSafe
-        self.simplisafe = SimpliSafe(username, password)
+        self.simplisafe = simplisafe
        self._name = name
        self._code = str(code) if code else None
-        self._id = self.simplisafe.get_id()
-        status = self.simplisafe.get_state()
-        if status == 'Off':
-            self._state = STATE_ALARM_DISARMED
-        elif status == 'Home':
-            self._state = STATE_ALARM_ARMED_HOME
-        elif status == 'Away':
-            self._state = STATE_ALARM_ARMED_AWAY
-        else:
-            self._state = STATE_UNKNOWN

    @property
    def name(self):
@@ -67,7 +81,7 @@ class SimpliSafeAlarm(alarm.AlarmControlPanel):
        if self._name is not None:
            return self._name
        else:
-            return 'Alarm {}'.format(self._id)
+            return 'Alarm {}'.format(self.simplisafe.location_id())

    @property
    def code_format(self):
@@ -77,21 +91,32 @@ class SimpliSafeAlarm(alarm.AlarmControlPanel):
    @property
    def state(self):
        """Return the state of the device."""
-        return self._state
+        status = self.simplisafe.state()
+        if status == 'Off':
+            state = STATE_ALARM_DISARMED
+        elif status == 'Home':
+            state = STATE_ALARM_ARMED_HOME
+        elif status == 'Away':
+            state = STATE_ALARM_ARMED_AWAY
+        else:
+            state = STATE_UNKNOWN
+        return state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            'temperature': self.simplisafe.temperature(),
+            'co': self.simplisafe.carbon_monoxide(),
+            'fire': self.simplisafe.fire(),
+            'alarm': self.simplisafe.alarm(),
+            'last_event': self.simplisafe.last_event(),
+            'flood': self.simplisafe.flood()
+        }

    def update(self):
        """Update alarm status."""
-        self.simplisafe.get_location()
-        status = self.simplisafe.get_state()
-
-        if status == 'Off':
-            self._state = STATE_ALARM_DISARMED
-        elif status == 'Home':
-            self._state = STATE_ALARM_ARMED_HOME
-        elif status == 'Away':
-            self._state = STATE_ALARM_ARMED_AWAY
-        else:
-            self._state = STATE_UNKNOWN
+        self.simplisafe.update()

    def alarm_disarm(self, code=None):
        """Send disarm command."""
--- a/homeassistant/components/alarm_control_panel/wink.py
+++ b/homeassistant/components/alarm_control_panel/wink.py
@@ -0,0 +1,75 @@
+"""
+Interfaces with Wink Cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.wink/
+"""
+import logging
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.const import (STATE_UNKNOWN,
+                                 STATE_ALARM_DISARMED,
+                                 STATE_ALARM_ARMED_HOME,
+                                 STATE_ALARM_ARMED_AWAY)
+from homeassistant.components.wink import WinkDevice, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['wink']
+STATE_ALARM_PRIVACY = 'Private'
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Wink platform."""
+    import pywink
+
+    for camera in pywink.get_cameras():
+        # get_cameras returns multiple device types.
+        # Only add those that aren't sensors.
+        try:
+            camera.capability()
+        except AttributeError:
+            _id = camera.object_id() + camera.name()
+            if _id not in hass.data[DOMAIN]['unique_ids']:
+                add_devices([WinkCameraDevice(camera, hass)])
+
+
+class WinkCameraDevice(WinkDevice, alarm.AlarmControlPanel):
+    """Representation a Wink camera alarm."""
+
+    def __init__(self, wink, hass):
+        """Initialize the Wink alarm."""
+        super().__init__(wink, hass)
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        wink_state = self.wink.state()
+        if wink_state == "away":
+            state = STATE_ALARM_ARMED_AWAY
+        elif wink_state == "home":
+            state = STATE_ALARM_DISARMED
+        elif wink_state == "night":
+            state = STATE_ALARM_ARMED_HOME
+        else:
+            state = STATE_UNKNOWN
+        return state
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self.wink.set_mode("home")
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self.wink.set_mode("night")
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self.wink.set_mode("away")
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            'private': self.wink.private()
+        }
--- a/homeassistant/components/alert.py
+++ b/homeassistant/components/alert.py
@@ -0,0 +1,279 @@
+"""
+Support for repeating alerts when conditions are met.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/alert/
+"""
+import asyncio
+from datetime import datetime, timedelta
+import logging
+import os
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.config import load_yaml_config_file
+from homeassistant.const import (
+    CONF_ENTITY_ID, STATE_IDLE, CONF_NAME, CONF_STATE, STATE_ON, STATE_OFF,
+    SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE, ATTR_ENTITY_ID)
+from homeassistant.helpers.entity import ToggleEntity
+from homeassistant.helpers import service, event
+from homeassistant.util.async import run_callback_threadsafe
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'alert'
+ENTITY_ID_FORMAT = DOMAIN + '.{}'
+
+CONF_CAN_ACK = 'can_acknowledge'
+CONF_NOTIFIERS = 'notifiers'
+CONF_REPEAT = 'repeat'
+CONF_SKIP_FIRST = 'skip_first'
+
+DEFAULT_CAN_ACK = True
+DEFAULT_SKIP_FIRST = False
+
+ALERT_SCHEMA = vol.Schema({
+    vol.Required(CONF_NAME): 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.Required(CONF_NOTIFIERS): cv.ensure_list})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        cv.slug: ALERT_SCHEMA,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+ALERT_SERVICE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+})
+
+
+def is_on(hass, entity_id):
+    """Return if the alert is firing and not acknowledged."""
+    return hass.states.is_state(entity_id, STATE_ON)
+
+
+def turn_on(hass, entity_id):
+    """Reset the alert."""
+    run_callback_threadsafe(
+        hass.loop, async_turn_on, hass, entity_id).result()
+
+
+@callback
+def async_turn_on(hass, entity_id):
+    """Async reset the alert."""
+    data = {ATTR_ENTITY_ID: entity_id}
+    hass.async_add_job(
+        hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
+
+
+def turn_off(hass, entity_id):
+    """Acknowledge alert."""
+    run_callback_threadsafe(
+        hass.loop, async_turn_off, hass, entity_id).result()
+
+
+@callback
+def async_turn_off(hass, entity_id):
+    """Async acknowledge the alert."""
+    data = {ATTR_ENTITY_ID: entity_id}
+    hass.async_add_job(
+        hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data))
+
+
+def toggle(hass, entity_id):
+    """Toggle acknowledgement of alert."""
+    run_callback_threadsafe(hass.loop, async_toggle, hass, entity_id)
+
+
+@callback
+def async_toggle(hass, entity_id):
+    """Async toggle acknowledgement of alert."""
+    data = {ATTR_ENTITY_ID: entity_id}
+    hass.async_add_job(
+        hass.services.async_call(DOMAIN, SERVICE_TOGGLE, data))
+
+
+@asyncio.coroutine
+def async_setup(hass, config):
+    """Set up the Alert component."""
+    alerts = config.get(DOMAIN)
+    all_alerts = {}
+
+    @asyncio.coroutine
+    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]
+            if service_call.service == SERVICE_TURN_ON:
+                yield from alert.async_turn_on()
+            elif service_call.service == SERVICE_TOGGLE:
+                yield from alert.async_toggle()
+            else:
+                yield from alert.async_turn_off()
+
+    # Setup alerts
+    for entity_id, alert in alerts.items():
+        entity = Alert(hass, entity_id,
+                       alert[CONF_NAME], 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
+
+    # Read descriptions
+    descriptions = yield from hass.loop.run_in_executor(
+        None, load_yaml_config_file, os.path.join(
+            os.path.dirname(__file__), 'services.yaml'))
+    descriptions = descriptions.get(DOMAIN, {})
+
+    # Setup service calls
+    hass.services.async_register(
+        DOMAIN, SERVICE_TURN_OFF, async_handle_alert_service,
+        descriptions.get(SERVICE_TURN_OFF), schema=ALERT_SERVICE_SCHEMA)
+    hass.services.async_register(
+        DOMAIN, SERVICE_TURN_ON, async_handle_alert_service,
+        descriptions.get(SERVICE_TURN_ON), schema=ALERT_SERVICE_SCHEMA)
+    hass.services.async_register(
+        DOMAIN, SERVICE_TOGGLE, async_handle_alert_service,
+        descriptions.get(SERVICE_TOGGLE), schema=ALERT_SERVICE_SCHEMA)
+
+    tasks = [alert.async_update_ha_state() for alert in all_alerts.values()]
+    if tasks:
+        yield from asyncio.wait(tasks, loop=hass.loop)
+
+    return True
+
+
+class Alert(ToggleEntity):
+    """Representation of an alert."""
+
+    def __init__(self, hass, entity_id, name, watched_entity_id, state,
+                 repeat, skip_first, notifiers, can_ack):
+        """Initialize the alert."""
+        self.hass = hass
+        self._name = name
+        self._alert_state = state
+        self._skip_first = skip_first
+        self._notifiers = notifiers
+        self._can_ack = can_ack
+
+        self._delay = [timedelta(minutes=val) for val in repeat]
+        self._next_delay = 0
+
+        self._firing = False
+        self._ack = False
+        self._cancel = None
+        self.entity_id = ENTITY_ID_FORMAT.format(entity_id)
+
+        event.async_track_state_change(
+            hass, watched_entity_id, self.watched_entity_change)
+
+    @property
+    def name(self):
+        """Return the name of the alert."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """HASS need not poll these entities."""
+        return False
+
+    @property
+    def state(self):
+        """Return the alert status."""
+        if self._firing:
+            if self._ack:
+                return STATE_OFF
+            return STATE_ON
+        return STATE_IDLE
+
+    @property
+    def hidden(self):
+        """Hide the alert when it is not firing."""
+        return not self._can_ack or not self._firing
+
+    @asyncio.coroutine
+    def watched_entity_change(self, entity, from_state, to_state):
+        """Determine if the alert should start or stop."""
+        _LOGGER.debug("Watched entity (%s) has changed", entity)
+        if to_state.state == self._alert_state and not self._firing:
+            yield from self.begin_alerting()
+        if to_state.state != self._alert_state and self._firing:
+            yield from self.end_alerting()
+
+    @asyncio.coroutine
+    def begin_alerting(self):
+        """Begin the alert procedures."""
+        _LOGGER.debug("Beginning Alert: %s", self._name)
+        self._ack = False
+        self._firing = True
+        self._next_delay = 0
+
+        if not self._skip_first:
+            yield from self._notify()
+        else:
+            yield from self._schedule_notify()
+
+        self.hass.async_add_job(self.async_update_ha_state)
+
+    @asyncio.coroutine
+    def end_alerting(self):
+        """End the alert procedures."""
+        _LOGGER.debug("Ending Alert: %s", self._name)
+        self._cancel()
+        self._ack = False
+        self._firing = False
+        self.hass.async_add_job(self.async_update_ha_state)
+
+    @asyncio.coroutine
+    def _schedule_notify(self):
+        """Schedule a notification."""
+        delay = self._delay[self._next_delay]
+        next_msg = datetime.now() + delay
+        self._cancel = \
+            event.async_track_point_in_time(self.hass, self._notify, next_msg)
+        self._next_delay = min(self._next_delay + 1, len(self._delay) - 1)
+
+    @asyncio.coroutine
+    def _notify(self, *args):
+        """Send the alert notification."""
+        if not self._firing:
+            return
+
+        if not self._ack:
+            _LOGGER.info("Alerting: %s", self._name)
+            for target in self._notifiers:
+                yield from self.hass.services.async_call(
+                    'notify', target, {'message': self._name})
+        yield from self._schedule_notify()
+
+    @asyncio.coroutine
+    def async_turn_on(self):
+        """Async Unacknowledge alert."""
+        _LOGGER.debug("Reset Alert: %s", self._name)
+        self._ack = False
+        yield from self.async_update_ha_state()
+
+    @asyncio.coroutine
+    def async_turn_off(self):
+        """Async Acknowledge alert."""
+        _LOGGER.debug("Acknowledged Alert: %s", self._name)
+        self._ack = True
+        yield from self.async_update_ha_state()
+
+    @asyncio.coroutine
+    def async_toggle(self):
+        """Async toggle alert."""
+        if self._ack:
+            return self.async_turn_on()
+        return self.async_turn_off()
--- a/homeassistant/components/alexa.py
+++ b/homeassistant/components/alexa.py
@@ -203,11 +203,12 @@ class AlexaResponse(object):
        self.reprompt = None
        self.session_attributes = {}
        self.should_end_session = True
+        self.variables = {}
        if intent is not None and 'slots' in intent:
-            self.variables = {key: value['value'] for key, value
-                              in intent['slots'].items() if 'value' in value}
-        else:
-            self.variables = {}
+            for key, value in intent['slots'].items():
+                if 'value' in value:
+                    underscored_key = key.replace('.', '_')
+                    self.variables[underscored_key] = value['value']

    def add_card(self, card_type, title, content):
        """Add a card to the response."""
--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -133,6 +133,9 @@ class APIEventStream(HomeAssistantView):
                except asyncio.TimeoutError:
                    yield from to_write.put(STREAM_PING_PAYLOAD)

+        except asyncio.CancelledError:
+            _LOGGER.debug('STREAM %s ABORT', id(stop_obj))
+
        finally:
            _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
            unsub_stream()
--- a/homeassistant/components/apiai.py
+++ b/homeassistant/components/apiai.py
@@ -0,0 +1,172 @@
+"""
+Support for API.AI webhook.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/apiai/
+"""
+import asyncio
+import copy
+import logging
+
+import voluptuous as vol
+
+from homeassistant.const import PROJECT_NAME, HTTP_BAD_REQUEST
+from homeassistant.helpers import template, script, config_validation as cv
+from homeassistant.components.http import HomeAssistantView
+
+_LOGGER = logging.getLogger(__name__)
+
+INTENTS_API_ENDPOINT = '/api/apiai'
+
+CONF_INTENTS = 'intents'
+CONF_SPEECH = 'speech'
+CONF_ACTION = 'action'
+CONF_ASYNC_ACTION = 'async_action'
+
+DEFAULT_CONF_ASYNC_ACTION = False
+
+DOMAIN = 'apiai'
+DEPENDENCIES = ['http']
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: {
+        CONF_INTENTS: {
+            cv.string: {
+                vol.Optional(CONF_SPEECH): cv.template,
+                vol.Optional(CONF_ACTION): cv.SCRIPT_SCHEMA,
+                vol.Optional(CONF_ASYNC_ACTION,
+                             default=DEFAULT_CONF_ASYNC_ACTION): cv.boolean
+            }
+        }
+    }
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup(hass, config):
+    """Activate API.AI component."""
+    intents = config[DOMAIN].get(CONF_INTENTS, {})
+
+    hass.http.register_view(ApiaiIntentsView(hass, intents))
+
+    return True
+
+
+class ApiaiIntentsView(HomeAssistantView):
+    """Handle API.AI requests."""
+
+    url = INTENTS_API_ENDPOINT
+    name = 'api:apiai'
+
+    def __init__(self, hass, intents):
+        """Initialize API.AI view."""
+        super().__init__()
+
+        self.hass = hass
+        intents = copy.deepcopy(intents)
+        template.attach(hass, intents)
+
+        for name, intent in intents.items():
+            if CONF_ACTION in intent:
+                intent[CONF_ACTION] = script.Script(
+                    hass, intent[CONF_ACTION], "Apiai intent {}".format(name))
+
+        self.intents = intents
+
+    @asyncio.coroutine
+    def post(self, request):
+        """Handle API.AI."""
+        data = yield from request.json()
+
+        _LOGGER.debug("Received api.ai request: %s", data)
+
+        req = data.get('result')
+
+        if req is None:
+            _LOGGER.error("Received invalid data from api.ai: %s", data)
+            return self.json_message(
+                "Expected result value not received", HTTP_BAD_REQUEST)
+
+        action_incomplete = req['actionIncomplete']
+
+        if action_incomplete:
+            return None
+
+        # use intent to no mix HASS actions with this parameter
+        intent = req.get('action')
+        parameters = req.get('parameters')
+        # contexts = req.get('contexts')
+        response = ApiaiResponse(parameters)
+
+        # Default Welcome Intent
+        # Maybe is better to handle this in api.ai directly?
+        #
+        # if intent == 'input.welcome':
+        #     response.add_speech(
+        #     "Hello, and welcome to the future. How may I help?")
+        #     return self.json(response)
+
+        if intent == "":
+            _LOGGER.warning("Received intent with empty action")
+            response.add_speech(
+                "You have not defined an action in your api.ai intent.")
+            return self.json(response)
+
+        config = self.intents.get(intent)
+
+        if config is None:
+            _LOGGER.warning("Received unknown intent %s", intent)
+            response.add_speech(
+                "Intent '%s' is not yet configured within Home Assistant." %
+                intent)
+            return self.json(response)
+
+        speech = config.get(CONF_SPEECH)
+        action = config.get(CONF_ACTION)
+        async_action = config.get(CONF_ASYNC_ACTION)
+
+        if action is not None:
+            # API.AI expects a response in less than 5s
+            if async_action:
+                # Do not wait for the action to be executed.
+                # Needed if the action will take longer than 5s to execute
+                self.hass.async_add_job(action.async_run(response.parameters))
+            else:
+                # Wait for the action to be executed so we can use results to
+                # render the answer
+                yield from action.async_run(response.parameters)
+
+        # pylint: disable=unsubscriptable-object
+        if speech is not None:
+            response.add_speech(speech)
+
+        return self.json(response)
+
+
+class ApiaiResponse(object):
+    """Help generating the response for API.AI."""
+
+    def __init__(self, parameters):
+        """Initialize the response."""
+        self.speech = None
+        self.parameters = {}
+        # Parameter names replace '.' and '-' for '_'
+        for key, value in parameters.items():
+            underscored_key = key.replace('.', '_').replace('-', '_')
+            self.parameters[underscored_key] = value
+
+    def add_speech(self, text):
+        """Add speech to the response."""
+        assert self.speech is None
+
+        if isinstance(text, template.Template):
+            text = text.async_render(self.parameters)
+
+        self.speech = text
+
+    def as_dict(self):
+        """Return response in an API.AI valid dict."""
+        return {
+            'speech': self.speech,
+            'displayText': self.speech,
+            'source': PROJECT_NAME,
+        }
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -412,7 +412,7 @@ def _async_process_trigger(hass, config, trigger_configs, name, action):
        if platform is None:
            return None

-        remove = platform.async_trigger(hass, conf, action)
+        remove = yield from platform.async_trigger(hass, conf, action)

        if not remove:
            _LOGGER.error("Error setting up trigger %s", name)
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -4,6 +4,7 @@ Offer event listening automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#event-trigger
 """
+import asyncio
 import logging

 import voluptuous as vol
@@ -24,6 +25,7 @@ TRIGGER_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for events based on configuration."""
    event_type = config.get(CONF_EVENT_TYPE)
--- a/homeassistant/components/automation/litejet.py
+++ b/homeassistant/components/automation/litejet.py
@@ -4,6 +4,7 @@ Trigger an automation when a LiteJet switch is released.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/automation.litejet/
 """
+import asyncio
 import logging

 import voluptuous as vol
@@ -32,6 +33,7 @@ TRIGGER_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for events based on configuration."""
    number = config.get(CONF_NUMBER)
--- a/homeassistant/components/automation/mqtt.py
+++ b/homeassistant/components/automation/mqtt.py
@@ -4,6 +4,7 @@ Offer MQTT listening automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#mqtt-trigger
 """
+import asyncio
 import json

 import voluptuous as vol
@@ -24,6 +25,7 @@ TRIGGER_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    topic = config.get(CONF_TOPIC)
@@ -49,4 +51,6 @@ def async_trigger(hass, config, action):
                'trigger': data
            })

-    return mqtt.async_subscribe(hass, topic, mqtt_automation_listener)
+    remove = yield from mqtt.async_subscribe(
+        hass, topic, mqtt_automation_listener)
+    return remove
--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -4,6 +4,7 @@ Offer numeric state listening automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#numeric-state-trigger
 """
+import asyncio
 import logging

 import voluptuous as vol
@@ -26,6 +27,7 @@ TRIGGER_SCHEMA = vol.All(vol.Schema({
 _LOGGER = logging.getLogger(__name__)


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
--- a/homeassistant/components/automation/state.py
+++ b/homeassistant/components/automation/state.py
@@ -4,6 +4,7 @@ Offer state listening automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#state-trigger
 """
+import asyncio
 import voluptuous as vol

 from homeassistant.core import callback
@@ -34,6 +35,7 @@ TRIGGER_SCHEMA = vol.All(
 )


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
@@ -43,6 +45,19 @@ def async_trigger(hass, config, action):
    async_remove_state_for_cancel = None
    async_remove_state_for_listener = None

+    @callback
+    def clear_listener():
+        """Clear all unsub listener."""
+        nonlocal async_remove_state_for_cancel, async_remove_state_for_listener
+
+        # pylint: disable=not-callable
+        if async_remove_state_for_listener is not None:
+            async_remove_state_for_listener()
+            async_remove_state_for_listener = None
+        if async_remove_state_for_cancel is not None:
+            async_remove_state_for_cancel()
+            async_remove_state_for_cancel = None
+
    @callback
    def state_automation_listener(entity, from_s, to_s):
        """Listen for state changes and calls action."""
@@ -64,18 +79,11 @@ def async_trigger(hass, config, action):
            call_action()
            return

-        @callback
-        def clear_listener():
-            """Clear all unsub listener."""
-            nonlocal async_remove_state_for_cancel
-            nonlocal async_remove_state_for_listener
-            async_remove_state_for_listener = None
-            async_remove_state_for_cancel = None
-
        @callback
        def state_for_listener(now):
            """Fire on state changes after a delay and calls action."""
-            async_remove_state_for_cancel()
+            nonlocal async_remove_state_for_listener
+            async_remove_state_for_listener = None
            clear_listener()
            call_action()

@@ -84,10 +92,11 @@ def async_trigger(hass, config, action):
            """Fire on changes and cancel for listener if changed."""
            if inner_to_s.state == to_s.state:
                return
-            async_remove_state_for_listener()
-            async_remove_state_for_cancel()
            clear_listener()

+        # cleanup previous listener
+        clear_listener()
+
        async_remove_state_for_listener = async_track_point_in_utc_time(
            hass, state_for_listener, dt_util.utcnow() + time_delta)

@@ -97,14 +106,10 @@ def async_trigger(hass, config, action):
    unsub = async_track_state_change(
        hass, entity_id, state_automation_listener, from_state, to_state)

+    @callback
    def async_remove():
        """Remove state listeners async."""
        unsub()
-        # pylint: disable=not-callable
-        if async_remove_state_for_cancel is not None:
-            async_remove_state_for_cancel()
-
-        if async_remove_state_for_listener is not None:
-            async_remove_state_for_listener()
+        clear_listener()

    return async_remove
--- a/homeassistant/components/automation/sun.py
+++ b/homeassistant/components/automation/sun.py
@@ -4,6 +4,7 @@ Offer sun based automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#sun-trigger
 """
+import asyncio
 from datetime import timedelta
 import logging

@@ -26,6 +27,7 @@ TRIGGER_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for events based on configuration."""
    event = config.get(CONF_EVENT)
--- a/homeassistant/components/automation/template.py
+++ b/homeassistant/components/automation/template.py
@@ -4,14 +4,14 @@ Offer template automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#template-trigger
 """
+import asyncio
 import logging

 import voluptuous as vol

 from homeassistant.core import callback
 from homeassistant.const import CONF_VALUE_TEMPLATE, CONF_PLATFORM
-from homeassistant.helpers import condition
-from homeassistant.helpers.event import async_track_state_change
+from homeassistant.helpers.event import async_track_template
 import homeassistant.helpers.config_validation as cv


@@ -23,33 +23,22 @@ TRIGGER_SCHEMA = IF_ACTION_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    value_template = config.get(CONF_VALUE_TEMPLATE)
    value_template.hass = hass

-    # Local variable to keep track of if the action has already been triggered
-    already_triggered = False
-
    @callback
-    def state_changed_listener(entity_id, from_s, to_s):
+    def template_listener(entity_id, from_s, to_s):
        """Listen for state changes and calls action."""
-        nonlocal already_triggered
-        template_result = condition.async_template(hass, value_template)
+        hass.async_run_job(action, {
+            'trigger': {
+                'platform': 'template',
+                'entity_id': entity_id,
+                'from_state': from_s,
+                'to_state': to_s,
+            },
+        })

-        # Check to see if template returns true
-        if template_result and not already_triggered:
-            already_triggered = True
-            hass.async_run_job(action, {
-                'trigger': {
-                    'platform': 'template',
-                    'entity_id': entity_id,
-                    'from_state': from_s,
-                    'to_state': to_s,
-                },
-            })
-        elif not template_result:
-            already_triggered = False
-
-    return async_track_state_change(hass, value_template.extract_entities(),
-                                    state_changed_listener)
+    return async_track_template(hass, value_template, template_listener)
--- a/homeassistant/components/automation/time.py
+++ b/homeassistant/components/automation/time.py
@@ -4,6 +4,7 @@ Offer time listening automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#time-trigger
 """
+import asyncio
 import logging

 import voluptuous as vol
@@ -29,6 +30,7 @@ TRIGGER_SCHEMA = vol.All(vol.Schema({
                            CONF_SECONDS, CONF_AFTER))


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    if CONF_AFTER in config:
--- a/homeassistant/components/automation/zone.py
+++ b/homeassistant/components/automation/zone.py
@@ -4,6 +4,7 @@ Offer zone automation rules.
 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#zone-trigger
 """
+import asyncio
 import voluptuous as vol

 from homeassistant.core import callback
@@ -26,6 +27,7 @@ TRIGGER_SCHEMA = vol.Schema({
 })


+@asyncio.coroutine
 def async_trigger(hass, config, action):
    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
--- a/homeassistant/components/bbb_gpio.py
+++ b/homeassistant/components/bbb_gpio.py
@@ -0,0 +1,74 @@
+"""
+Support for controlling GPIO pins of a Beaglebone Black.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/bbb_gpio/
+"""
+import logging
+
+from homeassistant.const import (
+    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
+
+REQUIREMENTS = ['Adafruit_BBIO==1.0.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'bbb_gpio'
+
+
+# pylint: disable=no-member
+def setup(hass, config):
+    """Set up the BeagleBone Black GPIO component."""
+    # pylint: disable=import-error
+    import Adafruit_BBIO.GPIO as GPIO
+
+    def cleanup_gpio(event):
+        """Stuff to do before stopping."""
+        GPIO.cleanup()
+
+    def prepare_gpio(event):
+        """Stuff to do when home assistant starts."""
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, cleanup_gpio)
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, prepare_gpio)
+    return True
+
+
+# noqa: F821
+
+def setup_output(pin):
+    """Setup a GPIO as output."""
+    # pylint: disable=import-error,undefined-variable
+    import Adafruit_BBIO.GPIO as GPIO
+    GPIO.setup(pin, GPIO.OUT)
+
+
+def setup_input(pin, pull_mode):
+    """Setup a GPIO as input."""
+    # pylint: disable=import-error,undefined-variable
+    import Adafruit_BBIO.GPIO as GPIO
+    GPIO.setup(pin, GPIO.IN,                            # noqa: F821
+               GPIO.PUD_DOWN if pull_mode == 'DOWN'     # noqa: F821
+               else GPIO.PUD_UP)                        # noqa: F821
+
+
+def write_output(pin, value):
+    """Write a value to a GPIO."""
+    # pylint: disable=import-error,undefined-variable
+    import Adafruit_BBIO.GPIO as GPIO
+    GPIO.output(pin, value)
+
+
+def read_input(pin):
+    """Read a value from a GPIO."""
+    # pylint: disable=import-error,undefined-variable
+    import Adafruit_BBIO.GPIO as GPIO
+    return GPIO.input(pin) is GPIO.HIGH
+
+
+def edge_detect(pin, event_callback, bounce):
+    """Add detection for RISING and FALLING events."""
+    # pylint: disable=import-error,undefined-variable
+    import Adafruit_BBIO.GPIO as GPIO
+    GPIO.add_event_detect(
+        pin, GPIO.BOTH, callback=event_callback, bouncetime=bounce)
--- a/homeassistant/components/binary_sensor/init.py
+++ b/homeassistant/components/binary_sensor/init.py
@@ -5,6 +5,7 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor/
 """
 import asyncio
+from datetime import timedelta
 import logging

 import voluptuous as vol
@@ -13,13 +14,13 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import (STATE_ON, STATE_OFF)
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+from homeassistant.helpers.deprecation import deprecated_substitute

 DOMAIN = 'binary_sensor'
-SCAN_INTERVAL = 30
+SCAN_INTERVAL = timedelta(seconds=30)

 ENTITY_ID_FORMAT = DOMAIN + '.{}'
-SENSOR_CLASSES = [
-    None,            # Generic on/off
+DEVICE_CLASSES = [
    'cold',          # On means cold (or too cold)
    'connectivity',  # On means connection present, Off = no connection
    'gas',           # CO, CO2, etc.
@@ -37,7 +38,7 @@ SENSOR_CLASSES = [
    'vibration',     # On means vibration detected, Off means no vibration
 ]

-SENSOR_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(SENSOR_CLASSES))
+DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(DEVICE_CLASSES))


@asyncio.coroutine
@@ -65,16 +66,7 @@ class BinarySensorDevice(Entity):
        return STATE_ON if self.is_on else STATE_OFF

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    @deprecated_substitute('sensor_class')
+    def device_class(self):
+        """Return the class of this device, from component DEVICE_CLASSES."""
        return None
-
-    @property
-    def state_attributes(self):
-        """Return device specific state attributes."""
-        attr = {}
-
-        if self.sensor_class is not None:
-            attr['sensor_class'] = self.sensor_class
-
-        return attr
--- a/homeassistant/components/binary_sensor/arest.py
+++ b/homeassistant/components/binary_sensor/arest.py
@@ -11,11 +11,12 @@ import requests
 import voluptuous as vol

 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA, SENSOR_CLASSES_SCHEMA)
+    BinarySensorDevice, PLATFORM_SCHEMA, DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
-    CONF_RESOURCE, CONF_PIN, CONF_NAME, CONF_SENSOR_CLASS)
+    CONF_RESOURCE, CONF_PIN, CONF_NAME, CONF_SENSOR_CLASS, CONF_DEVICE_CLASS)
 from homeassistant.util import Throttle
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -25,52 +26,51 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_RESOURCE): cv.url,
    vol.Optional(CONF_NAME): cv.string,
    vol.Required(CONF_PIN): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the aREST binary sensor."""
+    """Set up the aREST binary sensor."""
    resource = config.get(CONF_RESOURCE)
    pin = config.get(CONF_PIN)
-    sensor_class = config.get(CONF_SENSOR_CLASS)
+    device_class = get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)

    try:
        response = requests.get(resource, timeout=10).json()
    except requests.exceptions.MissingSchema:
-        _LOGGER.error('Missing resource or schema in configuration. '
-                      'Add http:// to your URL.')
+        _LOGGER.error("Missing resource or schema in configuration. "
+                      "Add http:// to your URL")
        return False
    except requests.exceptions.ConnectionError:
-        _LOGGER.error('No route to device at %s. '
-                      'Please check the IP address in the configuration file.',
-                      resource)
+        _LOGGER.error("No route to device at %s", resource)
        return False

    arest = ArestData(resource, pin)

    add_devices([ArestBinarySensor(
        arest, resource, config.get(CONF_NAME, response[CONF_NAME]),
-        sensor_class, pin)])
+        device_class, pin)])


 class ArestBinarySensor(BinarySensorDevice):
    """Implement an aREST binary sensor for a pin."""

-    def __init__(self, arest, resource, name, sensor_class, pin):
+    def __init__(self, arest, resource, name, device_class, pin):
        """Initialize the aREST device."""
        self.arest = arest
        self._resource = resource
        self._name = name
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._pin = pin
        self.update()

        if self._pin is not None:
-            request = requests.get('{}/mode/{}/i'.format
-                                   (self._resource, self._pin), timeout=10)
+            request = requests.get(
+                '{}/mode/{}/i'.format(self._resource, self._pin), timeout=10)
            if request.status_code is not 200:
-                _LOGGER.error("Can't set mode. Is device offline?")
+                _LOGGER.error("Can't set mode of %s", self._resource)

    @property
    def name(self):
@@ -83,9 +83,9 @@ class ArestBinarySensor(BinarySensorDevice):
        return bool(self.arest.data.get('state'))

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
-        return self._sensor_class
+        return self._device_class

    def update(self):
        """Get the latest data from aREST API."""
@@ -109,5 +109,4 @@ class ArestData(object):
                self._resource, self._pin), timeout=10)
            self.data = {'state': response.json()['return_value']}
        except requests.exceptions.ConnectionError:
-            _LOGGER.error("No route to device '%s'. Is device offline?",
-                          self._resource)
+            _LOGGER.error("No route to device '%s'", self._resource)
--- a/homeassistant/components/binary_sensor/aurora.py
+++ b/homeassistant/components/binary_sensor/aurora.py
@@ -0,0 +1,148 @@
+"""
+Support for aurora forecast data sensor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.aurora/
+"""
+from datetime import timedelta
+import logging
+
+import requests
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor \
+    import (BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.util import Throttle
+
+CONF_THRESHOLD = "forecast_threshold"
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Aurora Visibility'
+DEFAULT_DEVICE_CLASS = "visible"
+DEFAULT_THRESHOLD = 75
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_THRESHOLD, default=DEFAULT_THRESHOLD): cv.positive_int,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the aurora sensor."""
+    if None in (hass.config.latitude, hass.config.longitude):
+        _LOGGER.error("Lat. or long. not set in Home Assistant config")
+        return False
+
+    name = config.get(CONF_NAME)
+    threshold = config.get(CONF_THRESHOLD)
+
+    try:
+        aurora_data = AuroraData(
+            hass.config.latitude,
+            hass.config.longitude,
+            threshold
+        )
+        aurora_data.update()
+    except requests.exceptions.HTTPError as error:
+        _LOGGER.error(
+            "Connection to aurora forecast service failed: %s", error)
+        return False
+
+    add_devices([AuroraSensor(aurora_data, name)], True)
+
+
+class AuroraSensor(BinarySensorDevice):
+    """Implementation of an aurora sensor."""
+
+    def __init__(self, aurora_data, name):
+        """Initialize the sensor."""
+        self.aurora_data = aurora_data
+        self._name = name
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return '{}'.format(self._name)
+
+    @property
+    def is_on(self):
+        """Return true if aurora is visible."""
+        return self.aurora_data.is_visible if self.aurora_data else False
+
+    @property
+    def device_class(self):
+        """Return the class of this device."""
+        return DEFAULT_DEVICE_CLASS
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attrs = {}
+
+        if self.aurora_data:
+            attrs["visibility_level"] = self.aurora_data.visibility_level
+            attrs["message"] = self.aurora_data.is_visible_text
+
+        return attrs
+
+    def update(self):
+        """Get the latest data from Aurora API and updates the states."""
+        self.aurora_data.update()
+
+
+class AuroraData(object):
+    """Get aurora forecast."""
+
+    def __init__(self, latitude, longitude, threshold):
+        """Initialize the data object."""
+        self.latitude = latitude
+        self.longitude = longitude
+        self.number_of_latitude_intervals = 513
+        self.number_of_longitude_intervals = 1024
+        self.api_url = \
+            "http://services.swpc.noaa.gov/text/aurora-nowcast-map.txt"
+        self.headers = {"User-Agent": "Home Assistant Aurora Tracker v.0.1.0"}
+
+        self.threshold = int(threshold)
+        self.is_visible = None
+        self.is_visible_text = None
+        self.visibility_level = None
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self):
+        """Get the latest data from the Aurora service."""
+        try:
+            self.visibility_level = self.get_aurora_forecast()
+            if int(self.visibility_level) > self.threshold:
+                self.is_visible = True
+                self.is_visible_text = "visible!"
+            else:
+                self.is_visible = False
+                self.is_visible_text = "nothing's out"
+
+        except requests.exceptions.HTTPError as error:
+            _LOGGER.error(
+                "Connection to aurora forecast service failed: %s", error)
+            return False
+
+    def get_aurora_forecast(self):
+        """Get forecast data and parse for given long/lat."""
+        raw_data = requests.get(self.api_url, headers=self.headers).text
+        forecast_table = [
+            row.strip(" ").split("   ")
+            for row in raw_data.split("\n")
+            if not row.startswith("#")
+        ]
+
+        # convert lat and long for data points in table
+        converted_latitude = round((self.latitude / 180)
+                                   * self.number_of_latitude_intervals)
+        converted_longitude = round((self.longitude / 360)
+                                    * self.number_of_longitude_intervals)
+
+        return forecast_table[converted_latitude][converted_longitude]
--- a/homeassistant/components/binary_sensor/bbb_gpio.py
+++ b/homeassistant/components/binary_sensor/bbb_gpio.py
@@ -0,0 +1,89 @@
+"""
+Support for binary sensor using Beaglebone Black GPIO.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.bbb_gpio/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.components.bbb_gpio as bbb_gpio
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (DEVICE_DEFAULT_NAME, CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['bbb_gpio']
+
+CONF_PINS = 'pins'
+CONF_BOUNCETIME = 'bouncetime'
+CONF_INVERT_LOGIC = 'invert_logic'
+CONF_PULL_MODE = 'pull_mode'
+
+DEFAULT_BOUNCETIME = 50
+DEFAULT_INVERT_LOGIC = False
+DEFAULT_PULL_MODE = 'UP'
+
+PIN_SCHEMA = vol.Schema({
+    vol.Required(CONF_NAME): cv.string,
+    vol.Optional(CONF_BOUNCETIME, default=DEFAULT_BOUNCETIME): cv.positive_int,
+    vol.Optional(CONF_INVERT_LOGIC, default=DEFAULT_INVERT_LOGIC): cv.boolean,
+    vol.Optional(CONF_PULL_MODE, default=DEFAULT_PULL_MODE):
+        vol.In(['UP', 'DOWN'])
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PINS, default={}):
+        vol.Schema({cv.string: PIN_SCHEMA}),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Beaglebone Black GPIO devices."""
+    pins = config.get(CONF_PINS)
+
+    binary_sensors = []
+
+    for pin, params in pins.items():
+        binary_sensors.append(BBBGPIOBinarySensor(pin, params))
+    add_devices(binary_sensors)
+
+
+class BBBGPIOBinarySensor(BinarySensorDevice):
+    """Represent a binary sensor that uses Beaglebone Black GPIO."""
+
+    def __init__(self, pin, params):
+        """Initialize the Beaglebone Black binary sensor."""
+        self._pin = pin
+        self._name = params.get(CONF_NAME) or DEVICE_DEFAULT_NAME
+        self._bouncetime = params.get(CONF_BOUNCETIME)
+        self._pull_mode = params.get(CONF_PULL_MODE)
+        self._invert_logic = params.get(CONF_INVERT_LOGIC)
+
+        bbb_gpio.setup_input(self._pin, self._pull_mode)
+        self._state = bbb_gpio.read_input(self._pin)
+
+        def read_gpio(pin):
+            """Read state from GPIO."""
+            self._state = bbb_gpio.read_input(self._pin)
+            self.schedule_update_ha_state()
+
+        bbb_gpio.edge_detect(self._pin, read_gpio, self._bouncetime)
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return the state of the entity."""
+        return self._state != self._invert_logic
--- a/homeassistant/components/binary_sensor/bloomsky.py
+++ b/homeassistant/components/binary_sensor/bloomsky.py
@@ -64,8 +64,8 @@ class BloomSkySensor(BinarySensorDevice):
        return self._unique_id

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return SENSOR_TYPES.get(self._sensor_name)

    @property
--- a/homeassistant/components/binary_sensor/command_line.py
+++ b/homeassistant/components/binary_sensor/command_line.py
@@ -4,17 +4,19 @@ Support for custom shell commands to retrieve values.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.command_line/
 """
+from datetime import timedelta
 import logging

 import voluptuous as vol

 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, SENSOR_CLASSES_SCHEMA, PLATFORM_SCHEMA)
+    BinarySensorDevice, DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA)
 from homeassistant.components.sensor.command_line import CommandSensorData
 from homeassistant.const import (
    CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, CONF_NAME, CONF_VALUE_TEMPLATE,
-    CONF_SENSOR_CLASS, CONF_COMMAND)
+    CONF_SENSOR_CLASS, CONF_COMMAND, CONF_DEVICE_CLASS)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -22,14 +24,15 @@ DEFAULT_NAME = 'Binary Command Sensor'
 DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'

-SCAN_INTERVAL = 60
+SCAN_INTERVAL = timedelta(seconds=60)

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_COMMAND): cv.string,
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
 })

@@ -41,27 +44,27 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    command = config.get(CONF_COMMAND)
    payload_off = config.get(CONF_PAYLOAD_OFF)
    payload_on = config.get(CONF_PAYLOAD_ON)
-    sensor_class = config.get(CONF_SENSOR_CLASS)
+    device_class = get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)
    value_template = config.get(CONF_VALUE_TEMPLATE)
    if value_template is not None:
        value_template.hass = hass
    data = CommandSensorData(command)

    add_devices([CommandBinarySensor(
-        hass, data, name, sensor_class, payload_on, payload_off,
+        hass, data, name, device_class, payload_on, payload_off,
        value_template)])


 class CommandBinarySensor(BinarySensorDevice):
    """Represent a command line binary sensor."""

-    def __init__(self, hass, data, name, sensor_class, payload_on,
+    def __init__(self, hass, data, name, device_class, payload_on,
                 payload_off, value_template):
        """Initialize the Command line binary sensor."""
        self._hass = hass
        self.data = data
        self._name = name
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._state = False
        self._payload_on = payload_on
        self._payload_off = payload_off
@@ -79,9 +82,9 @@ class CommandBinarySensor(BinarySensorDevice):
        return self._state

    @ property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of the binary sensor."""
-        return self._sensor_class
+        return self._device_class

    def update(self):
        """Get the latest data and updates the state."""
--- a/homeassistant/components/binary_sensor/concord232.py
+++ b/homeassistant/components/binary_sensor/concord232.py
@@ -11,7 +11,7 @@ import requests
 import voluptuous as vol

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

@@ -27,10 +27,10 @@ DEFAULT_NAME = 'Alarm'
 DEFAULT_PORT = '5007'
 DEFAULT_SSL = False

-SCAN_INTERVAL = 1
+SCAN_INTERVAL = datetime.timedelta(seconds=1)

 ZONE_TYPES_SCHEMA = vol.Schema({
-    cv.positive_int: vol.In(SENSOR_CLASSES),
+    cv.positive_int: vol.In(DEVICE_CLASSES),
 })

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -102,8 +102,8 @@ class Concord232ZoneSensor(BinarySensorDevice):
        self.update()

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return self._zone_type

    @property
--- a/homeassistant/components/binary_sensor/demo.py
+++ b/homeassistant/components/binary_sensor/demo.py
@@ -18,14 +18,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class DemoBinarySensor(BinarySensorDevice):
    """A Demo binary sensor."""

-    def __init__(self, name, state, sensor_class):
+    def __init__(self, name, state, device_class):
        """Initialize the demo sensor."""
        self._name = name
        self._state = state
-        self._sensor_type = sensor_class
+        self._sensor_type = device_class

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
        return self._sensor_type

--- a/homeassistant/components/binary_sensor/digital_ocean.py
+++ b/homeassistant/components/binary_sensor/digital_ocean.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the Digital Ocean droplet sensor."""
+    """Set up the Digital Ocean droplet sensor."""
    digital_ocean = get_component('digital_ocean')
    droplets = config.get(CONF_DROPLETS)

@@ -63,12 +63,12 @@ class DigitalOceanBinarySensor(BinarySensorDevice):
        return self.data.status == 'active'

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
        return DEFAULT_SENSOR_CLASS

    @property
-    def state_attributes(self):
+    def device_state_attributes(self):
        """Return the state attributes of the Digital Ocean droplet."""
        return {
            ATTR_CREATED_AT: self.data.created_at,
--- a/homeassistant/components/binary_sensor/ecobee.py
+++ b/homeassistant/components/binary_sensor/ecobee.py
@@ -38,7 +38,7 @@ class EcobeeBinarySensor(BinarySensorDevice):
        self.sensor_name = sensor_name
        self.index = sensor_index
        self._state = None
-        self._sensor_class = 'occupancy'
+        self._device_class = 'occupancy'
        self.update()

    @property
@@ -57,9 +57,9 @@ class EcobeeBinarySensor(BinarySensorDevice):
        return "binary_sensor_ecobee_{}_{}".format(self._name, self.index)

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
-        return self._sensor_class
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._device_class

    def update(self):
        """Get the latest state of the sensor."""
--- a/homeassistant/components/binary_sensor/enocean.py
+++ b/homeassistant/components/binary_sensor/enocean.py
@@ -9,10 +9,12 @@ import logging
 import voluptuous as vol

 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA, SENSOR_CLASSES_SCHEMA)
+    BinarySensorDevice, PLATFORM_SCHEMA, DEVICE_CLASSES_SCHEMA)
 from homeassistant.components import enocean
-from homeassistant.const import (CONF_NAME, CONF_ID, CONF_SENSOR_CLASS)
+from homeassistant.const import (
+    CONF_NAME, CONF_ID, CONF_SENSOR_CLASS, CONF_DEVICE_CLASS)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -22,7 +24,8 @@ DEFAULT_NAME = 'EnOcean binary sensor'
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_ID): vol.All(cv.ensure_list, [vol.Coerce(int)]),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })


@@ -30,15 +33,15 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Binary Sensor platform fo EnOcean."""
    dev_id = config.get(CONF_ID)
    devname = config.get(CONF_NAME)
-    sensor_class = config.get(CONF_SENSOR_CLASS)
+    device_class = get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)

-    add_devices([EnOceanBinarySensor(dev_id, devname, sensor_class)])
+    add_devices([EnOceanBinarySensor(dev_id, devname, device_class)])


 class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
    """Representation of EnOcean binary sensors such as wall switches."""

-    def __init__(self, dev_id, devname, sensor_class):
+    def __init__(self, dev_id, devname, device_class):
        """Initialize the EnOcean binary sensor."""
        enocean.EnOceanDevice.__init__(self)
        self.stype = "listener"
@@ -46,7 +49,7 @@ class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
        self.which = -1
        self.onoff = -1
        self.devname = devname
-        self._sensor_class = sensor_class
+        self._device_class = device_class

    @property
    def name(self):
@@ -54,9 +57,9 @@ class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
        return self.devname

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
-        return self._sensor_class
+        return self._device_class

    def value_changed(self, value, value2):
        """Fire an event with the data that have changed.
--- a/homeassistant/components/binary_sensor/envisalink.py
+++ b/homeassistant/components/binary_sensor/envisalink.py
@@ -4,48 +4,56 @@ Support for Envisalink zone states- represented as binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.envisalink/
 """
+import asyncio
 import logging
+
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.envisalink import (EVL_CONTROLLER,
-                                                 ZONE_SCHEMA,
-                                                 CONF_ZONENAME,
-                                                 CONF_ZONETYPE,
-                                                 EnvisalinkDevice,
-                                                 SIGNAL_ZONE_UPDATE)
+from homeassistant.components.envisalink import (
+    DATA_EVL, ZONE_SCHEMA, CONF_ZONENAME, CONF_ZONETYPE, EnvisalinkDevice,
+    SIGNAL_ZONE_UPDATE)
 from homeassistant.const import ATTR_LAST_TRIP_TIME

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


-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Setup Envisalink binary sensor devices."""
-    _configured_zones = discovery_info['zones']
-    for zone_num in _configured_zones:
-        _device_config_data = ZONE_SCHEMA(_configured_zones[zone_num])
-        _device = EnvisalinkBinarySensor(
+    configured_zones = discovery_info['zones']
+
+    devices = []
+    for zone_num in configured_zones:
+        device_config_data = ZONE_SCHEMA(configured_zones[zone_num])
+        device = EnvisalinkBinarySensor(
+            hass,
            zone_num,
-            _device_config_data[CONF_ZONENAME],
-            _device_config_data[CONF_ZONETYPE],
-            EVL_CONTROLLER.alarm_state['zone'][zone_num],
-            EVL_CONTROLLER)
-        add_devices_callback([_device])
+            device_config_data[CONF_ZONENAME],
+            device_config_data[CONF_ZONETYPE],
+            hass.data[DATA_EVL].alarm_state['zone'][zone_num],
+            hass.data[DATA_EVL]
+        )
+        devices.append(device)
+
+    yield from async_add_devices(devices)


 class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
    """Representation of an Envisalink binary sensor."""

-    def __init__(self, zone_number, zone_name, zone_type, info, controller):
+    def __init__(self, hass, zone_number, zone_name, zone_type, info,
+                 controller):
        """Initialize the binary_sensor."""
-        from pydispatch import dispatcher
        self._zone_type = zone_type
        self._zone_number = zone_number

        _LOGGER.debug('Setting up zone: ' + zone_name)
-        EnvisalinkDevice.__init__(self, zone_name, info, controller)
-        dispatcher.connect(self._update_callback,
-                           signal=SIGNAL_ZONE_UPDATE,
-                           sender=dispatcher.Any)
+        super().__init__(zone_name, info, controller)
+
+        async_dispatcher_connect(
+            hass, SIGNAL_ZONE_UPDATE, self._update_callback)

    @property
    def device_state_attributes(self):
@@ -60,11 +68,12 @@ class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
        return self._info['status']['open']

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return self._zone_type

+    @callback
    def _update_callback(self, zone):
        """Update the zone's state, if needed."""
        if zone is None or int(zone) == self._zone_number:
-            self.hass.async_add_job(self.update_ha_state)
+            self.hass.async_add_job(self.async_update_ha_state())
--- a/homeassistant/components/binary_sensor/ffmpeg.py
+++ b/homeassistant/components/binary_sensor/ffmpeg.py
@@ -1,224 +0,0 @@
-"""
-Provides a binary sensor which is a collection of ffmpeg tools.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/binary_sensor.ffmpeg/
-"""
-import logging
-from os import path
-
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA, DOMAIN)
-from homeassistant.components.ffmpeg import (
-    get_binary, run_test, CONF_INPUT, CONF_OUTPUT, CONF_EXTRA_ARGUMENTS)
-from homeassistant.config import load_yaml_config_file
-from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, CONF_NAME,
-                                 ATTR_ENTITY_ID)
-
-DEPENDENCIES = ['ffmpeg']
-
-_LOGGER = logging.getLogger(__name__)
-
-SERVICE_RESTART = 'ffmpeg_restart'
-
-FFMPEG_SENSOR_NOISE = 'noise'
-FFMPEG_SENSOR_MOTION = 'motion'
-
-MAP_FFMPEG_BIN = [
-    FFMPEG_SENSOR_NOISE,
-    FFMPEG_SENSOR_MOTION
-]
-
-CONF_TOOL = 'tool'
-CONF_PEAK = 'peak'
-CONF_DURATION = 'duration'
-CONF_RESET = 'reset'
-CONF_CHANGES = 'changes'
-CONF_REPEAT = 'repeat'
-CONF_REPEAT_TIME = 'repeat_time'
-
-DEFAULT_NAME = 'FFmpeg'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_TOOL): vol.In(MAP_FFMPEG_BIN),
-    vol.Required(CONF_INPUT): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
-    vol.Optional(CONF_OUTPUT): cv.string,
-    vol.Optional(CONF_PEAK, default=-30): vol.Coerce(int),
-    vol.Optional(CONF_DURATION, default=1):
-        vol.All(vol.Coerce(int), vol.Range(min=1)),
-    vol.Optional(CONF_RESET, default=10):
-        vol.All(vol.Coerce(int), vol.Range(min=1)),
-    vol.Optional(CONF_CHANGES, default=10):
-        vol.All(vol.Coerce(float), vol.Range(min=0, max=99)),
-    vol.Optional(CONF_REPEAT, default=0):
-        vol.All(vol.Coerce(int), vol.Range(min=0)),
-    vol.Optional(CONF_REPEAT_TIME, default=0):
-        vol.All(vol.Coerce(int), vol.Range(min=0)),
-})
-
-SERVICE_RESTART_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
-})
-
-
-def restart(hass, entity_id=None):
-    """Restart a ffmpeg process on entity."""
-    data = {ATTR_ENTITY_ID: entity_id} if entity_id else {}
-    hass.services.call(DOMAIN, SERVICE_RESTART, data)
-
-
-# list of all ffmpeg sensors
-DEVICES = []
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Create the binary sensor."""
-    from haffmpeg import SensorNoise, SensorMotion
-
-    # check source
-    if not run_test(hass, config.get(CONF_INPUT)):
-        return
-
-    # generate sensor object
-    if config.get(CONF_TOOL) == FFMPEG_SENSOR_NOISE:
-        entity = FFmpegNoise(SensorNoise, config)
-    else:
-        entity = FFmpegMotion(SensorMotion, config)
-
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, entity.shutdown_ffmpeg)
-
-    # add to system
-    add_entities([entity])
-    DEVICES.append(entity)
-
-    # exists service?
-    if hass.services.has_service(DOMAIN, SERVICE_RESTART):
-        return
-
-    descriptions = load_yaml_config_file(
-        path.join(path.dirname(__file__), 'services.yaml'))
-
-    # register service
-    def _service_handle_restart(service):
-        """Handle service binary_sensor.ffmpeg_restart."""
-        entity_ids = service.data.get('entity_id')
-
-        if entity_ids:
-            _devices = [device for device in DEVICES
-                        if device.entity_id in entity_ids]
-        else:
-            _devices = DEVICES
-
-        for device in _devices:
-            device.restart_ffmpeg()
-
-    hass.services.register(DOMAIN, SERVICE_RESTART,
-                           _service_handle_restart,
-                           descriptions.get(SERVICE_RESTART),
-                           schema=SERVICE_RESTART_SCHEMA)
-
-
-class FFmpegBinarySensor(BinarySensorDevice):
-    """A binary sensor which use ffmpeg for noise detection."""
-
-    def __init__(self, ffobj, config):
-        """Constructor for binary sensor noise detection."""
-        self._state = False
-        self._config = config
-        self._name = config.get(CONF_NAME)
-        self._ffmpeg = ffobj(get_binary(), self._callback)
-
-        self._start_ffmpeg(config)
-
-    def _callback(self, state):
-        """HA-FFmpeg callback for noise detection."""
-        self._state = state
-        self.schedule_update_ha_state()
-
-    def _start_ffmpeg(self, config):
-        """Start a FFmpeg instance."""
-        raise NotImplementedError
-
-    def shutdown_ffmpeg(self, event):
-        """For STOP event to shutdown ffmpeg."""
-        self._ffmpeg.close()
-
-    def restart_ffmpeg(self):
-        """Restart ffmpeg with new config."""
-        self._ffmpeg.close()
-        self._start_ffmpeg(self._config)
-
-    @property
-    def is_on(self):
-        """True if the binary sensor is on."""
-        return self._state
-
-    @property
-    def should_poll(self):
-        """Return True if entity has to be polled for state."""
-        return False
-
-    @property
-    def name(self):
-        """Return the name of the entity."""
-        return self._name
-
-    @property
-    def available(self):
-        """Return True if entity is available."""
-        return self._ffmpeg.is_running
-
-
-class FFmpegNoise(FFmpegBinarySensor):
-    """A binary sensor which use ffmpeg for noise detection."""
-
-    def _start_ffmpeg(self, config):
-        """Start a FFmpeg instance."""
-        # init config
-        self._ffmpeg.set_options(
-            time_duration=config.get(CONF_DURATION),
-            time_reset=config.get(CONF_RESET),
-            peak=config.get(CONF_PEAK),
-        )
-
-        # run
-        self._ffmpeg.open_sensor(
-            input_source=config.get(CONF_INPUT),
-            output_dest=config.get(CONF_OUTPUT),
-            extra_cmd=config.get(CONF_EXTRA_ARGUMENTS),
-        )
-
-    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
-        return "sound"
-
-
-class FFmpegMotion(FFmpegBinarySensor):
-    """A binary sensor which use ffmpeg for noise detection."""
-
-    def _start_ffmpeg(self, config):
-        """Start a FFmpeg instance."""
-        # init config
-        self._ffmpeg.set_options(
-            time_reset=config.get(CONF_RESET),
-            time_repeat=config.get(CONF_REPEAT_TIME),
-            repeat=config.get(CONF_REPEAT),
-            changes=config.get(CONF_CHANGES),
-        )
-
-        # run
-        self._ffmpeg.open_sensor(
-            input_source=config.get(CONF_INPUT),
-            extra_cmd=config.get(CONF_EXTRA_ARGUMENTS),
-        )
-
-    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
-        return "motion"
--- a/homeassistant/components/binary_sensor/ffmpeg_motion.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_motion.py
@@ -0,0 +1,127 @@
+"""
+Provides a binary sensor which is a collection of ffmpeg tools.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ffmpeg_motion/
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.components.ffmpeg import (
+    FFmpegBase, DATA_FFMPEG, CONF_INPUT, CONF_EXTRA_ARGUMENTS,
+    CONF_INITIAL_STATE)
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ['ffmpeg']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_RESET = 'reset'
+CONF_CHANGES = 'changes'
+CONF_REPEAT = 'repeat'
+CONF_REPEAT_TIME = 'repeat_time'
+
+DEFAULT_NAME = 'FFmpeg Motion'
+DEFAULT_INIT_STATE = True
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_INITIAL_STATE, default=DEFAULT_INIT_STATE): cv.boolean,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
+    vol.Optional(CONF_RESET, default=10):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Optional(CONF_CHANGES, default=10):
+        vol.All(vol.Coerce(float), vol.Range(min=0, max=99)),
+    vol.Inclusive(CONF_REPEAT, 'repeat'):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Inclusive(CONF_REPEAT_TIME, 'repeat'):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+})
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Create the binary sensor."""
+    manager = hass.data[DATA_FFMPEG]
+
+    # check source
+    if not manager.async_run_test(config.get(CONF_INPUT)):
+        return
+
+    # generate sensor object
+    entity = FFmpegMotion(hass, manager, config)
+
+    # add to system
+    manager.async_register_device(entity)
+    yield from async_add_devices([entity])
+
+
+class FFmpegBinarySensor(FFmpegBase, BinarySensorDevice):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def __init__(self, hass, config):
+        """Constructor for binary sensor noise detection."""
+        super().__init__(config.get(CONF_INITIAL_STATE))
+
+        self._state = False
+        self._config = config
+        self._name = config.get(CONF_NAME)
+
+    @callback
+    def _async_callback(self, state):
+        """HA-FFmpeg callback for noise detection."""
+        self._state = state
+        self.hass.async_add_job(self.async_update_ha_state())
+
+    @property
+    def is_on(self):
+        """True if the binary sensor is on."""
+        return self._state
+
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._name
+
+
+class FFmpegMotion(FFmpegBinarySensor):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def __init__(self, hass, manager, config):
+        """Initialize ffmpeg motion binary sensor."""
+        from haffmpeg import SensorMotion
+
+        super().__init__(hass, config)
+        self.ffmpeg = SensorMotion(
+            manager.binary, hass.loop, self._async_callback)
+
+    def async_start_ffmpeg(self):
+        """Start a FFmpeg instance.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        # init config
+        self.ffmpeg.set_options(
+            time_reset=self._config.get(CONF_RESET),
+            time_repeat=self._config.get(CONF_REPEAT_TIME, 0),
+            repeat=self._config.get(CONF_REPEAT, 0),
+            changes=self._config.get(CONF_CHANGES),
+        )
+
+        # run
+        return self.ffmpeg.open_sensor(
+            input_source=self._config.get(CONF_INPUT),
+            extra_cmd=self._config.get(CONF_EXTRA_ARGUMENTS),
+        )
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return "motion"
--- a/homeassistant/components/binary_sensor/ffmpeg_noise.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_noise.py
@@ -0,0 +1,96 @@
+"""
+Provides a binary sensor which is a collection of ffmpeg tools.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ffmpeg_noise/
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import PLATFORM_SCHEMA
+from homeassistant.components.binary_sensor.ffmpeg_motion import (
+    FFmpegBinarySensor)
+from homeassistant.components.ffmpeg import (
+    DATA_FFMPEG, CONF_INPUT, CONF_OUTPUT, CONF_EXTRA_ARGUMENTS,
+    CONF_INITIAL_STATE)
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ['ffmpeg']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_PEAK = 'peak'
+CONF_DURATION = 'duration'
+CONF_RESET = 'reset'
+
+DEFAULT_NAME = 'FFmpeg Noise'
+DEFAULT_INIT_STATE = True
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_INPUT): cv.string,
+    vol.Optional(CONF_INITIAL_STATE, default=DEFAULT_INIT_STATE): cv.boolean,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_EXTRA_ARGUMENTS): cv.string,
+    vol.Optional(CONF_OUTPUT): cv.string,
+    vol.Optional(CONF_PEAK, default=-30): vol.Coerce(int),
+    vol.Optional(CONF_DURATION, default=1):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Optional(CONF_RESET, default=10):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+})
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Create the binary sensor."""
+    manager = hass.data[DATA_FFMPEG]
+
+    # check source
+    if not manager.async_run_test(config.get(CONF_INPUT)):
+        return
+
+    # generate sensor object
+    entity = FFmpegNoise(hass, manager, config)
+
+    # add to system
+    manager.async_register_device(entity)
+    yield from async_add_devices([entity])
+
+
+class FFmpegNoise(FFmpegBinarySensor):
+    """A binary sensor which use ffmpeg for noise detection."""
+
+    def __init__(self, hass, manager, config):
+        """Initialize ffmpeg noise binary sensor."""
+        from haffmpeg import SensorNoise
+
+        super().__init__(hass, config)
+        self.ffmpeg = SensorNoise(
+            manager.binary, hass.loop, self._async_callback)
+
+    def async_start_ffmpeg(self):
+        """Start a FFmpeg instance.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        # init config
+        self.ffmpeg.set_options(
+            time_duration=self._config.get(CONF_DURATION),
+            time_reset=self._config.get(CONF_RESET),
+            peak=self._config.get(CONF_PEAK),
+        )
+
+        # run
+        return self.ffmpeg.open_sensor(
+            input_source=self._config.get(CONF_INPUT),
+            output_dest=self._config.get(CONF_OUTPUT),
+            extra_cmd=self._config.get(CONF_EXTRA_ARGUMENTS),
+        )
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return "sound"
--- a/homeassistant/components/binary_sensor/flic.py
+++ b/homeassistant/components/binary_sensor/flic.py
@@ -1,6 +1,6 @@
 """Contains functionality to use flic buttons as a binary sensor."""
-import asyncio
 import logging
+import threading

 import voluptuous as vol

@@ -10,7 +10,6 @@ from homeassistant.const import (
    EVENT_HOMEASSISTANT_STOP)
 from homeassistant.components.binary_sensor import (
    BinarySensorDevice, PLATFORM_SCHEMA)
-from homeassistant.util.async import run_callback_threadsafe


 REQUIREMENTS = ['https://github.com/soldag/pyflic/archive/0.4.zip#pyflic==0.4']
@@ -43,9 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_entities,
-                         discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
    """Setup the flic platform."""
    import pyflic

@@ -63,26 +60,29 @@ def async_setup_platform(hass, config, async_add_entities,

    def new_button_callback(address):
        """Setup newly verified button as device in home assistant."""
-        hass.add_job(async_setup_button(hass, config, async_add_entities,
-                                        client, address))
+        setup_button(hass, config, add_entities, client, address)

    client.on_new_verified_button = new_button_callback
    if discovery:
-        start_scanning(hass, config, async_add_entities, client)
+        start_scanning(config, add_entities, client)

-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
-                               lambda event: client.close())
-    hass.loop.run_in_executor(None, client.handle_events)
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP,
+                         lambda event: client.close())
+
+    # Start the pyflic event handling thread
+    threading.Thread(target=client.handle_events).start()
+
+    def get_info_callback(items):
+        """Add entities for already verified buttons."""
+        addresses = items["bd_addr_of_verified_buttons"] or []
+        for address in addresses:
+            setup_button(hass, config, add_entities, client, address)

    # Get addresses of already verified buttons
-    addresses = yield from async_get_verified_addresses(client)
-    if addresses:
-        for address in addresses:
-            yield from async_setup_button(hass, config, async_add_entities,
-                                          client, address)
+    client.get_info(get_info_callback)


-def start_scanning(hass, config, async_add_entities, client):
+def start_scanning(config, add_entities, client):
    """Start a new flic client for scanning & connceting to new buttons."""
    import pyflic

@@ -97,36 +97,20 @@ def start_scanning(hass, config, async_add_entities, client):
                            address, result)

        # Restart scan wizard
-        start_scanning(hass, config, async_add_entities, client)
+        start_scanning(config, add_entities, client)

    scan_wizard.on_completed = scan_completed_callback
    client.add_scan_wizard(scan_wizard)


-@asyncio.coroutine
-def async_setup_button(hass, config, async_add_entities, client, address):
+def setup_button(hass, config, add_entities, client, address):
    """Setup single button device."""
    timeout = config.get(CONF_TIMEOUT)
    ignored_click_types = config.get(CONF_IGNORED_CLICK_TYPES)
    button = FlicButton(hass, client, address, timeout, ignored_click_types)
    _LOGGER.info("Connected to button (%s)", address)

-    yield from async_add_entities([button])
-
-
-@asyncio.coroutine
-def async_get_verified_addresses(client):
-    """Retrieve addresses of verified buttons."""
-    future = asyncio.Future()
-    loop = asyncio.get_event_loop()
-
-    def get_info_callback(items):
-        """Set the addressed of connected buttons as result of the future."""
-        addresses = items["bd_addr_of_verified_buttons"]
-        run_callback_threadsafe(loop, future.set_result, addresses)
-    client.get_info(get_info_callback)
-
-    return future
+    add_entities([button])


 class FlicButton(BinarySensorDevice):
@@ -195,12 +179,9 @@ class FlicButton(BinarySensorDevice):
        return False

    @property
-    def state_attributes(self):
+    def device_state_attributes(self):
        """Return device specific state attributes."""
-        attr = super(FlicButton, self).state_attributes
-        attr["address"] = self.address
-
-        return attr
+        return {"address": self.address}

    def _queued_event_check(self, click_type, time_diff):
        """Generate a log message and returns true if timeout exceeded."""
--- a/homeassistant/components/binary_sensor/hikvision.py
+++ b/homeassistant/components/binary_sensor/hikvision.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
    CONF_HOST, CONF_PORT, CONF_NAME, CONF_USERNAME, CONF_PASSWORD,
    CONF_SSL, EVENT_HOMEASSISTANT_STOP, ATTR_LAST_TRIP_TIME, CONF_CUSTOMIZE)

-REQUIREMENTS = ['pyhik==0.0.6', 'pydispatcher==2.0.5']
+REQUIREMENTS = ['pyhik==0.0.7', 'pydispatcher==2.0.5']
 _LOGGER = logging.getLogger(__name__)

 CONF_IGNORED = 'ignored'
@@ -29,7 +29,7 @@ DEFAULT_DELAY = 0

 ATTR_DELAY = 'delay'

-SENSOR_CLASS_MAP = {
+DEVICE_CLASS_MAP = {
    'Motion': 'motion',
    'Line Crossing': 'motion',
    'IO Trigger': None,
@@ -201,10 +201,10 @@ class HikvisionBinarySensor(BinarySensorDevice):
        return self._sensor_state()

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        try:
-            return SENSOR_CLASS_MAP[self._sensor]
+            return DEVICE_CLASS_MAP[self._sensor]
        except KeyError:
            # Sensor must be unknown to us, add as generic
            return None
--- a/homeassistant/components/binary_sensor/homematic.py
+++ b/homeassistant/components/binary_sensor/homematic.py
@@ -7,8 +7,7 @@ https://home-assistant.io/components/binary_sensor.homematic/
 import logging
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.homematic import HMDevice
-from homeassistant.loader import get_component
+from homeassistant.components.homematic import HMDevice, ATTR_DISCOVER_DEVICES

 _LOGGER = logging.getLogger(__name__)

@@ -17,6 +16,7 @@ DEPENDENCIES = ['homematic']
 SENSOR_TYPES_CLASS = {
    "Remote": None,
    "ShutterContact": "opening",
+    "MaxShutterContact": "opening",
    "IPShutterContact": "opening",
    "Smoke": "smoke",
    "SmokeV2": "smoke",
@@ -28,18 +28,18 @@ SENSOR_TYPES_CLASS = {
 }


-def setup_platform(hass, config, add_callback_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Homematic binary sensor platform."""
    if discovery_info is None:
        return

-    homematic = get_component("homematic")
-    return homematic.setup_hmdevice_discovery_helper(
-        hass,
-        HMBinarySensor,
-        discovery_info,
-        add_callback_devices
-    )
+    devices = []
+    for config in discovery_info[ATTR_DISCOVER_DEVICES]:
+        new_device = HMBinarySensor(hass, config)
+        new_device.link_homematic()
+        devices.append(new_device)
+
+    add_devices(devices)


 class HMBinarySensor(HMDevice, BinarySensorDevice):
@@ -53,11 +53,8 @@ class HMBinarySensor(HMDevice, BinarySensorDevice):
        return bool(self._hm_get_state())

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
-        if not self.available:
-            return None
-
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        # If state is MOTION (RemoteMotion works only)
        if self._state == "MOTION":
            return "motion"
--- a/homeassistant/components/binary_sensor/insteon_plm.py
+++ b/homeassistant/components/binary_sensor/insteon_plm.py
@@ -0,0 +1,87 @@
+"""
+Support for INSTEON dimmers via PowerLinc Modem.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/insteon_plm/
+"""
+import logging
+import asyncio
+
+from homeassistant.core import callback
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ['insteon_plm']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Set up the INSTEON PLM device class for the hass platform."""
+    plm = hass.data['insteon_plm']
+
+    device_list = []
+    for device in discovery_info:
+        name = device.get('address')
+        address = device.get('address_hex')
+
+        _LOGGER.info('Registered %s with binary_sensor platform.', name)
+
+        device_list.append(
+            InsteonPLMBinarySensorDevice(hass, plm, address, name)
+        )
+
+    hass.async_add_job(async_add_devices(device_list))
+
+
+class InsteonPLMBinarySensorDevice(BinarySensorDevice):
+    """A Class for an Insteon device."""
+
+    def __init__(self, hass, plm, address, name):
+        """Initialize the binarysensor."""
+        self._hass = hass
+        self._plm = plm.protocol
+        self._address = address
+        self._name = name
+
+        self._plm.add_update_callback(
+            self.async_binarysensor_update, {'address': self._address})
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def address(self):
+        """Return the the address of the node."""
+        return self._address
+
+    @property
+    def name(self):
+        """Return the the name of the node."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return the boolean response if the node is on."""
+        sensorstate = self._plm.get_device_attr(self._address, 'sensorstate')
+        _LOGGER.info('sensor state for %s is %s', self._address, sensorstate)
+        return bool(sensorstate)
+
+    @property
+    def device_state_attributes(self):
+        """Provide attributes for display on device card."""
+        insteon_plm = get_component('insteon_plm')
+        return insteon_plm.common_attributes(self)
+
+    def get_attr(self, key):
+        """Return specified attribute for this device."""
+        return self._plm.get_device_attr(self.address, key)
+
+    @callback
+    def async_binarysensor_update(self, message):
+        """Receive notification from transport that new data exists."""
+        _LOGGER.info('Received update calback from PLM for %s', self._address)
+        self._hass.async_add_job(self.async_update_ha_state())
--- a/homeassistant/components/binary_sensor/iss.py
+++ b/homeassistant/components/binary_sensor/iss.py
@@ -0,0 +1,131 @@
+"""
+Support for International Space Station data sensor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.iss/
+"""
+import logging
+from datetime import timedelta
+
+import requests
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (CONF_NAME, ATTR_LONGITUDE, ATTR_LATITUDE)
+from homeassistant.util import Throttle
+
+REQUIREMENTS = ['pyiss==1.0.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_ISS_NEXT_RISE = 'next_rise'
+ATTR_ISS_NUMBER_PEOPLE_SPACE = 'number_of_people_in_space'
+
+CONF_SHOW_ON_MAP = 'show_on_map'
+
+DEFAULT_NAME = 'ISS'
+DEFAULT_DEVICE_CLASS = 'visible'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_SHOW_ON_MAP, default=False): cv.boolean,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the ISS sensor."""
+    if None in (hass.config.latitude, hass.config.longitude):
+        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
+        return False
+
+    try:
+        iss_data = IssData(hass.config.latitude, hass.config.longitude)
+        iss_data.update()
+    except requests.exceptions.HTTPError as error:
+        _LOGGER.error(error)
+        return False
+
+    name = config.get(CONF_NAME)
+    show_on_map = config.get(CONF_SHOW_ON_MAP)
+
+    add_devices([IssBinarySensor(iss_data, name, show_on_map)], True)
+
+
+class IssBinarySensor(BinarySensorDevice):
+    """Implementation of the ISS binary sensor."""
+
+    def __init__(self, iss_data, name, show):
+        """Initialize the sensor."""
+        self.iss_data = iss_data
+        self._state = None
+        self._name = name
+        self._show_on_map = show
+        self.update()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self.iss_data.is_above if self.iss_data else False
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor."""
+        return DEFAULT_DEVICE_CLASS
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        if self.iss_data:
+            attrs = {
+                ATTR_ISS_NUMBER_PEOPLE_SPACE:
+                    self.iss_data.number_of_people_in_space,
+                ATTR_ISS_NEXT_RISE: self.iss_data.next_rise,
+            }
+            if self._show_on_map:
+                attrs[ATTR_LONGITUDE] = self.iss_data.position.get('longitude')
+                attrs[ATTR_LATITUDE] = self.iss_data.position.get('latitude')
+            else:
+                attrs['long'] = self.iss_data.position.get('longitude')
+                attrs['lat'] = self.iss_data.position.get('latitude')
+            return attrs
+
+    def update(self):
+        """Get the latest data from ISS API and updates the states."""
+        self.iss_data.update()
+
+
+class IssData(object):
+    """Get data from the ISS API."""
+
+    def __init__(self, latitude, longitude):
+        """Initialize the data object."""
+        self.is_above = None
+        self.next_rise = None
+        self.number_of_people_in_space = None
+        self.position = None
+        self.latitude = latitude
+        self.longitude = longitude
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self):
+        """Get the latest data from the ISS API."""
+        import pyiss
+
+        try:
+            iss = pyiss.ISS()
+            self.is_above = iss.is_ISS_above(self.latitude, self.longitude)
+            self.next_rise = iss.next_rise(self.latitude, self.longitude)
+            self.number_of_people_in_space = iss.number_of_people_in_space()
+            self.position = iss.current_location()
+        except requests.exceptions.HTTPError as error:
+            _LOGGER.error(error)
+            return False
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -4,6 +4,7 @@ Support for MQTT binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.mqtt/
 """
+import asyncio
 import logging

 import voluptuous as vol
@@ -11,12 +12,13 @@ import voluptuous as vol
 from homeassistant.core import callback
 import homeassistant.components.mqtt as mqtt
 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, SENSOR_CLASSES)
+    BinarySensorDevice, DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
    CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF,
-    CONF_SENSOR_CLASS)
+    CONF_SENSOR_CLASS, CONF_DEVICE_CLASS)
 from homeassistant.components.mqtt import (CONF_STATE_TOPIC, CONF_QOS)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -29,22 +31,25 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS, default=None):
-        vol.Any(vol.In(SENSOR_CLASSES), vol.SetTo(None)),
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })


-# pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the MQTT binary sensor."""
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Set up the MQTT binary sensor."""
+    if discovery_info is not None:
+        config = PLATFORM_SCHEMA(discovery_info)
+
    value_template = config.get(CONF_VALUE_TEMPLATE)
    if value_template is not None:
        value_template.hass = hass
-    add_devices([MqttBinarySensor(
-        hass,
+
+    yield from async_add_devices([MqttBinarySensor(
        config.get(CONF_NAME),
        config.get(CONF_STATE_TOPIC),
-        config.get(CONF_SENSOR_CLASS),
+        get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS),
        config.get(CONF_QOS),
        config.get(CONF_PAYLOAD_ON),
        config.get(CONF_PAYLOAD_OFF),
@@ -55,32 +60,38 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class MqttBinarySensor(BinarySensorDevice):
    """Representation a binary sensor that is updated by MQTT."""

-    def __init__(self, hass, name, state_topic, sensor_class, qos, payload_on,
+    def __init__(self, name, state_topic, device_class, qos, payload_on,
                 payload_off, value_template):
        """Initialize the MQTT binary sensor."""
-        self._hass = hass
        self._name = name
        self._state = False
        self._state_topic = state_topic
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._payload_on = payload_on
        self._payload_off = payload_off
        self._qos = qos
+        self._template = value_template

+    def async_added_to_hass(self):
+        """Subscribe mqtt events.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
        @callback
        def message_received(topic, payload, qos):
            """A new MQTT message has been received."""
-            if value_template is not None:
-                payload = value_template.async_render_with_possible_json_value(
+            if self._template is not None:
+                payload = self._template.async_render_with_possible_json_value(
                    payload)
            if payload == self._payload_on:
                self._state = True
-                hass.async_add_job(self.async_update_ha_state())
            elif payload == self._payload_off:
                self._state = False
-                hass.async_add_job(self.async_update_ha_state())

-        mqtt.subscribe(hass, self._state_topic, message_received, self._qos)
+            self.hass.async_add_job(self.async_update_ha_state())
+
+        return mqtt.async_subscribe(
+            self.hass, self._state_topic, message_received, self._qos)

    @property
    def should_poll(self):
@@ -98,6 +109,6 @@ class MqttBinarySensor(BinarySensorDevice):
        return self._state

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
-        return self._sensor_class
+        return self._device_class
--- a/homeassistant/components/binary_sensor/mysensors.py
+++ b/homeassistant/components/binary_sensor/mysensors.py
@@ -7,7 +7,7 @@ https://home-assistant.io/components/binary_sensor.mysensors/
 import logging

 from homeassistant.components import mysensors
-from homeassistant.components.binary_sensor import (SENSOR_CLASSES,
+from homeassistant.components.binary_sensor import (DEVICE_CLASSES,
                                                    BinarySensorDevice)
 from homeassistant.const import STATE_ON

@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

        devices = {}
        gateway.platform_callbacks.append(mysensors.pf_callback_factory(
-            map_sv_types, devices, add_devices, MySensorsBinarySensor))
+            map_sv_types, devices, MySensorsBinarySensor, add_devices))


 class MySensorsBinarySensor(
@@ -62,8 +62,8 @@ class MySensorsBinarySensor(
        return False

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        pres = self.gateway.const.Presentation
        class_map = {
            pres.S_DOOR: 'opening',
@@ -78,5 +78,5 @@ class MySensorsBinarySensor(
                pres.S_VIBRATION: 'vibration',
                pres.S_MOISTURE: 'moisture',
            })
-        if class_map.get(self.child_type) in SENSOR_CLASSES:
+        if class_map.get(self.child_type) in DEVICE_CLASSES:
            return class_map.get(self.child_type)
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -7,15 +7,10 @@ https://home-assistant.io/components/binary_sensor.nest/
 from itertools import chain
 import logging

-import voluptuous as vol
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.components.binary_sensor import (BinarySensorDevice)
 from homeassistant.components.sensor.nest import NestSensor
-from homeassistant.const import (CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS)
-from homeassistant.components.nest import (
-    DATA_NEST, is_thermostat, is_camera)
-import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_MONITORED_CONDITIONS
+from homeassistant.components.nest import DATA_NEST

 DEPENDENCIES = ['nest']

@@ -43,17 +38,6 @@ _BINARY_TYPES_DEPRECATED = [

 _VALID_BINARY_SENSOR_TYPES = BINARY_TYPES + CLIMATE_BINARY_TYPES \
    + CAMERA_BINARY_TYPES
-_VALID_BINARY_SENSOR_TYPES_WITH_DEPRECATED = _VALID_BINARY_SENSOR_TYPES \
-    + _BINARY_TYPES_DEPRECATED
-
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_SCAN_INTERVAL):
-        vol.All(vol.Coerce(int), vol.Range(min=1)),
-    vol.Required(CONF_MONITORED_CONDITIONS):
-        vol.All(cv.ensure_list,
-                [vol.In(_VALID_BINARY_SENSOR_TYPES_WITH_DEPRECATED)])
-})

 _LOGGER = logging.getLogger(__name__)

@@ -64,33 +48,37 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        return

    nest = hass.data[DATA_NEST]
-    conf = config.get(CONF_MONITORED_CONDITIONS, _VALID_BINARY_SENSOR_TYPES)

-    for variable in conf:
+    # Add all available binary sensors if no Nest binary sensor config is set
+    if discovery_info == {}:
+        conditions = _VALID_BINARY_SENSOR_TYPES
+    else:
+        conditions = discovery_info.get(CONF_MONITORED_CONDITIONS, {})
+
+    for variable in conditions:
        if variable in _BINARY_TYPES_DEPRECATED:
            wstr = (variable + " is no a longer supported "
                    "monitored_conditions. See "
                    "https://home-assistant.io/components/binary_sensor.nest/ "
-                    "for valid options, or remove monitored_conditions "
-                    "entirely to get a reasonable default")
+                    "for valid options.")
            _LOGGER.error(wstr)

    sensors = []
-    device_chain = chain(nest.devices(),
-                         nest.protect_devices(),
-                         nest.camera_devices())
+    device_chain = chain(nest.thermostats(),
+                         nest.smoke_co_alarms(),
+                         nest.cameras())
    for structure, device in device_chain:
        sensors += [NestBinarySensor(structure, device, variable)
-                    for variable in conf
+                    for variable in conditions
                    if variable in BINARY_TYPES]
        sensors += [NestBinarySensor(structure, device, variable)
-                    for variable in conf
+                    for variable in conditions
                    if variable in CLIMATE_BINARY_TYPES
-                    and is_thermostat(device)]
+                    and device.is_thermostat]

-        if is_camera(device):
+        if device.is_camera:
            sensors += [NestBinarySensor(structure, device, variable)
-                        for variable in conf
+                        for variable in conditions
                        if variable in CAMERA_BINARY_TYPES]
            for activity_zone in device.activity_zones:
                sensors += [NestActivityZoneSensor(structure,
@@ -118,13 +106,14 @@ class NestActivityZoneSensor(NestBinarySensor):

    def __init__(self, structure, device, zone):
        """Initialize the sensor."""
-        super(NestActivityZoneSensor, self).__init__(structure, device, None)
+        super(NestActivityZoneSensor, self).__init__(structure, device, "")
        self.zone = zone
+        self._name = "{} {} activity".format(self._name, self.zone.name)

    @property
    def name(self):
        """Return the name of the nest, if any."""
-        return "{} {} activity".format(self._name, self.zone.name)
+        return self._name

    def update(self):
        """Retrieve latest state."""
--- a/homeassistant/components/binary_sensor/netatmo.py
+++ b/homeassistant/components/binary_sensor/netatmo.py
@@ -1,19 +1,19 @@
 """
 Support for the Netatmo binary sensors.

-The binary sensors based on events seen by the NetatmoCamera
+The binary sensors based on events seen by the Netatmo cameras.

 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/binary_sensor.netatmo/
+https://home-assistant.io/components/binary_sensor.netatmo/.
 """
 import logging
 import voluptuous as vol

 from homeassistant.components.binary_sensor import (
    BinarySensorDevice, PLATFORM_SCHEMA)
-from homeassistant.components.netatmo import WelcomeData
+from homeassistant.components.netatmo import CameraData
 from homeassistant.loader import get_component
-from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_TIMEOUT
+from homeassistant.const import CONF_TIMEOUT, CONF_OFFSET
 from homeassistant.helpers import config_validation as cv

 DEPENDENCIES = ["netatmo"]
@@ -22,24 +22,40 @@ _LOGGER = logging.getLogger(__name__)


 # These are the available sensors mapped to binary_sensor class
-SENSOR_TYPES = {
-    "Someone known": 'occupancy',
-    "Someone unknown": 'motion',
-    "Motion": 'motion',
+WELCOME_SENSOR_TYPES = {
+    "Someone known": "motion",
+    "Someone unknown": "motion",
+    "Motion": "motion",
+}
+PRESENCE_SENSOR_TYPES = {
+    "Outdoor motion": "motion",
+    "Outdoor human": "motion",
+    "Outdoor animal": "motion",
+    "Outdoor vehicle": "motion"
+}
+TAG_SENSOR_TYPES = {
    "Tag Vibration": 'vibration',
-    "Tag Open": 'opening',
+    "Tag Open": 'opening'
 }

 CONF_HOME = 'home'
 CONF_CAMERAS = 'cameras'
+CONF_WELCOME_SENSORS = 'welcome_sensors'
+CONF_PRESENCE_SENSORS = 'presence_sensors'
+CONF_TAG_SENSORS = 'tag_sensors'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_HOME): cv.string,
    vol.Optional(CONF_TIMEOUT): cv.positive_int,
+    vol.Optional(CONF_OFFSET): cv.positive_int,
    vol.Optional(CONF_CAMERAS, default=[]):
        vol.All(cv.ensure_list, [cv.string]),
-    vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES.keys()):
-        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+    vol.Optional(
+        CONF_WELCOME_SENSORS, default=WELCOME_SENSOR_TYPES.keys()):
+        vol.All(cv.ensure_list, [vol.In(WELCOME_SENSOR_TYPES)]),
+    vol.Optional(
+        CONF_PRESENCE_SENSORS, default=PRESENCE_SENSOR_TYPES.keys()):
+        vol.All(cv.ensure_list, [vol.In(PRESENCE_SENSOR_TYPES)]),
 })


@@ -49,48 +65,69 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    netatmo = get_component('netatmo')
    home = config.get(CONF_HOME, None)
    timeout = config.get(CONF_TIMEOUT, 15)
+    offset = config.get(CONF_OFFSET, 90)

    module_name = None

    import lnetatmo
    try:
-        data = WelcomeData(netatmo.NETATMO_AUTH, home)
+        data = CameraData(netatmo.NETATMO_AUTH, home)
        if data.get_camera_names() == []:
            return None
    except lnetatmo.NoDevice:
        return None

-    sensors = config.get(CONF_MONITORED_CONDITIONS, SENSOR_TYPES)
+    welcome_sensors = config.get(
+        CONF_WELCOME_SENSORS, WELCOME_SENSOR_TYPES)
+    presence_sensors = config.get(
+        CONF_PRESENCE_SENSORS, PRESENCE_SENSOR_TYPES)
+    tag_sensors = config.get(CONF_TAG_SENSORS, TAG_SENSOR_TYPES)

    for camera_name in data.get_camera_names():
-        if CONF_CAMERAS in config:
-            if config[CONF_CAMERAS] != [] and \
-               camera_name not in config[CONF_CAMERAS]:
-                continue
-        for variable in sensors:
-            if variable in ('Tag Vibration', 'Tag Open'):
-                continue
-            add_devices([WelcomeBinarySensor(data, camera_name, module_name,
-                                             home, timeout, variable)])
+        camera_type = data.get_camera_type(camera=camera_name, home=home)
+        if camera_type == "NACamera":
+            if CONF_CAMERAS in config:
+                if config[CONF_CAMERAS] != [] and \
+                   camera_name not in config[CONF_CAMERAS]:
+                    continue
+            for variable in welcome_sensors:
+                add_devices([NetatmoBinarySensor(data, camera_name,
+                                                 module_name, home, timeout,
+                                                 offset, camera_type,
+                                                 variable)])
+        if camera_type == "NOC":
+            if CONF_CAMERAS in config:
+                if config[CONF_CAMERAS] != [] and \
+                   camera_name not in config[CONF_CAMERAS]:
+                    continue
+            for variable in presence_sensors:
+                add_devices([NetatmoBinarySensor(data, camera_name,
+                                                 module_name, home, timeout,
+                                                 offset, camera_type,
+                                                 variable)])

        for module_name in data.get_module_names(camera_name):
-            for variable in sensors:
-                if variable in ('Tag Vibration', 'Tag Open'):
-                    add_devices([WelcomeBinarySensor(data, camera_name,
-                                                     module_name, home,
-                                                     timeout, variable)])
+            for variable in tag_sensors:
+                camera_type = None
+                add_devices([NetatmoBinarySensor(data, camera_name,
+                                                 module_name, home,
+                                                 timeout, offset,
+                                                 camera_type,
+                                                 variable)])


-class WelcomeBinarySensor(BinarySensorDevice):
-    """Represent a single binary sensor in a Netatmo Welcome device."""
+class NetatmoBinarySensor(BinarySensorDevice):
+    """Represent a single binary sensor in a Netatmo Camera device."""

-    def __init__(self, data, camera_name, module_name, home, timeout, sensor):
+    def __init__(self, data, camera_name, module_name, home,
+                 timeout, offset, camera_type, sensor):
        """Setup for access to the Netatmo camera events."""
        self._data = data
        self._camera_name = camera_name
        self._module_name = module_name
        self._home = home
        self._timeout = timeout
+        self._offset = offset
        if home:
            self._name = home + ' / ' + camera_name
        else:
@@ -99,10 +136,11 @@ class WelcomeBinarySensor(BinarySensorDevice):
            self._name += ' / ' + module_name
        self._sensor_name = sensor
        self._name += ' ' + sensor
-        camera_id = data.welcomedata.cameraByName(camera=camera_name,
+        camera_id = data.camera_data.cameraByName(camera=camera_name,
                                                  home=home)['id']
-        self._unique_id = "Welcome_binary_sensor {0} - {1}".format(self._name,
+        self._unique_id = "Netatmo_binary_sensor {0} - {1}".format(self._name,
                                                                   camera_id)
+        self._cameratype = camera_type
        self.update()

    @property
@@ -116,9 +154,14 @@ class WelcomeBinarySensor(BinarySensorDevice):
        return self._unique_id

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
-        return SENSOR_TYPES.get(self._sensor_name)
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        if self._cameratype == "NACamera":
+            return WELCOME_SENSOR_TYPES.get(self._sensor_name)
+        elif self._cameratype == "NOC":
+            return PRESENCE_SENSOR_TYPES.get(self._sensor_name)
+        else:
+            return TAG_SENSOR_TYPES.get(self._sensor_name)

    @property
    def is_on(self):
@@ -130,30 +173,50 @@ class WelcomeBinarySensor(BinarySensorDevice):
        self._data.update()
        self._data.update_event()

-        if self._sensor_name == "Someone known":
-            self._state =\
-                    self._data.welcomedata.someoneKnownSeen(self._home,
+        if self._cameratype == "NACamera":
+            if self._sensor_name == "Someone known":
+                self._state =\
+                    self._data.camera_data.someoneKnownSeen(self._home,
                                                            self._camera_name,
                                                            self._timeout*60)
-        elif self._sensor_name == "Someone unknown":
-            self._state =\
-                self._data.welcomedata.someoneUnknownSeen(self._home,
+            elif self._sensor_name == "Someone unknown":
+                self._state =\
+                    self._data.camera_data.someoneUnknownSeen(
+                        self._home, self._camera_name, self._timeout*60)
+            elif self._sensor_name == "Motion":
+                self._state =\
+                    self._data.camera_data.motionDetected(self._home,
                                                          self._camera_name,
                                                          self._timeout*60)
-        elif self._sensor_name == "Motion":
+        elif self._cameratype == "NOC":
+            if self._sensor_name == "Outdoor motion":
+                self._state =\
+                    self._data.camera_data.outdoormotionDetected(
+                        self._home, self._camera_name, self._offset)
+            elif self._sensor_name == "Outdoor human":
+                self._state =\
+                    self._data.camera_data.humanDetected(self._home,
+                                                         self._camera_name,
+                                                         self._offset)
+            elif self._sensor_name == "Outdoor animal":
+                self._state =\
+                    self._data.camera_data.animalDetected(self._home,
+                                                          self._camera_name,
+                                                          self._offset)
+            elif self._sensor_name == "Outdoor vehicle":
+                self._state =\
+                    self._data.camera_data.carDetected(self._home,
+                                                       self._camera_name,
+                                                       self._offset)
+        if self._sensor_name == "Tag Vibration":
            self._state =\
-                self._data.welcomedata.motionDetected(self._home,
-                                                      self._camera_name,
-                                                      self._timeout*60)
-        elif self._sensor_name == "Tag Vibration":
-            self._state =\
-                self._data.welcomedata.moduleMotionDetected(self._home,
+                self._data.camera_data.moduleMotionDetected(self._home,
                                                            self._module_name,
                                                            self._camera_name,
                                                            self._timeout*60)
        elif self._sensor_name == "Tag Open":
            self._state =\
-                self._data.welcomedata.moduleOpened(self._home,
+                self._data.camera_data.moduleOpened(self._home,
                                                    self._module_name,
                                                    self._camera_name)
        else:
--- a/homeassistant/components/binary_sensor/nx584.py
+++ b/homeassistant/components/binary_sensor/nx584.py
@@ -12,11 +12,11 @@ import requests
 import voluptuous as vol

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

-REQUIREMENTS = ['pynx584==0.2']
+REQUIREMENTS = ['pynx584==0.4']

 _LOGGER = logging.getLogger(__name__)

@@ -28,7 +28,7 @@ DEFAULT_PORT = '5007'
 DEFAULT_SSL = False

 ZONE_TYPES_SCHEMA = vol.Schema({
-    cv.positive_int: vol.In(SENSOR_CLASSES),
+    cv.positive_int: vol.In(DEVICE_CLASSES),
 })

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -85,8 +85,8 @@ class NX584ZoneSensor(BinarySensorDevice):
        self._zone_type = zone_type

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return self._zone_type

    @property
--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -99,8 +99,8 @@ class OctoPrintBinarySensor(BinarySensorDevice):
            return STATE_OFF

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return None

    def update(self):
--- a/homeassistant/components/binary_sensor/rest.py
+++ b/homeassistant/components/binary_sensor/rest.py
@@ -10,14 +10,15 @@ import voluptuous as vol
 from requests.auth import HTTPBasicAuth, HTTPDigestAuth

 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, SENSOR_CLASSES_SCHEMA, PLATFORM_SCHEMA)
+    BinarySensorDevice, DEVICE_CLASSES_SCHEMA, PLATFORM_SCHEMA)
 from homeassistant.components.sensor.rest import RestData
 from homeassistant.const import (
    CONF_PAYLOAD, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_METHOD, CONF_RESOURCE,
    CONF_SENSOR_CLASS, CONF_VERIFY_SSL, CONF_USERNAME, CONF_PASSWORD,
    CONF_HEADERS, CONF_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION,
-    HTTP_DIGEST_AUTHENTICATION)
+    HTTP_DIGEST_AUTHENTICATION, CONF_DEVICE_CLASS)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -34,7 +35,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    vol.Optional(CONF_PASSWORD): cv.string,
    vol.Optional(CONF_PAYLOAD): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
    vol.Optional(CONF_USERNAME): cv.string,
    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
    vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
@@ -51,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)
    headers = config.get(CONF_HEADERS)
-    sensor_class = config.get(CONF_SENSOR_CLASS)
+    device_class = get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)
    value_template = config.get(CONF_VALUE_TEMPLATE)
    if value_template is not None:
        value_template.hass = hass
@@ -72,18 +74,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        return False

    add_devices([RestBinarySensor(
-        hass, rest, name, sensor_class, value_template)])
+        hass, rest, name, device_class, value_template)])


 class RestBinarySensor(BinarySensorDevice):
    """Representation of a REST binary sensor."""

-    def __init__(self, hass, rest, name, sensor_class, value_template):
+    def __init__(self, hass, rest, name, device_class, value_template):
        """Initialize a REST binary sensor."""
        self._hass = hass
        self.rest = rest
        self._name = name
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._state = False
        self._previous_data = None
        self._value_template = value_template
@@ -95,9 +97,9 @@ class RestBinarySensor(BinarySensorDevice):
        return self._name

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
-        return self._sensor_class
+        return self._device_class

    @property
    def is_on(self):
--- a/homeassistant/components/binary_sensor/rpi_gpio.py
+++ b/homeassistant/components/binary_sensor/rpi_gpio.py
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    for port_num, port_name in ports.items():
        binary_sensors.append(RPiGPIOBinarySensor(
            port_name, port_num, pull_mode, bouncetime, invert_logic))
-    add_devices(binary_sensors)
+    add_devices(binary_sensors, True)


 class RPiGPIOBinarySensor(BinarySensorDevice):
@@ -65,9 +65,9 @@ class RPiGPIOBinarySensor(BinarySensorDevice):
        self._pull_mode = pull_mode
        self._bouncetime = bouncetime
        self._invert_logic = invert_logic
+        self._state = None

        rpi_gpio.setup_input(self._port, self._pull_mode)
-        self._state = rpi_gpio.read_input(self._port)

        def read_gpio(port):
            """Read state from GPIO."""
@@ -90,3 +90,7 @@ class RPiGPIOBinarySensor(BinarySensorDevice):
    def is_on(self):
        """Return the state of the entity."""
        return self._state != self._invert_logic
+
+    def update(self):
+        """Update the GPIO state."""
+        self._state = rpi_gpio.read_input(self._port)
--- a/homeassistant/components/binary_sensor/services.yaml
+++ b/homeassistant/components/binary_sensor/services.yaml
@@ -1,9 +0,0 @@
-# Describes the format for available binary_sensor services
-
-ffmpeg_restart:
-  description: Send a restart command to a ffmpeg based sensor (party mode).
-
-  fields:
-    entity_id:
-      description: Name(s) of entites that will restart. Platform dependent.
-      example: 'binary_sensor.ffmpeg_noise'
--- a/homeassistant/components/binary_sensor/sleepiq.py
+++ b/homeassistant/components/binary_sensor/sleepiq.py
@@ -42,7 +42,7 @@ class IsInBedBinarySensor(sleepiq.SleepIQSensor, BinarySensorDevice):
        return self._state is True

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the class of this sensor."""
        return "occupancy"

--- a/homeassistant/components/binary_sensor/template.py
+++ b/homeassistant/components/binary_sensor/template.py
@@ -12,14 +12,15 @@ import voluptuous as vol
 from homeassistant.core import callback
 from homeassistant.components.binary_sensor import (
    BinarySensorDevice, ENTITY_ID_FORMAT, PLATFORM_SCHEMA,
-    SENSOR_CLASSES_SCHEMA)
+    DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
    ATTR_FRIENDLY_NAME, ATTR_ENTITY_ID, CONF_VALUE_TEMPLATE,
-    CONF_SENSOR_CLASS, CONF_SENSORS)
+    CONF_SENSOR_CLASS, CONF_SENSORS, CONF_DEVICE_CLASS)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.deprecation import get_deprecated

 _LOGGER = logging.getLogger(__name__)

@@ -27,7 +28,8 @@ SENSOR_SCHEMA = vol.Schema({
    vol.Required(CONF_VALUE_TEMPLATE): cv.template,
    vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
-    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -45,7 +47,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        entity_ids = (device_config.get(ATTR_ENTITY_ID) or
                      value_template.extract_entities())
        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
-        sensor_class = device_config.get(CONF_SENSOR_CLASS)
+        device_class = get_deprecated(
+            device_config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)

        if value_template is not None:
            value_template.hass = hass
@@ -55,7 +58,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                hass,
                device,
                friendly_name,
-                sensor_class,
+                device_class,
                value_template,
                entity_ids)
            )
@@ -70,14 +73,14 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 class BinarySensorTemplate(BinarySensorDevice):
    """A virtual binary sensor that triggers from another sensor."""

-    def __init__(self, hass, device, friendly_name, sensor_class,
+    def __init__(self, hass, device, friendly_name, device_class,
                 value_template, entity_ids):
        """Initialize the Template binary sensor."""
        self.hass = hass
        self.entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, device,
                                                  hass=hass)
        self._name = friendly_name
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._template = value_template
        self._state = None

@@ -100,9 +103,9 @@ class BinarySensorTemplate(BinarySensorDevice):
        return self._state

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the sensor class of the sensor."""
-        return self._sensor_class
+        return self._device_class

    @property
    def should_poll(self):
@@ -118,7 +121,8 @@ class BinarySensorTemplate(BinarySensorDevice):
            if ex.args and ex.args[0].startswith(
                    "UndefinedError: 'None' has no attribute"):
                # Common during HA startup - so just a warning
-                _LOGGER.warning(ex)
+                _LOGGER.warning('Could not render template %s,'
+                                ' the state is unknown.', self._name)
                return
-            _LOGGER.error(ex)
+            _LOGGER.error('Could not render template %s: %s', self._name, ex)
            self._state = False
--- a/homeassistant/components/binary_sensor/threshold.py
+++ b/homeassistant/components/binary_sensor/threshold.py
@@ -11,11 +11,12 @@ import voluptuous as vol

 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.binary_sensor import (
-    BinarySensorDevice, PLATFORM_SCHEMA, SENSOR_CLASSES_SCHEMA)
+    BinarySensorDevice, PLATFORM_SCHEMA, DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
    CONF_NAME, CONF_ENTITY_ID, CONF_TYPE, STATE_UNKNOWN, CONF_SENSOR_CLASS,
-    ATTR_ENTITY_ID)
+    ATTR_ENTITY_ID, CONF_DEVICE_CLASS)
 from homeassistant.core import callback
+from homeassistant.helpers.deprecation import get_deprecated
 from homeassistant.helpers.event import async_track_state_change

 _LOGGER = logging.getLogger(__name__)
@@ -37,7 +38,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_THRESHOLD): vol.Coerce(float),
    vol.Required(CONF_TYPE): vol.In(SENSOR_TYPES),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA,
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })


@@ -48,11 +50,11 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    name = config.get(CONF_NAME)
    threshold = config.get(CONF_THRESHOLD)
    limit_type = config.get(CONF_TYPE)
-    sensor_class = config.get(CONF_SENSOR_CLASS)
+    device_class = get_deprecated(config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)

    yield from async_add_devices(
        [ThresholdSensor(hass, entity_id, name, threshold, limit_type,
-                         sensor_class)], True)
+                         device_class)], True)
    return True


@@ -60,14 +62,14 @@ class ThresholdSensor(BinarySensorDevice):
    """Representation of a Threshold sensor."""

    def __init__(self, hass, entity_id, name, threshold, limit_type,
-                 sensor_class):
+                 device_class):
        """Initialize the Threshold sensor."""
        self._hass = hass
        self._entity_id = entity_id
        self.is_upper = limit_type == 'upper'
        self._name = name
        self._threshold = threshold
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._deviation = False
        self.sensor_value = 0

@@ -105,12 +107,12 @@ class ThresholdSensor(BinarySensorDevice):
        return False

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the sensor class of the sensor."""
-        return self._sensor_class
+        return self._device_class

    @property
-    def state_attributes(self):
+    def device_state_attributes(self):
        """Return the state attributes of the sensor."""
        return {
            ATTR_ENTITY_ID: self._entity_id,
--- a/homeassistant/components/binary_sensor/trend.py
+++ b/homeassistant/components/binary_sensor/trend.py
@@ -15,12 +15,14 @@ from homeassistant.components.binary_sensor import (
    BinarySensorDevice,
    ENTITY_ID_FORMAT,
    PLATFORM_SCHEMA,
-    SENSOR_CLASSES_SCHEMA)
+    DEVICE_CLASSES_SCHEMA)
 from homeassistant.const import (
    ATTR_FRIENDLY_NAME,
    ATTR_ENTITY_ID,
    CONF_SENSOR_CLASS,
+    CONF_DEVICE_CLASS,
    STATE_UNKNOWN,)
+from homeassistant.helpers.deprecation import get_deprecated
 from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.helpers.event import track_state_change

@@ -34,8 +36,8 @@ SENSOR_SCHEMA = vol.Schema({
    vol.Optional(CONF_ATTRIBUTE): cv.string,
    vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
    vol.Optional(CONF_INVERT, default=False): cv.boolean,
-    vol.Optional(CONF_SENSOR_CLASS, default=None): SENSOR_CLASSES_SCHEMA
-
+    vol.Optional(CONF_SENSOR_CLASS): DEVICE_CLASSES_SCHEMA,
+    vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
 })

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -52,7 +54,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        entity_id = device_config[ATTR_ENTITY_ID]
        attribute = device_config.get(CONF_ATTRIBUTE)
        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
-        sensor_class = device_config[CONF_SENSOR_CLASS]
+        device_class = get_deprecated(
+            device_config, CONF_DEVICE_CLASS, CONF_SENSOR_CLASS)
        invert = device_config[CONF_INVERT]

        sensors.append(
@@ -62,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                friendly_name,
                entity_id,
                attribute,
-                sensor_class,
+                device_class,
                invert)
            )
    if not sensors:
@@ -76,7 +79,7 @@ class SensorTrend(BinarySensorDevice):
    """Representation of a trend Sensor."""

    def __init__(self, hass, device_id, friendly_name,
-                 target_entity, attribute, sensor_class, invert):
+                 target_entity, attribute, device_class, invert):
        """Initialize the sensor."""
        self._hass = hass
        self.entity_id = generate_entity_id(ENTITY_ID_FORMAT, device_id,
@@ -84,7 +87,7 @@ class SensorTrend(BinarySensorDevice):
        self._name = friendly_name
        self._target_entity = target_entity
        self._attribute = attribute
-        self._sensor_class = sensor_class
+        self._device_class = device_class
        self._invert = invert
        self._state = None
        self.from_state = None
@@ -111,9 +114,9 @@ class SensorTrend(BinarySensorDevice):
        return self._state

    @property
-    def sensor_class(self):
+    def device_class(self):
        """Return the sensor class of the sensor."""
-        return self._sensor_class
+        return self._device_class

    @property
    def should_poll(self):
--- a/homeassistant/components/binary_sensor/volvooncall.py
+++ b/homeassistant/components/binary_sensor/volvooncall.py
@@ -0,0 +1,40 @@
+"""
+Support for VOC.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.volvooncall/
+
+"""
+import logging
+
+from homeassistant.components.volvooncall import VolvoEntity
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup Volvo sensors."""
+    if discovery_info is None:
+        return
+    add_devices([VolvoSensor(hass, *discovery_info)])
+
+
+class VolvoSensor(VolvoEntity, BinarySensorDevice):
+    """Representation of a Volvo sensor."""
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        val = getattr(self.vehicle, self._attribute)
+        if self._attribute == 'bulb_failures':
+            return len(val) > 0
+        elif self._attribute in ['doors', 'windows']:
+            return any([val[key] for key in val if 'Open' in key])
+        else:
+            return val != 'Normal'
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return 'safety'
--- a/homeassistant/components/binary_sensor/wink.py
+++ b/homeassistant/components/binary_sensor/wink.py
@@ -4,11 +4,13 @@ Support for Wink binary sensors.
 For more details about this platform, please refer to the documentation at
 at https://home-assistant.io/components/binary_sensor.wink/
 """
+import logging

 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.sensor.wink import WinkDevice
+from homeassistant.components.wink import WinkDevice, DOMAIN
 from homeassistant.helpers.entity import Entity
-from homeassistant.loader import get_component
+
+_LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['wink']

@@ -18,11 +20,14 @@ SENSOR_TYPES = {
    "brightness": "light",
    "vibration": "vibration",
    "loudness": "sound",
+    "noise": "sound",
+    "capturing_audio": "sound",
    "liquid_detected": "moisture",
    "motion": "motion",
    "presence": "occupancy",
    "co_detected": "gas",
-    "smoke_detected": "smoke"
+    "smoke_detected": "smoke",
+    "capturing_video": None
 }


@@ -31,17 +36,54 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    import pywink

    for sensor in pywink.get_sensors():
-        if sensor.capability() in SENSOR_TYPES:
-            add_devices([WinkBinarySensorDevice(sensor, hass)])
+        _id = sensor.object_id() + sensor.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            if sensor.capability() in SENSOR_TYPES:
+                add_devices([WinkBinarySensorDevice(sensor, hass)])

    for key in pywink.get_keys():
-        add_devices([WinkBinarySensorDevice(key, hass)])
+        _id = key.object_id() + key.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkBinarySensorDevice(key, hass)])

    for sensor in pywink.get_smoke_and_co_detectors():
-        add_devices([WinkBinarySensorDevice(sensor, hass)])
+        _id = sensor.object_id() + sensor.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkSmokeDetector(sensor, hass)])

    for hub in pywink.get_hubs():
-        add_devices([WinkHub(hub, hass)])
+        _id = hub.object_id() + hub.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkHub(hub, hass)])
+
+    for remote in pywink.get_remotes():
+        _id = remote.object_id() + remote.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkRemote(remote, hass)])
+
+    for button in pywink.get_buttons():
+        _id = button.object_id() + button.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkButton(button, hass)])
+
+    for gang in pywink.get_gangs():
+        _id = gang.object_id() + gang.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkGang(gang, hass)])
+
+    for door_bell_sensor in pywink.get_door_bells():
+        _id = door_bell_sensor.object_id() + door_bell_sensor.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkBinarySensorDevice(door_bell_sensor, hass)])
+
+    for camera_sensor in pywink.get_cameras():
+        _id = camera_sensor.object_id() + camera_sensor.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            try:
+                if camera_sensor.capability() in SENSOR_TYPES:
+                    add_devices([WinkBinarySensorDevice(camera_sensor, hass)])
+            except AttributeError:
+                _LOGGER.info("Device isn't a sensor, skipping.")


 class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
@@ -50,46 +92,47 @@ class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
    def __init__(self, wink, hass):
        """Initialize the Wink binary sensor."""
        super().__init__(wink, hass)
-        wink = get_component('wink')
-        self._unit_of_measurement = self.wink.UNIT
-        self.capability = self.wink.capability()
+        if hasattr(self.wink, 'unit'):
+            self._unit_of_measurement = self.wink.unit()
+        else:
+            self._unit_of_measurement = None
+        if hasattr(self.wink, 'capability'):
+            self.capability = self.wink.capability()
+        else:
+            self.capability = None

    @property
    def is_on(self):
        """Return true if the binary sensor is on."""
-        if self.capability == "loudness":
-            state = self.wink.loudness_boolean()
-        elif self.capability == "vibration":
-            state = self.wink.vibration_boolean()
-        elif self.capability == "brightness":
-            state = self.wink.brightness_boolean()
-        elif self.capability == "liquid_detected":
-            state = self.wink.liquid_boolean()
-        elif self.capability == "motion":
-            state = self.wink.motion_boolean()
-        elif self.capability == "presence":
-            state = self.wink.presence_boolean()
-        elif self.capability == "co_detected":
-            state = self.wink.co_detected_boolean()
-        elif self.capability == "smoke_detected":
-            state = self.wink.smoke_detected_boolean()
-        else:
-            state = self.wink.state()
-
-        return state
+        return self.wink.state()

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return SENSOR_TYPES.get(self.capability)


-class WinkHub(WinkDevice, BinarySensorDevice, Entity):
+class WinkSmokeDetector(WinkBinarySensorDevice):
+    """Representation of a Wink Smoke detector."""
+
+    def __init__(self, wink, hass):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink, hass)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            'test_activated': self.wink.test_activated()
+        }
+
+
+class WinkHub(WinkBinarySensorDevice):
    """Representation of a Wink Hub."""

-    def __init(self, wink, hass):
-        """Initialize the hub sensor."""
-        WinkDevice.__init__(self, wink, hass)
+    def __init__(self, wink, hass):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink, hass)

    @property
    def device_state_attributes(self):
@@ -99,7 +142,54 @@ class WinkHub(WinkDevice, BinarySensorDevice, Entity):
            'firmware version': self.wink.firmware_version()
        }

+
+class WinkRemote(WinkBinarySensorDevice):
+    """Representation of a Wink Lutron Connected bulb remote."""
+
+    def __init__(self, wink, hass):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink, hass)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            'button_on_pressed': self.wink.button_on_pressed(),
+            'button_off_pressed': self.wink.button_off_pressed(),
+            'button_up_pressed': self.wink.button_up_pressed(),
+            'button_down_pressed': self.wink.button_down_pressed()
+        }
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return None
+
+
+class WinkButton(WinkBinarySensorDevice):
+    """Representation of a Wink Relay button."""
+
+    def __init__(self, wink, hass):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink, hass)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {
+            'pressed': self.wink.pressed(),
+            'long_pressed': self.wink.long_pressed()
+        }
+
+
+class WinkGang(WinkBinarySensorDevice):
+    """Representation of a Wink Relay gang."""
+
+    def __init__(self, wink, hass):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink, hass)
+
    @property
    def is_on(self):
-        """Return true if the binary sensor is on."""
+        """Return true if the gang is connected."""
        return self.wink.state()
--- a/homeassistant/components/binary_sensor/zigbee.py
+++ b/homeassistant/components/binary_sensor/zigbee.py
@@ -24,7 +24,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({

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


 class ZigBeeBinarySensor(ZigBeeDigitalIn, BinarySensorDevice):
--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -8,8 +8,8 @@ import logging
 import datetime
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.event import track_point_in_time
-from homeassistant.helpers.entity import Entity
 from homeassistant.components import zwave
+from homeassistant.components.zwave import workaround
 from homeassistant.components.binary_sensor import (
    DOMAIN,
    BinarySensorDevice)
@@ -17,19 +17,6 @@ from homeassistant.components.binary_sensor import (
 _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = []

-PHILIO = 0x013c
-PHILIO_SLIM_SENSOR = 0x0002
-PHILIO_SLIM_SENSOR_MOTION = (PHILIO, PHILIO_SLIM_SENSOR, 0)
-WENZHOU = 0x0118
-WENZHOU_SLIM_SENSOR_MOTION = (WENZHOU, PHILIO_SLIM_SENSOR, 0)
-
-WORKAROUND_NO_OFF_EVENT = 'trigger_no_off_event'
-
-DEVICE_MAPPINGS = {
-    PHILIO_SLIM_SENSOR_MOTION: WORKAROUND_NO_OFF_EVENT,
-    WENZHOU_SLIM_SENSOR_MOTION: WORKAROUND_NO_OFF_EVENT,
-}
-

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Z-Wave platform for binary sensors."""
@@ -40,51 +27,45 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    value = node.values[discovery_info[zwave.const.ATTR_VALUE_ID]]
    value.set_change_verified(False)

-    # Make sure that we have values for the key before converting to int
-    if (value.node.manufacturer_id.strip() and
-            value.node.product_id.strip()):
-        specific_sensor_key = (int(value.node.manufacturer_id, 16),
-                               int(value.node.product_id, 16),
-                               value.index)
+    device_mapping = workaround.get_device_mapping(value)
+    if device_mapping == workaround.WORKAROUND_NO_OFF_EVENT:
+        # Default the multiplier to 4
+        re_arm_multiplier = (zwave.get_config_value(value.node, 9) or 4)
+        add_devices([
+            ZWaveTriggerSensor(value, "motion",
+                               hass, re_arm_multiplier * 8)
+        ])
+        return

-        if specific_sensor_key in DEVICE_MAPPINGS:
-            if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
-                # Default the multiplier to 4
-                re_arm_multiplier = (zwave.get_config_value(value.node,
-                                                            9) or 4)
-                add_devices([
-                    ZWaveTriggerSensor(value, "motion",
-                                       hass, re_arm_multiplier * 8)
-                ])
-                return
+    if workaround.get_device_component_mapping(value) == DOMAIN:
+        add_devices([ZWaveBinarySensor(value, None)])
+        return

    if value.command_class == zwave.const.COMMAND_CLASS_SENSOR_BINARY:
        add_devices([ZWaveBinarySensor(value, None)])


-class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity, Entity):
+class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
    """Representation of a binary sensor within Z-Wave."""

-    def __init__(self, value, sensor_class):
+    def __init__(self, value, device_class):
        """Initialize the sensor."""
-        self._sensor_type = sensor_class
-        # pylint: disable=import-error
-        from openzwave.network import ZWaveNetwork
-        from pydispatch import dispatcher
-
        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        self._sensor_type = device_class
+        self._state = self._value.data

-        dispatcher.connect(
-            self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
+    def update_properties(self):
+        """Callback on data changes for node values."""
+        self._state = self._value.data

    @property
    def is_on(self):
        """Return True if the binary sensor is on."""
-        return self._value.data
+        return self._state

    @property
-    def sensor_class(self):
-        """Return the class of this sensor, from SENSOR_CLASSES."""
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
        return self._sensor_type

    @property
@@ -92,44 +73,35 @@ class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity, Entity):
        """No polling needed."""
        return False

-    def value_changed(self, value):
-        """Called when a value has changed on the network."""
-        if self._value.value_id == value.value_id or \
-           self._value.node == value.node:
-            self.schedule_update_ha_state()

-
-class ZWaveTriggerSensor(ZWaveBinarySensor, Entity):
+class ZWaveTriggerSensor(ZWaveBinarySensor):
    """Representation of a stateless sensor within Z-Wave."""

-    def __init__(self, sensor_value, sensor_class, hass, re_arm_sec=60):
+    def __init__(self, value, device_class, hass, re_arm_sec=60):
        """Initialize the sensor."""
-        super(ZWaveTriggerSensor, self).__init__(sensor_value, sensor_class)
+        super(ZWaveTriggerSensor, self).__init__(value, device_class)
        self._hass = hass
        self.re_arm_sec = re_arm_sec
        self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
            seconds=self.re_arm_sec)
        # If it's active make sure that we set the timeout tracker
-        if sensor_value.data:
-            track_point_in_time(
-                self._hass, self.async_update_ha_state,
-                self.invalidate_after)
+        track_point_in_time(
+            self._hass, self.async_update_ha_state,
+            self.invalidate_after)

-    def value_changed(self, value):
-        """Called when a value has changed on the network."""
-        if self._value.value_id == value.value_id:
-            self.schedule_update_ha_state()
-            if value.data:
-                # only allow this value to be true for re_arm secs
-                self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
-                    seconds=self.re_arm_sec)
-                track_point_in_time(
-                    self._hass, self.async_update_ha_state,
-                    self.invalidate_after)
+    def update_properties(self):
+        """Called when a value for this entity's node has changed."""
+        self._state = self._value.data
+        # only allow this value to be true for re_arm secs
+        self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
+            seconds=self.re_arm_sec)
+        track_point_in_time(
+            self._hass, self.async_update_ha_state,
+            self.invalidate_after)

    @property
    def is_on(self):
        """Return True if movement has happened within the rearm time."""
-        return self._value.data and \
+        return self._state and \
            (self.invalidate_after is None or
             self.invalidate_after > dt_util.utcnow())
--- a/homeassistant/components/calendar/init.py
+++ b/homeassistant/components/calendar/init.py
@@ -6,6 +6,8 @@ https://home-assistant.io/components/calendar/

 """
 import logging
+from datetime import timedelta
+
 import re

 from homeassistant.components.google import (CONF_OFFSET,
@@ -20,6 +22,7 @@ from homeassistant.util import dt

 _LOGGER = logging.getLogger(__name__)

+SCAN_INTERVAL = timedelta(seconds=60)
 DOMAIN = 'calendar'
 ENTITY_ID_FORMAT = DOMAIN + '.{}'

@@ -27,7 +30,7 @@ ENTITY_ID_FORMAT = DOMAIN + '.{}'
 def setup(hass, config):
    """Track states and offer events for calendars."""
    component = EntityComponent(
-        logging.getLogger(__name__), DOMAIN, hass, 60, DOMAIN)
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL, DOMAIN)

    component.setup(config)

@@ -144,10 +147,10 @@ class CalendarEventDevice(Entity):
        def _get_date(date):
            """Get the dateTime from date or dateTime as a local."""
            if 'date' in date:
-                return dt.as_utc(dt.dt.datetime.combine(
-                    dt.parse_date(date['date']), dt.dt.time()))
+                return dt.start_of_local_day(dt.dt.datetime.combine(
+                    dt.parse_date(date['date']), dt.dt.time.min))
            else:
-                return dt.parse_datetime(date['dateTime'])
+                return dt.as_local(dt.parse_datetime(date['dateTime']))

        start = _get_date(self.data.event['start'])
        end = _get_date(self.data.event['end'])
--- a/homeassistant/components/calendar/google.py
+++ b/homeassistant/components/calendar/google.py
@@ -66,7 +66,7 @@ class GoogleCalendarData(object):
        """Get the latest data."""
        service = self.calendar_service.get()
        params = dict(DEFAULT_GOOGLE_SEARCH_PARAMS)
-        params['timeMin'] = dt.utcnow().isoformat('T')
+        params['timeMin'] = dt.now().isoformat('T')
        params['calendarId'] = self.calendar_id
        if self.search:
            params['q'] = self.search
--- a/homeassistant/components/camera/init.py
+++ b/homeassistant/components/camera/init.py
@@ -6,18 +6,31 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/camera/
 """
 import asyncio
+import collections
+from datetime import timedelta
 import logging
+import hashlib
+from random import SystemRandom

+import aiohttp
 from aiohttp import web
+import async_timeout

+from homeassistant.core import callback
+from homeassistant.const import ATTR_ENTITY_PICTURE
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.components.http import HomeAssistantView, KEY_AUTHENTICATED
+from homeassistant.helpers.event import async_track_time_interval
+
+_LOGGER = logging.getLogger(__name__)

 DOMAIN = 'camera'
 DEPENDENCIES = ['http']
-SCAN_INTERVAL = 30
+SCAN_INTERVAL = timedelta(seconds=30)
 ENTITY_ID_FORMAT = DOMAIN + '.{}'

 STATE_RECORDING = 'recording'
@@ -26,17 +39,63 @@ STATE_IDLE = 'idle'

 ENTITY_IMAGE_URL = '/api/camera_proxy/{0}?token={1}'

+TOKEN_CHANGE_INTERVAL = timedelta(minutes=5)
+_RND = SystemRandom()
+
+
+@asyncio.coroutine
+def async_get_image(hass, entity_id, timeout=10):
+    """Fetch a image from a camera entity."""
+    websession = async_get_clientsession(hass)
+    state = hass.states.get(entity_id)
+
+    if state is None:
+        raise HomeAssistantError(
+            "No entity '{0}' for grab a image".format(entity_id))
+
+    url = "{0}{1}".format(
+        hass.config.api.base_url,
+        state.attributes.get(ATTR_ENTITY_PICTURE)
+    )
+
+    response = None
+    try:
+        with async_timeout.timeout(timeout, loop=hass.loop):
+            response = yield from websession.get(url)
+
+            if response.status != 200:
+                raise HomeAssistantError("Error {0} on {1}".format(
+                    response.status, url))
+
+            image = yield from response.read()
+            return image
+
+    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        raise HomeAssistantError("Can't connect to {0}".format(url))
+
+    finally:
+        if response is not None:
+            yield from response.release()
+

@asyncio.coroutine
 def async_setup(hass, config):
    """Setup the camera component."""
-    component = EntityComponent(
-        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
+    component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)

    hass.http.register_view(CameraImageView(component.entities))
    hass.http.register_view(CameraMjpegStream(component.entities))

    yield from component.async_setup(config)
+
+    @callback
+    def update_tokens(time):
+        """Update tokens of the entities."""
+        for entity in component.entities.values():
+            entity.async_update_token()
+            hass.async_add_job(entity.async_update_ha_state())
+
+    async_track_time_interval(hass, update_tokens, TOKEN_CHANGE_INTERVAL)
    return True


@@ -46,11 +105,8 @@ class Camera(Entity):
    def __init__(self):
        """Initialize a camera."""
        self.is_streaming = False
-
-    @property
-    def access_token(self):
-        """Access token for this camera."""
-        return str(id(self))
+        self.access_tokens = collections.deque([], 2)
+        self.async_update_token()

    @property
    def should_poll(self):
@@ -60,7 +116,7 @@ class Camera(Entity):
    @property
    def entity_picture(self):
        """Return a link to the camera feed as entity picture."""
-        return ENTITY_IMAGE_URL.format(self.entity_id, self.access_token)
+        return ENTITY_IMAGE_URL.format(self.entity_id, self.access_tokens[-1])

    @property
    def is_recording(self):
@@ -81,15 +137,12 @@ class Camera(Entity):
        """Return bytes of camera image."""
        raise NotImplementedError()

-    @asyncio.coroutine
    def async_camera_image(self):
        """Return bytes of camera image.

-        This method must be run in the event loop.
+        This method must be run in the event loop and returns a coroutine.
        """
-        image = yield from self.hass.loop.run_in_executor(
-            None, self.camera_image)
-        return image
+        return self.hass.loop.run_in_executor(None, self.camera_image)

    @asyncio.coroutine
    def handle_async_mjpeg_stream(self, request):
@@ -131,8 +184,14 @@ class Camera(Entity):
                    yield from response.drain()

                yield from asyncio.sleep(.5)
+
+        except (asyncio.CancelledError, ConnectionResetError):
+            _LOGGER.debug("Close stream by frontend.")
+            response = None
+
        finally:
-            yield from response.write_eof()
+            if response is not None:
+                yield from response.write_eof()

    @property
    def state(self):
@@ -148,7 +207,7 @@ class Camera(Entity):
    def state_attributes(self):
        """Camera state attributes."""
        attr = {
-            'access_token': self.access_token,
+            'access_token': self.access_tokens[-1],
        }

        if self.model:
@@ -159,6 +218,13 @@ class Camera(Entity):

        return attr

+    @callback
+    def async_update_token(self):
+        """Update the used token."""
+        self.access_tokens.append(
+            hashlib.sha256(
+                _RND.getrandbits(256).to_bytes(32, 'little')).hexdigest())
+

 class CameraView(HomeAssistantView):
    """Base CameraView."""
@@ -175,10 +241,11 @@ class CameraView(HomeAssistantView):
        camera = self.entities.get(entity_id)

        if camera is None:
-            return web.Response(status=404)
+            status = 404 if request[KEY_AUTHENTICATED] else 401
+            return web.Response(status=status)

        authenticated = (request[KEY_AUTHENTICATED] or
-                         request.GET.get('token') == camera.access_token)
+                         request.GET.get('token') in camera.access_tokens)

        if not authenticated:
            return web.Response(status=401)
@@ -201,12 +268,16 @@ class CameraImageView(CameraView):
    @asyncio.coroutine
    def handle(self, request, camera):
        """Serve camera image."""
-        image = yield from camera.async_camera_image()
+        try:
+            image = yield from camera.async_camera_image()

-        if image is None:
-            return web.Response(status=500)
+            if image is None:
+                return web.Response(status=500)

-        return web.Response(body=image)
+            return web.Response(body=image)
+
+        except asyncio.CancelledError:
+            _LOGGER.debug("Close stream by frontend.")


 class CameraMjpegStream(CameraView):
--- a/homeassistant/components/camera/amcrest.py
+++ b/homeassistant/components/camera/amcrest.py
@@ -4,8 +4,10 @@ This component provides basic support for Amcrest IP cameras.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/camera.amcrest/
 """
+import asyncio
 import logging

+import aiohttp
 import voluptuous as vol

 import homeassistant.loader as loader
@@ -13,16 +15,20 @@ from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
 from homeassistant.const import (
    CONF_HOST, CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import (
+    async_get_clientsession, async_aiohttp_proxy_stream)

-REQUIREMENTS = ['amcrest==1.0.0']
+REQUIREMENTS = ['amcrest==1.1.4']

 _LOGGER = logging.getLogger(__name__)

 CONF_RESOLUTION = 'resolution'
+CONF_STREAM_SOURCE = 'stream_source'

 DEFAULT_NAME = 'Amcrest Camera'
 DEFAULT_PORT = 80
 DEFAULT_RESOLUTION = 'high'
+DEFAULT_STREAM_SOURCE = 'mjpeg'

 NOTIFICATION_ID = 'amcrest_notification'
 NOTIFICATION_TITLE = 'Amcrest Camera Setup'
@@ -32,6 +38,14 @@ RESOLUTION_LIST = {
    'low': 1,
 }

+STREAM_SOURCE_LIST = {
+    'mjpeg': 0,
+    'snapshot': 1
+}
+
+CONTENT_TYPE_HEADER = 'Content-Type'
+TIMEOUT = 5
+
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_HOST): cv.string,
    vol.Required(CONF_USERNAME): cv.string,
@@ -40,19 +54,21 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
        vol.All(vol.In(RESOLUTION_LIST)),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+    vol.Optional(CONF_STREAM_SOURCE, default=DEFAULT_STREAM_SOURCE):
+        vol.All(vol.In(STREAM_SOURCE_LIST)),
 })


 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up an Amcrest IP Camera."""
    from amcrest import AmcrestCamera
-    data = AmcrestCamera(
+    camera = AmcrestCamera(
        config.get(CONF_HOST), config.get(CONF_PORT),
-        config.get(CONF_USERNAME), config.get(CONF_PASSWORD))
+        config.get(CONF_USERNAME), config.get(CONF_PASSWORD)).camera

    persistent_notification = loader.get_component('persistent_notification')
    try:
-        data.camera.current_time
+        camera.current_time
    # pylint: disable=broad-except
    except Exception as ex:
        _LOGGER.error("Unable to connect to Amcrest camera: %s", str(ex))
@@ -64,26 +80,53 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            notification_id=NOTIFICATION_ID)
        return False

-    add_devices([AmcrestCam(config, data)])
+    add_devices([AmcrestCam(hass, config, camera)])
    return True


 class AmcrestCam(Camera):
    """An implementation of an Amcrest IP camera."""

-    def __init__(self, device_info, data):
+    def __init__(self, hass, device_info, camera):
        """Initialize an Amcrest camera."""
        super(AmcrestCam, self).__init__()
-        self._data = data
+        self._camera = camera
+        self._base_url = self._camera.get_base_url()
+        self._hass = hass
        self._name = device_info.get(CONF_NAME)
        self._resolution = RESOLUTION_LIST[device_info.get(CONF_RESOLUTION)]
+        self._stream_source = STREAM_SOURCE_LIST[
+            device_info.get(CONF_STREAM_SOURCE)
+        ]
+        self._token = self._auth = aiohttp.BasicAuth(
+            device_info.get(CONF_USERNAME),
+            password=device_info.get(CONF_PASSWORD)
+        )

    def camera_image(self):
        """Return a still image reponse from the camera."""
        # Send the request to snap a picture and return raw jpg data
-        response = self._data.camera.snapshot(channel=self._resolution)
+        response = self._camera.snapshot(channel=self._resolution)
        return response.data

+    @asyncio.coroutine
+    def handle_async_mjpeg_stream(self, request):
+        """Return an MJPEG stream."""
+        # The snapshot implementation is handled by the parent class
+        if self._stream_source == STREAM_SOURCE_LIST['snapshot']:
+            yield from super().handle_async_mjpeg_stream(request)
+            return
+
+        # Otherwise, stream an MJPEG image stream directly from the camera
+        websession = async_get_clientsession(self.hass)
+        streaming_url = '{0}mjpg/video.cgi?channel=0&subtype={1}'.format(
+            self._base_url, self._resolution)
+
+        stream_coro = websession.get(
+            streaming_url, auth=self._token, timeout=TIMEOUT)
+
+        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+
    @property
    def name(self):
        """Return the name of this camera."""
--- a/homeassistant/components/camera/ffmpeg.py
+++ b/homeassistant/components/camera/ffmpeg.py
@@ -12,10 +12,9 @@ from aiohttp import web

 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
 from homeassistant.components.ffmpeg import (
-    async_run_test, get_binary, CONF_INPUT, CONF_EXTRA_ARGUMENTS)
+    DATA_FFMPEG, CONF_INPUT, CONF_EXTRA_ARGUMENTS)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.const import CONF_NAME
-from homeassistant.util.async import run_coroutine_threadsafe

 DEPENDENCIES = ['ffmpeg']

@@ -33,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Setup a FFmpeg Camera."""
-    if not async_run_test(hass, config.get(CONF_INPUT)):
+    if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_INPUT)):
        return
    yield from async_add_devices([FFmpegCamera(hass, config)])

@@ -44,20 +43,17 @@ class FFmpegCamera(Camera):
    def __init__(self, hass, config):
        """Initialize a FFmpeg camera."""
        super().__init__()
+
+        self._manager = hass.data[DATA_FFMPEG]
        self._name = config.get(CONF_NAME)
        self._input = config.get(CONF_INPUT)
        self._extra_arguments = config.get(CONF_EXTRA_ARGUMENTS)

-    def camera_image(self):
-        """Return bytes of camera image."""
-        return run_coroutine_threadsafe(
-            self.async_camera_image(), self.hass.loop).result()
-
    @asyncio.coroutine
    def async_camera_image(self):
        """Return a still image response from the camera."""
-        from haffmpeg import ImageSingleAsync, IMAGE_JPEG
-        ffmpeg = ImageSingleAsync(get_binary(), loop=self.hass.loop)
+        from haffmpeg import ImageFrame, IMAGE_JPEG
+        ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)

        image = yield from ffmpeg.get_image(
            self._input, output_format=IMAGE_JPEG,
@@ -67,9 +63,9 @@ class FFmpegCamera(Camera):
    @asyncio.coroutine
    def handle_async_mjpeg_stream(self, request):
        """Generate an HTTP MJPEG stream from the camera."""
-        from haffmpeg import CameraMjpegAsync
+        from haffmpeg import CameraMjpeg

-        stream = CameraMjpegAsync(get_binary(), loop=self.hass.loop)
+        stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
        yield from stream.open_camera(
            self._input, extra_cmd=self._extra_arguments)

@@ -84,9 +80,15 @@ class FFmpegCamera(Camera):
                if not data:
                    break
                response.write(data)
+
+        except asyncio.CancelledError:
+            _LOGGER.debug("Close stream by frontend.")
+            response = None
+
        finally:
-            self.hass.async_add_job(stream.close())
-            yield from response.write_eof()
+            yield from stream.close()
+            if response is not None:
+                yield from response.write_eof()

    @property
    def name(self):
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -118,12 +118,13 @@ class GenericCamera(Camera):
                _LOGGER.error('Timeout getting camera image')
                return self._last_image
            except (aiohttp.errors.ClientError,
-                    aiohttp.errors.ClientDisconnectedError) as err:
+                    aiohttp.errors.DisconnectedError,
+                    aiohttp.errors.HttpProcessingError) as err:
                _LOGGER.error('Error getting new camera image: %s', err)
                return self._last_image
            finally:
                if response is not None:
-                    self.hass.async_add_job(response.release())
+                    yield from response.release()

        self._last_url = url
        return self._last_image
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -9,8 +9,6 @@ import logging
 from contextlib import closing

 import aiohttp
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPGatewayTimeout
 import async_timeout
 import requests
 from requests.auth import HTTPBasicAuth, HTTPDigestAuth
@@ -20,18 +18,21 @@ from homeassistant.const import (
    CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_AUTHENTICATION,
    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
 from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.aiohttp_client import (
+    async_get_clientsession, async_aiohttp_proxy_stream)
 from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)

 CONF_MJPEG_URL = 'mjpeg_url'
+CONF_STILL_IMAGE_URL = 'still_image_url'
 CONTENT_TYPE_HEADER = 'Content-Type'

 DEFAULT_NAME = 'Mjpeg Camera'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_MJPEG_URL): cv.url,
+    vol.Optional(CONF_STILL_IMAGE_URL): cv.url,
    vol.Optional(CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION):
        vol.In([HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION]),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -70,6 +71,7 @@ class MjpegCamera(Camera):
        self._username = device_info.get(CONF_USERNAME)
        self._password = device_info.get(CONF_PASSWORD)
        self._mjpeg_url = device_info[CONF_MJPEG_URL]
+        self._still_image_url = device_info.get(CONF_STILL_IMAGE_URL)

        self._auth = None
        if self._username and self._password:
@@ -78,6 +80,37 @@ class MjpegCamera(Camera):
                    self._username, password=self._password
                )

+    @asyncio.coroutine
+    def async_camera_image(self):
+        """Return a still image response from the camera."""
+        # DigestAuth is not supported
+        if self._authentication == HTTP_DIGEST_AUTHENTICATION or \
+           self._still_image_url is None:
+            image = yield from self.hass.loop.run_in_executor(
+                None, self.camera_image)
+            return image
+
+        websession = async_get_clientsession(self.hass)
+        response = None
+        try:
+            with async_timeout.timeout(10, loop=self.hass.loop):
+                response = yield from websession.get(
+                    self._still_image_url, auth=self._auth)
+
+                image = yield from response.read()
+                return image
+
+        except asyncio.TimeoutError:
+            _LOGGER.error('Timeout getting camera image')
+
+        except (aiohttp.errors.ClientError,
+                aiohttp.errors.ClientDisconnectedError) as err:
+            _LOGGER.error('Error getting new camera image: %s', err)
+
+        finally:
+            if response is not None:
+                yield from response.release()
+
    def camera_image(self):
        """Return a still image response from the camera."""
        if self._username and self._password:
@@ -103,32 +136,9 @@ class MjpegCamera(Camera):

        # connect to stream
        websession = async_get_clientsession(self.hass)
-        stream = None
-        response = None
-        try:
-            with async_timeout.timeout(10, loop=self.hass.loop):
-                stream = yield from websession.get(self._mjpeg_url,
-                                                   auth=self._auth)
+        stream_coro = websession.get(self._mjpeg_url, auth=self._auth)

-            response = web.StreamResponse()
-            response.content_type = stream.headers.get(CONTENT_TYPE_HEADER)
-
-            yield from response.prepare(request)
-
-            while True:
-                data = yield from stream.content.read(102400)
-                if not data:
-                    break
-                response.write(data)
-
-        except asyncio.TimeoutError:
-            raise HTTPGatewayTimeout()
-
-        finally:
-            if stream is not None:
-                self.hass.async_add_job(stream.release())
-            if response is not None:
-                yield from response.write_eof()
+        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)

    @property
    def name(self):
--- a/homeassistant/components/camera/nest.py
+++ b/homeassistant/components/camera/nest.py
@@ -27,7 +27,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    if discovery_info is None:
        return

-    camera_devices = hass.data[nest.DATA_NEST].camera_devices()
+    camera_devices = hass.data[nest.DATA_NEST].cameras()
    cameras = [NestCamera(structure, device)
               for structure, device in camera_devices]
    add_devices(cameras, True)
@@ -43,7 +43,7 @@ class NestCamera(Camera):
        self.device = device
        self._location = None
        self._name = None
-        self._is_online = None
+        self._online = None
        self._is_streaming = None
        self._is_video_history_enabled = False
        # Default to non-NestAware subscribed, but will be fixed during update
@@ -76,7 +76,7 @@ class NestCamera(Camera):
        """Cache value from Python-nest."""
        self._location = self.device.where
        self._name = self.device.name
-        self._is_online = self.device.is_online
+        self._online = self.device.online
        self._is_streaming = self.device.is_streaming
        self._is_video_history_enabled = self.device.is_video_history_enabled

--- a/homeassistant/components/camera/netatmo.py
+++ b/homeassistant/components/camera/netatmo.py
@@ -1,15 +1,16 @@
 """
-Support for the Netatmo Welcome camera.
+Support for the Netatmo cameras.

 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/camera.netatmo/
+https://home-assistant.io/components/camera.netatmo/.
 """
 import logging

 import requests
 import voluptuous as vol

-from homeassistant.components.netatmo import WelcomeData
+from homeassistant.const import CONF_VERIFY_SSL
+from homeassistant.components.netatmo import CameraData
 from homeassistant.components.camera import (Camera, PLATFORM_SCHEMA)
 from homeassistant.loader import get_component
 from homeassistant.helpers import config_validation as cv
@@ -22,6 +23,7 @@ CONF_HOME = 'home'
 CONF_CAMERAS = 'cameras'

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
    vol.Optional(CONF_HOME): cv.string,
    vol.Optional(CONF_CAMERAS, default=[]):
        vol.All(cv.ensure_list, [cv.string]),
@@ -30,41 +32,46 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({

 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup access to Netatmo Welcome cameras."""
+    """Setup access to Netatmo cameras."""
    netatmo = get_component('netatmo')
    home = config.get(CONF_HOME)
+    verify_ssl = config.get(CONF_VERIFY_SSL, True)
    import lnetatmo
    try:
-        data = WelcomeData(netatmo.NETATMO_AUTH, home)
+        data = CameraData(netatmo.NETATMO_AUTH, home)
        for camera_name in data.get_camera_names():
+            camera_type = data.get_camera_type(camera=camera_name, home=home)
            if CONF_CAMERAS in config:
                if config[CONF_CAMERAS] != [] and \
                   camera_name not in config[CONF_CAMERAS]:
                    continue
-            add_devices([WelcomeCamera(data, camera_name, home)])
+            add_devices([NetatmoCamera(data, camera_name, home,
+                                       camera_type, verify_ssl)])
    except lnetatmo.NoDevice:
        return None


-class WelcomeCamera(Camera):
-    """Representation of the images published from Welcome camera."""
+class NetatmoCamera(Camera):
+    """Representation of the images published from a Netatmo camera."""

-    def __init__(self, data, camera_name, home):
+    def __init__(self, data, camera_name, home, camera_type, verify_ssl):
        """Setup for access to the Netatmo camera images."""
-        super(WelcomeCamera, self).__init__()
+        super(NetatmoCamera, self).__init__()
        self._data = data
        self._camera_name = camera_name
+        self._verify_ssl = verify_ssl
        if home:
            self._name = home + ' / ' + camera_name
        else:
            self._name = camera_name
-        camera_id = data.welcomedata.cameraByName(camera=camera_name,
+        camera_id = data.camera_data.cameraByName(camera=camera_name,
                                                  home=home)['id']
        self._unique_id = "Welcome_camera {0} - {1}".format(self._name,
                                                            camera_id)
-        self._vpnurl, self._localurl = self._data.welcomedata.cameraUrls(
+        self._vpnurl, self._localurl = self._data.camera_data.cameraUrls(
            camera=camera_name
            )
+        self._cameratype = camera_type

    def camera_image(self):
        """Return a still image response from the camera."""
@@ -72,22 +79,43 @@ class WelcomeCamera(Camera):
            if self._localurl:
                response = requests.get('{0}/live/snapshot_720.jpg'.format(
                    self._localurl), timeout=10)
-            else:
+            elif self._vpnurl:
                response = requests.get('{0}/live/snapshot_720.jpg'.format(
-                    self._vpnurl), timeout=10)
+                    self._vpnurl), timeout=10, verify=self._verify_ssl)
+            else:
+                _LOGGER.error('Welcome VPN url is None')
+                self._data.update()
+                (self._vpnurl, self._localurl) = \
+                    self._data.camera_data.cameraUrls(camera=self._camera_name)
+                return None
        except requests.exceptions.RequestException as error:
-            _LOGGER.error('Welcome VPN url changed: %s', error)
+            _LOGGER.error('Welcome url changed: %s', error)
            self._data.update()
            (self._vpnurl, self._localurl) = \
-                self._data.welcomedata.cameraUrls(camera=self._camera_name)
+                self._data.camera_data.cameraUrls(camera=self._camera_name)
            return None
        return response.content

    @property
    def name(self):
-        """Return the name of this Netatmo Welcome device."""
+        """Return the name of this Netatmo camera device."""
        return self._name

+    @property
+    def brand(self):
+        """Camera brand."""
+        return "Netatmo"
+
+    @property
+    def model(self):
+        """Camera model."""
+        if self._cameratype == "NOC":
+            return "Presence"
+        elif self._cameratype == "NACamera":
+            return "Welcome"
+        else:
+            return None
+
    @property
    def unique_id(self):
        """Return the unique ID for this sensor."""
--- a/homeassistant/components/camera/synology.py
+++ b/homeassistant/components/camera/synology.py
@@ -10,8 +10,6 @@ import logging
 import voluptuous as vol

 import aiohttp
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPGatewayTimeout
 import async_timeout

 from homeassistant.const import (
@@ -20,7 +18,8 @@ from homeassistant.const import (
 from homeassistant.components.camera import (
    Camera, PLATFORM_SCHEMA)
 from homeassistant.helpers.aiohttp_client import (
-    async_get_clientsession, async_create_clientsession)
+    async_get_clientsession, async_create_clientsession,
+    async_aiohttp_proxy_stream)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.async import run_coroutine_threadsafe

@@ -253,34 +252,10 @@ class SynologyCamera(Camera):
            'cameraId': self._camera_id,
            'format': 'mjpeg'
        }
-        stream = None
-        response = None
-        try:
-            with async_timeout.timeout(TIMEOUT, loop=self.hass.loop):
-                stream = yield from self._websession.get(
-                    streaming_url,
-                    params=streaming_payload
-                )
-            response = web.StreamResponse()
-            response.content_type = stream.headers.get(CONTENT_TYPE_HEADER)
+        stream_coro = self._websession.get(
+            streaming_url, params=streaming_payload)

-            yield from response.prepare(request)
-
-            while True:
-                data = yield from stream.content.read(102400)
-                if not data:
-                    break
-                response.write(data)
-
-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
-            _LOGGER.exception("Error on %s", streaming_url)
-            raise HTTPGatewayTimeout()
-
-        finally:
-            if stream is not None:
-                self.hass.async_add_job(stream.release())
-            if response is not None:
-                yield from response.write_eof()
+        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)

    @property
    def name(self):
--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -14,7 +14,7 @@ from homeassistant.const import CONF_PORT
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['uvcclient==0.9.0']
+REQUIREMENTS = ['uvcclient==0.10.0']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/camera/zoneminder.py
+++ b/homeassistant/components/camera/zoneminder.py
@@ -0,0 +1,78 @@
+"""
+Support for ZoneMinder camera streaming.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.zoneminder/
+"""
+import asyncio
+import logging
+from urllib.parse import urljoin, urlencode
+
+from homeassistant.const import CONF_NAME
+from homeassistant.components.camera.mjpeg import (
+    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera)
+
+import homeassistant.components.zoneminder as zoneminder
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['zoneminder']
+DOMAIN = 'zoneminder'
+
+
+def _get_image_url(hass, monitor, mode):
+    zm_data = hass.data[DOMAIN]
+    query = urlencode({
+        'mode': mode,
+        'buffer': monitor['StreamReplayBuffer'],
+        'monitor': monitor['Id'],
+    })
+    url = '{zms_url}?{query}'.format(
+        zms_url=urljoin(zm_data['server_origin'], zm_data['path_zms']),
+        query=query,
+    )
+    _LOGGER.debug('Monitor %s %s URL (without auth): %s',
+                  monitor['Id'], mode, url)
+
+    if not zm_data['username']:
+        return url
+
+    url += '&user={:s}'.format(zm_data['username'])
+
+    if not zm_data['password']:
+        return url
+
+    return url + '&pass={:s}'.format(zm_data['password'])
+
+
+@asyncio.coroutine
+# pylint: disable=unused-argument
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Setup ZoneMinder cameras."""
+    cameras = []
+    monitors = zoneminder.get_state('api/monitors.json')
+    if not monitors:
+        _LOGGER.warning('Could not fetch monitors from ZoneMinder')
+        return
+
+    for i in monitors['monitors']:
+        monitor = i['Monitor']
+
+        if monitor['Function'] == 'None':
+            _LOGGER.info('Skipping camera %s', monitor['Id'])
+            continue
+
+        _LOGGER.info('Initializing camera %s', monitor['Id'])
+
+        device_info = {
+            CONF_NAME: monitor['Name'],
+            CONF_MJPEG_URL: _get_image_url(hass, monitor, 'jpeg'),
+            CONF_STILL_IMAGE_URL: _get_image_url(hass, monitor, 'single')
+        }
+        cameras.append(MjpegCamera(hass, device_info))
+
+    if not cameras:
+        _LOGGER.warning('No active cameras found')
+        return
+
+    yield from async_add_devices(cameras)
--- a/homeassistant/components/climate/init.py
+++ b/homeassistant/components/climate/init.py
@@ -4,15 +4,18 @@ Provides functionality to interact with climate devices.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/climate/
 """
+import asyncio
+from datetime import timedelta
 import logging
 import os
+import functools as ft
 from numbers import Number
-import voluptuous as vol

-from homeassistant.helpers.entity_component import EntityComponent
+import voluptuous as vol

 from homeassistant.config import load_yaml_config_file
 from homeassistant.util.temperature import convert as convert_temperature
+from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 import homeassistant.helpers.config_validation as cv
@@ -23,12 +26,13 @@ from homeassistant.const import (
 DOMAIN = "climate"

 ENTITY_ID_FORMAT = DOMAIN + ".{}"
-SCAN_INTERVAL = 60
+SCAN_INTERVAL = timedelta(seconds=60)

 SERVICE_SET_AWAY_MODE = "set_away_mode"
 SERVICE_SET_AUX_HEAT = "set_aux_heat"
 SERVICE_SET_TEMPERATURE = "set_temperature"
 SERVICE_SET_FAN_MODE = "set_fan_mode"
+SERVICE_SET_HOLD_MODE = "set_hold_mode"
 SERVICE_SET_OPERATION_MODE = "set_operation_mode"
 SERVICE_SET_SWING_MODE = "set_swing_mode"
 SERVICE_SET_HUMIDITY = "set_humidity"
@@ -53,6 +57,7 @@ ATTR_CURRENT_HUMIDITY = "current_humidity"
 ATTR_HUMIDITY = "humidity"
 ATTR_MAX_HUMIDITY = "max_humidity"
 ATTR_MIN_HUMIDITY = "min_humidity"
+ATTR_HOLD_MODE = "hold_mode"
 ATTR_OPERATION_MODE = "operation_mode"
 ATTR_OPERATION_LIST = "operation_list"
 ATTR_SWING_MODE = "swing_mode"
@@ -90,6 +95,10 @@ SET_FAN_MODE_SCHEMA = vol.Schema({
    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
    vol.Required(ATTR_FAN_MODE): cv.string,
 })
+SET_HOLD_MODE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_HOLD_MODE): cv.string,
+})
 SET_OPERATION_MODE_SCHEMA = vol.Schema({
    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
    vol.Required(ATTR_OPERATION_MODE): cv.string,
@@ -116,6 +125,18 @@ def set_away_mode(hass, away_mode, entity_id=None):
    hass.services.call(DOMAIN, SERVICE_SET_AWAY_MODE, data)


+def set_hold_mode(hass, hold_mode, entity_id=None):
+    """Set new hold mode."""
+    data = {
+        ATTR_HOLD_MODE: hold_mode
+    }
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_SET_HOLD_MODE, data)
+
+
 def set_aux_heat(hass, aux_heat, entity_id=None):
    """Turn all or specified climate devices auxillary heater on."""
    data = {
@@ -185,69 +206,95 @@ def set_swing_mode(hass, swing_mode, entity_id=None):
    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)


-def setup(hass, config):
+@asyncio.coroutine
+def async_setup(hass, config):
    """Setup climate devices."""
    component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
-    component.setup(config)
+    yield from component.async_setup(config)

-    descriptions = load_yaml_config_file(
+    descriptions = yield from hass.loop.run_in_executor(
+        None, load_yaml_config_file,
        os.path.join(os.path.dirname(__file__), 'services.yaml'))

-    def away_mode_set_service(service):
+    @asyncio.coroutine
+    def _async_update_climate(target_climate):
+        """Update climate entity after service stuff."""
+        update_tasks = []
+        for climate in target_climate:
+            if not climate.should_poll:
+                continue
+
+            update_coro = hass.loop.create_task(
+                climate.async_update_ha_state(True))
+            if hasattr(climate, 'async_update'):
+                update_tasks.append(update_coro)
+            else:
+                yield from update_coro
+
+        if update_tasks:
+            yield from asyncio.wait(update_tasks, loop=hass.loop)
+
+    @asyncio.coroutine
+    def async_away_mode_set_service(service):
        """Set away mode on target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        away_mode = service.data.get(ATTR_AWAY_MODE)

-        if away_mode is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_AWAY_MODE, ATTR_AWAY_MODE)
-            return
-
        for climate in target_climate:
            if away_mode:
-                climate.turn_away_mode_on()
+                yield from climate.async_turn_away_mode_on()
            else:
-                climate.turn_away_mode_off()
+                yield from climate.async_turn_away_mode_off()

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_AWAY_MODE, away_mode_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_AWAY_MODE, async_away_mode_set_service,
        descriptions.get(SERVICE_SET_AWAY_MODE),
        schema=SET_AWAY_MODE_SCHEMA)

-    def aux_heat_set_service(service):
+    @asyncio.coroutine
+    def async_hold_mode_set_service(service):
+        """Set hold mode on target climate devices."""
+        target_climate = component.async_extract_from_service(service)
+
+        hold_mode = service.data.get(ATTR_HOLD_MODE)
+
+        for climate in target_climate:
+            yield from climate.async_set_hold_mode(hold_mode)
+
+        yield from _async_update_climate(target_climate)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_HOLD_MODE, async_hold_mode_set_service,
+        descriptions.get(SERVICE_SET_HOLD_MODE),
+        schema=SET_HOLD_MODE_SCHEMA)
+
+    @asyncio.coroutine
+    def async_aux_heat_set_service(service):
        """Set auxillary heater on target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        aux_heat = service.data.get(ATTR_AUX_HEAT)

-        if aux_heat is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_AUX_HEAT, ATTR_AUX_HEAT)
-            return
-
        for climate in target_climate:
            if aux_heat:
-                climate.turn_aux_heat_on()
+                yield from climate.async_turn_aux_heat_on()
            else:
-                climate.turn_aux_heat_off()
+                yield from climate.async_turn_aux_heat_off()

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_AUX_HEAT, aux_heat_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_AUX_HEAT, async_aux_heat_set_service,
        descriptions.get(SERVICE_SET_AUX_HEAT),
        schema=SET_AUX_HEAT_SCHEMA)

-    def temperature_set_service(service):
+    @asyncio.coroutine
+    def async_temperature_set_service(service):
        """Set temperature on the target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        for climate in target_climate:
            kwargs = {}
@@ -261,106 +308,83 @@ def setup(hass, config):
                else:
                    kwargs[value] = temp

-            climate.set_temperature(**kwargs)
-            if climate.should_poll:
-                climate.update_ha_state(True)
+            yield from climate.async_set_temperature(**kwargs)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_TEMPERATURE, temperature_set_service,
+        yield from _async_update_climate(target_climate)
+
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_TEMPERATURE, async_temperature_set_service,
        descriptions.get(SERVICE_SET_TEMPERATURE),
        schema=SET_TEMPERATURE_SCHEMA)

-    def humidity_set_service(service):
+    @asyncio.coroutine
+    def async_humidity_set_service(service):
        """Set humidity on the target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        humidity = service.data.get(ATTR_HUMIDITY)

-        if humidity is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_HUMIDITY, ATTR_HUMIDITY)
-            return
-
        for climate in target_climate:
-            climate.set_humidity(humidity)
+            yield from climate.async_set_humidity(humidity)

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_HUMIDITY, humidity_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_HUMIDITY, async_humidity_set_service,
        descriptions.get(SERVICE_SET_HUMIDITY),
        schema=SET_HUMIDITY_SCHEMA)

-    def fan_mode_set_service(service):
+    @asyncio.coroutine
+    def async_fan_mode_set_service(service):
        """Set fan mode on target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        fan = service.data.get(ATTR_FAN_MODE)

-        if fan is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_FAN_MODE, ATTR_FAN_MODE)
-            return
-
        for climate in target_climate:
-            climate.set_fan_mode(fan)
+            yield from climate.async_set_fan_mode(fan)

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_FAN_MODE, fan_mode_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_FAN_MODE, async_fan_mode_set_service,
        descriptions.get(SERVICE_SET_FAN_MODE),
        schema=SET_FAN_MODE_SCHEMA)

-    def operation_set_service(service):
+    @asyncio.coroutine
+    def async_operation_set_service(service):
        """Set operating mode on the target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        operation_mode = service.data.get(ATTR_OPERATION_MODE)

-        if operation_mode is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_OPERATION_MODE, ATTR_OPERATION_MODE)
-            return
-
        for climate in target_climate:
-            climate.set_operation_mode(operation_mode)
+            yield from climate.async_set_operation_mode(operation_mode)

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_OPERATION_MODE, operation_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_OPERATION_MODE, async_operation_set_service,
        descriptions.get(SERVICE_SET_OPERATION_MODE),
        schema=SET_OPERATION_MODE_SCHEMA)

-    def swing_set_service(service):
+    @asyncio.coroutine
+    def async_swing_set_service(service):
        """Set swing mode on the target climate devices."""
-        target_climate = component.extract_from_service(service)
+        target_climate = component.async_extract_from_service(service)

        swing_mode = service.data.get(ATTR_SWING_MODE)

-        if swing_mode is None:
-            _LOGGER.error(
-                "Received call to %s without attribute %s",
-                SERVICE_SET_SWING_MODE, ATTR_SWING_MODE)
-            return
-
        for climate in target_climate:
-            climate.set_swing_mode(swing_mode)
+            yield from climate.async_set_swing_mode(swing_mode)

-            if climate.should_poll:
-                climate.update_ha_state(True)
+        yield from _async_update_climate(target_climate)

-    hass.services.register(
-        DOMAIN, SERVICE_SET_SWING_MODE, swing_set_service,
+    hass.services.async_register(
+        DOMAIN, SERVICE_SET_SWING_MODE, async_swing_set_service,
        descriptions.get(SERVICE_SET_SWING_MODE),
        schema=SET_SWING_MODE_SCHEMA)
+
    return True


@@ -421,6 +445,10 @@ class ClimateDevice(Entity):
            if self.operation_list:
                data[ATTR_OPERATION_LIST] = self.operation_list

+        is_hold = self.current_hold_mode
+        if is_hold is not None:
+            data[ATTR_HOLD_MODE] = is_hold
+
        swing_mode = self.current_swing_mode
        if swing_mode is not None:
            data[ATTR_SWING_MODE] = swing_mode
@@ -492,6 +520,11 @@ class ClimateDevice(Entity):
        """Return true if away mode is on."""
        return None

+    @property
+    def current_hold_mode(self):
+        """Return the current hold mode, e.g., home, away, temp."""
+        return None
+
    @property
    def is_aux_heat_on(self):
        """Return true if aux heater."""
@@ -521,38 +554,122 @@ class ClimateDevice(Entity):
        """Set new target temperature."""
        raise NotImplementedError()

+    def async_set_temperature(self, **kwargs):
+        """Set new target temperature.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, ft.partial(self.set_temperature, **kwargs))
+
    def set_humidity(self, humidity):
        """Set new target humidity."""
        raise NotImplementedError()

+    def async_set_humidity(self, humidity):
+        """Set new target humidity.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.set_humidity, humidity)
+
    def set_fan_mode(self, fan):
        """Set new target fan mode."""
        raise NotImplementedError()

+    def async_set_fan_mode(self, fan):
+        """Set new target fan mode.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.set_fan_mode, fan)
+
    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
        raise NotImplementedError()

+    def async_set_operation_mode(self, operation_mode):
+        """Set new target operation mode.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.set_operation_mode, operation_mode)
+
    def set_swing_mode(self, swing_mode):
        """Set new target swing operation."""
        raise NotImplementedError()

+    def async_set_swing_mode(self, swing_mode):
+        """Set new target swing operation.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.set_swing_mode, swing_mode)
+
    def turn_away_mode_on(self):
        """Turn away mode on."""
        raise NotImplementedError()

+    def async_turn_away_mode_on(self):
+        """Turn away mode on.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.turn_away_mode_on)
+
    def turn_away_mode_off(self):
        """Turn away mode off."""
        raise NotImplementedError()

+    def async_turn_away_mode_off(self):
+        """Turn away mode off.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.turn_away_mode_off)
+
+    def set_hold_mode(self, hold_mode):
+        """Set new target hold mode."""
+        raise NotImplementedError()
+
+    def async_set_hold_mode(self, hold_mode):
+        """Set new target hold mode.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.set_hold_mode, hold_mode)
+
    def turn_aux_heat_on(self):
        """Turn auxillary heater on."""
        raise NotImplementedError()

+    def async_turn_aux_heat_on(self):
+        """Turn auxillary heater on.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.turn_aux_heat_on)
+
    def turn_aux_heat_off(self):
        """Turn auxillary heater off."""
        raise NotImplementedError()

+    def async_turn_aux_heat_off(self):
+        """Turn auxillary heater off.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        return self.hass.loop.run_in_executor(
+            None, self.turn_aux_heat_off)
+
    @property
    def min_temp(self):
        """Return the minimum temperature."""
--- a/homeassistant/components/climate/demo.py
+++ b/homeassistant/components/climate/demo.py
@@ -12,11 +12,11 @@ from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE
 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Demo climate devices."""
    add_devices([
-        DemoClimate("HeatPump", 68, TEMP_FAHRENHEIT, None, 77, "Auto Low",
-                    None, None, "Auto", "heat", None, None, None),
-        DemoClimate("Hvac", 21, TEMP_CELSIUS, True, 22, "On High",
+        DemoClimate("HeatPump", 68, TEMP_FAHRENHEIT, None, None, 77,
+                    "Auto Low", None, None, "Auto", "heat", None, None, None),
+        DemoClimate("Hvac", 21, TEMP_CELSIUS, True, None, 22, "On High",
                    67, 54, "Off", "cool", False, None, None),
-        DemoClimate("Ecobee", None, TEMP_CELSIUS, None, 23, "Auto Low",
+        DemoClimate("Ecobee", None, TEMP_CELSIUS, None, None, 23, "Auto Low",
                    None, None, "Auto", "auto", None, 24, 21)
    ])

@@ -25,7 +25,7 @@ class DemoClimate(ClimateDevice):
    """Representation of a demo climate device."""

    def __init__(self, name, target_temperature, unit_of_measurement,
-                 away, current_temperature, current_fan_mode,
+                 away, hold, current_temperature, current_fan_mode,
                 target_humidity, current_humidity, current_swing_mode,
                 current_operation, aux, target_temp_high, target_temp_low):
        """Initialize the climate device."""
@@ -34,6 +34,7 @@ class DemoClimate(ClimateDevice):
        self._target_humidity = target_humidity
        self._unit_of_measurement = unit_of_measurement
        self._away = away
+        self._hold = hold
        self._current_temperature = current_temperature
        self._current_humidity = current_humidity
        self._current_fan_mode = current_fan_mode
@@ -106,6 +107,11 @@ class DemoClimate(ClimateDevice):
        """Return if away mode is on."""
        return self._away

+    @property
+    def current_hold_mode(self):
+        """Return hold mode setting."""
+        return self._hold
+
    @property
    def is_aux_heat_on(self):
        """Return true if away mode is on."""
@@ -129,27 +135,27 @@ class DemoClimate(ClimateDevice):
           kwargs.get(ATTR_TARGET_TEMP_LOW) is not None:
            self._target_temperature_high = kwargs.get(ATTR_TARGET_TEMP_HIGH)
            self._target_temperature_low = kwargs.get(ATTR_TARGET_TEMP_LOW)
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def set_humidity(self, humidity):
        """Set new target temperature."""
        self._target_humidity = humidity
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def set_swing_mode(self, swing_mode):
        """Set new target temperature."""
        self._current_swing_mode = swing_mode
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def set_fan_mode(self, fan):
        """Set new target temperature."""
        self._current_fan_mode = fan
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def set_operation_mode(self, operation_mode):
        """Set new target temperature."""
        self._current_operation = operation_mode
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    @property
    def current_swing_mode(self):
@@ -164,19 +170,24 @@ class DemoClimate(ClimateDevice):
    def turn_away_mode_on(self):
        """Turn away mode on."""
        self._away = True
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def turn_away_mode_off(self):
        """Turn away mode off."""
        self._away = False
-        self.update_ha_state()
+        self.schedule_update_ha_state()
+
+    def set_hold_mode(self, hold):
+        """Update hold mode on."""
+        self._hold = hold
+        self.schedule_update_ha_state()

    def turn_aux_heat_on(self):
        """Turn away auxillary heater on."""
        self._aux = True
-        self.update_ha_state()
+        self.schedule_update_ha_state()

    def turn_aux_heat_off(self):
        """Turn auxillary heater off."""
        self._aux = False
-        self.update_ha_state()
+        self.schedule_update_ha_state()
--- a/homeassistant/components/climate/ecobee.py
+++ b/homeassistant/components/climate/ecobee.py
@@ -11,10 +11,10 @@ import voluptuous as vol

 from homeassistant.components import ecobee
 from homeassistant.components.climate import (
-    DOMAIN, STATE_COOL, STATE_HEAT, STATE_IDLE, ClimateDevice,
+    DOMAIN, STATE_COOL, STATE_HEAT, STATE_AUTO, STATE_IDLE, ClimateDevice,
    ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_HIGH)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, STATE_OFF, STATE_ON, TEMP_FAHRENHEIT)
+    ATTR_ENTITY_ID, STATE_OFF, STATE_ON, ATTR_TEMPERATURE, TEMP_FAHRENHEIT)
 from homeassistant.config import load_yaml_config_file
 import homeassistant.helpers.config_validation as cv

@@ -22,16 +22,25 @@ _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)

 ATTR_FAN_MIN_ON_TIME = 'fan_min_on_time'
+ATTR_RESUME_ALL = 'resume_all'
+
+DEFAULT_RESUME_ALL = False

 DEPENDENCIES = ['ecobee']

 SERVICE_SET_FAN_MIN_ON_TIME = 'ecobee_set_fan_min_on_time'
+SERVICE_RESUME_PROGRAM = 'ecobee_resume_program'

 SET_FAN_MIN_ON_TIME_SCHEMA = vol.Schema({
    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
    vol.Required(ATTR_FAN_MIN_ON_TIME): vol.Coerce(int),
 })

+RESUME_PROGRAM_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_RESUME_ALL, default=DEFAULT_RESUME_ALL): cv.boolean,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Ecobee Thermostat Platform."""
@@ -48,20 +57,35 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

    def fan_min_on_time_set_service(service):
        """Set the minimum fan on time on the target thermostats."""
-        entity_id = service.data.get('entity_id')
+        entity_id = service.data.get(ATTR_ENTITY_ID)
+        fan_min_on_time = service.data[ATTR_FAN_MIN_ON_TIME]

        if entity_id:
            target_thermostats = [device for device in devices
-                                  if device.entity_id == entity_id]
+                                  if device.entity_id in entity_id]
        else:
            target_thermostats = devices

-        fan_min_on_time = service.data[ATTR_FAN_MIN_ON_TIME]
-
        for thermostat in target_thermostats:
            thermostat.set_fan_min_on_time(str(fan_min_on_time))

-            thermostat.update_ha_state(True)
+            thermostat.schedule_update_ha_state(True)
+
+    def resume_program_set_service(service):
+        """Resume the program on the target thermostats."""
+        entity_id = service.data.get(ATTR_ENTITY_ID)
+        resume_all = service.data.get(ATTR_RESUME_ALL)
+
+        if entity_id:
+            target_thermostats = [device for device in devices
+                                  if device.entity_id in entity_id]
+        else:
+            target_thermostats = devices
+
+        for thermostat in target_thermostats:
+            thermostat.resume_program(resume_all)
+
+            thermostat.schedule_update_ha_state(True)

    descriptions = load_yaml_config_file(
        path.join(path.dirname(__file__), 'services.yaml'))
@@ -71,6 +95,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        descriptions.get(SERVICE_SET_FAN_MIN_ON_TIME),
        schema=SET_FAN_MIN_ON_TIME_SCHEMA)

+    hass.services.register(
+        DOMAIN, SERVICE_RESUME_PROGRAM, resume_program_set_service,
+        descriptions.get(SERVICE_RESUME_PROGRAM),
+        schema=RESUME_PROGRAM_SCHEMA)
+

 class Thermostat(ClimateDevice):
    """A thermostat class for Ecobee."""
@@ -116,12 +145,30 @@ class Thermostat(ClimateDevice):
    @property
    def target_temperature_low(self):
        """Return the lower bound temperature we try to reach."""
-        return int(self.thermostat['runtime']['desiredHeat'] / 10)
+        if self.current_operation == STATE_AUTO:
+            return int(self.thermostat['runtime']['desiredHeat'] / 10)
+        else:
+            return None

    @property
    def target_temperature_high(self):
        """Return the upper bound temperature we try to reach."""
-        return int(self.thermostat['runtime']['desiredCool'] / 10)
+        if self.current_operation == STATE_AUTO:
+            return int(self.thermostat['runtime']['desiredCool'] / 10)
+        else:
+            return None
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        if self.current_operation == STATE_AUTO:
+            return None
+        if self.current_operation == STATE_HEAT:
+            return int(self.thermostat['runtime']['desiredHeat'] / 10)
+        elif self.current_operation == STATE_COOL:
+            return int(self.thermostat['runtime']['desiredCool'] / 10)
+        else:
+            return None

    @property
    def desired_fan_mode(self):
@@ -136,6 +183,34 @@ class Thermostat(ClimateDevice):
        else:
            return STATE_OFF

+    @property
+    def current_hold_mode(self):
+        """Return current hold mode."""
+        events = self.thermostat['events']
+        if any((event['holdClimateRef'] == 'away' and
+                int(event['endDate'][0:4])-int(event['startDate'][0:4]) <= 1)
+               or event['type'] == 'autoAway'
+               for event in events):
+            # away hold is auto away or a temporary hold from away climate
+            hold = 'away'
+        elif any(event['holdClimateRef'] == 'away' and
+                 int(event['endDate'][0:4])-int(event['startDate'][0:4]) > 1
+                 for event in events):
+            # a permanent away is not considered a hold, but away_mode
+            hold = None
+        elif any(event['holdClimateRef'] == 'home' or
+                 event['type'] == 'autoHome'
+                 for event in events):
+            # home mode is auto home or any home hold
+            hold = 'home'
+        elif any(event['type'] == 'hold' and event['running']
+                 for event in events):
+            hold = 'temp'
+            # temperature hold is any other hold not based on climate
+        else:
+            hold = None
+        return hold
+
    @property
    def current_operation(self):
        """Return current operation."""
@@ -189,25 +264,24 @@ class Thermostat(ClimateDevice):
            "fan_min_on_time": self.fan_min_on_time
        }

+    def is_vacation_on(self):
+        """Return true if vacation mode is on."""
+        events = self.thermostat['events']
+        return any(event['type'] == 'vacation' and event['running']
+                   for event in events)
+
    @property
    def is_away_mode_on(self):
        """Return true if away mode is on."""
-        mode = self.mode
        events = self.thermostat['events']
-        for event in events:
-            if event['holdClimateRef'] == 'away' or \
-               event['type'] == 'autoAway':
-                mode = "away"
-                break
-        return 'away' in mode
+        return any(event['holdClimateRef'] == 'away' and
+                   int(event['endDate'][0:4])-int(event['startDate'][0:4]) > 1
+                   for event in events)

    def turn_away_mode_on(self):
        """Turn away on."""
-        if self.hold_temp:
-            self.data.ecobee.set_climate_hold(self.thermostat_index,
-                                              "away", "indefinite")
-        else:
-            self.data.ecobee.set_climate_hold(self.thermostat_index, "away")
+        self.data.ecobee.set_climate_hold(self.thermostat_index,
+                                          "away", 'indefinite')
        self.update_without_throttle = True

    def turn_away_mode_off(self):
@@ -215,28 +289,69 @@ class Thermostat(ClimateDevice):
        self.data.ecobee.resume_program(self.thermostat_index)
        self.update_without_throttle = True

+    def set_hold_mode(self, hold_mode):
+        """Set hold mode (away, home, temp)."""
+        hold = self.current_hold_mode
+
+        if hold == hold_mode:
+            # no change, so no action required
+            return
+        elif hold_mode == 'away':
+            self.data.ecobee.set_climate_hold(self.thermostat_index,
+                                              "away", self.hold_preference())
+        elif hold_mode == 'home':
+            self.data.ecobee.set_climate_hold(self.thermostat_index,
+                                              "home", self.hold_preference())
+        elif hold_mode == 'temp':
+            self.set_temp_hold(int(self.current_temperature))
+        else:
+            self.data.ecobee.resume_program(self.thermostat_index)
+            self.update_without_throttle = True
+
+    def set_auto_temp_hold(self, heat_temp, cool_temp):
+        """Set temperature hold in auto mode."""
+        self.data.ecobee.set_hold_temp(self.thermostat_index, cool_temp,
+                                       heat_temp, self.hold_preference())
+        _LOGGER.debug("Setting ecobee hold_temp to: heat=%s, is=%s, "
+                      "cool=%s, is=%s", heat_temp, isinstance(
+                          heat_temp, (int, float)), cool_temp,
+                      isinstance(cool_temp, (int, float)))
+
+        self.update_without_throttle = True
+
+    def set_temp_hold(self, temp):
+        """Set temperature hold in modes other than auto."""
+        # Set arbitrary range when not in auto mode
+        if self.current_operation == STATE_HEAT:
+            heat_temp = temp
+            cool_temp = temp + 20
+        elif self.current_operation == STATE_COOL:
+            heat_temp = temp - 20
+            cool_temp = temp
+
+        self.data.ecobee.set_hold_temp(self.thermostat_index, cool_temp,
+                                       heat_temp, self.hold_preference())
+        _LOGGER.debug("Setting ecobee hold_temp to: low=%s, is=%s, "
+                      "cool=%s, is=%s", heat_temp, isinstance(
+                          heat_temp, (int, float)), cool_temp,
+                      isinstance(cool_temp, (int, float)))
+
+        self.update_without_throttle = True
+
    def set_temperature(self, **kwargs):
        """Set new target temperature."""
-        if kwargs.get(ATTR_TARGET_TEMP_LOW) is not None and \
-           kwargs.get(ATTR_TARGET_TEMP_HIGH) is not None:
-            high_temp = int(kwargs.get(ATTR_TARGET_TEMP_LOW))
-            low_temp = int(kwargs.get(ATTR_TARGET_TEMP_HIGH))
+        low_temp = kwargs.get(ATTR_TARGET_TEMP_LOW)
+        high_temp = kwargs.get(ATTR_TARGET_TEMP_HIGH)
+        temp = kwargs.get(ATTR_TEMPERATURE)

-        if self.hold_temp:
-            self.data.ecobee.set_hold_temp(self.thermostat_index, low_temp,
-                                           high_temp, "indefinite")
-            _LOGGER.debug("Setting ecobee hold_temp to: low=%s, is=%s, "
-                          "high=%s, is=%s", low_temp, isinstance(
-                              low_temp, (int, float)), high_temp,
-                          isinstance(high_temp, (int, float)))
+        if self.current_operation == STATE_AUTO and low_temp is not None \
+           and high_temp is not None:
+            self.set_auto_temp_hold(int(low_temp), int(high_temp))
+        elif temp is not None:
+            self.set_temp_hold(int(temp))
        else:
-            self.data.ecobee.set_hold_temp(self.thermostat_index, low_temp,
-                                           high_temp)
-            _LOGGER.debug("Setting ecobee temp to: low=%s, is=%s, "
-                          "high=%s, is=%s", low_temp, isinstance(
-                              low_temp, (int, float)), high_temp,
-                          isinstance(high_temp, (int, float)))
-        self.update_without_throttle = True
+            _LOGGER.error(
+                'Missing valid arguments for set_temperature in %s', kwargs)

    def set_operation_mode(self, operation_mode):
        """Set HVAC mode (auto, auxHeatOnly, cool, heat, off)."""
@@ -249,20 +364,21 @@ class Thermostat(ClimateDevice):
                                             fan_min_on_time)
        self.update_without_throttle = True

-    # Home and Sleep mode aren't used in UI yet:
+    def resume_program(self, resume_all):
+        """Resume the thermostat schedule program."""
+        self.data.ecobee.resume_program(self.thermostat_index,
+                                        str(resume_all).lower())
+        self.update_without_throttle = True

-    # def turn_home_mode_on(self):
-    #     """ Turns home mode on. """
-    #     self.data.ecobee.set_climate_hold(self.thermostat_index, "home")
-
-    # def turn_home_mode_off(self):
-    #     """ Turns home mode off. """
-    #     self.data.ecobee.resume_program(self.thermostat_index)
-
-    # def turn_sleep_mode_on(self):
-    #     """ Turns sleep mode on. """
-    #     self.data.ecobee.set_climate_hold(self.thermostat_index, "sleep")
-
-    # def turn_sleep_mode_off(self):
-    #     """ Turns sleep mode off. """
-    #     self.data.ecobee.resume_program(self.thermostat_index)
+    def hold_preference(self):
+        """Return user preference setting for hold time."""
+        # Values returned from thermostat are 'useEndTime4hour',
+        # 'useEndTime2hour', 'nextTransition', 'indefinite', 'askMe'
+        default = self.thermostat['settings']['holdAction']
+        if default == 'nextTransition':
+            return default
+        # add further conditions if other hold durations should be
+        # supported; note that this should not include 'indefinite'
+        # as an indefinite away hold is interpreted as away_mode
+        else:
+            return 'nextTransition'
--- a/homeassistant/components/climate/eq3btsmart.py
+++ b/homeassistant/components/climate/eq3btsmart.py
@@ -8,18 +8,28 @@ import logging

 import voluptuous as vol

-from homeassistant.components.climate import ClimateDevice, PLATFORM_SCHEMA
+from homeassistant.components.climate import (
+    ClimateDevice, PLATFORM_SCHEMA, PRECISION_HALVES,
+    STATE_AUTO, STATE_ON, STATE_OFF,
+)
 from homeassistant.const import (
    CONF_MAC, TEMP_CELSIUS, CONF_DEVICES, ATTR_TEMPERATURE)
-from homeassistant.util.temperature import convert
+
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['bluepy_devices==0.2.0']
+REQUIREMENTS = ['python-eq3bt==0.1.5']

 _LOGGER = logging.getLogger(__name__)

-ATTR_MODE = 'mode'
-ATTR_MODE_READABLE = 'mode_readable'
+STATE_BOOST = "boost"
+STATE_AWAY = "away"
+STATE_MANUAL = "manual"
+
+ATTR_STATE_WINDOW_OPEN = "window_open"
+ATTR_STATE_VALVE = "valve"
+ATTR_STATE_LOCKED = "is_locked"
+ATTR_STATE_LOW_BAT = "low_battery"
+ATTR_STATE_AWAY_END = "away_end"

 DEVICE_SCHEMA = vol.Schema({
    vol.Required(CONF_MAC): cv.string,
@@ -48,10 +58,25 @@ class EQ3BTSmartThermostat(ClimateDevice):

    def __init__(self, _mac, _name):
        """Initialize the thermostat."""
-        from bluepy_devices.devices import eq3btsmart
+        # we want to avoid name clash with this module..
+        import eq3bt as eq3
+
+        self.modes = {eq3.Mode.Open: STATE_ON,
+                      eq3.Mode.Closed: STATE_OFF,
+                      eq3.Mode.Auto: STATE_AUTO,
+                      eq3.Mode.Manual: STATE_MANUAL,
+                      eq3.Mode.Boost: STATE_BOOST,
+                      eq3.Mode.Away: STATE_AWAY}
+
+        self.reverse_modes = {v: k for k, v in self.modes.items()}

        self._name = _name
-        self._thermostat = eq3btsmart.EQ3BTSmartThermostat(_mac)
+        self._thermostat = eq3.Thermostat(_mac)
+
+    @property
+    def available(self) -> bool:
+        """Return if thermostat is available."""
+        return self.current_operation is not None

    @property
    def name(self):
@@ -63,6 +88,11 @@ class EQ3BTSmartThermostat(ClimateDevice):
        """Return the unit of measurement that is used."""
        return TEMP_CELSIUS

+    @property
+    def precision(self):
+        """Return eq3bt's precision 0.5."""
+        return PRECISION_HALVES
+
    @property
    def current_temperature(self):
        """Can not report temperature, so return target_temperature."""
@@ -81,24 +111,56 @@ class EQ3BTSmartThermostat(ClimateDevice):
        self._thermostat.target_temperature = temperature

    @property
-    def device_state_attributes(self):
-        """Return the device specific state attributes."""
-        return {
-            ATTR_MODE: self._thermostat.mode,
-            ATTR_MODE_READABLE: self._thermostat.mode_readable,
-        }
+    def current_operation(self):
+        """Current mode."""
+        if self._thermostat.mode < 0:
+            return None
+        return self.modes[self._thermostat.mode]
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        return [x for x in self.modes.values()]
+
+    def set_operation_mode(self, operation_mode):
+        """Set operation mode."""
+        self._thermostat.mode = self.reverse_modes[operation_mode]
+
+    def turn_away_mode_off(self):
+        """Away mode off turns to AUTO mode."""
+        self.set_operation_mode(STATE_AUTO)
+
+    def turn_away_mode_on(self):
+        """Set away mode on."""
+        self.set_operation_mode(STATE_AWAY)
+
+    @property
+    def is_away_mode_on(self):
+        """Return if we are away."""
+        return self.current_operation == STATE_AWAY

    @property
    def min_temp(self):
        """Return the minimum temperature."""
-        return convert(self._thermostat.min_temp, TEMP_CELSIUS,
-                       self.unit_of_measurement)
+        return self._thermostat.min_temp

    @property
    def max_temp(self):
        """Return the maximum temperature."""
-        return convert(self._thermostat.max_temp, TEMP_CELSIUS,
-                       self.unit_of_measurement)
+        return self._thermostat.max_temp
+
+    @property
+    def device_state_attributes(self):
+        """Return the device specific state attributes."""
+        dev_specific = {
+            ATTR_STATE_LOCKED: self._thermostat.locked,
+            ATTR_STATE_LOW_BAT: self._thermostat.low_battery,
+            ATTR_STATE_VALVE: self._thermostat.valve_state,
+            ATTR_STATE_WINDOW_OPEN: self._thermostat.window_open,
+            ATTR_STATE_AWAY_END: self._thermostat.away_end,
+        }
+
+        return dev_specific

    def update(self):
        """Update the data from the thermostat."""
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -4,17 +4,19 @@ Adds support for generic thermostat units.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.generic_thermostat/
 """
+import asyncio
 import logging

 import voluptuous as vol

+from homeassistant.core import callback
 from homeassistant.components import switch
 from homeassistant.components.climate import (
    STATE_HEAT, STATE_COOL, STATE_IDLE, ClimateDevice, PLATFORM_SCHEMA)
 from homeassistant.const import (
    ATTR_UNIT_OF_MEASUREMENT, STATE_ON, STATE_OFF, ATTR_TEMPERATURE)
 from homeassistant.helpers import condition
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)
@@ -48,7 +50,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-def setup_platform(hass, config, add_devices, discovery_info=None):
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Setup the generic thermostat."""
    name = config.get(CONF_NAME)
    heater_entity_id = config.get(CONF_HEATER)
@@ -60,7 +63,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    min_cycle_duration = config.get(CONF_MIN_DUR)
    tolerance = config.get(CONF_TOLERANCE)

-    add_devices([GenericThermostat(
+    yield from async_add_devices([GenericThermostat(
        hass, name, heater_entity_id, sensor_entity_id, min_temp, max_temp,
        target_temp, ac_mode, min_cycle_duration, tolerance)])

@@ -86,11 +89,14 @@ class GenericThermostat(ClimateDevice):
        self._target_temp = target_temp
        self._unit = hass.config.units.temperature_unit

-        track_state_change(hass, sensor_entity_id, self._sensor_changed)
+        async_track_state_change(
+            hass, sensor_entity_id, self._async_sensor_changed)
+        async_track_state_change(
+            hass, heater_entity_id, self._async_switch_changed)

        sensor_state = hass.states.get(sensor_entity_id)
        if sensor_state:
-            self._update_temp(sensor_state)
+            self._async_update_temp(sensor_state)

    @property
    def should_poll(self):
@@ -127,14 +133,15 @@ class GenericThermostat(ClimateDevice):
        """Return the temperature we try to reach."""
        return self._target_temp

-    def set_temperature(self, **kwargs):
+    @asyncio.coroutine
+    def async_set_temperature(self, **kwargs):
        """Set new target temperature."""
        temperature = kwargs.get(ATTR_TEMPERATURE)
        if temperature is None:
            return
        self._target_temp = temperature
-        self._control_heating()
-        self.update_ha_state()
+        self._async_control_heating()
+        yield from self.async_update_ha_state()

    @property
    def min_temp(self):
@@ -156,16 +163,25 @@ class GenericThermostat(ClimateDevice):
            # Get default temp from super class
            return ClimateDevice.max_temp.fget(self)

-    def _sensor_changed(self, entity_id, old_state, new_state):
+    @asyncio.coroutine
+    def _async_sensor_changed(self, entity_id, old_state, new_state):
        """Called when temperature changes."""
        if new_state is None:
            return

-        self._update_temp(new_state)
-        self._control_heating()
-        self.schedule_update_ha_state()
+        self._async_update_temp(new_state)
+        self._async_control_heating()
+        yield from self.async_update_ha_state()

-    def _update_temp(self, state):
+    @callback
+    def _async_switch_changed(self, entity_id, old_state, new_state):
+        """Called when heater switch changes state."""
+        if new_state is None:
+            return
+        self.hass.async_add_job(self.async_update_ha_state())
+
+    @callback
+    def _async_update_temp(self, state):
        """Update thermostat with latest state from sensor."""
        unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)

@@ -175,7 +191,8 @@ class GenericThermostat(ClimateDevice):
        except ValueError as ex:
            _LOGGER.error('Unable to update from sensor: %s', ex)

-    def _control_heating(self):
+    @callback
+    def _async_control_heating(self):
        """Check if we need to turn heating on or off."""
        if not self._active and None not in (self._cur_temp,
                                             self._target_temp):
@@ -191,9 +208,9 @@ class GenericThermostat(ClimateDevice):
                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)
+            long_enough = condition.state(
+                self.hass, self.heater_entity_id, current_state,
+                self.min_cycle_duration)
            if not long_enough:
                return

@@ -203,12 +220,12 @@ class GenericThermostat(ClimateDevice):
                too_cold = self._target_temp - self._cur_temp > self._tolerance
                if too_cold:
                    _LOGGER.info('Turning off AC %s', self.heater_entity_id)
-                    switch.turn_off(self.hass, self.heater_entity_id)
+                    switch.async_turn_off(self.hass, self.heater_entity_id)
            else:
                too_hot = self._cur_temp - self._target_temp > self._tolerance
                if too_hot:
                    _LOGGER.info('Turning on AC %s', self.heater_entity_id)
-                    switch.turn_on(self.hass, self.heater_entity_id)
+                    switch.async_turn_on(self.hass, self.heater_entity_id)
        else:
            is_heating = self._is_device_active
            if is_heating:
@@ -216,12 +233,12 @@ class GenericThermostat(ClimateDevice):
                if too_hot:
                    _LOGGER.info('Turning off heater %s',
                                 self.heater_entity_id)
-                    switch.turn_off(self.hass, self.heater_entity_id)
+                    switch.async_turn_off(self.hass, self.heater_entity_id)
            else:
                too_cold = self._target_temp - self._cur_temp > self._tolerance
                if too_cold:
                    _LOGGER.info('Turning on heater %s', self.heater_entity_id)
-                    switch.turn_on(self.hass, self.heater_entity_id)
+                    switch.async_turn_on(self.hass, self.heater_entity_id)

    @property
    def _is_device_active(self):
--- a/homeassistant/components/climate/homematic.py
+++ b/homeassistant/components/climate/homematic.py
@@ -6,13 +6,14 @@ https://home-assistant.io/components/climate.homematic/
 """
 import logging
 from homeassistant.components.climate import ClimateDevice, STATE_AUTO
-from homeassistant.components.homematic import HMDevice
+from homeassistant.components.homematic import HMDevice, ATTR_DISCOVER_DEVICES
 from homeassistant.util.temperature import convert
 from homeassistant.const import TEMP_CELSIUS, STATE_UNKNOWN, ATTR_TEMPERATURE
-from homeassistant.loader import get_component

 DEPENDENCIES = ['homematic']

+_LOGGER = logging.getLogger(__name__)
+
 STATE_MANUAL = "manual"
 STATE_BOOST = "boost"

@@ -22,21 +23,31 @@ HM_STATE_MAP = {
    "BOOST_MODE": STATE_BOOST,
 }

-_LOGGER = logging.getLogger(__name__)
+HM_TEMP_MAP = [
+    'ACTUAL_TEMPERATURE',
+    'TEMPERATURE',
+]
+
+HM_HUMI_MAP = [
+    'ACTUAL_HUMIDITY',
+    'HUMIDITY',
+]
+
+HM_CONTROL_MODE = 'CONTROL_MODE'


-def setup_platform(hass, config, add_callback_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Homematic thermostat platform."""
    if discovery_info is None:
        return

-    homematic = get_component("homematic")
-    return homematic.setup_hmdevice_discovery_helper(
-        hass,
-        HMThermostat,
-        discovery_info,
-        add_callback_devices
-    )
+    devices = []
+    for config in discovery_info[ATTR_DISCOVER_DEVICES]:
+        new_device = HMThermostat(hass, config)
+        new_device.link_homematic()
+        devices.append(new_device)
+
+    add_devices(devices)


 class HMThermostat(HMDevice, ClimateDevice):
@@ -50,7 +61,7 @@ class HMThermostat(HMDevice, ClimateDevice):
    @property
    def current_operation(self):
        """Return current operation ie. heat, cool, idle."""
-        if not self.available:
+        if HM_CONTROL_MODE not in self._data:
            return None

        # read state and search
@@ -62,8 +73,6 @@ class HMThermostat(HMDevice, ClimateDevice):
    @property
    def operation_list(self):
        """List of available operation modes."""
-        if not self.available:
-            return None
        op_list = []

        # generate list
@@ -76,31 +85,29 @@ class HMThermostat(HMDevice, ClimateDevice):
    @property
    def current_humidity(self):
        """Return the current humidity."""
-        if not self.available:
-            return None
-        return self._data.get('ACTUAL_HUMIDITY', None)
+        for node in HM_HUMI_MAP:
+            if node in self._data:
+                return self._data[node]

    @property
    def current_temperature(self):
        """Return the current temperature."""
-        if not self.available:
-            return None
-        return self._data.get('ACTUAL_TEMPERATURE', None)
+        for node in HM_TEMP_MAP:
+            if node in self._data:
+                return self._data[node]

    @property
    def target_temperature(self):
        """Return the target temperature."""
-        if not self.available:
-            return None
-        return self._data.get('SET_TEMPERATURE', None)
+        return self._data.get(self._state)

    def set_temperature(self, **kwargs):
        """Set new target temperature."""
        temperature = kwargs.get(ATTR_TEMPERATURE)
-        if not self.available or temperature is None:
+        if temperature is None:
            return None

-        self._hmdevice.set_temperature(temperature)
+        self._hmdevice.writeNodeData(self._state, float(temperature))

    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
@@ -122,10 +129,12 @@ class HMThermostat(HMDevice, ClimateDevice):
    def _init_data_struct(self):
        """Generate a data dict (self._data) from the Homematic metadata."""
        # Add state to data dict
-        self._data.update({"CONTROL_MODE": STATE_UNKNOWN,
-                           "SET_TEMPERATURE": STATE_UNKNOWN,
-                           "ACTUAL_TEMPERATURE": STATE_UNKNOWN})
+        self._state = next(iter(self._hmdevice.WRITENODE.keys()))
+        self._data[self._state] = STATE_UNKNOWN

-        # support humidity
-        if 'ACTUAL_HUMIDITY' in self._hmdevice.SENSORNODE:
-            self._data.update({'ACTUAL_HUMIDITY': STATE_UNKNOWN})
+        # support state
+        if HM_CONTROL_MODE in self._hmdevice.ATTRIBUTENODE:
+            self._data[HM_CONTROL_MODE] = STATE_UNKNOWN
+
+        for node in self._hmdevice.SENSORNODE.keys():
+            self._data[node] = STATE_UNKNOWN
--- a/homeassistant/components/climate/honeywell.py
+++ b/homeassistant/components/climate/honeywell.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = ['evohomeclient==0.2.5',
-                'somecomfort==0.3.2']
+                'somecomfort==0.4.1']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/climate/mysensors.py
+++ b/homeassistant/components/climate/mysensors.py
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        }
        devices = {}
        gateway.platform_callbacks.append(mysensors.pf_callback_factory(
-            map_sv_types, devices, add_devices, MySensorsHVAC))
+            map_sv_types, devices, MySensorsHVAC, add_devices))


 class MySensorsHVAC(mysensors.MySensorsDeviceEntity, ClimateDevice):
@@ -135,7 +135,7 @@ class MySensorsHVAC(mysensors.MySensorsDeviceEntity, ClimateDevice):
            if self.gateway.optimistic:
                # optimistically assume that switch has changed state
                self._values[value_type] = value
-                self.update_ha_state()
+                self.schedule_update_ha_state()

    def set_fan_mode(self, fan):
        """Set new target temperature."""
@@ -145,7 +145,7 @@ class MySensorsHVAC(mysensors.MySensorsDeviceEntity, ClimateDevice):
        if self.gateway.optimistic:
            # optimistically assume that switch has changed state
            self._values[set_req.V_HVAC_SPEED] = fan
-            self.update_ha_state()
+            self.schedule_update_ha_state()

    def set_operation_mode(self, operation_mode):
        """Set new target temperature."""
@@ -156,7 +156,7 @@ class MySensorsHVAC(mysensors.MySensorsDeviceEntity, ClimateDevice):
        if self.gateway.optimistic:
            # optimistically assume that switch has changed state
            self._values[set_req.V_HVAC_FLOW_STATE] = operation_mode
-            self.update_ha_state()
+            self.schedule_update_ha_state()

    def update(self):
        """Update the controller with the latest value from a sensor."""
--- a/homeassistant/components/climate/nest.py
+++ b/homeassistant/components/climate/nest.py
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

    add_devices(
        [NestThermostat(structure, device, temp_unit)
-         for structure, device in hass.data[DATA_NEST].devices()],
+         for structure, device in hass.data[DATA_NEST].thermostats()],
        True
    )

--- a/homeassistant/components/climate/netatmo.py
+++ b/homeassistant/components/climate/netatmo.py
@@ -111,7 +111,6 @@ class NetatmoThermostat(ClimateDevice):
        temp = None
        self._data.thermostatdata.setthermpoint(mode, temp, endTimeOffset=None)
        self._away = True
-        self.update_ha_state()

    def turn_away_mode_off(self):
        """Turn away off."""
@@ -119,7 +118,6 @@ class NetatmoThermostat(ClimateDevice):
        temp = None
        self._data.thermostatdata.setthermpoint(mode, temp, endTimeOffset=None)
        self._away = False
-        self.update_ha_state()

    def set_temperature(self, endTimeOffset=DEFAULT_TIME_OFFSET, **kwargs):
        """Set new target temperature for 2 hours."""
@@ -131,7 +129,6 @@ class NetatmoThermostat(ClimateDevice):
            mode, temperature, endTimeOffset)
        self._target_temperature = temperature
        self._away = False
-        self.update_ha_state()

    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def update(self):
--- a/homeassistant/components/climate/oem.py
+++ b/homeassistant/components/climate/oem.py
@@ -0,0 +1,148 @@
+"""
+OpenEnergyMonitor Thermostat Support.
+
+This provides a climate component for the ESP8266 based thermostat sold by
+OpenEnergyMonitor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.oem/
+"""
+import logging
+
+import requests
+import voluptuous as vol
+
+# Import the device class from the component that you want to support
+from homeassistant.components.climate import (
+    ClimateDevice, PLATFORM_SCHEMA, STATE_HEAT, STATE_IDLE, ATTR_TEMPERATURE)
+from homeassistant.const import (CONF_HOST, CONF_USERNAME, CONF_PASSWORD,
+                                 CONF_PORT, TEMP_CELSIUS, CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+
+# Home Assistant depends on 3rd party packages for API specific code.
+REQUIREMENTS = ['oemthermostat==1.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+# Local configs
+CONF_AWAY_TEMP = 'away_temp'
+
+# Validation of the user's configuration
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default="Thermostat"): cv.string,
+    vol.Optional(CONF_PORT, default=80): cv.port,
+    vol.Inclusive(CONF_USERNAME, 'authentication'): cv.string,
+    vol.Inclusive(CONF_PASSWORD, 'authentication'): cv.string,
+    vol.Optional(CONF_AWAY_TEMP, default=14): vol.Coerce(float)
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup oemthermostat."""
+    from oemthermostat import Thermostat
+
+    # Assign configuration variables. The configuration check takes care they
+    # are present.
+    name = config.get(CONF_NAME)
+    host = config.get(CONF_HOST)
+    port = config.get(CONF_PORT)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+    away_temp = config.get(CONF_AWAY_TEMP)
+
+    # If creating the class raises an exception, it failed to connect or
+    # something else went wrong.
+    try:
+        therm = Thermostat(host, port=port,
+                           username=username, password=password)
+    except (ValueError, AssertionError, requests.RequestException):
+        return False
+
+    # Add devices
+    add_devices((ThermostatDevice(hass, therm, name, away_temp), ), True)
+
+
+class ThermostatDevice(ClimateDevice):
+    """Interface class for the oemthermostat module and HA."""
+
+    def __init__(self, hass, thermostat, name, away_temp):
+        """Initialize the device."""
+        self._name = name
+        self.hass = hass
+
+        # Away mode stuff
+        self._away = False
+        self._away_temp = away_temp
+        self._prev_temp = thermostat.setpoint
+
+        self.thermostat = thermostat
+        # Set the thermostat mode to manual
+        self.thermostat.mode = 2
+
+        # set up internal state varS
+        self._state = None
+        self._temperature = None
+        self._setpoint = None
+
+    @property
+    def name(self):
+        """Name of this Thermostat."""
+        return self._name
+
+    @property
+    def temperature_unit(self):
+        """The unit of measurement used by the platform."""
+        return TEMP_CELSIUS
+
+    @property
+    def current_operation(self):
+        """Return current operation i.e. heat, cool, idle."""
+        if self._state:
+            return STATE_HEAT
+        else:
+            return STATE_IDLE
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._setpoint
+
+    def set_temperature(self, **kwargs):
+        """Change the setpoint of the thermostat."""
+        # If we are setting the temp, then we don't want away mode anymore.
+        self.turn_away_mode_off()
+
+        temp = kwargs.get(ATTR_TEMPERATURE)
+        self.thermostat.setpoint = temp
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return self._away
+
+    def turn_away_mode_on(self):
+        """Turn away mode on."""
+        if not self._away:
+            self._prev_temp = self._setpoint
+
+        self.thermostat.setpoint = self._away_temp
+        self._away = True
+
+    def turn_away_mode_off(self):
+        """Turn away mode off."""
+        if self._away:
+            self.thermostat.setpoint = self._prev_temp
+
+        self._away = False
+
+    def update(self):
+        """Update local state."""
+        self._setpoint = self.thermostat.setpoint
+        self._temperature = self.thermostat.temperature
+        self._state = self.thermostat.state
--- a/homeassistant/components/climate/services.yaml
+++ b/homeassistant/components/climate/services.yaml
@@ -22,6 +22,18 @@ set_away_mode:
      description: New value of away mode
      example: true

+set_hold_mode:
+  description: Turn hold mode for climate device
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'climate.kitchen'
+
+    hold_mode:
+      description: New value of hold mode
+      example: 'away'
+
 set_temperature:
  description: Set target temperature of climate device

@@ -66,7 +78,7 @@ set_fan_mode:
      description: Name(s) of entities to change
      example: 'climate.nest'

-    fan:
+    fan_mode:
      description: New value of fan mode
      example: On Low

@@ -76,7 +88,7 @@ set_operation_mode:
  fields:
    entity_id:
      description: Name(s) of entities to change
-      example: 'climet.nest'
+      example: 'climate.nest'

    operation_mode:
      description: New value of operation mode
@@ -94,3 +106,27 @@ set_swing_mode:
    swing_mode:
    description: New value of swing mode
    example: 1
+
+ecobee_set_fan_min_on_time:
+  description: Set the minimum fan on time
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'climate.kitchen'
+
+    fan_min_on_time:
+      description: New value of fan min on time
+      example: 5
+
+ecobee_resume_program:
+  description: Resume the programmed schedule
+
+  fields:
+    entity_id:
+      description: Name(s) of entities to change
+      example: 'climate.kitchen'
+
+    resume_all:
+      description: Resume all events and return to the scheduled program. This default to false which removes only the top event.
+      example: true
--- a/homeassistant/components/climate/wink.py
+++ b/homeassistant/components/climate/wink.py
@@ -4,7 +4,7 @@ Support for Wink thermostats.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.wink/
 """
-from homeassistant.components.wink import WinkDevice
+from homeassistant.components.wink import WinkDevice, DOMAIN
 from homeassistant.components.climate import (
    STATE_AUTO, STATE_COOL, STATE_HEAT, ClimateDevice,
    ATTR_TARGET_TEMP_HIGH, ATTR_TARGET_TEMP_LOW,
@@ -13,12 +13,16 @@ from homeassistant.components.climate import (
 from homeassistant.const import (
    TEMP_CELSIUS, STATE_ON,
    STATE_OFF, STATE_UNKNOWN)
-from homeassistant.loader import get_component

 DEPENDENCIES = ['wink']

 STATE_AUX = 'aux'
 STATE_ECO = 'eco'
+STATE_FAN = 'fan'
+SPEED_LOWEST = 'lowest'
+SPEED_LOW = 'low'
+SPEED_MEDIUM = 'medium'
+SPEED_HIGH = 'high'

 ATTR_EXTERNAL_TEMPERATURE = "external_temperature"
 ATTR_SMART_TEMPERATURE = "smart_temperature"
@@ -30,8 +34,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    """Setup the Wink thermostat."""
    import pywink
    temp_unit = hass.config.units.temperature_unit
-    add_devices(WinkThermostat(thermostat, hass, temp_unit)
-                for thermostat in pywink.get_thermostats())
+    for climate in pywink.get_thermostats():
+        _id = climate.object_id() + climate.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkThermostat(climate, hass, temp_unit)])
+    for climate in pywink.get_air_conditioners():
+        _id = climate.object_id() + climate.name()
+        if _id not in hass.data[DOMAIN]['unique_ids']:
+            add_devices([WinkAC(climate, hass, temp_unit)])


 # pylint: disable=abstract-method,too-many-public-methods, too-many-branches
@@ -41,7 +51,6 @@ class WinkThermostat(WinkDevice, ClimateDevice):
    def __init__(self, wink, hass, temp_unit):
        """Initialize the Wink device."""
        super().__init__(wink, hass)
-        wink = get_component('wink')
        self._config_temp_unit = temp_unit

    @property
@@ -329,3 +338,131 @@ class WinkThermostat(WinkDevice, ClimateDevice):
        else:
            return_value = maximum
        return return_value
+
+
+class WinkAC(WinkDevice, ClimateDevice):
+    """Representation of a Wink air conditioner."""
+
+    def __init__(self, wink, hass, temp_unit):
+        """Initialize the Wink device."""
+        super().__init__(wink, hass)
+        self._config_temp_unit = temp_unit
+
+    @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 state attributes."""
+        data = {}
+        target_temp_high = self.target_temperature_high
+        target_temp_low = self.target_temperature_low
+        if target_temp_high is not None:
+            data[ATTR_TARGET_TEMP_HIGH] = self._convert_for_display(
+                self.target_temperature_high)
+        if target_temp_low is not None:
+            data[ATTR_TARGET_TEMP_LOW] = self._convert_for_display(
+                self.target_temperature_low)
+        data["total_consumption"] = self.wink.total_consumption()
+        data["schedule_enabled"] = self.wink.schedule_enabled()
+
+        return data
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self.wink.current_temperature()
+
+    @property
+    def current_operation(self):
+        """Return current operation ie. heat, cool, idle."""
+        if not self.wink.is_on():
+            current_op = STATE_OFF
+        elif self.wink.current_mode() == 'cool_only':
+            current_op = STATE_COOL
+        elif self.wink.current_mode() == 'auto_eco':
+            current_op = STATE_ECO
+        elif self.wink.current_mode() == 'fan_only':
+            current_op = STATE_FAN
+        else:
+            current_op = STATE_UNKNOWN
+        return current_op
+
+    @property
+    def operation_list(self):
+        """List of available operation modes."""
+        op_list = ['off']
+        modes = self.wink.modes()
+        if 'cool_only' in modes:
+            op_list.append(STATE_COOL)
+        if 'auto_eco' in modes:
+            op_list.append(STATE_ECO)
+        if 'fan_eco' in modes:
+            op_list.append(STATE_FAN)
+        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."""
+        if operation_mode == STATE_COOL:
+            self.wink.set_operation_mode('cool_only')
+        elif operation_mode == STATE_ECO:
+            self.wink.set_operation_mode('auto_eco')
+        elif operation_mode == STATE_OFF:
+            self.wink.set_operation_mode('off')
+        elif operation_mode == STATE_FAN:
+            self.wink.set_operation_mode('fan_only')
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self.wink.current_max_set_point()
+
+    @property
+    def target_temperature_low(self):
+        """Only supports cool."""
+        return None
+
+    @property
+    def target_temperature_high(self):
+        """Only supports cool."""
+        return None
+
+    @property
+    def current_fan_mode(self):
+        """Return the current fan mode."""
+        speed = self.wink.current_fan_speed()
+        if speed <= 0.3 and speed >= 0.0:
+            return SPEED_LOWEST
+        elif speed <= 0.5 and speed > 0.3:
+            return SPEED_LOW
+        elif speed <= 0.8 and speed > 0.5:
+            return SPEED_MEDIUM
+        elif speed <= 1.0 and speed > 0.8:
+            return SPEED_HIGH
+        else:
+            return STATE_UNKNOWN
+
+    @property
+    def fan_list(self):
+        """List of available fan modes."""
+        return [SPEED_LOWEST, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+
+    def set_fan_mode(self, mode):
+        """Set fan speed."""
+        if mode == SPEED_LOWEST:
+            speed = 0.3
+        elif mode == SPEED_LOW:
+            speed = 0.5
+        elif mode == SPEED_MEDIUM:
+            speed = 0.8
+        elif mode == SPEED_HIGH:
+            speed = 1.0
+        self.wink.set_ac_fan_speed(speed)
--- a/homeassistant/components/climate/zwave.py
+++ b/homeassistant/components/climate/zwave.py
@@ -52,8 +52,6 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):

    def __init__(self, value, temp_unit):
        """Initialize the Z-Wave climate device."""
-        from openzwave.network import ZWaveNetwork
-        from pydispatch import dispatcher
        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
        self._index = value.index
        self._node = value.node
@@ -70,10 +68,6 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
        self._unit = temp_unit
        _LOGGER.debug("temp_unit is %s", self._unit)
        self._zxt_120 = None
-        self.update_properties()
-        # register listener
-        dispatcher.connect(
-            self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
        # Make sure that we have values for the key before converting to int
        if (value.node.manufacturer_id.strip() and
                value.node.product_id.strip()):
@@ -84,57 +78,59 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
                    _LOGGER.debug("Remotec ZXT-120 Zwave Thermostat"
                                  " workaround")
                    self._zxt_120 = 1
-
-    def value_changed(self, value):
-        """Called when a value has changed on the network."""
-        if self._value.value_id == value.value_id or \
-           self._value.node == value.node:
-            self.update_properties()
-            self.schedule_update_ha_state()
-            _LOGGER.debug("Value changed on network %s", value)
+        self.update_properties()

    def update_properties(self):
-        """Callback on data change for the registered node/value pair."""
+        """Callback on data changes for node values."""
        # Operation Mode
-        for value in self._node.get_values(
-                class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE).values():
-            self._current_operation = value.data
-            self._operation_list = list(value.data_items)
-            _LOGGER.debug("self._operation_list=%s", self._operation_list)
-            _LOGGER.debug("self._current_operation=%s",
-                          self._current_operation)
+        self._current_operation = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE, member='data')
+        operation_list = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE,
+            member='data_items')
+        if operation_list:
+            self._operation_list = list(operation_list)
+        _LOGGER.debug("self._operation_list=%s", self._operation_list)
+        _LOGGER.debug("self._current_operation=%s", self._current_operation)
+
        # Current Temp
-        for value in (
-                self._node.get_values(
-                    class_id=zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL)
-                .values()):
-            if value.label == 'Temperature':
-                self._current_temperature = round((float(value.data)), 1)
-                self._unit = value.units
+        self._current_temperature = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL,
+            label=['Temperature'], member='data')
+        device_unit = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL,
+            label=['Temperature'], member='units')
+        if device_unit is not None:
+            self._unit = device_unit
+
        # Fan Mode
-        for value in (
-                self._node.get_values(
-                    class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE)
-                .values()):
-            self._current_fan_mode = value.data
-            self._fan_list = list(value.data_items)
-            _LOGGER.debug("self._fan_list=%s", self._fan_list)
-            _LOGGER.debug("self._current_fan_mode=%s",
-                          self._current_fan_mode)
+        self._current_fan_mode = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
+            member='data')
+        fan_list = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
+            member='data_items')
+        if fan_list:
+            self._fan_list = list(fan_list)
+        _LOGGER.debug("self._fan_list=%s", self._fan_list)
+        _LOGGER.debug("self._current_fan_mode=%s",
+                      self._current_fan_mode)
        # Swing mode
        if self._zxt_120 == 1:
-            for value in (
-                    self._node.get_values(
-                        class_id=zwave.const.COMMAND_CLASS_CONFIGURATION)
-                    .values()):
-                if value.command_class == \
-                   zwave.const.COMMAND_CLASS_CONFIGURATION and \
-                   value.index == 33:
-                    self._current_swing_mode = value.data
-                    self._swing_list = list(value.data_items)
-                    _LOGGER.debug("self._swing_list=%s", self._swing_list)
-                    _LOGGER.debug("self._current_swing_mode=%s",
-                                  self._current_swing_mode)
+            self._current_swing_mode = (
+                self.get_value(
+                    class_id=zwave.const.COMMAND_CLASS_CONFIGURATION,
+                    index=33,
+                    member='data'))
+            swing_list = self.get_value(class_id=zwave.const
+                                        .COMMAND_CLASS_CONFIGURATION,
+                                        index=33,
+                                        member='data_items')
+            if swing_list:
+                self._swing_list = list(swing_list)
+            _LOGGER.debug("self._swing_list=%s", self._swing_list)
+            _LOGGER.debug("self._current_swing_mode=%s",
+                          self._current_swing_mode)
        # Set point
        temps = []
        for value in (
@@ -152,19 +148,16 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
                    break
                else:
                    self._target_temperature = round((float(value.data)), 1)
+
        # Operating state
-        for value in (
-                self._node.get_values(
-                    class_id=zwave.const
-                    .COMMAND_CLASS_THERMOSTAT_OPERATING_STATE).values()):
-            self._operating_state = value.data
+        self._operating_state = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_OPERATING_STATE,
+            member='data')

        # Fan operating state
-        for value in (
-                self._node.get_values(
-                    class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_STATE)
-                .values()):
-            self._fan_state = value.data
+        self._fan_state = self.get_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_STATE,
+            member='data')

    @property
    def should_poll(self):
@@ -228,50 +221,29 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
        else:
            return

-        for value in (self._node.get_values(
-                class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_SETPOINT)
-                      .values()):
-            if value.index == self._index:
-                if self._zxt_120:
-                    # ZXT-120 responds only to whole int
-                    value.data = round(temperature, 0)
-                    self._target_temperature = temperature
-                    self.update_ha_state()
-                else:
-                    value.data = temperature
-                    self.update_ha_state()
-                break
+        self.set_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_SETPOINT,
+            index=self._index, data=temperature)
+        self.update_ha_state()

    def set_fan_mode(self, fan):
        """Set new target fan mode."""
-        for value in (self._node.get_values(
-                class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE).
-                      values()):
-            if value.command_class == \
-               zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE and \
-               value.index == 0:
-                value.data = bytes(fan, 'utf-8')
-                break
+        self.set_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
+            index=0, data=bytes(fan, 'utf-8'))

    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
-        for value in self._node.get_values(
-                class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE).values():
-            if value.command_class == \
-               zwave.const.COMMAND_CLASS_THERMOSTAT_MODE and value.index == 0:
-                value.data = bytes(operation_mode, 'utf-8')
-                break
+        self.set_value(
+            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE,
+            index=0, data=bytes(operation_mode, 'utf-8'))

    def set_swing_mode(self, swing_mode):
        """Set new target swing mode."""
        if self._zxt_120 == 1:
-            for value in self._node.get_values(
-                    class_id=zwave.const.COMMAND_CLASS_CONFIGURATION).values():
-                if value.command_class == \
-                   zwave.const.COMMAND_CLASS_CONFIGURATION and \
-                   value.index == 33:
-                    value.data = bytes(swing_mode, 'utf-8')
-                    break
+            self.set_value(
+                class_id=zwave.const.COMMAND_CLASS_CONFIGURATION,
+                index=33, data=bytes(swing_mode, 'utf-8'))

    @property
    def device_state_attributes(self):
--- a/homeassistant/components/config/init.py
+++ b/homeassistant/components/config/init.py
@@ -0,0 +1,136 @@
+"""Component to configure Home Assistant via an API."""
+import asyncio
+import os
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.const import EVENT_COMPONENT_LOADED
+from homeassistant.bootstrap import (
+    async_prepare_setup_platform, ATTR_COMPONENT)
+from homeassistant.components.frontend import register_built_in_panel
+from homeassistant.components.http import HomeAssistantView
+from homeassistant.util.yaml import load_yaml, dump
+
+DOMAIN = 'config'
+DEPENDENCIES = ['http']
+SECTIONS = ('core', 'group', 'hassbian')
+ON_DEMAND = ('zwave', )
+
+
+@asyncio.coroutine
+def async_setup(hass, config):
+    """Setup the config component."""
+    register_built_in_panel(hass, 'config', 'Configuration', 'mdi:settings')
+
+    @asyncio.coroutine
+    def setup_panel(panel_name):
+        """Setup a panel."""
+        panel = yield from async_prepare_setup_platform(hass, config, DOMAIN,
+                                                        panel_name)
+
+        if not panel:
+            return
+
+        success = yield from panel.async_setup(hass)
+
+        if success:
+            key = '{}.{}'.format(DOMAIN, panel_name)
+            hass.bus.async_fire(EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: key})
+            hass.config.components.add(key)
+
+    tasks = [setup_panel(panel_name) for panel_name in SECTIONS]
+
+    for panel_name in ON_DEMAND:
+        if panel_name in hass.config.components:
+            tasks.append(setup_panel(panel_name))
+
+    if tasks:
+        yield from asyncio.wait(tasks, loop=hass.loop)
+
+    @callback
+    def component_loaded(event):
+        """Respond to components being loaded."""
+        panel_name = event.data.get(ATTR_COMPONENT)
+        if panel_name in ON_DEMAND:
+            hass.async_add_job(setup_panel(panel_name))
+
+    hass.bus.async_listen(EVENT_COMPONENT_LOADED, component_loaded)
+
+    return True
+
+
+class EditKeyBasedConfigView(HomeAssistantView):
+    """Configure a Group endpoint."""
+
+    def __init__(self, component, config_type, path, key_schema, data_schema,
+                 *, post_write_hook=None):
+        """Initialize a config view."""
+        self.url = '/api/config/%s/%s/{config_key}' % (component, config_type)
+        self.name = 'api:config:%s:%s' % (component, config_type)
+        self.path = path
+        self.key_schema = key_schema
+        self.data_schema = data_schema
+        self.post_write_hook = post_write_hook
+
+    @asyncio.coroutine
+    def get(self, request, config_key):
+        """Fetch device specific config."""
+        hass = request.app['hass']
+        current = yield from hass.loop.run_in_executor(
+            None, _read, hass.config.path(self.path))
+        return self.json(current.get(config_key, {}))
+
+    @asyncio.coroutine
+    def post(self, request, config_key):
+        """Validate config and return results."""
+        try:
+            data = yield from request.json()
+        except ValueError:
+            return self.json_message('Invalid JSON specified', 400)
+
+        try:
+            self.key_schema(config_key)
+        except vol.Invalid as err:
+            return self.json_message('Key malformed: {}'.format(err), 400)
+
+        try:
+            # We just validate, we don't store that data because
+            # we don't want to store the defaults.
+            self.data_schema(data)
+        except vol.Invalid as err:
+            return self.json_message('Message malformed: {}'.format(err), 400)
+
+        hass = request.app['hass']
+        path = hass.config.path(self.path)
+
+        current = yield from hass.loop.run_in_executor(None, _read, path)
+        current.setdefault(config_key, {}).update(data)
+
+        yield from hass.loop.run_in_executor(None, _write, path, current)
+
+        if self.post_write_hook is not None:
+            hass.async_add_job(self.post_write_hook(hass))
+
+        return self.json({
+            'result': 'ok',
+        })
+
+
+def _read(path):
+    """Read YAML helper."""
+    if not os.path.isfile(path):
+        with open(path, 'w'):
+            pass
+        return {}
+
+    return load_yaml(path)
+
+
+def _write(path, data):
+    """Write YAML helper."""
+    # Do it before opening file. If dump causes error it will now not
+    # truncate the file.
+    data = dump(data)
+    with open(path, 'w', encoding='utf-8') as outfile:
+        outfile.write(data)
--- a/Show More
+++ b/Show More