Use twine for release

Bump version to 0.66.0.b2
version should contain just 'b' not 'beta' (#13476 )
2026-01-10 09:37:16 +01:00 · 2018-03-26 16:16:42 -07:00 · 2018-03-26 16:10:03 -07:00 · 2018-03-26 16:09:18 -07:00 · 2018-03-26 16:09:18 -07:00 · 2018-03-26 16:09:17 -07:00
837 changed files with 31983 additions and 12799 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -29,6 +29,9 @@ omit =
    homeassistant/components/arduino.py
    homeassistant/components/*/arduino.py

+    homeassistant/components/bmw_connected_drive.py
+    homeassistant/components/*/bmw_connected_drive.py
+
    homeassistant/components/android_ip_webcam.py
    homeassistant/components/*/android_ip_webcam.py

@@ -38,6 +41,9 @@ omit =
    homeassistant/components/asterisk_mbox.py
    homeassistant/components/*/asterisk_mbox.py

+    homeassistant/components/august.py
+    homeassistant/components/*/august.py
+
    homeassistant/components/axis.py
    homeassistant/components/*/axis.py

@@ -56,6 +62,9 @@ omit =
    homeassistant/components/comfoconnect.py
    homeassistant/components/*/comfoconnect.py

+    homeassistant/components/daikin.py
+    homeassistant/components/*/daikin.py
+
    homeassistant/components/deconz/*
    homeassistant/components/*/deconz.py

@@ -76,6 +85,9 @@ omit =
    homeassistant/components/ecobee.py
    homeassistant/components/*/ecobee.py

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

@@ -97,6 +109,9 @@ omit =
    homeassistant/components/homematic/__init__.py
    homeassistant/components/*/homematic.py

+    homeassistant/components/homematicip_cloud.py
+    homeassistant/components/*/homematicip_cloud.py
+
    homeassistant/components/ihc/*
    homeassistant/components/*/ihc.py

@@ -175,6 +190,9 @@ omit =
    homeassistant/components/opencv.py
    homeassistant/components/*/opencv.py

+    homeassistant/components/pilight.py
+    homeassistant/components/*/pilight.py
+
    homeassistant/components/qwikswitch.py
    homeassistant/components/*/qwikswitch.py

@@ -205,6 +223,9 @@ omit =
    homeassistant/components/skybell.py
    homeassistant/components/*/skybell.py

+    homeassistant/components/smappee.py
+    homeassistant/components/*/smappee.py
+
    homeassistant/components/tado.py
    homeassistant/components/*/tado.py

@@ -235,6 +256,9 @@ omit =
    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twilio_call.py

+    homeassistant/components/upcloud.py
+    homeassistant/components/*/upcloud.py
+
    homeassistant/components/usps.py
    homeassistant/components/*/usps.py

@@ -284,14 +308,11 @@ omit =
    homeassistant/components/zoneminder.py
    homeassistant/components/*/zoneminder.py

-    homeassistant/components/daikin.py
-    homeassistant/components/*/daikin.py
-
    homeassistant/components/alarm_control_panel/alarmdotcom.py
    homeassistant/components/alarm_control_panel/canary.py
    homeassistant/components/alarm_control_panel/concord232.py
-    homeassistant/components/alarm_control_panel/egardia.py
    homeassistant/components/alarm_control_panel/ialarm.py
+    homeassistant/components/alarm_control_panel/ifttt.py
    homeassistant/components/alarm_control_panel/manual_mqtt.py
    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/alarm_control_panel/simplisafe.py
@@ -303,7 +324,6 @@ omit =
    homeassistant/components/binary_sensor/hikvision.py
    homeassistant/components/binary_sensor/iss.py
    homeassistant/components/binary_sensor/mystrom.py
-    homeassistant/components/binary_sensor/pilight.py
    homeassistant/components/binary_sensor/ping.py
    homeassistant/components/binary_sensor/rest.py
    homeassistant/components/binary_sensor/tapsaff.py
@@ -316,6 +336,7 @@ omit =
    homeassistant/components/camera/foscam.py
    homeassistant/components/camera/mjpeg.py
    homeassistant/components/camera/onvif.py
+    homeassistant/components/camera/proxy.py
    homeassistant/components/camera/ring.py
    homeassistant/components/camera/rpi_camera.py
    homeassistant/components/camera/synology.py
@@ -344,12 +365,14 @@ omit =
    homeassistant/components/cover/scsgate.py
    homeassistant/components/device_tracker/actiontec.py
    homeassistant/components/device_tracker/aruba.py
+    homeassistant/components/device_tracker/asuswrt.py
    homeassistant/components/device_tracker/automatic.py
    homeassistant/components/device_tracker/bbox.py
    homeassistant/components/device_tracker/bluetooth_le_tracker.py
    homeassistant/components/device_tracker/bluetooth_tracker.py
    homeassistant/components/device_tracker/bt_home_hub_5.py
    homeassistant/components/device_tracker/cisco_ios.py
+    homeassistant/components/device_tracker/ddwrt.py
    homeassistant/components/device_tracker/fritz.py
    homeassistant/components/device_tracker/gpslogger.py
    homeassistant/components/device_tracker/hitron_coda.py
@@ -385,20 +408,20 @@ omit =
    homeassistant/components/image_processing/dlib_face_detect.py
    homeassistant/components/image_processing/dlib_face_identify.py
    homeassistant/components/image_processing/seven_segments.py
-    homeassistant/components/keyboard.py
    homeassistant/components/keyboard_remote.py
+    homeassistant/components/keyboard.py
    homeassistant/components/light/avion.py
    homeassistant/components/light/blinksticklight.py
    homeassistant/components/light/blinkt.py
-    homeassistant/components/light/decora.py
    homeassistant/components/light/decora_wifi.py
+    homeassistant/components/light/decora.py
    homeassistant/components/light/flux_led.py
    homeassistant/components/light/greenwave.py
    homeassistant/components/light/hue.py
    homeassistant/components/light/hyperion.py
    homeassistant/components/light/iglo.py
-    homeassistant/components/light/lifx.py
    homeassistant/components/light/lifx_legacy.py
+    homeassistant/components/light/lifx.py
    homeassistant/components/light/limitlessled.py
    homeassistant/components/light/mystrom.py
    homeassistant/components/light/osramlightify.py
@@ -424,6 +447,7 @@ omit =
    homeassistant/components/media_player/bluesound.py
    homeassistant/components/media_player/braviatv.py
    homeassistant/components/media_player/cast.py
+    homeassistant/components/media_player/channels.py
    homeassistant/components/media_player/clementine.py
    homeassistant/components/media_player/cmus.py
    homeassistant/components/media_player/denon.py
@@ -455,6 +479,7 @@ omit =
    homeassistant/components/media_player/russound_rio.py
    homeassistant/components/media_player/russound_rnet.py
    homeassistant/components/media_player/snapcast.py
+    homeassistant/components/media_player/songpal.py
    homeassistant/components/media_player/sonos.py
    homeassistant/components/media_player/spotify.py
    homeassistant/components/media_player/squeezebox.py
@@ -462,8 +487,9 @@ omit =
    homeassistant/components/media_player/vizio.py
    homeassistant/components/media_player/vlc.py
    homeassistant/components/media_player/volumio.py
-    homeassistant/components/media_player/yamaha.py
+    homeassistant/components/media_player/xiaomi_tv.py
    homeassistant/components/media_player/yamaha_musiccast.py
+    homeassistant/components/media_player/yamaha.py
    homeassistant/components/media_player/ziggo_mediabox_xl.py
    homeassistant/components/mycroft.py
    homeassistant/components/notify/aws_lambda.py
@@ -471,8 +497,8 @@ omit =
    homeassistant/components/notify/aws_sqs.py
    homeassistant/components/notify/ciscospark.py
    homeassistant/components/notify/clickatell.py
-    homeassistant/components/notify/clicksend.py
    homeassistant/components/notify/clicksend_tts.py
+    homeassistant/components/notify/clicksend.py
    homeassistant/components/notify/discord.py
    homeassistant/components/notify/free_mobile.py
    homeassistant/components/notify/gntp.py
@@ -497,7 +523,9 @@ omit =
    homeassistant/components/notify/sendgrid.py
    homeassistant/components/notify/simplepush.py
    homeassistant/components/notify/slack.py
+    homeassistant/components/notify/stride.py
    homeassistant/components/notify/smtp.py
+    homeassistant/components/notify/synology_chat.py
    homeassistant/components/notify/syslog.py
    homeassistant/components/notify/telegram.py
    homeassistant/components/notify/telstra.py
@@ -533,7 +561,6 @@ omit =
    homeassistant/components/sensor/crimereports.py
    homeassistant/components/sensor/cups.py
    homeassistant/components/sensor/currencylayer.py
-    homeassistant/components/sensor/darksky.py
    homeassistant/components/sensor/deluge.py
    homeassistant/components/sensor/deutsche_bahn.py
    homeassistant/components/sensor/dht.py
@@ -551,8 +578,11 @@ omit =
    homeassistant/components/sensor/etherscan.py
    homeassistant/components/sensor/fastdotcom.py
    homeassistant/components/sensor/fedex.py
+    homeassistant/components/sensor/filesize.py
    homeassistant/components/sensor/fitbit.py
    homeassistant/components/sensor/fixer.py
+    homeassistant/components/sensor/folder.py
+    homeassistant/components/sensor/foobot.py
    homeassistant/components/sensor/fritzbox_callmonitor.py
    homeassistant/components/sensor/fritzbox_netmonitor.py
    homeassistant/components/sensor/gearbest.py
@@ -565,8 +595,8 @@ omit =
    homeassistant/components/sensor/haveibeenpwned.py
    homeassistant/components/sensor/hp_ilo.py
    homeassistant/components/sensor/htu21d.py
-    homeassistant/components/sensor/imap.py
    homeassistant/components/sensor/imap_email_content.py
+    homeassistant/components/sensor/imap.py
    homeassistant/components/sensor/influxdb.py
    homeassistant/components/sensor/irish_rail_transport.py
    homeassistant/components/sensor/kwb.py
@@ -607,30 +637,34 @@ omit =
    homeassistant/components/sensor/ripple.py
    homeassistant/components/sensor/sabnzbd.py
    homeassistant/components/sensor/scrape.py
+    homeassistant/components/sensor/sense.py
    homeassistant/components/sensor/sensehat.py
-    homeassistant/components/sensor/serial.py
    homeassistant/components/sensor/serial_pm.py
+    homeassistant/components/sensor/serial.py
    homeassistant/components/sensor/shodan.py
+    homeassistant/components/sensor/simulated.py
    homeassistant/components/sensor/skybeacon.py
    homeassistant/components/sensor/sma.py
    homeassistant/components/sensor/snmp.py
    homeassistant/components/sensor/sochain.py
    homeassistant/components/sensor/sonarr.py
    homeassistant/components/sensor/speedtest.py
+    homeassistant/components/sensor/spotcrime.py
    homeassistant/components/sensor/steam_online.py
    homeassistant/components/sensor/supervisord.py
    homeassistant/components/sensor/swiss_hydrological_data.py
    homeassistant/components/sensor/swiss_public_transport.py
+    homeassistant/components/sensor/syncthru.py
    homeassistant/components/sensor/synologydsm.py
    homeassistant/components/sensor/systemmonitor.py
    homeassistant/components/sensor/sytadin.py
    homeassistant/components/sensor/tank_utility.py
    homeassistant/components/sensor/ted5000.py
-    homeassistant/components/sensor/teksavvy.py
    homeassistant/components/sensor/temper.py
    homeassistant/components/sensor/tibber.py
    homeassistant/components/sensor/time_date.py
    homeassistant/components/sensor/torque.py
+    homeassistant/components/sensor/trafikverket_weatherstation.py
    homeassistant/components/sensor/transmission.py
    homeassistant/components/sensor/travisci.py
    homeassistant/components/sensor/twitch.py
@@ -645,6 +679,7 @@ omit =
    homeassistant/components/sensor/worxlandroid.py
    homeassistant/components/sensor/xbox_live.py
    homeassistant/components/sensor/zamg.py
+    homeassistant/components/sensor/zestimate.py
    homeassistant/components/shiftr.py
    homeassistant/components/spc.py
    homeassistant/components/switch/acer_projector.py
@@ -662,7 +697,6 @@ omit =
    homeassistant/components/switch/mystrom.py
    homeassistant/components/switch/netio.py
    homeassistant/components/switch/orvibo.py
-    homeassistant/components/switch/pilight.py
    homeassistant/components/switch/pulseaudio_loopback.py
    homeassistant/components/switch/rainbird.py
    homeassistant/components/switch/rainmachine.py
@@ -672,6 +706,7 @@ omit =
    homeassistant/components/switch/telnet.py
    homeassistant/components/switch/tplink.py
    homeassistant/components/switch/transmission.py
+    homeassistant/components/switch/vesync.py
    homeassistant/components/switch/xiaomi_miio.py
    homeassistant/components/telegram_bot/*
    homeassistant/components/thingspeak.py
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,10 @@
 # Ensure Docker script files uses LF to support Docker for Windows.
-setup_docker_prereqs    eol=lf
-/virtualization/Docker/scripts/*    eol=lf
+# Ensure "git config --global core.autocrlf input" before you clone
+*     text eol=lf
+*.py  whitespace=error
+
+*.ico binary
+*.jpg binary
+*.png binary
+*.zip binary
+*.mp3 binary
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,19 +12,18 @@

 ## Checklist:
  - [ ] The code change is tested and works locally.
+  - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**

 If user exposed functionality or configuration variables are added/changed:
  - [ ] Documentation added/updated in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io)

 If the code communicates with devices, web services, or third-party tools:
-  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
  - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
  - [ ] New dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.
  - [ ] New files were added to `.coveragerc`.

 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#L14
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ Icon
 *.iml

 # pytest
+.pytest_cache
 .cache

 # GITHUB Proposed Python stuff:
@@ -103,3 +104,6 @@ desktop.ini

 # mypy
 /.mypy_cache/*
+
+# Secrets
+.lokalise_token
--- a/.gitmodules
+++ b/.gitmodules
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,10 @@ addons:
 matrix:
  fast_finish: true
  include:
-    - python: "3.4.2"
+    - python: "3.5.3"
      env: TOXENV=lint
-    - python: "3.4.2"
+    - python: "3.5.3"
      env: TOXENV=pylint
-    - python: "3.4.2"
-      env: TOXENV=py34
    # - python: "3.5"
    #   env: TOXENV=typing
    - python: "3.5.3"
@@ -30,4 +28,15 @@ cache:
 install: pip install -U tox coveralls
 language: python
 script: travis_wait 30 tox --develop
+services:
+  - docker
+before_deploy:
+  - docker pull lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7
+deploy:
+  skip_cleanup: true
+  provider: script
+  script: script/travis_deploy
+  on:
+    branch: dev
+    condition: $TOXENV = lint
 after_success: coveralls
--- a/12
+++ b/12
@@ -43,18 +43,25 @@ homeassistant/components/hassio.py @home-assistant/hassio

 # Individual components
 homeassistant/components/alarm_control_panel/egardia.py @jeroenterheerdt
+homeassistant/components/binary_sensor/hikvision.py @mezz64
+homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/camera/yi.py @bachya
 homeassistant/components/climate/ephember.py @ttroy50
 homeassistant/components/climate/eq3btsmart.py @rytilahti
 homeassistant/components/climate/sensibo.py @andrey-git
+homeassistant/components/cover/group.py @cdce8p
 homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/automatic.py @armills
 homeassistant/components/device_tracker/tile.py @bachya
 homeassistant/components/history_graph.py @andrey-git
 homeassistant/components/light/tplink.py @rytilahti
 homeassistant/components/light/yeelight.py @rytilahti
+homeassistant/components/media_player/emby.py @mezz64
 homeassistant/components/media_player/kodi.py @armills
+homeassistant/components/media_player/mediaroom.py @dgomes
 homeassistant/components/media_player/monoprice.py @etsinko
+homeassistant/components/media_player/sonos.py @amelchio
+homeassistant/components/media_player/xiaomi_tv.py @fattdev
 homeassistant/components/media_player/yamaha_musiccast.py @jalmeroth
 homeassistant/components/plant.py @ChristianKuehnel
 homeassistant/components/sensor/airvisual.py @bachya
@@ -63,6 +70,7 @@ homeassistant/components/sensor/irish_rail_transport.py @ttroy50
 homeassistant/components/sensor/miflora.py @danielhiversen @ChristianKuehnel
 homeassistant/components/sensor/pollen.py @bachya
 homeassistant/components/sensor/sytadin.py @gautric
+homeassistant/components/sensor/sql.py @dgomes
 homeassistant/components/sensor/tibber.py @danielhiversen
 homeassistant/components/sensor/waqi.py @andrey-git
 homeassistant/components/switch/rainmachine.py @bachya
@@ -70,9 +78,13 @@ homeassistant/components/switch/tplink.py @rytilahti
 homeassistant/components/xiaomi_aqara.py @danielhiversen @syssi

 homeassistant/components/*/axis.py @kane610
+homeassistant/components/*/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/broadlink.py @danielhiversen
+homeassistant/components/eight_sleep.py @mezz64
+homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/hive.py @Rendili @KJonline
 homeassistant/components/*/hive.py @Rendili @KJonline
+homeassistant/components/homekit/* @cdce8p
 homeassistant/components/*/deconz.py @kane610
 homeassistant/components/*/rfxtrx.py @danielhiversen
 homeassistant/components/velux.py @Julius2342
--- 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/community/blob/master/contributors/devel/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0)
+ - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) 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/docs/source/api/util.rst
+++ b/docs/source/api/util.rst
@@ -4,10 +4,10 @@ homeassistant.util package
 Submodules
 ----------

-homeassistant.util.async module
+homeassistant.util.async_ module
 -------------------------------

-.. automodule:: homeassistant.util.async
+.. automodule:: homeassistant.util.async_
    :members:
    :undoc-members:
    :show-inheritance:
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -22,10 +22,23 @@ import os
 import inspect

 from homeassistant.const import __version__, __short_version__
-from setup import (
-    PROJECT_NAME, PROJECT_LONG_DESCRIPTION, PROJECT_COPYRIGHT, PROJECT_AUTHOR,
-    PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY, GITHUB_PATH,
-    GITHUB_URL)
+
+PROJECT_NAME = 'Home Assistant'
+PROJECT_PACKAGE_NAME = 'homeassistant'
+PROJECT_AUTHOR = 'The Home Assistant Authors'
+PROJECT_COPYRIGHT = ' 2013-2018, {}'.format(PROJECT_AUTHOR)
+PROJECT_LONG_DESCRIPTION = ('Home Assistant is an open-source '
+                            'home automation platform running on Python 3. '
+                            'Track and control all devices at home and '
+                            'automate control. '
+                            'Installation in less than a minute.')
+PROJECT_GITHUB_USERNAME = 'home-assistant'
+PROJECT_GITHUB_REPOSITORY = 'home-assistant'
+
+GITHUB_PATH = '{}/{}'.format(
+    PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY)
+GITHUB_URL = 'https://github.com/{}'.format(GITHUB_PATH)
+

 sys.path.insert(0, os.path.abspath('_ext'))
 sys.path.insert(0, os.path.abspath('../homeassistant'))
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -15,7 +15,6 @@ from homeassistant.const import (
    __version__,
    EVENT_HOMEASSISTANT_START,
    REQUIRED_PYTHON_VER,
-    REQUIRED_PYTHON_VER_WIN,
    RESTART_EXIT_CODE,
 )

@@ -33,12 +32,7 @@ def attempt_use_uvloop():

 def validate_python() -> None:
    """Validate that the right Python version is running."""
-    if sys.platform == "win32" and \
-       sys.version_info[:3] < REQUIRED_PYTHON_VER_WIN:
-        print("Home Assistant requires at least Python {}.{}.{}".format(
-            *REQUIRED_PYTHON_VER_WIN))
-        sys.exit(1)
-    elif sys.version_info[:3] < REQUIRED_PYTHON_VER:
+    if sys.version_info[:3] < REQUIRED_PYTHON_VER:
        print("Home Assistant requires at least Python {}.{}.{}".format(
            *REQUIRED_PYTHON_VER))
        sys.exit(1)
@@ -278,7 +272,7 @@ def setup_and_run_hass(config_dir: str,

    if args.open_ui:
        # Imported here to avoid importing asyncio before monkey patch
-        from homeassistant.util.async import run_callback_threadsafe
+        from homeassistant.util.async_ import run_callback_threadsafe

        def open_browser(event):
            """Open the webinterface in a browser."""
@@ -341,7 +335,8 @@ def main() -> int:
    """Start Home Assistant."""
    validate_python()

-    if os.environ.get('HASS_NO_MONKEY') != '1':
+    monkey_patch_needed = sys.version_info[:3] < (3, 6, 3)
+    if monkey_patch_needed and os.environ.get('HASS_NO_MONKEY') != '1':
        if sys.version_info[:2] >= (3, 6):
            monkey_patch.disable_c_asyncio()
        monkey_patch.patch_weakref_tasks()
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -12,7 +12,8 @@ from typing import Any, Optional, Dict
 import voluptuous as vol

 from homeassistant import (
-    core, config as conf_util, loader, components as core_components)
+    core, config as conf_util, config_entries, loader,
+    components as core_components)
 from homeassistant.components import persistent_notification
 from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.setup import async_setup_component
@@ -35,13 +36,13 @@ FIRST_INIT_COMPONENT = set((


 def from_config_dict(config: Dict[str, Any],
-                     hass: Optional[core.HomeAssistant]=None,
-                     config_dir: Optional[str]=None,
-                     enable_log: bool=True,
-                     verbose: bool=False,
-                     skip_pip: bool=False,
-                     log_rotate_days: Any=None,
-                     log_file: Any=None) \
+                     hass: Optional[core.HomeAssistant] = None,
+                     config_dir: Optional[str] = None,
+                     enable_log: bool = True,
+                     verbose: bool = False,
+                     skip_pip: bool = False,
+                     log_rotate_days: Any = None,
+                     log_file: Any = None) \
                     -> Optional[core.HomeAssistant]:
    """Try to configure Home Assistant from a configuration dictionary.

@@ -68,12 +69,12 @@ def from_config_dict(config: Dict[str, Any],
@asyncio.coroutine
 def async_from_config_dict(config: Dict[str, Any],
                           hass: core.HomeAssistant,
-                           config_dir: Optional[str]=None,
-                           enable_log: bool=True,
-                           verbose: bool=False,
-                           skip_pip: bool=False,
-                           log_rotate_days: Any=None,
-                           log_file: Any=None) \
+                           config_dir: Optional[str] = None,
+                           enable_log: bool = True,
+                           verbose: bool = False,
+                           skip_pip: bool = False,
+                           log_rotate_days: Any = None,
+                           log_file: Any = None) \
                           -> Optional[core.HomeAssistant]:
    """Try to configure Home Assistant from a configuration dictionary.

@@ -85,14 +86,6 @@ def async_from_config_dict(config: Dict[str, Any],
    if enable_log:
        async_enable_logging(hass, verbose, log_rotate_days, log_file)

-    if sys.version_info[:2] < (3, 5):
-        _LOGGER.warning(
-            'Python 3.4 support has been deprecated and will be removed in '
-            'the beginning of 2018. Please upgrade Python or your operating '
-            'system. More info: https://home-assistant.io/blog/2017/10/06/'
-            'deprecating-python-3.4-support/'
-        )
-
    core_config = config.get(core.DOMAIN, {})

    try:
@@ -111,21 +104,25 @@ def async_from_config_dict(config: Dict[str, Any],
    if not loader.PREPARED:
        yield from hass.async_add_job(loader.prepare, hass)

+    # Make a copy because we are mutating it.
+    config = OrderedDict(config)
+
    # 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
-    new_config = OrderedDict()
+    # Ensure we have no None values after merge
    for key, value in config.items():
-        new_config[key] = value or {}
-    config = new_config
+        if not value:
+            config[key] = {}
+
+    hass.config_entries = config_entries.ConfigEntries(hass, config)
+    yield from hass.config_entries.async_load()

    # Filter out the repeating and common config section [homeassistant]
    components = set(key.split(' ')[0] for key in config.keys()
                     if key != core.DOMAIN)
+    components.update(hass.config_entries.async_domains())

    # setup components
    # pylint: disable=not-an-iterable
@@ -163,11 +160,11 @@ def async_from_config_dict(config: Dict[str, Any],


 def from_config_file(config_path: str,
-                     hass: Optional[core.HomeAssistant]=None,
-                     verbose: bool=False,
-                     skip_pip: bool=True,
-                     log_rotate_days: Any=None,
-                     log_file: Any=None):
+                     hass: Optional[core.HomeAssistant] = None,
+                     verbose: bool = False,
+                     skip_pip: bool = True,
+                     log_rotate_days: Any = None,
+                     log_file: Any = None):
    """Read the configuration file and try to start all the functionality.

    Will add functionality to 'hass' parameter if given,
@@ -188,10 +185,10 @@ def from_config_file(config_path: str,
@asyncio.coroutine
 def async_from_config_file(config_path: str,
                           hass: core.HomeAssistant,
-                           verbose: bool=False,
-                           skip_pip: bool=True,
-                           log_rotate_days: Any=None,
-                           log_file: Any=None):
+                           verbose: bool = False,
+                           skip_pip: bool = True,
+                           log_rotate_days: Any = None,
+                           log_file: Any = None):
    """Read the configuration file and try to start all the functionality.

    Will add functionality to 'hass' parameter.
@@ -219,7 +216,7 @@ def async_from_config_file(config_path: str,


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

--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -15,6 +15,7 @@ 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.helpers import intent
 from homeassistant.const import (
    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE,
    SERVICE_HOMEASSISTANT_STOP, SERVICE_HOMEASSISTANT_RESTART,
@@ -154,6 +155,13 @@ def async_setup(hass, config):
        ha.DOMAIN, SERVICE_TURN_ON, async_handle_turn_service)
    hass.services.async_register(
        ha.DOMAIN, SERVICE_TOGGLE, async_handle_turn_service)
+    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
+        intent.INTENT_TURN_ON, ha.DOMAIN, SERVICE_TURN_ON, "Turned {} on"))
+    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
+        intent.INTENT_TURN_OFF, ha.DOMAIN, SERVICE_TURN_OFF,
+        "Turned {} off"))
+    hass.helpers.intent.async_register(intent.ServiceIntentHandler(
+        intent.INTENT_TOGGLE, ha.DOMAIN, SERVICE_TOGGLE, "Toggled {}"))

    @asyncio.coroutine
    def async_handle_core_service(call):
--- a/homeassistant/components/abode.py
+++ b/homeassistant/components/abode.py
@@ -7,6 +7,7 @@ https://home-assistant.io/components/abode/
 import asyncio
 import logging
 from functools import partial
+from requests.exceptions import HTTPError, ConnectTimeout

 import voluptuous as vol

@@ -17,7 +18,6 @@ from homeassistant.const import (
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
-from requests.exceptions import HTTPError, ConnectTimeout

 REQUIREMENTS = ['abodepy==0.12.2']

--- a/homeassistant/components/alarm_control_panel/alarmdotcom.py
+++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['pyalarmdotcom==0.3.0']
+REQUIREMENTS = ['pyalarmdotcom==0.3.1']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/alarm_control_panel/canary.py
+++ b/homeassistant/components/alarm_control_panel/canary.py
@@ -59,8 +59,7 @@ class CanaryAlarm(AlarmControlPanel):
            return STATE_ALARM_ARMED_HOME
        elif mode.name == LOCATION_MODE_NIGHT:
            return STATE_ALARM_ARMED_NIGHT
-        else:
-            return None
+        return None

    @property
    def device_state_attributes(self):
--- a/homeassistant/components/alarm_control_panel/concord232.py
+++ b/homeassistant/components/alarm_control_panel/concord232.py
@@ -26,7 +26,7 @@ DEFAULT_HOST = 'localhost'
 DEFAULT_NAME = 'CONCORD232'
 DEFAULT_PORT = 5007

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

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
--- a/homeassistant/components/alarm_control_panel/egardia.py
+++ b/homeassistant/components/alarm_control_panel/egardia.py
@@ -4,130 +4,70 @@ Interfaces with Egardia/Woonveilig alarm control panel.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.egardia/
 """
+import asyncio
 import logging

 import requests
-import voluptuous as vol

 import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_USERNAME,
-    EVENT_HOMEASSISTANT_STOP, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
-import homeassistant.exceptions as exc
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pythonegardia==1.0.26']
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_TRIGGERED,
+    STATE_ALARM_ARMED_NIGHT)
+from homeassistant.components.egardia import (
+    EGARDIA_DEVICE, EGARDIA_SERVER,
+    REPORT_SERVER_CODES_IGNORE, CONF_REPORT_SERVER_CODES,
+    CONF_REPORT_SERVER_ENABLED, CONF_REPORT_SERVER_PORT
+    )
+DEPENDENCIES = ['egardia']

 _LOGGER = logging.getLogger(__name__)

-CONF_REPORT_SERVER_CODES = 'report_server_codes'
-CONF_REPORT_SERVER_ENABLED = 'report_server_enabled'
-CONF_REPORT_SERVER_PORT = 'report_server_port'
-CONF_REPORT_SERVER_CODES_IGNORE = 'ignore'
-CONF_VERSION = 'version'
-
-DEFAULT_NAME = 'Egardia'
-DEFAULT_PORT = 80
-DEFAULT_REPORT_SERVER_ENABLED = False
-DEFAULT_REPORT_SERVER_PORT = 52010
-DEFAULT_VERSION = 'GATE-01'
-DOMAIN = 'egardia'
-D_EGARDIASRV = 'egardiaserver'
-
-NOTIFICATION_ID = 'egardia_notification'
-NOTIFICATION_TITLE = 'Egardia'
-
 STATES = {
    'ARM': STATE_ALARM_ARMED_AWAY,
    'DAY HOME': STATE_ALARM_ARMED_HOME,
    'DISARM': STATE_ALARM_DISARMED,
+    'ARMHOME': STATE_ALARM_ARMED_HOME,
    'HOME': STATE_ALARM_ARMED_HOME,
-    'TRIGGERED': STATE_ALARM_TRIGGERED,
-    'UNKNOWN': STATE_UNKNOWN,
+    'NIGHT HOME': STATE_ALARM_ARMED_NIGHT,
+    'TRIGGERED': STATE_ALARM_TRIGGERED
 }

-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): cv.string,
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    vol.Optional(CONF_REPORT_SERVER_CODES): vol.All(cv.ensure_list),
-    vol.Optional(CONF_REPORT_SERVER_ENABLED,
-                 default=DEFAULT_REPORT_SERVER_ENABLED): cv.boolean,
-    vol.Optional(CONF_REPORT_SERVER_PORT, default=DEFAULT_REPORT_SERVER_PORT):
-        cv.port,
-})
-

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up the Egardia platform."""
-    from pythonegardia import egardiadevice
-    from pythonegardia import egardiaserver
-
-    name = config.get(CONF_NAME)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    host = config.get(CONF_HOST)
-    port = config.get(CONF_PORT)
-    rs_enabled = config.get(CONF_REPORT_SERVER_ENABLED)
-    rs_port = config.get(CONF_REPORT_SERVER_PORT)
-    rs_codes = config.get(CONF_REPORT_SERVER_CODES)
-    version = config.get(CONF_VERSION)
-
-    try:
-        egardiasystem = egardiadevice.EgardiaDevice(
-            host, port, username, password, '', version)
-    except requests.exceptions.RequestException:
-        raise exc.PlatformNotReady()
-    except egardiadevice.UnauthorizedError:
-        _LOGGER.error("Unable to authorize. Wrong password or username")
+    if discovery_info is None:
        return
-
-    eg_dev = EgardiaAlarm(
-        name, egardiasystem, rs_enabled, rs_codes)
-
-    if rs_enabled:
-        # Set up the egardia server
-        _LOGGER.info("Setting up EgardiaServer")
-        try:
-            if D_EGARDIASRV not in hass.data:
-                server = egardiaserver.EgardiaServer('', rs_port)
-                bound = server.bind()
-                if not bound:
-                    raise IOError(
-                        "Binding error occurred while starting EgardiaServer")
-                hass.data[D_EGARDIASRV] = server
-                server.start()
-        except IOError:
-            return
-        hass.data[D_EGARDIASRV].register_callback(eg_dev.handle_status_event)
-
-    def handle_stop_event(event):
-        """Call function for Home Assistant stop event."""
-        hass.data[D_EGARDIASRV].stop()
-
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, handle_stop_event)
-
-    add_devices([eg_dev], True)
+    device = EgardiaAlarm(
+        discovery_info['name'],
+        hass.data[EGARDIA_DEVICE],
+        discovery_info[CONF_REPORT_SERVER_ENABLED],
+        discovery_info.get(CONF_REPORT_SERVER_CODES),
+        discovery_info[CONF_REPORT_SERVER_PORT])
+    # add egardia alarm device
+    add_devices([device], True)


 class EgardiaAlarm(alarm.AlarmControlPanel):
    """Representation of a Egardia alarm."""

-    def __init__(self, name, egardiasystem, rs_enabled=False, rs_codes=None):
+    def __init__(self, name, egardiasystem,
+                 rs_enabled=False, rs_codes=None, rs_port=52010):
        """Initialize the Egardia alarm."""
        self._name = name
        self._egardiasystem = egardiasystem
        self._status = None
        self._rs_enabled = rs_enabled
-        if rs_codes is not None:
-            self._rs_codes = rs_codes[0]
-        else:
-            self._rs_codes = rs_codes
+        self._rs_codes = rs_codes
+        self._rs_port = rs_port
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Add Egardiaserver callback if enabled."""
+        if self._rs_enabled:
+            _LOGGER.debug("Registering callback to Egardiaserver")
+            self.hass.data[EGARDIA_SERVER].register_callback(
+                self.handle_status_event)

    @property
    def name(self):
@@ -156,31 +96,20 @@ class EgardiaAlarm(alarm.AlarmControlPanel):

    def lookupstatusfromcode(self, statuscode):
        """Look at the rs_codes and returns the status from the code."""
-        status = 'UNKNOWN'
-        if self._rs_codes is not None:
-            statuscode = str(statuscode).strip()
-            for i in self._rs_codes:
-                val = str(self._rs_codes[i]).strip()
-                if ',' in val:
-                    splitted = val.split(',')
-                    for code in splitted:
-                        code = str(code).strip()
-                        if statuscode == code:
-                            status = i.upper()
-                            break
-                elif statuscode == val:
-                    status = i.upper()
-                    break
+        status = next((
+            status_group.upper() for status_group, codes
+            in self._rs_codes.items() for code in codes
+            if statuscode == code), 'UNKNOWN')
        return status

    def parsestatus(self, status):
        """Parse the status."""
        _LOGGER.debug("Parsing status %s", status)
        # Ignore the statuscode if it is IGNORE
-        if status.lower().strip() != CONF_REPORT_SERVER_CODES_IGNORE:
-            _LOGGER.debug("Not ignoring status")
-            newstatus = ([v for k, v in STATES.items()
-                          if status.upper() == k][0])
+        if status.lower().strip() != REPORT_SERVER_CODES_IGNORE:
+            _LOGGER.debug("Not ignoring status %s", status)
+            newstatus = STATES.get(status.upper())
+            _LOGGER.debug("newstatus %s", newstatus)
            self._status = newstatus
        else:
            _LOGGER.error("Ignoring status")
--- a/homeassistant/components/alarm_control_panel/ifttt.py
+++ b/homeassistant/components/alarm_control_panel/ifttt.py
@@ -0,0 +1,170 @@
+"""
+Interfaces with alarm control panels that have to be controlled through IFTTT.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.ifttt/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.alarm_control_panel import (
+    DOMAIN, PLATFORM_SCHEMA)
+from homeassistant.components.ifttt import (
+    ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_STATE, CONF_NAME, CONF_CODE,
+    CONF_OPTIMISTIC, STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+import homeassistant.helpers.config_validation as cv
+
+DEPENDENCIES = ['ifttt']
+
+_LOGGER = logging.getLogger(__name__)
+
+ALLOWED_STATES = [
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME]
+
+DATA_IFTTT_ALARM = 'ifttt_alarm'
+DEFAULT_NAME = "Home"
+
+CONF_EVENT_AWAY = "event_arm_away"
+CONF_EVENT_HOME = "event_arm_home"
+CONF_EVENT_NIGHT = "event_arm_night"
+CONF_EVENT_DISARM = "event_disarm"
+
+DEFAULT_EVENT_AWAY = "alarm_arm_away"
+DEFAULT_EVENT_HOME = "alarm_arm_home"
+DEFAULT_EVENT_NIGHT = "alarm_arm_night"
+DEFAULT_EVENT_DISARM = "alarm_disarm"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_CODE): cv.string,
+    vol.Optional(CONF_EVENT_AWAY, default=DEFAULT_EVENT_AWAY): cv.string,
+    vol.Optional(CONF_EVENT_HOME, default=DEFAULT_EVENT_HOME): cv.string,
+    vol.Optional(CONF_EVENT_NIGHT, default=DEFAULT_EVENT_NIGHT): cv.string,
+    vol.Optional(CONF_EVENT_DISARM, default=DEFAULT_EVENT_DISARM): cv.string,
+    vol.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+})
+
+SERVICE_PUSH_ALARM_STATE = "ifttt_push_alarm_state"
+
+PUSH_ALARM_STATE_SERVICE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_STATE): cv.string,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up a control panel managed through IFTTT."""
+    if DATA_IFTTT_ALARM not in hass.data:
+        hass.data[DATA_IFTTT_ALARM] = []
+
+    name = config.get(CONF_NAME)
+    code = config.get(CONF_CODE)
+    event_away = config.get(CONF_EVENT_AWAY)
+    event_home = config.get(CONF_EVENT_HOME)
+    event_night = config.get(CONF_EVENT_NIGHT)
+    event_disarm = config.get(CONF_EVENT_DISARM)
+    optimistic = config.get(CONF_OPTIMISTIC)
+
+    alarmpanel = IFTTTAlarmPanel(name, code, event_away, event_home,
+                                 event_night, event_disarm, optimistic)
+    hass.data[DATA_IFTTT_ALARM].append(alarmpanel)
+    add_devices([alarmpanel])
+
+    async def push_state_update(service):
+        """Set the service state as device state attribute."""
+        entity_ids = service.data.get(ATTR_ENTITY_ID)
+        state = service.data.get(ATTR_STATE)
+        devices = hass.data[DATA_IFTTT_ALARM]
+        if entity_ids:
+            devices = [d for d in devices if d.entity_id in entity_ids]
+
+        for device in devices:
+            device.push_alarm_state(state)
+            device.async_schedule_update_ha_state()
+
+    hass.services.register(DOMAIN, SERVICE_PUSH_ALARM_STATE, push_state_update,
+                           schema=PUSH_ALARM_STATE_SERVICE_SCHEMA)
+
+
+class IFTTTAlarmPanel(alarm.AlarmControlPanel):
+    """Representation of an alarm control panel controlled throught IFTTT."""
+
+    def __init__(self, name, code, event_away, event_home, event_night,
+                 event_disarm, optimistic):
+        """Initialize the alarm control panel."""
+        self._name = name
+        self._code = code
+        self._event_away = event_away
+        self._event_home = event_home
+        self._event_night = event_night
+        self._event_disarm = event_disarm
+        self._optimistic = optimistic
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    @property
+    def assumed_state(self):
+        """Notify that this platform return an assumed state."""
+        return True
+
+    @property
+    def code_format(self):
+        """Return one or more characters."""
+        return None if self._code is None else '.+'
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_disarm, STATE_ALARM_DISARMED)
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_away, STATE_ALARM_ARMED_AWAY)
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_home, STATE_ALARM_ARMED_HOME)
+
+    def alarm_arm_night(self, code=None):
+        """Send arm night command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_night, STATE_ALARM_ARMED_NIGHT)
+
+    def set_alarm_state(self, event, state):
+        """Call the IFTTT trigger service to change the alarm state."""
+        data = {ATTR_EVENT: event}
+
+        self.hass.services.call(IFTTT_DOMAIN, SERVICE_TRIGGER, data)
+        _LOGGER.debug("Called IFTTT component to trigger event %s", event)
+        if self._optimistic:
+            self._state = state
+
+    def push_alarm_state(self, value):
+        """Push the alarm state to the given value."""
+        if value in ALLOWED_STATES:
+            _LOGGER.debug("Pushed the alarm state to %s", value)
+            self._state = value
+
+    def _check_code(self, code):
+        return self._code is None or self._code == code
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -172,9 +172,8 @@ class ManualAlarm(alarm.AlarmControlPanel):
                    trigger_time) < dt_util.utcnow():
                if self._disarm_after_trigger:
                    return STATE_ALARM_DISARMED
-                else:
-                    self._state = self._previous_state
-                    return self._state
+                self._state = self._previous_state
+                return self._state

        if self._state in SUPPORTED_PENDING_STATES and \
                self._within_pending_time(self._state):
@@ -187,8 +186,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
        """Get the current state."""
        if self.state == STATE_ALARM_PENDING:
            return self._previous_state
-        else:
-            return self._state
+        return self._state

    def _pending_time(self, state):
        """Get the pending time."""
--- a/homeassistant/components/alarm_control_panel/manual_mqtt.py
+++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py
@@ -208,9 +208,8 @@ class ManualMQTTAlarm(alarm.AlarmControlPanel):
                    trigger_time) < dt_util.utcnow():
                if self._disarm_after_trigger:
                    return STATE_ALARM_DISARMED
-                else:
-                    self._state = self._previous_state
-                    return self._state
+                self._state = self._previous_state
+                return self._state

        if self._state in SUPPORTED_PENDING_STATES and \
                self._within_pending_time(self._state):
@@ -223,8 +222,7 @@ class ManualMQTTAlarm(alarm.AlarmControlPanel):
        """Get the current state."""
        if self.state == STATE_ALARM_PENDING:
            return self._previous_state
-        else:
-            return self._state
+        return self._state

    def _pending_time(self, state):
        """Get the pending time."""
--- a/homeassistant/components/alarm_control_panel/services.yaml
+++ b/homeassistant/components/alarm_control_panel/services.yaml
@@ -1,71 +1,81 @@
-# Describes the format for available alarm control panel services
-
-alarm_disarm:
-  description: Send the alarm the command for disarm.
-  fields:
-    entity_id:
-      description: Name of alarm control panel to disarm.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: An optional code to disarm the alarm control panel with.
-      example: 1234
-
-alarm_arm_home:
-  description: Send the alarm the command for arm home.
-  fields:
-    entity_id:
-      description: Name of alarm control panel to arm home.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: An optional code to arm home the alarm control panel with.
-      example: 1234
-
-alarm_arm_away:
-  description: Send the alarm the command for arm away.
-  fields:
-    entity_id:
-      description: Name of alarm control panel to arm away.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: An optional code to arm away the alarm control panel with.
-      example: 1234
-
-alarm_arm_night:
-  description: Send the alarm the command for arm night.
-  fields:
-    entity_id:
-      description: Name of alarm control panel to arm night.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: An optional code to arm night the alarm control panel with.
-      example: 1234
-
-alarm_trigger:
-  description: Send the alarm the command for trigger.
-  fields:
-    entity_id:
-      description: Name of alarm control panel to trigger.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: An optional code to trigger the alarm control panel with.
-      example: 1234
-
-envisalink_alarm_keypress:
-  description: Send custom keypresses to the alarm.
-  fields:
-    entity_id:
-      description: Name of the alarm control panel to trigger.
-      example: 'alarm_control_panel.downstairs'
-    keypress:
-      description: 'String to send to the alarm panel (1-6 characters).'
-      example: '*71'
-
-alarmdecoder_alarm_toggle_chime:
-  description: Send the alarm the toggle chime command.
-  fields:
-    entity_id:
-      description: Name of the alarm control panel to trigger.
-      example: 'alarm_control_panel.downstairs'
-    code:
-      description: A required code to toggle the alarm control panel chime with.
-      example: 1234
+# Describes the format for available alarm control panel services
+
+alarm_disarm:
+  description: Send the alarm the command for disarm.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to disarm.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to disarm the alarm control panel with.
+      example: 1234
+
+alarm_arm_home:
+  description: Send the alarm the command for arm home.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm home.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm home the alarm control panel with.
+      example: 1234
+
+alarm_arm_away:
+  description: Send the alarm the command for arm away.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm away.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm away the alarm control panel with.
+      example: 1234
+
+alarm_arm_night:
+  description: Send the alarm the command for arm night.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to arm night.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to arm night the alarm control panel with.
+      example: 1234
+
+alarm_trigger:
+  description: Send the alarm the command for trigger.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to trigger.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: An optional code to trigger the alarm control panel with.
+      example: 1234
+
+envisalink_alarm_keypress:
+  description: Send custom keypresses to the alarm.
+  fields:
+    entity_id:
+      description: Name of the alarm control panel to trigger.
+      example: 'alarm_control_panel.downstairs'
+    keypress:
+      description: 'String to send to the alarm panel (1-6 characters).'
+      example: '*71'
+
+alarmdecoder_alarm_toggle_chime:
+  description: Send the alarm the toggle chime command.
+  fields:
+    entity_id:
+      description: Name of the alarm control panel to trigger.
+      example: 'alarm_control_panel.downstairs'
+    code:
+      description: A required code to toggle the alarm control panel chime with.
+      example: 1234
+
+ifttt_push_alarm_state:
+  description: Update the alarm state to the specified value.
+  fields:
+    entity_id:
+      description: Name of the alarm control panel which state has to be updated.
+      example: 'alarm_control_panel.downstairs'
+    state:
+      description: The state to which the alarm control panel has to be set.
+      example: 'armed_night'
--- a/homeassistant/components/alert.py
+++ b/homeassistant/components/alert.py
@@ -34,7 +34,7 @@ DEFAULT_SKIP_FIRST = False

 ALERT_SCHEMA = vol.Schema({
    vol.Required(CONF_NAME): cv.string,
-    vol.Optional(CONF_DONE_MESSAGE, default=None): cv.string,
+    vol.Optional(CONF_DONE_MESSAGE): cv.string,
    vol.Required(CONF_ENTITY_ID): cv.entity_id,
    vol.Required(CONF_STATE, default=STATE_ON): cv.string,
    vol.Required(CONF_REPEAT): vol.All(cv.ensure_list, [vol.Coerce(float)]),
@@ -121,7 +121,7 @@ def async_setup(hass, config):
    # Setup alerts
    for entity_id, alert in alerts.items():
        entity = Alert(hass, entity_id,
-                       alert[CONF_NAME], alert[CONF_DONE_MESSAGE],
+                       alert[CONF_NAME], alert.get(CONF_DONE_MESSAGE),
                       alert[CONF_ENTITY_ID], alert[CONF_STATE],
                       alert[CONF_REPEAT], alert[CONF_SKIP_FIRST],
                       alert[CONF_NOTIFIERS], alert[CONF_CAN_ACK])
--- a/homeassistant/components/alexa/init.py
+++ b/homeassistant/components/alexa/init.py
@@ -31,10 +31,7 @@ ALEXA_ENTITY_SCHEMA = vol.Schema({
 })

 SMART_HOME_SCHEMA = vol.Schema({
-    vol.Optional(
-        CONF_FILTER,
-        default=lambda: entityfilter.generate_filter([], [], [], [])
-    ): entityfilter.FILTER_SCHEMA,
+    vol.Optional(CONF_FILTER, default={}): entityfilter.FILTER_SCHEMA,
    vol.Optional(CONF_ENTITY_CONFIG): {cv.entity_id: ALEXA_ENTITY_SCHEMA}
 })

--- a/homeassistant/components/alexa/smart_home.py
+++ b/homeassistant/components/alexa/smart_home.py
@@ -391,6 +391,7 @@ class _AlexaTemperatureSensor(_AlexaInterface):

@ENTITY_ADAPTERS.register(alert.DOMAIN)
@ENTITY_ADAPTERS.register(automation.DOMAIN)
+@ENTITY_ADAPTERS.register(group.DOMAIN)
@ENTITY_ADAPTERS.register(input_boolean.DOMAIN)
 class _GenericCapabilities(_AlexaEntity):
    """A generic, on/off device.
@@ -437,9 +438,7 @@ class _LightCapabilities(_AlexaEntity):
        supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
        if supported & light.SUPPORT_BRIGHTNESS:
            yield _AlexaBrightnessController(self.entity)
-        if supported & light.SUPPORT_RGB_COLOR:
-            yield _AlexaColorController(self.entity)
-        if supported & light.SUPPORT_XY_COLOR:
+        if supported & light.SUPPORT_COLOR:
            yield _AlexaColorController(self.entity)
        if supported & light.SUPPORT_COLOR_TEMP:
            yield _AlexaColorTemperatureController(self.entity)
@@ -521,16 +520,6 @@ class _ScriptCapabilities(_AlexaEntity):
                                      supports_deactivation=can_cancel)]


-@ENTITY_ADAPTERS.register(group.DOMAIN)
-class _GroupCapabilities(_AlexaEntity):
-    def default_display_categories(self):
-        return [_DisplayCategory.SCENE_TRIGGER]
-
-    def interfaces(self):
-        return [_AlexaSceneController(self.entity,
-                                      supports_deactivation=True)]
-
-
@ENTITY_ADAPTERS.register(sensor.DOMAIN)
 class _SensorCapabilities(_AlexaEntity):
    def default_display_categories(self):
@@ -773,6 +762,8 @@ def extract_entity(funct):
 def async_api_turn_on(hass, config, request, entity):
    """Process a turn on request."""
    domain = entity.domain
+    if entity.domain == group.DOMAIN:
+        domain = ha.DOMAIN

    service = SERVICE_TURN_ON
    if entity.domain == cover.DOMAIN:
@@ -849,25 +840,16 @@ def async_api_adjust_brightness(hass, config, request, entity):
@asyncio.coroutine
 def async_api_set_color(hass, config, request, entity):
    """Process a set color request."""
-    supported = entity.attributes.get(ATTR_SUPPORTED_FEATURES)
    rgb = color_util.color_hsb_to_RGB(
        float(request[API_PAYLOAD]['color']['hue']),
        float(request[API_PAYLOAD]['color']['saturation']),
        float(request[API_PAYLOAD]['color']['brightness'])
    )

-    if supported & light.SUPPORT_RGB_COLOR > 0:
-        yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
-            ATTR_ENTITY_ID: entity.entity_id,
-            light.ATTR_RGB_COLOR: rgb,
-        }, blocking=False)
-    else:
-        xyz = color_util.color_RGB_to_xy(*rgb)
-        yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
-            ATTR_ENTITY_ID: entity.entity_id,
-            light.ATTR_XY_COLOR: (xyz[0], xyz[1]),
-            light.ATTR_BRIGHTNESS: xyz[2],
-        }, blocking=False)
+    yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
+        ATTR_ENTITY_ID: entity.entity_id,
+        light.ATTR_RGB_COLOR: rgb,
+    }, blocking=False)

    return api_message(request)

@@ -928,10 +910,7 @@ def async_api_increase_color_temp(hass, config, request, entity):
@asyncio.coroutine
 def async_api_activate(hass, config, request, entity):
    """Process an activate request."""
-    if entity.domain == group.DOMAIN:
-        domain = ha.DOMAIN
-    else:
-        domain = entity.domain
+    domain = entity.domain

    yield from hass.services.async_call(domain, SERVICE_TURN_ON, {
        ATTR_ENTITY_ID: entity.entity_id
@@ -955,10 +934,7 @@ def async_api_activate(hass, config, request, entity):
@asyncio.coroutine
 def async_api_deactivate(hass, config, request, entity):
    """Process a deactivate request."""
-    if entity.domain == group.DOMAIN:
-        domain = ha.DOMAIN
-    else:
-        domain = entity.domain
+    domain = entity.domain

    yield from hass.services.async_call(domain, SERVICE_TURN_OFF, {
        ATTR_ENTITY_ID: entity.entity_id
@@ -1178,20 +1154,24 @@ def async_api_adjust_volume(hass, config, request, entity):
@asyncio.coroutine
 def async_api_adjust_volume_step(hass, config, request, entity):
    """Process an adjust volume step request."""
-    volume_step = round(float(request[API_PAYLOAD]['volumeSteps'] / 100), 2)
-
-    current_level = entity.attributes.get(media_player.ATTR_MEDIA_VOLUME_LEVEL)
-
-    volume = current_level + volume_step
+    # media_player volume up/down service does not support specifying steps
+    # each component handles it differently e.g. via config.
+    # For now we use the volumeSteps returned to figure out if we
+    # should step up/down
+    volume_step = request[API_PAYLOAD]['volumeSteps']

    data = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
    }

-    yield from hass.services.async_call(
-        entity.domain, media_player.SERVICE_VOLUME_SET,
-        data, blocking=False)
+    if volume_step > 0:
+        yield from hass.services.async_call(
+            entity.domain, media_player.SERVICE_VOLUME_UP,
+            data, blocking=False)
+    elif volume_step < 0:
+        yield from hass.services.async_call(
+            entity.domain, media_player.SERVICE_VOLUME_DOWN,
+            data, blocking=False)

    return api_message(request)

--- a/homeassistant/components/amcrest.py
+++ b/homeassistant/components/amcrest.py
@@ -79,7 +79,7 @@ CONFIG_SCHEMA = vol.Schema({
        vol.Optional(CONF_FFMPEG_ARGUMENTS): cv.string,
        vol.Optional(CONF_SCAN_INTERVAL, default=SCAN_INTERVAL):
            cv.time_period,
-        vol.Optional(CONF_SENSORS, default=None):
+        vol.Optional(CONF_SENSORS):
            vol.All(cv.ensure_list, [vol.In(SENSORS)]),
    })])
 }, extra=vol.ALLOW_EXTRA)
--- a/homeassistant/components/android_ip_webcam.py
+++ b/homeassistant/components/android_ip_webcam.py
@@ -140,11 +140,11 @@ CONFIG_SCHEMA = vol.Schema({
            cv.time_period,
        vol.Inclusive(CONF_USERNAME, 'authentication'): cv.string,
        vol.Inclusive(CONF_PASSWORD, 'authentication'): cv.string,
-        vol.Optional(CONF_SWITCHES, default=None):
+        vol.Optional(CONF_SWITCHES):
            vol.All(cv.ensure_list, [vol.In(SWITCHES)]),
-        vol.Optional(CONF_SENSORS, default=None):
+        vol.Optional(CONF_SENSORS):
            vol.All(cv.ensure_list, [vol.In(SENSORS)]),
-        vol.Optional(CONF_MOTION_SENSOR, default=None): cv.boolean,
+        vol.Optional(CONF_MOTION_SENSOR): cv.boolean,
    })])
 }, extra=vol.ALLOW_EXTRA)

@@ -165,9 +165,9 @@ def async_setup(hass, config):
        password = cam_config.get(CONF_PASSWORD)
        name = cam_config[CONF_NAME]
        interval = cam_config[CONF_SCAN_INTERVAL]
-        switches = cam_config[CONF_SWITCHES]
-        sensors = cam_config[CONF_SENSORS]
-        motion = cam_config[CONF_MOTION_SENSOR]
+        switches = cam_config.get(CONF_SWITCHES)
+        sensors = cam_config.get(CONF_SENSORS)
+        motion = cam_config.get(CONF_MOTION_SENSOR)

        # Init ip webcam
        cam = PyDroidIPCam(
--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -131,8 +131,7 @@ class APIEventStream(HomeAssistantView):
                    msg = "data: {}\n\n".format(payload)
                    _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
                                  msg.strip())
-                    response.write(msg.encode("UTF-8"))
-                    yield from response.drain()
+                    yield from response.write(msg.encode("UTF-8"))
                except asyncio.TimeoutError:
                    yield from to_write.put(STREAM_PING_PAYLOAD)

--- a/homeassistant/components/apple_tv.py
+++ b/homeassistant/components/apple_tv.py
@@ -60,7 +60,7 @@ CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.All(ensure_list, [vol.Schema({
        vol.Required(CONF_HOST): cv.string,
        vol.Required(CONF_LOGIN_ID): cv.string,
-        vol.Optional(CONF_CREDENTIALS, default=None): cv.string,
+        vol.Optional(CONF_CREDENTIALS): cv.string,
        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
        vol.Optional(CONF_START_OFF, default=False): cv.boolean,
    })])
--- a/homeassistant/components/august.py
+++ b/homeassistant/components/august.py
@@ -0,0 +1,257 @@
+"""
+Support for August devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/august/
+"""
+
+import logging
+from datetime import timedelta
+
+import voluptuous as vol
+from requests import RequestException
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    CONF_PASSWORD, CONF_USERNAME, CONF_TIMEOUT)
+from homeassistant.helpers import discovery
+from homeassistant.util import Throttle
+
+_LOGGER = logging.getLogger(__name__)
+
+_CONFIGURING = {}
+
+REQUIREMENTS = ['py-august==0.4.0']
+
+DEFAULT_TIMEOUT = 10
+ACTIVITY_FETCH_LIMIT = 10
+ACTIVITY_INITIAL_FETCH_LIMIT = 20
+
+CONF_LOGIN_METHOD = 'login_method'
+CONF_INSTALL_ID = 'install_id'
+
+NOTIFICATION_ID = 'august_notification'
+NOTIFICATION_TITLE = "August Setup"
+
+AUGUST_CONFIG_FILE = '.august.conf'
+
+DATA_AUGUST = 'august'
+DOMAIN = 'august'
+DEFAULT_ENTITY_NAMESPACE = 'august'
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=5)
+DEFAULT_SCAN_INTERVAL = timedelta(seconds=5)
+LOGIN_METHODS = ['phone', 'email']
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_LOGIN_METHOD): vol.In(LOGIN_METHODS),
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_INSTALL_ID): cv.string,
+        vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+AUGUST_COMPONENTS = [
+    'camera', 'binary_sensor', 'lock'
+]
+
+
+def request_configuration(hass, config, api, authenticator):
+    """Request configuration steps from the user."""
+    configurator = hass.components.configurator
+
+    def august_configuration_callback(data):
+        """Run when the configuration callback is called."""
+        from august.authenticator import ValidationResult
+
+        result = authenticator.validate_verification_code(
+            data.get('verification_code'))
+
+        if result == ValidationResult.INVALID_VERIFICATION_CODE:
+            configurator.notify_errors(_CONFIGURING[DOMAIN],
+                                       "Invalid verification code")
+        elif result == ValidationResult.VALIDATED:
+            setup_august(hass, config, api, authenticator)
+
+    if DOMAIN not in _CONFIGURING:
+        authenticator.send_verification_code()
+
+    conf = config[DOMAIN]
+    username = conf.get(CONF_USERNAME)
+    login_method = conf.get(CONF_LOGIN_METHOD)
+
+    _CONFIGURING[DOMAIN] = configurator.request_config(
+        NOTIFICATION_TITLE,
+        august_configuration_callback,
+        description="Please check your {} ({}) and enter the verification "
+                    "code below".format(login_method, username),
+        submit_caption='Verify',
+        fields=[{
+            'id': 'verification_code',
+            'name': "Verification code",
+            'type': 'string'}]
+    )
+
+
+def setup_august(hass, config, api, authenticator):
+    """Set up the August component."""
+    from august.authenticator import AuthenticationState
+
+    authentication = None
+    try:
+        authentication = authenticator.authenticate()
+    except RequestException as ex:
+        _LOGGER.error("Unable to connect to August service: %s", str(ex))
+
+        hass.components.persistent_notification.create(
+            "Error: {}<br />"
+            "You will need to restart hass after fixing."
+            "".format(ex),
+            title=NOTIFICATION_TITLE,
+            notification_id=NOTIFICATION_ID)
+
+    state = authentication.state
+
+    if state == AuthenticationState.AUTHENTICATED:
+        if DOMAIN in _CONFIGURING:
+            hass.components.configurator.request_done(_CONFIGURING.pop(DOMAIN))
+
+        hass.data[DATA_AUGUST] = AugustData(api, authentication.access_token)
+
+        for component in AUGUST_COMPONENTS:
+            discovery.load_platform(hass, component, DOMAIN, {}, config)
+
+        return True
+    elif state == AuthenticationState.BAD_PASSWORD:
+        return False
+    elif state == AuthenticationState.REQUIRES_VALIDATION:
+        request_configuration(hass, config, api, authenticator)
+        return True
+
+    return False
+
+
+def setup(hass, config):
+    """Set up the August component."""
+    from august.api import Api
+    from august.authenticator import Authenticator
+
+    conf = config[DOMAIN]
+    api = Api(timeout=conf.get(CONF_TIMEOUT))
+
+    authenticator = Authenticator(
+        api,
+        conf.get(CONF_LOGIN_METHOD),
+        conf.get(CONF_USERNAME),
+        conf.get(CONF_PASSWORD),
+        install_id=conf.get(CONF_INSTALL_ID),
+        access_token_cache_file=hass.config.path(AUGUST_CONFIG_FILE))
+
+    return setup_august(hass, config, api, authenticator)
+
+
+class AugustData:
+    """August data object."""
+
+    def __init__(self, api, access_token):
+        """Init August data object."""
+        self._api = api
+        self._access_token = access_token
+        self._doorbells = self._api.get_doorbells(self._access_token) or []
+        self._locks = self._api.get_operable_locks(self._access_token) or []
+        self._house_ids = [d.house_id for d in self._doorbells + self._locks]
+
+        self._doorbell_detail_by_id = {}
+        self._lock_status_by_id = {}
+        self._lock_detail_by_id = {}
+        self._activities_by_id = {}
+
+    @property
+    def house_ids(self):
+        """Return a list of house_ids."""
+        return self._house_ids
+
+    @property
+    def doorbells(self):
+        """Return a list of doorbells."""
+        return self._doorbells
+
+    @property
+    def locks(self):
+        """Return a list of locks."""
+        return self._locks
+
+    def get_device_activities(self, device_id, *activity_types):
+        """Return a list of activities."""
+        self._update_device_activities()
+
+        activities = self._activities_by_id.get(device_id, [])
+        if activity_types:
+            return [a for a in activities if a.activity_type in activity_types]
+        return activities
+
+    def get_latest_device_activity(self, device_id, *activity_types):
+        """Return latest activity."""
+        activities = self.get_device_activities(device_id, *activity_types)
+        return next(iter(activities or []), None)
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def _update_device_activities(self, limit=ACTIVITY_FETCH_LIMIT):
+        """Update data object with latest from August API."""
+        for house_id in self.house_ids:
+            activities = self._api.get_house_activities(self._access_token,
+                                                        house_id,
+                                                        limit=limit)
+
+            device_ids = {a.device_id for a in activities}
+            for device_id in device_ids:
+                self._activities_by_id[device_id] = [a for a in activities if
+                                                     a.device_id == device_id]
+
+    def get_doorbell_detail(self, doorbell_id):
+        """Return doorbell detail."""
+        self._update_doorbells()
+        return self._doorbell_detail_by_id.get(doorbell_id)
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def _update_doorbells(self):
+        detail_by_id = {}
+
+        for doorbell in self._doorbells:
+            detail_by_id[doorbell.device_id] = self._api.get_doorbell_detail(
+                self._access_token, doorbell.device_id)
+
+        self._doorbell_detail_by_id = detail_by_id
+
+    def get_lock_status(self, lock_id):
+        """Return lock status."""
+        self._update_locks()
+        return self._lock_status_by_id.get(lock_id)
+
+    def get_lock_detail(self, lock_id):
+        """Return lock detail."""
+        self._update_locks()
+        return self._lock_detail_by_id.get(lock_id)
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def _update_locks(self):
+        status_by_id = {}
+        detail_by_id = {}
+
+        for lock in self._locks:
+            status_by_id[lock.device_id] = self._api.get_lock_status(
+                self._access_token, lock.device_id)
+            detail_by_id[lock.device_id] = self._api.get_lock_detail(
+                self._access_token, lock.device_id)
+
+        self._lock_status_by_id = status_by_id
+        self._lock_detail_by_id = detail_by_id
+
+    def lock(self, device_id):
+        """Lock the device."""
+        return self._api.lock(self._access_token, device_id)
+
+    def unlock(self, device_id):
+        """Unlock the device."""
+        return self._api.unlock(self._access_token, device_id)
--- a/homeassistant/components/binary_sensor/init.py
+++ b/homeassistant/components/binary_sensor/init.py
@@ -4,7 +4,7 @@ Component to interface with binary sensors.
 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

@@ -28,6 +28,7 @@ DEVICE_CLASSES = [
    'gas',           # On means gas detected, Off means no gas (clear)
    'heat',          # On means hot, Off means normal
    'light',         # On means light detected, Off means no light
+    'lock',          # On means open (unlocked), Off means closed (locked)
    'moisture',      # On means wet, Off means dry
    'motion',        # On means motion detected, Off means no motion (clear)
    'moving',        # On means moving, Off means not moving (stopped)
@@ -47,13 +48,12 @@ DEVICE_CLASSES = [
 DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(DEVICE_CLASSES))


-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
    """Track states and offer events for binary sensors."""
    component = EntityComponent(
        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)

-    yield from component.async_setup(config)
+    await component.async_setup(config)
    return True


--- a/homeassistant/components/binary_sensor/august.py
+++ b/homeassistant/components/binary_sensor/august.py
@@ -0,0 +1,97 @@
+"""
+Support for August binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.august/
+"""
+from datetime import timedelta, datetime
+
+from homeassistant.components.august import DATA_AUGUST
+from homeassistant.components.binary_sensor import (BinarySensorDevice)
+
+DEPENDENCIES = ['august']
+
+SCAN_INTERVAL = timedelta(seconds=5)
+
+
+def _retrieve_online_state(data, doorbell):
+    """Get the latest state of the sensor."""
+    detail = data.get_doorbell_detail(doorbell.device_id)
+    return detail.is_online
+
+
+def _retrieve_motion_state(data, doorbell):
+    from august.activity import ActivityType
+    return _activity_time_based_state(data, doorbell,
+                                      [ActivityType.DOORBELL_MOTION,
+                                       ActivityType.DOORBELL_DING])
+
+
+def _retrieve_ding_state(data, doorbell):
+    from august.activity import ActivityType
+    return _activity_time_based_state(data, doorbell,
+                                      [ActivityType.DOORBELL_DING])
+
+
+def _activity_time_based_state(data, doorbell, activity_types):
+    """Get the latest state of the sensor."""
+    latest = data.get_latest_device_activity(doorbell.device_id,
+                                             *activity_types)
+
+    if latest is not None:
+        start = latest.activity_start_time
+        end = latest.activity_end_time + timedelta(seconds=30)
+        return start <= datetime.now() <= end
+    return None
+
+
+# Sensor types: Name, device_class, state_provider
+SENSOR_TYPES = {
+    'doorbell_ding': ['Ding', 'occupancy', _retrieve_ding_state],
+    'doorbell_motion': ['Motion', 'motion', _retrieve_motion_state],
+    'doorbell_online': ['Online', 'connectivity', _retrieve_online_state],
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the August binary sensors."""
+    data = hass.data[DATA_AUGUST]
+    devices = []
+
+    for doorbell in data.doorbells:
+        for sensor_type in SENSOR_TYPES:
+            devices.append(AugustBinarySensor(data, sensor_type, doorbell))
+
+    add_devices(devices, True)
+
+
+class AugustBinarySensor(BinarySensorDevice):
+    """Representation of an August binary sensor."""
+
+    def __init__(self, data, sensor_type, doorbell):
+        """Initialize the sensor."""
+        self._data = data
+        self._sensor_type = sensor_type
+        self._doorbell = doorbell
+        self._state = None
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of this device, from component DEVICE_CLASSES."""
+        return SENSOR_TYPES[self._sensor_type][1]
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return "{} {}".format(self._doorbell.device_name,
+                              SENSOR_TYPES[self._sensor_type][0])
+
+    def update(self):
+        """Get the latest state of the sensor."""
+        state_provider = SENSOR_TYPES[self._sensor_type][2]
+        self._state = state_provider(self._data, self._doorbell)
--- a/homeassistant/components/binary_sensor/bloomsky.py
+++ b/homeassistant/components/binary_sensor/bloomsky.py
@@ -24,7 +24,7 @@ SENSOR_TYPES = {
 }

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES):
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
 })

--- a/homeassistant/components/binary_sensor/bmw_connected_drive.py
+++ b/homeassistant/components/binary_sensor/bmw_connected_drive.py
@@ -0,0 +1,118 @@
+"""
+Reads vehicle status from BMW connected drive portal.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.bmw_connected_drive/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+DEPENDENCIES = ['bmw_connected_drive']
+
+_LOGGER = logging.getLogger(__name__)
+
+SENSOR_TYPES = {
+    'lids': ['Doors', 'opening'],
+    'windows': ['Windows', 'opening'],
+    'door_lock_state': ['Door lock state', 'safety']
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the BMW sensors."""
+    accounts = hass.data[BMW_DOMAIN]
+    _LOGGER.debug('Found BMW accounts: %s',
+                  ', '.join([a.name for a in accounts]))
+    devices = []
+    for account in accounts:
+        for vehicle in account.account.vehicles:
+            for key, value in sorted(SENSOR_TYPES.items()):
+                device = BMWConnectedDriveSensor(account, vehicle, key,
+                                                 value[0], value[1])
+                devices.append(device)
+    add_devices(devices, True)
+
+
+class BMWConnectedDriveSensor(BinarySensorDevice):
+    """Representation of a BMW vehicle binary sensor."""
+
+    def __init__(self, account, vehicle, attribute: str, sensor_name,
+                 device_class):
+        """Constructor."""
+        self._account = account
+        self._vehicle = vehicle
+        self._attribute = attribute
+        self._name = '{} {}'.format(self._vehicle.modelName, self._attribute)
+        self._sensor_name = sensor_name
+        self._device_class = device_class
+        self._state = None
+
+    @property
+    def should_poll(self) -> bool:
+        """Data update is triggered from BMWConnectedDriveEntity."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return self._name
+
+    @property
+    def device_class(self):
+        """Return the class of the binary sensor."""
+        return self._device_class
+
+    @property
+    def is_on(self):
+        """Return the state of the binary sensor."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes of the binary sensor."""
+        vehicle_state = self._vehicle.state
+        result = {
+            'car': self._vehicle.modelName
+        }
+
+        if self._attribute == 'lids':
+            for lid in vehicle_state.lids:
+                result[lid.name] = lid.state.value
+        elif self._attribute == 'windows':
+            for window in vehicle_state.windows:
+                result[window.name] = window.state.value
+        elif self._attribute == 'door_lock_state':
+            result['door_lock_state'] = vehicle_state.door_lock_state.value
+
+        return result
+
+    def update(self):
+        """Read new state data from the library."""
+        vehicle_state = self._vehicle.state
+
+        # device class opening: On means open, Off means closed
+        if self._attribute == 'lids':
+            _LOGGER.debug("Status of lid: %s", vehicle_state.all_lids_closed)
+            self._state = not vehicle_state.all_lids_closed
+        if self._attribute == 'windows':
+            self._state = not vehicle_state.all_windows_closed
+        # device class safety: On means unsafe, Off means safe
+        if self._attribute == 'door_lock_state':
+            # Possible values: LOCKED, SECURED, SELECTIVELOCKED, UNLOCKED
+            self._state = bool(vehicle_state.door_lock_state.value
+                               in ('SELECTIVELOCKED', 'UNLOCKED'))
+
+    def update_callback(self):
+        """Schedule a state update."""
+        self.schedule_update_ha_state(True)
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Add callback after being added to hass.
+
+        Show latest data after startup.
+        """
+        self._account.add_update_listener(self.update_callback)
--- a/homeassistant/components/binary_sensor/concord232.py
+++ b/homeassistant/components/binary_sensor/concord232.py
@@ -27,7 +27,7 @@ DEFAULT_NAME = 'Alarm'
 DEFAULT_PORT = '5007'
 DEFAULT_SSL = False

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

 ZONE_TYPES_SCHEMA = vol.Schema({
    cv.positive_int: vol.In(DEVICE_CLASSES),
--- a/homeassistant/components/binary_sensor/deconz.py
+++ b/homeassistant/components/binary_sensor/deconz.py
@@ -4,28 +4,26 @@ Support for deCONZ binary sensor.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.deconz/
 """
-import asyncio
-
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.deconz import DOMAIN as DECONZ_DATA
+from homeassistant.components.deconz import (
+    DOMAIN as DATA_DECONZ, DATA_DECONZ_ID)
 from homeassistant.const import ATTR_BATTERY_LEVEL
 from homeassistant.core import callback

 DEPENDENCIES = ['deconz']


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
    """Set up the deCONZ binary sensor."""
    if discovery_info is None:
        return

    from pydeconz.sensor import DECONZ_BINARY_SENSOR
-    sensors = hass.data[DECONZ_DATA].sensors
+    sensors = hass.data[DATA_DECONZ].sensors
    entities = []

-    for key in sorted(sensors.keys(), key=int):
-        sensor = sensors[key]
+    for sensor in sensors.values():
        if sensor and sensor.type in DECONZ_BINARY_SENSOR:
            entities.append(DeconzBinarySensor(sensor))
    async_add_devices(entities, True)
@@ -38,10 +36,10 @@ class DeconzBinarySensor(BinarySensorDevice):
        """Set up sensor and add update callback to get data from websocket."""
        self._sensor = sensor

-    @asyncio.coroutine
-    def async_added_to_hass(self):
+    async def async_added_to_hass(self):
        """Subscribe sensors events."""
        self._sensor.register_async_callback(self.async_update_callback)
+        self.hass.data[DATA_DECONZ_ID][self.entity_id] = self._sensor.deconz_id

    @callback
    def async_update_callback(self, reason):
@@ -94,9 +92,9 @@ class DeconzBinarySensor(BinarySensorDevice):
    def device_state_attributes(self):
        """Return the state attributes of the sensor."""
        from pydeconz.sensor import PRESENCE
-        attr = {
-            ATTR_BATTERY_LEVEL: self._sensor.battery,
-        }
-        if self._sensor.type == PRESENCE:
+        attr = {}
+        if self._sensor.battery:
+            attr[ATTR_BATTERY_LEVEL] = self._sensor.battery
+        if self._sensor.type in PRESENCE and self._sensor.dark:
            attr['dark'] = self._sensor.dark
        return attr
--- a/homeassistant/components/binary_sensor/egardia.py
+++ b/homeassistant/components/binary_sensor/egardia.py
@@ -0,0 +1,78 @@
+"""
+Interfaces with Egardia/Woonveilig alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.egardia/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.components.egardia import (
+    EGARDIA_DEVICE, ATTR_DISCOVER_DEVICES)
+_LOGGER = logging.getLogger(__name__)
+DEPENDENCIES = ['egardia']
+EGARDIA_TYPE_TO_DEVICE_CLASS = {'IR Sensor': 'motion',
+                                'Door Contact': 'opening',
+                                'IR': 'motion'}
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Initialize the platform."""
+    if (discovery_info is None or
+            discovery_info[ATTR_DISCOVER_DEVICES] is None):
+        return
+
+    disc_info = discovery_info[ATTR_DISCOVER_DEVICES]
+    # multiple devices here!
+    async_add_devices(
+        (
+            EgardiaBinarySensor(
+                sensor_id=disc_info[sensor]['id'],
+                name=disc_info[sensor]['name'],
+                egardia_system=hass.data[EGARDIA_DEVICE],
+                device_class=EGARDIA_TYPE_TO_DEVICE_CLASS.get(
+                    disc_info[sensor]['type'], None)
+            )
+            for sensor in disc_info
+        ), True)
+
+
+class EgardiaBinarySensor(BinarySensorDevice):
+    """Represents a sensor based on an Egardia sensor (IR, Door Contact)."""
+
+    def __init__(self, sensor_id, name, egardia_system, device_class):
+        """Initialize the sensor device."""
+        self._id = sensor_id
+        self._name = name
+        self._state = None
+        self._device_class = device_class
+        self._egardia_system = egardia_system
+
+    def update(self):
+        """Update the status."""
+        egardia_input = self._egardia_system.getsensorstate(self._id)
+        self._state = STATE_ON if egardia_input else STATE_OFF
+
+    @property
+    def name(self):
+        """The name of the device."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Whether the device is switched on."""
+        return self._state == STATE_ON
+
+    @property
+    def hidden(self):
+        """Whether the device is hidden by default."""
+        # these type of sensors are probably mainly used for automations
+        return True
+
+    @property
+    def device_class(self):
+        """The device class."""
+        return self._device_class
--- a/homeassistant/components/binary_sensor/envisalink.py
+++ b/homeassistant/components/binary_sensor/envisalink.py
@@ -50,7 +50,7 @@ class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
        self._zone_type = zone_type
        self._zone_number = zone_number

-        _LOGGER.debug('Setting up zone: ' + zone_name)
+        _LOGGER.debug('Setting up zone: %s', zone_name)
        super().__init__(zone_name, info, controller)

    @asyncio.coroutine
--- a/homeassistant/components/binary_sensor/hikvision.py
+++ b/homeassistant/components/binary_sensor/hikvision.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
    CONF_SSL, EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START,
    ATTR_LAST_TRIP_TIME, CONF_CUSTOMIZE)

-REQUIREMENTS = ['pyhik==0.1.4']
+REQUIREMENTS = ['pyhik==0.1.8']
 _LOGGER = logging.getLogger(__name__)

 CONF_IGNORED = 'ignored'
@@ -48,6 +48,9 @@ DEVICE_CLASS_MAP = {
    'Face Detection': 'motion',
    'Scene Change Detection': 'motion',
    'I/O': None,
+    'Unattended Baggage': 'motion',
+    'Attended Baggage': 'motion',
+    'Recording Failure': None,
 }

 CUSTOMIZE_SCHEMA = vol.Schema({
@@ -56,7 +59,7 @@ CUSTOMIZE_SCHEMA = vol.Schema({
    })

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_NAME, default=None): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
    vol.Required(CONF_HOST): cv.string,
    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(CONF_SSL, default=False): cv.boolean,
@@ -211,7 +214,7 @@ class HikvisionBinarySensor(BinarySensorDevice):

    @property
    def unique_id(self):
-        """Return an unique ID."""
+        """Return a unique ID."""
        return self._id

    @property
--- a/homeassistant/components/binary_sensor/ihc.py
+++ b/homeassistant/components/binary_sensor/ihc.py
@@ -25,7 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
            vol.All({
                vol.Required(CONF_ID): cv.positive_int,
                vol.Optional(CONF_NAME): cv.string,
-                vol.Optional(CONF_TYPE, default=None): DEVICE_CLASSES_SCHEMA,
+                vol.Optional(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
                vol.Optional(CONF_INVERTING, default=False): cv.boolean,
            }, validate_name)
        ])
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            product_cfg = device['product_cfg']
            product = device['product']
            sensor = IHCBinarySensor(ihc_controller, name, ihc_id, info,
-                                     product_cfg[CONF_TYPE],
+                                     product_cfg.get(CONF_TYPE),
                                     product_cfg[CONF_INVERTING],
                                     product)
            devices.append(sensor)
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
        for sensor_cfg in binary_sensors:
            ihc_id = sensor_cfg[CONF_ID]
            name = sensor_cfg[CONF_NAME]
-            sensor_type = sensor_cfg[CONF_TYPE]
+            sensor_type = sensor_cfg.get(CONF_TYPE)
            inverting = sensor_cfg[CONF_INVERTING]
            sensor = IHCBinarySensor(ihc_controller, name, ihc_id, info,
                                     sensor_type, inverting)
@@ -70,7 +70,7 @@ class IHCBinarySensor(IHCDevice, BinarySensorDevice):

    def __init__(self, ihc_controller, name, ihc_id: int, info: bool,
                 sensor_type: str, inverting: bool,
-                 product: Element=None) -> None:
+                 product: Element = None) -> None:
        """Initialize the IHC binary sensor."""
        super().__init__(ihc_controller, name, ihc_id, info, product)
        self._state = None
--- a/homeassistant/components/binary_sensor/insteon_plm.py
+++ b/homeassistant/components/binary_sensor/insteon_plm.py
@@ -2,86 +2,56 @@
 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/
+https://home-assistant.io/components/binary_sensor.insteon_plm/
 """
-import logging
 import asyncio
+import logging

-from homeassistant.core import callback
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.loader import get_component
+from homeassistant.components.insteon_plm import InsteonPLMEntity

 DEPENDENCIES = ['insteon_plm']

 _LOGGER = logging.getLogger(__name__)

+SENSOR_TYPES = {'openClosedSensor': 'opening',
+                'motionSensor': 'motion',
+                'doorSensor': 'door',
+                'leakSensor': 'moisture'}
+

@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')
+    address = discovery_info['address']
+    device = plm.devices[address]
+    state_key = discovery_info['state_key']

-        _LOGGER.info('Registered %s with binary_sensor platform.', name)
+    _LOGGER.debug('Adding device %s entity %s to Binary Sensor platform',
+                  device.address.hex, device.states[state_key].name)

-        device_list.append(
-            InsteonPLMBinarySensorDevice(hass, plm, address, name)
-        )
+    new_entity = InsteonPLMBinarySensor(device, state_key)

-    async_add_devices(device_list)
+    async_add_devices([new_entity])


-class InsteonPLMBinarySensorDevice(BinarySensorDevice):
-    """A Class for an Insteon device."""
+class InsteonPLMBinarySensor(InsteonPLMEntity, BinarySensorDevice):
+    """A Class for an Insteon device entity."""

-    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})
+    def __init__(self, device, state_key):
+        """Initialize the INSTEON PLM binary sensor."""
+        super().__init__(device, state_key)
+        self._sensor_type = SENSOR_TYPES.get(self._insteon_device_state.name)

    @property
-    def should_poll(self):
-        """No polling needed."""
-        return False
-
-    @property
-    def address(self):
-        """Return the address of the node."""
-        return self._address
-
-    @property
-    def name(self):
-        """Return the name of the node."""
-        return self._name
+    def device_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_type

    @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)
+        sensorstate = self._insteon_device_state.value
        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 callback from PLM for %s", self._address)
-        self._hass.async_add_job(self.async_update_ha_state())
--- a/homeassistant/components/binary_sensor/isy994.py
+++ b/homeassistant/components/binary_sensor/isy994.py
@@ -56,24 +56,17 @@ def setup_platform(hass, config: ConfigType,
        else:
            device_type = _detect_device_type(node)
            subnode_id = int(node.nid[-1])
-            if device_type == 'opening':
-                # Door/window sensors use an optional "negative" node
-                if subnode_id == 4:
+            if (device_type == 'opening' or device_type == 'moisture'):
+                # These sensors use an optional "negative" subnode 2 to snag
+                # all state changes
+                if subnode_id == 2:
+                    parent_device.add_negative_node(node)
+                elif subnode_id == 4:
                    # Subnode 4 is the heartbeat node, which we will represent
                    # as a separate binary_sensor
                    device = ISYBinarySensorHeartbeat(node, parent_device)
                    parent_device.add_heartbeat_device(device)
                    devices.append(device)
-                elif subnode_id == 2:
-                    parent_device.add_negative_node(node)
-            elif device_type == 'moisture':
-                # Moisture nodes have a subnode 2, but we ignore it because
-                # it's just the inverse of the primary node.
-                if subnode_id == 4:
-                    # Heartbeat node
-                    device = ISYBinarySensorHeartbeat(node, parent_device)
-                    parent_device.add_heartbeat_device(device)
-                    devices.append(device)
            else:
                # We don't yet have any special logic for other sensor types,
                # so add the nodes as individual devices
--- a/homeassistant/components/binary_sensor/knx.py
+++ b/homeassistant/components/binary_sensor/knx.py
@@ -4,7 +4,6 @@ Support for KNX/IP binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.knx/
 """
-import asyncio

 import voluptuous as vol

@@ -26,6 +25,7 @@ CONF_DEFAULT_HOOK = 'on'
 CONF_COUNTER = 'counter'
 CONF_DEFAULT_COUNTER = 1
 CONF_ACTION = 'action'
+CONF_RESET_AFTER = 'reset_after'

 CONF__ACTION = 'turn_off_action'

@@ -35,7 +35,7 @@ DEPENDENCIES = ['knx']
 AUTOMATION_SCHEMA = vol.Schema({
    vol.Optional(CONF_HOOK, default=CONF_DEFAULT_HOOK): cv.string,
    vol.Optional(CONF_COUNTER, default=CONF_DEFAULT_COUNTER): cv.port,
-    vol.Required(CONF_ACTION, default=None): cv.SCRIPT_SCHEMA
+    vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA
 })

 AUTOMATIONS_SCHEMA = vol.All(
@@ -49,16 +49,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_DEVICE_CLASS): cv.string,
    vol.Optional(CONF_SIGNIFICANT_BIT, default=CONF_DEFAULT_SIGNIFICANT_BIT):
        cv.positive_int,
-    vol.Optional(CONF_AUTOMATION, default=None): AUTOMATIONS_SCHEMA,
+    vol.Optional(CONF_RESET_AFTER): cv.positive_int,
+    vol.Optional(CONF_AUTOMATION): AUTOMATIONS_SCHEMA,
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
    """Set up binary sensor(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
    if discovery_info is not None:
        async_add_devices_discovery(hass, discovery_info, async_add_devices)
    else:
@@ -85,7 +83,8 @@ def async_add_devices_config(hass, config, async_add_devices):
        name=name,
        group_address=config.get(CONF_ADDRESS),
        device_class=config.get(CONF_DEVICE_CLASS),
-        significant_bit=config.get(CONF_SIGNIFICANT_BIT))
+        significant_bit=config.get(CONF_SIGNIFICANT_BIT),
+        reset_after=config.get(CONF_RESET_AFTER))
    hass.data[DATA_KNX].xknx.devices.add(binary_sensor)

    entity = KNXBinarySensor(hass, binary_sensor)
@@ -114,11 +113,10 @@ class KNXBinarySensor(BinarySensorDevice):
    @callback
    def async_register_callbacks(self):
        """Register callbacks to update hass after device was changed."""
-        @asyncio.coroutine
-        def after_update_callback(device):
+        async def after_update_callback(device):
            """Call after device was updated."""
            # pylint: disable=unused-argument
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
        self.device.register_device_updated_cb(after_update_callback)

    @property
--- a/homeassistant/components/binary_sensor/mysensors.py
+++ b/homeassistant/components/binary_sensor/mysensors.py
@@ -9,6 +9,17 @@ from homeassistant.components.binary_sensor import (
    DEVICE_CLASSES, DOMAIN, BinarySensorDevice)
 from homeassistant.const import STATE_ON

+SENSORS = {
+    'S_DOOR': 'door',
+    'S_MOTION': 'motion',
+    'S_SMOKE': 'smoke',
+    'S_SPRINKLER': 'safety',
+    'S_WATER_LEAK': 'safety',
+    'S_SOUND': 'sound',
+    'S_VIBRATION': 'vibration',
+    'S_MOISTURE': 'moisture',
+}
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up the MySensors platform for binary sensors."""
@@ -29,18 +40,7 @@ class MySensorsBinarySensor(mysensors.MySensorsEntity, BinarySensorDevice):
    def device_class(self):
        """Return the class of this sensor, from DEVICE_CLASSES."""
        pres = self.gateway.const.Presentation
-        class_map = {
-            pres.S_DOOR: 'opening',
-            pres.S_MOTION: 'motion',
-            pres.S_SMOKE: 'smoke',
-        }
-        if float(self.gateway.protocol_version) >= 1.5:
-            class_map.update({
-                pres.S_SPRINKLER: 'sprinkler',
-                pres.S_WATER_LEAK: 'leak',
-                pres.S_SOUND: 'sound',
-                pres.S_VIBRATION: 'vibration',
-                pres.S_MOISTURE: 'moisture',
-            })
-        if class_map.get(self.child_type) in DEVICE_CLASSES:
-            return class_map.get(self.child_type)
+        device_class = SENSORS.get(pres(self.child_type).name)
+        if device_class in DEVICE_CLASSES:
+            return device_class
+        return None
--- a/homeassistant/components/binary_sensor/netatmo.py
+++ b/homeassistant/components/binary_sensor/netatmo.py
@@ -50,10 +50,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_CAMERAS, default=[]):
        vol.All(cv.ensure_list, [cv.string]),
    vol.Optional(CONF_HOME): cv.string,
-    vol.Optional(CONF_PRESENCE_SENSORS, default=PRESENCE_SENSOR_TYPES):
+    vol.Optional(CONF_PRESENCE_SENSORS, default=list(PRESENCE_SENSOR_TYPES)):
        vol.All(cv.ensure_list, [vol.In(PRESENCE_SENSOR_TYPES)]),
    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
-    vol.Optional(CONF_WELCOME_SENSORS, default=WELCOME_SENSOR_TYPES):
+    vol.Optional(CONF_WELCOME_SENSORS, default=list(WELCOME_SENSOR_TYPES)):
        vol.All(cv.ensure_list, [vol.In(WELCOME_SENSOR_TYPES)]),
 })

--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -27,7 +27,7 @@ SENSOR_TYPES = {
 }

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_TYPES):
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
--- a/homeassistant/components/binary_sensor/rfxtrx.py
+++ b/homeassistant/components/binary_sensor/rfxtrx.py
@@ -28,15 +28,15 @@ DEPENDENCIES = ['rfxtrx']
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_DEVICES, default={}): {
        cv.string: vol.Schema({
-            vol.Optional(CONF_NAME, default=None): cv.string,
-            vol.Optional(CONF_DEVICE_CLASS, default=None):
+            vol.Optional(CONF_NAME): cv.string,
+            vol.Optional(CONF_DEVICE_CLASS):
                DEVICE_CLASSES_SCHEMA,
            vol.Optional(CONF_FIRE_EVENT, default=False): cv.boolean,
-            vol.Optional(CONF_OFF_DELAY, default=None):
+            vol.Optional(CONF_OFF_DELAY):
            vol.Any(cv.time_period, cv.positive_timedelta),
-            vol.Optional(CONF_DATA_BITS, default=None): cv.positive_int,
-            vol.Optional(CONF_COMMAND_ON, default=None): cv.byte,
-            vol.Optional(CONF_COMMAND_OFF, default=None): cv.byte
+            vol.Optional(CONF_DATA_BITS): cv.positive_int,
+            vol.Optional(CONF_COMMAND_ON): cv.byte,
+            vol.Optional(CONF_COMMAND_OFF): cv.byte
        })
    },
    vol.Optional(CONF_AUTOMATIC_ADD, default=False):  cv.boolean,
@@ -48,26 +48,26 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    import RFXtrx as rfxtrxmod
    sensors = []

-    for packet_id, entity in config['devices'].items():
+    for packet_id, entity in config[CONF_DEVICES].items():
        event = rfxtrx.get_rfx_object(packet_id)
        device_id = slugify(event.device.id_string.lower())

        if device_id in rfxtrx.RFX_DEVICES:
            continue

-        if entity[CONF_DATA_BITS] is not None:
+        if entity.get(CONF_DATA_BITS) is not None:
            _LOGGER.debug(
                "Masked device id: %s", rfxtrx.get_pt2262_deviceid(
-                    device_id, entity[CONF_DATA_BITS]))
+                    device_id, entity.get(CONF_DATA_BITS)))

        _LOGGER.debug("Add %s rfxtrx.binary_sensor (class %s)",
-                      entity[ATTR_NAME], entity[CONF_DEVICE_CLASS])
+                      entity[ATTR_NAME], entity.get(CONF_DEVICE_CLASS))

        device = RfxtrxBinarySensor(
-            event, entity[ATTR_NAME], entity[CONF_DEVICE_CLASS],
-            entity[CONF_FIRE_EVENT], entity[CONF_OFF_DELAY],
-            entity[CONF_DATA_BITS], entity[CONF_COMMAND_ON],
-            entity[CONF_COMMAND_OFF])
+            event, entity.get(CONF_NAME), entity.get(CONF_DEVICE_CLASS),
+            entity[CONF_FIRE_EVENT], entity.get(CONF_OFF_DELAY),
+            entity.get(CONF_DATA_BITS), entity.get(CONF_COMMAND_ON),
+            entity.get(CONF_COMMAND_OFF))
        device.hass = hass
        sensors.append(device)
        rfxtrx.RFX_DEVICES[device_id] = device
--- a/homeassistant/components/binary_sensor/rpi_pfio.py
+++ b/homeassistant/components/binary_sensor/rpi_pfio.py
@@ -26,7 +26,7 @@ DEFAULT_SETTLE_TIME = 20
 DEPENDENCIES = ['rpi_pfio']

 PORT_SCHEMA = vol.Schema({
-    vol.Optional(CONF_NAME, default=None): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
    vol.Optional(CONF_SETTLE_TIME, default=DEFAULT_SETTLE_TIME):
        cv.positive_int,
    vol.Optional(CONF_INVERT_LOGIC, default=DEFAULT_INVERT_LOGIC): cv.boolean,
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    binary_sensors = []
    ports = config.get(CONF_PORTS)
    for port, port_entity in ports.items():
-        name = port_entity[CONF_NAME]
+        name = port_entity.get(CONF_NAME)
        settle_time = port_entity[CONF_SETTLE_TIME] / 1000
        invert_logic = port_entity[CONF_INVERT_LOGIC]

--- a/homeassistant/components/binary_sensor/trend.py
+++ b/homeassistant/components/binary_sensor/trend.py
@@ -23,7 +23,7 @@ from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.util import utcnow

-REQUIREMENTS = ['numpy==1.14.0']
+REQUIREMENTS = ['numpy==1.14.2']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/binary_sensor/upcloud.py
+++ b/homeassistant/components/binary_sensor/upcloud.py
@@ -0,0 +1,38 @@
+"""
+Support for monitoring the state of UpCloud servers.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.upcloud/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.components.upcloud import (
+    UpCloudServerEntity, CONF_SERVERS, DATA_UPCLOUD)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['upcloud']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the UpCloud server binary sensor."""
+    upcloud = hass.data[DATA_UPCLOUD]
+
+    servers = config.get(CONF_SERVERS)
+
+    devices = [UpCloudBinarySensor(upcloud, uuid) for uuid in servers]
+
+    add_devices(devices, True)
+
+
+class UpCloudBinarySensor(UpCloudServerEntity, BinarySensorDevice):
+    """Representation of an UpCloud server sensor."""
--- a/homeassistant/components/binary_sensor/workday.py
+++ b/homeassistant/components/binary_sensor/workday.py
@@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-REQUIREMENTS = ['holidays==0.9.3']
+REQUIREMENTS = ['holidays==0.9.4']

 # List of all countries currently supported by holidays
 # There seems to be no way to get the list out at runtime
@@ -47,7 +47,7 @@ DEFAULT_OFFSET = 0

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_COUNTRY): vol.In(ALL_COUNTRIES),
-    vol.Optional(CONF_PROVINCE, default=None): cv.string,
+    vol.Optional(CONF_PROVINCE): cv.string,
    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    vol.Optional(CONF_OFFSET, default=DEFAULT_OFFSET): vol.Coerce(int),
    vol.Optional(CONF_WORKDAYS, default=DEFAULT_WORKDAYS):
--- a/homeassistant/components/binary_sensor/xiaomi_aqara.py
+++ b/homeassistant/components/binary_sensor/xiaomi_aqara.py
@@ -319,7 +319,10 @@ class XiaomiButton(XiaomiBinarySensor):
            click_type = 'double'
        elif value == 'both_click':
            click_type = 'both'
+        elif value == 'shake':
+            click_type = 'shake'
        else:
+            _LOGGER.warning("Unsupported click_type detected: %s", value)
            return False

        self._hass.bus.fire('click', {
--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -4,7 +4,6 @@ Binary sensors on Zigbee Home Automation networks.
 For more details on this platform, please refer to the documentation
 at https://home-assistant.io/components/binary_sensor.zha/
 """
-import asyncio
 import logging

 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
@@ -25,8 +24,8 @@ CLASS_MAPPING = {
 }


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
    """Set up the Zigbee Home Automation binary sensors."""
    discovery_info = zha.get_discovery_info(hass, discovery_info)
    if discovery_info is None:
@@ -39,19 +38,19 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    device_class = None
    cluster = in_clusters[IasZone.cluster_id]
    if discovery_info['new_join']:
-        yield from cluster.bind()
+        await cluster.bind()
        ieee = cluster.endpoint.device.application.ieee
-        yield from cluster.write_attributes({'cie_addr': ieee})
+        await cluster.write_attributes({'cie_addr': ieee})

    try:
-        zone_type = yield from cluster['zone_type']
+        zone_type = await cluster['zone_type']
        device_class = CLASS_MAPPING.get(zone_type, None)
    except Exception:  # pylint: disable=broad-except
        # If we fail to read from the device, use a non-specific class
        pass

    sensor = BinarySensor(device_class, **discovery_info)
-    async_add_devices([sensor])
+    async_add_devices([sensor], update_before_add=True)


 class BinarySensor(zha.Entity, BinarySensorDevice):
@@ -66,6 +65,11 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
        from zigpy.zcl.clusters.security import IasZone
        self._ias_zone_cluster = self._in_clusters[IasZone.cluster_id]

+    @property
+    def should_poll(self) -> bool:
+        """Let zha handle polling."""
+        return False
+
    @property
    def is_on(self) -> bool:
        """Return True if entity is on."""
@@ -83,7 +87,18 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
        if command_id == 0:
            self._state = args[0] & 3
            _LOGGER.debug("Updated alarm state: %s", self._state)
-            self.schedule_update_ha_state()
+            self.async_schedule_update_ha_state()
        elif command_id == 1:
            _LOGGER.debug("Enroll requested")
-            self.hass.add_job(self._ias_zone_cluster.enroll_response(0, 0))
+            res = self._ias_zone_cluster.enroll_response(0, 0)
+            self.hass.async_add_job(res)
+
+    async def async_update(self):
+        """Retrieve latest state."""
+        from bellows.types.basic import uint16_t
+
+        result = await zha.safe_read(self._endpoint.ias_zone,
+                                     ['zone_status'])
+        state = result.get('zone_status', self._state)
+        if isinstance(state, (int, uint16_t)):
+            self._state = result.get('zone_status', self._state) & 3
--- a/homeassistant/components/bmw_connected_drive.py
+++ b/homeassistant/components/bmw_connected_drive.py
@@ -0,0 +1,105 @@
+"""
+Reads vehicle status from BMW connected drive portal.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/bmw_connected_drive/
+"""
+import logging
+import datetime
+
+import voluptuous as vol
+from homeassistant.helpers import discovery
+from homeassistant.helpers.event import track_utc_time_change
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    CONF_USERNAME, CONF_PASSWORD
+)
+
+REQUIREMENTS = ['bimmer_connected==0.4.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'bmw_connected_drive'
+CONF_VALUES = 'values'
+CONF_COUNTRY = 'country'
+
+ACCOUNT_SCHEMA = vol.Schema({
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_COUNTRY): cv.string,
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: {
+        cv.string: ACCOUNT_SCHEMA
+    },
+}, extra=vol.ALLOW_EXTRA)
+
+
+BMW_COMPONENTS = ['binary_sensor', 'device_tracker', 'lock', 'sensor']
+UPDATE_INTERVAL = 5  # in minutes
+
+
+def setup(hass, config):
+    """Set up the BMW connected drive components."""
+    accounts = []
+    for name, account_config in config[DOMAIN].items():
+        username = account_config[CONF_USERNAME]
+        password = account_config[CONF_PASSWORD]
+        country = account_config[CONF_COUNTRY]
+        _LOGGER.debug('Adding new account %s', name)
+        bimmer = BMWConnectedDriveAccount(username, password, country, name)
+        accounts.append(bimmer)
+
+        # update every UPDATE_INTERVAL minutes, starting now
+        # this should even out the load on the servers
+
+        now = datetime.datetime.now()
+        track_utc_time_change(
+            hass, bimmer.update,
+            minute=range(now.minute % UPDATE_INTERVAL, 60, UPDATE_INTERVAL),
+            second=now.second)
+
+    hass.data[DOMAIN] = accounts
+
+    for account in accounts:
+        account.update()
+
+    for component in BMW_COMPONENTS:
+        discovery.load_platform(hass, component, DOMAIN, {}, config)
+
+    return True
+
+
+class BMWConnectedDriveAccount(object):
+    """Representation of a BMW vehicle."""
+
+    def __init__(self, username: str, password: str, country: str,
+                 name: str) -> None:
+        """Constructor."""
+        from bimmer_connected.account import ConnectedDriveAccount
+
+        self.account = ConnectedDriveAccount(username, password, country)
+        self.name = name
+        self._update_listeners = []
+
+    def update(self, *_):
+        """Update the state of all vehicles.
+
+        Notify all listeners about the update.
+        """
+        _LOGGER.debug('Updating vehicle state for account %s, '
+                      'notifying %d listeners',
+                      self.name, len(self._update_listeners))
+        try:
+            self.account.update_vehicle_states()
+            for listener in self._update_listeners:
+                listener()
+        except IOError as exception:
+            _LOGGER.error('Error updating the vehicle state.')
+            _LOGGER.exception(exception)
+
+    def add_update_listener(self, listener):
+        """Add a listener for update notifications."""
+        self._update_listeners.append(listener)
--- a/homeassistant/components/calendar/caldav.py
+++ b/homeassistant/components/calendar/caldav.py
@@ -166,7 +166,7 @@ class WebDavCalendarData(object):
        self.event = {
            "summary": vevent.summary.value,
            "start": self.get_hass_date(vevent.dtstart.value),
-            "end": self.get_hass_date(vevent.dtend.value),
+            "end": self.get_hass_date(self.get_end_date(vevent)),
            "location": self.get_attr_value(vevent, "location"),
            "description": self.get_attr_value(vevent, "description")
        }
@@ -194,7 +194,9 @@ class WebDavCalendarData(object):
    @staticmethod
    def is_over(vevent):
        """Return if the event is over."""
-        return dt.now() > WebDavCalendarData.to_datetime(vevent.dtend.value)
+        return dt.now() >= WebDavCalendarData.to_datetime(
+            WebDavCalendarData.get_end_date(vevent)
+        )

    @staticmethod
    def get_hass_date(obj):
@@ -217,3 +219,17 @@ class WebDavCalendarData(object):
        if hasattr(obj, attribute):
            return getattr(obj, attribute).value
        return None
+
+    @staticmethod
+    def get_end_date(obj):
+        """Return the end datetime as determined by dtend or duration."""
+        if hasattr(obj, "dtend"):
+            enddate = obj.dtend.value
+
+        elif hasattr(obj, "duration"):
+            enddate = obj.dtstart.value + obj.duration.value
+
+        else:
+            enddate = obj.dtstart.value + timedelta(days=1)
+
+        return enddate
--- a/homeassistant/components/calendar/todoist.py
+++ b/homeassistant/components/calendar/todoist.py
@@ -496,9 +496,13 @@ class TodoistProjectData(object):
            # We had no valid tasks
            return True

+        # Make sure the task collection is reset to prevent an
+        # infinite collection repeating the same tasks
+        self.all_project_tasks.clear()
+
        # Organize the best tasks (so users can see all the tasks
        # they have, organized)
-        while len(project_tasks) > 0:
+        while project_tasks:
            best_task = self.select_best_task(project_tasks)
            _LOGGER.debug("Found Todoist Task: %s", best_task[SUMMARY])
            project_tasks.remove(best_task)
--- a/homeassistant/components/camera/init.py
+++ b/homeassistant/components/camera/init.py
@@ -264,9 +264,9 @@ class Camera(Entity):
                                 'boundary=--frameboundary')
        yield from response.prepare(request)

-        def write(img_bytes):
+        async def write(img_bytes):
            """Write image to stream."""
-            response.write(bytes(
+            await response.write(bytes(
                '--frameboundary\r\n'
                'Content-Type: {}\r\n'
                'Content-Length: {}\r\n\r\n'.format(
@@ -282,15 +282,14 @@ class Camera(Entity):
                    break

                if img_bytes and img_bytes != last_image:
-                    write(img_bytes)
+                    yield from write(img_bytes)

                    # Chrome seems to always ignore first picture,
                    # print it twice.
                    if last_image is None:
-                        write(img_bytes)
+                        yield from write(img_bytes)

                    last_image = img_bytes
-                    yield from response.drain()

                yield from asyncio.sleep(.5)

--- a/homeassistant/components/camera/arlo.py
+++ b/homeassistant/components/camera/arlo.py
@@ -49,8 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up an Arlo IP Camera."""
    arlo = hass.data.get(DATA_ARLO)
    if not arlo:
@@ -60,7 +59,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    for camera in arlo.cameras:
        cameras.append(ArloCam(hass, camera, config))

-    async_add_devices(cameras, True)
+    add_devices(cameras, True)


 class ArloCam(Camera):
--- a/homeassistant/components/camera/august.py
+++ b/homeassistant/components/camera/august.py
@@ -0,0 +1,76 @@
+"""
+Support for August camera.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.august/
+"""
+from datetime import timedelta
+
+import requests
+
+from homeassistant.components.august import DATA_AUGUST, DEFAULT_TIMEOUT
+from homeassistant.components.camera import Camera
+
+DEPENDENCIES = ['august']
+
+SCAN_INTERVAL = timedelta(seconds=5)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up August cameras."""
+    data = hass.data[DATA_AUGUST]
+    devices = []
+
+    for doorbell in data.doorbells:
+        devices.append(AugustCamera(data, doorbell, DEFAULT_TIMEOUT))
+
+    add_devices(devices, True)
+
+
+class AugustCamera(Camera):
+    """An implementation of a Canary security camera."""
+
+    def __init__(self, data, doorbell, timeout):
+        """Initialize a Canary security camera."""
+        super().__init__()
+        self._data = data
+        self._doorbell = doorbell
+        self._timeout = timeout
+        self._image_url = None
+        self._image_content = None
+
+    @property
+    def name(self):
+        """Return the name of this device."""
+        return self._doorbell.device_name
+
+    @property
+    def is_recording(self):
+        """Return true if the device is recording."""
+        return self._doorbell.has_subscription
+
+    @property
+    def motion_detection_enabled(self):
+        """Return the camera motion detection status."""
+        return True
+
+    @property
+    def brand(self):
+        """Return the camera brand."""
+        return 'August'
+
+    @property
+    def model(self):
+        """Return the camera model."""
+        return 'Doorbell'
+
+    def camera_image(self):
+        """Return bytes of camera image."""
+        latest = self._data.get_doorbell_detail(self._doorbell.device_id)
+
+        if self._image_url is not latest.image_url:
+            self._image_url = latest.image_url
+            self._image_content = requests.get(self._image_url,
+                                               timeout=self._timeout).content
+
+        return self._image_content
--- a/homeassistant/components/camera/doorbird.py
+++ b/homeassistant/components/camera/doorbird.py
@@ -18,8 +18,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 DEPENDENCIES = ['doorbird']

 _CAMERA_LAST_VISITOR = "DoorBird Last Ring"
+_CAMERA_LAST_MOTION = "DoorBird Last Motion"
 _CAMERA_LIVE = "DoorBird Live"
 _LAST_VISITOR_INTERVAL = datetime.timedelta(minutes=1)
+_LAST_MOTION_INTERVAL = datetime.timedelta(minutes=1)
 _LIVE_INTERVAL = datetime.timedelta(seconds=1)
 _LOGGER = logging.getLogger(__name__)
 _TIMEOUT = 10  # seconds
@@ -34,6 +36,9 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        DoorBirdCamera(
            device.history_image_url(1, 'doorbell'), _CAMERA_LAST_VISITOR,
            _LAST_VISITOR_INTERVAL),
+        DoorBirdCamera(
+            device.history_image_url(1, 'motionsensor'), _CAMERA_LAST_MOTION,
+            _LAST_MOTION_INTERVAL),
    ])


--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -21,7 +21,7 @@ from homeassistant.components.camera import (
    PLATFORM_SCHEMA, DEFAULT_CONTENT_TYPE, Camera)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers import config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -119,6 +119,8 @@ class MjpegCamera(Camera):
        else:
            req = requests.get(self._mjpeg_url, stream=True, timeout=10)

+        # https://github.com/PyCQA/pylint/issues/1437
+        # pylint: disable=no-member
        with closing(req) as response:
            return extract_image_from_mjpeg(response.iter_content(102400))

--- a/homeassistant/components/camera/onvif.py
+++ b/homeassistant/components/camera/onvif.py
@@ -11,13 +11,15 @@ import os
 import voluptuous as vol

 from homeassistant.const import (
-    CONF_NAME, CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)
-from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
+    CONF_NAME, CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT,
+    ATTR_ENTITY_ID)
+from homeassistant.components.camera import Camera, PLATFORM_SCHEMA, DOMAIN
 from homeassistant.components.ffmpeg import (
    DATA_FFMPEG, CONF_EXTRA_ARGUMENTS)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
    async_aiohttp_proxy_stream)
+from homeassistant.helpers.service import extract_entity_ids

 _LOGGER = logging.getLogger(__name__)

@@ -32,6 +34,25 @@ DEFAULT_PORT = 5000
 DEFAULT_USERNAME = 'admin'
 DEFAULT_PASSWORD = '888888'
 DEFAULT_ARGUMENTS = '-q:v 2'
+DEFAULT_PROFILE = 0
+
+CONF_PROFILE = "profile"
+
+ATTR_PAN = "pan"
+ATTR_TILT = "tilt"
+ATTR_ZOOM = "zoom"
+
+DIR_UP = "UP"
+DIR_DOWN = "DOWN"
+DIR_LEFT = "LEFT"
+DIR_RIGHT = "RIGHT"
+ZOOM_OUT = "ZOOM_OUT"
+ZOOM_IN = "ZOOM_IN"
+
+SERVICE_PTZ = "onvif_ptz"
+
+ONVIF_DATA = "onvif"
+ENTITIES = "entities"

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_HOST): cv.string,
@@ -40,65 +61,171 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
    vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
+    vol.Optional(CONF_PROFILE, default=DEFAULT_PROFILE):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
+})
+
+SERVICE_PTZ_SCHEMA = vol.Schema({
+    ATTR_ENTITY_ID: cv.entity_ids,
+    ATTR_PAN: vol.In([DIR_LEFT, DIR_RIGHT]),
+    ATTR_TILT: vol.In([DIR_UP, DIR_DOWN]),
+    ATTR_ZOOM: vol.In([ZOOM_OUT, ZOOM_IN])
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up a ONVIF camera."""
    if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_HOST)):
        return
-    async_add_devices([ONVIFCamera(hass, config)])
+
+    def handle_ptz(service):
+        """Handle PTZ service call."""
+        pan = service.data.get(ATTR_PAN, None)
+        tilt = service.data.get(ATTR_TILT, None)
+        zoom = service.data.get(ATTR_ZOOM, None)
+        all_cameras = hass.data[ONVIF_DATA][ENTITIES]
+        entity_ids = extract_entity_ids(hass, service)
+        target_cameras = []
+        if not entity_ids:
+            target_cameras = all_cameras
+        else:
+            target_cameras = [camera for camera in all_cameras
+                              if camera.entity_id in entity_ids]
+        for camera in target_cameras:
+            camera.perform_ptz(pan, tilt, zoom)
+
+    hass.services.async_register(DOMAIN, SERVICE_PTZ, handle_ptz,
+                                 schema=SERVICE_PTZ_SCHEMA)
+    add_devices([ONVIFHassCamera(hass, config)])


-class ONVIFCamera(Camera):
+class ONVIFHassCamera(Camera):
    """An implementation of an ONVIF camera."""

    def __init__(self, hass, config):
        """Initialize a ONVIF camera."""
-        from onvif import ONVIFService
-        import onvif
        super().__init__()
+        import onvif

+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        self._host = config.get(CONF_HOST)
+        self._port = config.get(CONF_PORT)
        self._name = config.get(CONF_NAME)
        self._ffmpeg_arguments = config.get(CONF_EXTRA_ARGUMENTS)
-        media = ONVIFService(
-            'http://{}:{}/onvif/device_service'.format(
-                config.get(CONF_HOST), config.get(CONF_PORT)),
-            config.get(CONF_USERNAME),
-            config.get(CONF_PASSWORD),
-            '{}/wsdl/media.wsdl'.format(os.path.dirname(onvif.__file__))
-        )
-        self._input = media.GetStreamUri().Uri
-        _LOGGER.debug("ONVIF Camera Using the following URL for %s: %s",
-                      self._name, self._input)
+        self._profile_index = config.get(CONF_PROFILE)
+        self._input = None
+        self._media_service = \
+            onvif.ONVIFService('http://{}:{}/onvif/device_service'.format(
+                self._host, self._port),
+                               self._username, self._password,
+                               '{}/wsdl/media.wsdl'.format(os.path.dirname(
+                                   onvif.__file__)))

-    @asyncio.coroutine
-    def async_camera_image(self):
+        self._ptz_service = \
+            onvif.ONVIFService('http://{}:{}/onvif/device_service'.format(
+                self._host, self._port),
+                               self._username, self._password,
+                               '{}/wsdl/ptz.wsdl'.format(os.path.dirname(
+                                   onvif.__file__)))
+
+    def obtain_input_uri(self):
+        """Set the input uri for the camera."""
+        from onvif import exceptions
+        _LOGGER.debug("Connecting with ONVIF Camera: %s on port %s",
+                      self._host, self._port)
+
+        try:
+            profiles = self._media_service.GetProfiles()
+
+            if self._profile_index >= len(profiles):
+                _LOGGER.warning("ONVIF Camera '%s' doesn't provide profile %d."
+                                " Using the last profile.",
+                                self._name, self._profile_index)
+                self._profile_index = -1
+
+            req = self._media_service.create_type('GetStreamUri')
+
+            # pylint: disable=protected-access
+            req.ProfileToken = profiles[self._profile_index]._token
+            uri_no_auth = self._media_service.GetStreamUri(req).Uri
+            uri_for_log = uri_no_auth.replace(
+                'rtsp://', 'rtsp://<user>:<password>@', 1)
+            self._input = uri_no_auth.replace(
+                'rtsp://', 'rtsp://{}:{}@'.format(self._username,
+                                                  self._password), 1)
+            _LOGGER.debug(
+                "ONVIF Camera Using the following URL for %s: %s",
+                self._name, uri_for_log)
+            # we won't need the media service anymore
+            self._media_service = None
+        except exceptions.ONVIFError as err:
+            _LOGGER.debug("Couldn't setup camera '%s'. Error: %s",
+                          self._name, err)
+            return
+
+    def perform_ptz(self, pan, tilt, zoom):
+        """Perform a PTZ action on the camera."""
+        from onvif import exceptions
+        if self._ptz_service:
+            pan_val = 1 if pan == DIR_RIGHT else -1 if pan == DIR_LEFT else 0
+            tilt_val = 1 if tilt == DIR_UP else -1 if tilt == DIR_DOWN else 0
+            zoom_val = 1 if zoom == ZOOM_IN else -1 if zoom == ZOOM_OUT else 0
+            req = {"Velocity": {
+                "PanTilt": {"_x": pan_val, "_y": tilt_val},
+                "Zoom": {"_x": zoom_val}}}
+            try:
+                self._ptz_service.ContinuousMove(req)
+            except exceptions.ONVIFError as err:
+                if "Bad Request" in err.reason:
+                    self._ptz_service = None
+                    _LOGGER.debug("Camera '%s' doesn't support PTZ.",
+                                  self._name)
+        else:
+            _LOGGER.debug("Camera '%s' doesn't support PTZ.", self._name)
+
+    async def async_added_to_hass(self):
+        """Callback when entity is added to hass."""
+        if ONVIF_DATA not in self.hass.data:
+            self.hass.data[ONVIF_DATA] = {}
+            self.hass.data[ONVIF_DATA][ENTITIES] = []
+        self.hass.data[ONVIF_DATA][ENTITIES].append(self)
+
+    async def async_camera_image(self):
        """Return a still image response from the camera."""
        from haffmpeg import ImageFrame, IMAGE_JPEG
+
+        if not self._input:
+            await self.hass.async_add_job(self.obtain_input_uri)
+            if not self._input:
+                return None
+
        ffmpeg = ImageFrame(
            self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)

-        image = yield from asyncio.shield(ffmpeg.get_image(
+        image = await asyncio.shield(ffmpeg.get_image(
            self._input, output_format=IMAGE_JPEG,
            extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
        return image

-    @asyncio.coroutine
-    def handle_async_mjpeg_stream(self, request):
+    async def handle_async_mjpeg_stream(self, request):
        """Generate an HTTP MJPEG stream from the camera."""
        from haffmpeg import CameraMjpeg

+        if not self._input:
+            await self.hass.async_add_job(self.obtain_input_uri)
+            if not self._input:
+                return None
+
        stream = CameraMjpeg(self.hass.data[DATA_FFMPEG].binary,
                             loop=self.hass.loop)
-        yield from stream.open_camera(
+        await stream.open_camera(
            self._input, extra_cmd=self._ffmpeg_arguments)

-        yield from async_aiohttp_proxy_stream(
+        await async_aiohttp_proxy_stream(
            self.hass, request, stream,
            'multipart/x-mixed-replace;boundary=ffserver')
-        yield from stream.close()
+        await stream.close()

    @property
    def name(self):
--- a/homeassistant/components/camera/proxy.py
+++ b/homeassistant/components/camera/proxy.py
@@ -0,0 +1,244 @@
+"""
+Proxy camera platform that enables image processing of camera data.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/proxy
+"""
+import logging
+import asyncio
+import aiohttp
+import async_timeout
+
+import voluptuous as vol
+
+from homeassistant.util.async_ import run_coroutine_threadsafe
+from homeassistant.helpers import config_validation as cv
+
+import homeassistant.util.dt as dt_util
+from homeassistant.const import (
+    CONF_NAME, CONF_ENTITY_ID, HTTP_HEADER_HA_AUTH)
+from homeassistant.components.camera import (
+    PLATFORM_SCHEMA, Camera)
+from homeassistant.helpers.aiohttp_client import (
+    async_get_clientsession, async_aiohttp_proxy_web)
+
+REQUIREMENTS = ['pillow==5.0.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_MAX_IMAGE_WIDTH = "max_image_width"
+CONF_IMAGE_QUALITY = "image_quality"
+CONF_IMAGE_REFRESH_RATE = "image_refresh_rate"
+CONF_FORCE_RESIZE = "force_resize"
+CONF_MAX_STREAM_WIDTH = "max_stream_width"
+CONF_STREAM_QUALITY = "stream_quality"
+CONF_CACHE_IMAGES = "cache_images"
+
+DEFAULT_BASENAME = "Camera Proxy"
+DEFAULT_QUALITY = 75
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ENTITY_ID): cv.entity_id,
+    vol.Optional(CONF_NAME): cv.string,
+    vol.Optional(CONF_MAX_IMAGE_WIDTH): int,
+    vol.Optional(CONF_IMAGE_QUALITY): int,
+    vol.Optional(CONF_IMAGE_REFRESH_RATE): float,
+    vol.Optional(CONF_FORCE_RESIZE, False): cv.boolean,
+    vol.Optional(CONF_CACHE_IMAGES, False): cv.boolean,
+    vol.Optional(CONF_MAX_STREAM_WIDTH): int,
+    vol.Optional(CONF_STREAM_QUALITY): int,
+})
+
+
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
+    """Set up the Proxy camera platform."""
+    async_add_devices([ProxyCamera(hass, config)])
+
+
+def _resize_image(image, opts):
+    """Resize image."""
+    from PIL import Image
+    import io
+
+    if not opts:
+        return image
+
+    quality = opts.quality or DEFAULT_QUALITY
+    new_width = opts.max_width
+
+    img = Image.open(io.BytesIO(image))
+    imgfmt = str(img.format)
+    if imgfmt != 'PNG' and imgfmt != 'JPEG':
+        _LOGGER.debug("Image is of unsupported type: %s", imgfmt)
+        return image
+
+    (old_width, old_height) = img.size
+    old_size = len(image)
+    if old_width <= new_width:
+        if opts.quality is None:
+            _LOGGER.debug("Image is smaller-than / equal-to requested width")
+            return image
+        new_width = old_width
+
+    scale = new_width / float(old_width)
+    new_height = int((float(old_height)*float(scale)))
+
+    img = img.resize((new_width, new_height), Image.ANTIALIAS)
+    imgbuf = io.BytesIO()
+    img.save(imgbuf, "JPEG", optimize=True, quality=quality)
+    newimage = imgbuf.getvalue()
+    if not opts.force_resize and len(newimage) >= old_size:
+        _LOGGER.debug("Using original image(%d bytes) "
+                      "because resized image (%d bytes) is not smaller",
+                      old_size, len(newimage))
+        return image
+
+    _LOGGER.debug("Resized image "
+                  "from (%dx%d - %d bytes) "
+                  "to (%dx%d - %d bytes)",
+                  old_width, old_height, old_size,
+                  new_width, new_height, len(newimage))
+    return newimage
+
+
+class ImageOpts():
+    """The representation of image options."""
+
+    def __init__(self, max_width, quality, force_resize):
+        """Initialize image options."""
+        self.max_width = max_width
+        self.quality = quality
+        self.force_resize = force_resize
+
+    def __bool__(self):
+        """Bool evalution rules."""
+        return bool(self.max_width or self.quality)
+
+
+class ProxyCamera(Camera):
+    """The representation of a Proxy camera."""
+
+    def __init__(self, hass, config):
+        """Initialize a proxy camera component."""
+        super().__init__()
+        self.hass = hass
+        self._proxied_camera = config.get(CONF_ENTITY_ID)
+        self._name = (
+            config.get(CONF_NAME) or
+            "{} - {}".format(DEFAULT_BASENAME, self._proxied_camera))
+        self._image_opts = ImageOpts(
+            config.get(CONF_MAX_IMAGE_WIDTH),
+            config.get(CONF_IMAGE_QUALITY),
+            config.get(CONF_FORCE_RESIZE))
+
+        self._stream_opts = ImageOpts(
+            config.get(CONF_MAX_STREAM_WIDTH),
+            config.get(CONF_STREAM_QUALITY),
+            True)
+
+        self._image_refresh_rate = config.get(CONF_IMAGE_REFRESH_RATE)
+        self._cache_images = bool(
+            config.get(CONF_IMAGE_REFRESH_RATE)
+            or config.get(CONF_CACHE_IMAGES))
+        self._last_image_time = 0
+        self._last_image = None
+        self._headers = (
+            {HTTP_HEADER_HA_AUTH: self.hass.config.api.api_password}
+            if self.hass.config.api.api_password is not None
+            else None)
+
+    def camera_image(self):
+        """Return camera image."""
+        return run_coroutine_threadsafe(
+            self.async_camera_image(), self.hass.loop).result()
+
+    async def async_camera_image(self):
+        """Return a still image response from the camera."""
+        now = dt_util.utcnow()
+
+        if (self._image_refresh_rate and
+                now < self._last_image_time + self._image_refresh_rate):
+            return self._last_image
+
+        self._last_image_time = now
+        url = "{}/api/camera_proxy/{}".format(
+            self.hass.config.api.base_url, self._proxied_camera)
+        try:
+            websession = async_get_clientsession(self.hass)
+            with async_timeout.timeout(10, loop=self.hass.loop):
+                response = await websession.get(url, headers=self._headers)
+            image = await response.read()
+        except asyncio.TimeoutError:
+            _LOGGER.error("Timeout getting camera image")
+            return self._last_image
+        except aiohttp.ClientError as err:
+            _LOGGER.error("Error getting new camera image: %s", err)
+            return self._last_image
+
+        image = await self.hass.async_add_job(
+            _resize_image, image, self._image_opts)
+
+        if self._cache_images:
+            self._last_image = image
+        return image
+
+    async def handle_async_mjpeg_stream(self, request):
+        """Generate an HTTP MJPEG stream from camera images."""
+        websession = async_get_clientsession(self.hass)
+        url = "{}/api/camera_proxy_stream/{}".format(
+            self.hass.config.api.base_url, self._proxied_camera)
+        stream_coro = websession.get(url, headers=self._headers)
+
+        if not self._stream_opts:
+            await async_aiohttp_proxy_web(self.hass, request, stream_coro)
+            return
+
+        response = aiohttp.web.StreamResponse()
+        response.content_type = ('multipart/x-mixed-replace; '
+                                 'boundary=--frameboundary')
+        await response.prepare(request)
+
+        async def write(img_bytes):
+            """Write image to stream."""
+            await response.write(bytes(
+                '--frameboundary\r\n'
+                'Content-Type: {}\r\n'
+                'Content-Length: {}\r\n\r\n'.format(
+                    self.content_type, len(img_bytes)),
+                'utf-8') + img_bytes + b'\r\n')
+
+        with async_timeout.timeout(10, loop=self.hass.loop):
+            req = await stream_coro
+
+        try:
+            # This would be nicer as an async generator
+            # But that would only be supported for python >=3.6
+            data = b''
+            stream = req.content
+            while True:
+                chunk = await stream.read(102400)
+                if not chunk:
+                    break
+                data += chunk
+                jpg_start = data.find(b'\xff\xd8')
+                jpg_end = data.find(b'\xff\xd9')
+                if jpg_start != -1 and jpg_end != -1:
+                    image = data[jpg_start:jpg_end + 2]
+                    image = await self.hass.async_add_job(
+                        _resize_image, image, self._stream_opts)
+                    await write(image)
+                    data = data[jpg_end + 2:]
+        except asyncio.CancelledError:
+            _LOGGER.debug("Stream closed by frontend.")
+            req.close()
+            response = None
+
+        finally:
+            if response is not None:
+                await response.write_eof()
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
--- a/homeassistant/components/camera/rpi_camera.py
+++ b/homeassistant/components/camera/rpi_camera.py
@@ -8,6 +8,7 @@ import os
 import subprocess
 import logging
 import shutil
+from tempfile import NamedTemporaryFile

 import voluptuous as vol

@@ -36,7 +37,7 @@ DEFAULT_TIMELAPSE = 1000
 DEFAULT_VERTICAL_FLIP = 0

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_FILE_PATH): cv.string,
+    vol.Optional(CONF_FILE_PATH): cv.isfile,
    vol.Optional(CONF_HORIZONTAL_FLIP, default=DEFAULT_HORIZONTAL_FLIP):
        vol.All(vol.Coerce(int), vol.Range(min=0, max=1)),
    vol.Optional(CONF_IMAGE_HEIGHT, default=DEFAULT_IMAGE_HEIGHT):
@@ -77,27 +78,36 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
            CONF_TIMELAPSE: config.get(CONF_TIMELAPSE),
            CONF_HORIZONTAL_FLIP: config.get(CONF_HORIZONTAL_FLIP),
            CONF_VERTICAL_FLIP: config.get(CONF_VERTICAL_FLIP),
-            CONF_FILE_PATH: config.get(CONF_FILE_PATH,
-                                       os.path.join(os.path.dirname(__file__),
-                                                    'image.jpg'))
+            CONF_FILE_PATH: config.get(CONF_FILE_PATH)
        }
    )

    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, kill_raspistill)

-    try:
-        # Try to create an empty file (or open existing) to ensure we have
-        # proper permissions.
-        open(setup_config[CONF_FILE_PATH], 'a').close()
+    file_path = setup_config[CONF_FILE_PATH]

-        add_devices([RaspberryCamera(setup_config)])
-    except PermissionError:
-        _LOGGER.error("File path is not writable")
-        return False
-    except FileNotFoundError:
-        _LOGGER.error("Could not create output file (missing directory?)")
+    def delete_temp_file(*args):
+        """Delete the temporary file to prevent saving multiple temp images.
+
+        Only used when no path is defined
+        """
+        os.remove(file_path)
+
+    # If no file path is defined, use a temporary file
+    if file_path is None:
+        temp_file = NamedTemporaryFile(suffix='.jpg', delete=False)
+        temp_file.close()
+        file_path = temp_file.name
+        setup_config[CONF_FILE_PATH] = file_path
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, delete_temp_file)
+
+    # Check whether the file path has been whitelisted
+    elif not hass.config.is_allowed_path(file_path):
+        _LOGGER.error("'%s' is not a whitelisted directory", file_path)
        return False

+    add_devices([RaspberryCamera(setup_config)])
+

 class RaspberryCamera(Camera):
    """Representation of a Raspberry Pi camera."""
--- a/homeassistant/components/camera/services.yaml
+++ b/homeassistant/components/camera/services.yaml
@@ -23,3 +23,20 @@ snapshot:
    filename:
      description: Template of a Filename. Variable is entity_id.
      example: '/tmp/snapshot_{{ entity_id }}'
+
+onvif_ptz:
+  description: Pan/Tilt/Zoom service for ONVIF camera.
+  fields:
+    entity_id:
+      description: Name(s) of entities to pan, tilt or zoom.
+      example: 'camera.living_room_camera'
+    pan:
+      description: "Direction of pan. Allowed values: LEFT, RIGHT."
+      example: 'LEFT'
+    tilt:
+      description: "Direction of tilt. Allowed values: DOWN, UP."
+      example: 'DOWN'
+    zoom:
+      description: "Zoom. Allowed values: ZOOM_IN, ZOOM_OUT"
+      example: "ZOOM_IN"
+
--- a/homeassistant/components/camera/synology.py
+++ b/homeassistant/components/camera/synology.py
@@ -20,7 +20,7 @@ from homeassistant.helpers.aiohttp_client import (
    async_get_clientsession)
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['py-synology==0.1.5']
+REQUIREMENTS = ['py-synology==0.2.0']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -188,7 +188,7 @@ class UnifiVideoCamera(Camera):
            self._nvr.set_recordmode(self._uuid, set_mode)
            self._motion_status = mode
        except NvrError as err:
-            _LOGGER.error("Unable to set recordmode to " + set_mode)
+            _LOGGER.error("Unable to set recordmode to %s", set_mode)
            _LOGGER.debug(err)

    def enable_motion_detection(self):
--- a/homeassistant/components/camera/xeoma.py
+++ b/homeassistant/components/camera/xeoma.py
@@ -4,7 +4,6 @@ Support for Xeoma Cameras.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/camera.xeoma/
 """
-import asyncio
 import logging

 import voluptuous as vol
@@ -14,7 +13,7 @@ from homeassistant.const import (
    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME)
 from homeassistant.helpers import config_validation as cv

-REQUIREMENTS = ['pyxeoma==1.3']
+REQUIREMENTS = ['pyxeoma==1.4.0']

 _LOGGER = logging.getLogger(__name__)

@@ -33,7 +32,7 @@ CAMERAS_SCHEMA = vol.Schema({

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_CAMERAS, default={}):
+    vol.Optional(CONF_CAMERAS):
        vol.Schema(vol.All(cv.ensure_list, [CAMERAS_SCHEMA])),
    vol.Optional(CONF_NEW_VERSION, default=True): cv.boolean,
    vol.Optional(CONF_PASSWORD): cv.string,
@@ -41,9 +40,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-@asyncio.coroutine
-# pylint: disable=unused-argument
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
    """Discover and setup Xeoma Cameras."""
    from pyxeoma.xeoma import Xeoma, XeomaError

@@ -54,8 +52,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    xeoma = Xeoma(host, login, password)

    try:
-        yield from xeoma.async_test_connection()
-        discovered_image_names = yield from xeoma.async_get_image_names()
+        await xeoma.async_test_connection()
+        discovered_image_names = await xeoma.async_get_image_names()
        discovered_cameras = [
            {
                CONF_IMAGE_NAME: image_name,
@@ -68,7 +66,9 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
            for image_name, username, pw in discovered_image_names
        ]

-        for cam in config[CONF_CAMERAS]:
+        for cam in config.get(CONF_CAMERAS, []):
+            # https://github.com/PyCQA/pylint/issues/1830
+            # pylint: disable=stop-iteration-return
            camera = next(
                (dc for dc in discovered_cameras
                 if dc[CONF_IMAGE_NAME] == cam[CONF_IMAGE_NAME]), None)
@@ -102,12 +102,11 @@ class XeomaCamera(Camera):
        self._password = password
        self._last_image = None

-    @asyncio.coroutine
-    def async_camera_image(self):
+    async def async_camera_image(self):
        """Return a still image response from the camera."""
        from pyxeoma.xeoma import XeomaError
        try:
-            image = yield from self._xeoma.async_get_camera_image(
+            image = await self._xeoma.async_get_camera_image(
                self._image, self._username, self._password)
            self._last_image = image
        except XeomaError as err:
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -38,8 +38,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass,
+                               config,
+                               async_add_devices,
+                               discovery_info=None):
    """Set up a Yi Camera."""
    _LOGGER.debug('Received configuration: %s', config)
    async_add_devices([YiCamera(hass, config)], True)
@@ -107,31 +109,29 @@ class YiCamera(Camera):
            self.user, self.passwd, self.host, self.port, self.path,
            latest_dir, videos[-1])

-    @asyncio.coroutine
-    def async_camera_image(self):
+    async def async_camera_image(self):
        """Return a still image response from the camera."""
        from haffmpeg import ImageFrame, IMAGE_JPEG

-        url = yield from self.hass.async_add_job(self.get_latest_video_url)
+        url = await self.hass.async_add_job(self.get_latest_video_url)
        if url != self._last_url:
            ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
-            self._last_image = yield from asyncio.shield(ffmpeg.get_image(
+            self._last_image = await asyncio.shield(ffmpeg.get_image(
                url, output_format=IMAGE_JPEG,
                extra_cmd=self._extra_arguments), loop=self.hass.loop)
            self._last_url = url

        return self._last_image

-    @asyncio.coroutine
-    def handle_async_mjpeg_stream(self, request):
+    async def handle_async_mjpeg_stream(self, request):
        """Generate an HTTP MJPEG stream from the camera."""
        from haffmpeg import CameraMjpeg

        stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
-        yield from stream.open_camera(
+        await stream.open_camera(
            self._last_url, extra_cmd=self._extra_arguments)

-        yield from async_aiohttp_proxy_stream(
+        await async_aiohttp_proxy_stream(
            self.hass, request, stream,
            'multipart/x-mixed-replace;boundary=ffserver')
-        yield from stream.close()
+        await stream.close()
--- a/homeassistant/components/canary.py
+++ b/homeassistant/components/canary.py
@@ -15,7 +15,7 @@ from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT
 from homeassistant.helpers import discovery
 from homeassistant.util import Throttle

-REQUIREMENTS = ['py-canary==0.4.0']
+REQUIREMENTS = ['py-canary==0.4.1']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/climate/init.py
+++ b/homeassistant/components/climate/init.py
@@ -237,14 +237,12 @@ def set_swing_mode(hass, swing_mode, entity_id=None):
    hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)


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

-    @asyncio.coroutine
-    def async_away_mode_set_service(service):
+    async def async_away_mode_set_service(service):
        """Set away mode on target climate devices."""
        target_climate = component.async_extract_from_service(service)

@@ -253,23 +251,22 @@ def async_setup(hass, config):
        update_tasks = []
        for climate in target_climate:
            if away_mode:
-                yield from climate.async_turn_away_mode_on()
+                await climate.async_turn_away_mode_on()
            else:
-                yield from climate.async_turn_away_mode_off()
+                await climate.async_turn_away_mode_off()

            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_AWAY_MODE, async_away_mode_set_service,
        schema=SET_AWAY_MODE_SCHEMA)

-    @asyncio.coroutine
-    def async_hold_mode_set_service(service):
+    async def async_hold_mode_set_service(service):
        """Set hold mode on target climate devices."""
        target_climate = component.async_extract_from_service(service)

@@ -277,21 +274,20 @@ def async_setup(hass, config):

        update_tasks = []
        for climate in target_climate:
-            yield from climate.async_set_hold_mode(hold_mode)
+            await climate.async_set_hold_mode(hold_mode)

            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_HOLD_MODE, async_hold_mode_set_service,
        schema=SET_HOLD_MODE_SCHEMA)

-    @asyncio.coroutine
-    def async_aux_heat_set_service(service):
+    async def async_aux_heat_set_service(service):
        """Set auxiliary heater on target climate devices."""
        target_climate = component.async_extract_from_service(service)

@@ -300,23 +296,22 @@ def async_setup(hass, config):
        update_tasks = []
        for climate in target_climate:
            if aux_heat:
-                yield from climate.async_turn_aux_heat_on()
+                await climate.async_turn_aux_heat_on()
            else:
-                yield from climate.async_turn_aux_heat_off()
+                await climate.async_turn_aux_heat_off()

            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_AUX_HEAT, async_aux_heat_set_service,
        schema=SET_AUX_HEAT_SCHEMA)

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

@@ -333,21 +328,20 @@ def async_setup(hass, config):
                else:
                    kwargs[value] = temp

-            yield from climate.async_set_temperature(**kwargs)
+            await climate.async_set_temperature(**kwargs)

            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_TEMPERATURE, async_temperature_set_service,
        schema=SET_TEMPERATURE_SCHEMA)

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

@@ -355,20 +349,19 @@ def async_setup(hass, config):

        update_tasks = []
        for climate in target_climate:
-            yield from climate.async_set_humidity(humidity)
+            await climate.async_set_humidity(humidity)
            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_HUMIDITY, async_humidity_set_service,
        schema=SET_HUMIDITY_SCHEMA)

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

@@ -376,20 +369,19 @@ def async_setup(hass, config):

        update_tasks = []
        for climate in target_climate:
-            yield from climate.async_set_fan_mode(fan)
+            await climate.async_set_fan_mode(fan)
            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_FAN_MODE, async_fan_mode_set_service,
        schema=SET_FAN_MODE_SCHEMA)

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

@@ -397,20 +389,19 @@ def async_setup(hass, config):

        update_tasks = []
        for climate in target_climate:
-            yield from climate.async_set_operation_mode(operation_mode)
+            await climate.async_set_operation_mode(operation_mode)
            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_OPERATION_MODE, async_operation_set_service,
        schema=SET_OPERATION_MODE_SCHEMA)

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

@@ -418,36 +409,35 @@ def async_setup(hass, config):

        update_tasks = []
        for climate in target_climate:
-            yield from climate.async_set_swing_mode(swing_mode)
+            await climate.async_set_swing_mode(swing_mode)
            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_SET_SWING_MODE, async_swing_set_service,
        schema=SET_SWING_MODE_SCHEMA)

-    @asyncio.coroutine
-    def async_on_off_service(service):
+    async def async_on_off_service(service):
        """Handle on/off calls."""
        target_climate = component.async_extract_from_service(service)

        update_tasks = []
        for climate in target_climate:
            if service.service == SERVICE_TURN_ON:
-                yield from climate.async_turn_on()
+                await climate.async_turn_on()
            elif service.service == SERVICE_TURN_OFF:
-                yield from climate.async_turn_off()
+                await climate.async_turn_off()

            if not climate.should_poll:
                continue
            update_tasks.append(climate.async_update_ha_state(True))

        if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)

    hass.services.async_register(
        DOMAIN, SERVICE_TURN_OFF, async_on_off_service,
@@ -669,16 +659,16 @@ class ClimateDevice(Entity):
        """
        return self.hass.async_add_job(self.set_humidity, humidity)

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set new target fan mode."""
        raise NotImplementedError()

-    def async_set_fan_mode(self, fan):
+    def async_set_fan_mode(self, fan_mode):
        """Set new target fan mode.

        This method must be run in the event loop and returns a coroutine.
        """
-        return self.hass.async_add_job(self.set_fan_mode, fan)
+        return self.hass.async_add_job(self.set_fan_mode, fan_mode)

    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
--- a/homeassistant/components/climate/daikin.py
+++ b/homeassistant/components/climate/daikin.py
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)

 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_NAME, default=None): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
 })

 HA_STATE_TO_DAIKIN = {
@@ -236,9 +236,9 @@ class DaikinClimate(ClimateDevice):
        """Return the fan setting."""
        return self.get(ATTR_FAN_MODE)

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set fan mode."""
-        self.set({ATTR_FAN_MODE: fan})
+        self.set({ATTR_FAN_MODE: fan_mode})

    @property
    def fan_list(self):
--- a/homeassistant/components/climate/demo.py
+++ b/homeassistant/components/climate/demo.py
@@ -195,9 +195,9 @@ class DemoClimate(ClimateDevice):
        self._current_swing_mode = swing_mode
        self.schedule_update_ha_state()

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

    def set_operation_mode(self, operation_mode):
@@ -225,9 +225,9 @@ class DemoClimate(ClimateDevice):
        self._away = False
        self.schedule_update_ha_state()

-    def set_hold_mode(self, hold):
-        """Update hold mode on."""
-        self._hold = hold
+    def set_hold_mode(self, hold_mode):
+        """Update hold_mode on."""
+        self._hold = hold_mode
        self.schedule_update_ha_state()

    def turn_aux_heat_on(self):
--- a/homeassistant/components/climate/ecobee.py
+++ b/homeassistant/components/climate/ecobee.py
@@ -14,10 +14,10 @@ from homeassistant.components.climate import (
    ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_HIGH, SUPPORT_TARGET_TEMPERATURE,
    SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE, SUPPORT_OPERATION_MODE,
    SUPPORT_TARGET_HUMIDITY_LOW, SUPPORT_TARGET_HUMIDITY_HIGH,
-    SUPPORT_AUX_HEAT, SUPPORT_TARGET_TEMPERATURE_HIGH,
-    SUPPORT_TARGET_TEMPERATURE_LOW)
+    SUPPORT_AUX_HEAT, SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_FAN_MODE,
+    SUPPORT_TARGET_TEMPERATURE_LOW, STATE_OFF)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, STATE_OFF, STATE_ON, ATTR_TEMPERATURE, TEMP_FAHRENHEIT)
+    ATTR_ENTITY_ID, STATE_ON, ATTR_TEMPERATURE, TEMP_FAHRENHEIT)
 import homeassistant.helpers.config_validation as cv

 _CONFIGURING = {}
@@ -50,7 +50,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_AWAY_MODE |
                 SUPPORT_HOLD_MODE | SUPPORT_OPERATION_MODE |
                 SUPPORT_TARGET_HUMIDITY_LOW | SUPPORT_TARGET_HUMIDITY_HIGH |
                 SUPPORT_AUX_HEAT | SUPPORT_TARGET_TEMPERATURE_HIGH |
-                 SUPPORT_TARGET_TEMPERATURE_LOW)
+                 SUPPORT_TARGET_TEMPERATURE_LOW | SUPPORT_FAN_MODE)


 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -122,6 +122,7 @@ class Thermostat(ClimateDevice):
        self._climate_list = self.climate_list
        self._operation_list = ['auto', 'auxHeatOnly', 'cool',
                                'heat', 'off']
+        self._fan_list = ['auto', 'on']
        self.update_without_throttle = False

    def update(self):
@@ -180,24 +181,29 @@ class Thermostat(ClimateDevice):
            return self.thermostat['runtime']['desiredCool'] / 10.0
        return None

-    @property
-    def desired_fan_mode(self):
-        """Return the desired fan mode of operation."""
-        return self.thermostat['runtime']['desiredFanMode']
-
    @property
    def fan(self):
-        """Return the current fan state."""
+        """Return the current fan status."""
        if 'fan' in self.thermostat['equipmentStatus']:
            return STATE_ON
        return STATE_OFF

+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return self.thermostat['runtime']['desiredFanMode']
+
    @property
    def current_hold_mode(self):
        """Return current hold mode."""
        mode = self._current_hold_mode
        return None if mode == AWAY_MODE else mode

+    @property
+    def fan_list(self):
+        """Return the available fan modes."""
+        return self._fan_list
+
    @property
    def _current_hold_mode(self):
        events = self.thermostat['events']
@@ -206,7 +212,7 @@ class Thermostat(ClimateDevice):
                if event['type'] == 'hold':
                    if event['holdClimateRef'] == 'away':
                        if int(event['endDate'][0:4]) - \
-                           int(event['startDate'][0:4]) <= 1:
+                                int(event['startDate'][0:4]) <= 1:
                            # A temporary hold from away climate is a hold
                            return 'away'
                        # A permanent hold from away climate
@@ -228,7 +234,7 @@ class Thermostat(ClimateDevice):
    def current_operation(self):
        """Return current operation."""
        if self.operation_mode == 'auxHeatOnly' or \
-           self.operation_mode == 'heatPump':
+                self.operation_mode == 'heatPump':
            return STATE_HEAT
        return self.operation_mode

@@ -271,10 +277,11 @@ class Thermostat(ClimateDevice):
            operation = STATE_HEAT
        else:
            operation = status
+
        return {
            "actual_humidity": self.thermostat['runtime']['actualHumidity'],
            "fan": self.fan,
-            "mode": self.mode,
+            "climate_mode": self.mode,
            "operation": operation,
            "climate_list": self.climate_list,
            "fan_min_on_time": self.fan_min_on_time
@@ -342,25 +349,46 @@ class Thermostat(ClimateDevice):
                                       cool_temp_setpoint, heat_temp_setpoint,
                                       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,
+                      "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_fan_mode(self, fan_mode):
+        """Set the fan mode.  Valid values are "on" or "auto"."""
+        if (fan_mode.lower() != STATE_ON) and (fan_mode.lower() != STATE_AUTO):
+            error = "Invalid fan_mode value:  Valid values are 'on' or 'auto'"
+            _LOGGER.error(error)
+            return
+
+        cool_temp = self.thermostat['runtime']['desiredCool'] / 10.0
+        heat_temp = self.thermostat['runtime']['desiredHeat'] / 10.0
+        self.data.ecobee.set_fan_mode(self.thermostat_index, fan_mode,
+                                      cool_temp, heat_temp,
+                                      self.hold_preference())
+
+        _LOGGER.info("Setting fan mode to: %s", fan_mode)
+
    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:
+        """Set temperature hold in modes other than auto.
+
+        Ecobee API: It is good practice to set the heat and cool hold
+        temperatures to be the same, if the thermostat is in either heat, cool,
+        auxHeatOnly, or off mode. If the thermostat is in auto mode, an
+        additional rule is required. The cool hold temperature must be greater
+        than the heat hold temperature by at least the amount in the
+        heatCoolMinDelta property.
+        https://www.ecobee.com/home/developer/api/examples/ex5.shtml
+        """
+        if self.current_operation == STATE_HEAT or self.current_operation == \
+                STATE_COOL:
            heat_temp = temp
-            cool_temp = temp + 20
-        elif self.current_operation == STATE_COOL:
-            heat_temp = temp - 20
            cool_temp = temp
        else:
-            # In auto mode set temperature between
-            heat_temp = temp - 10
-            cool_temp = temp + 10
+            delta = self.thermostat['settings']['heatCoolMinDelta'] / 10
+            heat_temp = temp - delta
+            cool_temp = temp + delta
        self.set_auto_temp_hold(heat_temp, cool_temp)

    def set_temperature(self, **kwargs):
@@ -369,8 +397,8 @@ class Thermostat(ClimateDevice):
        high_temp = kwargs.get(ATTR_TARGET_TEMP_HIGH)
        temp = kwargs.get(ATTR_TEMPERATURE)

-        if self.current_operation == STATE_AUTO and (low_temp is not None or
-                                                     high_temp is not None):
+        if self.current_operation == STATE_AUTO and \
+                (low_temp is not None or high_temp is not None):
            self.set_auto_temp_hold(low_temp, high_temp)
        elif temp is not None:
            self.set_temp_hold(temp)
--- a/homeassistant/components/climate/ephember.py
+++ b/homeassistant/components/climate/ephember.py
@@ -98,8 +98,7 @@ class EphEmberThermostat(ClimateDevice):
        """Return current operation ie. heat, cool, idle."""
        if self._zone['isCurrentlyActive']:
            return STATE_HEAT
-        else:
-            return STATE_IDLE
+        return STATE_IDLE

    @property
    def is_aux_heat_on(self):
--- a/homeassistant/components/climate/eq3btsmart.py
+++ b/homeassistant/components/climate/eq3btsmart.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
    CONF_MAC, CONF_DEVICES, TEMP_CELSIUS, ATTR_TEMPERATURE, PRECISION_HALVES)
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['python-eq3bt==0.1.8']
+REQUIREMENTS = ['python-eq3bt==0.1.9']

 _LOGGER = logging.getLogger(__name__)

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


-# pylint: disable=import-error
+# pylint: disable=import-error, no-name-in-module
 class EQ3BTSmartThermostat(ClimateDevice):
    """Representation of an eQ-3 Bluetooth Smart thermostat."""

@@ -75,6 +75,8 @@ class EQ3BTSmartThermostat(ClimateDevice):

        self._name = _name
        self._thermostat = eq3.Thermostat(_mac)
+        self._target_temperature = None
+        self._target_mode = None

    @property
    def supported_features(self):
@@ -116,6 +118,7 @@ class EQ3BTSmartThermostat(ClimateDevice):
        temperature = kwargs.get(ATTR_TEMPERATURE)
        if temperature is None:
            return
+        self._target_temperature = temperature
        self._thermostat.target_temperature = temperature

    @property
@@ -132,6 +135,7 @@ class EQ3BTSmartThermostat(ClimateDevice):

    def set_operation_mode(self, operation_mode):
        """Set operation mode."""
+        self._target_mode = operation_mode
        self._thermostat.mode = self.reverse_modes[operation_mode]

    def turn_away_mode_off(self):
@@ -177,3 +181,15 @@ class EQ3BTSmartThermostat(ClimateDevice):
            self._thermostat.update()
        except BTLEException as ex:
            _LOGGER.warning("Updating the state failed: %s", ex)
+
+        if (self._target_temperature and
+                self._thermostat.target_temperature
+                != self._target_temperature):
+            self.set_temperature(temperature=self._target_temperature)
+        else:
+            self._target_temperature = None
+        if (self._target_mode and
+                self.modes[self._thermostat.mode] != self._target_mode):
+            self.set_operation_mode(operation_mode=self._target_mode)
+        else:
+            self._target_mode = None
--- a/homeassistant/components/climate/flexit.py
+++ b/homeassistant/components/climate/flexit.py
@@ -152,6 +152,6 @@ class Flexit(ClimateDevice):
            self._target_temperature = kwargs.get(ATTR_TEMPERATURE)
        self.unit.set_temp(self._target_temperature)

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set new fan mode."""
-        self.unit.set_fan_speed(self._fan_list.index(fan))
+        self.unit.set_fan_speed(self._fan_list.index(fan_mode))
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -190,11 +190,9 @@ class GenericThermostat(ClimateDevice):
        """Return the current state."""
        if self._is_device_active:
            return self.current_operation
-        else:
-            if self._enabled:
-                return STATE_IDLE
-            else:
-                return STATE_OFF
+        if self._enabled:
+            return STATE_IDLE
+        return STATE_OFF

    @property
    def should_poll(self):
@@ -231,7 +229,7 @@ class GenericThermostat(ClimateDevice):
        """List of available operation modes."""
        return self._operation_list

-    def set_operation_mode(self, operation_mode):
+    async def async_set_operation_mode(self, operation_mode):
        """Set operation mode."""
        if operation_mode == STATE_HEAT:
            self._current_operation = STATE_HEAT
--- a/homeassistant/components/climate/knx.py
+++ b/homeassistant/components/climate/knx.py
@@ -4,7 +4,6 @@ Support for KNX/IP climate devices.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.knx/
 """
-import asyncio

 import voluptuous as vol

@@ -48,9 +47,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
                 default=DEFAULT_SETPOINT_SHIFT_STEP): vol.All(
                     float, vol.Range(min=0, max=2)),
    vol.Optional(CONF_SETPOINT_SHIFT_MAX, default=DEFAULT_SETPOINT_SHIFT_MAX):
-        vol.All(int, vol.Range(min=-32, max=0)),
-    vol.Optional(CONF_SETPOINT_SHIFT_MIN, default=DEFAULT_SETPOINT_SHIFT_MIN):
        vol.All(int, vol.Range(min=0, max=32)),
+    vol.Optional(CONF_SETPOINT_SHIFT_MIN, default=DEFAULT_SETPOINT_SHIFT_MIN):
+        vol.All(int, vol.Range(min=-32, max=0)),
    vol.Optional(CONF_OPERATION_MODE_ADDRESS): cv.string,
    vol.Optional(CONF_OPERATION_MODE_STATE_ADDRESS): cv.string,
    vol.Optional(CONF_CONTROLLER_STATUS_ADDRESS): cv.string,
@@ -61,12 +60,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
    """Set up climate(s) for KNX platform."""
-    if DATA_KNX not in hass.data or not hass.data[DATA_KNX].initialized:
-        return
-
    if discovery_info is not None:
        async_add_devices_discovery(hass, discovery_info, async_add_devices)
    else:
@@ -138,11 +134,10 @@ class KNXClimate(ClimateDevice):

    def async_register_callbacks(self):
        """Register callbacks to update hass after device was changed."""
-        @asyncio.coroutine
-        def after_update_callback(device):
+        async def after_update_callback(device):
            """Call after device was updated."""
            # pylint: disable=unused-argument
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
        self.device.register_device_updated_cb(after_update_callback)

    @property
@@ -190,14 +185,13 @@ class KNXClimate(ClimateDevice):
        """Return the maximum temperature."""
        return self.device.target_temperature_max

-    @asyncio.coroutine
-    def async_set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs):
        """Set new target temperature."""
        temperature = kwargs.get(ATTR_TEMPERATURE)
        if temperature is None:
            return
-        yield from self.device.set_target_temperature(temperature)
-        yield from self.async_update_ha_state()
+        await self.device.set_target_temperature(temperature)
+        await self.async_update_ha_state()

    @property
    def current_operation(self):
@@ -213,10 +207,9 @@ class KNXClimate(ClimateDevice):
                operation_mode in
                self.device.get_supported_operation_modes()]

-    @asyncio.coroutine
-    def async_set_operation_mode(self, operation_mode):
+    async def async_set_operation_mode(self, operation_mode):
        """Set operation mode."""
        if self.device.supports_operation_mode:
            from xknx.knx import HVACOperationMode
            knx_operation_mode = HVACOperationMode(operation_mode)
-            yield from self.device.set_operation_mode(knx_operation_mode)
+            await self.device.set_operation_mode(knx_operation_mode)
--- a/homeassistant/components/climate/melissa.py
+++ b/homeassistant/components/climate/melissa.py
@@ -26,7 +26,7 @@ SUPPORT_FLAGS = (SUPPORT_FAN_MODE | SUPPORT_OPERATION_MODE |
                 SUPPORT_ON_OFF | SUPPORT_TARGET_TEMPERATURE)

 OP_MODES = [
-    STATE_AUTO, STATE_COOL, STATE_DRY, STATE_FAN_ONLY, STATE_HEAT
+    STATE_COOL, STATE_DRY, STATE_FAN_ONLY, STATE_HEAT
 ]

 FAN_MODES = [
@@ -42,8 +42,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    all_devices = []

    for device in devices:
-        all_devices.append(MelissaClimate(
-            api, device['serial_number'], device))
+        if device['type'] == 'melissa':
+            all_devices.append(MelissaClimate(
+                api, device['serial_number'], device))

    add_devices(all_devices)

@@ -146,10 +147,10 @@ class MelissaClimate(ClimateDevice):
        temp = kwargs.get(ATTR_TEMPERATURE)
        self.send({self._api.TEMP: temp})

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

    def set_operation_mode(self, operation_mode):
        """Set operation mode."""
@@ -174,8 +175,7 @@ class MelissaClimate(ClimateDevice):
        if not self._api.send(self._serial_number, self._cur_settings):
            self._cur_settings = old_value
            return False
-        else:
-            return True
+        return True

    def update(self):
        """Get latest data from Melissa."""
@@ -196,14 +196,11 @@ class MelissaClimate(ClimateDevice):
            return STATE_OFF
        elif state == self._api.STATE_IDLE:
            return STATE_IDLE
-        else:
-            return None
+        return None

    def melissa_op_to_hass(self, mode):
        """Translate Melissa modes to hass states."""
-        if mode == self._api.MODE_AUTO:
-            return STATE_AUTO
-        elif mode == self._api.MODE_HEAT:
+        if mode == self._api.MODE_HEAT:
            return STATE_HEAT
        elif mode == self._api.MODE_COOL:
            return STATE_COOL
@@ -211,10 +208,9 @@ class MelissaClimate(ClimateDevice):
            return STATE_DRY
        elif mode == self._api.MODE_FAN:
            return STATE_FAN_ONLY
-        else:
-            _LOGGER.warning(
-                "Operation mode %s could not be mapped to hass", mode)
-            return None
+        _LOGGER.warning(
+            "Operation mode %s could not be mapped to hass", mode)
+        return None

    def melissa_fan_to_hass(self, fan):
        """Translate Melissa fan modes to hass modes."""
@@ -226,15 +222,12 @@ class MelissaClimate(ClimateDevice):
            return SPEED_MEDIUM
        elif fan == self._api.FAN_HIGH:
            return SPEED_HIGH
-        else:
-            _LOGGER.warning("Fan mode %s could not be mapped to hass", fan)
-            return None
+        _LOGGER.warning("Fan mode %s could not be mapped to hass", fan)
+        return None

    def hass_mode_to_melissa(self, mode):
        """Translate hass states to melissa modes."""
-        if mode == STATE_AUTO:
-            return self._api.MODE_AUTO
-        elif mode == STATE_HEAT:
+        if mode == STATE_HEAT:
            return self._api.MODE_HEAT
        elif mode == STATE_COOL:
            return self._api.MODE_COOL
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -482,15 +482,15 @@ class MqttClimate(MqttAvailability, ClimateDevice):
            self.async_schedule_update_ha_state()

    @asyncio.coroutine
-    def async_set_fan_mode(self, fan):
+    def async_set_fan_mode(self, fan_mode):
        """Set new target temperature."""
        if self._send_if_off or self._current_operation != STATE_OFF:
            mqtt.async_publish(
                self.hass, self._topic[CONF_FAN_MODE_COMMAND_TOPIC],
-                fan, self._qos, self._retain)
+                fan_mode, self._qos, self._retain)

        if self._topic[CONF_FAN_MODE_STATE_TOPIC] is None:
-            self._current_fan_mode = fan
+            self._current_fan_mode = fan_mode
            self.async_schedule_update_ha_state()

    @asyncio.coroutine
@@ -552,15 +552,15 @@ class MqttClimate(MqttAvailability, ClimateDevice):
            self.async_schedule_update_ha_state()

    @asyncio.coroutine
-    def async_set_hold_mode(self, hold):
+    def async_set_hold_mode(self, hold_mode):
        """Update hold mode on."""
        if self._topic[CONF_HOLD_COMMAND_TOPIC] is not None:
            mqtt.async_publish(self.hass,
                               self._topic[CONF_HOLD_COMMAND_TOPIC],
-                               hold, self._qos, self._retain)
+                               hold_mode, self._qos, self._retain)

        if self._topic[CONF_HOLD_STATE_TOPIC] is None:
-            self._hold = hold
+            self._hold = hold_mode
            self.async_schedule_update_ha_state()

    @asyncio.coroutine
--- a/homeassistant/components/climate/mysensors.py
+++ b/homeassistant/components/climate/mysensors.py
@@ -143,14 +143,14 @@ class MySensorsHVAC(mysensors.MySensorsEntity, ClimateDevice):
                self._values[value_type] = value
                self.schedule_update_ha_state()

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set new target temperature."""
        set_req = self.gateway.const.SetReq
        self.gateway.set_child_value(
-            self.node_id, self.child_id, set_req.V_HVAC_SPEED, fan)
+            self.node_id, self.child_id, set_req.V_HVAC_SPEED, fan_mode)
        if self.gateway.optimistic:
            # Optimistically assume that device has changed state
-            self._values[set_req.V_HVAC_SPEED] = fan
+            self._values[set_req.V_HVAC_SPEED] = fan_mode
            self.schedule_update_ha_state()

    def set_operation_mode(self, operation_mode):
--- a/homeassistant/components/climate/nest.py
+++ b/homeassistant/components/climate/nest.py
@@ -29,10 +29,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({

 NEST_MODE_HEAT_COOL = 'heat-cool'

-SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_TARGET_TEMPERATURE_HIGH |
-                 SUPPORT_TARGET_TEMPERATURE_LOW | SUPPORT_OPERATION_MODE |
-                 SUPPORT_AWAY_MODE | SUPPORT_FAN_MODE)
-

 def setup_platform(hass, config, add_devices, discovery_info=None):
    """Set up the Nest thermostat."""
@@ -58,6 +54,10 @@ class NestThermostat(ClimateDevice):
        self.device = device
        self._fan_list = [STATE_ON, STATE_AUTO]

+        # Set the default supported features
+        self._support_flags = (SUPPORT_TARGET_TEMPERATURE |
+                               SUPPORT_OPERATION_MODE | SUPPORT_AWAY_MODE)
+
        # Not all nest devices support cooling and heating remove unused
        self._operation_list = [STATE_OFF]

@@ -70,11 +70,16 @@ class NestThermostat(ClimateDevice):

        if self.device.can_heat and self.device.can_cool:
            self._operation_list.append(STATE_AUTO)
+            self._support_flags = (self._support_flags |
+                                   SUPPORT_TARGET_TEMPERATURE_HIGH |
+                                   SUPPORT_TARGET_TEMPERATURE_LOW)

        self._operation_list.append(STATE_ECO)

        # feature of device
        self._has_fan = self.device.has_fan
+        if self._has_fan:
+            self._support_flags = (self._support_flags | SUPPORT_FAN_MODE)

        # data attributes
        self._away = None
@@ -95,7 +100,7 @@ class NestThermostat(ClimateDevice):
    @property
    def supported_features(self):
        """Return the list of supported features."""
-        return SUPPORT_FLAGS
+        return self._support_flags

    @property
    def unique_id(self):
@@ -162,6 +167,7 @@ class NestThermostat(ClimateDevice):

    def set_temperature(self, **kwargs):
        """Set new target temperature."""
+        import nest
        target_temp_low = kwargs.get(ATTR_TARGET_TEMP_LOW)
        target_temp_high = kwargs.get(ATTR_TARGET_TEMP_HIGH)
        if self._mode == NEST_MODE_HEAT_COOL:
@@ -170,7 +176,10 @@ class NestThermostat(ClimateDevice):
        else:
            temp = kwargs.get(ATTR_TEMPERATURE)
        _LOGGER.debug("Nest set_temperature-output-value=%s", temp)
-        self.device.target = temp
+        try:
+            self.device.target = temp
+        except nest.nest.APIError:
+            _LOGGER.error("An error occured while setting the temperature")

    def set_operation_mode(self, operation_mode):
        """Set operation mode."""
@@ -205,11 +214,14 @@ class NestThermostat(ClimateDevice):
    @property
    def fan_list(self):
        """List of available fan modes."""
-        return self._fan_list
+        if self._has_fan:
+            return self._fan_list
+        return None

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Turn fan on/off."""
-        self.device.fan = fan.lower()
+        if self._has_fan:
+            self.device.fan = fan_mode.lower()

    @property
    def min_temp(self):
@@ -225,7 +237,7 @@ class NestThermostat(ClimateDevice):
        """Cache value from Python-nest."""
        self._location = self.device.where
        self._name = self.device.name
-        self._humidity = self.device.humidity,
+        self._humidity = self.device.humidity
        self._temperature = self.device.temperature
        self._mode = self.device.mode
        self._target_temperature = self.device.target
--- a/homeassistant/components/climate/nuheat.py
+++ b/homeassistant/components/climate/nuheat.py
@@ -185,7 +185,7 @@ class NuHeatThermostat(ClimateDevice):
        self._thermostat.resume_schedule()
        self._force_update = True

-    def set_hold_mode(self, hold_mode, **kwargs):
+    def set_hold_mode(self, hold_mode):
        """Update the hold mode of the thermostat."""
        if hold_mode == MODE_AUTO:
            schedule_mode = SCHEDULE_RUN
--- a/homeassistant/components/climate/radiotherm.py
+++ b/homeassistant/components/climate/radiotherm.py
@@ -183,17 +183,16 @@ class RadioThermostat(ClimateDevice):
        """List of available fan modes."""
        if self._is_model_ct80:
            return CT80_FAN_OPERATION_LIST
-        else:
-            return CT30_FAN_OPERATION_LIST
+        return CT30_FAN_OPERATION_LIST

    @property
    def current_fan_mode(self):
        """Return whether the fan is on."""
        return self._fmode

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Turn fan on/off."""
-        code = FAN_MODE_TO_CODE.get(fan, None)
+        code = FAN_MODE_TO_CODE.get(fan_mode, None)
        if code is not None:
            self.device.fmode = code

--- a/homeassistant/components/climate/sensibo.py
+++ b/homeassistant/components/climate/sensibo.py
@@ -29,7 +29,7 @@ REQUIREMENTS = ['pysensibo==1.0.2']

 _LOGGER = logging.getLogger(__name__)

-ALL = 'all'
+ALL = ['all']
 TIMEOUT = 10

 SERVICE_ASSUME_STATE = 'sensibo_assume_state'
@@ -240,13 +240,18 @@ class SensiboClimate(ClimateDevice):
    def min_temp(self):
        """Return the minimum temperature."""
        return self._temperatures_list[0] \
-            if len(self._temperatures_list) else super().min_temp()
+            if self._temperatures_list else super().min_temp

    @property
    def max_temp(self):
        """Return the maximum temperature."""
        return self._temperatures_list[-1] \
-            if len(self._temperatures_list) else super().max_temp()
+            if self._temperatures_list else super().max_temp
+
+    @property
+    def unique_id(self):
+        """Return unique ID based on Sensibo ID."""
+        return self._id

    @asyncio.coroutine
    def async_set_temperature(self, **kwargs):
@@ -273,11 +278,11 @@ class SensiboClimate(ClimateDevice):
                self._id, 'targetTemperature', temperature, self._ac_states)

    @asyncio.coroutine
-    def async_set_fan_mode(self, fan):
+    def async_set_fan_mode(self, fan_mode):
        """Set new target fan mode."""
        with async_timeout.timeout(TIMEOUT):
            yield from self._client.async_set_ac_state_property(
-                self._id, 'fanLevel', fan, self._ac_states)
+                self._id, 'fanLevel', fan_mode, self._ac_states)

    @asyncio.coroutine
    def async_set_operation_mode(self, operation_mode):
--- a/homeassistant/components/climate/tado.py
+++ b/homeassistant/components/climate/tado.py
@@ -213,6 +213,7 @@ class TadoClimate(ClimateDevice):
        self._target_temp = temperature
        self._control_heating()

+    # pylint: disable=arguments-differ
    def set_operation_mode(self, readable_operation_mode):
        """Set new operation mode."""
        operation_mode = CONST_MODE_SMART_SCHEDULE
--- a/homeassistant/components/climate/tesla.py
+++ b/homeassistant/components/climate/tesla.py
@@ -51,8 +51,7 @@ class TeslaThermostat(TeslaDevice, ClimateDevice):
        mode = self.tesla_device.is_hvac_enabled()
        if mode:
            return OPERATION_LIST[0]  # On
-        else:
-            return OPERATION_LIST[1]  # Off
+        return OPERATION_LIST[1]  # Off

    @property
    def operation_list(self):
--- a/homeassistant/components/climate/venstar.py
+++ b/homeassistant/components/climate/venstar.py
@@ -111,8 +111,7 @@ class VenstarThermostat(ClimateDevice):
        """Return the unit of measurement, as defined by the API."""
        if self._client.tempunits == self._client.TEMPUNITS_F:
            return TEMP_FAHRENHEIT
-        else:
-            return TEMP_CELSIUS
+        return TEMP_CELSIUS

    @property
    def fan_list(self):
@@ -143,16 +142,14 @@ class VenstarThermostat(ClimateDevice):
            return STATE_COOL
        elif self._client.mode == self._client.MODE_AUTO:
            return STATE_AUTO
-        else:
-            return STATE_OFF
+        return STATE_OFF

    @property
    def current_fan_mode(self):
        """Return the fan setting."""
        if self._client.fan == self._client.FAN_AUTO:
            return STATE_AUTO
-        else:
-            return STATE_ON
+        return STATE_ON

    @property
    def device_state_attributes(self):
@@ -169,24 +166,21 @@ class VenstarThermostat(ClimateDevice):
            return self._client.heattemp
        elif self._client.mode == self._client.MODE_COOL:
            return self._client.cooltemp
-        else:
-            return None
+        return None

    @property
    def target_temperature_low(self):
        """Return the lower bound temp if auto mode is on."""
        if self._client.mode == self._client.MODE_AUTO:
            return self._client.heattemp
-        else:
-            return None
+        return None

    @property
    def target_temperature_high(self):
        """Return the upper bound temp if auto mode is on."""
        if self._client.mode == self._client.MODE_AUTO:
            return self._client.cooltemp
-        else:
-            return None
+        return None

    @property
    def target_humidity(self):
@@ -245,9 +239,9 @@ class VenstarThermostat(ClimateDevice):
            if not success:
                _LOGGER.error("Failed to change the temperature")

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set new target fan mode."""
-        if fan == STATE_ON:
+        if fan_mode == STATE_ON:
            success = self._client.set_fan(self._client.FAN_ON)
        else:
            success = self._client.set_fan(self._client.FAN_AUTO)
--- a/homeassistant/components/climate/vera.py
+++ b/homeassistant/components/climate/vera.py
@@ -85,13 +85,13 @@ class VeraThermostat(VeraDevice, ClimateDevice):
        """Return a list of available fan modes."""
        return FAN_OPERATION_LIST

-    def set_fan_mode(self, mode):
+    def set_fan_mode(self, fan_mode):
        """Set new target temperature."""
-        if mode == FAN_OPERATION_LIST[0]:
+        if fan_mode == FAN_OPERATION_LIST[0]:
            self.vera_device.fan_on()
-        elif mode == FAN_OPERATION_LIST[1]:
+        elif fan_mode == FAN_OPERATION_LIST[1]:
            self.vera_device.fan_auto()
-        elif mode == FAN_OPERATION_LIST[2]:
+        elif fan_mode == FAN_OPERATION_LIST[2]:
            return self.vera_device.fan_cycle()

    @property
--- a/homeassistant/components/climate/wink.py
+++ b/homeassistant/components/climate/wink.py
@@ -324,9 +324,9 @@ class WinkThermostat(WinkDevice, ClimateDevice):
            return self.wink.fan_modes()
        return None

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Turn fan on/off."""
-        self.wink.set_fan_mode(fan.lower())
+        self.wink.set_fan_mode(fan_mode.lower())

    def turn_aux_heat_on(self):
        """Turn auxiliary heater on."""
@@ -486,26 +486,25 @@ class WinkAC(WinkDevice, ClimateDevice):
            return SPEED_LOW
        elif speed <= 0.66:
            return SPEED_MEDIUM
-        else:
-            return SPEED_HIGH
+        return SPEED_HIGH

    @property
    def fan_list(self):
        """Return a list of available fan modes."""
        return [SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """
        Set fan speed.

        The official Wink app only supports 3 modes [low, medium, high]
        which are equal to [0.33, 0.66, 1.0] respectively.
        """
-        if fan == SPEED_LOW:
+        if fan_mode == SPEED_LOW:
            speed = 0.33
-        elif fan == SPEED_MEDIUM:
+        elif fan_mode == SPEED_MEDIUM:
            speed = 0.66
-        elif fan == SPEED_HIGH:
+        elif fan_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
@@ -198,10 +198,10 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):

        self.values.primary.data = temperature

-    def set_fan_mode(self, fan):
+    def set_fan_mode(self, fan_mode):
        """Set new target fan mode."""
        if self.values.fan_mode:
-            self.values.fan_mode.data = fan
+            self.values.fan_mode.data = fan_mode

    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
--- a/homeassistant/components/cloud/init.py
+++ b/homeassistant/components/cloud/init.py
@@ -15,12 +15,12 @@ import async_timeout
 import voluptuous as vol

 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE, CONF_NAME, CONF_TYPE)
+    EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE, CONF_NAME)
 from homeassistant.helpers import entityfilter, config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util import dt as dt_util
 from homeassistant.components.alexa import smart_home as alexa_sh
-from homeassistant.components.google_assistant import smart_home as ga_sh
+from homeassistant.components.google_assistant import helpers as ga_h

 from . import http_api, iot
 from .const import CONFIG_DIR, DOMAIN, SERVERS
@@ -37,6 +37,7 @@ CONF_FILTER = 'filter'
 CONF_GOOGLE_ACTIONS = 'google_actions'
 CONF_RELAYER = 'relayer'
 CONF_USER_POOL_ID = 'user_pool_id'
+CONF_GOOGLE_ACTIONS_SYNC_URL = 'google_actions_sync_url'

 DEFAULT_MODE = 'production'
 DEPENDENCIES = ['http']
@@ -51,15 +52,11 @@ ALEXA_ENTITY_SCHEMA = vol.Schema({

 GOOGLE_ENTITY_SCHEMA = vol.Schema({
    vol.Optional(CONF_NAME): cv.string,
-    vol.Optional(CONF_TYPE): vol.In(ga_sh.MAPPING_COMPONENT),
    vol.Optional(CONF_ALIASES): vol.All(cv.ensure_list, [cv.string])
 })

 ASSISTANT_SCHEMA = vol.Schema({
-    vol.Optional(
-        CONF_FILTER,
-        default=lambda: entityfilter.generate_filter([], [], [], [])
-    ): entityfilter.FILTER_SCHEMA,
+    vol.Optional(CONF_FILTER, default={}): entityfilter.FILTER_SCHEMA,
 })

 ALEXA_SCHEMA = ASSISTANT_SCHEMA.extend({
@@ -79,6 +76,7 @@ CONFIG_SCHEMA = vol.Schema({
        vol.Optional(CONF_USER_POOL_ID): str,
        vol.Optional(CONF_REGION): str,
        vol.Optional(CONF_RELAYER): str,
+        vol.Optional(CONF_GOOGLE_ACTIONS_SYNC_URL): str,
        vol.Optional(CONF_ALEXA): ALEXA_SCHEMA,
        vol.Optional(CONF_GOOGLE_ACTIONS): GACTIONS_SCHEMA,
    }),
@@ -114,7 +112,7 @@ class Cloud:

    def __init__(self, hass, mode, alexa, google_actions,
                 cognito_client_id=None, user_pool_id=None, region=None,
-                 relayer=None):
+                 relayer=None, google_actions_sync_url=None):
        """Create an instance of Cloud."""
        self.hass = hass
        self.mode = mode
@@ -132,6 +130,7 @@ class Cloud:
            self.user_pool_id = user_pool_id
            self.region = region
            self.relayer = relayer
+            self.google_actions_sync_url = google_actions_sync_url

        else:
            info = SERVERS[mode]
@@ -140,6 +139,7 @@ class Cloud:
            self.user_pool_id = info['user_pool_id']
            self.region = info['region']
            self.relayer = info['relayer']
+            self.google_actions_sync_url = info['google_actions_sync_url']

    @property
    def is_logged_in(self):
@@ -178,7 +178,7 @@ class Cloud:
                """If an entity should be exposed."""
                return conf['filter'](entity.entity_id)

-            self._gactions_config = ga_sh.Config(
+            self._gactions_config = ga_h.Config(
                should_expose=should_expose,
                agent_user_id=self.claims['cognito:username'],
                entity_config=conf.get(CONF_ENTITY_CONFIG),
@@ -222,7 +222,7 @@ class Cloud:

        # Fetching keyset can fail if internet is not up yet.
        if not success:
-            self.hass.helpers.async_call_later(5, self.async_start)
+            self.hass.helpers.event.async_call_later(5, self.async_start)
            return

        def load_config():
--- a/homeassistant/components/cloud/auth_api.py
+++ b/homeassistant/components/cloud/auth_api.py
@@ -1,7 +1,4 @@
 """Package to communicate with the authentication API."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)


 class CloudError(Exception):
@@ -20,17 +17,11 @@ class UserNotConfirmed(CloudError):
    """Raised when a user has not confirmed email yet."""


-class ExpiredCode(CloudError):
-    """Raised when an expired code is encountered."""
-
-
-class InvalidCode(CloudError):
-    """Raised when an invalid code is submitted."""
-
-
 class PasswordChangeRequired(CloudError):
    """Raised when a password change is required."""

+    # https://github.com/PyCQA/pylint/issues/1085
+    # pylint: disable=useless-super-delegation
    def __init__(self, message='Password change required.'):
        """Initialize a password change required error."""
        super().__init__(message)
@@ -43,10 +34,8 @@ class UnknownError(CloudError):
 AWS_EXCEPTIONS = {
    'UserNotFoundException': UserNotFound,
    'NotAuthorizedException': Unauthenticated,
-    'ExpiredCodeException': ExpiredCode,
    'UserNotConfirmedException': UserNotConfirmed,
    'PasswordResetRequiredException': PasswordChangeRequired,
-    'CodeMismatchException': InvalidCode,
 }


@@ -70,17 +59,6 @@ def register(cloud, email, password):
        raise _map_aws_exception(err)


-def confirm_register(cloud, confirmation_code, email):
-    """Confirm confirmation code after registration."""
-    from botocore.exceptions import ClientError
-
-    cognito = _cognito(cloud)
-    try:
-        cognito.confirm_sign_up(confirmation_code, email)
-    except ClientError as err:
-        raise _map_aws_exception(err)
-
-
 def resend_email_confirm(cloud, email):
    """Resend email confirmation."""
    from botocore.exceptions import ClientError
@@ -108,18 +86,6 @@ def forgot_password(cloud, email):
        raise _map_aws_exception(err)


-def confirm_forgot_password(cloud, confirmation_code, email, new_password):
-    """Confirm forgotten password code and change password."""
-    from botocore.exceptions import ClientError
-
-    cognito = _cognito(cloud, username=email)
-
-    try:
-        cognito.confirm_forgot_password(confirmation_code, new_password)
-    except ClientError as err:
-        raise _map_aws_exception(err)
-
-
 def login(cloud, email, password):
    """Log user in and fetch certificate."""
    cognito = _authenticate(cloud, email, password)
--- a/homeassistant/components/cloud/const.py
+++ b/homeassistant/components/cloud/const.py
@@ -8,7 +8,9 @@ SERVERS = {
        'cognito_client_id': '60i2uvhvbiref2mftj7rgcrt9u',
        'user_pool_id': 'us-east-1_87ll5WOP8',
        'region': 'us-east-1',
-        'relayer': 'wss://cloud.hass.io:8000/websocket'
+        'relayer': 'wss://cloud.hass.io:8000/websocket',
+        'google_actions_sync_url': ('https://24ab3v80xd.execute-api.us-east-1.'
+                                    'amazonaws.com/prod/smart_home_sync'),
    }
 }

@@ -16,3 +18,9 @@ MESSAGE_EXPIRATION = """
 It looks like your Home Assistant Cloud subscription has expired. Please check
 your [account page](/config/cloud/account) to continue using the service.
 """
+
+MESSAGE_AUTH_FAIL = """
+You have been logged out of Home Assistant Cloud because we have been unable
+to verify your credentials. Please [log in](/config/cloud) again to continue
+using the service.
+"""
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -6,8 +6,9 @@ import logging
 import async_timeout
 import voluptuous as vol

-from homeassistant.components.http import (
-    HomeAssistantView, RequestDataValidator)
+from homeassistant.components.http import HomeAssistantView
+from homeassistant.components.http.data_validator import (
+    RequestDataValidator)

 from . import auth_api
 from .const import DOMAIN, REQUEST_TIMEOUT
@@ -15,17 +16,15 @@ from .const import DOMAIN, REQUEST_TIMEOUT
 _LOGGER = logging.getLogger(__name__)


-@asyncio.coroutine
-def async_setup(hass):
+async def async_setup(hass):
    """Initialize the HTTP API."""
+    hass.http.register_view(GoogleActionsSyncView)
    hass.http.register_view(CloudLoginView)
    hass.http.register_view(CloudLogoutView)
    hass.http.register_view(CloudAccountView)
    hass.http.register_view(CloudRegisterView)
-    hass.http.register_view(CloudConfirmRegisterView)
    hass.http.register_view(CloudResendConfirmView)
    hass.http.register_view(CloudForgotPasswordView)
-    hass.http.register_view(CloudConfirmForgotPasswordView)


 _CLOUD_ERRORS = {
@@ -33,20 +32,17 @@ _CLOUD_ERRORS = {
    auth_api.UserNotConfirmed: (400, 'Email not confirmed.'),
    auth_api.Unauthenticated: (401, 'Authentication failed.'),
    auth_api.PasswordChangeRequired: (400, 'Password change required.'),
-    auth_api.ExpiredCode: (400, 'Confirmation code has expired.'),
-    auth_api.InvalidCode: (400, 'Invalid confirmation code.'),
    asyncio.TimeoutError: (502, 'Unable to reach the Home Assistant cloud.')
 }


 def _handle_cloud_errors(handler):
    """Handle auth errors."""
-    @asyncio.coroutine
    @wraps(handler)
-    def error_handler(view, request, *args, **kwargs):
+    async def error_handler(view, request, *args, **kwargs):
        """Handle exceptions that raise from the wrapped request handler."""
        try:
-            result = yield from handler(view, request, *args, **kwargs)
+            result = await handler(view, request, *args, **kwargs)
            return result

        except (auth_api.CloudError, asyncio.TimeoutError) as err:
@@ -60,6 +56,31 @@ def _handle_cloud_errors(handler):
    return error_handler


+class GoogleActionsSyncView(HomeAssistantView):
+    """Trigger a Google Actions Smart Home Sync."""
+
+    url = '/api/cloud/google_actions/sync'
+    name = 'api:cloud:google_actions/sync'
+
+    @_handle_cloud_errors
+    async def post(self, request):
+        """Trigger a Google Actions sync."""
+        hass = request.app['hass']
+        cloud = hass.data[DOMAIN]
+        websession = hass.helpers.aiohttp_client.async_get_clientsession()
+
+        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
+            await hass.async_add_job(auth_api.check_token, cloud)
+
+        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
+            req = await websession.post(
+                cloud.google_actions_sync_url, headers={
+                    'authorization': cloud.id_token
+                })
+
+        return self.json({}, status_code=req.status)
+
+
 class CloudLoginView(HomeAssistantView):
    """Login to Home Assistant cloud."""

@@ -71,19 +92,18 @@ class CloudLoginView(HomeAssistantView):
        vol.Required('email'): str,
        vol.Required('password'): str,
    }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
        """Handle login request."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]

        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(auth_api.login, cloud, data['email'],
-                                          data['password'])
+            await hass.async_add_job(auth_api.login, cloud, data['email'],
+                                     data['password'])

        hass.async_add_job(cloud.iot.connect)
        # Allow cloud to start connecting.
-        yield from asyncio.sleep(0, loop=hass.loop)
+        await asyncio.sleep(0, loop=hass.loop)
        return self.json(_account_data(cloud))


@@ -94,14 +114,13 @@ class CloudLogoutView(HomeAssistantView):
    name = 'api:cloud:logout'

    @_handle_cloud_errors
-    @asyncio.coroutine
-    def post(self, request):
+    async def post(self, request):
        """Handle logout request."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]

        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from cloud.logout()
+            await cloud.logout()

        return self.json_message('ok')

@@ -112,8 +131,7 @@ class CloudAccountView(HomeAssistantView):
    url = '/api/cloud/account'
    name = 'api:cloud:account'

-    @asyncio.coroutine
-    def get(self, request):
+    async def get(self, request):
        """Get account info."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]
@@ -135,44 +153,18 @@ class CloudRegisterView(HomeAssistantView):
        vol.Required('email'): str,
        vol.Required('password'): vol.All(str, vol.Length(min=6)),
    }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
        """Handle registration request."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]

        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                auth_api.register, cloud, data['email'], data['password'])

        return self.json_message('ok')


-class CloudConfirmRegisterView(HomeAssistantView):
-    """Confirm registration on the Home Assistant cloud."""
-
-    url = '/api/cloud/confirm_register'
-    name = 'api:cloud:confirm_register'
-
-    @_handle_cloud_errors
-    @RequestDataValidator(vol.Schema({
-        vol.Required('confirmation_code'): str,
-        vol.Required('email'): str,
-    }))
-    @asyncio.coroutine
-    def post(self, request, data):
-        """Handle registration confirmation request."""
-        hass = request.app['hass']
-        cloud = hass.data[DOMAIN]
-
-        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
-                auth_api.confirm_register, cloud, data['confirmation_code'],
-                data['email'])
-
-        return self.json_message('ok')
-
-
 class CloudResendConfirmView(HomeAssistantView):
    """Resend email confirmation code."""

@@ -183,14 +175,13 @@ class CloudResendConfirmView(HomeAssistantView):
    @RequestDataValidator(vol.Schema({
        vol.Required('email'): str,
    }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
        """Handle resending confirm email code request."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]

        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                auth_api.resend_email_confirm, cloud, data['email'])

        return self.json_message('ok')
@@ -206,46 +197,18 @@ class CloudForgotPasswordView(HomeAssistantView):
    @RequestDataValidator(vol.Schema({
        vol.Required('email'): str,
    }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
        """Handle forgot password request."""
        hass = request.app['hass']
        cloud = hass.data[DOMAIN]

        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                auth_api.forgot_password, cloud, data['email'])

        return self.json_message('ok')


-class CloudConfirmForgotPasswordView(HomeAssistantView):
-    """View to finish Forgot Password flow.."""
-
-    url = '/api/cloud/confirm_forgot_password'
-    name = 'api:cloud:confirm_forgot_password'
-
-    @_handle_cloud_errors
-    @RequestDataValidator(vol.Schema({
-        vol.Required('confirmation_code'): str,
-        vol.Required('email'): str,
-        vol.Required('new_password'): vol.All(str, vol.Length(min=6))
-    }))
-    @asyncio.coroutine
-    def post(self, request, data):
-        """Handle forgot password confirm request."""
-        hass = request.app['hass']
-        cloud = hass.data[DOMAIN]
-
-        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
-                auth_api.confirm_forgot_password, cloud,
-                data['confirmation_code'], data['email'],
-                data['new_password'])
-
-        return self.json_message('ok')
-
-
 def _account_data(cloud):
    """Generate the auth data JSON response."""
    claims = cloud.claims
--- a/homeassistant/components/cloud/iot.py
+++ b/homeassistant/components/cloud/iot.py
@@ -1,6 +1,7 @@
 """Module to handle messages from Home Assistant cloud."""
 import asyncio
 import logging
+import pprint

 from aiohttp import hdrs, client_exceptions, WSMsgType

@@ -10,7 +11,7 @@ from homeassistant.components.google_assistant import smart_home as ga
 from homeassistant.util.decorator import Registry
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from . import auth_api
-from .const import MESSAGE_EXPIRATION
+from .const import MESSAGE_EXPIRATION, MESSAGE_AUTH_FAIL

 HANDLERS = Registry()
 _LOGGER = logging.getLogger(__name__)
@@ -44,20 +45,13 @@ class CloudIoT:
    @asyncio.coroutine
    def connect(self):
        """Connect to the IoT broker."""
+        if self.state != STATE_DISCONNECTED:
+            raise RuntimeError('Connect called while not disconnected')
+
        hass = self.cloud.hass
-        if self.cloud.subscription_expired:
-            # Try refreshing the token to see if it is still expired.
-            yield from hass.async_add_job(auth_api.check_token, self.cloud)
-
-            if self.cloud.subscription_expired:
-                hass.components.persistent_notification.async_create(
-                    MESSAGE_EXPIRATION, 'Subscription expired',
-                    'cloud_subscription_expired')
-                self.state = STATE_DISCONNECTED
-                return
-
-        if self.state == STATE_CONNECTED:
-            raise RuntimeError('Already connected')
+        self.close_requested = False
+        self.state = STATE_CONNECTING
+        self.tries = 0

        @asyncio.coroutine
        def _handle_hass_stop(event):
@@ -66,17 +60,70 @@ class CloudIoT:
            remove_hass_stop_listener = None
            yield from self.disconnect()

-        self.state = STATE_CONNECTING
-        self.close_requested = False
        remove_hass_stop_listener = hass.bus.async_listen_once(
            EVENT_HOMEASSISTANT_STOP, _handle_hass_stop)
+
+        while True:
+            try:
+                yield from self._handle_connection()
+            except Exception:  # pylint: disable=broad-except
+                # Safety net. This should never hit.
+                # Still adding it here to make sure we can always reconnect
+                _LOGGER.exception("Unexpected error")
+
+            if self.close_requested:
+                break
+
+            self.state = STATE_CONNECTING
+            self.tries += 1
+
+            try:
+                # Sleep 2^tries seconds between retries
+                self.retry_task = hass.async_add_job(asyncio.sleep(
+                    2**min(9, self.tries), loop=hass.loop))
+                yield from self.retry_task
+                self.retry_task = None
+            except asyncio.CancelledError:
+                # Happens if disconnect called
+                break
+
+        self.state = STATE_DISCONNECTED
+        if remove_hass_stop_listener is not None:
+            remove_hass_stop_listener()
+
+    @asyncio.coroutine
+    def _handle_connection(self):
+        """Connect to the IoT broker."""
+        hass = self.cloud.hass
+
+        try:
+            yield from hass.async_add_job(auth_api.check_token, self.cloud)
+        except auth_api.Unauthenticated as err:
+            _LOGGER.error('Unable to refresh token: %s', err)
+
+            hass.components.persistent_notification.async_create(
+                MESSAGE_AUTH_FAIL, 'Home Assistant Cloud',
+                'cloud_subscription_expired')
+
+            # Don't await it because it will cancel this task
+            hass.async_add_job(self.cloud.logout())
+            return
+        except auth_api.CloudError as err:
+            _LOGGER.warning("Unable to refresh token: %s", err)
+            return
+
+        if self.cloud.subscription_expired:
+            hass.components.persistent_notification.async_create(
+                MESSAGE_EXPIRATION, 'Home Assistant Cloud',
+                'cloud_subscription_expired')
+            self.close_requested = True
+            return
+
        session = async_get_clientsession(self.cloud.hass)
        client = None
        disconnect_warn = None

        try:
-            yield from hass.async_add_job(auth_api.check_token, self.cloud)
-
            self.client = client = yield from session.ws_connect(
                self.cloud.relayer, heartbeat=55, headers={
                    hdrs.AUTHORIZATION:
@@ -90,9 +137,11 @@ class CloudIoT:
            while not client.closed:
                msg = yield from client.receive()

-                if msg.type in (WSMsgType.ERROR, WSMsgType.CLOSED,
-                                WSMsgType.CLOSING):
-                    disconnect_warn = 'Connection cancelled.'
+                if msg.type in (WSMsgType.CLOSED, WSMsgType.CLOSING):
+                    break
+
+                elif msg.type == WSMsgType.ERROR:
+                    disconnect_warn = 'Connection error'
                    break

                elif msg.type != WSMsgType.TEXT:
@@ -106,7 +155,9 @@ class CloudIoT:
                    disconnect_warn = 'Received invalid JSON.'
                    break

-                _LOGGER.debug("Received message: %s", msg)
+                if _LOGGER.isEnabledFor(logging.DEBUG):
+                    _LOGGER.debug("Received message:\n%s\n",
+                                  pprint.pformat(msg))

                response = {
                    'msgid': msg['msgid'],
@@ -128,12 +179,11 @@ class CloudIoT:
                    _LOGGER.exception("Error handling message")
                    response['error'] = 'exception'

-                _LOGGER.debug("Publishing message: %s", response)
+                if _LOGGER.isEnabledFor(logging.DEBUG):
+                    _LOGGER.debug("Publishing message:\n%s\n",
+                                  pprint.pformat(response))
                yield from client.send_json(response)

-        except auth_api.CloudError:
-            _LOGGER.warning("Unable to connect: Unable to refresh token.")
-
        except client_exceptions.WSServerHandshakeError as err:
            if err.code == 401:
                disconnect_warn = 'Invalid auth.'
@@ -145,38 +195,11 @@ class CloudIoT:
        except client_exceptions.ClientError as err:
            _LOGGER.warning("Unable to connect: %s", err)

-        except Exception:  # pylint: disable=broad-except
-            if not self.close_requested:
-                _LOGGER.exception("Unexpected error")
-
        finally:
-            if disconnect_warn is not None:
-                _LOGGER.warning("Connection closed: %s", disconnect_warn)
-
-            if remove_hass_stop_listener is not None:
-                remove_hass_stop_listener()
-
-            if client is not None:
-                self.client = None
-                yield from client.close()
-
-            if self.close_requested:
-                self.state = STATE_DISCONNECTED
-
+            if disconnect_warn is None:
+                _LOGGER.info("Connection closed")
            else:
-                self.state = STATE_CONNECTING
-                self.tries += 1
-
-                try:
-                    # Sleep 0, 5, 10, 15 ... up to 30 seconds between retries
-                    self.retry_task = hass.async_add_job(asyncio.sleep(
-                        min(30, (self.tries - 1) * 5), loop=hass.loop))
-                    yield from self.retry_task
-                    self.retry_task = None
-                    hass.async_add_job(self.connect())
-                except asyncio.CancelledError:
-                    # Happens if disconnect called
-                    pass
+                _LOGGER.warning("Connection closed: %s", disconnect_warn)

    @asyncio.coroutine
    def disconnect(self):
--- a/homeassistant/components/coinbase.py
+++ b/homeassistant/components/coinbase.py
@@ -14,7 +14,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.util import Throttle

-REQUIREMENTS = ['coinbase==2.0.7']
+REQUIREMENTS = ['coinbase==2.1.0']

 _LOGGER = logging.getLogger(__name__)

--- a/homeassistant/components/config/init.py
+++ b/homeassistant/components/config/init.py
@@ -13,16 +13,25 @@ from homeassistant.util.yaml import load_yaml, dump

 DOMAIN = 'config'
 DEPENDENCIES = ['http']
-SECTIONS = ('core', 'customize', 'group', 'hassbian', 'automation', 'script')
-ON_DEMAND = ('zwave')
+SECTIONS = ('core', 'customize', 'group', 'hassbian', 'automation', 'script',
+            'entity_registry')
+ON_DEMAND = ('zwave',)
+FEATURE_FLAGS = ('config_entries',)


@asyncio.coroutine
 def async_setup(hass, config):
    """Set up the config component."""
+    global SECTIONS
+
    yield from hass.components.frontend.async_register_built_in_panel(
        'config', 'config', 'mdi:settings')

+    # Temporary way of allowing people to opt-in for unreleased config sections
+    for key, value in config.get(DOMAIN, {}).items():
+        if key in FEATURE_FLAGS and value:
+            SECTIONS += (key,)
+
    @asyncio.coroutine
    def setup_panel(panel_name):
        """Set up a panel."""
@@ -151,7 +160,7 @@ class EditKeyBasedConfigView(BaseEditConfigView):

    def _get_value(self, hass, data, config_key):
        """Get value."""
-        return data.get(config_key, {})
+        return data.get(config_key)

    def _write_value(self, hass, data, config_key, new_value):
        """Set value."""
--- a/Show More
+++ b/Show More