Merge pull request #6956 from home-assistant/release-0-42

0.42
Bump Amcrest module to 1.1.8 (#6990 )
2017-04-08 15:40:30 -07:00 · 2017-04-08 14:55:12 -07:00 · 2017-04-08 14:55:12 -07:00 · 2017-04-08 06:33:59 -07:00 · 2017-04-08 04:51:47 -07:00 · 2017-04-08 04:50:52 -07:00
336 changed files with 11844 additions and 5042 deletions
@@ -59,6 +59,9 @@ omit =
    homeassistant/components/lutron.py
    homeassistant/components/*/lutron.py

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

@@ -115,9 +118,6 @@ omit =
    homeassistant/components/zigbee.py
    homeassistant/components/*/zigbee.py

-    homeassistant/components/zwave/*
-    homeassistant/components/*/zwave.py
-
    homeassistant/components/enocean.py
    homeassistant/components/*/enocean.py

@@ -145,10 +145,14 @@ omit =
    homeassistant/components/maxcube.py
    homeassistant/components/*/maxcube.py

+    homeassistant/components/tado.py
+    homeassistant/components/*/tado.py
+
    homeassistant/components/alarm_control_panel/alarmdotcom.py
    homeassistant/components/alarm_control_panel/concord232.py
    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/alarm_control_panel/simplisafe.py
+    homeassistant/components/alarm_control_panel/totalconnect.py
    homeassistant/components/apiai.py
    homeassistant/components/binary_sensor/arest.py
    homeassistant/components/binary_sensor/concord232.py
@@ -171,6 +175,7 @@ omit =
    homeassistant/components/climate/oem.py
    homeassistant/components/climate/proliphix.py
    homeassistant/components/climate/radiotherm.py
+    homeassistant/components/config/zwave.py
    homeassistant/components/cover/garadget.py
    homeassistant/components/cover/homematic.py
    homeassistant/components/cover/myq.py
@@ -221,6 +226,7 @@ omit =
    homeassistant/components/light/hue.py
    homeassistant/components/light/hyperion.py
    homeassistant/components/light/lifx.py
+    homeassistant/components/light/lifx_legacy.py
    homeassistant/components/light/limitlessled.py
    homeassistant/components/light/osramlightify.py
    homeassistant/components/light/tikteck.py
@@ -231,6 +237,7 @@ omit =
    homeassistant/components/light/zengge.py
    homeassistant/components/lirc.py
    homeassistant/components/lock/nuki.py
+    homeassistant/components/lock/lockitron.py
    homeassistant/components/media_player/anthemav.py
    homeassistant/components/media_player/apple_tv.py
    homeassistant/components/media_player/aquostv.py
@@ -269,6 +276,7 @@ omit =
    homeassistant/components/media_player/sonos.py
    homeassistant/components/media_player/squeezebox.py
    homeassistant/components/media_player/vlc.py
+    homeassistant/components/media_player/volumio.py
    homeassistant/components/media_player/yamaha.py
    homeassistant/components/notify/aws_lambda.py
    homeassistant/components/notify/aws_sns.py
@@ -318,6 +326,7 @@ omit =
    homeassistant/components/sensor/coinmarketcap.py
    homeassistant/components/sensor/comed_hourly_pricing.py
    homeassistant/components/sensor/cpuspeed.py
+    homeassistant/components/sensor/crimereports.py
    homeassistant/components/sensor/cups.py
    homeassistant/components/sensor/currencylayer.py
    homeassistant/components/sensor/darksky.py
@@ -327,7 +336,7 @@ omit =
    homeassistant/components/sensor/dovado.py
    homeassistant/components/sensor/dte_energy_bridge.py
    homeassistant/components/sensor/ebox.py
-    homeassistant/components/sensor/efergy.py
+    homeassistant/components/sensor/eddystone_temperature.py
    homeassistant/components/sensor/eliqonline.py
    homeassistant/components/sensor/emoncms.py
    homeassistant/components/sensor/fastdotcom.py
@@ -352,9 +361,12 @@ omit =
    homeassistant/components/sensor/lastfm.py
    homeassistant/components/sensor/linux_battery.py
    homeassistant/components/sensor/loopenergy.py
+    homeassistant/components/sensor/lyft.py
+    homeassistant/components/sensor/metoffice.py
    homeassistant/components/sensor/miflora.py
    homeassistant/components/sensor/modem_callerid.py
    homeassistant/components/sensor/mqtt_room.py
+    homeassistant/components/sensor/mvglive.py
    homeassistant/components/sensor/netdata.py
    homeassistant/components/sensor/neurio_energy.py
    homeassistant/components/sensor/nut.py
@@ -426,9 +438,12 @@ omit =
    homeassistant/components/tts/picotts.py
    homeassistant/components/upnp.py
    homeassistant/components/weather/bom.py
+    homeassistant/components/weather/metoffice.py
    homeassistant/components/weather/openweathermap.py
    homeassistant/components/weather/zamg.py
    homeassistant/components/zeroconf.py
+    homeassistant/components/zwave/__init__.py
+    homeassistant/components/zwave/util.py


 [report]
@@ -1,15 +1,4 @@
 config/*
-!config/home-assistant.conf.default
-
-# There is not a better solution afaik..
-!config/custom_components
-config/custom_components/*
-!config/custom_components/example.py
-!config/custom_components/hello_world.py
-!config/custom_components/mqtt_example.py
-!config/panels
-config/panels/*
-!config/panels/react.html

 tests/testing_config/deps
 tests/testing_config/home-assistant.log
@@ -1,5 +1,5 @@
 include README.rst
-include LICENSE
+include LICENSE.md
 graft homeassistant
 prune homeassistant/components/frontend/www_static/home-assistant-polymer
 recursive-exclude * *.py[co]
@@ -1,9 +1,7 @@
 Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/home-assistant/home-assistant| |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs|
 ==============================================================================================================================================================================================

-Home Assistant is a home automation platform running on Python 3. The
-goal of Home Assistant is to be able to track and control all devices at
-home and offer a platform for automating control.
+Home Assistant is a home automation platform running on Python 3. It is able to track and control all devices at home and offer a platform for automating control.

 To get started:

@@ -12,83 +10,22 @@ To get started:
    python3 -m pip install homeassistant
    hass --open-ui

-Check out `the website <https://home-assistant.io>`__ for `a
-demo <https://home-assistant.io/demo/>`__, installation instructions,
-tutorials and documentation.
+Check out `home-assistant.io <https://home-assistant.io>`__ for `a
+demo <https://home-assistant.io/demo/>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
+`tutorials <https://home-assistant.io/getting-started/automation-2/>`__ and `documentation <https://home-assistant.io/docs/>`__.

 |screenshot-states|

-Examples of devices Home Assistant can interface with:
+Featured integrations
+---------------------

-  Monitoring connected devices to a wireless router:
-   `OpenWrt <https://openwrt.org/>`__,
-   `Tomato <http://www.polarcloud.com/tomato>`__,
-   `Netgear <http://netgear.com>`__,
-   `DD-WRT <http://www.dd-wrt.com/site/index>`__,
-   `TPLink <http://www.tp-link.us/>`__,
-   `ASUSWRT <http://event.asus.com/2013/nw/ASUSWRT/>`__,
-   `Xiaomi <http://miwifi.com/>`__ and any SNMP
-   capable Linksys WAP/WRT
-  `Philips Hue <http://meethue.com>`__ lights,
-   `WeMo <http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/>`__
-   switches, `Edimax <http://www.edimax.com/>`__ switches,
-   `Efergy <https://efergy.com>`__ energy monitoring, and
-   `Tellstick <http://www.telldus.se/products/tellstick>`__ devices and
-   sensors
-  `Google
-   Chromecasts <http://www.google.com/intl/en/chrome/devices/chromecast>`__,
-   `Music Player Daemon <http://www.musicpd.org/>`__, `Logitech
-   Squeezebox <https://en.wikipedia.org/wiki/Squeezebox_%28network_music_player%29>`__,
-   `Plex <https://plex.tv/>`__, `Kodi (XBMC) <http://kodi.tv/>`__,
-   iTunes (by way of
-   `itunes-api <https://github.com/maddox/itunes-api>`__), and Amazon
-   Fire TV (by way of
-   `python-firetv <https://github.com/happyleavesaoc/python-firetv>`__)
-  Support for
-   `ISY994 <https://www.universal-devices.com/residential/isy994i-series/>`__
-   (Insteon and X10 devices), `Z-Wave <http://www.z-wave.com/>`__, `Nest
-   Thermostats <https://nest.com/>`__,
-   `RFXtrx <http://www.rfxcom.com/>`__,
-   `Arduino <https://www.arduino.cc/>`__, `Raspberry
-   Pi <https://www.raspberrypi.org/>`__, and
-   `Modbus <http://www.modbus.org/>`__
-  Interaction with `IFTTT <https://ifttt.com/>`__
-  Integrate data from the `Bitcoin <https://bitcoin.org>`__ network,
-   meteorological data from
-   `OpenWeatherMap <http://openweathermap.org/>`__ and
-   `Forecast.io <https://forecast.io/>`__,
-   `Transmission <http://www.transmissionbt.com/>`__, or
-   `SABnzbd <http://sabnzbd.org>`__.
-  `See full list of supported
-   devices <https://home-assistant.io/components/>`__
+|screenshot-components|

-Build home automation on top of your devices:
-
-  Keep a precise history of every change to the state of your house
-  Turn on the lights when people get home after sunset
-  Turn on lights slowly during sunset to compensate for less light
-  Turn off all lights and devices when everybody leaves the house
-  Offers a `REST API <https://home-assistant.io/developers/rest_api/>`__
-   and can interface with MQTT for easy integration with other projects
-   like `OwnTracks <http://owntracks.org/>`__
-  Allow sending notifications using
-   `Instapush <https://instapush.im>`__, `Notify My Android
-   (NMA) <http://www.notifymyandroid.com/>`__,
-   `PushBullet <https://www.pushbullet.com/>`__,
-   `PushOver <https://pushover.net/>`__,
-   `Slack <https://slack.com/>`__,
-   `Telegram <https://telegram.org/>`__, `Join <http://joaoapps.com/join/>`__, and `Jabber
-   (XMPP) <http://xmpp.org>`__
-
-The system is built using a modular approach so support for other devices or actions can
-be implemented easily. See also the `section on
-architecture <https://home-assistant.io/developers/architecture/>`__
-and the `section on creating your own
+The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://home-assistant.io/developers/architecture/>`__ and the `section on creating your own
 components <https://home-assistant.io/developers/creating_components/>`__.

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

 .. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
   :target: https://travis-ci.org/home-assistant/home-assistant
@@ -100,3 +37,5 @@ section <https://home-assistant.io/help/>`__ of our website for further help and
   :target: https://gitter.im/home-assistant/home-assistant/devs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 .. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
   :target: https://home-assistant.io/demo/
+.. |screenshot-components| image:: https://raw.github.com/home-assistant/home-assistant/dev/docs/screenshot-components.png
+   :target: https://home-assistant.io/components/
@@ -1,158 +0,0 @@
-homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.io
-
-  # Location required to calculate the time the sun rises and sets.
-  # Coordinates are also used for location for weather related components.
-  # Google Maps can be used to determine more precise GPS coordinates.
-  latitude: 32.87336
-  longitude: 117.22743
-
-  # Impacts weather/sunrise data
-  elevation: 665
-
-  # 'metric' for Metric System, 'imperial' for imperial system
-  unit_system: metric
-
-  # Pick yours from here:
-  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-  time_zone: America/Los_Angeles
-
-  # Name of the location where Home Assistant is running
-  name: Home
-
-http:
-  api_password: mypass
-  # Set to 1 to enable development mode
-  # development: 1
-
-# Enable the frontend
-frontend:
-
-light:
-#  platform: hue
-
-wink:
-  # Get your token at https://winkbearertoken.appspot.com
-  access_token: 'YOUR_TOKEN'
-
-device_tracker:
-  # The following tracker are available:
-  # https://home-assistant.io/components/#presence-detection
-  platform: netgear
-  host: 192.168.1.1
-  username: admin
-  password: PASSWORD
-
-switch:
-  platform: wemo
-
-climate:
-  platform: nest
-  # Required: username and password that are used to login to the Nest thermostat.
-  username: myemail@mydomain.com
-  password: mypassword
-
-downloader:
-  download_dir: downloads
-
-notify:
-  platform: pushbullet
-  api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
-
-device_sun_light_trigger:
-  # Optional: specify a specific light/group of lights that has to be turned on
-  light_group: group.living_room
-  # Optional: specify which light profile to use when turning lights on
-  light_profile: relax
-  # Optional: disable lights being turned off when everybody leaves the house
-  # disable_turn_off: 1
-
-# A comma separated list of states that have to be tracked as a single group
-# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
-# You can also have groups within groups.
-# https://home-assistant.io/components/group/
-group:
-  default_view:
-    view: yes
-    entities:
-      - group.awesome_people
-      - group.climate
-  kitchen:
-    name: Kitchen
-    entities:
-      - switch.kitchen_pin_3
-  upstairs:
-    name: Kids
-    icon: mdi:account-multiple
-    view: yes
-    entities:
-      - input_boolean.notify_home
-      - camera.demo_camera
-
-browser:
-keyboard:
-
-# https://home-assistant.io/getting-started/automation/
-automation:
-  - alias: Turn on light when sun sets
-    trigger:
-      platform: sun
-      event: sunset
-      offset: "-01:00:00"
-    condition:
-      condition: state
-      entity_id: group.all_devices
-      state: 'home'
-    action:
-      service: light.turn_on
-
-# Another way to do is to collect all entries under one "sensor:"
-# sensor:
-#   - platform: mqtt
-#     name: "MQTT Sensor 1"
-#   - platform: mqtt
-#     name: "MQTT Sensor 2"
-#
-# Details: https://home-assistant.io/getting-started/devices/
-
-sensor:
-  platform: systemmonitor
-  resources:
-    - type: 'disk_use_percent'
-      arg: '/'
-    - type: 'disk_use_percent'
-      arg: '/home'
-
-sensor 2:
-  platform: cpuspeed
-
-script:
-  wakeup:
-    alias: Wake Up
-    sequence:
-      - event: LOGBOOK_ENTRY
-        event_data:
-          name: Paulus
-          message: is waking up
-          entity_id: device_tracker.paulus
-          domain: light
-      - alias: Bedroom lights on
-        service: light.turn_on
-        data:
-          entity_id: group.bedroom
-          brightness: 100
-      - delay:
-          minutes: 1
-      - alias: Living room lights on
-        service: light.turn_on
-        data:
-          entity_id: group.living_room
-
-scene:
-  - name: Romantic
-    entities:
-      light.tv_back_light: on
-      light.ceiling:
-        state: on
-        xy_color: [0.33, 0.66]
-        brightness: 200
@@ -1,149 +0,0 @@
-"""
-Example of a custom component.
-
-Example component to target an entity_id to:
- - turn it on at 7AM in the morning
- - turn it on if anyone comes home and it is off
- - turn it off if all lights are turned off
- - turn it off if all people leave the house
- - offer a service to turn it on for 10 seconds
-
-Configuration:
-
-To use the Example custom component you will need to add the following to
-your configuration.yaml file.
-
-example:
-  target: TARGET_ENTITY
-
-Variable:
-
-target
-*Required
-TARGET_ENTITY should be one of your devices that can be turned on and off,
-ie a light or a switch. Example value could be light.Ceiling or switch.AC
-(if you have these devices with those names).
-"""
-import time
-import logging
-
-from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_ON, STATE_OFF
-from homeassistant.helpers import validate_config
-from homeassistant.helpers.event_decorators import \
-    track_state_change, track_time_change
-from homeassistant.helpers.service import service
-import homeassistant.components as core
-from homeassistant.components import device_tracker
-from homeassistant.components import light
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "example"
-
-# List of component names (string) your component depends upon.
-# We depend on group because group will be loaded after all the components that
-# initialize devices have been setup.
-DEPENDENCIES = ['group', 'device_tracker', 'light']
-
-# Configuration key for the entity id we are targeting.
-CONF_TARGET = 'target'
-
-# Variable for storing configuration parameters.
-TARGET_ID = None
-
-# Name of the service that we expose.
-SERVICE_FLASH = 'flash'
-
-# Shortcut for the logger
-_LOGGER = logging.getLogger(__name__)
-
-
-def setup(hass, config):
-    """Setup example component."""
-    global TARGET_ID
-
-    # Validate that all required config options are given.
-    if not validate_config(config, {DOMAIN: [CONF_TARGET]}, _LOGGER):
-        return False
-
-    TARGET_ID = config[DOMAIN][CONF_TARGET]
-
-    # Validate that the target entity id exists.
-    if hass.states.get(TARGET_ID) is None:
-        _LOGGER.error("Target entity id %s does not exist",
-                      TARGET_ID)
-
-        # Tell the bootstrapper that we failed to initialize and clear the
-        # stored target id so our functions don't run.
-        TARGET_ID = None
-        return False
-
-    # Tell the bootstrapper that we initialized successfully.
-    return True
-
-
-@track_state_change(device_tracker.ENTITY_ID_ALL_DEVICES)
-def track_devices(hass, entity_id, old_state, new_state):
-    """Called when the group.all devices change state."""
-    # If the target id is not set, return
-    if not TARGET_ID:
-        return
-
-    # If anyone comes home and the entity is not on, turn it on.
-    if new_state.state == STATE_HOME and not core.is_on(hass, TARGET_ID):
-
-        core.turn_on(hass, TARGET_ID)
-
-    # If all people leave the house and the entity is on, turn it off.
-    elif new_state.state == STATE_NOT_HOME and core.is_on(hass, TARGET_ID):
-
-        core.turn_off(hass, TARGET_ID)
-
-
-@track_time_change(hour=7, minute=0, second=0)
-def wake_up(hass, now):
-    """Turn light on in the morning.
-
-    Turn the light on at 7 AM if there are people home and it is not already
-    on.
-    """
-    if not TARGET_ID:
-        return
-
-    if device_tracker.is_on(hass) and not core.is_on(hass, TARGET_ID):
-        _LOGGER.info('People home at 7AM, turning it on')
-        core.turn_on(hass, TARGET_ID)
-
-
-@track_state_change(light.ENTITY_ID_ALL_LIGHTS, STATE_ON, STATE_OFF)
-def all_lights_off(hass, entity_id, old_state, new_state):
-    """If all lights turn off, turn off."""
-    if not TARGET_ID:
-        return
-
-    if core.is_on(hass, TARGET_ID):
-        _LOGGER.info('All lights have been turned off, turning it off')
-        core.turn_off(hass, TARGET_ID)
-
-
-@service(DOMAIN, SERVICE_FLASH)
-def flash_service(hass, call):
-    """Service that will toggle the target.
-
-    Set the light to off for 10 seconds if on and vice versa.
-    """
-    if not TARGET_ID:
-        return
-
-    if core.is_on(hass, TARGET_ID):
-        core.turn_off(hass, TARGET_ID)
-
-        time.sleep(10)
-
-        core.turn_on(hass, TARGET_ID)
-
-    else:
-        core.turn_on(hass, TARGET_ID)
-
-        time.sleep(10)
-
-        core.turn_off(hass, TARGET_ID)
@@ -1,27 +0,0 @@
-"""
-The "hello world" custom component.
-
-This component implements the bare minimum that a component should implement.
-
-Configuration:
-
-To use the hello_word component you will need to add the following to your
-configuration.yaml file.
-
-hello_world:
-"""
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "hello_world"
-
-# List of component names (string) your component depends upon.
-DEPENDENCIES = []
-
-
-def setup(hass, config):
-    """Setup our skeleton component."""
-    # States are in the format DOMAIN.OBJECT_ID.
-    hass.states.set('hello_world.Hello_World', 'Works!')
-
-    # Return boolean to indicate that initialization was successfully.
-    return True
@@ -1,55 +0,0 @@
-"""
-Example of a custom MQTT component.
-
-Shows how to communicate with MQTT. Follows a topic on MQTT and updates the
-state of an entity to the last message received on that topic.
-
-Also offers a service 'set_state' that will publish a message on the topic that
-will be passed via MQTT to our message received listener. Call the service with
-example payload {"new_state": "some new state"}.
-
-Configuration:
-
-To use the mqtt_example component you will need to add the following to your
-configuration.yaml file.
-
-mqtt_example:
-  topic: "home-assistant/mqtt_example"
-"""
-import homeassistant.loader as loader
-
-# The domain of your component. Should be equal to the name of your component.
-DOMAIN = "mqtt_example"
-
-# List of component names (string) your component depends upon.
-DEPENDENCIES = ['mqtt']
-
-CONF_TOPIC = 'topic'
-DEFAULT_TOPIC = 'home-assistant/mqtt_example'
-
-
-def setup(hass, config):
-    """Setup the MQTT example component."""
-    mqtt = loader.get_component('mqtt')
-    topic = config[DOMAIN].get('topic', DEFAULT_TOPIC)
-    entity_id = 'mqtt_example.last_message'
-
-    # Listen to a message on MQTT.
-    def message_received(topic, payload, qos):
-        """A new MQTT message has been received."""
-        hass.states.set(entity_id, payload)
-
-    mqtt.subscribe(hass, topic, message_received)
-
-    hass.states.set(entity_id, 'No messages')
-
-    # Service to publish a message on MQTT.
-    def set_state_service(call):
-        """Service to send a message."""
-        mqtt.publish(hass, topic, call.data.get('new_state'))
-
-    # Register our service with Home Assistant.
-    hass.services.register(DOMAIN, 'set_state', set_state_service)
-
-    # Return boolean to indicate that initialization was successfully.
-    return True
@@ -1,432 +0,0 @@
-<!--
-Custom Home Assistant panel example.
-
-Currently only works in Firefox and Chrome because it uses ES6.
-
-Make sure this file is in <config>/panels/react.html
-
-Add to your configuration.yaml:
-
-panel_custom:
-  - name: react
-    sidebar_title: TodoMVC
-    sidebar_icon: mdi:checkbox-marked-outline
-    config:
-      title: Wow hello!
-->
-
-<script src="https://fb.me/react-15.2.1.min.js"></script>
-<script src="https://fb.me/react-dom-15.2.1.min.js"></script>
-
-<!-- for development, replace with:
-<script src="https://fb.me/react-15.2.1.js"></script>
-<script src="https://fb.me/react-dom-15.2.1.js"></script>
-->
-
-<!--
-  CSS taken from ReactJS TodoMVC example by Pete Hunt
-  http://todomvc.com/examples/react/
-->
-
-<style>
-  .todoapp input[type="checkbox"] {
-    outline: none;
-  }
-
-  .todoapp {
-    background: #fff;
-    margin: 130px 0 40px 0;
-    position: relative;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
-                0 25px 50px 0 rgba(0, 0, 0, 0.1);
-  }
-
-  .todoapp h1 {
-    position: absolute;
-    top: -155px;
-    width: 100%;
-    font-size: 100px;
-    font-weight: 100;
-    text-align: center;
-    color: rgba(175, 47, 47, 0.15);
-    -webkit-text-rendering: optimizeLegibility;
-    -moz-text-rendering: optimizeLegibility;
-    text-rendering: optimizeLegibility;
-  }
-
-  .todoapp .main {
-    position: relative;
-    border-top: 1px solid #e6e6e6;
-  }
-
-  .todoapp .todo-list {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-  }
-
-  .todoapp .todo-list li {
-    position: relative;
-    font-size: 24px;
-    border-bottom: 1px solid #ededed;
-  }
-
-  .todoapp .todo-list li:last-child {
-    border-bottom: none;
-  }
-
-  .todoapp .todo-list li .toggle {
-    text-align: center;
-    width: 40px;
-    /* auto, since non-WebKit browsers doesn't support input styling */
-    height: auto;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    margin: auto 0;
-    border: none; /* Mobile Safari */
-    -webkit-appearance: none;
-    appearance: none;
-    cursor: pointer;
-  }
-
-  .todoapp .todo-list li .toggle:focus {
-    border-left: 3px solid rgba(175, 47, 47, 0.35);
-  }
-
-  .todoapp .todo-list li .toggle:after {
-    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#ededed" stroke-width="3"/></svg>');
-  }
-
-  .todoapp .todo-list li .toggle:checked:after {
-    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="-10 -18 100 135"><circle cx="50" cy="50" r="50" fill="none" stroke="#bddad5" stroke-width="3"/><path fill="#5dc2af" d="M72 25L42 71 27 56l-4 4 20 20 34-52z"/></svg>');
-  }
-
-  .todoapp .todo-list li label {
-    white-space: pre-line;
-    word-break: break-all;
-    padding: 15px 60px 15px 15px;
-    margin-left: 45px;
-    display: block;
-    line-height: 1.2;
-    transition: color 0.4s;
-  }
-
-  .todoapp .todo-list li.completed label {
-    color: #d9d9d9;
-    text-decoration: line-through;
-  }
-
-  .todoapp .footer {
-    color: #777;
-    padding: 10px 15px;
-    height: 20px;
-    text-align: center;
-    border-top: 1px solid #e6e6e6;
-  }
-
-  .todoapp .footer:before {
-    content: '';
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    height: 50px;
-    overflow: hidden;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
-                0 8px 0 -3px #f6f6f6,
-                0 9px 1px -3px rgba(0, 0, 0, 0.2),
-                0 16px 0 -6px #f6f6f6,
-                0 17px 2px -6px rgba(0, 0, 0, 0.2);
-  }
-
-  .todoapp .todo-count {
-    float: left;
-    text-align: left;
-    font-weight: 300;
-  }
-
-  .todoapp .toggle-menu {
-    position: absolute;
-    right: 15px;
-    font-weight: 300;
-    color: rgba(175, 47, 47, 0.75);
-  }
-
-  .todoapp .filters {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    position: absolute;
-    right: 0;
-    left: 0;
-  }
-
-  .todoapp .filters li {
-    display: inline;
-  }
-
-  .todoapp .filters li a {
-    color: inherit;
-    margin: 3px;
-    padding: 3px 7px;
-    text-decoration: none;
-    border: 1px solid transparent;
-    border-radius: 3px;
-  }
-
-  .todoapp .filters li a.selected,
-  .filters li a:hover {
-    border-color: rgba(175, 47, 47, 0.1);
-  }
-
-  .todoapp .filters li a.selected {
-    border-color: rgba(175, 47, 47, 0.2);
-  }
-
-  /*
-    Hack to remove background from Mobile Safari.
-    Can't use it globally since it destroys checkboxes in Firefox
-  */
-  @media screen and (-webkit-min-device-pixel-ratio:0) {
-    .todoapp .toggle-all,
-    .todoapp .todo-list li .toggle {
-      background: none;
-    }
-
-    .todoapp .todo-list li .toggle {
-      height: 40px;
-    }
-
-    .todoapp .toggle-all {
-      -webkit-transform: rotate(90deg);
-      transform: rotate(90deg);
-      -webkit-appearance: none;
-      appearance: none;
-    }
-  }
-
-  @media (max-width: 430px) {
-    .todoapp .footer {
-      height: 50px;
-    }
-
-    .todoapp .filters {
-      bottom: 10px;
-    }
-  }
-</style>
-
-<dom-module id='ha-panel-react'>
-  <template>
-    <style>
-      :host {
-        background: #f5f5f5;
-        display: block;
-        height: 100%;
-        overflow: auto;
-      }
-      .mount {
-        font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        line-height: 1.4em;
-        color: #4d4d4d;
-        min-width: 230px;
-        max-width: 550px;
-        margin: 0 auto;
-        -webkit-font-smoothing: antialiased;
-        -moz-font-smoothing: antialiased;
-        font-smoothing: antialiased;
-        font-weight: 300;
-      }
-    </style>
-    <div id='mount' class='mount'></div>
-  </template>
-</dom-module>
-
-<script>
-// Example uses ES6. Will only work in modern browsers
-class TodoMVC extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      filter: 'all',
-      // load initial value of entities
-      entities: this.props.hass.reactor.evaluate(
-        this.props.hass.entityGetters.visibleEntityMap),
-    };
-  }
-
-  componentDidMount() {
-    // register to entity updates
-    this._unwatchHass = this.props.hass.reactor.observe(
-      this.props.hass.entityGetters.visibleEntityMap,
-      entities => this.setState({entities}))
-  }
-
-  componentWillUnmount() {
-    // unregister to entity updates
-    this._unwatchHass();
-  }
-
-  handlePickFilter(filter, ev) {
-    ev.preventDefault();
-    this.setState({filter});
-  }
-
-  handleEntityToggle(entity, ev) {
-    this.props.hass.serviceActions.callService(
-      entity.domain, 'toggle', { entity_id: entity.entityId });
-  }
-
-  handleToggleMenu(ev) {
-    ev.preventDefault();
-    Polymer.Base.fire('open-menu', null, {node: ev.target});
-  }
-
-  entityRow(entity) {
-    const completed = entity.state === 'on';
-
-    return React.createElement(
-      'li', {
-        className: completed && 'completed',
-        key: entity.entityId,
-      },
-      React.createElement(
-        "div", { className: "view" },
-        React.createElement(
-          "input", {
-            checked: completed,
-            className: "toggle",
-            type: "checkbox",
-            onChange: ev => this.handleEntityToggle(entity, ev),
-          }),
-        React.createElement("label", null, entity.entityDisplay)));
-  }
-
-  filterRow(filter) {
-    return React.createElement(
-      "li", { key: filter },
-      React.createElement(
-        "a", {
-          href: "#",
-          className: this.state.filter === filter && "selected",
-          onClick: ev => this.handlePickFilter(filter, ev),
-        },
-        filter.substring(0, 1).toUpperCase() + filter.substring(1)
-      )
-    );
-  }
-
-  render() {
-    const { entities, filter } = this.state;
-
-    if (!entities) return null;
-
-    const filters = ['all', 'light', 'switch'];
-
-    const showEntities = filter === 'all' ?
-      entities.filter(ent => filters.includes(ent.domain)) :
-      entities.filter(ent => ent.domain == filter);
-
-    return React.createElement(
-      'div', { className: 'todoapp-wrapper' },
-      React.createElement(
-        "section", { className: "todoapp" },
-        React.createElement(
-          "div", null,
-          React.createElement(
-            "header", { className: "header" },
-            React.createElement("h1", null, this.props.title || "todos")
-          ),
-          React.createElement(
-            "section", { className: "main" },
-            React.createElement(
-              "ul", { className: "todo-list" },
-              showEntities.valueSeq().map(ent => this.entityRow(ent)))
-            )
-          ),
-          React.createElement(
-            "footer", { className: "footer" },
-            React.createElement(
-              "span", { className: "todo-count" },
-              showEntities.filter(ent => ent.state === 'off').size + " items left"
-            ),
-            React.createElement(
-              "ul", { className: "filters" },
-              filters.map(filter => this.filterRow(filter))
-            ),
-            !this.props.showMenu && React.createElement(
-              "a", {
-                className: "toggle-menu",
-                href: '#',
-                onClick: ev => this.handleToggleMenu(ev),
-              },
-              "Show menu"
-            )
-          )
-        ));
-  }
-}
-
-Polymer({
-  is: 'ha-panel-react',
-
-  properties: {
-    // Home Assistant object
-    hass: {
-      type: Object,
-    },
-
-    // If should render in narrow mode
-    narrow: {
-      type: Boolean,
-      value: false,
-    },
-
-    // If sidebar is currently shown
-    showMenu: {
-      type: Boolean,
-      value: false,
-    },
-
-    // Home Assistant panel info
-    // panel.config contains config passed to register_panel serverside
-    panel: {
-      type: Object,
-    }
-  },
-
-  // This will make sure we forward changed properties to React
-  observers: [
-    'propsChanged(hass, narrow, showMenu, panel)',
-  ],
-
-  // Mount React when element attached
-  attached: function () {
-    this.mount(this.hass, this.narrow, this.showMenu, this.panel);
-  },
-
-  // Called when properties change
-  propsChanged: function (hass, narrow, showMenu, panel) {
-    this.mount(hass, narrow, showMenu, panel);
-  },
-
-  // Render React. Debounce in case multiple properties change.
-  mount: function (hass, narrow, showMenu, panel) {
-    this.debounce('mount', function () {
-      ReactDOM.render(React.createElement(TodoMVC, {
-        hass: hass,
-        narrow: narrow,
-        showMenu: showMenu,
-        title: panel.config ? panel.config.title : null
-      }), this.$.mount);
-    }.bind(this));
-  },
-
-  // Unmount React node when panel no longer in use.
-  detached: function () {
-    ReactDOM.unmountComponentAtNode(this.$.mount);
-  },
-});
-</script>
@@ -20,6 +20,17 @@ from homeassistant.const import (
 from homeassistant.util.async import run_callback_threadsafe


+def attempt_use_uvloop():
+    """Attempt to use uvloop."""
+    import asyncio
+
+    try:
+        import uvloop
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+    except ImportError:
+        pass
+
+
 def monkey_patch_asyncio():
    """Replace weakref.WeakSet to address Python 3 bug.

@@ -255,10 +266,13 @@ def closefds_osx(min_fd: int, max_fd: int) -> None:

 def cmdline() -> List[str]:
    """Collect path and arguments to re-execute the current hass instance."""
-    if sys.argv[0].endswith('/__main__.py'):
+    if sys.argv[0].endswith(os.path.sep + '__main__.py'):
        modulepath = os.path.dirname(sys.argv[0])
        os.environ['PYTHONPATH'] = os.path.dirname(modulepath)
-    return [sys.executable] + [arg for arg in sys.argv if arg != '--daemon']
+        return [sys.executable] + [arg for arg in sys.argv if
+                                   arg != '--daemon']
+    else:
+        return [arg for arg in sys.argv if arg != '--daemon']


 def setup_and_run_hass(config_dir: str,
@@ -308,8 +322,7 @@ def setup_and_run_hass(config_dir: str,
            EVENT_HOMEASSISTANT_START, open_browser
        )

-    hass.start()
-    return hass.exit_code
+    return hass.start()


 def try_to_restart() -> None:
@@ -356,11 +369,13 @@ def try_to_restart() -> None:

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

-    validate_python()
-
    args = get_arguments()

    if args.script is not None:
@@ -21,7 +21,6 @@ import homeassistant.loader as loader
 from homeassistant.util.logging import AsyncHandler
 from homeassistant.util.yaml import clear_secret_cache
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import event_decorators, service
 from homeassistant.helpers.signal import async_register_signal_handling

 _LOGGER = logging.getLogger(__name__)
@@ -75,8 +74,6 @@ def async_from_config_dict(config: Dict[str, Any],
    This method is a coroutine.
    """
    start = time()
-    hass.async_track_tasks()
-
    core_config = config.get(core.DOMAIN, {})

    try:
@@ -127,10 +124,6 @@ def async_from_config_dict(config: Dict[str, Any],

    _LOGGER.info('Home Assistant core initialized')

-    # Give event decorators access to HASS
-    event_decorators.HASS = hass
-    service.HASS = hass
-
    # stage 1
    for component in components:
        if component not in FIRST_INIT_COMPONENT:
@@ -145,10 +138,10 @@ def async_from_config_dict(config: Dict[str, Any],
            continue
        hass.async_add_job(async_setup_component(hass, component, config))

-    yield from hass.async_stop_track_tasks()
+    yield from hass.async_block_till_done()

    stop = time()
-    _LOGGER.info('Home Assistant initialized in %ss', round(stop-start, 2))
+    _LOGGER.info('Home Assistant initialized in %.2fs', stop-start)

    async_register_signal_handling(hass)
    return hass
@@ -113,7 +113,7 @@ def async_setup(hass, config):
            if not alarm.should_poll:
                continue

-            update_coro = hass.loop.create_task(
+            update_coro = hass.async_add_job(
                alarm.async_update_ha_state(True))
            if hasattr(alarm, 'async_update'):
                update_tasks.append(update_coro)
@@ -1,13 +1,13 @@
 """
+
 Interfaces with Alarm.com alarm control panels.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
 """
 import logging
-
+import asyncio
 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 (
@@ -15,10 +15,9 @@ from homeassistant.const import (
    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN, CONF_CODE,
    CONF_NAME)
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession

-REQUIREMENTS = ['https://github.com/Xorso/pyalarmdotcom'
-                '/archive/0.1.1.zip'
-                '#pyalarmdotcom==0.1.1']
+REQUIREMENTS = ['pyalarmdotcom==0.2.9']

 _LOGGER = logging.getLogger(__name__)

@@ -32,14 +31,17 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


-def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup an Alarm.com control panel."""
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Setup a Alarm.com control panel."""
    name = config.get(CONF_NAME)
    code = config.get(CONF_CODE)
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

-    add_devices([AlarmDotCom(hass, name, code, username, password)], True)
+    alarmdotcom = AlarmDotCom(hass, name, code, username, password)
+    yield from alarmdotcom.async_login()
+    async_add_devices([alarmdotcom])


 class AlarmDotCom(alarm.AlarmControlPanel):
@@ -47,18 +49,30 @@ class AlarmDotCom(alarm.AlarmControlPanel):

    def __init__(self, hass, name, code, username, password):
        """Initialize the Alarm.com status."""
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        self._alarm = Alarmdotcom(username, password, timeout=10)
+        from pyalarmdotcom import Alarmdotcom
+        _LOGGER.debug('Setting up Alarm.com...')
        self._hass = hass
        self._name = name
        self._code = str(code) if code else None
        self._username = username
        self._password = password
+        self._websession = async_get_clientsession(self._hass)
        self._state = STATE_UNKNOWN
+        self._alarm = Alarmdotcom(username,
+                                  password,
+                                  self._websession,
+                                  hass.loop)

-    def update(self):
+    @asyncio.coroutine
+    def async_login(self):
+        """Login to Alarm.com."""
+        yield from self._alarm.async_login()
+
+    @asyncio.coroutine
+    def async_update(self):
        """Fetch the latest state."""
-        self._state = self._alarm.state
+        yield from self._alarm.async_update()
+        return self._alarm.state

    @property
    def name(self):
@@ -73,45 +87,36 @@ class AlarmDotCom(alarm.AlarmControlPanel):
    @property
    def state(self):
        """Return the state of the device."""
-        if self._state == 'Disarmed':
+        if self._alarm.state.lower() == 'disarmed':
            return STATE_ALARM_DISARMED
-        elif self._state == 'Armed Stay':
+        elif self._alarm.state.lower() == 'armed stay':
            return STATE_ALARM_ARMED_HOME
-        elif self._state == 'Armed Away':
+        elif self._alarm.state.lower() == 'armed away':
            return STATE_ALARM_ARMED_AWAY
        else:
            return STATE_UNKNOWN

-    def alarm_disarm(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_disarm(self, code=None):
        """Send disarm command."""
-        if not self._validate_code(code, 'disarming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.disarm()
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_disarm()

-    def alarm_arm_home(self, code=None):
-        """Send arm home command."""
-        if not self._validate_code(code, 'arming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.arm_stay()
+    @asyncio.coroutine
+    def async_alarm_arm_home(self, code=None):
+        """Send arm hom command."""
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_arm_home()

-    def alarm_arm_away(self, code=None):
+    @asyncio.coroutine
+    def async_alarm_arm_away(self, code=None):
        """Send arm away command."""
-        if not self._validate_code(code, 'arming home'):
-            return
-        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
-        # Open another session to alarm.com to fire off the command
-        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
-        _alarm.arm_away()
+        if self._validate_code(code):
+            yield from self._alarm.async_alarm_arm_away()

-    def _validate_code(self, code, state):
+    def _validate_code(self, code):
        """Validate given code."""
        check = self._code is None or code == self._code
        if not check:
-            _LOGGER.warning('Wrong code entered for %s', state)
+            _LOGGER.warning('Wrong code entered.')
        return check
@@ -0,0 +1,87 @@
+"""Interfaces with TotalConnect alarm control panels."""
+import logging
+
+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_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN,
+    CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['total_connect_client==0.7']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Total Connect'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup a TotalConnect control panel."""
+    name = config.get(CONF_NAME)
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+
+    total_connect = TotalConnect(name, username, password)
+    add_devices([total_connect], True)
+
+
+class TotalConnect(alarm.AlarmControlPanel):
+    """Represent an TotalConnect status."""
+
+    def __init__(self, name, username, password):
+        """Initialize the TotalConnect status."""
+        from total_connect_client import TotalConnectClient
+
+        _LOGGER.debug('Setting up TotalConnect...')
+        self._name = name
+        self._username = username
+        self._password = password
+        self._state = STATE_UNKNOWN
+        self._client = TotalConnectClient.TotalConnectClient(username,
+                                                             password)
+
+    @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
+
+    def update(self):
+        """Return the state of the device."""
+        status = self._client.get_armed_status()
+
+        if status == self._client.DISARMED:
+            state = STATE_ALARM_DISARMED
+        elif status == self._client.ARMED_STAY:
+            state = STATE_ALARM_ARMED_HOME
+        elif status == self._client.ARMED_AWAY:
+            state = STATE_ALARM_ARMED_AWAY
+        else:
+            state = STATE_UNKNOWN
+
+        self._state = state
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._client.disarm()
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self._client.arm_stay()
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self._client.arm_away()
@@ -26,17 +26,24 @@ from homeassistant.util.dt import utcnow
 from homeassistant.components.camera.mjpeg import (
    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL)

-DOMAIN = 'android_ip_webcam'
-REQUIREMENTS = ["pydroid-ipcam==0.4"]
+REQUIREMENTS = ['pydroid-ipcam==0.8']

 _LOGGER = logging.getLogger(__name__)
-SCAN_INTERVAL = timedelta(seconds=10)
-
-DATA_IP_WEBCAM = 'android_ip_webcam'

+ATTR_AUD_CONNS = 'Audio Connections'
 ATTR_HOST = 'host'
 ATTR_VID_CONNS = 'Video Connections'
-ATTR_AUD_CONNS = 'Audio Connections'
+
+CONF_MOTION_SENSOR = 'motion_sensor'
+
+DATA_IP_WEBCAM = 'android_ip_webcam'
+DEFAULT_NAME = 'IP Webcam'
+DEFAULT_PORT = 8080
+DEFAULT_TIMEOUT = 10
+DOMAIN = 'android_ip_webcam'
+
+SCAN_INTERVAL = timedelta(seconds=10)
+SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'

 KEY_MAP = {
    'audio_connections': 'Audio Connections',
@@ -123,18 +130,6 @@ SENSORS = ['audio_connections', 'battery_level', 'battery_temp',
           'battery_voltage', 'light', 'motion', 'pressure', 'proximity',
           'sound', 'video_connections']

-SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
-
-CONF_AUTO_DISCOVERY = 'auto_discovery'
-CONF_MOTION_SENSOR = 'motion_sensor'
-
-DEFAULT_AUTO_DISCOVERY = True
-DEFAULT_MOTION_SENSOR = False
-DEFAULT_NAME = 'IP Webcam'
-DEFAULT_PORT = 8080
-DEFAULT_TIMEOUT = 10
-
-
 CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -145,21 +140,18 @@ CONFIG_SCHEMA = vol.Schema({
            cv.time_period,
        vol.Inclusive(CONF_USERNAME, 'authentication'): cv.string,
        vol.Inclusive(CONF_PASSWORD, 'authentication'): cv.string,
-        vol.Optional(CONF_AUTO_DISCOVERY, default=DEFAULT_AUTO_DISCOVERY):
-            cv.boolean,
-        vol.Optional(CONF_SWITCHES, default=[]):
+        vol.Optional(CONF_SWITCHES, default=None):
            vol.All(cv.ensure_list, [vol.In(SWITCHES)]),
-        vol.Optional(CONF_SENSORS, default=[]):
+        vol.Optional(CONF_SENSORS, default=None):
            vol.All(cv.ensure_list, [vol.In(SENSORS)]),
-        vol.Optional(CONF_MOTION_SENSOR, default=DEFAULT_MOTION_SENSOR):
-            cv.boolean,
+        vol.Optional(CONF_MOTION_SENSOR, default=None): cv.boolean,
    })])
 }, extra=vol.ALLOW_EXTRA)


@asyncio.coroutine
 def async_setup(hass, config):
-    """Setup the IP Webcam component."""
+    """Set up the IP Webcam component."""
    from pydroid_ipcam import PyDroidIPCam

    webcams = hass.data[DATA_IP_WEBCAM] = {}
@@ -167,7 +159,7 @@ def async_setup(hass, config):

    @asyncio.coroutine
    def async_setup_ipcamera(cam_config):
-        """Setup a ip camera."""
+        """Set up an IP camera."""
        host = cam_config[CONF_HOST]
        username = cam_config.get(CONF_USERNAME)
        password = cam_config.get(CONF_PASSWORD)
@@ -177,16 +169,28 @@ def async_setup(hass, config):
        sensors = cam_config[CONF_SENSORS]
        motion = cam_config[CONF_MOTION_SENSOR]

-        # init ip webcam
+        # Init ip webcam
        cam = PyDroidIPCam(
            hass.loop, websession, host, cam_config[CONF_PORT],
            username=username, password=password,
            timeout=cam_config[CONF_TIMEOUT]
        )

+        if switches is None:
+            switches = [setting for setting in cam.enabled_settings
+                        if setting in SWITCHES]
+
+        if sensors is None:
+            sensors = [sensor for sensor in cam.enabled_sensors
+                       if sensor in SENSORS]
+            sensors.extend(['audio_connections', 'video_connections'])
+
+        if motion is None:
+            motion = 'motion_active' in cam.enabled_sensors
+
        @asyncio.coroutine
        def async_update_data(now):
-            """Update data from ipcam in SCAN_INTERVAL."""
+            """Update data from IP camera in SCAN_INTERVAL."""
            yield from cam.update()
            async_dispatcher_send(hass, SIGNAL_UPDATE_DATA, host)

@@ -195,21 +199,7 @@ def async_setup(hass, config):

        yield from async_update_data(None)

-        # use autodiscovery to detect sensors/configs
-        if cam_config[CONF_AUTO_DISCOVERY]:
-            if not cam.available:
-                _LOGGER.error(
-                    "Android webcam %s not found for discovery!", cam.base_url)
-                return
-
-            sensors = [sensor for sensor in cam.enabled_sensors
-                       if sensor in SENSORS]
-            switches = [setting for setting in cam.enabled_settings
-                        if setting in SWITCHES]
-            motion = True if 'motion_active' in cam.enabled_sensors else False
-            sensors.extend(['audio_connections', 'video_connections'])
-
-        # load platforms
+        # Load platforms
        webcams[host] = cam

        mjpeg_camera = {
@@ -50,9 +50,11 @@ def setup(hass, config):
    hass.http.register_view(APIDomainServicesView)
    hass.http.register_view(APIEventForwardingView)
    hass.http.register_view(APIComponentsView)
-    hass.http.register_view(APIErrorLogView)
    hass.http.register_view(APITemplateView)

+    hass.http.register_static_path(
+        URL_API_ERROR_LOG, hass.config.path(ERROR_LOG_FILENAME), False)
+
    return True


@@ -327,6 +329,8 @@ class APIEventForwardingView(HomeAssistantView):
    @asyncio.coroutine
    def post(self, request):
        """Setup an event forwarder."""
+        _LOGGER.warning('Event forwarding is deprecated. '
+                        'Will be removed by 0.43')
        hass = request.app['hass']
        try:
            data = yield from request.json()
@@ -400,20 +404,6 @@ class APIComponentsView(HomeAssistantView):
        return self.json(request.app['hass'].config.components)


-class APIErrorLogView(HomeAssistantView):
-    """View to handle ErrorLog requests."""
-
-    url = URL_API_ERROR_LOG
-    name = "api:error-log"
-
-    @asyncio.coroutine
-    def get(self, request):
-        """Serve error log."""
-        resp = yield from self.file(
-            request, request.app['hass'].config.path(ERROR_LOG_FILENAME))
-        return resp
-
-
 class APITemplateView(HomeAssistantView):
    """View to handle requests."""

@@ -12,10 +12,11 @@ import os
 import voluptuous as vol

 from homeassistant.setup import async_prepare_setup_platform
+from homeassistant.core import CoreState
 from homeassistant import config as conf_util
 from homeassistant.const import (
    ATTR_ENTITY_ID, CONF_PLATFORM, STATE_ON, SERVICE_TURN_ON, SERVICE_TURN_OFF,
-    SERVICE_TOGGLE, SERVICE_RELOAD)
+    SERVICE_TOGGLE, SERVICE_RELOAD, EVENT_HOMEASSISTANT_START)
 from homeassistant.components import logbook
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import extract_domain_configs, script, condition
@@ -81,8 +82,7 @@ _CONDITION_SCHEMA = vol.All(cv.ensure_list, [cv.CONDITION_SCHEMA])

 PLATFORM_SCHEMA = vol.Schema({
    CONF_ALIAS: cv.string,
-    vol.Optional(CONF_INITIAL_STATE,
-                 default=DEFAULT_INITIAL_STATE): cv.boolean,
+    vol.Optional(CONF_INITIAL_STATE): cv.boolean,
    vol.Optional(CONF_HIDE_ENTITY, default=DEFAULT_HIDE_ENTITY): cv.boolean,
    vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA,
    vol.Optional(CONF_CONDITION): _CONDITION_SCHEMA,
@@ -101,15 +101,13 @@ TRIGGER_SERVICE_SCHEMA = vol.Schema({
 RELOAD_SERVICE_SCHEMA = vol.Schema({})


-def is_on(hass, entity_id=None):
+def is_on(hass, entity_id):
    """
    Return true if specified automation entity_id is on.

-    Check all automation if no entity_id specified.
+    Async friendly.
    """
-    entity_ids = [entity_id] if entity_id else hass.states.entity_ids(DOMAIN)
-    return any(hass.states.is_state(entity_id, STATE_ON)
-               for entity_id in entity_ids)
+    return hass.states.is_state(entity_id, STATE_ON)


 def turn_on(hass, entity_id=None):
@@ -231,7 +229,6 @@ class AutomationEntity(ToggleEntity):
        self._async_detach_triggers = None
        self._cond_func = cond_func
        self._async_action = async_action
-        self._enabled = False
        self._last_triggered = None
        self._hidden = hidden
        self._initial_state = initial_state
@@ -261,38 +258,54 @@ class AutomationEntity(ToggleEntity):
    @property
    def is_on(self) -> bool:
        """Return True if entity is on."""
-        return self._enabled
+        return self._async_detach_triggers is not None

    @asyncio.coroutine
    def async_added_to_hass(self) -> None:
        """Startup with initial state or previous state."""
-        state = yield from async_get_last_state(self.hass, self.entity_id)
-        if state is None:
-            if self._initial_state:
-                yield from self.async_enable()
+        enable_automation = DEFAULT_INITIAL_STATE
+
+        if self._initial_state is not None:
+            enable_automation = self._initial_state
        else:
-            self._last_triggered = state.attributes.get('last_triggered')
-            if state.state == STATE_ON:
+            state = yield from async_get_last_state(self.hass, self.entity_id)
+            if state:
+                enable_automation = state.state == STATE_ON
+                self._last_triggered = state.attributes.get('last_triggered')
+
+        if not enable_automation:
+            return
+
+        # HomeAssistant is starting up
+        elif self.hass.state == CoreState.not_running:
+            @asyncio.coroutine
+            def async_enable_automation(event):
+                """Start automation on startup."""
                yield from self.async_enable()

+            self.hass.bus.async_listen_once(
+                EVENT_HOMEASSISTANT_START, async_enable_automation)
+
+        # HomeAssistant is running
+        else:
+            yield from self.async_enable()
+
    @asyncio.coroutine
    def async_turn_on(self, **kwargs) -> None:
        """Turn the entity on and update the state."""
-        if self._enabled:
+        if self.is_on:
            return

        yield from self.async_enable()
-        yield from self.async_update_ha_state()

    @asyncio.coroutine
    def async_turn_off(self, **kwargs) -> None:
        """Turn the entity off."""
-        if not self._enabled:
+        if not self.is_on:
            return

        self._async_detach_triggers()
        self._async_detach_triggers = None
-        self._enabled = False
        yield from self.async_update_ha_state()

    @asyncio.coroutine
@@ -318,12 +331,12 @@ class AutomationEntity(ToggleEntity):

        This method is a coroutine.
        """
-        if self._enabled:
+        if self.is_on:
            return

        self._async_detach_triggers = yield from self._async_attach_triggers(
            self.async_trigger)
-        self._enabled = True
+        yield from self.async_update_ha_state()


@asyncio.coroutine
@@ -342,7 +355,7 @@ def _async_process_config(hass, config, component):
                                                                  list_no)

            hidden = config_block[CONF_HIDE_ENTITY]
-            initial_state = config_block[CONF_INITIAL_STATE]
+            initial_state = config_block.get(CONF_INITIAL_STATE)

            action = _async_get_action(hass, config_block.get(CONF_ACTION, {}),
                                       name)
@@ -2,15 +2,15 @@
 Offer event listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#event-trigger
+at https://home-assistant.io/docs/automation/trigger/#event-trigger
 """
 import asyncio
 import logging

 import voluptuous as vol

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

 CONF_EVENT_TYPE = "event_type"
@@ -31,6 +31,19 @@ def async_trigger(hass, config, action):
    event_type = config.get(CONF_EVENT_TYPE)
    event_data = config.get(CONF_EVENT_DATA)

+    if (event_type == EVENT_HOMEASSISTANT_START and
+            hass.state == CoreState.starting):
+        _LOGGER.warning('Deprecation: Automations should not listen to event '
+                        "'homeassistant_start'. Use platform 'homeassistant' "
+                        'instead. Feature will be removed in 0.45')
+        hass.async_run_job(action, {
+            'trigger': {
+                'platform': 'event',
+                'event': None,
+            },
+        })
+        return lambda: None
+
    @callback
    def handle_event(event):
        """Listen for events and calls the action when data matches."""
@@ -0,0 +1,55 @@
+"""
+Offer Home Assistant core automation rules.
+
+For more details about this automation rule, please refer to the documentation
+at https://home-assistant.io/components/automation/#homeassistant-trigger
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback, CoreState
+from homeassistant.const import (
+    CONF_PLATFORM, CONF_EVENT, EVENT_HOMEASSISTANT_STOP)
+
+EVENT_START = 'start'
+EVENT_SHUTDOWN = 'shutdown'
+_LOGGER = logging.getLogger(__name__)
+
+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'homeassistant',
+    vol.Required(CONF_EVENT): vol.Any(EVENT_START, EVENT_SHUTDOWN),
+})
+
+
+@asyncio.coroutine
+def async_trigger(hass, config, action):
+    """Listen for events based on configuration."""
+    event = config.get(CONF_EVENT)
+
+    if event == EVENT_SHUTDOWN:
+        @callback
+        def hass_shutdown(event):
+            """Called when Home Assistant is shutting down."""
+            hass.async_run_job(action, {
+                'trigger': {
+                    'platform': 'homeassistant',
+                    'event': event,
+                },
+            })
+
+        return hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP,
+                                          hass_shutdown)
+
+    # Automation are enabled while hass is starting up, fire right away
+    # Check state because a config reload shouldn't trigger it.
+    elif hass.state == CoreState.starting:
+        hass.async_run_job(action, {
+            'trigger': {
+                'platform': 'homeassistant',
+                'event': event,
+            },
+        })
+
+    return lambda: None
@@ -70,7 +70,7 @@ def async_trigger(hass, config, action):
        nonlocal held_less_than, held_more_than
        pressed_time = dt_util.utcnow()
        if held_more_than is None and held_less_than is None:
-            call_action()
+            hass.add_job(call_action)
        if held_more_than is not None and held_less_than is None:
            cancel_pressed_more_than = track_point_in_utc_time(
                hass,
@@ -88,7 +88,7 @@ def async_trigger(hass, config, action):
        held_time = dt_util.utcnow() - pressed_time
        if held_less_than is not None and held_time < held_less_than:
            if held_more_than is None or held_time > held_more_than:
-                call_action()
+                hass.add_job(call_action)

    hass.data['litejet_system'].on_switch_pressed(number, pressed)
    hass.data['litejet_system'].on_switch_released(number, released)
@@ -2,7 +2,7 @@
 Offer MQTT listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#mqtt-trigger
+at https://home-assistant.io/docs/automation/trigger/#mqtt-trigger
 """
 import asyncio
 import json
@@ -2,7 +2,7 @@
 Offer numeric state listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#numeric-state-trigger
+at https://home-assistant.io/docs/automation/trigger/#numeric-state-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer state listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#state-trigger
+at https://home-assistant.io/docs/automation/trigger/#state-trigger
 """
 import asyncio
 import voluptuous as vol
@@ -2,7 +2,7 @@
 Offer sun based automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#sun-trigger
+at https://home-assistant.io/docs/automation/trigger/#sun-trigger
 """
 import asyncio
 from datetime import timedelta
@@ -2,7 +2,7 @@
 Offer template automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#template-trigger
+at https://home-assistant.io/docs/automation/trigger/#template-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer time listening automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#time-trigger
+at https://home-assistant.io/docs/automation/trigger/#time-trigger
 """
 import asyncio
 import logging
@@ -2,7 +2,7 @@
 Offer zone automation rules.

 For more details about this automation rule, please refer to the documentation
-at https://home-assistant.io/components/automation/#zone-trigger
+at https://home-assistant.io/docs/automation/trigger/#zone-trigger
 """
 import asyncio
 import voluptuous as vol
@@ -11,7 +11,7 @@ DEPENDENCIES = ['blink']


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup the blink binary sensors."""
+    """Set up the blink binary sensors."""
    if discovery_info is None:
        return

@@ -36,6 +36,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
    dev = []
    for droplet in droplets:
        droplet_id = digital_ocean.DIGITAL_OCEAN.get_droplet_id(droplet)
+        if droplet_id is None:
+            _LOGGER.error("Droplet %s is not available", droplet)
+            return False
        dev.append(DigitalOceanBinarySensor(
            digital_ocean.DIGITAL_OCEAN, droplet_id))

@@ -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.0']
+REQUIREMENTS = ['pyhik==0.1.2']
 _LOGGER = logging.getLogger(__name__)

 CONF_IGNORED = 'ignored'
@@ -33,7 +33,6 @@ ATTR_DELAY = 'delay'
 DEVICE_CLASS_MAP = {
    'Motion': 'motion',
    'Line Crossing': 'motion',
-    'IO Trigger': None,
    'Field Detection': 'motion',
    'Video Loss': None,
    'Tamper Detection': 'motion',
@@ -47,6 +46,7 @@ DEVICE_CLASS_MAP = {
    'Bad Video': None,
    'PIR Alarm': 'motion',
    'Face Detection': 'motion',
+    'Scene Change Detection': 'motion',
 }

 CUSTOMIZE_SCHEMA = vol.Schema({
@@ -91,24 +91,30 @@ def setup_platform(hass, config, add_entities, discovery_info=None):

    entities = []

-    for sensor in data.sensors:
-        # Build sensor name, then parse customize config.
-        sensor_name = sensor.replace(' ', '_')
+    for sensor, channel_list in data.sensors.items():
+        for channel in channel_list:
+            # Build sensor name, then parse customize config.
+            if data.type == 'NVR':
+                sensor_name = '{}_{}'.format(
+                    sensor.replace(' ', '_'), channel[1])
+            else:
+                sensor_name = sensor.replace(' ', '_')

-        custom = customize.get(sensor_name.lower(), {})
-        ignore = custom.get(CONF_IGNORED)
-        delay = custom.get(CONF_DELAY)
+            custom = customize.get(sensor_name.lower(), {})
+            ignore = custom.get(CONF_IGNORED)
+            delay = custom.get(CONF_DELAY)

-        _LOGGER.debug('Entity: %s - %s, Options - Ignore: %s, Delay: %s',
-                      data.name, sensor_name, ignore, delay)
-        if not ignore:
-            entities.append(HikvisionBinarySensor(hass, sensor, data, delay))
+            _LOGGER.debug('Entity: %s - %s, Options - Ignore: %s, Delay: %s',
+                          data.name, sensor_name, ignore, delay)
+            if not ignore:
+                entities.append(HikvisionBinarySensor(
+                    hass, sensor, channel[1], data, delay))

    add_entities(entities)


 class HikvisionData(object):
-    """Hikvision camera event stream object."""
+    """Hikvision device event stream object."""

    def __init__(self, hass, url, port, name, username, password):
        """Initialize the data oject."""
@@ -144,25 +150,40 @@ class HikvisionData(object):

    @property
    def cam_id(self):
-        """Return camera id."""
+        """Return device id."""
        return self.camdata.get_id

    @property
    def name(self):
-        """Return camera name."""
+        """Return device name."""
        return self._name

+    @property
+    def type(self):
+        """Return device type."""
+        return self.camdata.get_type
+
+    def get_attributes(self, sensor, channel):
+        """Return attribute list for sensor/channel."""
+        return self.camdata.fetch_attributes(sensor, channel)
+

 class HikvisionBinarySensor(BinarySensorDevice):
    """Representation of a Hikvision binary sensor."""

-    def __init__(self, hass, sensor, cam, delay):
+    def __init__(self, hass, sensor, channel, cam, delay):
        """Initialize the binary_sensor."""
        self._hass = hass
        self._cam = cam
-        self._name = self._cam.name + ' ' + sensor
-        self._id = self._cam.cam_id + '.' + sensor
        self._sensor = sensor
+        self._channel = channel
+
+        if self._cam.type == 'NVR':
+            self._name = '{} {} {}'.format(self._cam.name, sensor, channel)
+        else:
+            self._name = '{} {}'.format(self._cam.name, sensor)
+
+        self._id = '{}.{}.{}'.format(self._cam.cam_id, sensor, channel)

        if delay is None:
            self._delay = 0
@@ -176,11 +197,11 @@ class HikvisionBinarySensor(BinarySensorDevice):

    def _sensor_state(self):
        """Extract sensor state."""
-        return self._cam.sensors[self._sensor][0]
+        return self._cam.get_attributes(self._sensor, self._channel)[0]

    def _sensor_last_update(self):
        """Extract sensor last update time."""
-        return self._cam.sensors[self._sensor][3]
+        return self._cam.get_attributes(self._sensor, self._channel)[3]

    @property
    def name(self):
@@ -32,7 +32,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
            InsteonPLMBinarySensorDevice(hass, plm, address, name)
        )

-    hass.async_add_job(async_add_devices(device_list))
+    async_add_devices(device_list)


 class InsteonPLMBinarySensorDevice(BinarySensorDevice):
@@ -0,0 +1,109 @@
+"""
+This component provides HA sensor support for Ring Door Bell/Chimes.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ring/
+"""
+import logging
+from datetime import timedelta
+
+import voluptuous as vol
+import homeassistant.helpers.config_validation as cv
+
+from homeassistant.components.ring import (
+    CONF_ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE)
+
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, CONF_ENTITY_NAMESPACE, CONF_MONITORED_CONDITIONS)
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+
+DEPENDENCIES = ['ring']
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=5)
+
+# Sensor types: Name, category, device_class
+SENSOR_TYPES = {
+    'ding': ['Ding', ['doorbell'], 'occupancy'],
+    'motion': ['Motion', ['doorbell'], 'motion'],
+}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_ENTITY_NAMESPACE, default=DEFAULT_ENTITY_NAMESPACE):
+        cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS, default=[]):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up a sensor for a Ring device."""
+    ring = hass.data.get('ring')
+
+    sensors = []
+    for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
+        for device in ring.doorbells:
+            if 'doorbell' in SENSOR_TYPES[sensor_type][1]:
+                sensors.append(RingBinarySensor(hass,
+                                                device,
+                                                sensor_type))
+    add_devices(sensors, True)
+    return True
+
+
+class RingBinarySensor(BinarySensorDevice):
+    """A binary sensor implementation for Ring device."""
+
+    def __init__(self, hass, data, sensor_type):
+        """Initialize a sensor for Ring device."""
+        super(RingBinarySensor, self).__init__()
+        self._sensor_type = sensor_type
+        self._data = data
+        self._name = "{0} {1}".format(self._data.name,
+                                      SENSOR_TYPES.get(self._sensor_type)[0])
+        self._device_class = SENSOR_TYPES.get(self._sensor_type)[2]
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the class of the binary sensor."""
+        return self._device_class
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attrs = {}
+        attrs[ATTR_ATTRIBUTION] = CONF_ATTRIBUTION
+
+        attrs['device_id'] = self._data.id
+        attrs['firmware'] = self._data.firmware
+        attrs['timezone'] = self._data.timezone
+
+        if self._data.alert and self._data.alert_expires_at:
+            attrs['expires_at'] = self._data.alert_expires_at
+            attrs['state'] = self._data.alert.get('state')
+
+        return attrs
+
+    def update(self):
+        """Get the latest data and updates the state."""
+        self._data.check_alerts()
+
+        if self._data.alert:
+            self._state = (self._sensor_type ==
+                           self._data.alert.get('kind'))
+        else:
+            self._state = False
@@ -0,0 +1,147 @@
+"""
+Sensor to indicate whether the current day is a workday.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.workday/
+"""
+import asyncio
+import logging
+import datetime
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    STATE_ON, STATE_OFF, STATE_UNKNOWN, CONF_NAME, WEEKDAYS)
+import homeassistant.util.dt as dt_util
+from homeassistant.helpers.entity import Entity
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['holidays==0.8.1']
+
+# List of all countries currently supported by holidays
+# There seems to be no way to get the list out at runtime
+ALL_COUNTRIES = ['Australia', 'AU', 'Austria', 'AT', 'Canada', 'CA',
+                 'Colombia', 'CO', 'Czech', 'CZ', 'Denmark', 'DK', 'England',
+                 'EuropeanCentralBank', 'ECB', 'TAR', 'Germany', 'DE',
+                 'Ireland', 'Isle of Man', 'Mexico', 'MX', 'Netherlands', 'NL',
+                 'NewZealand', 'NZ', 'Northern Ireland', 'Norway', 'NO',
+                 'Portugal', 'PT', 'PortugalExt', 'PTE', 'Scotland', 'Spain',
+                 'ES', 'UnitedKingdom', 'UK', 'UnitedStates', 'US', 'Wales']
+CONF_COUNTRY = 'country'
+CONF_PROVINCE = 'province'
+CONF_WORKDAYS = 'workdays'
+# By default, Monday - Friday are workdays
+DEFAULT_WORKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri']
+CONF_EXCLUDES = 'excludes'
+# By default, public holidays, Saturdays and Sundays are excluded from workdays
+DEFAULT_EXCLUDES = ['sat', 'sun', 'holiday']
+DEFAULT_NAME = 'Workday Sensor'
+ALLOWED_DAYS = WEEKDAYS + ['holiday']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_COUNTRY): vol.In(ALL_COUNTRIES),
+    vol.Optional(CONF_PROVINCE, default=None): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_WORKDAYS, default=DEFAULT_WORKDAYS):
+        vol.All(cv.ensure_list, [vol.In(ALLOWED_DAYS)]),
+    vol.Optional(CONF_EXCLUDES, default=DEFAULT_EXCLUDES):
+        vol.All(cv.ensure_list, [vol.In(ALLOWED_DAYS)]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the Workday sensor."""
+    import holidays
+
+    sensor_name = config.get(CONF_NAME)
+    country = config.get(CONF_COUNTRY)
+    province = config.get(CONF_PROVINCE)
+    workdays = config.get(CONF_WORKDAYS)
+    excludes = config.get(CONF_EXCLUDES)
+
+    year = datetime.datetime.now().year
+    obj_holidays = getattr(holidays, country)(years=year)
+
+    if province:
+        if province not in obj_holidays.PROVINCES:
+            _LOGGER.error('There is no province/state %s in country %s',
+                          province, country)
+            return False
+        else:
+            year = datetime.datetime.now().year
+            obj_holidays = getattr(holidays, country)(prov=province,
+                                                      years=year)
+
+    _LOGGER.debug("Found the following holidays for your configuration:")
+    for date, name in sorted(obj_holidays.items()):
+        _LOGGER.debug("%s %s", date, name)
+
+    add_devices([IsWorkdaySensor(
+        obj_holidays, workdays, excludes, sensor_name)], True)
+
+
+def day_to_string(day):
+    """Convert day index 0 - 7 to string."""
+    try:
+        return ALLOWED_DAYS[day]
+    except IndexError:
+        return None
+
+
+class IsWorkdaySensor(Entity):
+    """Implementation of a Workday sensor."""
+
+    def __init__(self, obj_holidays, workdays, excludes, name):
+        """Initialize the Workday sensor."""
+        self._name = name
+        self._obj_holidays = obj_holidays
+        self._workdays = workdays
+        self._excludes = excludes
+        self._state = STATE_UNKNOWN
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    def is_include(self, day, now):
+        """Check if given day is in the includes list."""
+        if day in self._workdays:
+            return True
+        elif 'holiday' in self._workdays and now in self._obj_holidays:
+            return True
+
+        return False
+
+    def is_exclude(self, day, now):
+        """Check if given day is in the excludes list."""
+        if day in self._excludes:
+            return True
+        elif 'holiday' in self._excludes and now in self._obj_holidays:
+            return True
+
+        return False
+
+    @asyncio.coroutine
+    def async_update(self):
+        """Get date and look whether it is a holiday."""
+        # Default is no workday
+        self._state = STATE_OFF
+
+        # Get iso day of the week (1 = Monday, 7 = Sunday)
+        day = datetime.datetime.today().isoweekday() - 1
+        day_of_week = day_to_string(day)
+
+        if self.is_include(day_of_week, dt_util.now()):
+            self._state = STATE_ON
+
+        if self.is_exclude(day_of_week, dt_util.now()):
+            self._state = STATE_OFF
@@ -19,34 +19,34 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = []


-def get_device(value, **kwargs):
+def get_device(values, **kwargs):
    """Create zwave entity device."""
-    device_mapping = workaround.get_device_mapping(value)
+    device_mapping = workaround.get_device_mapping(values.primary)
    if device_mapping == workaround.WORKAROUND_NO_OFF_EVENT:
        # Default the multiplier to 4
-        re_arm_multiplier = (zwave.get_config_value(value.node, 9) or 4)
-        return ZWaveTriggerSensor(value, "motion", re_arm_multiplier * 8)
+        re_arm_multiplier = zwave.get_config_value(values.primary.node, 9) or 4
+        return ZWaveTriggerSensor(values, "motion", re_arm_multiplier * 8)

-    if workaround.get_device_component_mapping(value) == DOMAIN:
-        return ZWaveBinarySensor(value, None)
+    if workaround.get_device_component_mapping(values.primary) == DOMAIN:
+        return ZWaveBinarySensor(values, None)

-    if value.command_class == zwave.const.COMMAND_CLASS_SENSOR_BINARY:
-        return ZWaveBinarySensor(value, None)
+    if values.primary.command_class == zwave.const.COMMAND_CLASS_SENSOR_BINARY:
+        return ZWaveBinarySensor(values, None)
    return None


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

-    def __init__(self, value, device_class):
+    def __init__(self, values, device_class):
        """Initialize the sensor."""
-        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        zwave.ZWaveDeviceEntity.__init__(self, values, DOMAIN)
        self._sensor_type = device_class
-        self._state = self._value.data
+        self._state = self.values.primary.data

    def update_properties(self):
        """Callback on data changes for node values."""
-        self._state = self._value.data
+        self._state = self.values.primary.data

    @property
    def is_on(self):
@@ -58,24 +58,19 @@ class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
        """Return the class of this sensor, from DEVICE_CLASSES."""
        return self._sensor_type

-    @property
-    def should_poll(self):
-        """No polling needed."""
-        return False
-

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

-    def __init__(self, value, device_class, re_arm_sec=60):
+    def __init__(self, values, device_class, re_arm_sec=60):
        """Initialize the sensor."""
-        super(ZWaveTriggerSensor, self).__init__(value, device_class)
+        super(ZWaveTriggerSensor, self).__init__(values, device_class)
        self.re_arm_sec = re_arm_sec
        self.invalidate_after = None

    def update_properties(self):
        """Called when a value for this entity's node has changed."""
-        self._state = self._value.data
+        self._state = self.values.primary.data
        # only allow this value to be true for re_arm secs
        if not self.hass:
            return
@@ -5,17 +5,19 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/blink/
 """
 import logging
+
 import voluptuous as vol
+
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import (CONF_USERNAME,
-                                 CONF_PASSWORD,
-                                 ATTR_FRIENDLY_NAME,
-                                 ATTR_ARMED)
+from homeassistant.const import (
+    CONF_USERNAME, CONF_PASSWORD, ATTR_FRIENDLY_NAME, ATTR_ARMED)
 from homeassistant.helpers import discovery
+
+REQUIREMENTS = ['blinkpy==0.5.2']
+
 _LOGGER = logging.getLogger(__name__)

 DOMAIN = 'blink'
-REQUIREMENTS = ['blinkpy==0.4.4']

 CONFIG_SCHEMA = vol.Schema({
    DOMAIN: vol.Schema({
@@ -50,7 +52,7 @@ class BlinkSystem(object):


 def setup(hass, config):
-    """Setup Blink System."""
+    """Set up Blink System."""
    hass.data[DOMAIN] = BlinkSystem(config)
    discovery.load_platform(hass, 'camera', DOMAIN, {}, config)
    discovery.load_platform(hass, 'sensor', DOMAIN, {}, config)
@@ -77,11 +79,11 @@ def setup(hass, config):
        hass.data[DOMAIN].blink.arm = value
        hass.data[DOMAIN].blink.refresh()

-    hass.services.register(DOMAIN, 'snap_picture', snap_picture,
-                           schema=SNAP_PICTURE_SCHEMA)
-    hass.services.register(DOMAIN, 'arm_camera', arm_camera,
-                           schema=ARM_CAMERA_SCHEMA)
-    hass.services.register(DOMAIN, 'arm_system', arm_system,
-                           schema=ARM_SYSTEM_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'snap_picture', snap_picture, schema=SNAP_PICTURE_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'arm_camera', arm_camera, schema=ARM_CAMERA_SCHEMA)
+    hass.services.register(
+        DOMAIN, 'arm_system', arm_system, schema=ARM_SYSTEM_SCHEMA)

    return True
@@ -7,6 +7,7 @@ https://home-assistant.io/components/camera/
 """
 import asyncio
 import collections
+from contextlib import suppress
 from datetime import timedelta
 import logging
 import hashlib
@@ -58,7 +59,6 @@ def async_get_image(hass, entity_id, timeout=10):
        state.attributes.get(ATTR_ENTITY_PICTURE)
    )

-    response = None
    try:
        with async_timeout.timeout(timeout, loop=hass.loop):
            response = yield from websession.get(url)
@@ -70,13 +70,9 @@ def async_get_image(hass, entity_id, timeout=10):
            image = yield from response.read()
            return image

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        raise HomeAssistantError("Can't connect to {0}".format(url))

-    finally:
-        if response is not None:
-            yield from response.release()
-

@asyncio.coroutine
 def async_setup(hass, config):
@@ -172,7 +168,7 @@ class Camera(Entity):
                if not img_bytes:
                    break

-                if img_bytes is not None and img_bytes != last_image:
+                if img_bytes and img_bytes != last_image:
                    write(img_bytes)

                    # Chrome seems to always ignore first picture,
@@ -185,8 +181,8 @@ class Camera(Entity):

                yield from asyncio.sleep(.5)

-        except (asyncio.CancelledError, ConnectionResetError):
-            _LOGGER.debug("Close stream by frontend.")
+        except asyncio.CancelledError:
+            _LOGGER.debug("Stream closed by frontend.")
            response = None

        finally:
@@ -268,16 +264,14 @@ class CameraImageView(CameraView):
    @asyncio.coroutine
    def handle(self, request, camera):
        """Serve camera image."""
-        try:
-            image = yield from camera.async_camera_image()
+        with suppress(asyncio.CancelledError, asyncio.TimeoutError):
+            with async_timeout.timeout(10, loop=request.app['hass'].loop):
+                image = yield from camera.async_camera_image()

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

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


 class CameraMjpegStream(CameraView):
@@ -16,9 +16,9 @@ from homeassistant.const import (
    CONF_HOST, CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_PORT)
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
-    async_get_clientsession, async_aiohttp_proxy_stream)
+    async_get_clientsession, async_aiohttp_proxy_web)

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

 _LOGGER = logging.getLogger(__name__)

@@ -125,7 +125,7 @@ class AmcrestCam(Camera):
        stream_coro = websession.get(
            streaming_url, auth=self._token, timeout=TIMEOUT)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -15,7 +15,7 @@ from homeassistant.util import Throttle

 DEPENDENCIES = ['blink']

-MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)

 _LOGGER = logging.getLogger(__name__)

@@ -1,67 +0,0 @@
-"""
-Support for internal dispatcher image push to Camera.
-
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/camera.dispatcher/
-"""
-import asyncio
-import logging
-
-import voluptuous as vol
-
-from homeassistant.core import callback
-from homeassistant.const import CONF_NAME
-from homeassistant.components.camera import PLATFORM_SCHEMA, Camera
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_SIGNAL = 'signal'
-DEFAULT_NAME = 'Dispatcher Camera'
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_SIGNAL): cv.slugify,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-})
-
-
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
-    """Setup a dispatcher camera."""
-    if discovery_info:
-        config = PLATFORM_SCHEMA(discovery_info)
-
-    async_add_devices(
-        [DispatcherCamera(config[CONF_NAME], config[CONF_SIGNAL])])
-
-
-class DispatcherCamera(Camera):
-    """A dispatcher implementation of an camera."""
-
-    def __init__(self, name, signal):
-        """Initialize a dispatcher camera."""
-        super().__init__()
-        self._name = name
-        self._signal = signal
-        self._image = None
-
-    @asyncio.coroutine
-    def async_added_to_hass(self):
-        """Register dispatcher and callbacks."""
-        @callback
-        def async_update_image(image):
-            """Update image from dispatcher call."""
-            self._image = image
-
-        async_dispatcher_connect(self.hass, self._signal, async_update_image)
-
-    @asyncio.coroutine
-    def async_camera_image(self):
-        """Return a still image response from the camera."""
-        return self._image
-
-    @property
-    def name(self):
-        """Return the name of this device."""
-        return self._name
@@ -8,14 +8,14 @@ import asyncio
 import logging

 import voluptuous as vol
-from aiohttp import web

+from homeassistant.const import CONF_NAME
 from homeassistant.components.camera import Camera, PLATFORM_SCHEMA
 from homeassistant.components.ffmpeg import (
    DATA_FFMPEG, CONF_INPUT, CONF_EXTRA_ARGUMENTS)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import CONF_NAME
-
+from homeassistant.helpers.aiohttp_client import (
+    async_aiohttp_proxy_stream)
 DEPENDENCIES = ['ffmpeg']

 _LOGGER = logging.getLogger(__name__)
@@ -69,26 +69,10 @@ class FFmpegCamera(Camera):
        yield from stream.open_camera(
            self._input, extra_cmd=self._extra_arguments)

-        response = web.StreamResponse()
-        response.content_type = 'multipart/x-mixed-replace;boundary=ffserver'
-
-        yield from response.prepare(request)
-
-        try:
-            while True:
-                data = yield from stream.read(102400)
-                if not data:
-                    break
-                response.write(data)
-
-        except asyncio.CancelledError:
-            _LOGGER.debug("Close stream by frontend.")
-            response = None
-
-        finally:
-            yield from stream.close()
-            if response is not None:
-                yield from response.write_eof()
+        yield from async_aiohttp_proxy_stream(
+            self.hass, request, stream,
+            'multipart/x-mixed-replace;boundary=ffserver')
+        yield from stream.close()

    @property
    def name(self):
@@ -66,9 +66,13 @@ class FoscamCamera(Camera):
    def camera_image(self):
        """Return a still image reponse from the camera."""
        # Send the request to snap a picture and return raw jpg data
-        response = requests.get(self._snap_picture_url, timeout=10)
-
-        return response.content
+        # Handle exception if host is not reachable or url failed
+        try:
+            response = requests.get(self._snap_picture_url, timeout=10)
+        except requests.exceptions.ConnectionError:
+            return None
+        else:
+            return response.content

    @property
    def name(self):
@@ -107,7 +107,6 @@ class GenericCamera(Camera):
                None, fetch)
        # async
        else:
-            response = None
            try:
                websession = async_get_clientsession(self.hass)
                with async_timeout.timeout(10, loop=self.hass.loop):
@@ -117,14 +116,9 @@ class GenericCamera(Camera):
            except asyncio.TimeoutError:
                _LOGGER.error('Timeout getting camera image')
                return self._last_image
-            except (aiohttp.errors.ClientError,
-                    aiohttp.errors.DisconnectedError,
-                    aiohttp.errors.HttpProcessingError) as err:
+            except aiohttp.ClientError as err:
                _LOGGER.error('Error getting new camera image: %s', err)
                return self._last_image
-            finally:
-                if response is not None:
-                    yield from response.release()

        self._last_url = url
        return self._last_image
@@ -19,7 +19,7 @@ from homeassistant.const import (
    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
 from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
 from homeassistant.helpers.aiohttp_client import (
-    async_get_clientsession, async_aiohttp_proxy_stream)
+    async_get_clientsession, async_aiohttp_proxy_web)
 from homeassistant.helpers import config_validation as cv

 _LOGGER = logging.getLogger(__name__)
@@ -93,7 +93,6 @@ class MjpegCamera(Camera):
            return image

        websession = async_get_clientsession(self.hass)
-        response = None
        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
                response = yield from websession.get(
@@ -105,14 +104,9 @@ class MjpegCamera(Camera):
        except asyncio.TimeoutError:
            _LOGGER.error('Timeout getting camera image')

-        except (aiohttp.errors.ClientError,
-                aiohttp.errors.ClientDisconnectedError) as err:
+        except aiohttp.ClientError as err:
            _LOGGER.error('Error getting new camera image: %s', err)

-        finally:
-            if response is not None:
-                yield from response.release()
-
    def camera_image(self):
        """Return a still image response from the camera."""
        if self._username and self._password:
@@ -140,7 +134,7 @@ class MjpegCamera(Camera):
        websession = async_get_clientsession(self.hass)
        stream_coro = websession.get(self._mjpeg_url, auth=self._auth)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -14,12 +14,12 @@ import async_timeout

 from homeassistant.const import (
    CONF_NAME, CONF_USERNAME, CONF_PASSWORD,
-    CONF_URL, CONF_WHITELIST, CONF_VERIFY_SSL)
+    CONF_URL, CONF_WHITELIST, CONF_VERIFY_SSL, CONF_TIMEOUT)
 from homeassistant.components.camera import (
    Camera, PLATFORM_SCHEMA)
 from homeassistant.helpers.aiohttp_client import (
    async_get_clientsession, async_create_clientsession,
-    async_aiohttp_proxy_stream)
+    async_aiohttp_proxy_web)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.async import run_coroutine_threadsafe

@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = 'Synology Camera'
 DEFAULT_STREAM_ID = '0'
-TIMEOUT = 5
+DEFAULT_TIMEOUT = 5
 CONF_CAMERA_NAME = 'camera_name'
 CONF_STREAM_ID = 'stream_id'

@@ -51,6 +51,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
    vol.Required(CONF_USERNAME): cv.string,
    vol.Required(CONF_PASSWORD): cv.string,
    vol.Required(CONF_URL): cv.string,
+    vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
    vol.Optional(CONF_WHITELIST, default=[]): cv.ensure_list,
    vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
 })
@@ -60,6 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
    """Setup a Synology IP Camera."""
    verify_ssl = config.get(CONF_VERIFY_SSL)
+    timeout = config.get(CONF_TIMEOUT)
    websession_init = async_get_clientsession(hass, verify_ssl)

    # Determine API to use for authentication
@@ -72,9 +74,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        'version': '1',
        'query': 'SYNO.'
    }
-    query_req = None
    try:
-        with async_timeout.timeout(TIMEOUT, loop=hass.loop):
+        with async_timeout.timeout(timeout, loop=hass.loop):
            query_req = yield from websession_init.get(
                syno_api_url,
                params=query_payload
@@ -86,14 +87,10 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        camera_path = query_resp['data'][CAMERA_API]['path']
        streaming_path = query_resp['data'][STREAMING_API]['path']

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", syno_api_url)
        return False

-    finally:
-        if query_req is not None:
-            yield from query_req.release()
-
    # Authticate to NAS to get a session id
    syno_auth_url = SYNO_API_URL.format(
        config.get(CONF_URL), WEBAPI_PATH, auth_path)
@@ -103,7 +100,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        websession_init,
        config.get(CONF_USERNAME),
        config.get(CONF_PASSWORD),
-        syno_auth_url
+        syno_auth_url,
+        timeout
    )

    # init websession
@@ -120,18 +118,17 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
        'version': '1'
    }
    try:
-        with async_timeout.timeout(TIMEOUT, loop=hass.loop):
+        with async_timeout.timeout(timeout, loop=hass.loop):
            camera_req = yield from websession.get(
                syno_camera_url,
                params=camera_payload
            )
-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", syno_camera_url)
        return False

    camera_resp = yield from camera_req.json()
    cameras = camera_resp['data']['cameras']
-    yield from camera_req.release()

    # add cameras
    devices = []
@@ -149,7 +146,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                snapshot_path,
                streaming_path,
                camera_path,
-                auth_path
+                auth_path,
+                timeout
            )
            devices.append(device)

@@ -157,7 +155,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):


@asyncio.coroutine
-def get_session_id(hass, websession, username, password, login_url):
+def get_session_id(hass, websession, username, password, login_url, timeout):
    """Get a session id."""
    auth_payload = {
        'api': AUTH_API,
@@ -168,9 +166,8 @@ def get_session_id(hass, websession, username, password, login_url):
        'session': 'SurveillanceStation',
        'format': 'sid'
    }
-    auth_req = None
    try:
-        with async_timeout.timeout(TIMEOUT, loop=hass.loop):
+        with async_timeout.timeout(timeout, loop=hass.loop):
            auth_req = yield from websession.get(
                login_url,
                params=auth_payload
@@ -178,21 +175,17 @@ def get_session_id(hass, websession, username, password, login_url):
        auth_resp = yield from auth_req.json()
        return auth_resp['data']['sid']

-    except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+    except (asyncio.TimeoutError, aiohttp.ClientError):
        _LOGGER.exception("Error on %s", login_url)
        return False

-    finally:
-        if auth_req is not None:
-            yield from auth_req.release()
-

 class SynologyCamera(Camera):
    """An implementation of a Synology NAS based IP camera."""

    def __init__(self, hass, websession, config, camera_id,
                 camera_name, snapshot_path, streaming_path, camera_path,
-                 auth_path):
+                 auth_path, timeout):
        """Initialize a Synology Surveillance Station camera."""
        super().__init__()
        self.hass = hass
@@ -206,6 +199,7 @@ class SynologyCamera(Camera):
        self._streaming_path = streaming_path
        self._camera_path = camera_path
        self._auth_path = auth_path
+        self._timeout = timeout

    def camera_image(self):
        """Return bytes of camera image."""
@@ -225,17 +219,16 @@ class SynologyCamera(Camera):
            'cameraId': self._camera_id
        }
        try:
-            with async_timeout.timeout(TIMEOUT, loop=self.hass.loop):
+            with async_timeout.timeout(self._timeout, loop=self.hass.loop):
                response = yield from self._websession.get(
                    image_url,
                    params=image_payload
                )
-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
-            _LOGGER.exception("Error on %s", image_url)
+        except (asyncio.TimeoutError, aiohttp.ClientError):
+            _LOGGER.error("Error fetching %s", image_url)
            return None

        image = yield from response.read()
-        yield from response.release()

        return image

@@ -255,7 +248,7 @@ class SynologyCamera(Camera):
        stream_coro = self._websession.get(
            streaming_url, params=streaming_payload)

-        yield from async_aiohttp_proxy_stream(self.hass, request, stream_coro)
+        yield from async_aiohttp_proxy_web(self.hass, request, stream_coro)

    @property
    def name(self):
@@ -19,6 +19,9 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['zoneminder']
 DOMAIN = 'zoneminder'

+# From ZoneMinder's web/includes/config.php.in
+ZM_STATE_ALARM = "2"
+

 def _get_image_url(hass, monitor, mode):
    zm_data = hass.data[DOMAIN]
@@ -69,10 +72,43 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
            CONF_MJPEG_URL: _get_image_url(hass, monitor, 'jpeg'),
            CONF_STILL_IMAGE_URL: _get_image_url(hass, monitor, 'single')
        }
-        cameras.append(MjpegCamera(hass, device_info))
+        cameras.append(ZoneMinderCamera(hass, device_info, monitor))

    if not cameras:
        _LOGGER.warning('No active cameras found')
        return

    async_add_devices(cameras)
+
+
+class ZoneMinderCamera(MjpegCamera):
+    """Representation of a ZoneMinder Monitor Stream."""
+
+    def __init__(self, hass, device_info, monitor):
+        """Initialize as a subclass of MjpegCamera."""
+        super().__init__(hass, device_info)
+        self._monitor_id = int(monitor['Id'])
+        self._is_recording = None
+
+    @property
+    def should_poll(self):
+        """Update the recording state periodically."""
+        return True
+
+    def update(self):
+        """Update our recording state from the ZM API."""
+        _LOGGER.debug('Updating camera state for monitor %i', self._monitor_id)
+        status_response = zoneminder.get_state(
+            'api/monitors/alarm/id:%i/command:status.json' % self._monitor_id
+        )
+        if not status_response:
+            _LOGGER.warning('Could not get status for monitor %i',
+                            self._monitor_id)
+            return
+
+        self._is_recording = status_response['status'] == ZM_STATE_ALARM
+
+    @property
+    def is_recording(self):
+        """Return whether the monitor is in alarm mode."""
+        return self._is_recording
@@ -224,7 +224,7 @@ def async_setup(hass, config):
            if not climate.should_poll:
                continue

-            update_coro = hass.loop.create_task(
+            update_coro = hass.async_add_job(
                climate.async_update_ha_state(True))
            if hasattr(climate, 'async_update'):
                update_tasks.append(update_coro)
@@ -692,18 +692,16 @@ class ClimateDevice(Entity):

    def _convert_for_display(self, temp):
        """Convert temperature into preferred units for display purposes."""
-        if (temp is None or not isinstance(temp, Number) or
-                self.temperature_unit == self.unit_of_measurement):
+        if temp is None or not isinstance(temp, Number):
            return temp
-
-        value = convert_temperature(temp, self.temperature_unit,
-                                    self.unit_of_measurement)
-
+        if self.temperature_unit != self.unit_of_measurement:
+            temp = convert_temperature(temp, self.temperature_unit,
+                                       self.unit_of_measurement)
        # Round in the units appropriate
        if self.precision == PRECISION_HALVES:
-            return round(value * 2) / 2.0
+            return round(temp * 2) / 2.0
        elif self.precision == PRECISION_TENTHS:
-            return round(value, 1)
+            return round(temp, 1)
        else:
            # PRECISION_WHOLE as a fall back
-            return round(value)
+            return round(temp)
@@ -16,11 +16,15 @@ _LOGGER = logging.getLogger(__name__)

 STATE_MANUAL = "manual"
 STATE_BOOST = "boost"
+STATE_COMFORT = "comfort"
+STATE_LOWERING = "lowering"

 HM_STATE_MAP = {
    "AUTO_MODE": STATE_AUTO,
    "MANU_MODE": STATE_MANUAL,
    "BOOST_MODE": STATE_BOOST,
+    "COMFORT_MODE": STATE_COMFORT,
+    "LOWERING_MODE": STATE_LOWERING
 }

 HM_TEMP_MAP = [
@@ -0,0 +1,292 @@
+"""
+Tado component to create a climate device for each zone.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/climate.tado/
+"""
+import logging
+
+from homeassistant.const import TEMP_CELSIUS
+from homeassistant.components.climate import ClimateDevice
+from homeassistant.const import ATTR_TEMPERATURE
+from homeassistant.components.tado import DATA_TADO
+
+_LOGGER = logging.getLogger(__name__)
+
+CONST_MODE_SMART_SCHEDULE = 'SMART_SCHEDULE'  # Default mytado mode
+CONST_MODE_OFF = 'OFF'  # Switch off heating in a zone
+
+# When we change the temperature setting, we need an overlay mode
+# wait until tado changes the mode automatic
+CONST_OVERLAY_TADO_MODE = 'TADO_MODE'
+# the user has change the temperature or mode manually
+CONST_OVERLAY_MANUAL = 'MANUAL'
+# the temperature will be reset after a timespan
+CONST_OVERLAY_TIMER = 'TIMER'
+
+OPERATION_LIST = {
+    CONST_OVERLAY_MANUAL: 'Manual',
+    CONST_OVERLAY_TIMER: 'Timer',
+    CONST_OVERLAY_TADO_MODE: 'Tado mode',
+    CONST_MODE_SMART_SCHEDULE: 'Smart schedule',
+    CONST_MODE_OFF: 'Off',
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the Tado climate platform."""
+    tado = hass.data[DATA_TADO]
+
+    try:
+        zones = tado.get_zones()
+    except RuntimeError:
+        _LOGGER.error("Unable to get zone info from mytado")
+        return False
+
+    climate_devices = []
+    for zone in zones:
+        climate_devices.append(create_climate_device(
+            tado, hass, zone, zone['name'], zone['id']))
+
+    if len(climate_devices) > 0:
+        add_devices(climate_devices, True)
+        return True
+    else:
+        return False
+
+
+def create_climate_device(tado, hass, zone, name, zone_id):
+    """Create a Tado climate device."""
+    capabilities = tado.get_capabilities(zone_id)
+
+    unit = TEMP_CELSIUS
+    min_temp = float(capabilities['temperatures']['celsius']['min'])
+    max_temp = float(capabilities['temperatures']['celsius']['max'])
+    ac_mode = capabilities['type'] != 'HEATING'
+
+    data_id = 'zone {} {}'.format(name, zone_id)
+    device = TadoClimate(tado,
+                         name, zone_id, data_id,
+                         hass.config.units.temperature(min_temp, unit),
+                         hass.config.units.temperature(max_temp, unit),
+                         ac_mode)
+
+    tado.add_sensor(data_id, {
+        'id': zone_id,
+        'zone': zone,
+        'name': name,
+        'climate': device
+    })
+
+    return device
+
+
+class TadoClimate(ClimateDevice):
+    """Representation of a tado climate device."""
+
+    def __init__(self, store, zone_name, zone_id, data_id,
+                 min_temp, max_temp, ac_mode,
+                 tolerance=0.3):
+        """Initialization of Tado climate device."""
+        self._store = store
+        self._data_id = data_id
+
+        self.zone_name = zone_name
+        self.zone_id = zone_id
+
+        self.ac_mode = ac_mode
+
+        self._active = False
+        self._device_is_active = False
+
+        self._unit = TEMP_CELSIUS
+        self._cur_temp = None
+        self._cur_humidity = None
+        self._is_away = False
+        self._min_temp = min_temp
+        self._max_temp = max_temp
+        self._target_temp = None
+        self._tolerance = tolerance
+
+        self._current_operation = CONST_MODE_SMART_SCHEDULE
+        self._overlay_mode = CONST_MODE_SMART_SCHEDULE
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self.zone_name
+
+    @property
+    def current_humidity(self):
+        """Return the current humidity."""
+        return self._cur_humidity
+
+    @property
+    def current_temperature(self):
+        """Return the sensor temperature."""
+        return self._cur_temp
+
+    @property
+    def current_operation(self):
+        """Return current readable operation mode."""
+        return OPERATION_LIST.get(self._current_operation)
+
+    @property
+    def operation_list(self):
+        """List of available operation modes (readable)."""
+        return list(OPERATION_LIST.values())
+
+    @property
+    def temperature_unit(self):
+        """The unit of measurement used by the platform."""
+        return self._unit
+
+    @property
+    def is_away_mode_on(self):
+        """Return true if away mode is on."""
+        return self._is_away
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we try to reach."""
+        return self._target_temp
+
+    def set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        temperature = kwargs.get(ATTR_TEMPERATURE)
+        if temperature is None:
+            return
+
+        self._current_operation = CONST_OVERLAY_TADO_MODE
+        self._overlay_mode = None
+        self._target_temp = temperature
+        self._control_heating()
+
+    def set_operation_mode(self, readable_operation_mode):
+        """Set new operation mode."""
+        operation_mode = CONST_MODE_SMART_SCHEDULE
+
+        for mode, readable in OPERATION_LIST.items():
+            if readable == readable_operation_mode:
+                operation_mode = mode
+                break
+
+        self._current_operation = operation_mode
+        self._overlay_mode = None
+        self._control_heating()
+
+    @property
+    def min_temp(self):
+        """Return the minimum temperature."""
+        if self._min_temp:
+            return self._min_temp
+        else:
+            # get default temp from super class
+            return super().min_temp
+
+    @property
+    def max_temp(self):
+        """Return the maximum temperature."""
+        if self._max_temp:
+            return self._max_temp
+        else:
+            #  Get default temp from super class
+            return super().max_temp
+
+    def update(self):
+        """Update the state of this climate device."""
+        self._store.update()
+
+        data = self._store.get_data(self._data_id)
+
+        if data is None:
+            _LOGGER.debug("Recieved no data for zone %s", self.zone_name)
+            return
+
+        if 'sensorDataPoints' in data:
+            sensor_data = data['sensorDataPoints']
+            temperature = float(
+                sensor_data['insideTemperature']['celsius'])
+            humidity = float(
+                sensor_data['humidity']['percentage'])
+            setting = 0
+
+            # temperature setting will not exist when device is off
+            if 'temperature' in data['setting'] and \
+                    data['setting']['temperature'] is not None:
+                setting = float(
+                    data['setting']['temperature']['celsius'])
+
+            unit = TEMP_CELSIUS
+
+            self._cur_temp = self.hass.config.units.temperature(
+                temperature, unit)
+
+            self._target_temp = self.hass.config.units.temperature(
+                setting, unit)
+
+            self._cur_humidity = humidity
+
+        if 'tadoMode' in data:
+            mode = data['tadoMode']
+            self._is_away = mode == 'AWAY'
+
+        if 'setting' in data:
+            power = data['setting']['power']
+            if power == 'OFF':
+                self._current_operation = CONST_MODE_OFF
+                self._device_is_active = False
+            else:
+                self._device_is_active = True
+
+        if 'overlay' in data and data['overlay'] is not None:
+            overlay = True
+            termination = data['overlay']['termination']['type']
+        else:
+            overlay = False
+            termination = ""
+
+        # If you set mode manualy to off, there will be an overlay
+        # and a termination, but we want to see the mode "OFF"
+
+        if overlay and self._device_is_active:
+            # There is an overlay the device is on
+            self._overlay_mode = termination
+            self._current_operation = termination
+        else:
+            # There is no overlay, the mode will always be
+            # "SMART_SCHEDULE"
+            self._overlay_mode = CONST_MODE_SMART_SCHEDULE
+            self._current_operation = CONST_MODE_SMART_SCHEDULE
+
+    def _control_heating(self):
+        """Send new target temperature to mytado."""
+        if not self._active and None not in (
+                self._cur_temp, self._target_temp):
+            self._active = True
+            _LOGGER.info("Obtained current and target temperature. "
+                         "Tado thermostat active")
+
+        if not self._active or self._current_operation == self._overlay_mode:
+            return
+
+        if self._current_operation == CONST_MODE_SMART_SCHEDULE:
+            _LOGGER.info("Switching mytado.com to SCHEDULE (default) "
+                         "for zone %s", self.zone_name)
+            self._store.reset_zone_overlay(self.zone_id)
+            self._overlay_mode = self._current_operation
+            return
+
+        if self._current_operation == CONST_MODE_OFF:
+            _LOGGER.info("Switching mytado.com to OFF for zone %s",
+                         self.zone_name)
+            self._store.set_zone_overlay(self.zone_id, CONST_OVERLAY_MANUAL)
+            self._overlay_mode = self._current_operation
+            return
+
+        _LOGGER.info("Switching mytado.com to %s mode for zone %s",
+                     self._current_operation, self.zone_name)
+        self._store.set_zone_overlay(
+            self.zone_id, self._current_operation, self._target_temp)
+
+        self._overlay_mode = self._current_operation
@@ -85,11 +85,11 @@ class VeraThermostat(VeraDevice, ClimateDevice):
            return self.vera_device.fan_cycle()

    @property
-    def current_power_mwh(self):
-        """Current power usage in mWh."""
+    def current_power_w(self):
+        """Current power usage in W."""
        power = self.vera_device.power
        if power:
-            return convert(power, float, 0.0) * 1000
+            return convert(power, float, 0.0)

    def update(self):
        """Called by the vera device callback to update state."""
@@ -19,7 +19,6 @@ DEPENDENCIES = ['wink']
 STATE_AUX = 'aux'
 STATE_ECO = 'eco'
 STATE_FAN = 'fan'
-SPEED_LOWEST = 'lowest'
 SPEED_LOW = 'low'
 SPEED_MEDIUM = 'medium'
 SPEED_HIGH = 'high'
@@ -400,7 +399,7 @@ class WinkAC(WinkDevice, ClimateDevice):
            op_list.append(STATE_COOL)
        if 'auto_eco' in modes:
            op_list.append(STATE_ECO)
-        if 'fan_eco' in modes:
+        if 'fan_only' in modes:
            op_list.append(STATE_FAN)
        return op_list

@@ -439,9 +438,7 @@ class WinkAC(WinkDevice, ClimateDevice):
    def current_fan_mode(self):
        """Return the current fan mode."""
        speed = self.wink.current_fan_speed()
-        if speed <= 0.3 and speed >= 0.0:
-            return SPEED_LOWEST
-        elif speed <= 0.5 and speed > 0.3:
+        if speed <= 0.4 and speed > 0.3:
            return SPEED_LOW
        elif speed <= 0.8 and speed > 0.5:
            return SPEED_MEDIUM
@@ -453,14 +450,12 @@ class WinkAC(WinkDevice, ClimateDevice):
    @property
    def fan_list(self):
        """List of available fan modes."""
-        return [SPEED_LOWEST, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+        return [SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]

    def set_fan_mode(self, mode):
        """Set fan speed."""
-        if mode == SPEED_LOWEST:
-            speed = 0.3
-        elif mode == SPEED_LOW:
-            speed = 0.5
+        if mode == SPEED_LOW:
+            speed = 0.4
        elif mode == SPEED_MEDIUM:
            speed = 0.8
        elif mode == SPEED_HIGH:
@@ -10,7 +10,6 @@ import logging
 from homeassistant.components.climate import DOMAIN
 from homeassistant.components.climate import ClimateDevice
 from homeassistant.components.zwave import ZWaveDeviceEntity
-from homeassistant.components import zwave
 from homeassistant.components.zwave import async_setup_platform  # noqa # pylint: disable=unused-import
 from homeassistant.const import (
    TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE)
@@ -33,20 +32,18 @@ DEVICE_MAPPINGS = {
 }


-def get_device(hass, value, **kwargs):
+def get_device(hass, values, **kwargs):
    """Create zwave entity device."""
    temp_unit = hass.config.units.temperature_unit
-    return ZWaveClimate(value, temp_unit)
+    return ZWaveClimate(values, temp_unit)


 class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
    """Representation of a Z-Wave Climate device."""

-    def __init__(self, value, temp_unit):
+    def __init__(self, values, temp_unit):
        """Initialize the Z-Wave climate device."""
-        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
-        self._index = value.index
-        self._node = value.node
+        ZWaveDeviceEntity.__init__(self, values, DOMAIN)
        self._target_temperature = None
        self._current_temperature = None
        self._current_operation = None
@@ -61,10 +58,11 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
        _LOGGER.debug("temp_unit is %s", self._unit)
        self._zxt_120 = None
        # Make sure that we have values for the key before converting to int
-        if (value.node.manufacturer_id.strip() and
-                value.node.product_id.strip()):
-            specific_sensor_key = (int(value.node.manufacturer_id, 16),
-                                   int(value.node.product_id, 16))
+        if (self.node.manufacturer_id.strip() and
+                self.node.product_id.strip()):
+            specific_sensor_key = (
+                int(self.node.manufacturer_id, 16),
+                int(self.node.product_id, 16))
            if specific_sensor_key in DEVICE_MAPPINGS:
                if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_ZXT_120:
                    _LOGGER.debug("Remotec ZXT-120 Zwave Thermostat"
@@ -75,86 +73,59 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
    def update_properties(self):
        """Callback on data changes for node values."""
        # Operation Mode
-        self._current_operation = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE, member='data')
-        operation_list = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE,
-            member='data_items')
-        if operation_list:
-            self._operation_list = list(operation_list)
+        if self.values.mode:
+            self._current_operation = self.values.mode.data
+            operation_list = self.values.mode.data_items
+            if operation_list:
+                self._operation_list = list(operation_list)
        _LOGGER.debug("self._operation_list=%s", self._operation_list)
        _LOGGER.debug("self._current_operation=%s", self._current_operation)

        # Current Temp
-        self._current_temperature = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL,
-            label=['Temperature'], member='data')
-        device_unit = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_SENSOR_MULTILEVEL,
-            label=['Temperature'], member='units')
-        if device_unit is not None:
-            self._unit = device_unit
+        if self.values.temperature:
+            self._current_temperature = self.values.temperature.data
+            device_unit = self.values.temperature.units
+            if device_unit is not None:
+                self._unit = device_unit

        # Fan Mode
-        self._current_fan_mode = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
-            member='data')
-        fan_list = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
-            member='data_items')
-        if fan_list:
-            self._fan_list = list(fan_list)
+        if self.values.fan_mode:
+            self._current_fan_mode = self.values.fan_mode.data
+            fan_list = self.values.fan_mode.data_items
+            if fan_list:
+                self._fan_list = list(fan_list)
        _LOGGER.debug("self._fan_list=%s", self._fan_list)
        _LOGGER.debug("self._current_fan_mode=%s",
                      self._current_fan_mode)
        # Swing mode
        if self._zxt_120 == 1:
-            self._current_swing_mode = (
-                self.get_value(
-                    class_id=zwave.const.COMMAND_CLASS_CONFIGURATION,
-                    index=33,
-                    member='data'))
-            swing_list = self.get_value(class_id=zwave.const
-                                        .COMMAND_CLASS_CONFIGURATION,
-                                        index=33,
-                                        member='data_items')
-            if swing_list:
-                self._swing_list = list(swing_list)
+            if self.values.zxt_120_swing_mode:
+                self._current_swing_mode = self.values.zxt_120_swing_mode.data
+                swing_list = self.values.zxt_120_swing_mode.data_items
+                if swing_list:
+                    self._swing_list = list(swing_list)
            _LOGGER.debug("self._swing_list=%s", self._swing_list)
            _LOGGER.debug("self._current_swing_mode=%s",
                          self._current_swing_mode)
        # Set point
-        temps = []
-        for value in (
-                self._node.get_values(
-                    class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_SETPOINT)
-                .values()):
-            temps.append((round(float(value.data)), 1))
-            if value.index == self._index:
-                if value.data == 0:
-                    _LOGGER.debug("Setpoint is 0, setting default to "
-                                  "current_temperature=%s",
-                                  self._current_temperature)
-                    self._target_temperature = (
-                        round((float(self._current_temperature)), 1))
-                    break
-                else:
-                    self._target_temperature = round((float(value.data)), 1)
+        if self.values.primary.data == 0:
+            _LOGGER.debug("Setpoint is 0, setting default to "
+                          "current_temperature=%s",
+                          self._current_temperature)
+            if self._current_temperature is not None:
+                self._target_temperature = (
+                    round((float(self._current_temperature)), 1))
+        else:
+            self._target_temperature = round(
+                (float(self.values.primary.data)), 1)

        # Operating state
-        self._operating_state = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_OPERATING_STATE,
-            member='data')
+        if self.values.operating_state:
+            self._operating_state = self.values.operating_state.data

        # Fan operating state
-        self._fan_state = self.get_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_STATE,
-            member='data')
-
-    @property
-    def should_poll(self):
-        """No polling on Z-Wave."""
-        return False
+        if self.values.fan_state:
+            self._fan_state = self.values.fan_state.data

    @property
    def current_fan_mode(self):
@@ -213,41 +184,31 @@ class ZWaveClimate(ZWaveDeviceEntity, ClimateDevice):
        else:
            return

-        self.set_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_SETPOINT,
-            index=self._index, data=temperature)
-        self.schedule_update_ha_state()
+        self.values.primary.data = temperature

    def set_fan_mode(self, fan):
        """Set new target fan mode."""
-        self.set_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_FAN_MODE,
-            index=0, data=bytes(fan, 'utf-8'))
+        if self.values.fan_mode:
+            self.values.fan_mode.data = bytes(fan, 'utf-8')

    def set_operation_mode(self, operation_mode):
        """Set new target operation mode."""
-        self.set_value(
-            class_id=zwave.const.COMMAND_CLASS_THERMOSTAT_MODE,
-            index=0, data=bytes(operation_mode, 'utf-8'))
+        if self.values.mode:
+            self.values.mode.data = bytes(operation_mode, 'utf-8')

    def set_swing_mode(self, swing_mode):
        """Set new target swing mode."""
        if self._zxt_120 == 1:
-            self.set_value(
-                class_id=zwave.const.COMMAND_CLASS_CONFIGURATION,
-                index=33, data=bytes(swing_mode, 'utf-8'))
+            if self.values.zxt_120_swing_mode:
+                self.values.zxt_120_swing_mode.data = bytes(
+                    swing_mode, 'utf-8')

    @property
    def device_state_attributes(self):
        """Return the device specific state attributes."""
        data = super().device_state_attributes
        if self._operating_state:
-            data[ATTR_OPERATING_STATE] = self._operating_state,
+            data[ATTR_OPERATING_STATE] = self._operating_state
        if self._fan_state:
            data[ATTR_FAN_STATE] = self._fan_state
        return data
-
-    @property
-    def dependent_value_ids(self):
-        """List of value IDs a device depends on."""
-        return None
@@ -166,7 +166,7 @@ def async_setup(hass, config):
            if not cover.should_poll:
                continue

-            update_coro = hass.loop.create_task(
+            update_coro = hass.async_add_job(
                cover.async_update_ha_state(True))
            if hasattr(cover, 'async_update'):
                update_tasks.append(update_coro)
@@ -14,8 +14,8 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv

 REQUIREMENTS = [
-    'https://github.com/arraylabs/pymyq/archive/v0.0.7.zip'
-    '#pymyq==0.0.7']
+    'https://github.com/arraylabs/pymyq/archive/v0.0.8.zip'
+    '#pymyq==0.0.8']

 COVER_SCHEMA = vol.Schema({
    vol.Required(CONF_TYPE): cv.string,
@@ -47,6 +47,7 @@ class VeraCover(VeraDevice, CoverDevice):
    def set_cover_position(self, position, **kwargs):
        """Move the cover to a specific position."""
        self.vera_device.set_level(position)
+        self.schedule_update_ha_state()

    @property
    def is_closed(self):
@@ -60,11 +61,14 @@ class VeraCover(VeraDevice, CoverDevice):
    def open_cover(self, **kwargs):
        """Open the cover."""
        self.vera_device.open()
+        self.schedule_update_ha_state()

    def close_cover(self, **kwargs):
        """Close the cover."""
        self.vera_device.close()
+        self.schedule_update_ha_state()

    def stop_cover(self, **kwargs):
        """Stop the cover."""
        self.vera_device.stop()
+        self.schedule_update_ha_state()
@@ -20,64 +20,50 @@ _LOGGER = logging.getLogger(__name__)
 SUPPORT_GARAGE = SUPPORT_OPEN | SUPPORT_CLOSE


-def get_device(value, **kwargs):
+def get_device(values, node_config, **kwargs):
    """Create zwave entity device."""
-    if (value.command_class == zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL
-            and value.index == 0):
-        return ZwaveRollershutter(value)
-    elif (value.command_class == zwave.const.COMMAND_CLASS_SWITCH_BINARY or
-          value.command_class == zwave.const.COMMAND_CLASS_BARRIER_OPERATOR):
-        return ZwaveGarageDoor(value)
+    invert_buttons = node_config.get(zwave.CONF_INVERT_OPENCLOSE_BUTTONS)
+    if (values.primary.command_class ==
+            zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL
+            and values.primary.index == 0):
+        return ZwaveRollershutter(values, invert_buttons)
+    elif (values.primary.command_class in [
+            zwave.const.COMMAND_CLASS_SWITCH_BINARY,
+            zwave.const.COMMAND_CLASS_BARRIER_OPERATOR]):
+        return ZwaveGarageDoor(values)
    return None


 class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):
    """Representation of an Zwave roller shutter."""

-    def __init__(self, value):
+    def __init__(self, values, invert_buttons):
        """Initialize the zwave rollershutter."""
-        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        ZWaveDeviceEntity.__init__(self, values, DOMAIN)
        # pylint: disable=no-member
-        self._node = value.node
        self._open_id = None
        self._close_id = None
-        self._current_position_id = None
        self._current_position = None
+        self._invert_buttons = invert_buttons

-        self._workaround = workaround.get_device_mapping(value)
+        self._workaround = workaround.get_device_mapping(values.primary)
        if self._workaround:
            _LOGGER.debug("Using workaround %s", self._workaround)
        self.update_properties()

-    @property
-    def dependent_value_ids(self):
-        """List of value IDs a device depends on."""
-        if not self._node.is_ready:
-            return None
-        return [self._current_position_id]
-
    def update_properties(self):
        """Callback on data changes for node values."""
        # Position value
-        if not self._node.is_ready:
-            if self._current_position_id is None:
-                self._current_position_id = self.get_value(
-                    class_id=zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL,
-                    label=['Level'], member='value_id')
-            if self._open_id is None:
-                self._open_id = self.get_value(
-                    class_id=zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL,
-                    label=['Open', 'Up'], member='value_id')
-            if self._close_id is None:
-                self._close_id = self.get_value(
-                    class_id=zwave.const.COMMAND_CLASS_SWITCH_MULTILEVEL,
-                    label=['Close', 'Down'], member='value_id')
-        if self._open_id and self._close_id and \
-                self._workaround == workaround.WORKAROUND_REVERSE_OPEN_CLOSE:
-            self._open_id, self._close_id = self._close_id, self._open_id
-            self._workaround = None
-        self._current_position = self._node.get_dimmer_level(
-            self._current_position_id)
+        self._current_position = self.values.primary.data
+
+        if self.values.open and self.values.close and \
+                self._open_id is None and self._close_id is None:
+            if self._invert_buttons:
+                self._open_id = self.values.close.value_id
+                self._close_id = self.values.open.value_id
+            else:
+                self._open_id = self.values.open.value_id
+                self._close_id = self.values.close.value_id

    @property
    def is_closed(self):
@@ -112,7 +98,7 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):

    def set_cover_position(self, position, **kwargs):
        """Move the roller shutter to a specific position."""
-        self._node.set_dimmer(self._value.value_id, position)
+        self.node.set_dimmer(self.values.primary.value_id, position)

    def stop_cover(self, **kwargs):
        """Stop the roller shutter."""
@@ -122,14 +108,14 @@ class ZwaveRollershutter(zwave.ZWaveDeviceEntity, CoverDevice):
 class ZwaveGarageDoor(zwave.ZWaveDeviceEntity, CoverDevice):
    """Representation of an Zwave garage door device."""

-    def __init__(self, value):
+    def __init__(self, values):
        """Initialize the zwave garage door."""
-        ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+        ZWaveDeviceEntity.__init__(self, values, DOMAIN)
        self.update_properties()

    def update_properties(self):
        """Callback on data changes for node values."""
-        self._state = self._value.data
+        self._state = self.values.primary.data

    @property
    def is_closed(self):
@@ -138,11 +124,11 @@ class ZwaveGarageDoor(zwave.ZWaveDeviceEntity, CoverDevice):

    def close_cover(self):
        """Close the garage door."""
-        self._value.data = False
+        self.values.primary.data = False

    def open_cover(self):
        """Open the garage door."""
-        self._value.data = True
+        self.values.primary.data = True

    @property
    def device_class(self):
@@ -553,7 +553,6 @@ class Device(Entity):
        # bytes like 00 get truncates to 0, API needs full bytes
        oui = '{:02x}:{:02x}:{:02x}'.format(*[int(b, 16) for b in oui_bytes])
        url = 'http://api.macvendors.com/' + oui
-        resp = None
        try:
            websession = async_get_clientsession(self.hass)

@@ -570,13 +569,9 @@ class Device(Entity):
            # in the 'known_devices.yaml' file which only happens
            # the first time the device is seen.
            return 'unknown'
-        except (asyncio.TimeoutError, aiohttp.errors.ClientError,
-                aiohttp.errors.ClientDisconnectedError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            # same as above
            return 'unknown'
-        finally:
-            if resp is not None:
-                yield from resp.release()

    @asyncio.coroutine
    def async_added_to_hass(self):
@@ -15,7 +15,7 @@ from homeassistant.components.device_tracker import (
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.util import Throttle

-REQUIREMENTS = ['fritzconnection==0.6']
+REQUIREMENTS = ['fritzconnection==0.6.3']

 # Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
@@ -18,6 +18,7 @@ from homeassistant.components.device_tracker import (  # NOQA
 _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['http']
+URL = '/api/locative'


 def setup_scanner(hass, config, see, discovery_info=None):
@@ -30,7 +31,7 @@ def setup_scanner(hass, config, see, discovery_info=None):
 class LocativeView(HomeAssistantView):
    """View to handle locative requests."""

-    url = '/api/locative'
+    url = URL
    name = 'api:locative'

    def __init__(self, see):
@@ -14,6 +14,7 @@ import requests
 import voluptuous as vol

 import homeassistant.helpers.config_validation as cv
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.components.device_tracker import (
    DOMAIN, PLATFORM_SCHEMA, DeviceScanner)
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
@@ -31,6 +32,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })


+class InvalidLuciTokenError(HomeAssistantError):
+    """When an invalid token is detected."""
+
+    pass
+
+
 def get_scanner(hass, config):
    """Validate the configuration and return a Luci scanner."""
    scanner = LuciDeviceScanner(config[DOMAIN])
@@ -46,8 +53,9 @@ class LuciDeviceScanner(DeviceScanner):

    def __init__(self, config):
        """Initialize the scanner."""
-        host = config[CONF_HOST]
-        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]

        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")

@@ -55,12 +63,15 @@ class LuciDeviceScanner(DeviceScanner):

        self.last_results = {}

-        self.token = _get_token(host, username, password)
-        self.host = host
+        self.refresh_token()

        self.mac2name = None
        self.success_init = self.token is not None

+    def refresh_token(self):
+        """Get a new token."""
+        self.token = _get_token(self.host, self.username, self.password)
+
    def scan_devices(self):
        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
@@ -98,8 +109,15 @@ class LuciDeviceScanner(DeviceScanner):
            _LOGGER.info('Checking ARP')

            url = 'http://{}/cgi-bin/luci/rpc/sys'.format(self.host)
-            result = _req_json_rpc(url, 'net.arptable',
-                                   params={'auth': self.token})
+
+            try:
+                result = _req_json_rpc(url, 'net.arptable',
+                                       params={'auth': self.token})
+            except InvalidLuciTokenError:
+                _LOGGER.info('Refreshing token')
+                self.refresh_token()
+                return False
+
            if result:
                self.last_results = []
                for device_entry in result:
@@ -116,6 +134,7 @@ class LuciDeviceScanner(DeviceScanner):
 def _req_json_rpc(url, method, *args, **kwargs):
    """Perform one JSON RPC operation."""
    data = json.dumps({'method': method, 'params': args})
+
    try:
        res = requests.post(url, data=data, timeout=5, **kwargs)
    except requests.exceptions.Timeout:
@@ -139,6 +158,10 @@ def _req_json_rpc(url, method, *args, **kwargs):
            "Failed to authenticate, "
            "please check your username and password")
        return
+    elif res.status_code == 403:
+        _LOGGER.error('Luci responded with a 403 Invalid token')
+        raise InvalidLuciTokenError
+
    else:
        _LOGGER.error('Invalid response from luci: %s', res)

@@ -16,11 +16,11 @@ _LOGGER = logging.getLogger(__name__)

 def setup_scanner(hass, config, see, discovery_info=None):
    """Setup the MySensors tracker."""
-    def mysensors_callback(gateway, node_id):
+    def mysensors_callback(gateway, msg):
        """Callback for mysensors platform."""
-        node = gateway.sensors[node_id]
+        node = gateway.sensors[msg.node_id]
        if node.sketch_name is None:
-            _LOGGER.info('No sketch_name: node %s', node_id)
+            _LOGGER.info('No sketch_name: node %s', msg.node_id)
            return

        pres = gateway.const.Presentation
@@ -37,12 +37,12 @@ def setup_scanner(hass, config, see, discovery_info=None):
                              'latitude,longitude,altitude', position)
                continue
            name = '{} {} {}'.format(
-                node.sketch_name, node_id, child.id)
+                node.sketch_name, msg.node_id, child.id)
            attr = {
                mysensors.ATTR_CHILD_ID: child.id,
                mysensors.ATTR_DESCRIPTION: child.description,
                mysensors.ATTR_DEVICE: gateway.device,
-                mysensors.ATTR_NODE_ID: node_id,
+                mysensors.ATTR_NODE_ID: msg.node_id,
            }
            see(
                dev_id=slugify(name),
@@ -19,7 +19,7 @@ from homeassistant.util import Throttle

 _LOGGER = logging.getLogger(__name__)

-REQUIREMENTS = ['pysnmp==4.3.4']
+REQUIREMENTS = ['pysnmp==4.3.5']

 CONF_COMMUNITY = 'community'
 CONF_AUTHKEY = 'authkey'
@@ -125,7 +125,10 @@ class SnmpScanner(DeviceScanner):

        for resrow in restable:
            for _, val in resrow:
-                mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                try:
+                    mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                except AttributeError:
+                    continue
                _LOGGER.debug("Found MAC %s", mac)
                mac = ':'.join([mac[i:i+2] for i in range(0, len(mac), 2)])
                devices.append({'mac': mac})
@@ -105,8 +105,6 @@ class TadoDeviceScanner(DeviceScanner):
        _LOGGER.debug("Requesting Tado")

        last_results = []
-        response = None
-        tado_json = None

        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
@@ -127,14 +125,10 @@ class TadoDeviceScanner(DeviceScanner):

                tado_json = yield from response.json()

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Cannot load Tado data")
            return False

-        finally:
-            if response is not None:
-                yield from response.release()
-
        # Without a home_id, we fetched an URL where the mobile devices can be
        # found under the mobileDevices key.
        if 'mobileDevices' in tado_json:
@@ -101,7 +101,6 @@ class UPCDeviceScanner(DeviceScanner):
    @asyncio.coroutine
    def async_login(self):
        """Login into firmware and get first token."""
-        response = None
        try:
            # get first token
            with async_timeout.timeout(10, loop=self.hass.loop):
@@ -109,7 +108,8 @@ class UPCDeviceScanner(DeviceScanner):
                    "http://{}/common_page/login.html".format(self.host)
                )

-            yield from response.text()
+                yield from response.text()
+
            self.token = response.cookies['sessionToken'].value

            # login
@@ -119,18 +119,12 @@ class UPCDeviceScanner(DeviceScanner):
            })

            # successfull?
-            if data is not None:
-                return True
-            return False
+            return data is not None

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Can not load login page from %s", self.host)
            return False

-        finally:
-            if response is not None:
-                yield from response.release()
-
    @asyncio.coroutine
    def _async_ws_function(self, function, additional_form=None):
        """Execute a command on UPC firmware webservice."""
@@ -142,8 +136,7 @@ class UPCDeviceScanner(DeviceScanner):
        if additional_form:
            form_data.update(additional_form)

-        redirects = True if function != CMD_DEVICES else False
-        response = None
+        redirects = function != CMD_DEVICES
        try:
            with async_timeout.timeout(10, loop=self.hass.loop):
                response = yield from self.websession.post(
@@ -163,10 +156,6 @@ class UPCDeviceScanner(DeviceScanner):
                self.token = response.cookies['sessionToken'].value
                return (yield from response.text())

-        except (asyncio.TimeoutError, aiohttp.errors.ClientError):
+        except (asyncio.TimeoutError, aiohttp.ClientError):
            _LOGGER.error("Error on %s", function)
            self.token = None
-
-        finally:
-            if response is not None:
-                yield from response.release()
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.util import Throttle
 import homeassistant.helpers.config_validation as cv

-REQUIREMENTS = ['python-digitalocean==1.10.1']
+REQUIREMENTS = ['python-digitalocean==1.11']

 _LOGGER = logging.getLogger(__name__)

@@ -18,7 +18,7 @@ from homeassistant.util import Throttle

 REQUIREMENTS = [
    'https://github.com/nkgilley/python-ecobee-api/archive/'
-    '4856a704670c53afe1882178a89c209b5f98533d.zip#python-ecobee==0.0.6']
+    'a4496b293956b2eac285305136a62ac78bef510d.zip#python-ecobee==0.0.7']

 _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)
@@ -218,7 +218,7 @@ def async_setup(hass, config: dict):
            if not fan.should_poll:
                continue

-            update_coro = hass.loop.create_task(
+            update_coro = hass.async_add_job(
                fan.async_update_ha_state(True))
            if hasattr(fan, 'async_update'):
                update_tasks.append(update_coro)
@@ -153,7 +153,7 @@ def setup(hass, config):
        sw_path = "service_worker.js"

    hass.http.register_static_path("/service_worker.js",
-                                   os.path.join(STATIC_PATH, sw_path), 0)
+                                   os.path.join(STATIC_PATH, sw_path), False)
    hass.http.register_static_path("/robots.txt",
                                   os.path.join(STATIC_PATH, "robots.txt"))
    hass.http.register_static_path("/static", STATIC_PATH)
@@ -63,7 +63,7 @@
      window.Polymer = {
        lazyRegister: true,
        useNativeCSSProperties: true,
-        dom: 'shady',
+        dom: 'shadow',
        suppressTemplateNotifications: true,
        suppressBindingNotifications: true,
      };
@@ -2,19 +2,19 @@

 FINGERPRINTS = {
    "compatibility.js": "83d9c77748dafa9db49ae77d7f3d8fb0",
-    "core.js": "1f7f88d8f5dada08bce1d935cfa5f33e",
-    "frontend.html": "418f6ef8354ce71f1b9594ee2068ebef",
-    "mdi.html": "65413cdf82f822bd6480e577852f0292",
+    "core.js": "5d08475f03adb5969bd31855d5ca0cfd",
+    "frontend.html": "feaf3e9453eca239f29eb10e7645a84f",
+    "mdi.html": "989f02c51eba561dc32b9ecc628a84b3",
    "micromarkdown-js.html": "93b5ec4016f0bba585521cf4d18dec1a",
-    "panels/ha-panel-config.html": "412b3e24515ffa1ee8074ce974cf4057",
-    "panels/ha-panel-dev-event.html": "91347dedf3b4fa9b49ccf4c0a28a03c4",
+    "panels/ha-panel-config.html": "6dcb246cd356307a638f81c4f89bf9b3",
+    "panels/ha-panel-dev-event.html": "1f169700c2345785855b1d7919d12326",
    "panels/ha-panel-dev-info.html": "61610e015a411cfc84edd2c4d489e71d",
-    "panels/ha-panel-dev-service.html": "153aad076f98bbd626466bac50986874",
-    "panels/ha-panel-dev-state.html": "90f3bede9602241552ef7bb7958198c6",
-    "panels/ha-panel-dev-template.html": "c249a4fc18a3a6994de3d6330cfe6cbb",
-    "panels/ha-panel-history.html": "fdaa4d2402d49d4c8bd64a1708ab7a50",
+    "panels/ha-panel-dev-service.html": "0fe8e6acdccf2dc3d1ae657b2c7f2df0",
+    "panels/ha-panel-dev-state.html": "48d37db4a1d6708314ded1d624d0f4d4",
+    "panels/ha-panel-dev-template.html": "6f353392d68574fbc5af188bca44d0ae",
+    "panels/ha-panel-history.html": "6945cebe5d8075aae560d2c4246b063f",
    "panels/ha-panel-iframe.html": "d920f0aa3c903680f2f8795e2255daab",
-    "panels/ha-panel-logbook.html": "2af1feb30b37427f481d5437a438a3f2",
-    "panels/ha-panel-map.html": "e10704a3469e44d1714eac9ed8e4b6a0",
+    "panels/ha-panel-logbook.html": "a1fc2b5d739bedb9d87e4da4cd929a71",
+    "panels/ha-panel-map.html": "e3c7a54f90dd4269d7e53cdcd96514c6",
    "websocket_test.html": "575de64b431fe11c3785bf96d7813450"
 }
@@ -0,0 +1,272 @@
+"""
+Exposes regular rest commands as services.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/hassio/
+"""
+import asyncio
+import logging
+import os
+
+import aiohttp
+from aiohttp import web
+from aiohttp.web_exceptions import HTTPBadGateway
+import async_timeout
+import voluptuous as vol
+
+from homeassistant.config import load_yaml_config_file
+from homeassistant.components.http import HomeAssistantView
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+
+DOMAIN = 'hassio'
+DEPENDENCIES = ['http']
+
+_LOGGER = logging.getLogger(__name__)
+
+LONG_TASK_TIMEOUT = 900
+DEFAULT_TIMEOUT = 10
+
+SERVICE_HOST_SHUTDOWN = 'host_shutdown'
+SERVICE_HOST_REBOOT = 'host_reboot'
+
+SERVICE_HOST_UPDATE = 'host_update'
+SERVICE_SUPERVISOR_UPDATE = 'supervisor_update'
+SERVICE_HOMEASSISTANT_UPDATE = 'homeassistant_update'
+
+SERVICE_ADDON_INSTALL = 'addon_install'
+SERVICE_ADDON_UNINSTALL = 'addon_uninstall'
+SERVICE_ADDON_UPDATE = 'addon_update'
+SERVICE_ADDON_START = 'addon_start'
+SERVICE_ADDON_STOP = 'addon_stop'
+
+ATTR_ADDON = 'addon'
+ATTR_VERSION = 'version'
+
+
+SCHEMA_SERVICE_UPDATE = vol.Schema({
+    vol.Optional(ATTR_VERSION): cv.string,
+})
+
+SCHEMA_SERVICE_ADDONS = vol.Schema({
+    vol.Required(ATTR_ADDON): cv.slug,
+})
+
+SCHEMA_SERVICE_ADDONS_VERSION = SCHEMA_SERVICE_ADDONS.extend({
+    vol.Optional(ATTR_VERSION): cv.string,
+})
+
+
+SERVICE_MAP = {
+    SERVICE_HOST_SHUTDOWN: None,
+    SERVICE_HOST_REBOOT: None,
+    SERVICE_HOST_UPDATE: SCHEMA_SERVICE_UPDATE,
+    SERVICE_SUPERVISOR_UPDATE: SCHEMA_SERVICE_UPDATE,
+    SERVICE_HOMEASSISTANT_UPDATE: SCHEMA_SERVICE_UPDATE,
+    SERVICE_ADDON_INSTALL: SCHEMA_SERVICE_ADDONS_VERSION,
+    SERVICE_ADDON_UNINSTALL: SCHEMA_SERVICE_ADDONS,
+    SERVICE_ADDON_START: SCHEMA_SERVICE_ADDONS,
+    SERVICE_ADDON_STOP: SCHEMA_SERVICE_ADDONS,
+    SERVICE_ADDON_UPDATE: SCHEMA_SERVICE_ADDONS_VERSION,
+}
+
+
+@asyncio.coroutine
+def async_setup(hass, config):
+    """Setup the hassio component."""
+    try:
+        host = os.environ['HASSIO']
+    except KeyError:
+        _LOGGER.error("No HassIO supervisor detect!")
+        return False
+
+    websession = async_get_clientsession(hass)
+    hassio = HassIO(hass.loop, websession, host)
+
+    api_ok = yield from hassio.is_connected()
+    if not api_ok:
+        _LOGGER.error("Not connected with HassIO!")
+        return False
+
+    # register base api views
+    for base in ('host', 'homeassistant'):
+        hass.http.register_view(HassIOBaseView(hassio, base))
+    for base in ('supervisor', 'network'):
+        hass.http.register_view(HassIOBaseEditView(hassio, base))
+
+    # register view for addons
+    hass.http.register_view(HassIOAddonsView(hassio))
+
+    @asyncio.coroutine
+    def async_service_handler(service):
+        """Handle HassIO service calls."""
+        addon = service.data.get(ATTR_ADDON)
+        if ATTR_VERSION in service.data:
+            version = {ATTR_VERSION: service.data[ATTR_VERSION]}
+        else:
+            version = None
+
+        # map to api call
+        if service.service == SERVICE_HOST_UPDATE:
+            yield from hassio.send_command(
+                "/host/update", payload=version)
+        elif service.service == SERVICE_HOST_REBOOT:
+            yield from hassio.send_command("/host/reboot")
+        elif service.service == SERVICE_HOST_SHUTDOWN:
+            yield from hassio.send_command("/host/shutdown")
+        elif service.service == SERVICE_SUPERVISOR_UPDATE:
+            yield from hassio.send_command(
+                "/supervisor/update", payload=version)
+        elif service.service == SERVICE_HOMEASSISTANT_UPDATE:
+            yield from hassio.send_command(
+                "/homeassistant/update", payload=version,
+                timeout=LONG_TASK_TIMEOUT)
+        elif service.service == SERVICE_ADDON_INSTALL:
+            yield from hassio.send_command(
+                "/addons/{}/install".format(addon), payload=version,
+                timeout=LONG_TASK_TIMEOUT)
+        elif service.service == SERVICE_ADDON_UNINSTALL:
+            yield from hassio.send_command(
+                "/addons/{}/uninstall".format(addon))
+        elif service.service == SERVICE_ADDON_START:
+            yield from hassio.send_command("/addons/{}/start".format(addon))
+        elif service.service == SERVICE_ADDON_STOP:
+            yield from hassio.send_command("/addons/{}/stop".format(addon))
+        elif service.service == SERVICE_ADDON_UPDATE:
+            yield from hassio.send_command(
+                "/addons/{}/update".format(addon), payload=version,
+                timeout=LONG_TASK_TIMEOUT)
+
+    descriptions = yield from hass.loop.run_in_executor(
+        None, load_yaml_config_file, os.path.join(
+            os.path.dirname(__file__), 'services.yaml'))
+
+    for service, schema in SERVICE_MAP.items():
+        hass.services.async_register(
+            DOMAIN, service, async_service_handler,
+            descriptions[DOMAIN][service], schema=schema)
+
+    return True
+
+
+class HassIO(object):
+    """Small API wrapper for HassIO."""
+
+    def __init__(self, loop, websession, ip):
+        """Initialze HassIO api."""
+        self.loop = loop
+        self.websession = websession
+        self._ip = ip
+
+    def is_connected(self):
+        """Return True if it connected to HassIO supervisor.
+
+        Return a coroutine.
+        """
+        return self.send_command("/supervisor/ping")
+
+    @asyncio.coroutine
+    def send_command(self, cmd, payload=None, timeout=DEFAULT_TIMEOUT):
+        """Send request to API."""
+        answer = yield from self.send_raw(cmd, payload=payload)
+        if answer['result'] == 'ok':
+            return answer['data'] if answer['data'] else True
+
+        _LOGGER.error("%s return error %s.", cmd, answer['message'])
+        return False
+
+    @asyncio.coroutine
+    def send_raw(self, cmd, payload=None, timeout=DEFAULT_TIMEOUT):
+        """Send raw request to API."""
+        try:
+            with async_timeout.timeout(timeout, loop=self.loop):
+                request = yield from self.websession.get(
+                    "http://{}{}".format(self._ip, cmd),
+                    timeout=None, json=payload
+                )
+
+                if request.status != 200:
+                    _LOGGER.error("%s return code %d.", cmd, request.status)
+                    return
+
+                return (yield from request.json())
+
+        except asyncio.TimeoutError:
+            _LOGGER.error("Timeout on api request %s.", cmd)
+
+        except aiohttp.ClientError:
+            _LOGGER.error("Client error on api request %s.", cmd)
+
+
+class HassIOBaseView(HomeAssistantView):
+    """HassIO view to handle base part."""
+
+    requires_auth = True
+
+    def __init__(self, hassio, base):
+        """Initialize a hassio base view."""
+        self.hassio = hassio
+        self._url_info = "/{}/info".format(base)
+
+        self.url = "/api/hassio/{}".format(base)
+        self.name = "api:hassio:{}".format(base)
+
+    @asyncio.coroutine
+    def get(self, request):
+        """Get base data."""
+        data = yield from self.hassio.send_command(self._url_info)
+        if not data:
+            raise HTTPBadGateway()
+        return web.json_response(data)
+
+
+class HassIOBaseEditView(HassIOBaseView):
+    """HassIO view to handle base with options support."""
+
+    def __init__(self, hassio, base):
+        """Initialize a hassio base edit view."""
+        super().__init__(hassio, base)
+        self._url_options = "/{}/options".format(base)
+
+    @asyncio.coroutine
+    def post(self, request):
+        """Set options on host."""
+        data = yield from request.json()
+
+        response = yield from self.hassio.send_raw(
+            self._url_options, payload=data)
+        if not response:
+            raise HTTPBadGateway()
+        return web.json_response(response)
+
+
+class HassIOAddonsView(HomeAssistantView):
+    """HassIO view to handle addons part."""
+
+    requires_auth = True
+    url = "/api/hassio/addons/{addon}"
+    name = "api:hassio:addons"
+
+    def __init__(self, hassio):
+        """Initialize a hassio addon view."""
+        self.hassio = hassio
+
+    @asyncio.coroutine
+    def get(self, request, addon):
+        """Get addon data."""
+        data = yield from self.hassio.send_command(
+            "/addons/{}/info".format(addon))
+        if not data:
+            raise HTTPBadGateway()
+        return web.json_response(data)
+
+    @asyncio.coroutine
+    def post(self, request, addon):
+        """Set options on host."""
+        data = yield from request.json()
+
+        response = yield from self.hassio.send_raw(
+            "/addons/{}/options".format(addon), payload=data)
+        if not response:
+            raise HTTPBadGateway()
+        return web.json_response(response)
@@ -22,7 +22,7 @@ from homeassistant.helpers.event import track_time_interval
 from homeassistant.config import load_yaml_config_file

 DOMAIN = 'homematic'
-REQUIREMENTS = ["pyhomematic==0.1.22"]
+REQUIREMENTS = ["pyhomematic==0.1.24"]

 SCAN_INTERVAL_HUB = timedelta(seconds=300)
 SCAN_INTERVAL_VARIABLES = timedelta(seconds=30)
@@ -82,7 +82,12 @@ HM_ATTRIBUTE_SUPPORT = {
    'RSSI_DEVICE': ['rssi', {}],
    'VALVE_STATE': ['valve', {}],
    'BATTERY_STATE': ['battery', {}],
-    'CONTROL_MODE': ['mode', {0: 'Auto', 1: 'Manual', 2: 'Away', 3: 'Boost'}],
+    'CONTROL_MODE': ['mode', {0: 'Auto',
+                              1: 'Manual',
+                              2: 'Away',
+                              3: 'Boost',
+                              4: 'Comfort',
+                              5: 'Lowering'}],
    'POWER': ['power', {}],
    'CURRENT': ['current', {}],
    'VOLTAGE': ['voltage', {}],
@@ -9,7 +9,6 @@ import json
 import logging
 import ssl
 from ipaddress import ip_network
-from pathlib import Path

 import os
 import voluptuous as vol
@@ -31,11 +30,13 @@ from .const import (
    KEY_USE_X_FORWARDED_FOR, KEY_TRUSTED_NETWORKS,
    KEY_BANS_ENABLED, KEY_LOGIN_THRESHOLD,
    KEY_DEVELOPMENT, KEY_AUTHENTICATED)
-from .static import FILE_SENDER, CACHING_FILE_SENDER, staticresource_middleware
+from .static import (
+    staticresource_middleware, CachingFileResponse, CachingStaticResource)
 from .util import get_real_ip

+REQUIREMENTS = ['aiohttp_cors==0.5.2']
+
 DOMAIN = 'http'
-REQUIREMENTS = ('aiohttp_cors==0.5.0',)

 CONF_API_PASSWORD = 'api_password'
 CONF_SERVER_HOST = 'server_host'
@@ -187,7 +188,7 @@ class HomeAssistantWSGI(object):
        if is_ban_enabled:
            middlewares.insert(0, ban_middleware)

-        self.app = web.Application(middlewares=middlewares, loop=hass.loop)
+        self.app = web.Application(middlewares=middlewares)
        self.app['hass'] = hass
        self.app[KEY_USE_X_FORWARDED_FOR] = use_x_forwarded_for
        self.app[KEY_TRUSTED_NETWORKS] = trusted_networks
@@ -255,31 +256,39 @@ class HomeAssistantWSGI(object):

        self.app.router.add_route('GET', url, redirect)

-    def register_static_path(self, url_root, path, cache_length=31):
-        """Register a folder to serve as a static path.
-
-        Specify optional cache length of asset in days.
-        """
+    def register_static_path(self, url_path, path, cache_headers=True):
+        """Register a folder or file to serve as a static path."""
        if os.path.isdir(path):
-            self.app.router.add_static(url_root, path)
+            if cache_headers:
+                resource = CachingStaticResource
+            else:
+                resource = web.StaticResource
+
+            self.app.router.register_resource(resource(url_path, path))
            return

-        filepath = Path(path)
-
-        @asyncio.coroutine
-        def serve_file(request):
-            """Serve file from disk."""
-            res = yield from CACHING_FILE_SENDER.send(request, filepath)
-            return res
+        if cache_headers:
+            @asyncio.coroutine
+            def serve_file(request):
+                """Serve file from disk."""
+                return CachingFileResponse(path)
+        else:
+            @asyncio.coroutine
+            def serve_file(request):
+                """Serve file from disk."""
+                return web.FileResponse(path)

        # aiohttp supports regex matching for variables. Using that as temp
        # to work around cache busting MD5.
        # Turns something like /static/dev-panel.html into
        # /static/{filename:dev-panel(-[a-z0-9]{32}|)\.html}
-        base, ext = url_root.rsplit('.', 1)
-        base, file = base.rsplit('/', 1)
-        regex = r"{}(-[a-z0-9]{{32}}|)\.{}".format(file, ext)
-        url_pattern = "{}/{{filename:{}}}".format(base, regex)
+        base, ext = os.path.splitext(url_path)
+        if ext:
+            base, file = base.rsplit('/', 1)
+            regex = r"{}(-[a-z0-9]{{32}}|){}".format(file, ext)
+            url_pattern = "{}/{{filename:{}}}".format(base, regex)
+        else:
+            url_pattern = url_path

        self.app.router.add_route('GET', url_pattern, serve_file)

@@ -318,7 +327,7 @@ class HomeAssistantWSGI(object):
        # re-register all redirects, views, static paths.
        self.app._frozen = True  # pylint: disable=protected-access

-        self._handler = self.app.make_handler()
+        self._handler = self.app.make_handler(loop=self.hass.loop)

        try:
            self.server = yield from self.hass.loop.create_server(
@@ -365,8 +374,7 @@ class HomeAssistantView(object):
    def file(self, request, fil):
        """Return a file."""
        assert isinstance(fil, str), 'only string paths allowed'
-        response = yield from FILE_SENDER.send(request, Path(fil))
-        return response
+        return web.FileResponse(fil)

    def register(self, router):
        """Register the view with a router."""
--- a/Show More
+++ b/Show More