Merge pull request #2381 from home-assistant/dev

0.23
Version bump to 0.23.0
2026-01-02 20:14:30 +01:00 · 2016-07-01 00:58:11 -07:00 · 2016-07-01 00:57:55 -07:00 · 2016-06-30 16:35:20 -07:00 · 2016-07-01 00:17:04 +02:00 · 2016-07-01 00:01:16 +02:00
674 changed files with 51444 additions and 20049 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,11 +5,24 @@ omit =
    homeassistant/__main__.py

    # omit pieces of code that rely on external devices being present
-    homeassistant/components/alarm_control_panel/alarmdotcom.py
+    homeassistant/components/apcupsd.py
+    homeassistant/components/*/apcupsd.py

    homeassistant/components/arduino.py
    homeassistant/components/*/arduino.py

+    homeassistant/components/bloomsky.py
+    homeassistant/components/*/bloomsky.py
+
+    homeassistant/components/dweet.py
+    homeassistant/components/*/dweet.py
+
+    homeassistant/components/ecobee.py
+    homeassistant/components/*/ecobee.py
+
+    homeassistant/components/envisalink.py
+    homeassistant/components/*/envisalink.py
+
    homeassistant/components/insteon_hub.py
    homeassistant/components/*/insteon_hub.py

@@ -19,19 +32,43 @@ omit =
    homeassistant/components/modbus.py
    homeassistant/components/*/modbus.py

-    homeassistant/components/*/tellstick.py
+    homeassistant/components/mysensors.py
+    homeassistant/components/*/mysensors.py
+
+    homeassistant/components/nest.py
+    homeassistant/components/*/nest.py
+
+    homeassistant/components/octoprint.py
+    homeassistant/components/*/octoprint.py
+
+    homeassistant/components/qwikswitch.py
+    homeassistant/components/*/qwikswitch.py
+
+    homeassistant/components/rpi_gpio.py
+    homeassistant/components/*/rpi_gpio.py
+
+    homeassistant/components/scsgate.py
+    homeassistant/components/*/scsgate.py

    homeassistant/components/tellduslive.py
    homeassistant/components/*/tellduslive.py

-    homeassistant/components/*/vera.py
+    homeassistant/components/tellstick.py
+    homeassistant/components/*/tellstick.py

-    homeassistant/components/ecobee.py
-    homeassistant/components/*/ecobee.py
+    homeassistant/components/*/thinkingcleaner.py
+
+    homeassistant/components/vera.py
+    homeassistant/components/*/vera.py

    homeassistant/components/verisure.py
    homeassistant/components/*/verisure.py

+    homeassistant/components/*/webostv.py
+
+    homeassistant/components/wemo.py
+    homeassistant/components/*/wemo.py
+
    homeassistant/components/wink.py
    homeassistant/components/*/wink.py

@@ -41,25 +78,30 @@ omit =
    homeassistant/components/zwave.py
    homeassistant/components/*/zwave.py

-    homeassistant/components/rfxtrx.py
-    homeassistant/components/*/rfxtrx.py
+    homeassistant/components/enocean.py
+    homeassistant/components/*/enocean.py

-    homeassistant/components/mysensors.py
-    homeassistant/components/*/mysensors.py
+    homeassistant/components/netatmo.py
+    homeassistant/components/*/netatmo.py

-    homeassistant/components/nest.py
-    homeassistant/components/*/nest.py
-
-    homeassistant/components/rpi_gpio.py
-    homeassistant/components/*/rpi_gpio.py
+    homeassistant/components/homematic.py
+    homeassistant/components/*/homematic.py

+    homeassistant/components/alarm_control_panel/alarmdotcom.py
+    homeassistant/components/alarm_control_panel/nx584.py
    homeassistant/components/binary_sensor/arest.py
    homeassistant/components/binary_sensor/rest.py
    homeassistant/components/browser.py
-    homeassistant/components/camera/*
+    homeassistant/components/camera/bloomsky.py
+    homeassistant/components/camera/foscam.py
+    homeassistant/components/camera/generic.py
+    homeassistant/components/camera/mjpeg.py
+    homeassistant/components/camera/rpi_camera.py
    homeassistant/components/device_tracker/actiontec.py
    homeassistant/components/device_tracker/aruba.py
    homeassistant/components/device_tracker/asuswrt.py
+    homeassistant/components/device_tracker/bluetooth_tracker.py
+    homeassistant/components/device_tracker/bt_home_hub_5.py
    homeassistant/components/device_tracker/ddwrt.py
    homeassistant/components/device_tracker/fritz.py
    homeassistant/components/device_tracker/icloud.py
@@ -73,51 +115,91 @@ omit =
    homeassistant/components/device_tracker/ubus.py
    homeassistant/components/discovery.py
    homeassistant/components/downloader.py
+    homeassistant/components/feedreader.py
+    homeassistant/components/garage_door/wink.py
+    homeassistant/components/garage_door/rpi_gpio.py
+    homeassistant/components/hdmi_cec.py
    homeassistant/components/ifttt.py
-    homeassistant/components/statsd.py
-    homeassistant/components/influxdb.py
    homeassistant/components/keyboard.py
    homeassistant/components/light/blinksticklight.py
    homeassistant/components/light/hue.py
    homeassistant/components/light/hyperion.py
    homeassistant/components/light/lifx.py
    homeassistant/components/light/limitlessled.py
+    homeassistant/components/light/osramlightify.py
+    homeassistant/components/lirc.py
+    homeassistant/components/media_player/braviatv.py
    homeassistant/components/media_player/cast.py
+    homeassistant/components/media_player/cmus.py
    homeassistant/components/media_player/denon.py
    homeassistant/components/media_player/firetv.py
+    homeassistant/components/media_player/gpmdp.py
    homeassistant/components/media_player/itunes.py
    homeassistant/components/media_player/kodi.py
+    homeassistant/components/media_player/lg_netcast.py
    homeassistant/components/media_player/mpd.py
+    homeassistant/components/media_player/onkyo.py
+    homeassistant/components/media_player/panasonic_viera.py
+    homeassistant/components/media_player/pandora.py
+    homeassistant/components/media_player/pioneer.py
    homeassistant/components/media_player/plex.py
+    homeassistant/components/media_player/roku.py
+    homeassistant/components/media_player/samsungtv.py
+    homeassistant/components/media_player/snapcast.py
    homeassistant/components/media_player/sonos.py
    homeassistant/components/media_player/squeezebox.py
+    homeassistant/components/media_player/yamaha.py
+    homeassistant/components/notify/aws_lambda.py
+    homeassistant/components/notify/aws_sns.py
+    homeassistant/components/notify/aws_sqs.py
    homeassistant/components/notify/free_mobile.py
+    homeassistant/components/notify/gntp.py
+    homeassistant/components/notify/googlevoice.py
    homeassistant/components/notify/instapush.py
+    homeassistant/components/notify/message_bird.py
    homeassistant/components/notify/nma.py
    homeassistant/components/notify/pushbullet.py
    homeassistant/components/notify/pushetta.py
    homeassistant/components/notify/pushover.py
+    homeassistant/components/notify/rest.py
+    homeassistant/components/notify/sendgrid.py
    homeassistant/components/notify/slack.py
    homeassistant/components/notify/smtp.py
    homeassistant/components/notify/syslog.py
    homeassistant/components/notify/telegram.py
+    homeassistant/components/notify/twilio_sms.py
    homeassistant/components/notify/twitter.py
    homeassistant/components/notify/xmpp.py
-    homeassistant/components/notify/googlevoice.py
+    homeassistant/components/scene/hunterdouglas_powerview.py
    homeassistant/components/sensor/arest.py
    homeassistant/components/sensor/bitcoin.py
    homeassistant/components/sensor/cpuspeed.py
+    homeassistant/components/sensor/deutsche_bahn.py
    homeassistant/components/sensor/dht.py
-    homeassistant/components/sensor/dweet.py
+    homeassistant/components/sensor/dte_energy_bridge.py
    homeassistant/components/sensor/efergy.py
    homeassistant/components/sensor/eliqonline.py
+    homeassistant/components/sensor/fitbit.py
+    homeassistant/components/sensor/fixer.py
    homeassistant/components/sensor/forecast.py
    homeassistant/components/sensor/glances.py
-    homeassistant/components/sensor/netatmo.py
+    homeassistant/components/sensor/google_travel_time.py
+    homeassistant/components/sensor/gtfs.py
+    homeassistant/components/sensor/lastfm.py
+    homeassistant/components/sensor/loopenergy.py
+    homeassistant/components/sensor/neurio_energy.py
+    homeassistant/components/sensor/nzbget.py
    homeassistant/components/sensor/onewire.py
    homeassistant/components/sensor/openweathermap.py
+    homeassistant/components/sensor/openexchangerates.py
+    homeassistant/components/sensor/plex.py
    homeassistant/components/sensor/rest.py
    homeassistant/components/sensor/sabnzbd.py
+    homeassistant/components/sensor/snmp.py
+    homeassistant/components/sensor/speedtest.py
+    homeassistant/components/sensor/steam_online.py
+    homeassistant/components/sensor/supervisord.py
+    homeassistant/components/sensor/swiss_hydrological_data.py
    homeassistant/components/sensor/swiss_public_transport.py
    homeassistant/components/sensor/systemmonitor.py
    homeassistant/components/sensor/temper.py
@@ -125,20 +207,28 @@ omit =
    homeassistant/components/sensor/torque.py
    homeassistant/components/sensor/transmission.py
    homeassistant/components/sensor/twitch.py
+    homeassistant/components/sensor/uber.py
    homeassistant/components/sensor/worldclock.py
+    homeassistant/components/switch/acer_projector.py
    homeassistant/components/switch/arest.py
+    homeassistant/components/switch/dlink.py
    homeassistant/components/switch/edimax.py
    homeassistant/components/switch/hikvisioncam.py
    homeassistant/components/switch/mystrom.py
+    homeassistant/components/switch/netio.py
    homeassistant/components/switch/orvibo.py
+    homeassistant/components/switch/pulseaudio_loopback.py
    homeassistant/components/switch/rest.py
+    homeassistant/components/switch/rpi_rf.py
    homeassistant/components/switch/transmission.py
-    homeassistant/components/switch/wemo.py
+    homeassistant/components/switch/wake_on_lan.py
+    homeassistant/components/thermostat/eq3btsmart.py
    homeassistant/components/thermostat/heatmiser.py
    homeassistant/components/thermostat/homematic.py
-    homeassistant/components/thermostat/honeywell.py
    homeassistant/components/thermostat/proliphix.py
    homeassistant/components/thermostat/radiotherm.py
+    homeassistant/components/upnp.py
+    homeassistant/components/zeroconf.py


 [report]
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+Make sure you are running the latest version of Home Assistant before reporting an issue.
+
+You should only file an issue if you found a bug. Feature and enhancement requests should go in [the Feature Requests section](https://community.home-assistant.io/c/feature-requests) of our community forum:
+
+**Home Assistant release (`hass --version`):**
+
+
+**Python release (`python3 --version`):**
+
+
+**Component/platform:**
+
+
+**Description of problem:**
+
+
+**Expected:**
+
+
+**Problem-relevant `configuration.yaml` entries and steps to reproduce:**
+```yaml
+
+```
+
+1. 
+2. 
+3. 
+
+**Traceback (if applicable):**
+```bash
+
+```
+
+**Additional info:**
+
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,33 @@
+**Description:**
+
+
+**Related issue (if applicable):** fixes #
+
+**Pull request in [home-assistant.io](https://github.com/home-assistant/home-assistant.io) with documentation (if applicable):** home-assistant/home-assistant.io#
+
+**Example entry for `configuration.yaml` (if applicable):**
+```yaml
+
+```
+
+**Checklist:**
+
+If user exposed functionality or configuration variables are added/changed:
+  - [ ] Documentation added/updated in [home-assistant.io](https://github.com/home-assistant/home-assistant.io)
+
+If code communicates with devices:
+  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
+  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
+  - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
+  - [ ] New dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.
+  - [ ] New files were added to `.coveragerc`.
+
+If the code does not interact with devices:
+  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
+  - [ ] Tests have been added to verify that the new code works.
+
+[fork]: http://stackoverflow.com/a/7244456
+[squash]: https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit
+[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L16
+[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L51
+
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 config/*
 !config/home-assistant.conf.default
-homeassistant/components/frontend/www_static/polymer/bower_components/*

 # There is not a better solution afaik..
 !config/custom_components
@@ -9,6 +8,7 @@ config/custom_components/*
 !config/custom_components/hello_world.py
 !config/custom_components/mqtt_example.py

+tests/config/deps
 tests/config/home-assistant.log

 # Hide sublime text stuff
@@ -78,7 +78,15 @@ nosetests.xml
 pyvenv.cfg
 pip-selfcheck.json
 venv
+.venv

 # vimmy stuff
 *.swp
 *.swo
+
+ctags.tmp
+
+# vagrant stuff
+virtualization/vagrant/setup_done
+virtualization/vagrant/.vagrant
+virtualization/vagrant/config
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "homeassistant/components/frontend/www_static/home-assistant-polymer"]
 	path = homeassistant/components/frontend/www_static/home-assistant-polymer
-	url = https://github.com/balloob/home-assistant-polymer.git
+	url = https://github.com/home-assistant/home-assistant-polymer.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 sudo: false
-language: python
+matrix:
+  fast_finish: true
+  include:
+    - python: "3.4"
+      env: TOXENV=py34
+    - python: "3.4"
+      env: TOXENV=requirements
+    - python: "3.5"
+      env: TOXENV=lint
+    - python: "3.5"
+      env: TOXENV=py35
 cache:
  directories:
    - $HOME/.cache/pip
-    # - "$HOME/virtualenv/python$TRAVIS_PYTHON_VERSION"
-python:
-  - 3.4
-  - 3.5
-install:
-  - "true"
-script:
-  - script/cibuild
-matrix:
-  fast_finish: true
+install: pip install -U tox coveralls
+language: python
+script: tox
+after_success: coveralls
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,10 +4,10 @@ Everybody is invited and welcome to contribute to Home Assistant. There is a lot

 The process is straight-forward.

- - Fork the Home Assistant [git repository](https://github.com/balloob/home-assistant).
+ - Fork the Home Assistant [git repository](https://github.com/home-assistant/home-assistant).
 - Write the code for your device, notification service, sensor, or IoT thing.
- - Check it with ``pylint`` and ``flake8``.
- - Create a Pull Request against the [**dev**](https://github.com/balloob/home-assistant/tree/dev) branch of Home Assistant.
+ - Ensure tests work.
+ - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.

 Still interested? Then you should read the next sections and get more details. 

@@ -17,22 +17,23 @@ For help on building your component, please see the [developer documentation](ht

 After you finish adding support for your device:

+ - Check that all dependencies are included via the `REQUIREMENTS` variable in your platform/component and only imported inside functions that use them.
 - Add any new dependencies to `requirements_all.txt` if needed. Use `script/gen_requirements_all.py`.
- - Update the `.coveragerc` file to exclude your platform if there are no tests available.
- - Provide some documentation for [home-assistant.io](https://home-assistant.io/). It's OK to just add a docstring with configuration details (sample entry for `configuration.yaml` file and alike) to the file header as a start. Visit the [website documentation](https://home-assistant.io/developers/website/) for further information on contributing to [home-assistant.io](https://github.com/balloob/home-assistant.io).
- - Make sure all your code passes ``pylint`` and ``flake8`` (PEP8 and some more) validation. To check your repository, run `./script/lint`.
- - Create a Pull Request against the [**dev**](https://github.com/balloob/home-assistant/tree/dev) branch of Home Assistant.
- - Check for comments and suggestions on your Pull Request and keep an eye on the [Travis output](https://travis-ci.org/balloob/home-assistant/).
+ - Update the `.coveragerc` file to exclude your platform if there are no tests available or your new code uses a 3rd party library for communication with the device/service/sensor.
+ - Provide some documentation for [home-assistant.io](https://home-assistant.io/). It's OK to just add a docstring with configuration details (sample entry for `configuration.yaml` file and alike) to the file header as a start. Visit the [website documentation](https://home-assistant.io/developers/website/) for further information on contributing to [home-assistant.io](https://github.com/home-assistant/home-assistant.io).
+ - Make sure all your code passes ``pylint`` and ``flake8`` (PEP8 and some more) validation. To check your repository, run `tox` or `script/lint`.
+ - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.
+ - Check for comments and suggestions on your Pull Request and keep an eye on the [CI output](https://travis-ci.org/home-assistant/home-assistant/).

 If you add a platform for an existing component, there is usually no need for updating the frontend. Only if you've added a new component that should show up in the frontend, there are more steps needed:

- - Update the file [`home-assistant-icons.html`](https://github.com/balloob/home-assistant/blob/master/homeassistant/components/frontend/www_static/polymer/resources/home-assistant-icons.html) with an icon for your domain ([pick one from this list](https://www.polymer-project.org/1.0/components/core-elements/demo.html#core-icon)).
+ - Update the file [`home-assistant-icons.html`](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/www_static/polymer/resources/home-assistant-icons.html) with an icon for your domain ([pick one from this list](https://www.polymer-project.org/1.0/components/core-elements/demo.html#core-icon)).
 - Update the demo component with two states that it provides.
 - Add your component to `home-assistant.conf.example`.

 Since you've updated `home-assistant-icons.html`, you've made changes to the frontend:

- - Run `build_frontend`. This will build a new version of the frontend. Make sure you add the changed files `frontend.py` and `frontend.html` to the commit.
+ - Run `script/build_frontend`. This will build a new version of the frontend. Make sure you add the changed files `frontend.py` and `frontend.html` to the commit.

 ### Setting states

@@ -45,11 +46,11 @@ A state can have several attributes that will help the frontend in displaying yo
 - `unit_of_measurement`: this will be appended to the state in the interface
 - `hidden`: This is a suggestion to the frontend on if the state should be hidden

-These attributes are defined in [homeassistant.components](https://github.com/balloob/home-assistant/blob/master/homeassistant/components/__init__.py#L25).
+These attributes are defined in [homeassistant.components](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/__init__.py#L25).

 ### Proper Visibility Handling

-Generally, when creating a new entity for Home Assistant you will want it to be a class that inherits the [homeassistant.helpers.entity.Entity](https://github.com/balloob/home-assistant/blob/master/homeassistant/helpers/entity.py) class. If this is done, visibility will be handled for you. 
+Generally, when creating a new entity for Home Assistant you will want it to be a class that inherits the [homeassistant.helpers.entity.Entity](https://github.com/home-assistant/home-assistant/blob/master/homeassistant/helpers/entity.py) class. If this is done, visibility will be handled for you. 
 You can set a suggestion for your entity's visibility by setting the hidden property by doing something similar to the following.

 ```python
@@ -66,6 +67,21 @@ The frontend is composed of [Polymer](https://www.polymer-project.org) web-compo

 When you are done with development and ready to commit your changes, run `build_frontend`, set `development=0` in your config and validate that everything still works.

+## Testing your code
+
+To test your code before submission, used the `tox` tool.
+
+```bash
+> pip install -U tox
+> tox
+```
+
+This will run unit tests against python 3.4 and 3.5 (if both are available locally), as well as run a set of tests which validate `pep8` and `pylint` style of the code.
+
+You can optionally run tests on only one tox target using the `-e` option to select an environment.
+
+For instance `tox -e lint` will run the linters only, `tox -e py34` will run unit tests only on python 3.4.
+
 ### Notes on PyLint and PEP8 validation

 In case a PyLint warning cannot be avoided, add a comment to disable the PyLint check for that line. This can be done using the format `# pylint: disable=YOUR-ERROR-NAME`. Example of an unavoidable PyLint warning is if you do not use the passed in datetime if you're listening for time change.
--- a/17
+++ b/17
@@ -6,20 +6,21 @@ VOLUME /config
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

-# For the nmap tracker
+RUN pip3 install --no-cache-dir colorlog cython
+
+# For the nmap tracker, bluetooth tracker, Z-Wave
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends nmap net-tools && \
+    apt-get install -y --no-install-recommends nmap net-tools cython3 libudev-dev sudo libglib2.0-dev && \
    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 COPY script/build_python_openzwave script/build_python_openzwave
-RUN apt-get update && \
-   apt-get install -y cython3 libudev-dev && \
-   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-   pip3 install "cython<0.23" && \
-   script/build_python_openzwave
+RUN script/build_python_openzwave && \
+  mkdir -p /usr/local/share/python-openzwave && \
+  ln -sf /usr/src/app/build/python-openzwave/openzwave/config /usr/local/share/python-openzwave/config

 COPY requirements_all.txt requirements_all.txt
-RUN pip3 install --no-cache-dir -r requirements_all.txt
+# certifi breaks Debian based installs
+RUN pip3 install --no-cache-dir -r requirements_all.txt && pip3 uninstall -y certifi

 # Copy source
 COPY . .
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/balloob/home-assistant|
-===========================================================================================================
+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
@@ -80,19 +80,21 @@ Built home automation on top of your devices:

 The system is built modular so support for other devices or actions can
 be implemented easily. See also the `section on
-architecture <https://home-assistant.io/developers/architecture.html>`__
+architecture <https://home-assistant.io/developers/architecture/>`__
 and the `section on creating your own
-components <https://home-assistant.io/developers/creating_components.html>`__.
+components <https://home-assistant.io/developers/creating_components/>`__.

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

-.. |Build Status| image:: https://travis-ci.org/balloob/home-assistant.svg?branch=master
-   :target: https://travis-ci.org/balloob/home-assistant
-.. |Coverage Status| image:: https://img.shields.io/coveralls/balloob/home-assistant.svg
-   :target: https://coveralls.io/r/balloob/home-assistant?branch=master
-.. |Join the chat at https://gitter.im/balloob/home-assistant| image:: https://badges.gitter.im/Join%20Chat.svg
-   :target: https://gitter.im/balloob/home-assistant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-.. |screenshot-states| image:: https://raw.github.com/balloob/home-assistant/master/docs/screenshots.png
+.. |Build Status| image:: https://travis-ci.org/home-assistant/home-assistant.svg?branch=master
+   :target: https://travis-ci.org/home-assistant/home-assistant
+.. |Coverage Status| image:: https://img.shields.io/coveralls/home-assistant/home-assistant.svg
+   :target: https://coveralls.io/r/home-assistant/home-assistant?branch=master
+.. |Join the chat at https://gitter.im/home-assistant/home-assistant| image:: https://img.shields.io/badge/gitter-general-blue.svg
+   :target: https://gitter.im/home-assistant/home-assistant?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. |Join the dev chat at https://gitter.im/home-assistant/home-assistant/devs| image:: https://img.shields.io/badge/gitter-development-yellowgreen.svg
+   :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/
--- a/config/configuration.yaml.example
+++ b/config/configuration.yaml.example
@@ -1,13 +1,13 @@
 homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.net
+  # Omitted values in this section will be auto detected using freegeoip.io

  # Location required to calculate the time the sun rises and sets.  
-  # Cooridinates are also used for location for weather related components. 
-  # Google Maps can be used to determine more precise GPS cooridinates.
+  # 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

-  # C for Celcius, F for Fahrenheit
+  # C for Celsius, F for Fahrenheit
  temperature_unit: C

  # Pick yours from here:
@@ -22,6 +22,9 @@ http:
  # Set to 1 to enable development mode
  # development: 1

+frontend:
+# enable the frontend
+
 light:
 #  platform: hue

--- a/config/custom_components/example.py
+++ b/config/custom_components/example.py
@@ -1,6 +1,5 @@
 """
-custom_components.example
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Example of a custom component.

 Example component to target an entity_id to:
 - turn it on at 7AM in the morning
@@ -37,21 +36,21 @@ 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
+# 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
+# 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 targetting
+# Configuration key for the entity id we are targeting.
 CONF_TARGET = 'target'

-# Variable for storing configuration parameters
+# Variable for storing configuration parameters.
 TARGET_ID = None

-# Name of the service that we expose
+# Name of the service that we expose.
 SERVICE_FLASH = 'flash'

 # Shortcut for the logger
@@ -59,16 +58,16 @@ _LOGGER = logging.getLogger(__name__)


 def setup(hass, config):
-    """ Setup example component. """
+    """Setup example component."""
    global TARGET_ID

-    # Validate that all required config options are given
+    # 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
+    # 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)
@@ -78,13 +77,13 @@ def setup(hass, config):
        TARGET_ID = None
        return False

-    # Tell the bootstrapper that we initialized successfully
+    # 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. """
+    """Called when the group.all devices change state."""
    # If the target id is not set, return
    if not TARGET_ID:
        return
@@ -94,7 +93,7 @@ def track_devices(hass, entity_id, old_state, new_state):

        core.turn_on(hass, TARGET_ID)

-    # If all people leave the house and the entity is on, turn it off
+    # 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)
@@ -102,9 +101,10 @@ def track_devices(hass, entity_id, old_state, new_state):

@track_time_change(hour=7, minute=0, second=0)
 def wake_up(hass, now):
-    """
-    Turn it on in the morning (7 AM) if there are people home and
-    it is not already on.
+    """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
@@ -116,7 +116,7 @@ def wake_up(hass, now):

@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 all lights turn off, turn off."""
    if not TARGET_ID:
        return

@@ -127,8 +127,9 @@ def all_lights_off(hass, entity_id, old_state, new_state):

@service(DOMAIN, SERVICE_FLASH)
 def flash_service(hass, call):
-    """
-    Service that will turn the target off for 10 seconds if on and vice versa.
+    """Service that will toggle the target.
+
+    Set the light to off for 10 seconds if on and vice versa.
    """
    if not TARGET_ID:
        return
--- a/config/custom_components/hello_world.py
+++ b/config/custom_components/hello_world.py
@@ -1,7 +1,7 @@
 """
-custom_components.hello_world
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Implements the bare minimum that a component should implement.
+The "hello world" custom component.
+
+This component implements the bare minimum that a component should implement.

 Configuration:

@@ -11,18 +11,17 @@ configuration.yaml file.
 hello_world:
 """

-# The domain of your component. Should be equal to the name of your component
+# 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
+# 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
+    """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 successful
+    # Return boolean to indicate that initialization was successfully.
    return True
--- a/config/custom_components/mqtt_example.py
+++ b/config/custom_components/mqtt_example.py
@@ -1,6 +1,6 @@
 """
-custom_components.mqtt_example
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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.

@@ -14,46 +14,42 @@ 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
-
+  topic: "home-assistant/mqtt_example"
 """
 import homeassistant.loader as loader

-# The domain of your component. Should be equal to the name of your component
+# 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
+# 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 our mqtt_example component. """
+    """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
-
+    # Listen to a message on MQTT.
    def message_received(topic, payload, qos):
-        """ A new MQTT message has been received. """
+        """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
-
+    # Service to publish a message on MQTT.
    def set_state_service(call):
-        """ Service to send a message. """
+        """Service to send a message."""
        mqtt.publish(hass, topic, call.data.get('new_state'))

-    # Register our service with Home Assistant
+    # Register our service with Home Assistant.
    hass.services.register(DOMAIN, 'set_state', set_state_service)

-    # return boolean to indicate that initialization was successful
+    # Return boolean to indicate that initialization was successfully.
    return True
--- a/docs/screenshots.png
+++ b/docs/screenshots.png
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -0,0 +1,567 @@
+swagger: '2.0'
+info:
+  title: Home Assistant
+  description: Home Assistant REST API
+  version: "1.0.0"
+# the domain of the service
+host: localhost:8123
+
+# array of all schemes that your API supports
+schemes:
+  - http
+  - https
+
+securityDefinitions:
+  api_key:
+    type: apiKey
+    description: API password
+    name: api_password
+    in: query
+  
+  # api_key:
+  #  type: apiKey
+  #  description: API password
+  #  name: x-ha-access
+  #  in: header
+
+# will be prefixed to all paths
+basePath: /api
+
+consumes:
+  - application/json
+produces:
+  - application/json
+paths:
+  /:
+    get:
+      summary: API alive message
+      description: Returns message if API is up and running.
+      tags:
+        - Core
+      responses:
+        200:
+          description: API is up and running
+          schema:
+            $ref: '#/definitions/Message'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /config:
+    get:
+      summary: API alive message
+      description: Returns the current configuration as JSON.
+      tags:
+        - Core
+      responses:
+        200:
+          description: Current configuration
+          schema:
+            $ref: '#/definitions/ApiConfig'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /discovery_info:
+    get:
+      summary: Basic information about Home Assistant instance
+      tags:
+        - Core
+      responses:
+        200:
+          description: Basic information
+          schema:
+            $ref: '#/definitions/DiscoveryInfo'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /bootstrap:
+    get:
+      summary: Returns all data needed to bootstrap Home Assistant.
+      tags:
+        - Core
+      responses:
+        200:
+          description: Bootstrap information
+          schema:
+            $ref: '#/definitions/BootstrapInfo'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /events:
+    get:
+      summary: Array of event objects.
+      description: Returns an array of event objects. Each event object contain event name and listener count.
+      tags:
+        - Events
+      responses:
+        200:
+          description: Events
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Event'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /services:
+    get:
+      summary: Array of service objects.
+      description: Returns an array of service objects. Each object contains the domain and which services it contains.
+      tags:
+        - Services
+      responses:
+        200:
+          description: Services
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Service'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /history:
+    get:
+      summary: Array of state changes in the past.
+      description: Returns an array of state changes in the past. Each object contains further detail for the entities.
+      tags:
+        - State
+      responses:
+        200:
+          description: State changes
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/History'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /states:
+    get:
+      summary: Array of state objects.
+      description: |
+        Returns an array of state objects. Each state has the following attributes: entity_id, state, last_changed and attributes.
+      tags:
+        - State
+      responses:
+        200:
+          description: States
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/State'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /states/{entity_id}:
+    get:
+      summary: Specific state object.
+      description: |
+        Returns a state object for specified entity_id.
+      tags:
+        - State
+      parameters:
+      - name: entity_id
+        in: path
+        description: entity_id of the entity to query
+        required: true
+        type: string
+      responses:
+        200:
+          description: State
+          schema:
+            $ref: '#/definitions/State'
+        404:
+          description: Not found
+          schema:
+            $ref: '#/definitions/Message'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+    post:
+      description: |
+        Updates or creates the current state of an entity.
+      tags:
+        - State
+      consumes:
+        - application/json
+      parameters:
+      - name: entity_id
+        in: path
+        description: entity_id to set the state of
+        required: true
+        type: string
+      - $ref: '#/parameters/State'
+      responses:
+        200:
+          description: State of existing entity was set
+          schema:
+            $ref: '#/definitions/State'
+        201:
+          description: State of new entity was set
+          schema:
+            $ref: '#/definitions/State'
+          headers:
+            location:
+              type: string
+              description: location of the new entity
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /error_log:
+    get:
+      summary: Error log
+      description: |
+        Retrieve all errors logged during the current session of Home Assistant as a plaintext response.
+      tags:
+        - Core
+      produces:
+        - text/plain
+      responses:
+        200:
+          description: Plain text error log
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /camera_proxy/camera.{entity_id}:
+    get:
+      summary: Camera image.
+      description: |
+        Returns the data (image) from the specified camera entity_id.
+      tags:
+        - Camera
+      produces:
+        - image/jpeg
+      parameters:
+      - name: entity_id
+        in: path
+        description: entity_id of the camera to query
+        required: true
+        type: string
+      responses:
+        200:
+          description: Camera image
+          schema:
+            type: file
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /events/{event_type}:
+    post:
+      description: |
+        Fires an event with event_type
+      tags:
+        - Events
+      consumes:
+        - application/json
+      parameters:
+      - name: event_type
+        in: path
+        description: event_type to fire event with
+        required: true
+        type: string
+      - $ref: '#/parameters/EventData'
+      responses:
+        200:
+          description: Response message
+          schema:
+            $ref: '#/definitions/Message'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /services/{domain}/{service}:
+    post:
+      description: |
+        Calls a service within a specific domain. Will return when the service has been executed or 10 seconds has past, whichever comes first.
+      tags:
+        - Services
+      consumes:
+        - application/json
+      parameters:
+      - name: domain
+        in: path
+        description: domain of the service
+        required: true
+        type: string
+      - name: service
+        in: path
+        description: service to call
+        required: true
+        type: string
+      - $ref: '#/parameters/ServiceData'
+      responses:
+        200:
+          description: List of states that have changed while the service was being executed. The result will include any changed states that changed while the service was being executed, even if their change was the result of something else happening in the system.
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/State'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /template:
+    post:
+      description: |
+        Render a Home Assistant template.
+      tags:
+        - Template
+      consumes:
+        - application/json
+      produces:
+        - text/plain
+      parameters:
+      - $ref: '#/parameters/Template'
+      responses:
+        200:
+          description: Returns the rendered template in plain text.
+          schema:
+            type: string
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /event_forwarding:
+    post:
+      description: |
+        Setup event forwarding to another Home Assistant instance.
+      tags:
+        - Core
+      consumes:
+        - application/json
+      parameters:
+      - $ref: '#/parameters/EventForwarding'
+      responses:
+        200:
+          description: It will return a message if event forwarding was setup successful.
+          schema:
+            $ref: '#/definitions/Message'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+    delete:
+      description: |
+        Cancel event forwarding to another Home Assistant instance.
+      tags:
+        - Core
+      consumes:
+        - application/json
+      parameters:
+      - $ref: '#/parameters/EventForwarding'
+      responses:
+        200:
+          description: It will return a message if event forwarding was cancelled successful.
+          schema:
+            $ref: '#/definitions/Message'
+        default:
+          description: Error
+          schema:
+            $ref: '#/definitions/Message'
+  /stream:
+    get:
+      summary: Server-sent events
+      description: The server-sent events feature is a one-way channel from your Home Assistant server to a client which is acting as a consumer.
+      tags:
+        - Core
+        - Events
+      produces:
+        - text/event-stream
+      parameters:
+        - name: restrict
+          in: query
+          description: comma-separated list of event_types to filter
+          required: false
+          type: string
+      responses:
+        default:
+          description: Stream of events
+          schema:
+            type: object
+            x-events:
+              state_changed:
+                type: object
+                properties:
+                  entity_id:
+                    type: string
+                  old_state:
+                    $ref: '#/definitions/State'
+                  new_state:
+                    $ref: '#/definitions/State'
+definitions:
+  ApiConfig:
+    type: object
+    properties:
+      components:
+        type: array
+        description: List of component types
+        items:
+          type: string
+          description: Component type
+      latitude:
+        type: number
+        format: float
+        description: Latitude of Home Assistant server
+      longitude:
+        type: number
+        format: float
+        description: Longitude of Home Assistant server
+      location_name:
+        type: string
+      temperature_unit:
+        type: string
+      time_zone:
+        type: string
+      version:
+        type: string
+  DiscoveryInfo:
+    type: object
+    properties:
+      base_url:
+        type: string
+      location_name:
+        type: string
+      requires_api_password:
+        type: boolean
+      version:
+        type: string
+  BootstrapInfo:
+    type: object
+    properties:
+      config:
+        $ref: '#/definitions/ApiConfig'
+      events:
+        type: array
+        items:
+          $ref: '#/definitions/Event'
+      services:
+        type: array
+        items:
+          $ref: '#/definitions/Service'
+      states:
+        type: array
+        items:
+          $ref: '#/definitions/State'
+  Event:
+    type: object
+    properties:
+      event:
+        type: string
+      listener_count:
+        type: integer
+  Service:
+    type: object
+    properties:
+      domain:
+        type: string
+      services:
+        type: object
+        additionalProperties:
+          $ref: '#/definitions/DomainService'
+  DomainService:
+    type: object
+    properties:
+      description:
+        type: string
+      fields:
+        type: object
+        description: Object with service fields that can be called
+  State:
+    type: object
+    properties:
+      attributes:
+        $ref: '#/definitions/StateAttributes'
+      state:
+        type: string
+      entity_id:
+        type: string
+      last_changed:
+        type: string
+        format: date-time
+  StateAttributes:
+    type: object
+    additionalProperties:
+      type: string
+  History:
+    allOf:
+    - $ref: '#/definitions/State'
+    - type: object
+      properties:
+        last_updated:
+            type: string
+            format: date-time
+  Message:
+    type: object
+    properties:
+      message:
+        type: string
+parameters:
+  State:
+    name: body
+    in: body
+    description: State parameter
+    required: false
+    schema:
+      type: object
+      required:
+      - state
+      properties:
+        attributes:
+          $ref: '#/definitions/StateAttributes'
+        state:
+          type: string
+  EventData:
+    name: body
+    in: body
+    description: event_data
+    required: false
+    schema:
+      type: object
+  ServiceData:
+    name: body
+    in: body
+    description: service_data
+    required: false
+    schema:
+      type: object
+  Template:
+    name: body
+    in: body
+    description: Template to render
+    required: true
+    schema:
+      type: object
+      required:
+      - template
+      properties:
+        template:
+          description: Jinja2 template string
+          type: string
+  EventForwarding:
+    name: body
+    in: body
+    description: Event Forwarding parameter
+    required: true
+    schema:
+      type: object
+      required:
+      - host
+      - api_password
+      properties:
+        host:
+          type: string
+        api_password:
+          type: string
+        port:
+          type: integer
--- a/homeassistant/init.py
+++ b/homeassistant/init.py
@@ -0,0 +1 @@
+"""Init file for Home Assistant."""
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -1,28 +1,37 @@
-""" Starts home assistant. """
+"""Starts home assistant."""
 from __future__ import print_function

-import sys
-import os
 import argparse
+import os
+import platform
+import subprocess
+import sys
+import threading
+import time

-from homeassistant import bootstrap
-import homeassistant.config as config_util
-from homeassistant.const import __version__, EVENT_HOMEASSISTANT_START
+from homeassistant.const import (
+    __version__,
+    EVENT_HOMEASSISTANT_START,
+    REQUIRED_PYTHON_VER,
+    RESTART_EXIT_CODE,
+)


 def validate_python():
-    """ Validate we're running the right Python version. """
+    """Validate we're running the right Python version."""
    major, minor = sys.version_info[:2]
+    req_major, req_minor = REQUIRED_PYTHON_VER

-    if major < 3 or (major == 3 and minor < 4):
-        print("Home Assistant requires atleast Python 3.4")
+    if major < req_major or (major == req_major and minor < req_minor):
+        print("Home Assistant requires at least Python {}.{}".format(
+            req_major, req_minor))
        sys.exit(1)


 def ensure_config_path(config_dir):
-    """ Validates configuration directory. """
-
-    lib_dir = os.path.join(config_dir, 'lib')
+    """Validate the configuration directory."""
+    import homeassistant.config as config_util
+    lib_dir = os.path.join(config_dir, 'deps')

    # Test if configuration directory exists
    if not os.path.isdir(config_dir):
@@ -49,7 +58,8 @@ def ensure_config_path(config_dir):


 def ensure_config_file(config_dir):
-    """ Ensure configuration file exists. """
+    """Ensure configuration file exists."""
+    import homeassistant.config as config_util
    config_path = config_util.ensure_config_exists(config_dir)

    if config_path is None:
@@ -60,7 +70,8 @@ def ensure_config_file(config_dir):


 def get_arguments():
-    """ Get parsed passed in arguments. """
+    """Get parsed passed in arguments."""
+    import homeassistant.config as config_util
    parser = argparse.ArgumentParser(
        description="Home Assistant: Observe, Control, Automate.")
    parser.add_argument('--version', action='version', version=__version__)
@@ -73,6 +84,10 @@ def get_arguments():
        '--demo-mode',
        action='store_true',
        help='Start Home Assistant in demo mode')
+    parser.add_argument(
+        '--debug',
+        action='store_true',
+        help='Start Home Assistant in debug mode')
    parser.add_argument(
        '--open-ui',
        action='store_true',
@@ -107,44 +122,61 @@ def get_arguments():
        '--restart-osx',
        action='store_true',
        help='Restarts on OS X.')
-    if os.name != "nt":
+    parser.add_argument(
+        '--runner',
+        action='store_true',
+        help='On restart exit with code {}'.format(RESTART_EXIT_CODE))
+    if os.name == "posix":
        parser.add_argument(
            '--daemon',
            action='store_true',
            help='Run Home Assistant as daemon')

    arguments = parser.parse_args()
-    if os.name == "nt":
+    if os.name != "posix" or arguments.debug or arguments.runner:
        arguments.daemon = False
+
    return arguments


 def daemonize():
-    """ Move current process to daemon process """
-    # create first fork
+    """Move current process to daemon process."""
+    # Create first fork
    pid = os.fork()
    if pid > 0:
        sys.exit(0)

-    # decouple fork
+    # Decouple fork
    os.setsid()
-    os.umask(0)

-    # create second fork
+    # Create second fork
    pid = os.fork()
    if pid > 0:
        sys.exit(0)

+    # redirect standard file descriptors to devnull
+    infd = open(os.devnull, 'r')
+    outfd = open(os.devnull, 'a+')
+    sys.stdout.flush()
+    sys.stderr.flush()
+    os.dup2(infd.fileno(), sys.stdin.fileno())
+    os.dup2(outfd.fileno(), sys.stdout.fileno())
+    os.dup2(outfd.fileno(), sys.stderr.fileno())
+

 def check_pid(pid_file):
-    """ Check that HA is not already running """
-    # check pid file
+    """Check that HA is not already running."""
+    # Check pid file
    try:
        pid = int(open(pid_file, 'r').readline())
    except IOError:
        # PID File does not exist
        return

+    # If we just restarted, we just found our own pidfile.
+    if pid == os.getpid():
+        return
+
    try:
        os.kill(pid, 0)
    except OSError:
@@ -155,7 +187,7 @@ def check_pid(pid_file):


 def write_pid(pid_file):
-    """ Create PID File """
+    """Create a PID File."""
    pid = os.getpid()
    try:
        open(pid_file, 'w').write(str(pid))
@@ -165,7 +197,7 @@ def write_pid(pid_file):


 def install_osx():
-    """ Setup to run via launchd on OS X """
+    """Setup to run via launchd on OS X."""
    with os.popen('which hass') as inp:
        hass_path = inp.read().strip()

@@ -197,41 +229,53 @@ def install_osx():


 def uninstall_osx():
-    """ Unload from launchd on OS X """
+    """Unload from launchd on OS X."""
    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
    os.popen('launchctl unload ' + path)

    print("Home Assistant has been uninstalled.")


-def main():
-    """ Starts Home Assistant. """
-    validate_python()
+def closefds_osx(min_fd, max_fd):
+    """Make sure file descriptors get closed when we restart.

-    args = get_arguments()
+    We cannot call close on guarded fds, and we cannot easily test which fds
+    are guarded. But we can set the close-on-exec flag on everything we want to
+    get rid of.
+    """
+    from fcntl import fcntl, F_GETFD, F_SETFD, FD_CLOEXEC

-    config_dir = os.path.join(os.getcwd(), args.config)
-    ensure_config_path(config_dir)
+    for _fd in range(min_fd, max_fd):
+        try:
+            val = fcntl(_fd, F_GETFD)
+            if not val & FD_CLOEXEC:
+                fcntl(_fd, F_SETFD, val | FD_CLOEXEC)
+        except IOError:
+            pass

-    # os x launchd functions
-    if args.install_osx:
-        install_osx()
-        return
-    if args.uninstall_osx:
-        uninstall_osx()
-        return
-    if args.restart_osx:
-        uninstall_osx()
-        install_osx()
-        return

-    # daemon functions
-    if args.pid_file:
-        check_pid(args.pid_file)
-    if args.daemon:
-        daemonize()
-    if args.pid_file:
-        write_pid(args.pid_file)
+def cmdline():
+    """Collect path and arguments to re-execute the current hass instance."""
+    if sys.argv[0].endswith('/__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']
+
+
+def setup_and_run_hass(config_dir, args):
+    """Setup HASS and run."""
+    from homeassistant import bootstrap
+
+    # Run a simple daemon runner process on Windows to handle restarts
+    if os.name == 'nt' and '--runner' not in sys.argv:
+        args = cmdline() + ['--runner']
+        while True:
+            try:
+                subprocess.check_call(args)
+                sys.exit(0)
+            except subprocess.CalledProcessError as exc:
+                if exc.returncode != RESTART_EXIT_CODE:
+                    sys.exit(exc.returncode)

    if args.demo_mode:
        config = {
@@ -239,19 +283,21 @@ def main():
            'demo': {}
        }
        hass = bootstrap.from_config_dict(
-            config, config_dir=config_dir, daemon=args.daemon,
-            verbose=args.verbose, skip_pip=args.skip_pip,
-            log_rotate_days=args.log_rotate_days)
+            config, config_dir=config_dir, verbose=args.verbose,
+            skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days)
    else:
        config_file = ensure_config_file(config_dir)
        print('Config directory:', config_dir)
        hass = bootstrap.from_config_file(
-            config_file, daemon=args.daemon, verbose=args.verbose,
-            skip_pip=args.skip_pip, log_rotate_days=args.log_rotate_days)
+            config_file, verbose=args.verbose, skip_pip=args.skip_pip,
+            log_rotate_days=args.log_rotate_days)
+
+    if hass is None:
+        return

    if args.open_ui:
        def open_browser(event):
-            """ Open the webinterface in a browser. """
+            """Open the webinterface in a browser."""
            if hass.config.api is not None:
                import webbrowser
                webbrowser.open(hass.config.api.base_url)
@@ -259,7 +305,90 @@ def main():
        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser)

    hass.start()
-    hass.block_till_stopped()
+    exit_code = int(hass.block_till_stopped())
+
+    return exit_code
+
+
+def try_to_restart():
+    """Attempt to clean up state and start a new homeassistant instance."""
+    # Things should be mostly shut down already at this point, now just try
+    # to clean up things that may have been left behind.
+    sys.stderr.write('Home Assistant attempting to restart.\n')
+
+    # Count remaining threads, ideally there should only be one non-daemonized
+    # thread left (which is us). Nothing we really do with it, but it might be
+    # useful when debugging shutdown/restart issues.
+    try:
+        nthreads = sum(thread.isAlive() and not thread.isDaemon()
+                       for thread in threading.enumerate())
+        if nthreads > 1:
+            sys.stderr.write(
+                "Found {} non-daemonic threads.\n".format(nthreads))
+
+    # Somehow we sometimes seem to trigger an assertion in the python threading
+    # module. It seems we find threads that have no associated OS level thread
+    # which are not marked as stopped at the python level.
+    except AssertionError:
+        sys.stderr.write("Failed to count non-daemonic threads.\n")
+
+    # Try to not leave behind open filedescriptors with the emphasis on try.
+    try:
+        max_fd = os.sysconf("SC_OPEN_MAX")
+    except ValueError:
+        max_fd = 256
+
+    if platform.system() == 'Darwin':
+        closefds_osx(3, max_fd)
+    else:
+        os.closerange(3, max_fd)
+
+    # Now launch into a new instance of Home-Assistant. If this fails we
+    # fall through and exit with error 100 (RESTART_EXIT_CODE) in which case
+    # systemd will restart us when RestartForceExitStatus=100 is set in the
+    # systemd.service file.
+    sys.stderr.write("Restarting Home-Assistant\n")
+    args = cmdline()
+    os.execv(args[0], args)
+
+
+def main():
+    """Start Home Assistant."""
+    validate_python()
+
+    args = get_arguments()
+
+    config_dir = os.path.join(os.getcwd(), args.config)
+    ensure_config_path(config_dir)
+
+    # OS X launchd functions
+    if args.install_osx:
+        install_osx()
+        return 0
+    if args.uninstall_osx:
+        uninstall_osx()
+        return 0
+    if args.restart_osx:
+        uninstall_osx()
+        # A small delay is needed on some systems to let the unload finish.
+        time.sleep(0.5)
+        install_osx()
+        return 0
+
+    # Daemon functions
+    if args.pid_file:
+        check_pid(args.pid_file)
+    if args.daemon:
+        daemonize()
+    if args.pid_file:
+        write_pid(args.pid_file)
+
+    exit_code = setup_and_run_hass(config_dir, args)
+    if exit_code == RESTART_EXIT_CODE and not args.runner:
+        try_to_restart()
+
+    return exit_code
+

 if __name__ == "__main__":
-    main()
+    sys.exit(main())
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -1,47 +1,37 @@
-"""
-homeassistant.bootstrap
-~~~~~~~~~~~~~~~~~~~~~~~
-Provides methods to bootstrap a home assistant instance.
+"""Provides methods to bootstrap a home assistant instance."""

-Each method will return a tuple (bus, statemachine).
-
-After bootstrapping you can add your own components or
-start by calling homeassistant.start_home_assistant(bus)
-"""
-
-from collections import defaultdict
 import logging
 import logging.handlers
 import os
-import shutil
 import sys
+from collections import defaultdict
+from threading import RLock
+
+import voluptuous as vol

-import homeassistant.core as core
-import homeassistant.util.dt as date_util
-import homeassistant.util.package as pkg_util
-import homeassistant.util.location as loc_util
-import homeassistant.config as config_util
-import homeassistant.loader as loader
 import homeassistant.components as core_components
-import homeassistant.components.group as group
-from homeassistant.helpers import event_decorators, service
-from homeassistant.helpers.entity import Entity
-from homeassistant.const import (
-    __version__, EVENT_COMPONENT_LOADED, CONF_LATITUDE, CONF_LONGITUDE,
-    CONF_TEMPERATURE_UNIT, CONF_NAME, CONF_TIME_ZONE, CONF_CUSTOMIZE,
-    TEMP_CELCIUS, TEMP_FAHRENHEIT)
+from homeassistant.components import group, persistent_notification
+import homeassistant.config as conf_util
+import homeassistant.core as core
+import homeassistant.helpers.config_validation as cv
+import homeassistant.loader as loader
+import homeassistant.util.package as pkg_util
+from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import (
+    event_decorators, service, config_per_platform, extract_domain_configs)

 _LOGGER = logging.getLogger(__name__)
+_SETUP_LOCK = RLock()
+_CURRENT_SETUP = []

 ATTR_COMPONENT = 'component'

-PLATFORM_FORMAT = '{}.{}'
 ERROR_LOG_FILENAME = 'home-assistant.log'


 def setup_component(hass, domain, config=None):
-    """ Setup a component and all its dependencies. """
-
+    """Setup a component and all its dependencies."""
    if domain in hass.config.components:
        return True

@@ -64,12 +54,12 @@ def setup_component(hass, domain, config=None):


 def _handle_requirements(hass, component, name):
-    """ Installs requirements for component. """
+    """Install the requirements for a component."""
    if hass.config.skip_pip or not hasattr(component, 'REQUIREMENTS'):
        return True

    for req in component.REQUIREMENTS:
-        if not pkg_util.install_package(req, target=hass.config.path('lib')):
+        if not pkg_util.install_package(req, target=hass.config.path('deps')):
            _LOGGER.error('Not initializing %s because could not install '
                          'dependency %s', name, req)
            return False
@@ -78,51 +68,114 @@ def _handle_requirements(hass, component, name):


 def _setup_component(hass, domain, config):
-    """ Setup a component for Home Assistant. """
+    """Setup a component for Home Assistant."""
+    # pylint: disable=too-many-return-statements,too-many-branches
    if domain in hass.config.components:
        return True
-    component = loader.get_component(domain)

-    missing_deps = [dep for dep in getattr(component, 'DEPENDENCIES', [])
-                    if dep not in hass.config.components]
+    with _SETUP_LOCK:
+        # It might have been loaded while waiting for lock
+        if domain in hass.config.components:
+            return True

-    if missing_deps:
-        _LOGGER.error(
-            'Not initializing %s because not all dependencies loaded: %s',
-            domain, ", ".join(missing_deps))
-        return False
-
-    if not _handle_requirements(hass, component, domain):
-        return False
-
-    try:
-        if not component.setup(hass, config):
-            _LOGGER.error('component %s failed to initialize', domain)
+        if domain in _CURRENT_SETUP:
+            _LOGGER.error('Attempt made to setup %s during setup of %s',
+                          domain, domain)
            return False
-    except Exception:  # pylint: disable=broad-except
-        _LOGGER.exception('Error during setup of component %s', domain)
-        return False

-    hass.config.components.append(component.DOMAIN)
+        component = loader.get_component(domain)
+        missing_deps = [dep for dep in getattr(component, 'DEPENDENCIES', [])
+                        if dep not in hass.config.components]

-    # Assumption: if a component does not depend on groups
-    # it communicates with devices
-    if group.DOMAIN not in getattr(component, 'DEPENDENCIES', []):
-        hass.pool.add_worker()
+        if missing_deps:
+            _LOGGER.error(
+                'Not initializing %s because not all dependencies loaded: %s',
+                domain, ", ".join(missing_deps))
+            return False

-    hass.bus.fire(
-        EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN})
+        if hasattr(component, 'CONFIG_SCHEMA'):
+            try:
+                config = component.CONFIG_SCHEMA(config)
+            except vol.MultipleInvalid as ex:
+                cv.log_exception(_LOGGER, ex, domain, config)
+                return False

-    return True
+        elif hasattr(component, 'PLATFORM_SCHEMA'):
+            platforms = []
+            for p_name, p_config in config_per_platform(config, domain):
+                # Validate component specific platform schema
+                try:
+                    p_validated = component.PLATFORM_SCHEMA(p_config)
+                except vol.MultipleInvalid as ex:
+                    cv.log_exception(_LOGGER, ex, domain, p_config)
+                    return False
+
+                # Not all platform components follow same pattern for platforms
+                # So if p_name is None we are not going to validate platform
+                # (the automation component is one of them)
+                if p_name is None:
+                    platforms.append(p_validated)
+                    continue
+
+                platform = prepare_setup_platform(hass, config, domain,
+                                                  p_name)
+
+                if platform is None:
+                    return False
+
+                # Validate platform specific schema
+                if hasattr(platform, 'PLATFORM_SCHEMA'):
+                    try:
+                        p_validated = platform.PLATFORM_SCHEMA(p_validated)
+                    except vol.MultipleInvalid as ex:
+                        cv.log_exception(_LOGGER, ex, '{}.{}'
+                                         .format(domain, p_name), p_validated)
+                        return False
+
+                platforms.append(p_validated)
+
+            # Create a copy of the configuration with all config for current
+            # component removed and add validated config back in.
+            filter_keys = extract_domain_configs(config, domain)
+            config = {key: value for key, value in config.items()
+                      if key not in filter_keys}
+            config[domain] = platforms
+
+        if not _handle_requirements(hass, component, domain):
+            return False
+
+        _CURRENT_SETUP.append(domain)
+
+        try:
+            if not component.setup(hass, config):
+                _LOGGER.error('component %s failed to initialize', domain)
+                return False
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception('Error during setup of component %s', domain)
+            return False
+        finally:
+            _CURRENT_SETUP.remove(domain)
+
+        hass.config.components.append(component.DOMAIN)
+
+        # Assumption: if a component does not depend on groups
+        # it communicates with devices
+        if group.DOMAIN not in getattr(component, 'DEPENDENCIES', []):
+            hass.pool.add_worker()
+
+        hass.bus.fire(
+            EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN})
+
+        return True


 def prepare_setup_platform(hass, config, domain, platform_name):
-    """ Loads a platform and makes sure dependencies are setup. """
+    """Load a platform and makes sure dependencies are setup."""
    _ensure_loader_prepared(hass)

    platform_path = PLATFORM_FORMAT.format(domain, platform_name)

-    platform = loader.get_component(platform_path)
+    platform = loader.get_platform(domain, platform_name)

    # Not found
    if platform is None:
@@ -148,17 +201,11 @@ def prepare_setup_platform(hass, config, domain, platform_name):
    return platform


-def mount_local_lib_path(config_dir):
-    """ Add local library to Python Path """
-    sys.path.insert(0, os.path.join(config_dir, 'lib'))
-
-
 # pylint: disable=too-many-branches, too-many-statements, too-many-arguments
 def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
-                     verbose=False, daemon=False, skip_pip=False,
+                     verbose=False, skip_pip=False,
                     log_rotate_days=None):
-    """
-    Tries to configure Home Assistant from a config dict.
+    """Try to configure Home Assistant from a config dict.

    Dynamically loads required components and its dependencies.
    """
@@ -167,13 +214,20 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
        if config_dir is not None:
            config_dir = os.path.abspath(config_dir)
            hass.config.config_dir = config_dir
-            mount_local_lib_path(config_dir)
+            _mount_local_lib_path(config_dir)

-    process_ha_config_upgrade(hass)
-    process_ha_core_config(hass, config.get(core.DOMAIN, {}))
+    core_config = config.get(core.DOMAIN, {})
+
+    try:
+        conf_util.process_ha_core_config(hass, core_config)
+    except vol.Invalid as ex:
+        cv.log_exception(_LOGGER, ex, 'homeassistant', core_config)
+        return None
+
+    conf_util.process_ha_config_upgrade(hass)

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

    hass.config.skip_pip = skip_pip
    if skip_pip:
@@ -195,12 +249,13 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
    if not core_components.setup(hass, config):
        _LOGGER.error('Home Assistant core failed to initialize. '
                      'Further initialization aborted.')
-
        return hass

+    persistent_notification.setup(hass, config)
+
    _LOGGER.info('Home Assistant core initialized')

-    # give event decorators access to HASS
+    # Give event decorators access to HASS
    event_decorators.HASS = hass
    service.HASS = hass

@@ -211,11 +266,11 @@ def from_config_dict(config, hass=None, config_dir=None, enable_log=True,
    return hass


-def from_config_file(config_path, hass=None, verbose=False, daemon=False,
-                     skip_pip=True, log_rotate_days=None):
-    """
-    Reads the configuration file and tries to start all the required
-    functionality. Will add functionality to 'hass' parameter if given,
+def from_config_file(config_path, hass=None, verbose=False, skip_pip=True,
+                     log_rotate_days=None):
+    """Read the configuration file and try to start all the functionality.
+
+    Will add functionality to 'hass' parameter if given,
    instantiates a new Home Assistant object if 'hass' is not given.
    """
    if hass is None:
@@ -224,39 +279,40 @@ def from_config_file(config_path, hass=None, verbose=False, daemon=False,
    # Set config dir to directory holding config file
    config_dir = os.path.abspath(os.path.dirname(config_path))
    hass.config.config_dir = config_dir
-    mount_local_lib_path(config_dir)
+    _mount_local_lib_path(config_dir)

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

-    config_dict = config_util.load_yaml_config_file(config_path)
+    try:
+        config_dict = conf_util.load_yaml_config_file(config_path)
+    except HomeAssistantError:
+        return None

    return from_config_dict(config_dict, hass, enable_log=False,
                            skip_pip=skip_pip)


-def enable_logging(hass, verbose=False, daemon=False, log_rotate_days=None):
-    """ Setup the logging for home assistant. """
-    if not daemon:
-        logging.basicConfig(level=logging.INFO)
-        fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
-               "[%(name)s] %(message)s%(reset)s")
-        try:
-            from colorlog import ColoredFormatter
-            logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
-                fmt,
-                datefmt='%y-%m-%d %H:%M:%S',
-                reset=True,
-                log_colors={
-                    'DEBUG': 'cyan',
-                    'INFO': 'green',
-                    'WARNING': 'yellow',
-                    'ERROR': 'red',
-                    'CRITICAL': 'red',
-                }
-            ))
-        except ImportError:
-            _LOGGER.warning(
-                "Colorlog package not found, console coloring disabled")
+def enable_logging(hass, verbose=False, log_rotate_days=None):
+    """Setup the logging."""
+    logging.basicConfig(level=logging.INFO)
+    fmt = ("%(log_color)s%(asctime)s %(levelname)s (%(threadName)s) "
+           "[%(name)s] %(message)s%(reset)s")
+    try:
+        from colorlog import ColoredFormatter
+        logging.getLogger().handlers[0].setFormatter(ColoredFormatter(
+            fmt,
+            datefmt='%y-%m-%d %H:%M:%S',
+            reset=True,
+            log_colors={
+                'DEBUG': 'cyan',
+                'INFO': 'green',
+                'WARNING': 'yellow',
+                'ERROR': 'red',
+                'CRITICAL': 'red',
+            }
+        ))
+    except ImportError:
+        pass

    # Log errors to a file if we have write access to file or config dir
    err_log_path = hass.config.path(ERROR_LOG_FILENAME)
@@ -287,107 +343,12 @@ def enable_logging(hass, verbose=False, daemon=False, log_rotate_days=None):
            'Unable to setup error log %s (access denied)', err_log_path)


-def process_ha_config_upgrade(hass):
-    """ Upgrade config if necessary. """
-    version_path = hass.config.path('.HA_VERSION')
-
-    try:
-        with open(version_path, 'rt') as inp:
-            conf_version = inp.readline().strip()
-    except FileNotFoundError:
-        # Last version to not have this file
-        conf_version = '0.7.7'
-
-    if conf_version == __version__:
-        return
-
-    _LOGGER.info('Upgrading config directory from %s to %s', conf_version,
-                 __version__)
-
-    lib_path = hass.config.path('lib')
-    if os.path.isdir(lib_path):
-        shutil.rmtree(lib_path)
-
-    with open(version_path, 'wt') as outp:
-        outp.write(__version__)
-
-
-def process_ha_core_config(hass, config):
-    """ Processes the [homeassistant] section from the config. """
-    hac = hass.config
-
-    def set_time_zone(time_zone_str):
-        """ Helper method to set time zone in HA. """
-        if time_zone_str is None:
-            return
-
-        time_zone = date_util.get_time_zone(time_zone_str)
-
-        if time_zone:
-            hac.time_zone = time_zone
-            date_util.set_default_time_zone(time_zone)
-        else:
-            _LOGGER.error('Received invalid time zone %s', time_zone_str)
-
-    for key, attr, typ in ((CONF_LATITUDE, 'latitude', float),
-                           (CONF_LONGITUDE, 'longitude', float),
-                           (CONF_NAME, 'location_name', str)):
-        if key in config:
-            try:
-                setattr(hac, attr, typ(config[key]))
-            except ValueError:
-                _LOGGER.error('Received invalid %s value for %s: %s',
-                              typ.__name__, key, attr)
-
-    set_time_zone(config.get(CONF_TIME_ZONE))
-
-    customize = config.get(CONF_CUSTOMIZE)
-
-    if isinstance(customize, dict):
-        for entity_id, attrs in config.get(CONF_CUSTOMIZE, {}).items():
-            if not isinstance(attrs, dict):
-                continue
-            Entity.overwrite_attribute(entity_id, attrs.keys(), attrs.values())
-
-    if CONF_TEMPERATURE_UNIT in config:
-        unit = config[CONF_TEMPERATURE_UNIT]
-
-        if unit == 'C':
-            hac.temperature_unit = TEMP_CELCIUS
-        elif unit == 'F':
-            hac.temperature_unit = TEMP_FAHRENHEIT
-
-    # If we miss some of the needed values, auto detect them
-    if None not in (
-            hac.latitude, hac.longitude, hac.temperature_unit, hac.time_zone):
-        return
-
-    _LOGGER.info('Auto detecting location and temperature unit')
-
-    info = loc_util.detect_location_info()
-
-    if info is None:
-        _LOGGER.error('Could not detect location information')
-        return
-
-    if hac.latitude is None and hac.longitude is None:
-        hac.latitude = info.latitude
-        hac.longitude = info.longitude
-
-    if hac.temperature_unit is None:
-        if info.use_fahrenheit:
-            hac.temperature_unit = TEMP_FAHRENHEIT
-        else:
-            hac.temperature_unit = TEMP_CELCIUS
-
-    if hac.location_name is None:
-        hac.location_name = info.city
-
-    if hac.time_zone is None:
-        set_time_zone(info.time_zone)
-
-
 def _ensure_loader_prepared(hass):
-    """ Ensure Home Assistant loader is prepared. """
+    """Ensure Home Assistant loader is prepared."""
    if not loader.PREPARED:
        loader.prepare(hass)
+
+
+def _mount_local_lib_path(config_dir):
+    """Add local library to Python Path."""
+    sys.path.insert(0, os.path.join(config_dir, 'deps'))
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -1,16 +1,11 @@
 """
-homeassistant.components
-~~~~~~~~~~~~~~~~~~~~~~~~
 This package contains components that can be plugged into Home Assistant.

 Component design guidelines:
-
-Each component defines a constant DOMAIN that is equal to its filename.
-
-Each component that tracks states should create state entity names in the
-format "<DOMAIN>.<OBJECT_ID>".
-
-Each component should publish services only under its own domain.
+- Each component defines a constant DOMAIN that is equal to its filename.
+- Each component that tracks states should create state entity names in the
+  format "<DOMAIN>.<OBJECT_ID>".
+- Each component should publish services only under its own domain.
 """
 import itertools as it
 import logging
@@ -24,10 +19,14 @@ from homeassistant.const import (

 _LOGGER = logging.getLogger(__name__)

+SERVICE_RELOAD_CORE_CONFIG = 'reload_core_config'
+

 def is_on(hass, entity_id=None):
-    """ Loads up the module to call the is_on method.
-    If there is no entity id given we will check all. """
+    """Load up the module to call the is_on method.
+
+    If there is no entity id given we will check all.
+    """
    if entity_id:
        group = get_component('group')

@@ -53,7 +52,7 @@ def is_on(hass, entity_id=None):


 def turn_on(hass, entity_id=None, **service_data):
-    """ Turns specified entity on if possible. """
+    """Turn specified entity on if possible."""
    if entity_id is not None:
        service_data[ATTR_ENTITY_ID] = entity_id

@@ -61,7 +60,7 @@ def turn_on(hass, entity_id=None, **service_data):


 def turn_off(hass, entity_id=None, **service_data):
-    """ Turns specified entity off. """
+    """Turn specified entity off."""
    if entity_id is not None:
        service_data[ATTR_ENTITY_ID] = entity_id

@@ -69,18 +68,22 @@ def turn_off(hass, entity_id=None, **service_data):


 def toggle(hass, entity_id=None, **service_data):
-    """ Toggles specified entity. """
+    """Toggle specified entity."""
    if entity_id is not None:
        service_data[ATTR_ENTITY_ID] = entity_id

    hass.services.call(ha.DOMAIN, SERVICE_TOGGLE, service_data)


-def setup(hass, config):
-    """ Setup general services related to homeassistant. """
+def reload_core_config(hass):
+    """Reload the core config."""
+    hass.services.call(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG)

+
+def setup(hass, config):
+    """Setup general services related to Home Assistant."""
    def handle_turn_service(service):
-        """ Method to handle calls to homeassistant.turn_on/off. """
+        """Method to handle calls to homeassistant.turn_on/off."""
        entity_ids = extract_entity_ids(hass, service)

        # Generic turn on/off method requires entity id
@@ -115,4 +118,21 @@ def setup(hass, config):
    hass.services.register(ha.DOMAIN, SERVICE_TURN_ON, handle_turn_service)
    hass.services.register(ha.DOMAIN, SERVICE_TOGGLE, handle_turn_service)

+    def handle_reload_config(call):
+        """Service handler for reloading core config."""
+        from homeassistant.exceptions import HomeAssistantError
+        from homeassistant import config as conf_util
+
+        try:
+            path = conf_util.find_config_file(hass.config.config_dir)
+            conf = conf_util.load_yaml_config_file(path)
+        except HomeAssistantError as err:
+            _LOGGER.error(err)
+            return
+
+        conf_util.process_ha_core_config(hass, conf.get(ha.DOMAIN) or {})
+
+    hass.services.register(ha.DOMAIN, SERVICE_RELOAD_CORE_CONFIG,
+                           handle_reload_config)
+
    return True
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -1,16 +1,20 @@
 """
-homeassistant.components.alarm_control_panel
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Component to interface with a alarm control panel.
+Component to interface with an alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel/
 """
 import logging
 import os

-from homeassistant.components import verisure
+import voluptuous as vol
+
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
+    ATTR_CODE, ATTR_CODE_FORMAT, ATTR_ENTITY_ID, SERVICE_ALARM_TRIGGER,
    SERVICE_ALARM_DISARM, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_AWAY)
 from homeassistant.config import load_yaml_config_file
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent

@@ -19,11 +23,6 @@ SCAN_INTERVAL = 30

 ENTITY_ID_FORMAT = DOMAIN + '.{}'

-# Maps discovered services to their platforms
-DISCOVERY_PLATFORMS = {
-    verisure.DISCOVER_SENSORS: 'verisure'
-}
-
 SERVICE_TO_METHOD = {
    SERVICE_ALARM_DISARM: 'alarm_disarm',
    SERVICE_ALARM_ARM_HOME: 'alarm_arm_home',
@@ -31,49 +30,49 @@ SERVICE_TO_METHOD = {
    SERVICE_ALARM_TRIGGER: 'alarm_trigger'
 }

-ATTR_CODE = 'code'
-ATTR_CODE_FORMAT = 'code_format'
-
 ATTR_TO_PROPERTY = [
    ATTR_CODE,
    ATTR_CODE_FORMAT
 ]

+ALARM_SERVICE_SCHEMA = vol.Schema({
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_CODE): cv.string,
+})
+

 def setup(hass, config):
-    """ Track states and offer events for sensors. """
+    """Track states and offer events for sensors."""
    component = EntityComponent(
-        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
-        DISCOVERY_PLATFORMS)
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)

    component.setup(config)

    def alarm_service_handler(service):
-        """ Maps services to methods on Alarm. """
+        """Map services to methods on Alarm."""
        target_alarms = component.extract_from_service(service)

-        if ATTR_CODE not in service.data:
-            code = None
-        else:
-            code = service.data[ATTR_CODE]
+        code = service.data.get(ATTR_CODE)

        method = SERVICE_TO_METHOD[service.service]

        for alarm in target_alarms:
            getattr(alarm, method)(code)
+            if alarm.should_poll:
+                alarm.update_ha_state(True)

    descriptions = load_yaml_config_file(
        os.path.join(os.path.dirname(__file__), 'services.yaml'))

    for service in SERVICE_TO_METHOD:
        hass.services.register(DOMAIN, service, alarm_service_handler,
-                               descriptions.get(service))
-
+                               descriptions.get(service),
+                               schema=ALARM_SERVICE_SCHEMA)
    return True


 def alarm_disarm(hass, code=None, entity_id=None):
-    """ Send the alarm the command for disarm. """
+    """Send the alarm the command for disarm."""
    data = {}
    if code:
        data[ATTR_CODE] = code
@@ -84,7 +83,7 @@ def alarm_disarm(hass, code=None, entity_id=None):


 def alarm_arm_home(hass, code=None, entity_id=None):
-    """ Send the alarm the command for arm home. """
+    """Send the alarm the command for arm home."""
    data = {}
    if code:
        data[ATTR_CODE] = code
@@ -95,7 +94,7 @@ def alarm_arm_home(hass, code=None, entity_id=None):


 def alarm_arm_away(hass, code=None, entity_id=None):
-    """ Send the alarm the command for arm away. """
+    """Send the alarm the command for arm away."""
    data = {}
    if code:
        data[ATTR_CODE] = code
@@ -106,7 +105,7 @@ def alarm_arm_away(hass, code=None, entity_id=None):


 def alarm_trigger(hass, code=None, entity_id=None):
-    """ Send the alarm the command for trigger. """
+    """Send the alarm the command for trigger."""
    data = {}
    if code:
        data[ATTR_CODE] = code
@@ -118,33 +117,33 @@ def alarm_trigger(hass, code=None, entity_id=None):

 # pylint: disable=no-self-use
 class AlarmControlPanel(Entity):
-    """ ABC for alarm control devices. """
+    """An abstract class for alarm control devices."""

    @property
    def code_format(self):
-        """ regex for code format or None if no code is required. """
+        """Regex for code format or None if no code is required."""
        return None

    def alarm_disarm(self, code=None):
-        """ Send disarm command. """
+        """Send disarm command."""
        raise NotImplementedError()

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

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

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

    @property
    def state_attributes(self):
-        """ Return the state attributes. """
+        """Return the state attributes."""
        state_attr = {
            ATTR_CODE_FORMAT: self.code_format,
-            }
+        }
        return state_attr
--- a/homeassistant/components/alarm_control_panel/alarmdotcom.py
+++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py
@@ -1,7 +1,5 @@
 """
-homeassistant.components.alarm_control_panel.alarmdotcom
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Interfaces with Verisure alarm control panel.
+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/
@@ -9,24 +7,21 @@ https://home-assistant.io/components/alarm_control_panel.alarmdotcom/
 import logging

 import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
-
 from homeassistant.const import (
-    STATE_UNKNOWN,
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+    CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN)

 _LOGGER = logging.getLogger(__name__)


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


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Setup an Alarm.com control panel. """
-
+    """Setup an Alarm.com control panel."""
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

@@ -44,9 +39,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 # pylint: disable=too-many-arguments, too-many-instance-attributes
 # pylint: disable=abstract-method
 class AlarmDotCom(alarm.AlarmControlPanel):
-    """ Represents a Alarm.com status. """
+    """Represent an Alarm.com status."""

    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)
        self._hass = hass
@@ -57,20 +53,22 @@ class AlarmDotCom(alarm.AlarmControlPanel):

    @property
    def should_poll(self):
+        """No polling needed."""
        return True

    @property
    def name(self):
+        """Return the name of the alarm."""
        return self._name

    @property
    def code_format(self):
-        """ One or more characters if code is defined. """
+        """One or more characters if code is defined."""
        return None if self._code is None else '.+'

    @property
    def state(self):
-        """ Returns the state of the device. """
+        """Return the state of the device."""
        if self._alarm.state == 'Disarmed':
            return STATE_ALARM_DISARMED
        elif self._alarm.state == 'Armed Stay':
@@ -81,37 +79,34 @@ class AlarmDotCom(alarm.AlarmControlPanel):
            return STATE_UNKNOWN

    def alarm_disarm(self, code=None):
-        """ Send disarm command. """
+        """Send disarm 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.disarm()
-        self.update_ha_state()

    def alarm_arm_home(self, code=None):
-        """ Send arm home command. """
+        """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()
-        self.update_ha_state()

    def alarm_arm_away(self, code=None):
-        """ Send arm away command. """
+        """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()
-        self.update_ha_state()

    def _validate_code(self, code, state):
-        """ Validate given code. """
+        """Validate given code."""
        check = self._code is None or code == self._code
        if not check:
            _LOGGER.warning('Wrong code entered for %s', state)
--- a/homeassistant/components/alarm_control_panel/demo.py
+++ b/homeassistant/components/alarm_control_panel/demo.py
@@ -1,13 +1,14 @@
 """
-homeassistant.components.alarm_control_panel.demo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Demo platform that has two fake alarm control panels.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
 """
 import homeassistant.components.alarm_control_panel.manual as manual


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the Demo alarm control panels. """
+    """Setup the Demo alarm control panel platform."""
    add_devices([
        manual.ManualAlarm(hass, 'Alarm', '1234', 5, 10),
    ])
--- a/homeassistant/components/alarm_control_panel/envisalink.py
+++ b/homeassistant/components/alarm_control_panel/envisalink.py
@@ -0,0 +1,105 @@
+"""
+Support for Envisalink-based alarm control panels (Honeywell/DSC).
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.envisalink/
+"""
+import logging
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.envisalink import (EVL_CONTROLLER,
+                                                 EnvisalinkDevice,
+                                                 PARTITION_SCHEMA,
+                                                 CONF_CODE,
+                                                 CONF_PARTITIONNAME,
+                                                 SIGNAL_PARTITION_UPDATE,
+                                                 SIGNAL_KEYPAD_UPDATE)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_UNKNOWN, STATE_ALARM_TRIGGERED)
+
+DEPENDENCIES = ['envisalink']
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Perform the setup for Envisalink alarm panels."""
+    _configured_partitions = discovery_info['partitions']
+    _code = discovery_info[CONF_CODE]
+    for part_num in _configured_partitions:
+        _device_config_data = PARTITION_SCHEMA(
+            _configured_partitions[part_num])
+        _device = EnvisalinkAlarm(
+            part_num,
+            _device_config_data[CONF_PARTITIONNAME],
+            _code,
+            EVL_CONTROLLER.alarm_state['partition'][part_num],
+            EVL_CONTROLLER)
+        add_devices_callback([_device])
+
+    return True
+
+
+class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
+    """Represents the Envisalink-based alarm panel."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, partition_number, alarm_name, code, info, controller):
+        """Initialize the alarm panel."""
+        from pydispatch import dispatcher
+        self._partition_number = partition_number
+        self._code = code
+        _LOGGER.debug('Setting up alarm: ' + alarm_name)
+        EnvisalinkDevice.__init__(self, alarm_name, info, controller)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_PARTITION_UPDATE,
+                           sender=dispatcher.Any)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_KEYPAD_UPDATE,
+                           sender=dispatcher.Any)
+
+    def _update_callback(self, partition):
+        """Update HA state, if needed."""
+        if partition is None or int(partition) == self._partition_number:
+            self.update_ha_state()
+
+    @property
+    def code_format(self):
+        """The characters if code is defined."""
+        return self._code
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        if self._info['status']['alarm']:
+            return STATE_ALARM_TRIGGERED
+        elif self._info['status']['armed_away']:
+            return STATE_ALARM_ARMED_AWAY
+        elif self._info['status']['armed_stay']:
+            return STATE_ALARM_ARMED_HOME
+        elif self._info['status']['alpha']:
+            return STATE_ALARM_DISARMED
+        else:
+            return STATE_UNKNOWN
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        if self._code:
+            EVL_CONTROLLER.disarm_partition(str(code),
+                                            self._partition_number)
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        if self._code:
+            EVL_CONTROLLER.arm_stay_partition(str(code),
+                                              self._partition_number)
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        if self._code:
+            EVL_CONTROLLER.arm_away_partition(str(code),
+                                              self._partition_number)
+
+    def alarm_trigger(self, code=None):
+        """Alarm trigger command. Not possible for us."""
+        raise NotImplementedError()
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -1,20 +1,18 @@
 """
-homeassistant.components.alarm_control_panel.manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for manual alarms.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.manual/
 """
-import logging
 import datetime
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.helpers.event import track_point_in_time
-import homeassistant.util.dt as dt_util
+import logging

+import homeassistant.components.alarm_control_panel as alarm
+import homeassistant.util.dt as dt_util
 from homeassistant.const import (
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
+from homeassistant.helpers.event import track_point_in_time

 _LOGGER = logging.getLogger(__name__)

@@ -24,8 +22,7 @@ DEFAULT_TRIGGER_TIME = 120


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the manual alarm platform. """
-
+    """Setup the manual alarm platform."""
    add_devices([ManualAlarm(
        hass,
        config.get('name', DEFAULT_ALARM_NAME),
@@ -47,6 +44,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
    """

    def __init__(self, hass, name, code, pending_time, trigger_time):
+        """Initalize the manual alarm panel."""
        self._state = STATE_ALARM_DISARMED
        self._hass = hass
        self._name = name
@@ -57,17 +55,17 @@ class ManualAlarm(alarm.AlarmControlPanel):

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

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

    @property
    def state(self):
-        """ Returns the state of the device. """
+        """Return the state of the device."""
        if self._state in (STATE_ALARM_ARMED_HOME,
                           STATE_ALARM_ARMED_AWAY) and \
           self._pending_time and self._state_ts + self._pending_time > \
@@ -85,11 +83,11 @@ class ManualAlarm(alarm.AlarmControlPanel):

    @property
    def code_format(self):
-        """ One or more characters. """
+        """One or more characters."""
        return None if self._code is None else '.+'

    def alarm_disarm(self, code=None):
-        """ Send disarm command. """
+        """Send disarm command."""
        if not self._validate_code(code, STATE_ALARM_DISARMED):
            return

@@ -98,7 +96,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
        self.update_ha_state()

    def alarm_arm_home(self, code=None):
-        """ Send arm home command. """
+        """Send arm home command."""
        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
            return

@@ -112,7 +110,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
                self._state_ts + self._pending_time)

    def alarm_arm_away(self, code=None):
-        """ Send arm away command. """
+        """Send arm away command."""
        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
            return

@@ -126,7 +124,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
                self._state_ts + self._pending_time)

    def alarm_trigger(self, code=None):
-        """ Send alarm trigger command. No code needed. """
+        """Send alarm trigger command. No code needed."""
        self._state = STATE_ALARM_TRIGGERED
        self._state_ts = dt_util.utcnow()
        self.update_ha_state()
@@ -141,7 +139,7 @@ class ManualAlarm(alarm.AlarmControlPanel):
                self._state_ts + self._pending_time + self._trigger_time)

    def _validate_code(self, code, state):
-        """ Validate given code. """
+        """Validate given code."""
        check = self._code is None or code == self._code
        if not check:
            _LOGGER.warning('Invalid code given for %s', state)
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -1,60 +1,70 @@
 """
-homeassistant.components.alarm_control_panel.mqtt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This platform enables the possibility to control a MQTT alarm.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.mqtt/
 """
 import logging
-import homeassistant.components.mqtt as mqtt
-import homeassistant.components.alarm_control_panel as alarm

+import voluptuous as vol
+
+import homeassistant.components.alarm_control_panel as alarm
+import homeassistant.components.mqtt as mqtt
 from homeassistant.const import (
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
+    CONF_NAME)
+from homeassistant.components.mqtt import (
+    CONF_STATE_TOPIC, CONF_COMMAND_TOPIC, CONF_QOS)
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-DEFAULT_NAME = "MQTT Alarm"
-DEFAULT_QOS = 0
-DEFAULT_PAYLOAD_DISARM = "DISARM"
-DEFAULT_PAYLOAD_ARM_HOME = "ARM_HOME"
-DEFAULT_PAYLOAD_ARM_AWAY = "ARM_AWAY"
-
 DEPENDENCIES = ['mqtt']

+CONF_PAYLOAD_DISARM = 'payload_disarm'
+CONF_PAYLOAD_ARM_HOME = 'payload_arm_home'
+CONF_PAYLOAD_ARM_AWAY = 'payload_arm_away'
+CONF_CODE = 'code'
+
+DEFAULT_NAME = "MQTT Alarm"
+DEFAULT_DISARM = "DISARM"
+DEFAULT_ARM_HOME = "ARM_HOME"
+DEFAULT_ARM_AWAY = "ARM_AWAY"
+
+PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Required(CONF_STATE_TOPIC): mqtt.valid_subscribe_topic,
+    vol.Required(CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
+    vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
+    vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
+    vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
+    vol.Optional(CONF_CODE): cv.string,
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the MQTT platform. """
-
-    if config.get('state_topic') is None:
-        _LOGGER.error("Missing required variable: state_topic")
-        return False
-
-    if config.get('command_topic') is None:
-        _LOGGER.error("Missing required variable: command_topic")
-        return False
-
+    """Setup the MQTT platform."""
    add_devices([MqttAlarm(
        hass,
-        config.get('name', DEFAULT_NAME),
-        config.get('state_topic'),
-        config.get('command_topic'),
-        config.get('qos', DEFAULT_QOS),
-        config.get('payload_disarm', DEFAULT_PAYLOAD_DISARM),
-        config.get('payload_arm_home', DEFAULT_PAYLOAD_ARM_HOME),
-        config.get('payload_arm_away', DEFAULT_PAYLOAD_ARM_AWAY),
-        config.get('code'))])
+        config[CONF_NAME],
+        config[CONF_STATE_TOPIC],
+        config[CONF_COMMAND_TOPIC],
+        config[CONF_QOS],
+        config[CONF_PAYLOAD_DISARM],
+        config[CONF_PAYLOAD_ARM_HOME],
+        config[CONF_PAYLOAD_ARM_AWAY],
+        config.get(CONF_CODE))])


 # pylint: disable=too-many-arguments, too-many-instance-attributes
 # pylint: disable=abstract-method
 class MqttAlarm(alarm.AlarmControlPanel):
-    """ represents a MQTT alarm status within home assistant. """
+    """Represent a MQTT alarm status."""

    def __init__(self, hass, name, state_topic, command_topic, qos,
                 payload_disarm, payload_arm_home, payload_arm_away, code):
+        """Initalize the MQTT alarm panel."""
        self._state = STATE_UNKNOWN
        self._hass = hass
        self._name = name
@@ -64,10 +74,10 @@ class MqttAlarm(alarm.AlarmControlPanel):
        self._payload_disarm = payload_disarm
        self._payload_arm_home = payload_arm_home
        self._payload_arm_away = payload_arm_away
-        self._code = str(code) if code else None
+        self._code = code

        def message_received(topic, payload, qos):
-            """ A new MQTT message has been received. """
+            """A new MQTT message has been received."""
            if payload not in (STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
                               STATE_ALARM_ARMED_AWAY, STATE_ALARM_PENDING,
                               STATE_ALARM_TRIGGERED):
@@ -80,47 +90,47 @@ class MqttAlarm(alarm.AlarmControlPanel):

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

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

    @property
    def state(self):
-        """ Returns the state of the device. """
+        """Return the state of the device."""
        return self._state

    @property
    def code_format(self):
-        """ One or more characters if code is defined """
+        """One or more characters if code is defined."""
        return None if self._code is None else '.+'

    def alarm_disarm(self, code=None):
-        """ Send disarm command. """
+        """Send disarm command."""
        if not self._validate_code(code, 'disarming'):
            return
        mqtt.publish(self.hass, self._command_topic,
                     self._payload_disarm, self._qos)

    def alarm_arm_home(self, code=None):
-        """ Send arm home command. """
+        """Send arm home command."""
        if not self._validate_code(code, 'arming home'):
            return
        mqtt.publish(self.hass, self._command_topic,
                     self._payload_arm_home, self._qos)

    def alarm_arm_away(self, code=None):
-        """ Send arm away command. """
+        """Send arm away command."""
        if not self._validate_code(code, 'arming away'):
            return
        mqtt.publish(self.hass, self._command_topic,
                     self._payload_arm_away, self._qos)

    def _validate_code(self, code, state):
-        """ Validate given code. """
+        """Validate given code."""
        check = self._code is None or code == self._code
        if not check:
            _LOGGER.warning('Wrong code entered for %s', state)
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -0,0 +1,105 @@
+"""
+Support for NX584 alarm control panels.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.nx584/
+"""
+import logging
+
+import requests
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_UNKNOWN)
+
+REQUIREMENTS = ['pynx584==0.2']
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup nx584 platform."""
+    host = config.get('host', 'localhost:5007')
+
+    try:
+        add_devices([NX584Alarm(hass, host, config.get('name', 'NX584'))])
+    except requests.exceptions.ConnectionError as ex:
+        _LOGGER.error('Unable to connect to NX584: %s', str(ex))
+        return False
+
+
+class NX584Alarm(alarm.AlarmControlPanel):
+    """Represents the NX584-based alarm panel."""
+
+    def __init__(self, hass, host, name):
+        """Initalize the nx584 alarm panel."""
+        from nx584 import client
+        self._hass = hass
+        self._host = host
+        self._name = name
+        self._alarm = client.Client('http://%s' % host)
+        # Do an initial list operation so that we will try to actually
+        # talk to the API and trigger a requests exception for setup_platform()
+        # to catch
+        self._alarm.list_zones()
+
+    @property
+    def should_poll(self):
+        """Polling needed."""
+        return True
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def code_format(self):
+        """The characters if code is defined."""
+        return '[0-9]{4}([0-9]{2})?'
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        try:
+            part = self._alarm.list_partitions()[0]
+            zones = self._alarm.list_zones()
+        except requests.exceptions.ConnectionError as ex:
+            _LOGGER.error('Unable to connect to %(host)s: %(reason)s',
+                          dict(host=self._host, reason=ex))
+            return STATE_UNKNOWN
+        except IndexError:
+            _LOGGER.error('nx584 reports no partitions')
+            return STATE_UNKNOWN
+
+        bypassed = False
+        for zone in zones:
+            if zone['bypassed']:
+                _LOGGER.debug('Zone %(zone)s is bypassed, '
+                              'assuming HOME',
+                              dict(zone=zone['number']))
+                bypassed = True
+                break
+
+        if not part['armed']:
+            return STATE_ALARM_DISARMED
+        elif bypassed:
+            return STATE_ALARM_ARMED_HOME
+        else:
+            return STATE_ALARM_ARMED_AWAY
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        self._alarm.disarm(code)
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        self._alarm.arm('home')
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        self._alarm.arm('auto')
+
+    def alarm_trigger(self, code=None):
+        """Alarm trigger command."""
+        raise NotImplementedError()
--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -1,96 +1,95 @@
 """
-homeassistant.components.alarm_control_panel.verisure
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Interfaces with Verisure alarm control panel.

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

-import homeassistant.components.verisure as verisure
 import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.verisure import HUB as hub

 from homeassistant.const import (
-    STATE_UNKNOWN,
-    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_UNKNOWN)

 _LOGGER = logging.getLogger(__name__)


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the Verisure platform. """
-
-    if not verisure.MY_PAGES:
-        _LOGGER.error('A connection has not been made to Verisure mypages.')
-        return False
-
+    """Setup the Verisure platform."""
    alarms = []
-
-    alarms.extend([
-        VerisureAlarm(value)
-        for value in verisure.ALARM_STATUS.values()
-        if verisure.SHOW_ALARM
-        ])
-
+    if int(hub.config.get('alarm', '1')):
+        hub.update_alarms()
+        alarms.extend([
+            VerisureAlarm(value.id)
+            for value in hub.alarm_status.values()
+            ])
    add_devices(alarms)


 # pylint: disable=abstract-method
 class VerisureAlarm(alarm.AlarmControlPanel):
-    """ Represents a Verisure alarm status. """
+    """Represent a Verisure alarm status."""

-    def __init__(self, alarm_status):
-        self._id = alarm_status.id
+    def __init__(self, device_id):
+        """Initalize the Verisure alarm panel."""
+        self._id = device_id
        self._state = STATE_UNKNOWN
+        self._digits = int(hub.config.get('code_digits', '4'))

    @property
    def name(self):
-        """ Returns the name of the device. """
+        """Return the name of the device."""
        return 'Alarm {}'.format(self._id)

    @property
    def state(self):
-        """ Returns the state of the device. """
+        """Return the state of the device."""
        return self._state

+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return hub.available
+
    @property
    def code_format(self):
-        """ Four digit code required. """
-        return '^\\d{%s}$' % verisure.CODE_DIGITS
+        """The code format as regex."""
+        return '^\\d{%s}$' % self._digits

    def update(self):
-        """ Update alarm status """
-        verisure.update_alarm()
+        """Update alarm status."""
+        hub.update_alarms()

-        if verisure.ALARM_STATUS[self._id].status == 'unarmed':
+        if hub.alarm_status[self._id].status == 'unarmed':
            self._state = STATE_ALARM_DISARMED
-        elif verisure.ALARM_STATUS[self._id].status == 'armedhome':
+        elif hub.alarm_status[self._id].status == 'armedhome':
            self._state = STATE_ALARM_ARMED_HOME
-        elif verisure.ALARM_STATUS[self._id].status == 'armed':
+        elif hub.alarm_status[self._id].status == 'armed':
            self._state = STATE_ALARM_ARMED_AWAY
-        elif verisure.ALARM_STATUS[self._id].status != 'pending':
+        elif hub.alarm_status[self._id].status != 'pending':
            _LOGGER.error(
                'Unknown alarm state %s',
-                verisure.ALARM_STATUS[self._id].status)
+                hub.alarm_status[self._id].status)

    def alarm_disarm(self, code=None):
-        """ Send disarm command. """
-        verisure.MY_PAGES.alarm.set(code, 'DISARMED')
+        """Send disarm command."""
+        hub.my_pages.alarm.set(code, 'DISARMED')
        _LOGGER.info('verisure alarm disarming')
-        verisure.MY_PAGES.alarm.wait_while_pending()
-        verisure.update_alarm()
+        hub.my_pages.alarm.wait_while_pending()
+        self.update()

    def alarm_arm_home(self, code=None):
-        """ Send arm home command. """
-        verisure.MY_PAGES.alarm.set(code, 'ARMED_HOME')
+        """Send arm home command."""
+        hub.my_pages.alarm.set(code, 'ARMED_HOME')
        _LOGGER.info('verisure alarm arming home')
-        verisure.MY_PAGES.alarm.wait_while_pending()
-        verisure.update_alarm()
+        hub.my_pages.alarm.wait_while_pending()
+        self.update()

    def alarm_arm_away(self, code=None):
-        """ Send arm away command. """
-        verisure.MY_PAGES.alarm.set(code, 'ARMED_AWAY')
+        """Send arm away command."""
+        hub.my_pages.alarm.set(code, 'ARMED_AWAY')
        _LOGGER.info('verisure alarm arming away')
-        verisure.MY_PAGES.alarm.wait_while_pending()
-        verisure.update_alarm()
+        hub.my_pages.alarm.wait_while_pending()
+        self.update()
--- a/homeassistant/components/alexa.py
+++ b/homeassistant/components/alexa.py
@@ -1,7 +1,5 @@
 """
-components.alexa
-~~~~~~~~~~~~~~~~
-Component to offer a service end point for an Alexa skill.
+Support for Alexa skill service end point.

 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/alexa/
@@ -9,15 +7,14 @@ https://home-assistant.io/components/alexa/
 import enum
 import logging

-from homeassistant.const import HTTP_OK, HTTP_UNPROCESSABLE_ENTITY
-from homeassistant.util import template
-from homeassistant.helpers.service import call_from_config
+from homeassistant.const import HTTP_BAD_REQUEST
+from homeassistant.helpers import template, script
+from homeassistant.components.http import HomeAssistantView

 DOMAIN = 'alexa'
 DEPENDENCIES = ['http']

 _LOGGER = logging.getLogger(__name__)
-_CONFIG = {}

 API_ENDPOINT = '/api/alexa'

@@ -28,92 +25,110 @@ CONF_ACTION = 'action'


 def setup(hass, config):
-    """ Activate Alexa component. """
-    _CONFIG.update(config[DOMAIN].get(CONF_INTENTS, {}))
-
-    hass.http.register_path('POST', API_ENDPOINT, _handle_alexa, True)
+    """Activate Alexa component."""
+    hass.wsgi.register_view(AlexaView(hass,
+                                      config[DOMAIN].get(CONF_INTENTS, {})))

    return True


-def _handle_alexa(handler, path_match, data):
-    """ Handle Alexa. """
-    _LOGGER.debug('Received Alexa request: %s', data)
+class AlexaView(HomeAssistantView):
+    """Handle Alexa requests."""

-    req = data.get('request')
+    url = API_ENDPOINT
+    name = 'api:alexa'

-    if req is None:
-        _LOGGER.error('Received invalid data from Alexa: %s', data)
-        handler.write_json_message(
-            "Invalid value received for port", HTTP_UNPROCESSABLE_ENTITY)
-        return
+    def __init__(self, hass, intents):
+        """Initialize Alexa view."""
+        super().__init__(hass)

-    req_type = req['type']
+        for name, intent in intents.items():
+            if CONF_ACTION in intent:
+                intent[CONF_ACTION] = script.Script(
+                    hass, intent[CONF_ACTION], "Alexa intent {}".format(name))

-    if req_type == 'SessionEndedRequest':
-        handler.send_response(HTTP_OK)
-        handler.end_headers()
-        return
+        self.intents = intents

-    intent = req.get('intent')
-    response = AlexaResponse(handler.server.hass, intent)
+    def post(self, request):
+        """Handle Alexa."""
+        data = request.json

-    if req_type == 'LaunchRequest':
-        response.add_speech(
-            SpeechType.plaintext,
-            "Hello, and welcome to the future. How may I help?")
-        handler.write_json(response.as_dict())
-        return
+        _LOGGER.debug('Received Alexa request: %s', data)

-    if req_type != 'IntentRequest':
-        _LOGGER.warning('Received unsupported request: %s', req_type)
-        return
+        req = data.get('request')

-    intent_name = intent['name']
-    config = _CONFIG.get(intent_name)
+        if req is None:
+            _LOGGER.error('Received invalid data from Alexa: %s', data)
+            return self.json_message('Expected request value not received',
+                                     HTTP_BAD_REQUEST)

-    if config is None:
-        _LOGGER.warning('Received unknown intent %s', intent_name)
-        response.add_speech(
-            SpeechType.plaintext,
-            "This intent is not yet configured within Home Assistant.")
-        handler.write_json(response.as_dict())
-        return
+        req_type = req['type']

-    speech = config.get(CONF_SPEECH)
-    card = config.get(CONF_CARD)
-    action = config.get(CONF_ACTION)
+        if req_type == 'SessionEndedRequest':
+            return None

-    # pylint: disable=unsubscriptable-object
-    if speech is not None:
-        response.add_speech(SpeechType[speech['type']], speech['text'])
+        intent = req.get('intent')
+        response = AlexaResponse(self.hass, intent)

-    if card is not None:
-        response.add_card(CardType[card['type']], card['title'],
-                          card['content'])
+        if req_type == 'LaunchRequest':
+            response.add_speech(
+                SpeechType.plaintext,
+                "Hello, and welcome to the future. How may I help?")
+            return self.json(response)

-    if action is not None:
-        call_from_config(handler.server.hass, action, True)
+        if req_type != 'IntentRequest':
+            _LOGGER.warning('Received unsupported request: %s', req_type)
+            return self.json_message(
+                'Received unsupported request: {}'.format(req_type),
+                HTTP_BAD_REQUEST)

-    handler.write_json(response.as_dict())
+        intent_name = intent['name']
+        config = self.intents.get(intent_name)
+
+        if config is None:
+            _LOGGER.warning('Received unknown intent %s', intent_name)
+            response.add_speech(
+                SpeechType.plaintext,
+                "This intent is not yet configured within Home Assistant.")
+            return self.json(response)
+
+        speech = config.get(CONF_SPEECH)
+        card = config.get(CONF_CARD)
+        action = config.get(CONF_ACTION)
+
+        if action is not None:
+            action.run(response.variables)
+
+        # pylint: disable=unsubscriptable-object
+        if speech is not None:
+            response.add_speech(SpeechType[speech['type']], speech['text'])
+
+        if card is not None:
+            response.add_card(CardType[card['type']], card['title'],
+                              card['content'])
+
+        return self.json(response)


 class SpeechType(enum.Enum):
-    """ Alexa speech types. """
+    """The Alexa speech types."""
+
    plaintext = "PlainText"
    ssml = "SSML"


 class CardType(enum.Enum):
-    """ Alexa card types. """
+    """The Alexa card types."""
+
    simple = "Simple"
    link_account = "LinkAccount"


 class AlexaResponse(object):
-    """ Helps generating the response for Alexa. """
+    """Help generating the response for Alexa."""

    def __init__(self, hass, intent=None):
+        """Initialize the response."""
        self.hass = hass
        self.speech = None
        self.card = None
@@ -127,7 +142,7 @@ class AlexaResponse(object):
            self.variables = {}

    def add_card(self, card_type, title, content):
-        """ Add a card to the response. """
+        """Add a card to the response."""
        assert self.card is None

        card = {
@@ -143,7 +158,7 @@ class AlexaResponse(object):
        self.card = card

    def add_speech(self, speech_type, text):
-        """ Add speech to the response. """
+        """Add speech to the response."""
        assert self.speech is None

        key = 'ssml' if speech_type == SpeechType.ssml else 'text'
@@ -154,7 +169,7 @@ class AlexaResponse(object):
        }

    def add_reprompt(self, speech_type, text):
-        """ Add repromopt if user does not answer. """
+        """Add reprompt if user does not answer."""
        assert self.reprompt is None

        key = 'ssml' if speech_type == SpeechType.ssml else 'text'
@@ -165,7 +180,7 @@ class AlexaResponse(object):
        }

    def as_dict(self):
-        """ Returns response in an Alexa valid dict. """
+        """Return response in an Alexa valid dict."""
        response = {
            'shouldEndSession': self.should_end_session
        }
@@ -188,5 +203,5 @@ class AlexaResponse(object):
        }

    def _render(self, template_string):
-        """ Render a response, adding data from intent if available. """
+        """Render a response, adding data from intent if available."""
        return template.render(self.hass, template_string, self.variables)
--- a/homeassistant/components/apcupsd.py
+++ b/homeassistant/components/apcupsd.py
@@ -0,0 +1,82 @@
+"""
+Support for status output of APCUPSd via its Network Information Server (NIS).
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/apcupsd/
+"""
+import logging
+from datetime import timedelta
+
+from homeassistant.util import Throttle
+
+DOMAIN = "apcupsd"
+REQUIREMENTS = ("apcaccess==0.0.4",)
+
+CONF_HOST = "host"
+CONF_PORT = "port"
+CONF_TYPE = "type"
+
+DEFAULT_HOST = "localhost"
+DEFAULT_PORT = 3551
+
+KEY_STATUS = "STATUS"
+
+VALUE_ONLINE = "ONLINE"
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
+
+DATA = None
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup(hass, config):
+    """Use config values to set up a function enabling status retrieval."""
+    global DATA
+
+    host = config[DOMAIN].get(CONF_HOST, DEFAULT_HOST)
+    port = config[DOMAIN].get(CONF_PORT, DEFAULT_PORT)
+
+    DATA = APCUPSdData(host, port)
+
+    # It doesn't really matter why we're not able to get the status, just that
+    # we can't.
+    # pylint: disable=broad-except
+    try:
+        DATA.update(no_throttle=True)
+    except Exception:
+        _LOGGER.exception("Failure while testing APCUPSd status retrieval.")
+        return False
+    return True
+
+
+class APCUPSdData(object):
+    """Stores the data retrieved from APCUPSd.
+
+    For each entity to use, acts as the single point responsible for fetching
+    updates from the server.
+    """
+
+    def __init__(self, host, port):
+        """Initialize the data oject."""
+        from apcaccess import status
+        self._host = host
+        self._port = port
+        self._status = None
+        self._get = status.get
+        self._parse = status.parse
+
+    @property
+    def status(self):
+        """Get latest update if throttle allows. Return status."""
+        self.update()
+        return self._status
+
+    def _get_status(self):
+        """Get the status from APCUPSd and parse it into a dict."""
+        return self._parse(self._get(host=self._host, port=self._port))
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self, **kwargs):
+        """Fetch the latest status from APCUPSd."""
+        self._status = self._get_status()
--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -1,31 +1,28 @@
 """
-homeassistant.components.api
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides a Rest API for Home Assistant.
+Rest API for Home Assistant.

 For more details about the RESTful API, please refer to the documentation at
 https://home-assistant.io/developers/api/
 """
-import re
-import logging
-import threading
 import json
+import logging
+import queue

 import homeassistant.core as ha
-from homeassistant.exceptions import TemplateError
-from homeassistant.helpers.state import TrackStates
 import homeassistant.remote as rem
-from homeassistant.util import template
 from homeassistant.bootstrap import ERROR_LOG_FILENAME
 from homeassistant.const import (
-    URL_API, URL_API_STATES, URL_API_EVENTS, URL_API_SERVICES, URL_API_STREAM,
-    URL_API_EVENT_FORWARD, URL_API_STATES_ENTITY, URL_API_COMPONENTS,
-    URL_API_CONFIG, URL_API_BOOTSTRAP, URL_API_ERROR_LOG, URL_API_LOG_OUT,
-    URL_API_TEMPLATE, EVENT_TIME_CHANGED, EVENT_HOMEASSISTANT_STOP, MATCH_ALL,
-    HTTP_OK, HTTP_CREATED, HTTP_BAD_REQUEST, HTTP_NOT_FOUND,
-    HTTP_UNPROCESSABLE_ENTITY, HTTP_HEADER_CONTENT_TYPE,
-    CONTENT_TYPE_TEXT_PLAIN)
-
+    EVENT_HOMEASSISTANT_STOP, EVENT_TIME_CHANGED,
+    HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_NOT_FOUND,
+    HTTP_UNPROCESSABLE_ENTITY, MATCH_ALL, URL_API, URL_API_COMPONENTS,
+    URL_API_CONFIG, URL_API_DISCOVERY_INFO, URL_API_ERROR_LOG,
+    URL_API_EVENT_FORWARD, URL_API_EVENTS, URL_API_SERVICES,
+    URL_API_STATES, URL_API_STATES_ENTITY, URL_API_STREAM, URL_API_TEMPLATE,
+    __version__)
+from homeassistant.exceptions import TemplateError
+from homeassistant.helpers.state import TrackStates
+from homeassistant.helpers import template
+from homeassistant.components.http import HomeAssistantView

 DOMAIN = 'api'
 DEPENDENCIES = ['http']
@@ -37,366 +34,361 @@ _LOGGER = logging.getLogger(__name__)


 def setup(hass, config):
-    """ Register the API with the HTTP interface. """
-
-    # /api - for validation purposes
-    hass.http.register_path('GET', URL_API, _handle_get_api)
-
-    # /api/stream
-    hass.http.register_path('GET', URL_API_STREAM, _handle_get_api_stream)
-
-    # /api/config
-    hass.http.register_path('GET', URL_API_CONFIG, _handle_get_api_config)
-
-    # /api/bootstrap
-    hass.http.register_path(
-        'GET', URL_API_BOOTSTRAP, _handle_get_api_bootstrap)
-
-    # /states
-    hass.http.register_path('GET', URL_API_STATES, _handle_get_api_states)
-    hass.http.register_path(
-        'GET', re.compile(r'/api/states/(?P<entity_id>[a-zA-Z\._0-9]+)'),
-        _handle_get_api_states_entity)
-    hass.http.register_path(
-        'POST', re.compile(r'/api/states/(?P<entity_id>[a-zA-Z\._0-9]+)'),
-        _handle_post_state_entity)
-    hass.http.register_path(
-        'PUT', re.compile(r'/api/states/(?P<entity_id>[a-zA-Z\._0-9]+)'),
-        _handle_post_state_entity)
-
-    # /events
-    hass.http.register_path('GET', URL_API_EVENTS, _handle_get_api_events)
-    hass.http.register_path(
-        'POST', re.compile(r'/api/events/(?P<event_type>[a-zA-Z\._0-9]+)'),
-        _handle_api_post_events_event)
-
-    # /services
-    hass.http.register_path('GET', URL_API_SERVICES, _handle_get_api_services)
-    hass.http.register_path(
-        'POST',
-        re.compile((r'/api/services/'
-                    r'(?P<domain>[a-zA-Z\._0-9]+)/'
-                    r'(?P<service>[a-zA-Z\._0-9]+)')),
-        _handle_post_api_services_domain_service)
-
-    # /event_forwarding
-    hass.http.register_path(
-        'POST', URL_API_EVENT_FORWARD, _handle_post_api_event_forward)
-    hass.http.register_path(
-        'DELETE', URL_API_EVENT_FORWARD, _handle_delete_api_event_forward)
-
-    # /components
-    hass.http.register_path(
-        'GET', URL_API_COMPONENTS, _handle_get_api_components)
-
-    hass.http.register_path('GET', URL_API_ERROR_LOG,
-                            _handle_get_api_error_log)
-
-    hass.http.register_path('POST', URL_API_LOG_OUT, _handle_post_api_log_out)
-
-    hass.http.register_path('POST', URL_API_TEMPLATE,
-                            _handle_post_api_template)
+    """Register the API with the HTTP interface."""
+    hass.wsgi.register_view(APIStatusView)
+    hass.wsgi.register_view(APIEventStream)
+    hass.wsgi.register_view(APIConfigView)
+    hass.wsgi.register_view(APIDiscoveryView)
+    hass.wsgi.register_view(APIStatesView)
+    hass.wsgi.register_view(APIEntityStateView)
+    hass.wsgi.register_view(APIEventListenersView)
+    hass.wsgi.register_view(APIEventView)
+    hass.wsgi.register_view(APIServicesView)
+    hass.wsgi.register_view(APIDomainServicesView)
+    hass.wsgi.register_view(APIEventForwardingView)
+    hass.wsgi.register_view(APIComponentsView)
+    hass.wsgi.register_view(APIErrorLogView)
+    hass.wsgi.register_view(APITemplateView)

    return True


-def _handle_get_api(handler, path_match, data):
-    """ Renders the debug interface. """
-    handler.write_json_message("API running.")
+class APIStatusView(HomeAssistantView):
+    """View to handle Status requests."""

+    url = URL_API
+    name = "api:status"

-def _handle_get_api_stream(handler, path_match, data):
-    """ Provide a streaming interface for the event bus. """
-    gracefully_closed = False
-    hass = handler.server.hass
-    wfile = handler.wfile
-    write_lock = threading.Lock()
-    block = threading.Event()
-    session_id = None
+    def get(self, request):
+        """Retrieve if API is running."""
+        return self.json_message('API running.')

-    restrict = data.get('restrict')
-    if restrict:
-        restrict = restrict.split(',')

-    def write_message(payload):
-        """ Writes a message to the output. """
-        with write_lock:
-            msg = "data: {}\n\n".format(payload)
+class APIEventStream(HomeAssistantView):
+    """View to handle EventStream requests."""

-            try:
-                wfile.write(msg.encode("UTF-8"))
-                wfile.flush()
-            except (IOError, ValueError):
-                # IOError: socket errors
-                # ValueError: raised when 'I/O operation on closed file'
-                block.set()
+    url = URL_API_STREAM
+    name = "api:stream"

-    def forward_events(event):
-        """ Forwards events to the open request. """
-        nonlocal gracefully_closed
+    def get(self, request):
+        """Provide a streaming interface for the event bus."""
+        stop_obj = object()
+        to_write = queue.Queue()

-        if block.is_set() or event.event_type == EVENT_TIME_CHANGED:
-            return
-        elif event.event_type == EVENT_HOMEASSISTANT_STOP:
-            gracefully_closed = True
-            block.set()
-            return
+        restrict = request.args.get('restrict')
+        if restrict:
+            restrict = restrict.split(',') + [EVENT_HOMEASSISTANT_STOP]

-        handler.server.sessions.extend_validation(session_id)
-        write_message(json.dumps(event, cls=rem.JSONEncoder))
+        def forward_events(event):
+            """Forward events to the open request."""
+            if event.event_type == EVENT_TIME_CHANGED:
+                return

-    handler.send_response(HTTP_OK)
-    handler.send_header('Content-type', 'text/event-stream')
-    session_id = handler.set_session_cookie_header()
-    handler.end_headers()
+            if restrict and event.event_type not in restrict:
+                return

-    if restrict:
-        for event in restrict:
-            hass.bus.listen(event, forward_events)
-    else:
-        hass.bus.listen(MATCH_ALL, forward_events)
+            _LOGGER.debug('STREAM %s FORWARDING %s', id(stop_obj), event)

-    while True:
-        write_message(STREAM_PING_PAYLOAD)
+            if event.event_type == EVENT_HOMEASSISTANT_STOP:
+                data = stop_obj
+            else:
+                data = json.dumps(event, cls=rem.JSONEncoder)

-        block.wait(STREAM_PING_INTERVAL)
+            to_write.put(data)

-        if block.is_set():
-            break
+        def stream():
+            """Stream events to response."""
+            self.hass.bus.listen(MATCH_ALL, forward_events)

-    if not gracefully_closed:
-        _LOGGER.info("Found broken event stream to %s, cleaning up",
-                     handler.client_address[0])
+            _LOGGER.debug('STREAM %s ATTACHED', id(stop_obj))

-    if restrict:
-        for event in restrict:
-            hass.bus.remove_listener(event, forward_events)
-    else:
-        hass.bus.remove_listener(MATCH_ALL, forward_events)
+            # Fire off one message right away to have browsers fire open event
+            to_write.put(STREAM_PING_PAYLOAD)

+            while True:
+                try:
+                    payload = to_write.get(timeout=STREAM_PING_INTERVAL)

-def _handle_get_api_config(handler, path_match, data):
-    """ Returns the Home Assistant config. """
-    handler.write_json(handler.server.hass.config.as_dict())
+                    if payload is stop_obj:
+                        break

+                    msg = "data: {}\n\n".format(payload)
+                    _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
+                                  msg.strip())
+                    yield msg.encode("UTF-8")
+                except queue.Empty:
+                    to_write.put(STREAM_PING_PAYLOAD)
+                except GeneratorExit:
+                    break

-def _handle_get_api_bootstrap(handler, path_match, data):
-    """ Returns all data needed to bootstrap Home Assistant. """
-    hass = handler.server.hass
+            _LOGGER.debug('STREAM %s RESPONSE CLOSED', id(stop_obj))
+            self.hass.bus.remove_listener(MATCH_ALL, forward_events)

-    handler.write_json({
-        'config': hass.config.as_dict(),
-        'states': hass.states.all(),
-        'events': _events_json(hass),
-        'services': _services_json(hass),
-    })
+        return self.Response(stream(), mimetype='text/event-stream')


-def _handle_get_api_states(handler, path_match, data):
-    """ Returns a dict containing all entity ids and their state. """
-    handler.write_json(handler.server.hass.states.all())
+class APIConfigView(HomeAssistantView):
+    """View to handle Config requests."""

+    url = URL_API_CONFIG
+    name = "api:config"

-def _handle_get_api_states_entity(handler, path_match, data):
-    """ Returns the state of a specific entity. """
-    entity_id = path_match.group('entity_id')
+    def get(self, request):
+        """Get current configuration."""
+        return self.json(self.hass.config.as_dict())

-    state = handler.server.hass.states.get(entity_id)

-    if state:
-        handler.write_json(state)
-    else:
-        handler.write_json_message("State does not exist.", HTTP_NOT_FOUND)
+class APIDiscoveryView(HomeAssistantView):
+    """View to provide discovery info."""

+    requires_auth = False
+    url = URL_API_DISCOVERY_INFO
+    name = "api:discovery"

-def _handle_post_state_entity(handler, path_match, data):
-    """ Handles updating the state of an entity.
+    def get(self, request):
+        """Get discovery info."""
+        needs_auth = self.hass.config.api.api_password is not None
+        return self.json({
+            'base_url': self.hass.config.api.base_url,
+            'location_name': self.hass.config.location_name,
+            'requires_api_password': needs_auth,
+            'version': __version__
+        })

-    This handles the following paths:
-    /api/states/<entity_id>
-    """
-    entity_id = path_match.group('entity_id')

-    try:
-        new_state = data['state']
-    except KeyError:
-        handler.write_json_message("state not specified", HTTP_BAD_REQUEST)
-        return
+class APIStatesView(HomeAssistantView):
+    """View to handle States requests."""

-    attributes = data['attributes'] if 'attributes' in data else None
+    url = URL_API_STATES
+    name = "api:states"

-    is_new_state = handler.server.hass.states.get(entity_id) is None
+    def get(self, request):
+        """Get current states."""
+        return self.json(self.hass.states.all())

-    # Write state
-    handler.server.hass.states.set(entity_id, new_state, attributes)

-    state = handler.server.hass.states.get(entity_id)
+class APIEntityStateView(HomeAssistantView):
+    """View to handle EntityState requests."""

-    status_code = HTTP_CREATED if is_new_state else HTTP_OK
+    url = "/api/states/<entity(exist=False):entity_id>"
+    name = "api:entity-state"

-    handler.write_json(
-        state.as_dict(),
-        status_code=status_code,
-        location=URL_API_STATES_ENTITY.format(entity_id))
+    def get(self, request, entity_id):
+        """Retrieve state of entity."""
+        state = self.hass.states.get(entity_id)
+        if state:
+            return self.json(state)
+        else:
+            return self.json_message('Entity not found', HTTP_NOT_FOUND)

+    def post(self, request, entity_id):
+        """Update state of entity."""
+        try:
+            new_state = request.json['state']
+        except KeyError:
+            return self.json_message('No state specified', HTTP_BAD_REQUEST)

-def _handle_get_api_events(handler, path_match, data):
-    """ Handles getting overview of event listeners. """
-    handler.write_json(_events_json(handler.server.hass))
+        attributes = request.json.get('attributes')
+        force_update = request.json.get('force_update', False)

+        is_new_state = self.hass.states.get(entity_id) is None

-def _handle_api_post_events_event(handler, path_match, event_data):
-    """ Handles firing of an event.
+        # Write state
+        self.hass.states.set(entity_id, new_state, attributes, force_update)

-    This handles the following paths:
-    /api/events/<event_type>
+        # Read the state back for our response
+        resp = self.json(self.hass.states.get(entity_id))

-    Events from /api are threated as remote events.
-    """
-    event_type = path_match.group('event_type')
+        if is_new_state:
+            resp.status_code = HTTP_CREATED

-    if event_data is not None and not isinstance(event_data, dict):
-        handler.write_json_message(
-            "event_data should be an object", HTTP_UNPROCESSABLE_ENTITY)
+        resp.headers.add('Location', URL_API_STATES_ENTITY.format(entity_id))

-    event_origin = ha.EventOrigin.remote
+        return resp

-    # Special case handling for event STATE_CHANGED
-    # We will try to convert state dicts back to State objects
-    if event_type == ha.EVENT_STATE_CHANGED and event_data:
-        for key in ('old_state', 'new_state'):
-            state = ha.State.from_dict(event_data.get(key))
+    def delete(self, request, entity_id):
+        """Remove entity."""
+        if self.hass.states.remove(entity_id):
+            return self.json_message('Entity removed')
+        else:
+            return self.json_message('Entity not found', HTTP_NOT_FOUND)

-            if state:
-                event_data[key] = state

-    handler.server.hass.bus.fire(event_type, event_data, event_origin)
+class APIEventListenersView(HomeAssistantView):
+    """View to handle EventListeners requests."""

-    handler.write_json_message("Event {} fired.".format(event_type))
+    url = URL_API_EVENTS
+    name = "api:event-listeners"

+    def get(self, request):
+        """Get event listeners."""
+        return self.json(events_json(self.hass))

-def _handle_get_api_services(handler, path_match, data):
-    """ Handles getting overview of services. """
-    handler.write_json(_services_json(handler.server.hass))

+class APIEventView(HomeAssistantView):
+    """View to handle Event requests."""

-# pylint: disable=invalid-name
-def _handle_post_api_services_domain_service(handler, path_match, data):
-    """ Handles calling a service.
+    url = '/api/events/<event_type>'
+    name = "api:event"

-    This handles the following paths:
-    /api/services/<domain>/<service>
-    """
-    domain = path_match.group('domain')
-    service = path_match.group('service')
+    def post(self, request, event_type):
+        """Fire events."""
+        event_data = request.json

-    with TrackStates(handler.server.hass) as changed_states:
-        handler.server.hass.services.call(domain, service, data, True)
+        if event_data is not None and not isinstance(event_data, dict):
+            return self.json_message('Event data should be a JSON object',
+                                     HTTP_BAD_REQUEST)

-    handler.write_json(changed_states)
+        # Special case handling for event STATE_CHANGED
+        # We will try to convert state dicts back to State objects
+        if event_type == ha.EVENT_STATE_CHANGED and event_data:
+            for key in ('old_state', 'new_state'):
+                state = ha.State.from_dict(event_data.get(key))

+                if state:
+                    event_data[key] = state

-# pylint: disable=invalid-name
-def _handle_post_api_event_forward(handler, path_match, data):
-    """ Handles adding an event forwarding target. """
+        self.hass.bus.fire(event_type, event_data, ha.EventOrigin.remote)

-    try:
-        host = data['host']
-        api_password = data['api_password']
-    except KeyError:
-        handler.write_json_message(
-            "No host or api_password received.", HTTP_BAD_REQUEST)
-        return
+        return self.json_message("Event {} fired.".format(event_type))

-    try:
-        port = int(data['port']) if 'port' in data else None
-    except ValueError:
-        handler.write_json_message(
-            "Invalid value received for port", HTTP_UNPROCESSABLE_ENTITY)
-        return

-    api = rem.API(host, api_password, port)
+class APIServicesView(HomeAssistantView):
+    """View to handle Services requests."""

-    if not api.validate_api():
-        handler.write_json_message(
-            "Unable to validate API", HTTP_UNPROCESSABLE_ENTITY)
-        return
+    url = URL_API_SERVICES
+    name = "api:services"

-    if handler.server.event_forwarder is None:
-        handler.server.event_forwarder = \
-            rem.EventForwarder(handler.server.hass)
+    def get(self, request):
+        """Get registered services."""
+        return self.json(services_json(self.hass))

-    handler.server.event_forwarder.connect(api)

-    handler.write_json_message("Event forwarding setup.")
+class APIDomainServicesView(HomeAssistantView):
+    """View to handle DomainServices requests."""

+    url = "/api/services/<domain>/<service>"
+    name = "api:domain-services"

-def _handle_delete_api_event_forward(handler, path_match, data):
-    """ Handles deleting an event forwarding target. """
+    def post(self, request, domain, service):
+        """Call a service.

-    try:
-        host = data['host']
-    except KeyError:
-        handler.write_json_message("No host received.", HTTP_BAD_REQUEST)
-        return
+        Returns a list of changed states.
+        """
+        with TrackStates(self.hass) as changed_states:
+            self.hass.services.call(domain, service, request.json, True)

-    try:
-        port = int(data['port']) if 'port' in data else None
-    except ValueError:
-        handler.write_json_message(
-            "Invalid value received for port", HTTP_UNPROCESSABLE_ENTITY)
-        return
+        return self.json(changed_states)

-    if handler.server.event_forwarder is not None:
-        api = rem.API(host, None, port)

-        handler.server.event_forwarder.disconnect(api)
+class APIEventForwardingView(HomeAssistantView):
+    """View to handle EventForwarding requests."""

-    handler.write_json_message("Event forwarding cancelled.")
+    url = URL_API_EVENT_FORWARD
+    name = "api:event-forward"
+    event_forwarder = None

+    def post(self, request):
+        """Setup an event forwarder."""
+        data = request.json
+        if data is None:
+            return self.json_message("No data received.", HTTP_BAD_REQUEST)
+        try:
+            host = data['host']
+            api_password = data['api_password']
+        except KeyError:
+            return self.json_message("No host or api_password received.",
+                                     HTTP_BAD_REQUEST)

-def _handle_get_api_components(handler, path_match, data):
-    """ Returns all the loaded components. """
+        try:
+            port = int(data['port']) if 'port' in data else None
+        except ValueError:
+            return self.json_message("Invalid value received for port.",
+                                     HTTP_UNPROCESSABLE_ENTITY)

-    handler.write_json(handler.server.hass.config.components)
+        api = rem.API(host, api_password, port)

+        if not api.validate_api():
+            return self.json_message("Unable to validate API.",
+                                     HTTP_UNPROCESSABLE_ENTITY)

-def _handle_get_api_error_log(handler, path_match, data):
-    """ Returns the logged errors for this session. """
-    handler.write_file(handler.server.hass.config.path(ERROR_LOG_FILENAME),
-                       False)
+        if self.event_forwarder is None:
+            self.event_forwarder = rem.EventForwarder(self.hass)

+        self.event_forwarder.connect(api)

-def _handle_post_api_log_out(handler, path_match, data):
-    """ Log user out. """
-    handler.send_response(HTTP_OK)
-    handler.destroy_session()
-    handler.end_headers()
+        return self.json_message("Event forwarding setup.")

+    def delete(self, request):
+        """Remove event forwarer."""
+        data = request.json
+        if data is None:
+            return self.json_message("No data received.", HTTP_BAD_REQUEST)

-def _handle_post_api_template(handler, path_match, data):
-    """ Log user out. """
-    template_string = data.get('template', '')
+        try:
+            host = data['host']
+        except KeyError:
+            return self.json_message("No host received.", HTTP_BAD_REQUEST)

-    try:
-        rendered = template.render(handler.server.hass, template_string)
+        try:
+            port = int(data['port']) if 'port' in data else None
+        except ValueError:
+            return self.json_message("Invalid value received for port.",
+                                     HTTP_UNPROCESSABLE_ENTITY)

-        handler.send_response(HTTP_OK)
-        handler.send_header(HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_TEXT_PLAIN)
-        handler.end_headers()
-        handler.wfile.write(rendered.encode('utf-8'))
-    except TemplateError as e:
-        handler.write_json_message(str(e), HTTP_UNPROCESSABLE_ENTITY)
-        return
+        if self.event_forwarder is not None:
+            api = rem.API(host, None, port)

+            self.event_forwarder.disconnect(api)

-def _services_json(hass):
-    """ Generate services data to JSONify. """
+        return self.json_message("Event forwarding cancelled.")
+
+
+class APIComponentsView(HomeAssistantView):
+    """View to handle Components requests."""
+
+    url = URL_API_COMPONENTS
+    name = "api:components"
+
+    def get(self, request):
+        """Get current loaded components."""
+        return self.json(self.hass.config.components)
+
+
+class APIErrorLogView(HomeAssistantView):
+    """View to handle ErrorLog requests."""
+
+    url = URL_API_ERROR_LOG
+    name = "api:error-log"
+
+    def get(self, request):
+        """Serve error log."""
+        return self.file(request, self.hass.config.path(ERROR_LOG_FILENAME))
+
+
+class APITemplateView(HomeAssistantView):
+    """View to handle requests."""
+
+    url = URL_API_TEMPLATE
+    name = "api:template"
+
+    def post(self, request):
+        """Render a template."""
+        try:
+            return template.render(self.hass, request.json['template'],
+                                   request.json.get('variables'))
+        except TemplateError as ex:
+            return self.json_message('Error rendering template: {}'.format(ex),
+                                     HTTP_BAD_REQUEST)
+
+
+def services_json(hass):
+    """Generate services data to JSONify."""
    return [{"domain": key, "services": value}
            for key, value in hass.services.services.items()]


-def _events_json(hass):
-    """ Generate event data to JSONify. """
+def events_json(hass):
+    """Generate event data to JSONify."""
    return [{"event": key, "listener_count": value}
            for key, value in hass.bus.listeners.items()]
--- a/homeassistant/components/arduino.py
+++ b/homeassistant/components/arduino.py
@@ -1,27 +1,23 @@
 """
-components.arduino
-~~~~~~~~~~~~~~~~~~
-Arduino component that connects to a directly attached Arduino board which
-runs with the Firmata firmware.
+Support for Arduino boards running with the Firmata firmware.

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

+from homeassistant.const import (
+    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.helpers import validate_config
-from homeassistant.const import (EVENT_HOMEASSISTANT_START,
-                                 EVENT_HOMEASSISTANT_STOP)

 DOMAIN = "arduino"
-REQUIREMENTS = ['PyMata==2.07a']
+REQUIREMENTS = ['PyMata==2.12']
 BOARD = None
 _LOGGER = logging.getLogger(__name__)


 def setup(hass, config):
-    """ Setup the Arduino component. """
-
+    """Setup the Arduino component."""
    if not validate_config(config,
                           {DOMAIN: ['port']},
                           _LOGGER):
@@ -40,11 +36,11 @@ def setup(hass, config):
        return False

    def stop_arduino(event):
-        """ Stop the Arduino service. """
+        """Stop the Arduino service."""
        BOARD.disconnect()

    def start_arduino(event):
-        """ Start the Arduino service. """
+        """Start the Arduino service."""
        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_arduino)

    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_arduino)
@@ -53,15 +49,16 @@ def setup(hass, config):


 class ArduinoBoard(object):
-    """ Represents an Arduino board. """
+    """Representation of an Arduino board."""

    def __init__(self, port):
+        """Initialize the board."""
        from PyMata.pymata import PyMata
        self._port = port
        self._board = PyMata(self._port, verbose=False)

    def set_mode(self, pin, direction, mode):
-        """ Sets the mode and the direction of a given pin. """
+        """Set the mode and the direction of a given pin."""
        if mode == 'analog' and direction == 'in':
            self._board.set_pin_mode(pin,
                                     self._board.INPUT,
@@ -72,7 +69,7 @@ class ArduinoBoard(object):
                                     self._board.ANALOG)
        elif mode == 'digital' and direction == 'in':
            self._board.set_pin_mode(pin,
-                                     self._board.OUTPUT,
+                                     self._board.INPUT,
                                     self._board.DIGITAL)
        elif mode == 'digital' and direction == 'out':
            self._board.set_pin_mode(pin,
@@ -84,31 +81,31 @@ class ArduinoBoard(object):
                                     self._board.PWM)

    def get_analog_inputs(self):
-        """ Get the values from the pins. """
+        """Get the values from the pins."""
        self._board.capability_query()
        return self._board.get_analog_response_table()

    def set_digital_out_high(self, pin):
-        """ Sets a given digital pin to high. """
+        """Set a given digital pin to high."""
        self._board.digital_write(pin, 1)

    def set_digital_out_low(self, pin):
-        """ Sets a given digital pin to low. """
+        """Set a given digital pin to low."""
        self._board.digital_write(pin, 0)

    def get_digital_in(self, pin):
-        """ Gets the value from a given digital pin. """
+        """Get the value from a given digital pin."""
        self._board.digital_read(pin)

    def get_analog_in(self, pin):
-        """ Gets the value from a given analog pin. """
+        """Get the value from a given analog pin."""
        self._board.analog_read(pin)

    def get_firmata(self):
-        """ Return the version of the Firmata firmware. """
+        """Return the version of the Firmata firmware."""
        return self._board.get_firmata_version()

    def disconnect(self):
-        """ Disconnects the board and closes the serial connection. """
+        """Disconnect the board and close the serial connection."""
        self._board.reset()
        self._board.close()
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -1,24 +1,26 @@
 """
-homeassistant.components.automation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Allows to setup simple automation rules via the config file.
+Allow to setup simple automation rules via the config file.

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

+import voluptuous as vol
+
 from homeassistant.bootstrap import prepare_setup_platform
-from homeassistant.const import CONF_PLATFORM
+from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM
 from homeassistant.components import logbook
-from homeassistant.helpers.service import call_from_config
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import extract_domain_configs, script, condition
+from homeassistant.loader import get_platform
+import homeassistant.helpers.config_validation as cv

 DOMAIN = 'automation'

 DEPENDENCIES = ['group']

 CONF_ALIAS = 'alias'
-CONF_SERVICE = 'service'

 CONF_CONDITION = 'condition'
 CONF_ACTION = 'action'
@@ -31,47 +33,86 @@ CONDITION_TYPE_OR = 'or'

 DEFAULT_CONDITION_TYPE = CONDITION_TYPE_AND

+METHOD_TRIGGER = 'trigger'
+METHOD_IF_ACTION = 'if_action'
+
 _LOGGER = logging.getLogger(__name__)


+def _platform_validator(method, schema):
+    """Generate platform validator for different steps."""
+    def validator(config):
+        """Validate it is a valid  platform."""
+        platform = get_platform(DOMAIN, config[CONF_PLATFORM])
+
+        if not hasattr(platform, method):
+            raise vol.Invalid('invalid method platform')
+
+        if not hasattr(platform, schema):
+            return config
+
+        return getattr(platform, schema)(config)
+
+    return validator
+
+_TRIGGER_SCHEMA = vol.All(
+    cv.ensure_list,
+    [
+        vol.All(
+            vol.Schema({
+                vol.Required(CONF_PLATFORM): cv.platform_validator(DOMAIN)
+            }, extra=vol.ALLOW_EXTRA),
+            _platform_validator(METHOD_TRIGGER, 'TRIGGER_SCHEMA')
+        ),
+    ]
+)
+
+_CONDITION_SCHEMA = vol.Any(
+    CONDITION_USE_TRIGGER_VALUES,
+    vol.All(
+        cv.ensure_list,
+        [
+            vol.All(
+                vol.Schema({
+                    CONF_PLATFORM: str,
+                    CONF_CONDITION: str,
+                }, extra=vol.ALLOW_EXTRA),
+                cv.has_at_least_one_key(CONF_PLATFORM, CONF_CONDITION),
+            ),
+        ]
+    )
+)
+
+PLATFORM_SCHEMA = vol.Schema({
+    CONF_ALIAS: cv.string,
+    vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA,
+    vol.Required(CONF_CONDITION_TYPE, default=DEFAULT_CONDITION_TYPE):
+        vol.All(vol.Lower, vol.Any(CONDITION_TYPE_AND, CONDITION_TYPE_OR)),
+    CONF_CONDITION: _CONDITION_SCHEMA,
+    vol.Required(CONF_ACTION): cv.SCRIPT_SCHEMA,
+})
+
+
 def setup(hass, config):
-    """ Sets up automation. """
-    config_key = DOMAIN
-    found = 1
+    """Setup the automation."""
+    success = False
+    for config_key in extract_domain_configs(config, DOMAIN):
+        conf = config[config_key]

-    while config_key in config:
-        # check for one block syntax
-        if isinstance(config[config_key], dict):
-            config_block = _migrate_old_config(config[config_key])
-            name = config_block.get(CONF_ALIAS, config_key)
-            _setup_automation(hass, config_block, name, config)
+        for list_no, config_block in enumerate(conf):
+            name = config_block.get(CONF_ALIAS, "{}, {}".format(config_key,
+                                                                list_no))
+            success = (_setup_automation(hass, config_block, name, config) or
+                       success)

-        # check for multiple block syntax
-        elif isinstance(config[config_key], list):
-            for list_no, config_block in enumerate(config[config_key]):
-                name = config_block.get(CONF_ALIAS,
-                                        "{}, {}".format(config_key, list_no))
-                _setup_automation(hass, config_block, name, config)
-
-        # any scalar value is incorrect
-        else:
-            _LOGGER.error('Error in config in section %s.', config_key)
-
-        found += 1
-        config_key = "{} {}".format(DOMAIN, found)
-
-    return True
+    return success


 def _setup_automation(hass, config_block, name, config):
-    """ Setup one instance of automation """
-
+    """Setup one instance of automation."""
    action = _get_action(hass, config_block.get(CONF_ACTION, {}), name)

-    if action is None:
-        return False
-
-    if CONF_CONDITION in config_block or CONF_CONDITION_TYPE in config_block:
+    if CONF_CONDITION in config_block:
        action = _process_if(hass, config, config_block, action)

        if action is None:
@@ -83,107 +124,79 @@ def _setup_automation(hass, config_block, name, config):


 def _get_action(hass, config, name):
-    """ Return an action based on a config. """
+    """Return an action based on a configuration."""
+    script_obj = script.Script(hass, config, name)

-    if CONF_SERVICE not in config:
-        _LOGGER.error('Error setting up %s, no action specified.', name)
-        return None
-
-    def action():
-        """ Action to be executed. """
+    def action(variables=None):
+        """Action to be executed."""
        _LOGGER.info('Executing %s', name)
        logbook.log_entry(hass, name, 'has been triggered', DOMAIN)
-
-        call_from_config(hass, config)
+        script_obj.run(variables)

    return action


-def _migrate_old_config(config):
-    """ Migrate old config to new. """
-    if CONF_PLATFORM not in config:
-        return config
-
-    _LOGGER.warning(
-        'You are using an old configuration format. Please upgrade: '
-        'https://home-assistant.io/components/automation/')
-
-    new_conf = {
-        CONF_TRIGGER: dict(config),
-        CONF_CONDITION: config.get('if', []),
-        CONF_ACTION: dict(config),
-    }
-
-    for cat, key, new_key in (('trigger', 'mqtt_topic', 'topic'),
-                              ('trigger', 'mqtt_payload', 'payload'),
-                              ('trigger', 'state_entity_id', 'entity_id'),
-                              ('trigger', 'state_before', 'before'),
-                              ('trigger', 'state_after', 'after'),
-                              ('trigger', 'state_to', 'to'),
-                              ('trigger', 'state_from', 'from'),
-                              ('trigger', 'state_hours', 'hours'),
-                              ('trigger', 'state_minutes', 'minutes'),
-                              ('trigger', 'state_seconds', 'seconds'),
-                              ('action', 'execute_service', 'service'),
-                              ('action', 'service_entity_id', 'entity_id'),
-                              ('action', 'service_data', 'data')):
-        if key in new_conf[cat]:
-            new_conf[cat][new_key] = new_conf[cat].pop(key)
-
-    return new_conf
-
-
 def _process_if(hass, config, p_config, action):
-    """ Processes if checks. """
-
+    """Process if checks."""
    cond_type = p_config.get(CONF_CONDITION_TYPE,
                             DEFAULT_CONDITION_TYPE).lower()

+    # Deprecated since 0.19 - 5/5/2016
+    if cond_type != DEFAULT_CONDITION_TYPE:
+        _LOGGER.warning('Using condition_type: "or" is deprecated. Please use '
+                        '"condition: or" instead.')
+
    if_configs = p_config.get(CONF_CONDITION)
    use_trigger = if_configs == CONDITION_USE_TRIGGER_VALUES

    if use_trigger:
        if_configs = p_config[CONF_TRIGGER]

-    if isinstance(if_configs, dict):
-        if_configs = [if_configs]
-
    checks = []
    for if_config in if_configs:
-        platform = _resolve_platform('if_action', hass, config,
-                                     if_config.get(CONF_PLATFORM))
-        if platform is None:
-            continue
+        # Deprecated except for used by use_trigger_values
+        # since 0.19 - 5/5/2016
+        if CONF_PLATFORM in if_config:
+            if not use_trigger:
+                _LOGGER.warning("Please switch your condition configuration "
+                                "to use 'condition' instead of 'platform'.")
+            if_config = dict(if_config)
+            if_config[CONF_CONDITION] = if_config.pop(CONF_PLATFORM)

-        check = platform.if_action(hass, if_config)
+            # To support use_trigger_values with state trigger accepting
+            # multiple entity_ids to monitor.
+            if_entity_id = if_config.get(ATTR_ENTITY_ID)
+            if isinstance(if_entity_id, list) and len(if_entity_id) == 1:
+                if_config[ATTR_ENTITY_ID] = if_entity_id[0]

-        # Invalid conditions are allowed if we base it on trigger
-        if check is None and not use_trigger:
-            return None
-
-        checks.append(check)
+        try:
+            checks.append(condition.from_config(if_config))
+        except HomeAssistantError as ex:
+            # Invalid conditions are allowed if we base it on trigger
+            if use_trigger:
+                _LOGGER.warning('Ignoring invalid condition: %s', ex)
+            else:
+                _LOGGER.warning('Invalid condition: %s', ex)
+                return None

    if cond_type == CONDITION_TYPE_AND:
-        def if_action():
-            """ AND all conditions. """
-            if all(check() for check in checks):
-                action()
+        def if_action(variables=None):
+            """AND all conditions."""
+            if all(check(hass, variables) for check in checks):
+                action(variables)
    else:
-        def if_action():
-            """ OR all conditions. """
-            if any(check() for check in checks):
-                action()
+        def if_action(variables=None):
+            """OR all conditions."""
+            if any(check(hass, variables) for check in checks):
+                action(variables)

    return if_action


 def _process_trigger(hass, config, trigger_configs, name, action):
-    """ Setup triggers. """
-    if isinstance(trigger_configs, dict):
-        trigger_configs = [trigger_configs]
-
+    """Setup the triggers."""
    for conf in trigger_configs:
-        platform = _resolve_platform('trigger', hass, config,
+        platform = _resolve_platform(METHOD_TRIGGER, hass, config,
                                     conf.get(CONF_PLATFORM))
        if platform is None:
            continue
@@ -195,7 +208,7 @@ def _process_trigger(hass, config, trigger_configs, name, action):


 def _resolve_platform(method, hass, config, platform):
-    """ Find automation platform. """
+    """Find the automation platform."""
    if platform is None:
        return None
    platform = prepare_setup_platform(hass, config, DOMAIN, platform)
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -1,34 +1,43 @@
 """
-homeassistant.components.automation.event
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers event listening automation rules.
+Offer event listening automation rules.

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

+import voluptuous as vol
+
+from homeassistant.const import CONF_PLATFORM
+from homeassistant.helpers import config_validation as cv
+
 CONF_EVENT_TYPE = "event_type"
 CONF_EVENT_DATA = "event_data"

 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'event',
+    vol.Required(CONF_EVENT_TYPE): cv.string,
+    vol.Optional(CONF_EVENT_DATA): dict,
+})
+

 def trigger(hass, config, action):
-    """ Listen for events based on config. """
+    """Listen for events based on configuration."""
    event_type = config.get(CONF_EVENT_TYPE)
-
-    if event_type is None:
-        _LOGGER.error("Missing configuration key %s", CONF_EVENT_TYPE)
-        return False
-
    event_data = config.get(CONF_EVENT_DATA)

    def handle_event(event):
-        """ Listens for events and calls the action when data matches. """
+        """Listen for events and calls the action when data matches."""
        if not event_data or all(val == event.data.get(key) for key, val
                                 in event_data.items()):
-            action()
+            action({
+                'trigger': {
+                    'platform': 'event',
+                    'event': event,
+                },
+            })

    hass.bus.listen(event_type, handle_event)
    return True
--- a/homeassistant/components/automation/mqtt.py
+++ b/homeassistant/components/automation/mqtt.py
@@ -1,35 +1,43 @@
 """
-homeassistant.components.automation.mqtt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers MQTT listening automation rules.
+Offer MQTT listening automation rules.

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

 import homeassistant.components.mqtt as mqtt
+from homeassistant.const import CONF_PLATFORM
+import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['mqtt']

 CONF_TOPIC = 'topic'
 CONF_PAYLOAD = 'payload'

+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): mqtt.DOMAIN,
+    vol.Required(CONF_TOPIC): mqtt.valid_subscribe_topic,
+    vol.Optional(CONF_PAYLOAD): cv.string,
+})
+

 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
-    topic = config.get(CONF_TOPIC)
+    """Listen for state changes based on configuration."""
+    topic = config[CONF_TOPIC]
    payload = config.get(CONF_PAYLOAD)

-    if topic is None:
-        logging.getLogger(__name__).error(
-            "Missing configuration key %s", CONF_TOPIC)
-        return False
-
    def mqtt_automation_listener(msg_topic, msg_payload, qos):
-        """ Listens for MQTT messages. """
+        """Listen for MQTT messages."""
        if payload is None or payload == msg_payload:
-            action()
+            action({
+                'trigger': {
+                    'platform': 'mqtt',
+                    'topic': msg_topic,
+                    'payload': msg_payload,
+                    'qos': qos,
+                }
+            })

    mqtt.subscribe(hass, topic, mqtt_automation_listener)

--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -1,110 +1,69 @@
 """
-homeassistant.components.automation.numeric_state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers numeric state listening automation rules.
+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
 """
-from functools import partial
 import logging

-from homeassistant.const import CONF_VALUE_TEMPLATE
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_VALUE_TEMPLATE, CONF_PLATFORM, CONF_ENTITY_ID,
+    CONF_BELOW, CONF_ABOVE)
 from homeassistant.helpers.event import track_state_change
-from homeassistant.util import template
+from homeassistant.helpers import condition, config_validation as cv

-
-CONF_ENTITY_ID = "entity_id"
-CONF_BELOW = "below"
-CONF_ABOVE = "above"
+TRIGGER_SCHEMA = vol.All(vol.Schema({
+    vol.Required(CONF_PLATFORM): 'numeric_state',
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+    CONF_BELOW: vol.Coerce(float),
+    CONF_ABOVE: vol.Coerce(float),
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+}), cv.has_at_least_one_key(CONF_BELOW, CONF_ABOVE))

 _LOGGER = logging.getLogger(__name__)


-def _renderer(hass, value_template, state):
-    """Render state value."""
-    if value_template is None:
-        return state.state
-
-    return template.render(hass, value_template, {'state': state})
-
-
 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
+    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
-
-    if entity_id is None:
-        _LOGGER.error("Missing configuration key %s", CONF_ENTITY_ID)
-        return False
-
    below = config.get(CONF_BELOW)
    above = config.get(CONF_ABOVE)
    value_template = config.get(CONF_VALUE_TEMPLATE)

-    if below is None and above is None:
-        _LOGGER.error("Missing configuration key."
-                      " One of %s or %s is required",
-                      CONF_BELOW, CONF_ABOVE)
-        return False
-
-    renderer = partial(_renderer, hass, value_template)
-
    # pylint: disable=unused-argument
    def state_automation_listener(entity, from_s, to_s):
-        """ Listens for state changes and calls action. """
+        """Listen for state changes and calls action."""
+        if to_s is None:
+            return

-        # Fire action if we go from outside range into range
-        if _in_range(above, below, renderer(to_s)) and \
-           (from_s is None or not _in_range(above, below, renderer(from_s))):
-            action()
+        variables = {
+            'trigger': {
+                'platform': 'numeric_state',
+                'entity_id': entity,
+                'below': below,
+                'above': above,
+            }
+        }
+
+        # If new one doesn't match, nothing to do
+        if not condition.numeric_state(
+                hass, to_s, below, above, value_template, variables):
+            return
+
+        # Only match if old didn't exist or existed but didn't match
+        # Written as: skip if old one did exist and matched
+        if from_s is not None and condition.numeric_state(
+                hass, from_s, below, above, value_template, variables):
+            return
+
+        variables['trigger']['from_state'] = from_s
+        variables['trigger']['to_state'] = to_s
+
+        action(variables)

    track_state_change(
        hass, entity_id, state_automation_listener)

    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with state based condition. """
-
-    entity_id = config.get(CONF_ENTITY_ID)
-
-    if entity_id is None:
-        _LOGGER.error("Missing configuration key %s", CONF_ENTITY_ID)
-        return None
-
-    below = config.get(CONF_BELOW)
-    above = config.get(CONF_ABOVE)
-    value_template = config.get(CONF_VALUE_TEMPLATE)
-
-    if below is None and above is None:
-        _LOGGER.error("Missing configuration key."
-                      " One of %s or %s is required",
-                      CONF_BELOW, CONF_ABOVE)
-        return None
-
-    renderer = partial(_renderer, hass, value_template)
-
-    def if_numeric_state():
-        """ Test numeric state condition. """
-        state = hass.states.get(entity_id)
-        return state is not None and _in_range(above, below, renderer(state))
-
-    return if_numeric_state
-
-
-def _in_range(range_start, range_end, value):
-    """ Checks if value is inside the range """
-    try:
-        value = float(value)
-    except ValueError:
-        _LOGGER.warning("Value returned from template is not a number: %s",
-                        value)
-        return False
-
-    if range_start is not None and range_end is not None:
-        return float(range_start) <= value < float(range_end)
-    elif range_end is not None:
-        return value < float(range_end)
-    else:
-        return float(range_start) <= value
--- a/homeassistant/components/automation/state.py
+++ b/homeassistant/components/automation/state.py
@@ -1,65 +1,85 @@
 """
-homeassistant.components.automation.state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers state listening automation rules.
+Offer state listening automation rules.

 For more details about this automation rule, please refer to the documentation
 at https://home-assistant.io/components/automation/#state-trigger
 """
-import logging
-
-from homeassistant.helpers.event import track_state_change
-from homeassistant.const import MATCH_ALL
+import voluptuous as vol

+import homeassistant.util.dt as dt_util
+from homeassistant.const import (
+    EVENT_STATE_CHANGED, EVENT_TIME_CHANGED, MATCH_ALL, CONF_PLATFORM)
+from homeassistant.helpers.event import track_state_change, track_point_in_time
+import homeassistant.helpers.config_validation as cv

 CONF_ENTITY_ID = "entity_id"
 CONF_FROM = "from"
 CONF_TO = "to"
 CONF_STATE = "state"
+CONF_FOR = "for"
+
+TRIGGER_SCHEMA = vol.All(
+    vol.Schema({
+        vol.Required(CONF_PLATFORM): 'state',
+        vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+        # These are str on purpose. Want to catch YAML conversions
+        CONF_FROM: str,
+        CONF_TO: str,
+        CONF_STATE: str,
+        CONF_FOR: vol.All(cv.time_period, cv.positive_timedelta),
+    }),
+    vol.Any(cv.key_dependency(CONF_FOR, CONF_TO),
+            cv.key_dependency(CONF_FOR, CONF_STATE))
+)


 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
+    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
-
-    if entity_id is None:
-        logging.getLogger(__name__).error(
-            "Missing trigger configuration key %s", CONF_ENTITY_ID)
-        return False
-
    from_state = config.get(CONF_FROM, MATCH_ALL)
    to_state = config.get(CONF_TO) or config.get(CONF_STATE) or MATCH_ALL
-
-    if isinstance(from_state, bool) or isinstance(to_state, bool):
-        logging.getLogger(__name__).error(
-            'Config error. Surround to/from values with quotes.')
-        return False
+    time_delta = config.get(CONF_FOR)

    def state_automation_listener(entity, from_s, to_s):
-        """ Listens for state changes and calls action. """
-        action()
+        """Listen for state changes and calls action."""
+        def call_action():
+            """Call action with right context."""
+            action({
+                'trigger': {
+                    'platform': 'state',
+                    'entity_id': entity,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                    'for': time_delta,
+                }
+            })
+
+        if time_delta is None:
+            call_action()
+            return
+
+        def state_for_listener(now):
+            """Fire on state changes after a delay and calls action."""
+            hass.bus.remove_listener(
+                EVENT_STATE_CHANGED, attached_state_for_cancel)
+            call_action()
+
+        def state_for_cancel_listener(entity, inner_from_s, inner_to_s):
+            """Fire on changes and cancel for listener if changed."""
+            if inner_to_s.state == to_s.state:
+                return
+            hass.bus.remove_listener(EVENT_TIME_CHANGED,
+                                     attached_state_for_listener)
+            hass.bus.remove_listener(EVENT_STATE_CHANGED,
+                                     attached_state_for_cancel)
+
+        attached_state_for_listener = track_point_in_time(
+            hass, state_for_listener, dt_util.utcnow() + time_delta)
+
+        attached_state_for_cancel = track_state_change(
+            hass, entity, state_for_cancel_listener)

    track_state_change(
        hass, entity_id, state_automation_listener, from_state, to_state)

    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with state based condition. """
-    entity_id = config.get(CONF_ENTITY_ID)
-    state = config.get(CONF_STATE)
-
-    if entity_id is None or state is None:
-        logging.getLogger(__name__).error(
-            "Missing if-condition configuration key %s or %s", CONF_ENTITY_ID,
-            CONF_STATE)
-        return None
-
-    state = str(state)
-
-    def if_state():
-        """ Test if condition. """
-        return hass.states.is_state(entity_id, state)
-
-    return if_state
--- a/homeassistant/components/automation/sun.py
+++ b/homeassistant/components/automation/sun.py
@@ -1,148 +1,49 @@
 """
-homeassistant.components.automation.sun
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers sun based automation rules.
+Offer sun based automation rules.

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

-from homeassistant.components import sun
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_EVENT, CONF_OFFSET, CONF_PLATFORM, SUN_EVENT_SUNRISE)
 from homeassistant.helpers.event import track_sunrise, track_sunset
-import homeassistant.util.dt as dt_util
+import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['sun']

-CONF_OFFSET = 'offset'
-CONF_EVENT = 'event'
-CONF_BEFORE = "before"
-CONF_BEFORE_OFFSET = "before_offset"
-CONF_AFTER = "after"
-CONF_AFTER_OFFSET = "after_offset"
-
-EVENT_SUNSET = 'sunset'
-EVENT_SUNRISE = 'sunrise'
-
 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'sun',
+    vol.Required(CONF_EVENT): cv.sun_event,
+    vol.Required(CONF_OFFSET, default=timedelta(0)): cv.time_period,
+})
+

 def trigger(hass, config, action):
-    """ Listen for events based on config. """
+    """Listen for events based on configuration."""
    event = config.get(CONF_EVENT)
+    offset = config.get(CONF_OFFSET)

-    if event is None:
-        _LOGGER.error("Missing configuration key %s", CONF_EVENT)
-        return False
-
-    event = event.lower()
-    if event not in (EVENT_SUNRISE, EVENT_SUNSET):
-        _LOGGER.error("Invalid value for %s: %s", CONF_EVENT, event)
-        return False
-
-    offset = _parse_offset(config.get(CONF_OFFSET))
-    if offset is False:
-        return False
+    def call_action():
+        """Call action with right context."""
+        action({
+            'trigger': {
+                'platform': 'sun',
+                'event': event,
+                'offset': offset,
+            },
+        })

    # Do something to call action
-    if event == EVENT_SUNRISE:
-        track_sunrise(hass, action, offset)
+    if event == SUN_EVENT_SUNRISE:
+        track_sunrise(hass, call_action, offset)
    else:
-        track_sunset(hass, action, offset)
+        track_sunset(hass, call_action, offset)

    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with sun based condition. """
-    before = config.get(CONF_BEFORE)
-    after = config.get(CONF_AFTER)
-
-    # Make sure required configuration keys are present
-    if before is None and after is None:
-        logging.getLogger(__name__).error(
-            "Missing if-condition configuration key %s or %s",
-            CONF_BEFORE, CONF_AFTER)
-        return None
-
-    # Make sure configuration keys have the right value
-    if before not in (None, EVENT_SUNRISE, EVENT_SUNSET) or \
-       after not in (None, EVENT_SUNRISE, EVENT_SUNSET):
-        logging.getLogger(__name__).error(
-            "%s and %s can only be set to %s or %s",
-            CONF_BEFORE, CONF_AFTER, EVENT_SUNRISE, EVENT_SUNSET)
-        return None
-
-    before_offset = _parse_offset(config.get(CONF_BEFORE_OFFSET))
-    after_offset = _parse_offset(config.get(CONF_AFTER_OFFSET))
-    if before_offset is False or after_offset is False:
-        return None
-
-    if before is None:
-        def before_func():
-            """Return no point in time."""
-            return None
-    elif before == EVENT_SUNRISE:
-        def before_func():
-            """Return time before sunrise."""
-            return sun.next_rising(hass) + before_offset
-    else:
-        def before_func():
-            """Return time before sunset."""
-            return sun.next_setting(hass) + before_offset
-
-    if after is None:
-        def after_func():
-            """Return no point in time."""
-            return None
-    elif after == EVENT_SUNRISE:
-        def after_func():
-            """Return time after sunrise."""
-            return sun.next_rising(hass) + after_offset
-    else:
-        def after_func():
-            """Return time after sunset."""
-            return sun.next_setting(hass) + after_offset
-
-    def time_if():
-        """ Validate time based if-condition """
-
-        now = dt_util.now()
-        before = before_func()
-        after = after_func()
-
-        if before is not None and now > now.replace(hour=before.hour,
-                                                    minute=before.minute):
-            return False
-
-        if after is not None and now < now.replace(hour=after.hour,
-                                                   minute=after.minute):
-            return False
-
-        return True
-
-    return time_if
-
-
-def _parse_offset(raw_offset):
-    if raw_offset is None:
-        return timedelta(0)
-
-    negative_offset = False
-    if raw_offset.startswith('-'):
-        negative_offset = True
-        raw_offset = raw_offset[1:]
-
-    try:
-        (hour, minute, second) = [int(x) for x in raw_offset.split(':')]
-    except ValueError:
-        _LOGGER.error('Could not parse offset %s', raw_offset)
-        return False
-
-    offset = timedelta(hours=hour, minutes=minute, seconds=second)
-
-    if negative_offset:
-        offset *= -1
-
-    return offset
--- a/homeassistant/components/automation/template.py
+++ b/homeassistant/components/automation/template.py
@@ -1,65 +1,53 @@
 """
-homeassistant.components.automation.template
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers template automation rules.
+Offer template automation rules.

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

-from homeassistant.const import CONF_VALUE_TEMPLATE, EVENT_STATE_CHANGED
-from homeassistant.exceptions import TemplateError
-from homeassistant.util import template
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_VALUE_TEMPLATE, CONF_PLATFORM, MATCH_ALL)
+from homeassistant.helpers import condition
+from homeassistant.helpers.event import track_state_change
+import homeassistant.helpers.config_validation as cv
+

 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = IF_ACTION_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'template',
+    vol.Required(CONF_VALUE_TEMPLATE): cv.template,
+})
+

 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
+    """Listen for state changes based on configuration."""
    value_template = config.get(CONF_VALUE_TEMPLATE)

-    if value_template is None:
-        _LOGGER.error("Missing configuration key %s", CONF_VALUE_TEMPLATE)
-        return False
-
    # Local variable to keep track of if the action has already been triggered
    already_triggered = False

-    def event_listener(event):
-        """ Listens for state changes and calls action. """
+    def state_changed_listener(entity_id, from_s, to_s):
+        """Listen for state changes and calls action."""
        nonlocal already_triggered
-        template_result = _check_template(hass, value_template)
+        template_result = condition.template(hass, value_template)

        # Check to see if template returns true
        if template_result and not already_triggered:
            already_triggered = True
-            action()
+            action({
+                'trigger': {
+                    'platform': 'template',
+                    'entity_id': entity_id,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                },
+            })
        elif not template_result:
            already_triggered = False

-    hass.bus.listen(EVENT_STATE_CHANGED, event_listener)
+    track_state_change(hass, MATCH_ALL, state_changed_listener)
    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with state based condition. """
-
-    value_template = config.get(CONF_VALUE_TEMPLATE)
-
-    if value_template is None:
-        _LOGGER.error("Missing configuration key %s", CONF_VALUE_TEMPLATE)
-        return False
-
-    return lambda: _check_template(hass, value_template)
-
-
-def _check_template(hass, value_template):
-    """ Checks if result of template is true """
-    try:
-        value = template.render(hass, value_template, {})
-    except TemplateError:
-        _LOGGER.exception('Error parsing template')
-        return False
-
-    return value.lower() == 'true'
--- a/homeassistant/components/automation/time.py
+++ b/homeassistant/components/automation/time.py
@@ -1,106 +1,53 @@
 """
-homeassistant.components.automation.time
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers time listening automation rules.
+Offer time listening automation rules.

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

-import homeassistant.util.dt as dt_util
+import voluptuous as vol
+
+from homeassistant.const import CONF_AFTER, CONF_PLATFORM
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_time_change

 CONF_HOURS = "hours"
 CONF_MINUTES = "minutes"
 CONF_SECONDS = "seconds"
-CONF_BEFORE = "before"
-CONF_AFTER = "after"
-CONF_WEEKDAY = "weekday"
-
-WEEKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']

 _LOGGER = logging.getLogger(__name__)

+TRIGGER_SCHEMA = vol.All(vol.Schema({
+    vol.Required(CONF_PLATFORM): 'time',
+    CONF_AFTER: cv.time,
+    CONF_HOURS: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+    CONF_MINUTES: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+    CONF_SECONDS: vol.Any(vol.Coerce(int), vol.Coerce(str)),
+}), cv.has_at_least_one_key(CONF_HOURS, CONF_MINUTES,
+                            CONF_SECONDS, CONF_AFTER))
+

 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
+    """Listen for state changes based on configuration."""
    if CONF_AFTER in config:
-        after = dt_util.parse_time_str(config[CONF_AFTER])
-        if after is None:
-            _error_time(config[CONF_AFTER], CONF_AFTER)
-            return False
+        after = config.get(CONF_AFTER)
        hours, minutes, seconds = after.hour, after.minute, after.second
-    elif (CONF_HOURS in config or CONF_MINUTES in config or
-          CONF_SECONDS in config):
+    else:
        hours = config.get(CONF_HOURS)
        minutes = config.get(CONF_MINUTES)
        seconds = config.get(CONF_SECONDS)
-    else:
-        _LOGGER.error('One of %s, %s, %s OR %s needs to be specified',
-                      CONF_HOURS, CONF_MINUTES, CONF_SECONDS, CONF_AFTER)
-        return False

    def time_automation_listener(now):
-        """ Listens for time changes and calls action. """
-        action()
+        """Listen for time changes and calls action."""
+        action({
+            'trigger': {
+                'platform': 'time',
+                'now': now,
+            },
+        })

    track_time_change(hass, time_automation_listener,
                      hour=hours, minute=minutes, second=seconds)

    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with time based condition. """
-    before = config.get(CONF_BEFORE)
-    after = config.get(CONF_AFTER)
-    weekday = config.get(CONF_WEEKDAY)
-
-    if before is None and after is None and weekday is None:
-        _LOGGER.error(
-            "Missing if-condition configuration key %s, %s or %s",
-            CONF_BEFORE, CONF_AFTER, CONF_WEEKDAY)
-        return None
-
-    if before is not None:
-        before = dt_util.parse_time_str(before)
-        if before is None:
-            _error_time(before, CONF_BEFORE)
-            return None
-
-    if after is not None:
-        after = dt_util.parse_time_str(after)
-        if after is None:
-            _error_time(after, CONF_AFTER)
-            return None
-
-    def time_if():
-        """ Validate time based if-condition """
-        now = dt_util.now()
-        if before is not None and now > now.replace(hour=before.hour,
-                                                    minute=before.minute):
-            return False
-
-        if after is not None and now < now.replace(hour=after.hour,
-                                                   minute=after.minute):
-            return False
-
-        if weekday is not None:
-            now_weekday = WEEKDAYS[now.weekday()]
-
-            if isinstance(weekday, str) and weekday != now_weekday or \
-               now_weekday not in weekday:
-                return False
-
-        return True
-
-    return time_if
-
-
-def _error_time(value, key):
-    """ Helper method to print error. """
-    _LOGGER.error(
-        "Received invalid value for '%s': %s", key, value)
-    if isinstance(value, int):
-        _LOGGER.error('Make sure you wrap time values in quotes')
--- a/homeassistant/components/automation/zone.py
+++ b/homeassistant/components/automation/zone.py
@@ -1,88 +1,64 @@
 """
-homeassistant.components.automation.zone
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Offers zone automation rules.
+Offer zone automation rules.

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

-from homeassistant.components import zone
-from homeassistant.helpers.event import track_state_change
 from homeassistant.const import (
-    ATTR_GPS_ACCURACY, ATTR_LATITUDE, ATTR_LONGITUDE, MATCH_ALL)
+    CONF_EVENT, CONF_ENTITY_ID, CONF_ZONE, MATCH_ALL, CONF_PLATFORM)
+from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers import (
+    condition, config_validation as cv, location)

-
-CONF_ENTITY_ID = "entity_id"
-CONF_ZONE = "zone"
-CONF_EVENT = "event"
 EVENT_ENTER = "enter"
 EVENT_LEAVE = "leave"
 DEFAULT_EVENT = EVENT_ENTER

+TRIGGER_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): 'zone',
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+    vol.Required(CONF_ZONE): cv.entity_id,
+    vol.Required(CONF_EVENT, default=DEFAULT_EVENT):
+        vol.Any(EVENT_ENTER, EVENT_LEAVE),
+})
+

 def trigger(hass, config, action):
-    """ Listen for state changes based on `config`. """
+    """Listen for state changes based on configuration."""
    entity_id = config.get(CONF_ENTITY_ID)
    zone_entity_id = config.get(CONF_ZONE)
-
-    if entity_id is None or zone_entity_id is None:
-        logging.getLogger(__name__).error(
-            "Missing trigger configuration key %s or %s", CONF_ENTITY_ID,
-            CONF_ZONE)
-        return False
-
-    event = config.get(CONF_EVENT, DEFAULT_EVENT)
+    event = config.get(CONF_EVENT)

    def zone_automation_listener(entity, from_s, to_s):
-        """ Listens for state changes and calls action. """
-        if from_s and None in (from_s.attributes.get(ATTR_LATITUDE),
-                               from_s.attributes.get(ATTR_LONGITUDE)) or \
-            None in (to_s.attributes.get(ATTR_LATITUDE),
-                     to_s.attributes.get(ATTR_LONGITUDE)):
+        """Listen for state changes and calls action."""
+        if from_s and not location.has_location(from_s) or \
+           not location.has_location(to_s):
            return

-        from_match = _in_zone(hass, zone_entity_id, from_s) if from_s else None
-        to_match = _in_zone(hass, zone_entity_id, to_s)
+        zone_state = hass.states.get(zone_entity_id)
+        if from_s:
+            from_match = condition.zone(hass, zone_state, from_s)
+        else:
+            from_match = False
+        to_match = condition.zone(hass, zone_state, to_s)

        # pylint: disable=too-many-boolean-expressions
        if event == EVENT_ENTER and not from_match and to_match or \
           event == EVENT_LEAVE and from_match and not to_match:
-            action()
+            action({
+                'trigger': {
+                    'platform': 'zone',
+                    'entity_id': entity,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                    'zone': zone_state,
+                    'event': event,
+                },
+            })

    track_state_change(
        hass, entity_id, zone_automation_listener, MATCH_ALL, MATCH_ALL)

    return True
-
-
-def if_action(hass, config):
-    """ Wraps action method with zone based condition. """
-    entity_id = config.get(CONF_ENTITY_ID)
-    zone_entity_id = config.get(CONF_ZONE)
-
-    if entity_id is None or zone_entity_id is None:
-        logging.getLogger(__name__).error(
-            "Missing condition configuration key %s or %s", CONF_ENTITY_ID,
-            CONF_ZONE)
-        return False
-
-    def if_in_zone():
-        """ Test if condition. """
-        return _in_zone(hass, zone_entity_id, hass.states.get(entity_id))
-
-    return if_in_zone
-
-
-def _in_zone(hass, zone_entity_id, state):
-    """ Check if state is in zone. """
-    if not state or None in (state.attributes.get(ATTR_LATITUDE),
-                             state.attributes.get(ATTR_LONGITUDE)):
-        return False
-
-    zone_state = hass.states.get(zone_entity_id)
-    return zone_state and zone.in_zone(
-        zone_state, state.attributes.get(ATTR_LATITUDE),
-        state.attributes.get(ATTR_LONGITUDE),
-        state.attributes.get(ATTR_GPS_ACCURACY, 0))
--- a/homeassistant/components/binary_sensor/init.py
+++ b/homeassistant/components/binary_sensor/init.py
@@ -1,8 +1,5 @@
 """
-homeassistant.components.binary_sensor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Component to interface with binary sensors (sensors which only know two states)
-that can be monitored.
+Component to interface with binary sensors.

 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor/
@@ -12,15 +9,33 @@ import logging
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import (STATE_ON, STATE_OFF)
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa

 DOMAIN = 'binary_sensor'
 SCAN_INTERVAL = 30

 ENTITY_ID_FORMAT = DOMAIN + '.{}'
+SENSOR_CLASSES = [
+    None,            # Generic on/off
+    'cold',          # On means cold (or too cold)
+    'connectivity',  # On means connection present, Off = no connection
+    'gas',           # CO, CO2, etc.
+    'heat',          # On means hot (or too hot)
+    'light',         # Lightness threshold
+    'moisture',      # Specifically a wetness sensor
+    'motion',        # Motion sensor
+    'moving',        # On means moving, Off means stopped
+    'opening',       # Door, window, etc.
+    'power',         # Power, over-current, etc
+    'safety',        # Generic on=unsafe, off=safe
+    'smoke',         # Smoke detector
+    'sound',         # On means sound detected, Off means no sound
+    'vibration',     # On means vibration detected, Off means no vibration
+]


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

@@ -31,19 +46,29 @@ def setup(hass, config):

 # pylint: disable=no-self-use
 class BinarySensorDevice(Entity):
-    """ Represents a binary sensor. """
+    """Represent a binary sensor."""

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

    @property
    def state(self):
-        """ Returns the state of the binary sensor. """
+        """Return the state of the binary sensor."""
        return STATE_ON if self.is_on else STATE_OFF

    @property
-    def friendly_state(self):
-        """ Returns the friendly state of the binary sensor. """
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
        return None
+
+    @property
+    def state_attributes(self):
+        """Return device specific state attributes."""
+        attr = {}
+
+        if self.sensor_class is not None:
+            attr['sensor_class'] = self.sensor_class
+
+        return attr
--- a/homeassistant/components/binary_sensor/apcupsd.py
+++ b/homeassistant/components/binary_sensor/apcupsd.py
@@ -0,0 +1,41 @@
+"""
+Support for tracking the online status of a UPS.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.apcupsd/
+"""
+from homeassistant.components import apcupsd
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+DEPENDENCIES = [apcupsd.DOMAIN]
+DEFAULT_NAME = "UPS Online Status"
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Instantiate an OnlineStatus binary sensor entity."""
+    add_entities((OnlineStatus(config, apcupsd.DATA),))
+
+
+class OnlineStatus(BinarySensorDevice):
+    """Represent UPS online status."""
+
+    def __init__(self, config, data):
+        """Initialize the APCUPSd device."""
+        self._config = config
+        self._data = data
+        self._state = None
+        self.update()
+
+    @property
+    def name(self):
+        """Return the name of the UPS online status sensor."""
+        return self._config.get("name", DEFAULT_NAME)
+
+    @property
+    def is_on(self):
+        """Return true if the UPS is online, else false."""
+        return self._state == apcupsd.VALUE_ONLINE
+
+    def update(self):
+        """Get the status report from APCUPSd and set this entity's state."""
+        self._state = self._data.status[apcupsd.KEY_STATUS]
--- a/homeassistant/components/binary_sensor/arest.py
+++ b/homeassistant/components/binary_sensor/arest.py
@@ -1,18 +1,17 @@
 """
-homeassistant.components.binary_sensor.arest
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The arest sensor will consume an exposed aREST API of a device.
+Support for exposed aREST RESTful API of a device.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.arest/
 """
-from datetime import timedelta
 import logging
+from datetime import timedelta

 import requests

+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    SENSOR_CLASSES)
 from homeassistant.util import Throttle
-from homeassistant.components.binary_sensor import BinarySensorDevice

 _LOGGER = logging.getLogger(__name__)

@@ -24,11 +23,15 @@ CONF_PIN = 'pin'


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Get the aREST binary sensor. """
-
+    """Setup the aREST binary sensor."""
    resource = config.get(CONF_RESOURCE)
    pin = config.get(CONF_PIN)

+    sensor_class = config.get('sensor_class')
+    if sensor_class not in SENSOR_CLASSES:
+        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
+        sensor_class = None
+
    if None in (resource, pin):
        _LOGGER.error('Not all required config keys present: %s',
                      ', '.join((CONF_RESOURCE, CONF_PIN)))
@@ -48,20 +51,24 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

    arest = ArestData(resource, pin)

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


 # pylint: disable=too-many-instance-attributes, too-many-arguments
 class ArestBinarySensor(BinarySensorDevice):
-    """ Implements an aREST binary sensor for a pin. """
+    """Implement an aREST binary sensor for a pin."""

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

@@ -73,31 +80,37 @@ class ArestBinarySensor(BinarySensorDevice):

    @property
    def name(self):
-        """ The name of the binary sensor. """
+        """Return the name of the binary sensor."""
        return self._name

    @property
    def is_on(self):
-        """ True if the binary sensor is on. """
+        """Return true if the binary sensor is on."""
        return bool(self.arest.data.get('state'))

+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_class
+
    def update(self):
-        """ Gets the latest data from aREST API. """
+        """Get the latest data from aREST API."""
        self.arest.update()


 # pylint: disable=too-few-public-methods
 class ArestData(object):
-    """ Class for handling the data retrieval for pins. """
+    """Class for handling the data retrieval for pins."""

    def __init__(self, resource, pin):
+        """Initialize the aREST data object."""
        self._resource = resource
        self._pin = pin
        self.data = {}

    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def update(self):
-        """ Gets the latest data from aREST device. """
+        """Get the latest data from aREST device."""
        try:
            response = requests.get('{}/digital/{}'.format(
                self._resource, self._pin), timeout=10)
--- a/homeassistant/components/binary_sensor/bloomsky.py
+++ b/homeassistant/components/binary_sensor/bloomsky.py
@@ -0,0 +1,74 @@
+"""
+Support the binary sensors of a BloomSky weather station.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.bloomsky/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ["bloomsky"]
+
+# These are the available sensors mapped to binary_sensor class
+SENSOR_TYPES = {
+    "Rain": "moisture",
+    "Night": None,
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the available BloomSky weather binary sensors."""
+    logger = logging.getLogger(__name__)
+    bloomsky = get_component('bloomsky')
+    sensors = config.get('monitored_conditions', SENSOR_TYPES)
+
+    for device in bloomsky.BLOOMSKY.devices.values():
+        for variable in sensors:
+            if variable in SENSOR_TYPES:
+                add_devices([BloomSkySensor(bloomsky.BLOOMSKY,
+                                            device,
+                                            variable)])
+            else:
+                logger.error("Cannot find definition for device: %s", variable)
+
+
+class BloomSkySensor(BinarySensorDevice):
+    """Represent a single binary sensor in a BloomSky device."""
+
+    def __init__(self, bs, device, sensor_name):
+        """Initialize a BloomSky binary sensor."""
+        self._bloomsky = bs
+        self._device_id = device["DeviceID"]
+        self._sensor_name = sensor_name
+        self._name = "{} {}".format(device["DeviceName"], sensor_name)
+        self._unique_id = "bloomsky_binary_sensor {}".format(self._name)
+        self.update()
+
+    @property
+    def name(self):
+        """The name of the BloomSky device and this sensor."""
+        return self._name
+
+    @property
+    def unique_id(self):
+        """Return the unique ID for this sensor."""
+        return self._unique_id
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return SENSOR_TYPES.get(self._sensor_name)
+
+    @property
+    def is_on(self):
+        """Return true if binary sensor is on."""
+        return self._state
+
+    def update(self):
+        """Request an update from the BloomSky API."""
+        self._bloomsky.refresh_devices()
+
+        self._state = \
+            self._bloomsky.devices[self._device_id]["Data"][self._sensor_name]
--- a/homeassistant/components/binary_sensor/command_sensor.py
+++ b/homeassistant/components/binary_sensor/command_sensor.py
@@ -1,20 +1,22 @@
 """
-homeassistant.components.binary_sensor.command_sensor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Allows to configure custom shell commands to turn a value
-into a logical value for a binary sensor.
+Support for custom shell commands to retrieve values.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.command_line/
 """
 import logging
 from datetime import timedelta

+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    SENSOR_CLASSES)
+from homeassistant.components.sensor.command_line import CommandSensorData
 from homeassistant.const import CONF_VALUE_TEMPLATE
-from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.components.sensor.command_sensor import CommandSensorData
-from homeassistant.util import template
+from homeassistant.helpers import template

 _LOGGER = logging.getLogger(__name__)

 DEFAULT_NAME = "Binary Command Sensor"
+DEFAULT_SENSOR_CLASS = None
 DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'

@@ -24,33 +26,40 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)

 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Add the Command Sensor. """
-
+    """Setup the Command Sensor."""
    if config.get('command') is None:
        _LOGGER.error('Missing required variable: "command"')
        return False

+    sensor_class = config.get('sensor_class')
+    if sensor_class not in SENSOR_CLASSES:
+        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
+        sensor_class = DEFAULT_SENSOR_CLASS
+
    data = CommandSensorData(config.get('command'))

    add_devices([CommandBinarySensor(
        hass,
        data,
        config.get('name', DEFAULT_NAME),
+        sensor_class,
        config.get('payload_on', DEFAULT_PAYLOAD_ON),
        config.get('payload_off', DEFAULT_PAYLOAD_OFF),
        config.get(CONF_VALUE_TEMPLATE)
    )])


-# pylint: disable=too-many-arguments
+# pylint: disable=too-many-arguments, too-many-instance-attributes
 class CommandBinarySensor(BinarySensorDevice):
-    """ Represents a binary sensor that is returning
-    a value of a shell commands. """
-    def __init__(self, hass, data, name, payload_on,
+    """Represent a command line binary sensor."""
+
+    def __init__(self, hass, data, name, sensor_class, payload_on,
                 payload_off, value_template):
+        """Initialize the Command line binary sensor."""
        self._hass = hass
        self.data = data
        self._name = name
+        self._sensor_class = sensor_class
        self._state = False
        self._payload_on = payload_on
        self._payload_off = payload_off
@@ -59,16 +68,21 @@ class CommandBinarySensor(BinarySensorDevice):

    @property
    def name(self):
-        """ The name of the sensor. """
+        """Return the name of the sensor."""
        return self._name

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

+    @ property
+    def sensor_class(self):
+        """Return the class of the binary sensor."""
+        return self._sensor_class
+
    def update(self):
-        """ Gets the latest data and updates the state. """
+        """Get the latest data and updates the state."""
        self.data.update()
        value = self.data.value

--- a/homeassistant/components/binary_sensor/demo.py
+++ b/homeassistant/components/binary_sensor/demo.py
@@ -1,37 +1,45 @@
 """
-homeassistant.components.binary_sensor.demo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Demo platform that has two fake binary sensors.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
 """
 from homeassistant.components.binary_sensor import BinarySensorDevice


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the Demo binary sensors. """
+    """Setup the Demo binary sensor platform."""
    add_devices([
-        DemoBinarySensor('Basement Floor Wet', False),
-        DemoBinarySensor('Movement Backyard', True),
+        DemoBinarySensor('Basement Floor Wet', False, 'moisture'),
+        DemoBinarySensor('Movement Backyard', True, 'motion'),
    ])


 class DemoBinarySensor(BinarySensorDevice):
-    """ A Demo binary sensor. """
+    """A Demo binary sensor."""

-    def __init__(self, name, state):
+    def __init__(self, name, state, sensor_class):
+        """Initialize the demo sensor."""
        self._name = name
        self._state = state
+        self._sensor_type = sensor_class
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_type

    @property
    def should_poll(self):
-        """ No polling needed for a demo binary sensor. """
+        """No polling needed for a demo binary sensor."""
        return False

    @property
    def name(self):
-        """ Returns the name of the binary sensor. """
+        """Return the name of the binary sensor."""
        return self._name

    @property
    def is_on(self):
-        """ True if the binary sensor is on. """
+        """Return true if the binary sensor is on."""
        return self._state
--- a/homeassistant/components/binary_sensor/enocean.py
+++ b/homeassistant/components/binary_sensor/enocean.py
@@ -0,0 +1,63 @@
+"""
+Support for EnOcean binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.enocean/
+"""
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components import enocean
+from homeassistant.const import CONF_NAME
+
+DEPENDENCIES = ["enocean"]
+
+CONF_ID = "id"
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Binary Sensor platform fo EnOcean."""
+    dev_id = config.get(CONF_ID, None)
+    devname = config.get(CONF_NAME, "EnOcean binary sensor")
+    add_devices([EnOceanBinarySensor(dev_id, devname)])
+
+
+class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
+    """Representation of EnOcean binary sensors such as wall switches."""
+
+    def __init__(self, dev_id, devname):
+        """Initialize the EnOcean binary sensor."""
+        enocean.EnOceanDevice.__init__(self)
+        self.stype = "listener"
+        self.dev_id = dev_id
+        self.which = -1
+        self.onoff = -1
+        self.devname = devname
+
+    @property
+    def name(self):
+        """The default name for the binary sensor."""
+        return self.devname
+
+    def value_changed(self, value, value2):
+        """Fire an event with the data that have changed.
+
+        This method is called when there is an incoming packet associated
+        with this platform.
+        """
+        self.update_ha_state()
+        if value2 == 0x70:
+            self.which = 0
+            self.onoff = 0
+        elif value2 == 0x50:
+            self.which = 0
+            self.onoff = 1
+        elif value2 == 0x30:
+            self.which = 1
+            self.onoff = 0
+        elif value2 == 0x10:
+            self.which = 1
+            self.onoff = 1
+        self.hass.bus.fire('button_pressed', {"id": self.dev_id,
+                                              'pushed': value,
+                                              'which': self.which,
+                                              'onoff': self.onoff})
--- a/homeassistant/components/binary_sensor/envisalink.py
+++ b/homeassistant/components/binary_sensor/envisalink.py
@@ -0,0 +1,71 @@
+"""
+Support for Envisalink zone states- represented as binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.envisalink/
+"""
+import logging
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.envisalink import (EVL_CONTROLLER,
+                                                 ZONE_SCHEMA,
+                                                 CONF_ZONENAME,
+                                                 CONF_ZONETYPE,
+                                                 EnvisalinkDevice,
+                                                 SIGNAL_ZONE_UPDATE)
+from homeassistant.const import ATTR_LAST_TRIP_TIME
+
+DEPENDENCIES = ['envisalink']
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Perform the setup for Envisalink sensor devices."""
+    _configured_zones = discovery_info['zones']
+    for zone_num in _configured_zones:
+        _device_config_data = ZONE_SCHEMA(_configured_zones[zone_num])
+        _device = EnvisalinkBinarySensor(
+            zone_num,
+            _device_config_data[CONF_ZONENAME],
+            _device_config_data[CONF_ZONETYPE],
+            EVL_CONTROLLER.alarm_state['zone'][zone_num],
+            EVL_CONTROLLER)
+        add_devices_callback([_device])
+
+
+class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
+    """Representation of an envisalink Binary Sensor."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, zone_number, zone_name, zone_type, info, controller):
+        """Initialize the binary_sensor."""
+        from pydispatch import dispatcher
+        self._zone_type = zone_type
+        self._zone_number = zone_number
+
+        _LOGGER.debug('Setting up zone: ' + zone_name)
+        EnvisalinkDevice.__init__(self, zone_name, info, controller)
+        dispatcher.connect(self._update_callback,
+                           signal=SIGNAL_ZONE_UPDATE,
+                           sender=dispatcher.Any)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attr = {}
+        attr[ATTR_LAST_TRIP_TIME] = self._info['last_fault']
+        return attr
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._info['status']['open']
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return self._zone_type
+
+    def _update_callback(self, zone):
+        """Update the zone's state, if needed."""
+        if zone is None or int(zone) == self._zone_number:
+            self.update_ha_state()
--- a/homeassistant/components/binary_sensor/homematic.py
+++ b/homeassistant/components/binary_sensor/homematic.py
@@ -0,0 +1,100 @@
+"""
+Support for Homematic binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.homematic/
+"""
+import logging
+from homeassistant.const import STATE_UNKNOWN
+from homeassistant.components.binary_sensor import BinarySensorDevice
+import homeassistant.components.homematic as homematic
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['homematic']
+
+SENSOR_TYPES_CLASS = {
+    "Remote": None,
+    "ShutterContact": "opening",
+    "Smoke": "smoke",
+    "SmokeV2": "smoke",
+    "Motion": "motion",
+    "MotionV2": "motion",
+    "RemoteMotion": None
+}
+
+
+def setup_platform(hass, config, add_callback_devices, discovery_info=None):
+    """Setup the Homematic binary sensor platform."""
+    if discovery_info is None:
+        return
+
+    return homematic.setup_hmdevice_discovery_helper(HMBinarySensor,
+                                                     discovery_info,
+                                                     add_callback_devices)
+
+
+class HMBinarySensor(homematic.HMDevice, BinarySensorDevice):
+    """Representation of a binary Homematic device."""
+
+    @property
+    def is_on(self):
+        """Return true if switch is on."""
+        if not self.available:
+            return False
+        return bool(self._hm_get_state())
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        if not self.available:
+            return None
+
+        # If state is MOTION (RemoteMotion works only)
+        if self._state == "MOTION":
+            return "motion"
+        return SENSOR_TYPES_CLASS.get(self._hmdevice.__class__.__name__, None)
+
+    def _check_hm_to_ha_object(self):
+        """Check if possible to use the HM Object as this HA type."""
+        from pyhomematic.devicetypes.sensors import HMBinarySensor\
+            as pyHMBinarySensor
+
+        # Check compatibility from HMDevice
+        if not super()._check_hm_to_ha_object():
+            return False
+
+        # check if the Homematic device correct for this HA device
+        if not isinstance(self._hmdevice, pyHMBinarySensor):
+            _LOGGER.critical("This %s can't be use as binary", self._name)
+            return False
+
+        # if exists user value?
+        if self._state and self._state not in self._hmdevice.BINARYNODE:
+            _LOGGER.critical("This %s have no binary with %s", self._name,
+                             self._state)
+            return False
+
+        # only check and give a warning to the user
+        if self._state is None and len(self._hmdevice.BINARYNODE) > 1:
+            _LOGGER.critical("%s have multiple binary params. It use all "
+                             "binary nodes as one. Possible param values: %s",
+                             self._name, str(self._hmdevice.BINARYNODE))
+            return False
+
+        return True
+
+    def _init_data_struct(self):
+        """Generate a data struct (self._data) from the Homematic metadata."""
+        super()._init_data_struct()
+
+        # object have 1 binary
+        if self._state is None and len(self._hmdevice.BINARYNODE) == 1:
+            for value in self._hmdevice.BINARYNODE:
+                self._state = value
+
+        # add state to data struct
+        if self._state:
+            _LOGGER.debug("%s init datastruct with main node '%s'", self._name,
+                          self._state)
+            self._data.update({self._state: STATE_UNKNOWN})
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -1,61 +1,75 @@
 """
-homeassistant.components.binary_sensor.mqtt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Allows to configure a MQTT binary sensor.
+Support for MQTT binary sensors.

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

-from homeassistant.const import CONF_VALUE_TEMPLATE
-from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.util import template
+import voluptuous as vol
+
 import homeassistant.components.mqtt as mqtt
+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    SENSOR_CLASSES)
+from homeassistant.const import CONF_NAME, CONF_VALUE_TEMPLATE
+from homeassistant.components.mqtt import CONF_STATE_TOPIC, CONF_QOS
+from homeassistant.helpers import template
+import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

+DEPENDENCIES = ['mqtt']
+
+CONF_SENSOR_CLASS = 'sensor_class'
+CONF_PAYLOAD_ON = 'payload_on'
+CONF_PAYLOAD_OFF = 'payload_off'
+
 DEFAULT_NAME = 'MQTT Binary sensor'
-DEFAULT_QOS = 0
 DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'

-DEPENDENCIES = ['mqtt']
+PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_SENSOR_CLASS, default=None):
+        vol.Any(vol.In(SENSOR_CLASSES), vol.SetTo(None)),
+    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
+    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
+})


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Add MQTT binary sensor. """
-
-    if config.get('state_topic') is None:
-        _LOGGER.error('Missing required variable: state_topic')
-        return False
-
+    """Add MQTT binary sensor."""
    add_devices([MqttBinarySensor(
        hass,
-        config.get('name', DEFAULT_NAME),
-        config.get('state_topic', None),
-        config.get('qos', DEFAULT_QOS),
-        config.get('payload_on', DEFAULT_PAYLOAD_ON),
-        config.get('payload_off', DEFAULT_PAYLOAD_OFF),
-        config.get(CONF_VALUE_TEMPLATE))])
+        config[CONF_NAME],
+        config[CONF_STATE_TOPIC],
+        config[CONF_SENSOR_CLASS],
+        config[CONF_QOS],
+        config[CONF_PAYLOAD_ON],
+        config[CONF_PAYLOAD_OFF],
+        config.get(CONF_VALUE_TEMPLATE)
+    )])


 # pylint: disable=too-many-arguments, too-many-instance-attributes
 class MqttBinarySensor(BinarySensorDevice):
-    """ Represents a binary sensor that is updated by MQTT. """
-    def __init__(self, hass, name, state_topic, qos, payload_on, payload_off,
-                 value_template):
+    """Representation a binary sensor that is updated by MQTT."""
+
+    def __init__(self, hass, name, state_topic, sensor_class, qos, payload_on,
+                 payload_off, value_template):
+        """Initialize the MQTT binary sensor."""
        self._hass = hass
        self._name = name
        self._state = False
        self._state_topic = state_topic
+        self._sensor_class = sensor_class
        self._payload_on = payload_on
        self._payload_off = payload_off
        self._qos = qos

        def message_received(topic, payload, qos):
-            """ A new MQTT message has been received. """
+            """A new MQTT message has been received."""
            if value_template is not None:
                payload = template.render_with_possible_json_value(
                    hass, value_template, payload)
@@ -70,15 +84,20 @@ class MqttBinarySensor(BinarySensorDevice):

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

    @property
    def name(self):
-        """ The name of the binary sensor. """
+        """Return the name of the binary sensor."""
        return self._name

    @property
    def is_on(self):
-        """ True if the binary sensor is on. """
+        """Return true if the binary sensor is on."""
        return self._state
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_class
--- a/homeassistant/components/binary_sensor/mysensors.py
+++ b/homeassistant/components/binary_sensor/mysensors.py
@@ -0,0 +1,78 @@
+"""
+Support for MySensors binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.mysensors/
+"""
+import logging
+
+from homeassistant.components import mysensors
+from homeassistant.components.binary_sensor import (SENSOR_CLASSES,
+                                                    BinarySensorDevice)
+from homeassistant.const import STATE_ON
+
+_LOGGER = logging.getLogger(__name__)
+DEPENDENCIES = []
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the mysensors platform for sensors."""
+    # Only act if loaded via mysensors by discovery event.
+    # Otherwise gateway is not setup.
+    if discovery_info is None:
+        return
+
+    for gateway in mysensors.GATEWAYS.values():
+        # Define the S_TYPES and V_TYPES that the platform should handle as
+        # states. Map them in a dict of lists.
+        pres = gateway.const.Presentation
+        set_req = gateway.const.SetReq
+        map_sv_types = {
+            pres.S_DOOR: [set_req.V_TRIPPED],
+            pres.S_MOTION: [set_req.V_TRIPPED],
+            pres.S_SMOKE: [set_req.V_TRIPPED],
+        }
+        if float(gateway.version) >= 1.5:
+            map_sv_types.update({
+                pres.S_SPRINKLER: [set_req.V_TRIPPED],
+                pres.S_WATER_LEAK: [set_req.V_TRIPPED],
+                pres.S_SOUND: [set_req.V_TRIPPED],
+                pres.S_VIBRATION: [set_req.V_TRIPPED],
+                pres.S_MOISTURE: [set_req.V_TRIPPED],
+            })
+
+        devices = {}
+        gateway.platform_callbacks.append(mysensors.pf_callback_factory(
+            map_sv_types, devices, add_devices, MySensorsBinarySensor))
+
+
+class MySensorsBinarySensor(
+        mysensors.MySensorsDeviceEntity, BinarySensorDevice):
+    """Represent the value of a MySensors Binary Sensor child node."""
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        if self.value_type in self._values:
+            return self._values[self.value_type] == STATE_ON
+        return False
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        pres = self.gateway.const.Presentation
+        class_map = {
+            pres.S_DOOR: 'opening',
+            pres.S_MOTION: 'motion',
+            pres.S_SMOKE: 'smoke',
+        }
+        if float(self.gateway.version) >= 1.5:
+            class_map.update({
+                pres.S_SPRINKLER: 'sprinkler',
+                pres.S_WATER_LEAK: 'leak',
+                pres.S_SOUND: 'sound',
+                pres.S_VIBRATION: 'vibration',
+                pres.S_MOISTURE: 'moisture',
+            })
+        if class_map.get(self.child_type) in SENSOR_CLASSES:
+            return class_map.get(self.child_type)
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -1,22 +1,23 @@
 """
-homeassistant.components.binary_sensor.nest
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for Nest Thermostat Binary Sensors.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.nest/
 """
-import logging
-import socket
+import voluptuous as vol
+
 import homeassistant.components.nest as nest
-
-from homeassistant.components.sensor.nest import NestSensor
 from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.sensor.nest import NestSensor
+from homeassistant.const import (
+    CONF_PLATFORM, CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS
+)

-
+DEPENDENCIES = ['nest']
 BINARY_TYPES = ['fan',
                'hvac_ac_state',
                'hvac_aux_heater_state',
+                'hvac_heater_state',
                'hvac_heat_x2_state',
                'hvac_heat_x3_state',
                'hvac_alt_heat_state',
@@ -24,32 +25,25 @@ BINARY_TYPES = ['fan',
                'hvac_emer_heat_state',
                'online']

+PLATFORM_SCHEMA = vol.Schema({
+    vol.Required(CONF_PLATFORM): nest.DOMAIN,
+    vol.Optional(CONF_SCAN_INTERVAL):
+        vol.All(vol.Coerce(int), vol.Range(min=1)),
+    vol.Required(CONF_MONITORED_CONDITIONS): [vol.In(BINARY_TYPES)],
+})
+

 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Setup Nest binary sensors. """
-
-    logger = logging.getLogger(__name__)
-    try:
-        for structure in nest.NEST.structures:
-            for device in structure.devices:
-                for variable in config['monitored_conditions']:
-                    if variable in BINARY_TYPES:
-                        add_devices([NestBinarySensor(structure,
-                                                      device,
-                                                      variable)])
-                    else:
-                        logger.error('Nest sensor type: "%s" does not exist',
-                                     variable)
-    except socket.error:
-        logger.error(
-            "Connection error logging into the nest web service."
-        )
+    """Setup Nest binary sensors."""
+    for structure, device in nest.devices():
+        add_devices([NestBinarySensor(structure, device, variable)
+                     for variable in config[CONF_MONITORED_CONDITIONS]])


 class NestBinarySensor(NestSensor, BinarySensorDevice):
-    """ Represents a Nest binary sensor. """
+    """Represents a Nest binary sensor."""

    @property
    def is_on(self):
-        """ True if the binary sensor is on. """
+        """True if the binary sensor is on."""
        return bool(getattr(self.device, self.variable))
--- a/homeassistant/components/binary_sensor/nx584.py
+++ b/homeassistant/components/binary_sensor/nx584.py
@@ -0,0 +1,134 @@
+"""
+Support for exposing nx584 elements as sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.nx584/
+"""
+import logging
+import threading
+import time
+
+import requests
+
+from homeassistant.components.binary_sensor import (
+    SENSOR_CLASSES, BinarySensorDevice)
+
+REQUIREMENTS = ['pynx584==0.2']
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup nx584 sensors."""
+    from nx584 import client as nx584_client
+
+    host = config.get('host', 'localhost:5007')
+    exclude = config.get('exclude_zones', [])
+    zone_types = config.get('zone_types', {})
+
+    if not all(isinstance(zone, int) for zone in exclude):
+        _LOGGER.error('Invalid excluded zone specified (use zone number)')
+        return False
+
+    if not all(isinstance(zone, int) and ztype in SENSOR_CLASSES
+               for zone, ztype in zone_types.items()):
+        _LOGGER.error('Invalid zone_types entry')
+        return False
+
+    try:
+        client = nx584_client.Client('http://%s' % host)
+        zones = client.list_zones()
+    except requests.exceptions.ConnectionError as ex:
+        _LOGGER.error('Unable to connect to NX584: %s', str(ex))
+        return False
+
+    version = [int(v) for v in client.get_version().split('.')]
+    if version < [1, 1]:
+        _LOGGER.error('NX584 is too old to use for sensors (>=0.2 required)')
+        return False
+
+    zone_sensors = {
+        zone['number']: NX584ZoneSensor(
+            zone,
+            zone_types.get(zone['number'], 'opening'))
+        for zone in zones
+        if zone['number'] not in exclude}
+    if zone_sensors:
+        add_devices(zone_sensors.values())
+        watcher = NX584Watcher(client, zone_sensors)
+        watcher.start()
+    else:
+        _LOGGER.warning('No zones found on NX584')
+
+    return True
+
+
+class NX584ZoneSensor(BinarySensorDevice):
+    """Represents a NX584 zone as a sensor."""
+
+    def __init__(self, zone, zone_type):
+        """Initialize the nx594 binary sensor."""
+        self._zone = zone
+        self._zone_type = zone_type
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return self._zone_type
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return self._zone['name']
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        # True means "faulted" or "open" or "abnormal state"
+        return self._zone['state']
+
+
+class NX584Watcher(threading.Thread):
+    """Event listener thread to process NX584 events."""
+
+    def __init__(self, client, zone_sensors):
+        """Initialize nx584 watcher thread."""
+        super(NX584Watcher, self).__init__()
+        self.daemon = True
+        self._client = client
+        self._zone_sensors = zone_sensors
+
+    def _process_zone_event(self, event):
+        zone = event['zone']
+        zone_sensor = self._zone_sensors.get(zone)
+        # pylint: disable=protected-access
+        if not zone_sensor:
+            return
+        zone_sensor._zone['state'] = event['zone_state']
+        zone_sensor.update_ha_state()
+
+    def _process_events(self, events):
+        for event in events:
+            if event.get('type') == 'zone_status':
+                self._process_zone_event(event)
+
+    def _run(self):
+        """Throw away any existing events so we don't replay history."""
+        self._client.get_events()
+        while True:
+            events = self._client.get_events()
+            if events:
+                self._process_events(events)
+
+    def run(self):
+        """Run the watcher."""
+        while True:
+            try:
+                self._run()
+            except requests.exceptions.ConnectionError:
+                _LOGGER.error('Failed to reach NX584 server')
+                time.sleep(10)
--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -0,0 +1,109 @@
+"""
+Support for monitoring OctoPrint binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.octoprint/
+"""
+import logging
+import requests
+
+from homeassistant.const import CONF_NAME, STATE_ON, STATE_OFF
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ["octoprint"]
+
+SENSOR_TYPES = {
+    # API Endpoint, Group, Key, unit
+    "Printing": ["printer", "state", "printing", None],
+    "Printing Error": ["printer", "state", "error", None]
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the available OctoPrint binary sensors."""
+    octoprint = get_component('octoprint')
+    name = config.get(CONF_NAME, "OctoPrint")
+    monitored_conditions = config.get("monitored_conditions",
+                                      SENSOR_TYPES.keys())
+
+    devices = []
+    for octo_type in monitored_conditions:
+        if octo_type in SENSOR_TYPES:
+            new_sensor = OctoPrintBinarySensor(octoprint.OCTOPRINT,
+                                               octo_type,
+                                               SENSOR_TYPES[octo_type][2],
+                                               name,
+                                               SENSOR_TYPES[octo_type][3],
+                                               SENSOR_TYPES[octo_type][0],
+                                               SENSOR_TYPES[octo_type][1],
+                                               "flags")
+            devices.append(new_sensor)
+        else:
+            _LOGGER.error("Unknown OctoPrint sensor type: %s", octo_type)
+    add_devices(devices)
+
+
+# pylint: disable=too-many-instance-attributes
+class OctoPrintBinarySensor(BinarySensorDevice):
+    """Representation an OctoPrint binary sensor."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, api, condition, sensor_type, sensor_name,
+                 unit, endpoint, group, tool=None):
+        """Initialize a new OctoPrint sensor."""
+        self.sensor_name = sensor_name
+        if tool is None:
+            self._name = sensor_name + ' ' + condition
+        else:
+            self._name = sensor_name + ' ' + condition
+        self.sensor_type = sensor_type
+        self.api = api
+        self._state = False
+        self._unit_of_measurement = unit
+        self.api_endpoint = endpoint
+        self.api_group = group
+        self.api_tool = tool
+        # Set initial state
+        self.update()
+        _LOGGER.debug("Created OctoPrint binary sensor %r", self)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self.is_on
+
+    @property
+    def is_on(self):
+        """Return true if binary sensor is on."""
+        if self._state:
+            return STATE_ON
+        else:
+            return STATE_OFF
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return None
+
+    def update(self):
+        """Update state of sensor."""
+        try:
+            self._state = self.api.update(self.sensor_type,
+                                          self.api_endpoint,
+                                          self.api_group,
+                                          self.api_tool)
+        except requests.exceptions.ConnectionError:
+            # Error calling the api, already logged in api.update()
+            return
+
+        if self._state is None:
+            _LOGGER.warning("Unable to locate value for %s", self.sensor_type)
--- a/homeassistant/components/binary_sensor/rest.py
+++ b/homeassistant/components/binary_sensor/rest.py
@@ -1,17 +1,16 @@
 """
-homeassistant.components.binary_sensor.rest
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The rest binary sensor will consume responses sent by an exposed REST API.
+Support for RESTful binary sensors.

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

-from homeassistant.const import CONF_VALUE_TEMPLATE
-from homeassistant.util import template
+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    SENSOR_CLASSES)
 from homeassistant.components.sensor.rest import RestData
-from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.const import CONF_VALUE_TEMPLATE
+from homeassistant.helpers import template

 _LOGGER = logging.getLogger(__name__)

@@ -21,52 +20,72 @@ DEFAULT_METHOD = 'GET'

 # pylint: disable=unused-variable
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Setup REST binary sensors."""
+    """Setup the REST binary sensor."""
    resource = config.get('resource', None)
    method = config.get('method', DEFAULT_METHOD)
    payload = config.get('payload', None)
    verify_ssl = config.get('verify_ssl', True)

+    sensor_class = config.get('sensor_class')
+    if sensor_class not in SENSOR_CLASSES:
+        _LOGGER.warning('Unknown sensor class: %s', sensor_class)
+        sensor_class = None
+
    rest = RestData(method, resource, payload, verify_ssl)
    rest.update()

    if rest.data is None:
-        _LOGGER.error('Unable to fetch Rest data')
+        _LOGGER.error('Unable to fetch REST data')
        return False

    add_devices([RestBinarySensor(
-        hass, rest, config.get('name', DEFAULT_NAME),
+        hass,
+        rest,
+        config.get('name', DEFAULT_NAME),
+        sensor_class,
        config.get(CONF_VALUE_TEMPLATE))])


 # pylint: disable=too-many-arguments
 class RestBinarySensor(BinarySensorDevice):
-    """REST binary sensor."""
+    """Representation of a REST binary sensor."""

-    def __init__(self, hass, rest, name, value_template):
+    def __init__(self, hass, rest, name, sensor_class, value_template):
        """Initialize a REST binary sensor."""
        self._hass = hass
        self.rest = rest
        self._name = name
+        self._sensor_class = sensor_class
        self._state = False
+        self._previous_data = None
        self._value_template = value_template
        self.update()

    @property
    def name(self):
-        """Name of the binary sensor."""
+        """Return the name of the binary sensor."""
        return self._name

+    @property
+    def sensor_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_class
+
    @property
    def is_on(self):
-        """Return if the binary sensor is on."""
+        """Return true if the binary sensor is on."""
        if self.rest.data is None:
            return False

        if self._value_template is not None:
-            self.rest.data = template.render_with_possible_json_value(
+            response = template.render_with_possible_json_value(
                self._hass, self._value_template, self.rest.data, False)
-        return bool(int(self.rest.data))
+
+        try:
+            return bool(int(response))
+        except ValueError:
+            return {"true": True, "on": True, "open": True,
+                    "yes": True}.get(response.lower(), False)

    def update(self):
        """Get the latest data from REST API and updates the state."""
--- a/homeassistant/components/binary_sensor/rpi_gpio.py
+++ b/homeassistant/components/binary_sensor/rpi_gpio.py
@@ -1,16 +1,14 @@
 """
-homeassistant.components.binary_sensor.rpi_gpio
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Allows to configure a binary sensor using RPi GPIO.
+Support for binary sensor using RPi GPIO.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.rpi_gpio/
 """
-
 import logging
+
 import homeassistant.components.rpi_gpio as rpi_gpio
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.const import (DEVICE_DEFAULT_NAME)
+from homeassistant.const import DEVICE_DEFAULT_NAME

 DEFAULT_PULL_MODE = "UP"
 DEFAULT_BOUNCETIME = 50
@@ -22,8 +20,7 @@ _LOGGER = logging.getLogger(__name__)

 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the Raspberry PI GPIO devices. """
-
+    """Setup the Raspberry PI GPIO devices."""
    pull_mode = config.get('pull_mode', DEFAULT_PULL_MODE)
    bouncetime = config.get('bouncetime', DEFAULT_BOUNCETIME)
    invert_logic = config.get('invert_logic', DEFAULT_INVERT_LOGIC)
@@ -38,10 +35,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

 # pylint: disable=too-many-arguments, too-many-instance-attributes
 class RPiGPIOBinarySensor(BinarySensorDevice):
-    """ Represents a binary sensor that uses Raspberry Pi GPIO. """
-    def __init__(self, name, port, pull_mode, bouncetime, invert_logic):
-        # pylint: disable=no-member
+    """Represent a binary sensor that uses Raspberry Pi GPIO."""

+    def __init__(self, name, port, pull_mode, bouncetime, invert_logic):
+        """Initialize the RPi binary sensor."""
+        # pylint: disable=no-member
        self._name = name or DEVICE_DEFAULT_NAME
        self._port = port
        self._pull_mode = pull_mode
@@ -52,22 +50,23 @@ class RPiGPIOBinarySensor(BinarySensorDevice):
        self._state = rpi_gpio.read_input(self._port)

        def read_gpio(port):
-            """ Reads state from GPIO. """
+            """Read state from GPIO."""
            self._state = rpi_gpio.read_input(self._port)
            self.update_ha_state()
+
        rpi_gpio.edge_detect(self._port, read_gpio, self._bouncetime)

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

    @property
    def name(self):
-        """ The name of the sensor. """
+        """Return the name of the sensor."""
        return self._name

    @property
    def is_on(self):
-        """ Returns the state of the entity. """
+        """Return the state of the entity."""
        return self._state != self._invert_logic
--- a/homeassistant/components/binary_sensor/tcp.py
+++ b/homeassistant/components/binary_sensor/tcp.py
@@ -0,0 +1,32 @@
+"""
+Provides a binary sensor which gets its values from a TCP socket.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.tcp/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.sensor.tcp import Sensor, CONF_VALUE_ON
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Create the binary sensor."""
+    if not BinarySensor.validate_config(config):
+        return False
+
+    add_entities((BinarySensor(hass, config),))
+
+
+class BinarySensor(BinarySensorDevice, Sensor):
+    """A binary sensor which is on when its state == CONF_VALUE_ON."""
+
+    required = (CONF_VALUE_ON,)
+
+    @property
+    def is_on(self):
+        """True if the binary sensor is on."""
+        return self._state == self._config[CONF_VALUE_ON]
--- a/homeassistant/components/binary_sensor/template.py
+++ b/homeassistant/components/binary_sensor/template.py
@@ -0,0 +1,131 @@
+"""
+Support for exposing a templated binary sensor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.template/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import (BinarySensorDevice,
+                                                    ENTITY_ID_FORMAT,
+                                                    SENSOR_CLASSES)
+from homeassistant.const import (ATTR_FRIENDLY_NAME, CONF_VALUE_TEMPLATE,
+                                 ATTR_ENTITY_ID, MATCH_ALL)
+from homeassistant.exceptions import TemplateError
+from homeassistant.helpers.entity import generate_entity_id
+from homeassistant.helpers import template
+from homeassistant.helpers.event import track_state_change
+from homeassistant.util import slugify
+
+CONF_SENSORS = 'sensors'
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup template binary sensors."""
+    sensors = []
+    if config.get(CONF_SENSORS) is None:
+        _LOGGER.error('Missing configuration data for binary_sensor platform')
+        return False
+
+    for device, device_config in config[CONF_SENSORS].items():
+
+        if device != slugify(device):
+            _LOGGER.error('Found invalid key for binary_sensor.template: %s. '
+                          'Use %s instead', device, slugify(device))
+            continue
+
+        if not isinstance(device_config, dict):
+            _LOGGER.error('Missing configuration data for binary_sensor %s',
+                          device)
+            continue
+
+        friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
+        sensor_class = device_config.get('sensor_class')
+        value_template = device_config.get(CONF_VALUE_TEMPLATE)
+
+        if sensor_class not in SENSOR_CLASSES:
+            _LOGGER.error('Sensor class is not valid')
+            continue
+
+        if value_template is None:
+            _LOGGER.error(
+                'Missing %s for sensor %s', CONF_VALUE_TEMPLATE, device)
+            continue
+
+        entity_ids = device_config.get(ATTR_ENTITY_ID, MATCH_ALL)
+
+        sensors.append(
+            BinarySensorTemplate(
+                hass,
+                device,
+                friendly_name,
+                sensor_class,
+                value_template,
+                entity_ids)
+            )
+    if not sensors:
+        _LOGGER.error('No sensors added')
+        return False
+    add_devices(sensors)
+
+    return True
+
+
+class BinarySensorTemplate(BinarySensorDevice):
+    """A virtual binary sensor that triggers from another sensor."""
+
+    # pylint: disable=too-many-arguments
+    def __init__(self, hass, device, friendly_name, sensor_class,
+                 value_template, entity_ids):
+        """Initialize the Template binary sensor."""
+        self.hass = hass
+        self.entity_id = generate_entity_id(ENTITY_ID_FORMAT, device,
+                                            hass=hass)
+        self._name = friendly_name
+        self._sensor_class = sensor_class
+        self._template = value_template
+        self._state = None
+
+        self.update()
+
+        def template_bsensor_state_listener(entity, old_state, new_state):
+            """Called when the target device changes state."""
+            self.update_ha_state(True)
+
+        track_state_change(hass, entity_ids,
+                           template_bsensor_state_listener)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state
+
+    @property
+    def sensor_class(self):
+        """Return the sensor class of the sensor."""
+        return self._sensor_class
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    def update(self):
+        """Get the latest data and update the state."""
+        try:
+            self._state = template.render(self.hass,
+                                          self._template).lower() == 'true'
+        except TemplateError as ex:
+            if ex.args and ex.args[0].startswith(
+                    "UndefinedError: 'None' has no attribute"):
+                # Common during HA startup - so just a warning
+                _LOGGER.warning(ex)
+                return
+            _LOGGER.error(ex)
+            self._state = False
--- a/homeassistant/components/binary_sensor/vera.py
+++ b/homeassistant/components/binary_sensor/vera.py
@@ -0,0 +1,68 @@
+"""
+Support for Vera binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.vera/
+"""
+import logging
+
+import homeassistant.util.dt as dt_util
+from homeassistant.const import (
+    ATTR_ARMED, ATTR_BATTERY_LEVEL, ATTR_LAST_TRIP_TIME, ATTR_TRIPPED)
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice)
+from homeassistant.components.vera import (
+    VeraDevice, VERA_DEVICES, VERA_CONTROLLER)
+
+DEPENDENCIES = ['vera']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Perform the setup for Vera controller devices."""
+    add_devices_callback(
+        VeraBinarySensor(device, VERA_CONTROLLER)
+        for device in VERA_DEVICES['binary_sensor'])
+
+
+class VeraBinarySensor(VeraDevice, BinarySensorDevice):
+    """Representation of a Vera Binary Sensor."""
+
+    def __init__(self, vera_device, controller):
+        """Initialize the binary_sensor."""
+        self._state = False
+        VeraDevice.__init__(self, vera_device, controller)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attr = {}
+        if self.vera_device.has_battery:
+            attr[ATTR_BATTERY_LEVEL] = self.vera_device.battery_level + '%'
+
+        if self.vera_device.is_armable:
+            armed = self.vera_device.is_armed
+            attr[ATTR_ARMED] = 'True' if armed else 'False'
+
+        if self.vera_device.is_trippable:
+            last_tripped = self.vera_device.last_trip
+            if last_tripped is not None:
+                utc_time = dt_util.utc_from_timestamp(int(last_tripped))
+                attr[ATTR_LAST_TRIP_TIME] = utc_time.isoformat()
+            else:
+                attr[ATTR_LAST_TRIP_TIME] = None
+            tripped = self.vera_device.is_tripped
+            attr[ATTR_TRIPPED] = 'True' if tripped else 'False'
+
+        attr['Vera Device Id'] = self.vera_device.vera_device_id
+        return attr
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state
+
+    def update(self):
+        """Get the latest data and update the state."""
+        self._state = self.vera_device.is_tripped
--- a/homeassistant/components/binary_sensor/wemo.py
+++ b/homeassistant/components/binary_sensor/wemo.py
@@ -0,0 +1,78 @@
+"""
+Support for WeMo sensors.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.wemo/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ['wemo']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument, too-many-function-args
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Register discovered WeMo binary sensors."""
+    import pywemo.discovery as discovery
+
+    if discovery_info is not None:
+        location = discovery_info[2]
+        mac = discovery_info[3]
+        device = discovery.device_from_description(location, mac)
+
+        if device:
+            add_devices_callback([WemoBinarySensor(device)])
+
+
+class WemoBinarySensor(BinarySensorDevice):
+    """Represents a WeMo binary sensor."""
+
+    def __init__(self, device):
+        """Initialize the WeMo sensor."""
+        self.wemo = device
+        self._state = None
+
+        wemo = get_component('wemo')
+        wemo.SUBSCRIPTION_REGISTRY.register(self.wemo)
+        wemo.SUBSCRIPTION_REGISTRY.on(self.wemo, None, self._update_callback)
+
+    def _update_callback(self, _device, _params):
+        """Called by the wemo device callback to update state."""
+        _LOGGER.info(
+            'Subscription update for  %s',
+            _device)
+        if not hasattr(self, 'hass'):
+            self.update()
+            return
+        self.update_ha_state(True)
+
+    @property
+    def should_poll(self):
+        """No polling needed with subscriptions."""
+        return False
+
+    @property
+    def unique_id(self):
+        """Return the id of this WeMo device."""
+        return "{}.{}".format(self.__class__, self.wemo.serialnumber)
+
+    @property
+    def name(self):
+        """Return the name of the sevice if any."""
+        return self.wemo.name
+
+    @property
+    def is_on(self):
+        """True if sensor is on."""
+        return self._state
+
+    def update(self):
+        """Update WeMo state."""
+        try:
+            self._state = self.wemo.get_state(True)
+        except AttributeError:
+            _LOGGER.warning('Could not update status for %s', self.name)
--- a/homeassistant/components/binary_sensor/wink.py
+++ b/homeassistant/components/binary_sensor/wink.py
@@ -0,0 +1,71 @@
+"""
+Support for Wink sensors.
+
+For more details about this platform, please refer to the documentation at
+at https://home-assistant.io/components/sensor.wink/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.sensor.wink import WinkDevice
+from homeassistant.const import CONF_ACCESS_TOKEN
+from homeassistant.helpers.entity import Entity
+from homeassistant.loader import get_component
+
+REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8']
+
+# These are the available sensors mapped to binary_sensor class
+SENSOR_TYPES = {
+    "opened": "opening",
+    "brightness": "light",
+    "vibration": "vibration",
+    "loudness": "sound"
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Wink platform."""
+    import pywink
+
+    if discovery_info is None:
+        token = config.get(CONF_ACCESS_TOKEN)
+
+        if token is None:
+            logging.getLogger(__name__).error(
+                "Missing wink access_token. "
+                "Get one at https://winkbearertoken.appspot.com/")
+            return
+
+        pywink.set_bearer_token(token)
+
+    for sensor in pywink.get_sensors():
+        if sensor.capability() in SENSOR_TYPES:
+            add_devices([WinkBinarySensorDevice(sensor)])
+
+
+class WinkBinarySensorDevice(WinkDevice, BinarySensorDevice, Entity):
+    """Representation of a Wink sensor."""
+
+    def __init__(self, wink):
+        """Initialize the Wink binary sensor."""
+        super().__init__(wink)
+        wink = get_component('wink')
+        self._unit_of_measurement = self.wink.UNIT
+        self.capability = self.wink.capability()
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        if self.capability == "loudness":
+            return self.wink.loudness_boolean()
+        elif self.capability == "vibration":
+            return self.wink.vibration_boolean()
+        elif self.capability == "brightness":
+            return self.wink.brightness_boolean()
+        else:
+            return self.wink.state()
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return SENSOR_TYPES.get(self.capability)
--- a/homeassistant/components/binary_sensor/zigbee.py
+++ b/homeassistant/components/binary_sensor/zigbee.py
@@ -1,29 +1,24 @@
 """
-homeassistant.components.binary_sensor.zigbee
-
 Contains functionality to use a ZigBee device as a binary sensor.
-"""

+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.zigbee/
+"""
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.zigbee import (
    ZigBeeDigitalIn, ZigBeeDigitalInConfig)

-
 DEPENDENCIES = ["zigbee"]


 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """
-    Create and add an entity based on the configuration.
-    """
+    """Create and add an entity based on the configuration."""
    add_entities([
        ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))
    ])


 class ZigBeeBinarySensor(ZigBeeDigitalIn, BinarySensorDevice):
-    """
-    Use multiple inheritance to turn a ZigBeeDigitalIn into a
-    BinarySensorDevice.
-    """
+    """Use ZigBeeDigitalIn as binary sensor."""
+
    pass
--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -0,0 +1,133 @@
+"""
+Interfaces with Z-Wave sensors.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/binary_sensor.zwave/
+"""
+import logging
+import datetime
+import homeassistant.util.dt as dt_util
+from homeassistant.helpers.event import track_point_in_time
+from homeassistant.components import zwave
+from homeassistant.components.binary_sensor import (
+    DOMAIN,
+    BinarySensorDevice)
+
+_LOGGER = logging.getLogger(__name__)
+DEPENDENCIES = []
+
+PHILIO = 0x013c
+PHILIO_SLIM_SENSOR = 0x0002
+PHILIO_SLIM_SENSOR_MOTION = (PHILIO, PHILIO_SLIM_SENSOR, 0)
+WENZHOU = 0x0118
+WENZHOU_SLIM_SENSOR_MOTION = (WENZHOU, PHILIO_SLIM_SENSOR, 0)
+
+WORKAROUND_NO_OFF_EVENT = 'trigger_no_off_event'
+
+DEVICE_MAPPINGS = {
+    PHILIO_SLIM_SENSOR_MOTION: WORKAROUND_NO_OFF_EVENT,
+    WENZHOU_SLIM_SENSOR_MOTION: WORKAROUND_NO_OFF_EVENT,
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Z-Wave platform for sensors."""
+    if discovery_info is None or zwave.NETWORK is None:
+        return
+
+    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
+    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+    value.set_change_verified(False)
+
+    # Make sure that we have values for the key before converting to int
+    if (value.node.manufacturer_id.strip() and
+            value.node.product_id.strip()):
+        specific_sensor_key = (int(value.node.manufacturer_id, 16),
+                               int(value.node.product_id, 16),
+                               value.index)
+
+        if specific_sensor_key in DEVICE_MAPPINGS:
+            if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
+                # Default the multiplier to 4
+                re_arm_multiplier = (zwave.get_config_value(value.node,
+                                                            9) or 4)
+                add_devices([
+                    ZWaveTriggerSensor(value, "motion",
+                                       hass, re_arm_multiplier * 8)
+                ])
+                return
+
+    if value.command_class == zwave.COMMAND_CLASS_SENSOR_BINARY:
+        add_devices([ZWaveBinarySensor(value, None)])
+
+
+class ZWaveBinarySensor(BinarySensorDevice, zwave.ZWaveDeviceEntity):
+    """Representation of a binary sensor within Z-Wave."""
+
+    def __init__(self, value, sensor_class):
+        """Initialize the sensor."""
+        self._sensor_type = sensor_class
+        # pylint: disable=import-error
+        from openzwave.network import ZWaveNetwork
+        from pydispatch import dispatcher
+
+        zwave.ZWaveDeviceEntity.__init__(self, value, DOMAIN)
+
+        dispatcher.connect(
+            self.value_changed, ZWaveNetwork.SIGNAL_VALUE_CHANGED)
+
+    @property
+    def is_on(self):
+        """Return True if the binary sensor is on."""
+        return self._value.data
+
+    @property
+    def sensor_class(self):
+        """Return the class of this sensor, from SENSOR_CLASSES."""
+        return self._sensor_type
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    def value_changed(self, value):
+        """Called when a value has changed on the network."""
+        if self._value.value_id == value.value_id:
+            self.update_ha_state()
+
+
+class ZWaveTriggerSensor(ZWaveBinarySensor):
+    """Representation of a stateless sensor within Z-Wave."""
+
+    def __init__(self, sensor_value, sensor_class, hass, re_arm_sec=60):
+        """Initialize the sensor."""
+        super(ZWaveTriggerSensor, self).__init__(sensor_value, sensor_class)
+        self._hass = hass
+        self.re_arm_sec = re_arm_sec
+        self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
+            seconds=self.re_arm_sec)
+        # If it's active make sure that we set the timeout tracker
+        if sensor_value.data:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self.invalidate_after)
+
+    def value_changed(self, value):
+        """Called when a value has changed on the network."""
+        if self._value.value_id == value.value_id:
+            self.update_ha_state()
+            if value.data:
+                # only allow this value to be true for re_arm secs
+                self.invalidate_after = dt_util.utcnow() + datetime.timedelta(
+                    seconds=self.re_arm_sec)
+                track_point_in_time(
+                    self._hass, self.update_ha_state,
+                    self.invalidate_after)
+
+    @property
+    def is_on(self):
+        """Return True if movement has happened within the rearm time."""
+        return self._value.data and \
+            (self.invalidate_after is None or
+             self.invalidate_after > dt_util.utcnow())
--- a/homeassistant/components/bloomsky.py
+++ b/homeassistant/components/bloomsky.py
@@ -0,0 +1,77 @@
+"""
+Support for BloomSky weather station.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/bloomsky/
+"""
+import logging
+from datetime import timedelta
+
+import requests
+
+from homeassistant.const import CONF_API_KEY
+from homeassistant.helpers import validate_config, discovery
+from homeassistant.util import Throttle
+
+DOMAIN = "bloomsky"
+BLOOMSKY = None
+
+_LOGGER = logging.getLogger(__name__)
+
+# The BloomSky only updates every 5-8 minutes as per the API spec so there's
+# no point in polling the API more frequently
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=300)
+
+
+# pylint: disable=unused-argument,too-few-public-methods
+def setup(hass, config):
+    """Setup BloomSky component."""
+    if not validate_config(
+            config,
+            {DOMAIN: [CONF_API_KEY]},
+            _LOGGER):
+        return False
+
+    api_key = config[DOMAIN][CONF_API_KEY]
+
+    global BLOOMSKY
+    try:
+        BLOOMSKY = BloomSky(api_key)
+    except RuntimeError:
+        return False
+
+    for component in 'camera', 'binary_sensor', 'sensor':
+        discovery.load_platform(hass, component, DOMAIN, {}, config)
+
+    return True
+
+
+class BloomSky(object):
+    """Handle all communication with the BloomSky API."""
+
+    # API documentation at http://weatherlution.com/bloomsky-api/
+    API_URL = "https://api.bloomsky.com/api/skydata"
+
+    def __init__(self, api_key):
+        """Initialize the BookSky."""
+        self._api_key = api_key
+        self.devices = {}
+        _LOGGER.debug("Initial bloomsky device load...")
+        self.refresh_devices()
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def refresh_devices(self):
+        """Use the API to retreive a list of devices."""
+        _LOGGER.debug("Fetching bloomsky update")
+        response = requests.get(self.API_URL,
+                                headers={"Authorization": self._api_key},
+                                timeout=10)
+        if response.status_code == 401:
+            raise RuntimeError("Invalid API_KEY")
+        elif response.status_code != 200:
+            _LOGGER.error("Invalid HTTP response: %s", response.status_code)
+            return
+        # Create dictionary keyed off of the device unique id
+        self.devices.update({
+            device["DeviceID"]: device for device in response.json()
+        })
--- a/homeassistant/components/browser.py
+++ b/homeassistant/components/browser.py
@@ -1,27 +1,29 @@
 """
-homeassistant.components.browser
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides functionality to launch a webbrowser on the host machine.
+Provides functionality to launch a web browser on the host machine.

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

 DOMAIN = "browser"
-
 SERVICE_BROWSE_URL = "browse_url"

+ATTR_URL = 'url'
+ATTR_URL_DEFAULT = 'https://www.google.com'
+
+SERVICE_BROWSE_URL_SCHEMA = vol.Schema({
+    vol.Required(ATTR_URL, default=ATTR_URL_DEFAULT): vol.Url,
+})
+

 def setup(hass, config):
-    """ Listen for browse_url events and open
-        the url in the default webbrowser. """
-
+    """Listen for browse_url events."""
    import webbrowser

    hass.services.register(DOMAIN, SERVICE_BROWSE_URL,
                           lambda service:
-                           webbrowser.open(
-                               service.data.get(
-                                   'url', 'https://www.google.com')))
+                           webbrowser.open(service.data[ATTR_URL]),
+                           schema=SERVICE_BROWSE_URL_SCHEMA)

    return True
--- a/homeassistant/components/camera/init.py
+++ b/homeassistant/components/camera/init.py
@@ -1,198 +1,116 @@
 # pylint: disable=too-many-lines
 """
-homeassistant.components.camera
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Component to interface with various cameras.
+Component to interface with cameras.

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

-import requests
-
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.const import (
-    ATTR_ENTITY_PICTURE,
-    HTTP_NOT_FOUND,
-    ATTR_ENTITY_ID,
-    )
-
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+from homeassistant.components.http import HomeAssistantView

 DOMAIN = 'camera'
 DEPENDENCIES = ['http']
-GROUP_NAME_ALL_CAMERAS = 'all_cameras'
 SCAN_INTERVAL = 30
 ENTITY_ID_FORMAT = DOMAIN + '.{}'

-SWITCH_ACTION_RECORD = 'record'
-SWITCH_ACTION_SNAPSHOT = 'snapshot'
-
-SERVICE_CAMERA = 'camera_service'
-
 STATE_RECORDING = 'recording'
-
-DEFAULT_RECORDING_SECONDS = 30
-
-# Maps discovered services to their platforms
-DISCOVERY_PLATFORMS = {}
-
-FILE_DATETIME_FORMAT = '%Y-%m-%d_%H-%M-%S-%f'
-DIR_DATETIME_FORMAT = '%Y-%m-%d_%H-%M-%S'
-
-REC_DIR_PREFIX = 'recording-'
-REC_IMG_PREFIX = 'recording_image-'
-
 STATE_STREAMING = 'streaming'
 STATE_IDLE = 'idle'

-CAMERA_PROXY_URL = '/api/camera_proxy_stream/{0}'
-CAMERA_STILL_URL = '/api/camera_proxy/{0}'
-ENTITY_IMAGE_URL = '/api/camera_proxy/{0}?time={1}'
-
-MULTIPART_BOUNDARY = '--jpegboundary'
-MJPEG_START_HEADER = 'Content-type: {0}\r\n\r\n'
+ENTITY_IMAGE_URL = '/api/camera_proxy/{0}?token={1}'


 # pylint: disable=too-many-branches
 def setup(hass, config):
-    """ Track states and offer events for cameras. """
-
+    """Setup the camera component."""
    component = EntityComponent(
-        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
-        DISCOVERY_PLATFORMS)
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
+
+    hass.wsgi.register_view(CameraImageView(hass, component.entities))
+    hass.wsgi.register_view(CameraMjpegStream(hass, component.entities))

    component.setup(config)

-    # -------------------------------------------------------------------------
-    # CAMERA COMPONENT ENDPOINTS
-    # -------------------------------------------------------------------------
-    # The following defines the endpoints for serving images from the camera
-    # via the HA http server.  This is means that you can access images from
-    # your camera outside of your LAN without the need for port forwards etc.
-
-    # Because the authentication header can't be added in image requests these
-    # endpoints are secured with session based security.
-
-    # pylint: disable=unused-argument
-    def _proxy_camera_image(handler, path_match, data):
-        """ Proxies the camera image via the HA server. """
-        entity_id = path_match.group(ATTR_ENTITY_ID)
-        camera = component.entities.get(entity_id)
-
-        if camera is None:
-            handler.send_response(HTTP_NOT_FOUND)
-            handler.end_headers()
-            return
-
-        response = camera.camera_image()
-
-        if response is None:
-            handler.send_response(HTTP_NOT_FOUND)
-            handler.end_headers()
-            return
-
-        handler.wfile.write(response)
-
-    hass.http.register_path(
-        'GET',
-        re.compile(r'/api/camera_proxy/(?P<entity_id>[a-zA-Z\._0-9]+)'),
-        _proxy_camera_image)
-
-    # pylint: disable=unused-argument
-    def _proxy_camera_mjpeg_stream(handler, path_match, data):
-        """
-        Proxies the camera image as an mjpeg stream via the HA server.
-        This function takes still images from the IP camera and turns them
-        into an MJPEG stream.  This means that HA can return a live video
-        stream even with only a still image URL available.
-        """
-        entity_id = path_match.group(ATTR_ENTITY_ID)
-        camera = component.entities.get(entity_id)
-
-        if camera is None:
-            handler.send_response(HTTP_NOT_FOUND)
-            handler.end_headers()
-            return
-
-        try:
-            camera.is_streaming = True
-            camera.update_ha_state()
-
-            handler.request.sendall(bytes('HTTP/1.1 200 OK\r\n', 'utf-8'))
-            handler.request.sendall(bytes(
-                'Content-type: multipart/x-mixed-replace; \
-                    boundary=--jpgboundary\r\n\r\n', 'utf-8'))
-            handler.request.sendall(bytes('--jpgboundary\r\n', 'utf-8'))
-
-            # MJPEG_START_HEADER.format()
-
-            while True:
-                img_bytes = camera.camera_image()
-                if img_bytes is None:
-                    continue
-                headers_str = '\r\n'.join((
-                    'Content-length: {}'.format(len(img_bytes)),
-                    'Content-type: image/jpeg',
-                )) + '\r\n\r\n'
-
-                handler.request.sendall(
-                    bytes(headers_str, 'utf-8') +
-                    img_bytes +
-                    bytes('\r\n', 'utf-8'))
-
-                handler.request.sendall(
-                    bytes('--jpgboundary\r\n', 'utf-8'))
-
-                time.sleep(0.5)
-
-        except (requests.RequestException, IOError):
-            camera.is_streaming = False
-            camera.update_ha_state()
-
-    hass.http.register_path(
-        'GET',
-        re.compile(
-            r'/api/camera_proxy_stream/(?P<entity_id>[a-zA-Z\._0-9]+)'),
-        _proxy_camera_mjpeg_stream)
-
    return True


 class Camera(Entity):
-    """ The base class for camera components. """
+    """The base class for camera entities."""

    def __init__(self):
+        """Initialize a camera."""
        self.is_streaming = False

    @property
-    # pylint: disable=no-self-use
-    def is_recording(self):
-        """ Returns true if the device is recording. """
+    def access_token(self):
+        """Access token for this camera."""
+        return str(id(self))
+
+    @property
+    def should_poll(self):
+        """No need to poll cameras."""
+        return False
+
+    @property
+    def entity_picture(self):
+        """Return a link to the camera feed as entity picture."""
+        return ENTITY_IMAGE_URL.format(self.entity_id, self.access_token)
+
+    @property
+    def is_recording(self):
+        """Return true if the device is recording."""
        return False

    @property
-    # pylint: disable=no-self-use
    def brand(self):
-        """ Should return a string of the camera brand. """
+        """Camera brand."""
        return None

    @property
-    # pylint: disable=no-self-use
    def model(self):
-        """ Returns string of camera model. """
+        """Camera model."""
        return None

    def camera_image(self):
-        """ Return bytes of camera image. """
+        """Return bytes of camera image."""
        raise NotImplementedError()

+    def mjpeg_stream(self, response):
+        """Generate an HTTP MJPEG stream from camera images."""
+        def stream():
+            """Stream images as mjpeg stream."""
+            try:
+                last_image = None
+                while True:
+                    img_bytes = self.camera_image()
+
+                    if img_bytes is not None and img_bytes != last_image:
+                        yield bytes(
+                            '--jpegboundary\r\n'
+                            'Content-Type: image/jpeg\r\n'
+                            'Content-Length: {}\r\n\r\n'.format(
+                                len(img_bytes)), 'utf-8') + img_bytes + b'\r\n'
+
+                        last_image = img_bytes
+
+                    time.sleep(0.5)
+            except GeneratorExit:
+                pass
+
+        return response(
+            stream(),
+            content_type=('multipart/x-mixed-replace; '
+                          'boundary=--jpegboundary')
+        )
+
    @property
    def state(self):
-        """ Returns the state of the entity. """
+        """Camera state."""
        if self.is_recording:
            return STATE_RECORDING
        elif self.is_streaming:
@@ -202,10 +120,9 @@ class Camera(Entity):

    @property
    def state_attributes(self):
-        """ Returns optional state attributes. """
+        """Camera state attributes."""
        attr = {
-            ATTR_ENTITY_PICTURE: ENTITY_IMAGE_URL.format(
-                self.entity_id, time.time()),
+            'access_token': self.access_token,
        }

        if self.model:
@@ -215,3 +132,60 @@ class Camera(Entity):
            attr['brand'] = self.brand

        return attr
+
+
+class CameraView(HomeAssistantView):
+    """Base CameraView."""
+
+    requires_auth = False
+
+    def __init__(self, hass, entities):
+        """Initialize a basic camera view."""
+        super().__init__(hass)
+        self.entities = entities
+
+    def get(self, request, entity_id):
+        """Start a get request."""
+        camera = self.entities.get(entity_id)
+
+        if camera is None:
+            return self.Response(status=404)
+
+        authenticated = (request.authenticated or
+                         request.args.get('token') == camera.access_token)
+
+        if not authenticated:
+            return self.Response(status=401)
+
+        return self.handle(camera)
+
+    def handle(self, camera):
+        """Hanlde the camera request."""
+        raise NotImplementedError()
+
+
+class CameraImageView(CameraView):
+    """Camera view to serve an image."""
+
+    url = "/api/camera_proxy/<entity(domain=camera):entity_id>"
+    name = "api:camera:image"
+
+    def handle(self, camera):
+        """Serve camera image."""
+        response = camera.camera_image()
+
+        if response is None:
+            return self.Response(status=500)
+
+        return self.Response(response)
+
+
+class CameraMjpegStream(CameraView):
+    """Camera View to serve an MJPEG stream."""
+
+    url = "/api/camera_proxy_stream/<entity(domain=camera):entity_id>"
+    name = "api:camera:stream"
+
+    def handle(self, camera):
+        """Serve camera image."""
+        return camera.mjpeg_stream(self.Response)
--- a/homeassistant/components/camera/bloomsky.py
+++ b/homeassistant/components/camera/bloomsky.py
@@ -0,0 +1,61 @@
+"""
+Support for a camera of a BloomSky weather station.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/camera.bloomsky/
+"""
+import logging
+
+import requests
+
+from homeassistant.components.camera import Camera
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ["bloomsky"]
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Setup access to BloomSky cameras."""
+    bloomsky = get_component('bloomsky')
+    for device in bloomsky.BLOOMSKY.devices.values():
+        add_devices_callback([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
+
+
+class BloomSkyCamera(Camera):
+    """Representation of the images published from the BloomSky's camera."""
+
+    def __init__(self, bs, device):
+        """Setup for access to the BloomSky camera images."""
+        super(BloomSkyCamera, self).__init__()
+        self._name = device["DeviceName"]
+        self._id = device["DeviceID"]
+        self._bloomsky = bs
+        self._url = ""
+        self._last_url = ""
+        # _last_image will store images as they are downloaded so that the
+        # frequent updates in home-assistant don't keep poking the server
+        # to download the same image over and over.
+        self._last_image = ""
+        self._logger = logging.getLogger(__name__)
+
+    def camera_image(self):
+        """Update the camera's image if it has changed."""
+        try:
+            self._url = self._bloomsky.devices[self._id]["Data"]["ImageURL"]
+            self._bloomsky.refresh_devices()
+            # If the URL hasn't changed then the image hasn't changed.
+            if self._url != self._last_url:
+                response = requests.get(self._url, timeout=10)
+                self._last_url = self._url
+                self._last_image = response.content
+        except requests.exceptions.RequestException as error:
+            self._logger.error("Error getting bloomsky image: %s", error)
+            return None
+
+        return self._last_image
+
+    @property
+    def name(self):
+        """Return the name of this BloomSky device."""
+        return self._name
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -1,29 +1,32 @@
 """
-homeassistant.components.camera.demo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Demo platform that has a fake camera.
+Demo camera platform that has a fake camera.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
 """
 import os
-from homeassistant.components.camera import Camera
+
 import homeassistant.util.dt as dt_util
+from homeassistant.components.camera import Camera


 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """ Sets up the Demo camera. """
+    """Setup the Demo camera platform."""
    add_devices([
        DemoCamera('Demo camera')
    ])


 class DemoCamera(Camera):
-    """ A Demo camera. """
+    """A Demo camera."""

    def __init__(self, name):
+        """Initialize demo camera component."""
        super().__init__()
        self._name = name

    def camera_image(self):
-        """ Return a faked still image response. """
+        """Return a faked still image response."""
        now = dt_util.utcnow()

        image_path = os.path.join(os.path.dirname(__file__),
@@ -33,5 +36,5 @@ class DemoCamera(Camera):

    @property
    def name(self):
-        """ Return the name of this device. """
+        """Return the name of this camera."""
        return self._name
--- a/homeassistant/components/camera/foscam.py
+++ b/homeassistant/components/camera/foscam.py
@@ -1,6 +1,4 @@
 """
-homeassistant.components.camera.foscam
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This component provides basic support for Foscam IP cameras.

 For more details about this platform, please refer to the documentation at
@@ -10,15 +8,15 @@ import logging

 import requests

-from homeassistant.helpers import validate_config
 from homeassistant.components.camera import DOMAIN, Camera
+from homeassistant.helpers import validate_config

 _LOGGER = logging.getLogger(__name__)


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
-    """ Adds a Foscam IP Camera. """
+    """Setup a Foscam IP Camera."""
    if not validate_config({DOMAIN: config},
                           {DOMAIN: ['username', 'password', 'ip']}, _LOGGER):
        return None
@@ -28,9 +26,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):

 # pylint: disable=too-many-instance-attributes
 class FoscamCamera(Camera):
-    """ An implementation of a Foscam IP camera. """
+    """An implementation of a Foscam IP camera."""

    def __init__(self, device_info):
+        """Initialize a Foscam camera."""
        super(FoscamCamera, self).__init__()

        ip_address = device_info.get('ip')
@@ -48,14 +47,13 @@ class FoscamCamera(Camera):
                     self._name, self._snap_picture_url)

    def camera_image(self):
-        """ Return a still image reponse from the camera. """
-
+        """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)
+        response = requests.get(self._snap_picture_url, timeout=10)

        return response.content

    @property
    def name(self):
-        """ Return the name of this device. """
+        """Return the name of this camera."""
        return self._name
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -1,6 +1,4 @@
 """
-homeassistant.components.camera.generic
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for IP Cameras.

 For more details about this platform, please refer to the documentation at
@@ -11,15 +9,15 @@ import logging
 import requests
 from requests.auth import HTTPBasicAuth

-from homeassistant.helpers import validate_config
 from homeassistant.components.camera import DOMAIN, Camera
+from homeassistant.helpers import validate_config

 _LOGGER = logging.getLogger(__name__)


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
-    """ Adds a generic IP Camera. """
+    """Setup a generic IP Camera."""
    if not validate_config({DOMAIN: config}, {DOMAIN: ['still_image_url']},
                           _LOGGER):
        return None
@@ -29,11 +27,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):

 # pylint: disable=too-many-instance-attributes
 class GenericCamera(Camera):
-    """
-    A generic implementation of an IP camera that is reachable over a URL.
-    """
+    """A generic implementation of an IP camera."""

    def __init__(self, device_info):
+        """Initialize a generic camera."""
        super().__init__()
        self._name = device_info.get('name', 'Generic Camera')
        self._username = device_info.get('username')
@@ -41,18 +38,19 @@ class GenericCamera(Camera):
        self._still_image_url = device_info['still_image_url']

    def camera_image(self):
-        """ Return a still image response from the camera. """
+        """Return a still image response from the camera."""
        if self._username and self._password:
            try:
                response = requests.get(
                    self._still_image_url,
-                    auth=HTTPBasicAuth(self._username, self._password))
+                    auth=HTTPBasicAuth(self._username, self._password),
+                    timeout=10)
            except requests.exceptions.RequestException as error:
                _LOGGER.error('Error getting camera image: %s', error)
                return None
        else:
            try:
-                response = requests.get(self._still_image_url)
+                response = requests.get(self._still_image_url, timeout=10)
            except requests.exceptions.RequestException as error:
                _LOGGER.error('Error getting camera image: %s', error)
                return None
@@ -61,5 +59,5 @@ class GenericCamera(Camera):

    @property
    def name(self):
-        """ Return the name of this device. """
+        """Return the name of this device."""
        return self._name
--- a/homeassistant/components/camera/local_file.py
+++ b/homeassistant/components/camera/local_file.py
@@ -0,0 +1,53 @@
+"""Camera that loads a picture from a local file."""
+
+import logging
+import os
+
+from homeassistant.components.camera import Camera
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Camera."""
+    # check for missing required configuration variable
+    if config.get("file_path") is None:
+        _LOGGER.error("Missing required variable: file_path")
+        return False
+
+    setup_config = (
+        {
+            "name": config.get("name", "Local File"),
+            "file_path": config.get("file_path")
+        }
+    )
+
+    # check filepath given is readable
+    if not os.access(setup_config["file_path"], os.R_OK):
+        _LOGGER.error("file path is not readable")
+        return False
+
+    add_devices([
+        LocalFile(setup_config)
+    ])
+
+
+class LocalFile(Camera):
+    """Local camera."""
+
+    def __init__(self, device_info):
+        """Initialize Local File Camera component."""
+        super().__init__()
+
+        self._name = device_info["name"]
+        self._config = device_info
+
+    def camera_image(self):
+        """Return image response."""
+        with open(self._config["file_path"], 'rb') as file:
+            return file.read()
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -1,26 +1,26 @@
 """
-homeassistant.components.camera.mjpeg
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Support for IP Cameras.

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

 import requests
 from requests.auth import HTTPBasicAuth

-from homeassistant.helpers import validate_config
 from homeassistant.components.camera import DOMAIN, Camera
+from homeassistant.helpers import validate_config
+
+CONTENT_TYPE_HEADER = 'Content-Type'

 _LOGGER = logging.getLogger(__name__)


 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
-    """ Adds a mjpeg IP Camera. """
+    """Setup a MJPEG IP Camera."""
    if not validate_config({DOMAIN: config}, {DOMAIN: ['mjpeg_url']},
                           _LOGGER):
        return None
@@ -30,22 +30,30 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):

 # pylint: disable=too-many-instance-attributes
 class MjpegCamera(Camera):
-    """
-    A generic implementation of an IP camera that is reachable over a URL.
-    """
+    """An implementation of an IP camera that is reachable over a URL."""

    def __init__(self, device_info):
+        """Initialize a MJPEG camera."""
        super().__init__()
        self._name = device_info.get('name', 'Mjpeg Camera')
        self._username = device_info.get('username')
        self._password = device_info.get('password')
        self._mjpeg_url = device_info['mjpeg_url']

-    def camera_image(self):
-        """ Return a still image response from the camera. """
+    def camera_stream(self):
+        """Return a MJPEG stream image response directly from the camera."""
+        if self._username and self._password:
+            return requests.get(self._mjpeg_url,
+                                auth=HTTPBasicAuth(self._username,
+                                                   self._password),
+                                stream=True, timeout=10)
+        else:
+            return requests.get(self._mjpeg_url, stream=True, timeout=10)

+    def camera_image(self):
+        """Return a still image response from the camera."""
        def process_response(response):
-            """ Take in a response object, return the jpg from it. """
+            """Take in a response object, return the jpg from it."""
            data = b''
            for chunk in response.iter_content(1024):
                data += chunk
@@ -55,18 +63,19 @@ class MjpegCamera(Camera):
                    jpg = data[jpg_start:jpg_end + 2]
                    return jpg

-        if self._username and self._password:
-            with closing(requests.get(self._mjpeg_url,
-                                      auth=HTTPBasicAuth(self._username,
-                                                         self._password),
-                                      stream=True)) as response:
-                return process_response(response)
-        else:
-            with closing(requests.get(self._mjpeg_url,
-                                      stream=True)) as response:
-                return process_response(response)
+        with closing(self.camera_stream()) as response:
+            return process_response(response)
+
+    def mjpeg_stream(self, response):
+        """Generate an HTTP MJPEG stream from the camera."""
+        stream = self.camera_stream()
+        return response(
+            stream.iter_content(chunk_size=1024),
+            mimetype=stream.headers[CONTENT_TYPE_HEADER],
+            direct_passthrough=True
+        )

    @property
    def name(self):
-        """ Return the name of this device. """
+        """Return the name of this camera."""
        return self._name
--- a/homeassistant/components/camera/netatmo.py
+++ b/homeassistant/components/camera/netatmo.py
@@ -0,0 +1,104 @@
+"""
+Support for the Netatmo Welcome camera.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.netatmo/
+"""
+import logging
+from datetime import timedelta
+import requests
+from homeassistant.util import Throttle
+
+from homeassistant.components.camera import Camera
+from homeassistant.loader import get_component
+
+DEPENDENCIES = ["netatmo"]
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_HOME = 'home'
+ATTR_CAMERAS = 'cameras'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """Setup access to Netatmo Welcome cameras."""
+    netatmo = get_component('netatmo')
+    home = config.get(CONF_HOME, None)
+    data = WelcomeData(netatmo.NETATMO_AUTH, home)
+
+    for camera_name in data.get_camera_names():
+        if ATTR_CAMERAS in config:
+            if camera_name not in config[ATTR_CAMERAS]:
+                continue
+        add_devices_callback([WelcomeCamera(data, camera_name, home)])
+
+
+class WelcomeCamera(Camera):
+    """Representation of the images published from Welcome camera."""
+
+    def __init__(self, data, camera_name, home):
+        """Setup for access to the BloomSky camera images."""
+        super(WelcomeCamera, self).__init__()
+        self._data = data
+        self._camera_name = camera_name
+        if home:
+            self._name = home + ' / ' + camera_name
+        else:
+            self._name = camera_name
+        self._vpnurl, self._localurl = self._data.welcomedata.cameraUrls(
+            camera=camera_name
+            )
+
+    def camera_image(self):
+        """Return a still image response from the camera."""
+        try:
+            if self._localurl:
+                response = requests.get('{0}/live/snapshot_720.jpg'.format(
+                    self._localurl), timeout=10)
+            else:
+                response = requests.get('{0}/live/snapshot_720.jpg'.format(
+                    self._vpnurl), timeout=10)
+        except requests.exceptions.RequestException as error:
+            _LOGGER.error('Welcome VPN url changed: %s', error)
+            self._data.update()
+            (self._vpnurl, self._localurl) = \
+                self._data.welcomedata.cameraUrls(camera=self._camera_name)
+            return None
+        return response.content
+
+    @property
+    def name(self):
+        """Return the name of this Netatmo Welcome device."""
+        return self._name
+
+
+class WelcomeData(object):
+    """Get the latest data from NetAtmo."""
+
+    def __init__(self, auth, home=None):
+        """Initialize the data object."""
+        self.auth = auth
+        self.welcomedata = None
+        self.camera_names = []
+        self.home = home
+
+    def get_camera_names(self):
+        """Return all module available on the API as a list."""
+        self.update()
+        if not self.home:
+            for home in self.welcomedata.cameras.keys():
+                for camera in self.welcomedata.cameras[home].values():
+                    self.camera_names.append(camera['name'])
+        else:
+            for camera in self.welcomedata.cameras[self.home].values():
+                self.camera_names.append(camera['name'])
+        return self.camera_names
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self):
+        """Call the NetAtmo API to update the data."""
+        import lnetatmo
+        self.welcomedata = lnetatmo.WelcomeData(self.auth)
--- a/homeassistant/components/camera/rpi_camera.py
+++ b/homeassistant/components/camera/rpi_camera.py
@@ -0,0 +1,90 @@
+"""
+Camera platform that has a Raspberry Pi camera.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.rpi_camera/
+"""
+import os
+import subprocess
+import logging
+import shutil
+
+from homeassistant.components.camera import Camera
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Setup the Raspberry Camera."""
+    if shutil.which("raspistill") is None:
+        _LOGGER.error("Error: raspistill not found")
+        return False
+
+    setup_config = (
+        {
+            "name": config.get("name", "Raspberry Pi Camera"),
+            "image_width": int(config.get("image_width", "640")),
+            "image_height": int(config.get("image_height", "480")),
+            "image_quality": int(config.get("image_quality", "7")),
+            "image_rotation": int(config.get("image_rotation", "0")),
+            "timelapse": int(config.get("timelapse", "2000")),
+            "horizontal_flip": int(config.get("horizontal_flip", "0")),
+            "vertical_flip": int(config.get("vertical_flip", "0")),
+            "file_path": config.get("file_path",
+                                    os.path.join(os.path.dirname(__file__),
+                                                 'image.jpg'))
+        }
+    )
+
+    # check filepath given is writable
+    if not os.access(setup_config["file_path"], os.W_OK):
+        _LOGGER.error("Error: file path is not writable")
+        return False
+
+    add_devices([
+        RaspberryCamera(setup_config)
+    ])
+
+
+class RaspberryCamera(Camera):
+    """Representation of a Raspberry Pi camera."""
+
+    def __init__(self, device_info):
+        """Initialize Raspberry Pi camera component."""
+        super().__init__()
+
+        self._name = device_info["name"]
+        self._config = device_info
+
+        # kill if there's raspistill instance
+        subprocess.Popen(['killall', 'raspistill'],
+                         stdout=subprocess.DEVNULL,
+                         stderr=subprocess.STDOUT)
+
+        cmd_args = [
+            'raspistill', '--nopreview', '-o', str(device_info["file_path"]),
+            '-t', '0', '-w', str(device_info["image_width"]),
+            '-h', str(device_info["image_height"]),
+            '-tl', str(device_info["timelapse"]),
+            '-q', str(device_info["image_quality"]),
+            '-rot', str(device_info["image_rotation"])
+        ]
+        if device_info["horizontal_flip"]:
+            cmd_args.append("-hf")
+
+        if device_info["vertical_flip"]:
+            cmd_args.append("-vf")
+
+        subprocess.Popen(cmd_args,
+                         stdout=subprocess.DEVNULL,
+                         stderr=subprocess.STDOUT)
+
+    def camera_image(self):
+        """Return raspstill image response."""
+        with open(self._config["file_path"], 'rb') as file:
+            return file.read()
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -0,0 +1,165 @@
+"""
+Support for Ubiquiti's UVC cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.uvc/
+"""
+import logging
+import socket
+
+import requests
+
+from homeassistant.components.camera import DOMAIN, Camera
+from homeassistant.helpers import validate_config
+
+REQUIREMENTS = ['uvcclient==0.9.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Discover cameras on a Unifi NVR."""
+    if not validate_config({DOMAIN: config}, {DOMAIN: ['nvr', 'key']},
+                           _LOGGER):
+        return None
+
+    addr = config.get('nvr')
+    key = config.get('key')
+    try:
+        port = int(config.get('port', 7080))
+    except ValueError:
+        _LOGGER.error('Invalid port number provided')
+        return False
+
+    from uvcclient import nvr
+    nvrconn = nvr.UVCRemote(addr, port, key)
+    try:
+        cameras = nvrconn.index()
+    except nvr.NotAuthorized:
+        _LOGGER.error('Authorization failure while connecting to NVR')
+        return False
+    except nvr.NvrError:
+        _LOGGER.error('NVR refuses to talk to me')
+        return False
+    except requests.exceptions.ConnectionError as ex:
+        _LOGGER.error('Unable to connect to NVR: %s', str(ex))
+        return False
+
+    identifier = nvrconn.server_version >= (3, 2, 0) and 'id' or 'uuid'
+    # Filter out airCam models, which are not supported in the latest
+    # version of UnifiVideo and which are EOL by Ubiquiti
+    cameras = [
+        camera for camera in cameras
+        if 'airCam' not in nvrconn.get_camera(camera[identifier])['model']]
+
+    add_devices([UnifiVideoCamera(nvrconn,
+                                  camera[identifier],
+                                  camera['name'])
+                 for camera in cameras])
+    return True
+
+
+class UnifiVideoCamera(Camera):
+    """A Ubiquiti Unifi Video Camera."""
+
+    def __init__(self, nvr, uuid, name):
+        """Initialize an Unifi camera."""
+        super(UnifiVideoCamera, self).__init__()
+        self._nvr = nvr
+        self._uuid = uuid
+        self._name = name
+        self.is_streaming = False
+        self._connect_addr = None
+        self._camera = None
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name
+
+    @property
+    def is_recording(self):
+        """Return true if the camera is recording."""
+        caminfo = self._nvr.get_camera(self._uuid)
+        return caminfo['recordingSettings']['fullTimeRecordEnabled']
+
+    @property
+    def brand(self):
+        """Return the brand of this camera."""
+        return 'Ubiquiti'
+
+    @property
+    def model(self):
+        """Return the model of this camera."""
+        caminfo = self._nvr.get_camera(self._uuid)
+        return caminfo['model']
+
+    def _login(self):
+        """Login to the camera."""
+        from uvcclient import camera as uvc_camera
+        from uvcclient import store as uvc_store
+
+        caminfo = self._nvr.get_camera(self._uuid)
+        if self._connect_addr:
+            addrs = [self._connect_addr]
+        else:
+            addrs = [caminfo['host'], caminfo['internalHost']]
+
+        store = uvc_store.get_info_store()
+        password = store.get_camera_password(self._uuid)
+        if password is None:
+            _LOGGER.debug('Logging into camera %(name)s with default password',
+                          dict(name=self._name))
+            password = 'ubnt'
+
+        if self._nvr.server_version >= (3, 2, 0):
+            client_cls = uvc_camera.UVCCameraClientV320
+        else:
+            client_cls = uvc_camera.UVCCameraClient
+
+        camera = None
+        for addr in addrs:
+            try:
+                camera = client_cls(addr,
+                                    caminfo['username'],
+                                    password)
+                camera.login()
+                _LOGGER.debug('Logged into UVC camera %(name)s via %(addr)s',
+                              dict(name=self._name, addr=addr))
+                self._connect_addr = addr
+                break
+            except socket.error:
+                pass
+            except uvc_camera.CameraConnectError:
+                pass
+            except uvc_camera.CameraAuthError:
+                pass
+        if not self._connect_addr:
+            _LOGGER.error('Unable to login to camera')
+            return None
+
+        self._camera = camera
+        return True
+
+    def camera_image(self):
+        """Return the image of this camera."""
+        from uvcclient import camera as uvc_camera
+        if not self._camera:
+            if not self._login():
+                return
+
+        def _get_image(retry=True):
+            try:
+                return self._camera.get_snapshot()
+            except uvc_camera.CameraConnectError:
+                _LOGGER.error('Unable to contact camera')
+            except uvc_camera.CameraAuthError:
+                if retry:
+                    self._login()
+                    return _get_image(retry=False)
+                else:
+                    _LOGGER.error('Unable to log into camera, unable '
+                                  'to get snapshot')
+                    raise
+
+        return _get_image()
--- a/homeassistant/components/configurator.py
+++ b/homeassistant/components/configurator.py
@@ -1,8 +1,5 @@
 """
-homeassistant.components.configurator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A component to allow pieces of code to request configuration from the user.
+Support to allow pieces of code to request configuration from the user.

 Initiate a request by calling the `request_config` method with a callback.
 This will return a request id that has to be used for future calls.
@@ -11,8 +8,8 @@ the user has submitted configuration information.
 """
 import logging

+from homeassistant.const import EVENT_TIME_CHANGED, ATTR_FRIENDLY_NAME
 from homeassistant.helpers.entity import generate_entity_id
-from homeassistant.const import EVENT_TIME_CHANGED

 DOMAIN = "configurator"
 ENTITY_ID_FORMAT = DOMAIN + ".{}"
@@ -22,6 +19,8 @@ SERVICE_CONFIGURE = "configure"
 STATE_CONFIGURE = "configure"
 STATE_CONFIGURED = "configured"

+ATTR_LINK_NAME = "link_name"
+ATTR_LINK_URL = "link_url"
 ATTR_CONFIGURE_ID = "configure_id"
 ATTR_DESCRIPTION = "description"
 ATTR_DESCRIPTION_IMAGE = "description_image"
@@ -37,15 +36,17 @@ _LOGGER = logging.getLogger(__name__)
 # pylint: disable=too-many-arguments
 def request_config(
        hass, name, callback, description=None, description_image=None,
-        submit_caption=None, fields=None):
-    """ Create a new request for config.
-    Will return an ID to be used for sequent calls. """
+        submit_caption=None, fields=None, link_name=None, link_url=None):
+    """Create a new request for configuration.

+    Will return an ID to be used for sequent calls.
+    """
    instance = _get_instance(hass)

    request_id = instance.request_config(
        name, callback,
-        description, description_image, submit_caption, fields)
+        description, description_image, submit_caption,
+        fields, link_name, link_url)

    _REQUESTS[request_id] = instance

@@ -53,7 +54,7 @@ def request_config(


 def notify_errors(request_id, error):
-    """ Add errors to a config request. """
+    """Add errors to a config request."""
    try:
        _REQUESTS[request_id].notify_errors(request_id, error)
    except KeyError:
@@ -62,7 +63,7 @@ def notify_errors(request_id, error):


 def request_done(request_id):
-    """ Mark a config request as done. """
+    """Mark a configuration request as done."""
    try:
        _REQUESTS.pop(request_id).request_done(request_id)
    except KeyError:
@@ -71,12 +72,12 @@ def request_done(request_id):


 def setup(hass, config):
-    """ Set up Configurator. """
+    """Setup the configurator component."""
    return True


 def _get_instance(hass):
-    """ Get an instance per hass object. """
+    """Get an instance per hass object."""
    try:
        return _INSTANCES[hass]
    except KeyError:
@@ -89,11 +90,10 @@ def _get_instance(hass):


 class Configurator(object):
-    """
-    Class to keep track of current configuration requests.
-    """
+    """The class to keep track of current configuration requests."""

    def __init__(self, hass):
+        """Initialize the configurator."""
        self.hass = hass
        self._cur_id = 0
        self._requests = {}
@@ -103,9 +103,9 @@ class Configurator(object):
    # pylint: disable=too-many-arguments
    def request_config(
            self, name, callback,
-            description, description_image, submit_caption, fields):
-        """ Setup a request for configuration. """
-
+            description, description_image, submit_caption,
+            fields, link_name, link_url):
+        """Setup a request for configuration."""
        entity_id = generate_entity_id(ENTITY_ID_FORMAT, name, hass=self.hass)

        if fields is None:
@@ -118,6 +118,7 @@ class Configurator(object):
        data = {
            ATTR_CONFIGURE_ID: request_id,
            ATTR_FIELDS: fields,
+            ATTR_FRIENDLY_NAME: name,
        }

        data.update({
@@ -125,6 +126,8 @@ class Configurator(object):
                (ATTR_DESCRIPTION, description),
                (ATTR_DESCRIPTION_IMAGE, description_image),
                (ATTR_SUBMIT_CAPTION, submit_caption),
+                (ATTR_LINK_NAME, link_name),
+                (ATTR_LINK_URL, link_url),
            ] if value is not None
        })

@@ -133,7 +136,7 @@ class Configurator(object):
        return request_id

    def notify_errors(self, request_id, error):
-        """ Update the state with errors. """
+        """Update the state with errors."""
        if not self._validate_request_id(request_id):
            return

@@ -141,13 +144,13 @@ class Configurator(object):

        state = self.hass.states.get(entity_id)

-        new_data = state.attributes
+        new_data = dict(state.attributes)
        new_data[ATTR_ERRORS] = error

        self.hass.states.set(entity_id, STATE_CONFIGURE, new_data)

    def request_done(self, request_id):
-        """ Remove the config request. """
+        """Remove the configuration request."""
        if not self._validate_request_id(request_id):
            return

@@ -160,13 +163,13 @@ class Configurator(object):
        self.hass.states.set(entity_id, STATE_CONFIGURED)

        def deferred_remove(event):
-            """ Remove the request state. """
+            """Remove the request state."""
            self.hass.states.remove(entity_id)

        self.hass.bus.listen_once(EVENT_TIME_CHANGED, deferred_remove)

    def handle_service_call(self, call):
-        """ Handle a configure service call. """
+        """Handle a configure service call."""
        request_id = call.data.get(ATTR_CONFIGURE_ID)

        if not self._validate_request_id(request_id):
@@ -180,10 +183,10 @@ class Configurator(object):
        callback(call.data.get(ATTR_FIELDS, {}))

    def _generate_unique_id(self):
-        """ Generates a unique configurator id. """
+        """Generate a unique configurator ID."""
        self._cur_id += 1
        return "{}-{}".format(id(self), self._cur_id)

    def _validate_request_id(self, request_id):
-        """ Validate that the request belongs to this instance. """
+        """Validate that the request belongs to this instance."""
        return request_id in self._requests
--- a/homeassistant/components/conversation.py
+++ b/homeassistant/components/conversation.py
@@ -1,18 +1,19 @@
 """
-homeassistant.components.conversation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides functionality to have conversations with Home Assistant.
+Support for functionality to have conversations with Home Assistant.

 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/conversation/
 """
 import logging
 import re
+import warnings

+import voluptuous as vol

 from homeassistant import core
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF)
+    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
+import homeassistant.helpers.config_validation as cv

 DOMAIN = "conversation"

@@ -20,25 +21,25 @@ SERVICE_PROCESS = "process"

 ATTR_TEXT = "text"

+SERVICE_PROCESS_SCHEMA = vol.Schema({
+    vol.Required(ATTR_TEXT): vol.All(cv.string, vol.Lower),
+})
+
 REGEX_TURN_COMMAND = re.compile(r'turn (?P<name>(?: |\w)+) (?P<command>\w+)')

-REQUIREMENTS = ['fuzzywuzzy==0.8.0']
+REQUIREMENTS = ['fuzzywuzzy==0.10.0']


 def setup(hass, config):
-    """ Registers the process service. """
+    """Register the process service."""
+    warnings.filterwarnings('ignore', module='fuzzywuzzy')
    from fuzzywuzzy import process as fuzzyExtract

    logger = logging.getLogger(__name__)

    def process(service):
-        """ Parses text into commands for Home Assistant. """
-        if ATTR_TEXT not in service.data:
-            logger.error("Received process service call without a text")
-            return
-
-        text = service.data[ATTR_TEXT].lower()
-
+        """Parse text into commands."""
+        text = service.data[ATTR_TEXT]
        match = REGEX_TURN_COMMAND.match(text)

        if not match:
@@ -46,11 +47,8 @@ def setup(hass, config):
            return

        name, command = match.groups()
-
        entities = {state.entity_id: state.name for state in hass.states.all()}
-
-        entity_ids = fuzzyExtract.extractOne(name,
-                                             entities,
+        entity_ids = fuzzyExtract.extractOne(name, entities,
                                             score_cutoff=65)[2]

        if not entity_ids:
@@ -72,6 +70,6 @@ def setup(hass, config):
            logger.error(
                'Got unsupported command %s from text %s', command, text)

-    hass.services.register(DOMAIN, SERVICE_PROCESS, process)
-
+    hass.services.register(DOMAIN, SERVICE_PROCESS, process,
+                           schema=SERVICE_PROCESS_SCHEMA)
    return True
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -1,16 +1,15 @@
 """
-homeassistant.components.demo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Sets up a demo environment that mimics interaction with devices.
+
+For more details about this component, please refer to the documentation
+https://home-assistant.io/components/demo/
 """
 import time

-import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
+import homeassistant.core as ha
 import homeassistant.loader as loader
-from homeassistant.const import (
-    CONF_PLATFORM, ATTR_ENTITY_ID)
+from homeassistant.const import ATTR_ENTITY_ID, CONF_PLATFORM

 DOMAIN = "demo"

@@ -21,6 +20,8 @@ COMPONENTS_WITH_DEMO_PLATFORM = [
    'binary_sensor',
    'camera',
    'device_tracker',
+    'garage_door',
+    'hvac',
    'light',
    'lock',
    'media_player',
@@ -33,9 +34,10 @@ COMPONENTS_WITH_DEMO_PLATFORM = [


 def setup(hass, config):
-    """ Setup a demo environment. """
+    """Setup a demo environment."""
    group = loader.get_component('group')
    configurator = loader.get_component('configurator')
+    persistent_notification = loader.get_component('persistent_notification')

    config.setdefault(ha.DOMAIN, {})
    config.setdefault(DOMAIN, {})
@@ -58,19 +60,41 @@ def setup(hass, config):
        demo_config[component] = {CONF_PLATFORM: 'demo'}
        bootstrap.setup_component(hass, component, demo_config)

+    # Setup example persistent notification
+    persistent_notification.create(
+        hass, 'This is an example of a persistent notification.',
+        title='Example Notification')
+
    # Setup room groups
    lights = sorted(hass.states.entity_ids('light'))
    switches = sorted(hass.states.entity_ids('switch'))
    media_players = sorted(hass.states.entity_ids('media_player'))
    group.Group(hass, 'living room', [
-        lights[2], lights[1], switches[0], media_players[1],
+        lights[1], switches[0], 'input_select.living_room_preset',
+        'rollershutter.living_room_window', media_players[1],
        'scene.romantic_lights'])
-    group.Group(hass, 'bedroom', [lights[0], switches[1],
-                                  media_players[0]])
-    group.Group(hass, 'Rooms', [
-        'group.living_room', 'group.bedroom',
+    group.Group(hass, 'bedroom', [
+        lights[0], switches[1], media_players[0],
+        'input_slider.noise_allowance'])
+    group.Group(hass, 'kitchen', [
+        lights[2], 'rollershutter.kitchen_window', 'lock.kitchen_door'])
+    group.Group(hass, 'doors', [
+        'lock.front_door', 'lock.kitchen_door',
+        'garage_door.right_garage_door', 'garage_door.left_garage_door'])
+    group.Group(hass, 'automations', [
+        'input_select.who_cooks', 'input_boolean.notify', ])
+    group.Group(hass, 'people', [
+        'device_tracker.demo_anne_therese', 'device_tracker.demo_home_boy',
+        'device_tracker.demo_paulus'])
+    group.Group(hass, 'thermostats', [
+        'thermostat.nest', 'thermostat.thermostat'])
+    group.Group(hass, 'downstairs', [
+        'group.living_room', 'group.kitchen',
        'scene.romantic_lights', 'rollershutter.kitchen_window',
-        'rollershutter.living_room_window',
+        'rollershutter.living_room_window', 'group.doors', 'thermostat.nest',
+    ], view=True)
+    group.Group(hass, 'Upstairs', [
+        'thermostat.thermostat', 'group.bedroom',
    ], view=True)

    # Setup scripts
@@ -80,18 +104,18 @@ def setup(hass, config):
            'demo': {
                'alias': 'Toggle {}'.format(lights[0].split('.')[1]),
                'sequence': [{
-                    'execute_service': 'light.turn_off',
-                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                    'service': 'light.turn_off',
+                    'data': {ATTR_ENTITY_ID: lights[0]}
                }, {
                    'delay': {'seconds': 5}
                }, {
-                    'execute_service': 'light.turn_on',
-                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                    'service': 'light.turn_on',
+                    'data': {ATTR_ENTITY_ID: lights[0]}
                }, {
                    'delay': {'seconds': 5}
                }, {
-                    'execute_service': 'light.turn_off',
-                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                    'service': 'light.turn_off',
+                    'data': {ATTR_ENTITY_ID: lights[0]}
                }]
            }}})

@@ -112,11 +136,44 @@ def setup(hass, config):
             }},
            ]})

+    # Set up input select
+    bootstrap.setup_component(
+        hass, 'input_select',
+        {'input_select':
+         {'living_room_preset': {'options': ['Visitors',
+                                             'Visitors with kids',
+                                             'Home Alone']},
+          'who_cooks': {'icon': 'mdi:panda',
+                        'initial': 'Anne Therese',
+                        'name': 'Cook today',
+                        'options': ['Paulus', 'Anne Therese']}}})
+    # Set up input boolean
+    bootstrap.setup_component(
+        hass, 'input_boolean',
+        {'input_boolean': {'notify': {'icon': 'mdi:car',
+                                      'initial': False,
+                                      'name': 'Notify Anne Therese is home'}}})
+
+    # Set up input boolean
+    bootstrap.setup_component(
+        hass, 'input_slider',
+        {'input_slider': {
+            'noise_allowance': {'icon': 'mdi:bell-ring',
+                                'min': 0,
+                                'max': 10,
+                                'name': 'Allowed Noise',
+                                'unit_of_measurement': 'dB'}}})
+
+    # Set up weblink
+    bootstrap.setup_component(
+        hass, 'weblink',
+        {'weblink': {'entities': [{'name': 'Router',
+                                   'url': 'http://192.168.1.1'}]}})
    # Setup configurator
    configurator_ids = []

    def hue_configuration_callback(data):
-        """ Fake callback, mark config as done. """
+        """Fake callback, mark config as done."""
        time.sleep(2)

        # First time it is called, pretend it failed.
--- a/homeassistant/components/device_sun_light_trigger.py
+++ b/homeassistant/components/device_sun_light_trigger.py
@@ -1,8 +1,5 @@
 """
-homeassistant.components.device_sun_light_trigger
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides functionality to turn on lights based on the state of the sun and
-devices.
+Provides functionality to turn on lights based on the states.

 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/device_sun_light_trigger/
@@ -10,10 +7,11 @@ https://home-assistant.io/components/device_sun_light_trigger/
 import logging
 from datetime import timedelta

-from homeassistant.helpers.event import track_point_in_time, track_state_change
 import homeassistant.util.dt as dt_util
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME
-from . import light, sun, device_tracker, group
+from homeassistant.helpers.event import track_point_in_time
+from homeassistant.helpers.event_decorators import track_state_change
+from homeassistant.loader import get_component

 DOMAIN = "device_sun_light_trigger"
 DEPENDENCIES = ['light', 'device_tracker', 'group', 'sun']
@@ -28,28 +26,26 @@ CONF_LIGHT_GROUP = 'light_group'
 CONF_DEVICE_GROUP = 'device_group'


-# pylint: disable=too-many-branches
+# pylint: disable=too-many-locals
 def setup(hass, config):
-    """ Triggers to turn lights on or off based on device precense. """
+    """The triggers to turn lights on or off based on device presence."""
+    logger = logging.getLogger(__name__)
+    device_tracker = get_component('device_tracker')
+    group = get_component('group')
+    light = get_component('light')
+    sun = get_component('sun')

    disable_turn_off = 'disable_turn_off' in config[DOMAIN]
-
    light_group = config[DOMAIN].get(CONF_LIGHT_GROUP,
                                     light.ENTITY_ID_ALL_LIGHTS)
-
    light_profile = config[DOMAIN].get(CONF_LIGHT_PROFILE, LIGHT_PROFILE)
-
    device_group = config[DOMAIN].get(CONF_DEVICE_GROUP,
                                      device_tracker.ENTITY_ID_ALL_DEVICES)
-
-    logger = logging.getLogger(__name__)
-
    device_entity_ids = group.get_entity_ids(hass, device_group,
                                             device_tracker.DOMAIN)

    if not device_entity_ids:
        logger.error("No devices found to track")
-
        return False

    # Get the light IDs from the specified group
@@ -57,116 +53,105 @@ def setup(hass, config):

    if not light_ids:
        logger.error("No lights found to turn on ")
-
        return False

    def calc_time_for_light_when_sunset():
-        """ Calculates the time when to start fading lights in when sun sets.
-        Returns None if no next_setting data available. """
+        """Calculate the time when to start fading lights in when sun sets.
+
+        Returns None if no next_setting data available.
+        """
        next_setting = sun.next_setting(hass)
-
-        if next_setting:
-            return next_setting - LIGHT_TRANSITION_TIME * len(light_ids)
-        else:
+        if not next_setting:
            return None
+        return next_setting - LIGHT_TRANSITION_TIME * len(light_ids)

-    def schedule_light_on_sun_rise(entity, old_state, new_state):
-        """The moment sun sets we want to have all the lights on.
-           We will schedule to have each light start after one another
-           and slowly transition in."""
+    def turn_light_on_before_sunset(light_id):
+        """Helper function to turn on lights.

-        def turn_light_on_before_sunset(light_id):
-            """ Helper function to turn on lights slowly if there
-                are devices home and the light is not on yet. """
-            if device_tracker.is_on(hass) and not light.is_on(hass, light_id):
-
-                light.turn_on(hass, light_id,
-                              transition=LIGHT_TRANSITION_TIME.seconds,
-                              profile=light_profile)
-
-        def turn_on(light_id):
-            """ Lambda can keep track of function parameters but not local
-            parameters. If we put the lambda directly in the below statement
-            only the last light will be turned on.. """
-            return lambda now: turn_light_on_before_sunset(light_id)
-
-        start_point = calc_time_for_light_when_sunset()
-
-        if start_point:
-            for index, light_id in enumerate(light_ids):
-                track_point_in_time(
-                    hass, turn_on(light_id),
-                    (start_point + index * LIGHT_TRANSITION_TIME))
+        Speed is slow if there are devices home and the light is not on yet.
+        """
+        if not device_tracker.is_on(hass) or light.is_on(hass, light_id):
+            return
+        light.turn_on(hass, light_id,
+                      transition=LIGHT_TRANSITION_TIME.seconds,
+                      profile=light_profile)

    # Track every time sun rises so we can schedule a time-based
    # pre-sun set event
-    track_state_change(hass, sun.ENTITY_ID, schedule_light_on_sun_rise,
-                       sun.STATE_BELOW_HORIZON, sun.STATE_ABOVE_HORIZON)
+    @track_state_change(sun.ENTITY_ID, sun.STATE_BELOW_HORIZON,
+                        sun.STATE_ABOVE_HORIZON)
+    def schedule_lights_at_sun_set(hass, entity, old_state, new_state):
+        """The moment sun sets we want to have all the lights on.

-    # If the sun is already above horizon
-    # schedule the time-based pre-sun set event
+        We will schedule to have each light start after one another
+        and slowly transition in.
+        """
+        start_point = calc_time_for_light_when_sunset()
+        if not start_point:
+            return
+
+        def turn_on(light_id):
+            """Lambda can keep track of function parameters.
+
+            No local parameters. If we put the lambda directly in the below
+            statement only the last light will be turned on.
+            """
+            return lambda now: turn_light_on_before_sunset(light_id)
+
+        for index, light_id in enumerate(light_ids):
+            track_point_in_time(hass, turn_on(light_id),
+                                start_point + index * LIGHT_TRANSITION_TIME)
+
+    # If the sun is already above horizon schedule the time-based pre-sun set
+    # event.
    if sun.is_on(hass):
-        schedule_light_on_sun_rise(None, None, None)
+        schedule_lights_at_sun_set(hass, None, None, None)

-    def check_light_on_dev_state_change(entity, old_state, new_state):
-        """ Function to handle tracked device state changes. """
+    @track_state_change(device_entity_ids, STATE_NOT_HOME, STATE_HOME)
+    def check_light_on_dev_state_change(hass, entity, old_state, new_state):
+        """Handle tracked device state changes."""
+        # pylint: disable=unused-variable
        lights_are_on = group.is_on(hass, light_group)

        light_needed = not (lights_are_on or sun.is_on(hass))

-        # Specific device came home ?
-        if entity != device_tracker.ENTITY_ID_ALL_DEVICES and \
-           new_state.state == STATE_HOME:
+        # These variables are needed for the elif check
+        now = dt_util.now()
+        start_point = calc_time_for_light_when_sunset()

-            # These variables are needed for the elif check
-            now = dt_util.now()
-            start_point = calc_time_for_light_when_sunset()
+        # Do we need lights?
+        if light_needed:
+            logger.info("Home coming event for %s. Turning lights on", entity)
+            light.turn_on(hass, light_ids, profile=light_profile)

-            # Do we need lights?
-            if light_needed:
+        # Are we in the time span were we would turn on the lights
+        # if someone would be home?
+        # Check this by seeing if current time is later then the point
+        # in time when we would start putting the lights on.
+        elif (start_point and
+              start_point < now < sun.next_setting(hass)):

-                logger.info(
-                    "Home coming event for %s. Turning lights on", entity)
+            # Check for every light if it would be on if someone was home
+            # when the fading in started and turn it on if so
+            for index, light_id in enumerate(light_ids):
+                if now > start_point + index * LIGHT_TRANSITION_TIME:
+                    light.turn_on(hass, light_id)

-                light.turn_on(hass, light_ids, profile=light_profile)
+                else:
+                    # If this light didn't happen to be turned on yet so
+                    # will all the following then, break.
+                    break

-            # Are we in the time span were we would turn on the lights
-            # if someone would be home?
-            # Check this by seeing if current time is later then the point
-            # in time when we would start putting the lights on.
-            elif (start_point and
-                  start_point < now < sun.next_setting(hass)):
-
-                # Check for every light if it would be on if someone was home
-                # when the fading in started and turn it on if so
-                for index, light_id in enumerate(light_ids):
-
-                    if now > start_point + index * LIGHT_TRANSITION_TIME:
-                        light.turn_on(hass, light_id)
-
-                    else:
-                        # If this light didn't happen to be turned on yet so
-                        # will all the following then, break.
-                        break
-
-        # Did all devices leave the house?
-        elif (entity == device_group and
-              new_state.state == STATE_NOT_HOME and lights_are_on and
-              not disable_turn_off):
+    if not disable_turn_off:
+        @track_state_change(device_group, STATE_HOME, STATE_NOT_HOME)
+        def turn_off_lights_when_all_leave(hass, entity, old_state, new_state):
+            """Handle device group state change."""
+            # pylint: disable=unused-variable
+            if not group.is_on(hass, light_group):
+                return

            logger.info(
                "Everyone has left but there are lights on. Turning them off")
-
            light.turn_off(hass, light_ids)

-    # Track home coming of each device
-    track_state_change(
-        hass, device_entity_ids, check_light_on_dev_state_change,
-        STATE_NOT_HOME, STATE_HOME)
-
-    # Track when all devices are gone to shut down lights
-    track_state_change(
-        hass, device_group, check_light_on_dev_state_change,
-        STATE_HOME, STATE_NOT_HOME)
-
    return True
--- a/homeassistant/components/device_tracker/init.py
+++ b/homeassistant/components/device_tracker/init.py
@@ -1,33 +1,33 @@
 """
-homeassistant.components.device_tracker
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Provides functionality to keep track of devices.
+Provide functionality to keep track of devices.

 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/device_tracker/
 """
 # pylint: disable=too-many-instance-attributes, too-many-arguments
 # pylint: disable=too-many-locals
-import csv
 from datetime import timedelta
 import logging
 import os
 import threading

 from homeassistant.bootstrap import prepare_setup_platform
-from homeassistant.components import discovery, group, zone
+from homeassistant.components import group, zone
+from homeassistant.components.discovery import SERVICE_NETGEAR
 from homeassistant.config import load_yaml_config_file
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_per_platform
+from homeassistant.helpers import config_per_platform, discovery
 from homeassistant.helpers.entity import Entity
+import homeassistant.helpers.config_validation as cv
 import homeassistant.util as util
 import homeassistant.util.dt as dt_util

 from homeassistant.helpers.event import track_utc_time_change
 from homeassistant.const import (
-    ATTR_ENTITY_PICTURE, ATTR_GPS_ACCURACY, ATTR_LATITUDE, ATTR_LONGITUDE,
+    ATTR_GPS_ACCURACY, ATTR_LATITUDE, ATTR_LONGITUDE,
    DEVICE_DEFAULT_NAME, STATE_HOME, STATE_NOT_HOME)

+PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
 DOMAIN = "device_tracker"
 DEPENDENCIES = ['zone']

@@ -36,7 +36,6 @@ ENTITY_ID_ALL_DEVICES = group.ENTITY_ID_FORMAT.format('all_devices')

 ENTITY_ID_FORMAT = DOMAIN + '.{}'

-CSV_DEVICES = "known_devices.csv"
 YAML_DEVICES = 'known_devices.yaml'

 CONF_TRACK_NEW = "track_new_devices"
@@ -64,7 +63,7 @@ ATTR_GPS = 'gps'
 ATTR_BATTERY = 'battery'

 DISCOVERY_PLATFORMS = {
-    discovery.SERVICE_NETGEAR: 'netgear',
+    SERVICE_NETGEAR: 'netgear',
 }
 _LOGGER = logging.getLogger(__name__)

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


 def is_on(hass, entity_id=None):
-    """ Returns if any or specified device is home. """
+    """Return the state if any or a specified device is home."""
    entity = entity_id or ENTITY_ID_ALL_DEVICES

    return hass.states.is_state(entity, STATE_HOME)
@@ -80,27 +79,28 @@ def is_on(hass, entity_id=None):

 def see(hass, mac=None, dev_id=None, host_name=None, location_name=None,
        gps=None, gps_accuracy=None, battery=None):
-    """ Call service to notify you see device. """
+    """Call service to notify you see device."""
    data = {key: value for key, value in
            ((ATTR_MAC, mac),
             (ATTR_DEV_ID, dev_id),
             (ATTR_HOST_NAME, host_name),
             (ATTR_LOCATION_NAME, location_name),
-             (ATTR_GPS, gps)) if value is not None}
+             (ATTR_GPS, gps),
+             (ATTR_GPS_ACCURACY, gps_accuracy),
+             (ATTR_BATTERY, battery)) if value is not None}
    hass.services.call(DOMAIN, SERVICE_SEE, data)


 def setup(hass, config):
-    """ Setup device tracker """
+    """Setup device tracker."""
    yaml_path = hass.config.path(YAML_DEVICES)
-    csv_path = hass.config.path(CSV_DEVICES)
-    if os.path.isfile(csv_path) and not os.path.isfile(yaml_path) and \
-       convert_csv_config(csv_path, yaml_path):
-        os.remove(csv_path)

    conf = config.get(DOMAIN, {})
+
+    # Config can be an empty list. In that case, substitute a dict
    if isinstance(conf, list):
-        conf = conf[0]
+        conf = conf[0] if len(conf) > 0 else {}
+
    consider_home = timedelta(
        seconds=util.convert(conf.get(CONF_CONSIDER_HOME), int,
                             DEFAULT_CONSIDER_HOME))
@@ -114,7 +114,7 @@ def setup(hass, config):
                            devices)

    def setup_platform(p_type, p_config, disc_info=None):
-        """ Setup a device tracker platform. """
+        """Setup a device tracker platform."""
        platform = prepare_setup_platform(hass, config, DOMAIN, p_type)
        if platform is None:
            return
@@ -135,26 +135,25 @@ def setup(hass, config):
        except Exception:  # pylint: disable=broad-except
            _LOGGER.exception('Error setting up platform %s', p_type)

-    for p_type, p_config in \
-            config_per_platform(config, DOMAIN, _LOGGER):
+    for p_type, p_config in config_per_platform(config, DOMAIN):
        setup_platform(p_type, p_config)

    def device_tracker_discovered(service, info):
-        """ Called when a device tracker platform is discovered. """
+        """Called when a device tracker platform is discovered."""
        setup_platform(DISCOVERY_PLATFORMS[service], {}, info)

    discovery.listen(hass, DISCOVERY_PLATFORMS.keys(),
                     device_tracker_discovered)

    def update_stale(now):
-        """ Clean up stale devices. """
+        """Clean up stale devices."""
        tracker.update_stale(now)
    track_utc_time_change(hass, update_stale, second=range(0, 60, 5))

    tracker.setup_group()

    def see_service(call):
-        """ Service to see a device. """
+        """Service to see a device."""
        args = {key: value for key, value in call.data.items() if key in
                (ATTR_MAC, ATTR_DEV_ID, ATTR_HOST_NAME, ATTR_LOCATION_NAME,
                 ATTR_GPS, ATTR_GPS_ACCURACY, ATTR_BATTERY)}
@@ -169,8 +168,10 @@ def setup(hass, config):


 class DeviceTracker(object):
-    """ Track devices """
+    """Representation of a device tracker."""
+
    def __init__(self, hass, consider_home, track_new, home_range, devices):
+        """Initialize a device tracker."""
        self.hass = hass
        self.devices = {dev.dev_id: dev for dev in devices}
        self.mac_to_dev = {dev.mac: dev for dev in devices if dev.mac}
@@ -187,7 +188,7 @@ class DeviceTracker(object):

    def see(self, mac=None, dev_id=None, host_name=None, location_name=None,
            gps=None, gps_accuracy=None, battery=None):
-        """ Notify device tracker that you see a device. """
+        """Notify the device tracker that you see a device."""
        with self.lock:
            if mac is None and dev_id is None:
                raise HomeAssistantError('Neither mac or device id passed in')
@@ -197,7 +198,7 @@ class DeviceTracker(object):
                if not device:
                    dev_id = util.slugify(host_name or '') or util.slugify(mac)
            else:
-                dev_id = str(dev_id).lower()
+                dev_id = cv.slug(str(dev_id).lower())
                device = self.devices.get(dev_id)

            if device:
@@ -208,6 +209,7 @@ class DeviceTracker(object):
                return

            # If no device can be found, create it
+            dev_id = util.ensure_unique_string(dev_id, self.devices.keys())
            device = Device(
                self.hass, self.consider_home, self.home_range, self.track_new,
                dev_id, mac, (host_name or dev_id).replace('_', ' '))
@@ -226,14 +228,14 @@ class DeviceTracker(object):
            update_config(self.hass.config.path(YAML_DEVICES), dev_id, device)

    def setup_group(self):
-        """ Initializes group for all tracked devices. """
+        """Initialize group for all tracked devices."""
        entity_ids = (dev.entity_id for dev in self.devices.values()
                      if dev.track)
        self.group = group.Group(
            self.hass, GROUP_NAME_ALL_DEVICES, entity_ids, False)

    def update_stale(self, now):
-        """ Update stale devices. """
+        """Update stale devices."""
        with self.lock:
            for device in self.devices.values():
                if (device.track and device.last_update_home and
@@ -242,7 +244,7 @@ class DeviceTracker(object):


 class Device(Entity):
-    """ Tracked device. """
+    """Represent a tracked device."""

    host_name = None
    location_name = None
@@ -251,12 +253,13 @@ class Device(Entity):
    last_seen = None
    battery = None

-    # Track if the last update of this device was HOME
+    # Track if the last update of this device was HOME.
    last_update_home = False
    _state = STATE_NOT_HOME

    def __init__(self, hass, consider_home, home_range, track, dev_id, mac,
                 name=None, picture=None, away_hide=False):
+        """Initialize a device."""
        self.hass = hass
        self.entity_id = ENTITY_ID_FORMAT.format(dev_id)

@@ -282,28 +285,30 @@ class Device(Entity):

    @property
    def gps_home(self):
-        """ Return if device is within range of home. """
+        """Return if device is within range of home."""
        distance = max(
            0, self.hass.config.distance(*self.gps) - self.gps_accuracy)
        return self.gps is not None and distance <= self.home_range

    @property
    def name(self):
-        """ Returns the name of the entity. """
+        """Return the name of the entity."""
        return self.config_name or self.host_name or DEVICE_DEFAULT_NAME

    @property
    def state(self):
-        """ State of the device. """
+        """Return the state of the device."""
        return self._state

    @property
-    def state_attributes(self):
-        """ Device state attributes. """
-        attr = {}
+    def entity_picture(self):
+        """Return the picture of the device."""
+        return self.config_picture

-        if self.config_picture:
-            attr[ATTR_ENTITY_PICTURE] = self.config_picture
+    @property
+    def state_attributes(self):
+        """Return the device state attributes."""
+        attr = {}

        if self.gps:
            attr[ATTR_LATITUDE] = self.gps[0]
@@ -317,12 +322,12 @@ class Device(Entity):

    @property
    def hidden(self):
-        """ If device should be hidden. """
+        """If device should be hidden."""
        return self.away_hide and self.state != STATE_HOME

    def seen(self, host_name=None, location_name=None, gps=None,
             gps_accuracy=0, battery=None):
-        """ Mark the device as seen. """
+        """Mark the device as seen."""
        self.last_seen = dt_util.utcnow()
        self.host_name = host_name
        self.location_name = location_name
@@ -340,12 +345,12 @@ class Device(Entity):
        self.update()

    def stale(self, now=None):
-        """ Return if device state is stale. """
+        """Return if device state is stale."""
        return self.last_seen and \
            (now or dt_util.utcnow()) - self.last_seen > self.consider_home

    def update(self):
-        """ Update state of entity. """
+        """Update state of entity."""
        if not self.last_seen:
            return
        elif self.location_name:
@@ -368,23 +373,8 @@ class Device(Entity):
            self.last_update_home = True


-def convert_csv_config(csv_path, yaml_path):
-    """ Convert CSV config file format to YAML. """
-    used_ids = set()
-    with open(csv_path) as inp:
-        for row in csv.DictReader(inp):
-            dev_id = util.ensure_unique_string(
-                (util.slugify(row['name']) or DEVICE_DEFAULT_NAME).lower(),
-                used_ids)
-            used_ids.add(dev_id)
-            device = Device(None, None, None, row['track'] == '1', dev_id,
-                            row['device'], row['name'], row['picture'])
-            update_config(yaml_path, dev_id, device)
-    return True
-
-
 def load_config(path, hass, consider_home, home_range):
-    """ Load devices from YAML config file. """
+    """Load devices from YAML configuration file."""
    if not os.path.isfile(path):
        return []
    return [
@@ -396,7 +386,7 @@ def load_config(path, hass, consider_home, home_range):


 def setup_scanner_platform(hass, config, scanner, see_device):
-    """ Helper method to connect scanner-based platform to device tracker. """
+    """Helper method to connect scanner-based platform to device tracker."""
    interval = util.convert(config.get(CONF_SCAN_INTERVAL), int,
                            DEFAULT_SCAN_INTERVAL)

@@ -404,7 +394,7 @@ def setup_scanner_platform(hass, config, scanner, see_device):
    seen = set()

    def device_tracker_scan(now):
-        """ Called when interval matches. """
+        """Called when interval matches."""
        for mac in scanner.scan_devices():
            if mac in seen:
                host_name = None
@@ -420,7 +410,7 @@ def setup_scanner_platform(hass, config, scanner, see_device):


 def update_config(path, dev_id, device):
-    """ Add device to YAML config file. """
+    """Add device to YAML configuration file."""
    with open(path, 'a') as out:
        out.write('\n')
        out.write('{}:\n'.format(device.dev_id))
--- a/homeassistant/components/device_tracker/actiontec.py
+++ b/homeassistant/components/device_tracker/actiontec.py
@@ -1,26 +1,23 @@
 """
-homeassistant.components.device_tracker.actiontec
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning an Actiontec MI424WR
-(Verizon FIOS) router for device presence.
+Support for Actiontec MI424WR (Verizon FIOS) routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.actiontec/
 """
 import logging
-from datetime import timedelta
-from collections import namedtuple
 import re
-import threading
 import telnetlib
+import threading
+from collections import namedtuple
+from datetime import timedelta

 import homeassistant.util.dt as dt_util
-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
@@ -34,7 +31,7 @@ _LEASES_REGEX = re.compile(

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns an Actiontec scanner. """
+    """Validate the configuration and return an Actiontec scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -46,12 +43,10 @@ Device = namedtuple("Device", ["mac", "ip", "last_update"])


 class ActiontecDeviceScanner(object):
-    """
-    This class queries a an actiontec router for connected devices.
-    Adapted from DD-WRT scanner.
-    """
+    """This class queries a an actiontec router for connected devices."""

    def __init__(self, config):
+        """Initialize the scanner."""
        self.host = config[CONF_HOST]
        self.username = config[CONF_USERNAME]
        self.password = config[CONF_PASSWORD]
@@ -62,15 +57,12 @@ class ActiontecDeviceScanner(object):
        _LOGGER.info("actiontec scanner initialized")

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return [client.mac for client in self.last_results]

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        if not self.last_results:
            return None
        for client in self.last_results:
@@ -80,9 +72,9 @@ class ActiontecDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the Actiontec MI424WR router is up
-        to date. Returns boolean if scanning successful.
+        """Ensure the information from the router is up to date.
+
+        Return boolean if scanning successful.
        """
        _LOGGER.info("Scanning")
        if not self.success_init:
@@ -100,7 +92,7 @@ class ActiontecDeviceScanner(object):
            return True

    def get_actiontec_data(self):
-        """ Retrieve data from Actiontec MI424WR and return parsed result. """
+        """Retrieve data from Actiontec MI424WR and return parsed result."""
        try:
            telnet = telnetlib.Telnet(self.host)
            telnet.read_until(b'Username: ')
--- a/homeassistant/components/device_tracker/aruba.py
+++ b/homeassistant/components/device_tracker/aruba.py
@@ -1,26 +1,23 @@
 """
-homeassistant.components.device_tracker.aruba
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a Aruba Access Point for device
-presence.
+Support for Aruba Access Points.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.aruba/
 """
 import logging
-from datetime import timedelta
 import re
 import threading
-import telnetlib
+from datetime import timedelta

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

 # Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)

+REQUIREMENTS = ['pexpect==4.0.1']
 _LOGGER = logging.getLogger(__name__)

 _DEVICES_REGEX = re.compile(
@@ -31,7 +28,7 @@ _DEVICES_REGEX = re.compile(

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns a Aruba scanner. """
+    """Validate the configuration and return a Aruba scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -43,8 +40,10 @@ def get_scanner(hass, config):


 class ArubaDeviceScanner(object):
-    """ This class queries a Aruba Acces Point for connected devices. """
+    """This class queries a Aruba Access Point for connected devices."""
+
    def __init__(self, config):
+        """Initialize the scanner."""
        self.host = config[CONF_HOST]
        self.username = config[CONF_USERNAME]
        self.password = config[CONF_PASSWORD]
@@ -53,20 +52,17 @@ class ArubaDeviceScanner(object):

        self.last_results = {}

-        # Test the router is accessible
+        # Test the router is accessible.
        data = self.get_aruba_data()
        self.success_init = data is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device IDs.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return [client['mac'] for client in self.last_results]

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        if not self.last_results:
            return None
        for client in self.last_results:
@@ -76,9 +72,9 @@ class ArubaDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the Aruba Access Point is up to date.
-        Returns boolean if scanning successful.
+        """Ensure the information from the Aruba Access Point is up to date.
+
+        Return boolean if scanning successful.
        """
        if not self.success_init:
            return False
@@ -92,24 +88,39 @@ class ArubaDeviceScanner(object):
            return True

    def get_aruba_data(self):
-        """ Retrieve data from Aruba Access Point and return parsed result. """
-        try:
-            telnet = telnetlib.Telnet(self.host)
-            telnet.read_until(b'User: ')
-            telnet.write((self.username + '\r\n').encode('ascii'))
-            telnet.read_until(b'Password: ')
-            telnet.write((self.password + '\r\n').encode('ascii'))
-            telnet.read_until(b'#')
-            telnet.write(('show clients\r\n').encode('ascii'))
-            devices_result = telnet.read_until(b'#').split(b'\r\n')
-            telnet.write('exit\r\n'.encode('ascii'))
-        except EOFError:
-            _LOGGER.exception("Unexpected response from router")
+        """Retrieve data from Aruba Access Point and return parsed result."""
+        import pexpect
+        connect = "ssh {}@{}"
+        ssh = pexpect.spawn(connect.format(self.username, self.host))
+        query = ssh.expect(['password:', pexpect.TIMEOUT, pexpect.EOF,
+                            'continue connecting (yes/no)?',
+                            'Host key verification failed.',
+                            'Connection refused',
+                            'Connection timed out'], timeout=120)
+        if query == 1:
+            _LOGGER.error("Timeout")
            return
-        except ConnectionRefusedError:
-            _LOGGER.exception("Connection refused by router," +
-                              " is telnet enabled?")
+        elif query == 2:
+            _LOGGER.error("Unexpected response from router")
            return
+        elif query == 3:
+            ssh.sendline('yes')
+            ssh.expect('password:')
+        elif query == 4:
+            _LOGGER.error("Host key Changed")
+            return
+        elif query == 5:
+            _LOGGER.error("Connection refused by server")
+            return
+        elif query == 6:
+            _LOGGER.error("Connection timed out")
+            return
+        ssh.sendline(self.password)
+        ssh.expect('#')
+        ssh.sendline('show clients')
+        ssh.expect('#')
+        devices_result = ssh.before.split(b'\r\n')
+        ssh.sendline('exit')

        devices = {}
        for device in devices_result:
@@ -119,5 +130,5 @@ class ArubaDeviceScanner(object):
                    'ip': match.group('ip'),
                    'mac': match.group('mac').upper(),
                    'name': match.group('name')
-                    }
+                }
        return devices
--- a/homeassistant/components/device_tracker/asuswrt.py
+++ b/homeassistant/components/device_tracker/asuswrt.py
@@ -1,34 +1,51 @@
 """
-homeassistant.components.device_tracker.asuswrt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a ASUSWRT router for device
-presence.
+Support for ASUSWRT routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.asuswrt/
 """
 import logging
-from datetime import timedelta
 import re
-import threading
+import socket
 import telnetlib
+import threading
+from collections import namedtuple
+from datetime import timedelta

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['pexpect==4.0.1']

+_LEASES_CMD = 'cat /var/lib/misc/dnsmasq.leases'
 _LEASES_REGEX = re.compile(
    r'\w+\s' +
    r'(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))\s' +
    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' +
    r'(?P<host>([^\s]+))')

+# command to get both 5GHz and 2.4GHz clients
+_WL_CMD = '{ wl -i eth2 assoclist & wl -i eth1 assoclist ; }'
+_WL_REGEX = re.compile(
+    r'\w+\s' +
+    r'(?P<mac>(([0-9A-F]{2}[:-]){5}([0-9A-F]{2})))')
+
+_ARP_CMD = 'arp -n'
+_ARP_REGEX = re.compile(
+    r'.+\s' +
+    r'\((?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\)\s' +
+    r'.+\s' +
+    r'(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))' +
+    r'\s' +
+    r'.*')
+
+_IP_NEIGH_CMD = 'ip neigh'
 _IP_NEIGH_REGEX = re.compile(
    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' +
    r'\w+\s' +
@@ -39,46 +56,53 @@ _IP_NEIGH_REGEX = re.compile(

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns an ASUS-WRT scanner. """
+    """Validate the configuration and return an ASUS-WRT scanner."""
    if not validate_config(config,
-                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME]},
                           _LOGGER):
        return None
+    elif CONF_PASSWORD not in config[DOMAIN] and \
+            'pub_key' not in config[DOMAIN]:
+        _LOGGER.error("Either a public key or password must be provided")
+        return None

    scanner = AsusWrtDeviceScanner(config[DOMAIN])

    return scanner if scanner.success_init else None

+AsusWrtResult = namedtuple('AsusWrtResult', 'neighbors leases arp')
+

 class AsusWrtDeviceScanner(object):
-    """
-    This class queries a router running ASUSWRT firmware
-    for connected devices. Adapted from DD-WRT scanner.
-    """
+    """This class queries a router running ASUSWRT firmware."""
+
+    # pylint: disable=too-many-instance-attributes, too-many-branches
+    # Eighth attribute needed for mode (AP mode vs router mode)

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

        self.lock = threading.Lock()

        self.last_results = {}

-        # Test the router is accessible
+        # Test the router is accessible.
        data = self.get_asuswrt_data()
        self.success_init = data is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device IDs.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return [client['mac'] for client in self.last_results]

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        if not self.last_results:
            return None
        for client in self.last_results:
@@ -88,9 +112,9 @@ class AsusWrtDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the ASUSWRT router is up to date.
-        Returns boolean if scanning successful.
+        """Ensure the information from the ASUSWRT router is up to date.
+
+        Return boolean if scanning successful.
        """
        if not self.success_init:
            return False
@@ -108,8 +132,45 @@ class AsusWrtDeviceScanner(object):
            self.last_results = active_clients
            return True

-    def get_asuswrt_data(self):
-        """ Retrieve data from ASUSWRT and return parsed result. """
+    def ssh_connection(self):
+        """Retrieve data from ASUSWRT via the ssh protocol."""
+        from pexpect import pxssh, exceptions
+
+        try:
+            ssh = pxssh.pxssh()
+            if self.pub_key:
+                ssh.login(self.host, self.username, ssh_key=self.pub_key)
+            elif self.password:
+                ssh.login(self.host, self.username, self.password)
+            else:
+                _LOGGER.error('No password or public key specified')
+                return None
+            ssh.sendline(_IP_NEIGH_CMD)
+            ssh.prompt()
+            neighbors = ssh.before.split(b'\n')[1:-1]
+            if self.mode == 'ap':
+                ssh.sendline(_ARP_CMD)
+                ssh.prompt()
+                arp_result = ssh.before.split(b'\n')[1:-1]
+                ssh.sendline(_WL_CMD)
+                ssh.prompt()
+                leases_result = ssh.before.split(b'\n')[1:-1]
+            else:
+                arp_result = ['']
+                ssh.sendline(_LEASES_CMD)
+                ssh.prompt()
+                leases_result = ssh.before.split(b'\n')[1:-1]
+            ssh.logout()
+            return AsusWrtResult(neighbors, leases_result, arp_result)
+        except pxssh.ExceptionPxssh as exc:
+            _LOGGER.error('Unexpected response from router: %s', exc)
+            return None
+        except exceptions.EOF:
+            _LOGGER.error('Connection refused or no route to host')
+            return None
+
+    def telnet_connection(self):
+        """Retrieve data from ASUSWRT via the telnet protocol."""
        try:
            telnet = telnetlib.Telnet(self.host)
            telnet.read_until(b'login: ')
@@ -117,42 +178,101 @@ class AsusWrtDeviceScanner(object):
            telnet.read_until(b'Password: ')
            telnet.write((self.password + '\n').encode('ascii'))
            prompt_string = telnet.read_until(b'#').split(b'\n')[-1]
-            telnet.write('ip neigh\n'.encode('ascii'))
+            telnet.write('{}\n'.format(_IP_NEIGH_CMD).encode('ascii'))
            neighbors = telnet.read_until(prompt_string).split(b'\n')[1:-1]
-            telnet.write('cat /var/lib/misc/dnsmasq.leases\n'.encode('ascii'))
-            leases_result = telnet.read_until(prompt_string).split(b'\n')[1:-1]
+            if self.mode == 'ap':
+                telnet.write('{}\n'.format(_ARP_CMD).encode('ascii'))
+                arp_result = (telnet.read_until(prompt_string).
+                              split(b'\n')[1:-1])
+                telnet.write('{}\n'.format(_WL_CMD).encode('ascii'))
+                leases_result = (telnet.read_until(prompt_string).
+                                 split(b'\n')[1:-1])
+            else:
+                arp_result = ['']
+                telnet.write('{}\n'.format(_LEASES_CMD).encode('ascii'))
+                leases_result = (telnet.read_until(prompt_string).
+                                 split(b'\n')[1:-1])
            telnet.write('exit\n'.encode('ascii'))
+            return AsusWrtResult(neighbors, leases_result, arp_result)
        except EOFError:
-            _LOGGER.exception("Unexpected response from router")
-            return
+            _LOGGER.error("Unexpected response from router")
+            return None
        except ConnectionRefusedError:
-            _LOGGER.exception("Connection refused by router," +
-                              " is telnet enabled?")
-            return
+            _LOGGER.error("Connection refused by router, is telnet enabled?")
+            return None
+        except socket.gaierror as exc:
+            _LOGGER.error("Socket exception: %s", exc)
+            return None
+        except OSError as exc:
+            _LOGGER.error("OSError: %s", exc)
+            return None
+
+    def get_asuswrt_data(self):
+        """Retrieve data from ASUSWRT and return parsed result."""
+        if self.protocol == 'ssh':
+            result = self.ssh_connection()
+        elif self.protocol == 'telnet':
+            result = self.telnet_connection()
+        else:
+            # autodetect protocol
+            result = self.ssh_connection()
+            if result:
+                self.protocol = 'ssh'
+            else:
+                result = self.telnet_connection()
+                if result:
+                    self.protocol = 'telnet'
+
+        if not result:
+            return {}

        devices = {}
-        for lease in leases_result:
-            match = _LEASES_REGEX.search(lease.decode('utf-8'))
+        if self.mode == 'ap':
+            for lease in result.leases:
+                match = _WL_REGEX.search(lease.decode('utf-8'))

-            if not match:
-                _LOGGER.warning("Could not parse lease row: %s", lease)
-                continue
+                if not match:
+                    _LOGGER.warning("Could not parse wl row: %s", lease)
+                    continue

-            # For leases where the client doesn't set a hostname, ensure
-            # it is blank and not '*', which breaks the entity_id down
-            # the line
-            host = match.group('host')
-            if host == '*':
                host = ''

-            devices[match.group('ip')] = {
-                'host': host,
-                'status': '',
-                'ip': match.group('ip'),
-                'mac': match.group('mac').upper(),
-                }
+                # match mac addresses to IP addresses in ARP table
+                for arp in result.arp:
+                    if match.group('mac').lower() in arp.decode('utf-8'):
+                        arp_match = _ARP_REGEX.search(arp.decode('utf-8'))
+                        if not arp_match:
+                            _LOGGER.warning("Could not parse arp row: %s", arp)
+                            continue

-        for neighbor in neighbors:
+                        devices[arp_match.group('ip')] = {
+                            'host': host,
+                            'status': '',
+                            'ip': arp_match.group('ip'),
+                            'mac': match.group('mac').upper(),
+                            }
+        else:
+            for lease in result.leases:
+                match = _LEASES_REGEX.search(lease.decode('utf-8'))
+
+                if not match:
+                    _LOGGER.warning("Could not parse lease row: %s", lease)
+                    continue
+
+                # For leases where the client doesn't set a hostname, ensure it
+                # is blank and not '*', which breaks entity_id down the line.
+                host = match.group('host')
+                if host == '*':
+                    host = ''
+
+                devices[match.group('ip')] = {
+                    'host': host,
+                    'status': '',
+                    'ip': match.group('ip'),
+                    'mac': match.group('mac').upper(),
+                    }
+
+        for neighbor in result.neighbors:
            match = _IP_NEIGH_REGEX.search(neighbor.decode('utf-8'))
            if not match:
                _LOGGER.warning("Could not parse neighbor row: %s", neighbor)
--- a/homeassistant/components/device_tracker/bluetooth_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_tracker.py
@@ -0,0 +1,91 @@
+"""Tracking for bluetooth devices."""
+import logging
+from datetime import timedelta
+
+from homeassistant.helpers.event import track_point_in_utc_time
+from homeassistant.components.device_tracker import (
+    YAML_DEVICES,
+    CONF_TRACK_NEW,
+    CONF_SCAN_INTERVAL,
+    DEFAULT_SCAN_INTERVAL,
+    load_config,
+)
+import homeassistant.util as util
+import homeassistant.util.dt as dt_util
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['pybluez==0.22']
+
+BT_PREFIX = 'BT_'
+
+
+def setup_scanner(hass, config, see):
+    """Setup the Bluetooth Scanner."""
+    # pylint: disable=import-error
+    import bluetooth
+
+    def see_device(device):
+        """Mark a device as seen."""
+        see(mac=BT_PREFIX + device[0], host_name=device[1])
+
+    def discover_devices():
+        """Discover bluetooth devices."""
+        result = bluetooth.discover_devices(duration=8,
+                                            lookup_names=True,
+                                            flush_cache=True,
+                                            lookup_class=False)
+        _LOGGER.debug("Bluetooth devices discovered = " + str(len(result)))
+        return result
+
+    yaml_path = hass.config.path(YAML_DEVICES)
+    devs_to_track = []
+    devs_donot_track = []
+
+    # Load all known devices.
+    # We just need the devices so set consider_home and home range
+    # to 0
+    for device in load_config(yaml_path, hass, 0, 0):
+        # check if device is a valid bluetooth device
+        if device.mac and device.mac[:3].upper() == BT_PREFIX:
+            if device.track:
+                devs_to_track.append(device.mac[3:])
+            else:
+                devs_donot_track.append(device.mac[3:])
+
+    # if track new devices is true discover new devices
+    # on startup.
+    track_new = util.convert(config.get(CONF_TRACK_NEW), bool,
+                             len(devs_to_track) == 0)
+    if track_new:
+        for dev in discover_devices():
+            if dev[0] not in devs_to_track and \
+               dev[0] not in devs_donot_track:
+                devs_to_track.append(dev[0])
+                see_device(dev)
+
+    if not devs_to_track:
+        _LOGGER.warning("No bluetooth devices to track!")
+        return False
+
+    interval = util.convert(config.get(CONF_SCAN_INTERVAL), int,
+                            DEFAULT_SCAN_INTERVAL)
+
+    def update_bluetooth(now):
+        """Lookup bluetooth device and update status."""
+        try:
+            for mac in devs_to_track:
+                _LOGGER.debug("Scanning " + mac)
+                result = bluetooth.lookup_name(mac, timeout=5)
+                if not result:
+                    # Could not lookup device name
+                    continue
+                see_device((mac, result))
+        except bluetooth.BluetoothError:
+            _LOGGER.exception('Error looking up bluetooth device!')
+        track_point_in_utc_time(hass, update_bluetooth,
+                                now + timedelta(seconds=interval))
+
+    update_bluetooth(dt_util.utcnow())
+
+    return True
--- a/homeassistant/components/device_tracker/bt_home_hub_5.py
+++ b/homeassistant/components/device_tracker/bt_home_hub_5.py
@@ -0,0 +1,141 @@
+"""
+Support for BT Home Hub 5.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.bt_home_hub_5/
+"""
+import logging
+import re
+import threading
+from datetime import timedelta
+import xml.etree.ElementTree as ET
+import json
+from urllib.parse import unquote
+
+import requests
+
+from homeassistant.helpers import validate_config
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST
+from homeassistant.util import Throttle
+
+# Return cached results if last scan was less then this time ago.
+MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
+
+_LOGGER = logging.getLogger(__name__)
+
+_MAC_REGEX = re.compile(r'(([0-9A-Fa-f]{1,2}\:){5}[0-9A-Fa-f]{1,2})')
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """Return a BT Home Hub 5 scanner if successful."""
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST]},
+                           _LOGGER):
+        return None
+    scanner = BTHomeHub5DeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+class BTHomeHub5DeviceScanner(object):
+    """This class queries a BT Home Hub 5."""
+
+    def __init__(self, config):
+        """Initialise the scanner."""
+        _LOGGER.info("Initialising BT Home Hub 5")
+        self.host = config.get(CONF_HOST, '192.168.1.254')
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        self.url = 'http://{}/nonAuth/home_status.xml'.format(self.host)
+
+        # Test the router is accessible
+        data = _get_homehub_data(self.url)
+        self.success_init = data is not None
+
+    def scan_devices(self):
+        """Scan for new devices and return a list with found device IDs."""
+        self._update_info()
+
+        return (device for device in self.last_results)
+
+    def get_device_name(self, device):
+        """Return the name of the given device or None if we don't know."""
+        with self.lock:
+            # If not initialised and not already scanned and not found.
+            if device not in self.last_results:
+                self._update_info()
+
+                if not self.last_results:
+                    return None
+
+            return self.last_results.get(device)
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """Ensure the information from the BT Home Hub 5 is up to date.
+
+        Return boolean if scanning successful.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Scanning")
+
+            data = _get_homehub_data(self.url)
+
+            if not data:
+                _LOGGER.warning('Error scanning devices')
+                return False
+
+            self.last_results = data
+
+            return True
+
+
+def _get_homehub_data(url):
+    """Retrieve data from BT Home Hub 5 and return parsed result."""
+    try:
+        response = requests.get(url, timeout=5)
+    except requests.exceptions.Timeout:
+        _LOGGER.exception("Connection to the router timed out")
+        return
+    if response.status_code == 200:
+        return _parse_homehub_response(response.text)
+    else:
+        _LOGGER.error("Invalid response from Home Hub: %s", response)
+
+
+def _parse_homehub_response(data_str):
+    """Parse the BT Home Hub 5 data format."""
+    root = ET.fromstring(data_str)
+
+    dirty_json = root.find('known_device_list').get('value')
+
+    # Normalise the JavaScript data to JSON.
+    clean_json = unquote(dirty_json.replace('\'', '\"')
+                         .replace('{', '{\"')
+                         .replace(':\"', '\":\"')
+                         .replace('\",', '\",\"'))
+
+    known_devices = [x for x in json.loads(clean_json) if x]
+
+    devices = {}
+
+    for device in known_devices:
+        name = device.get('name')
+        mac = device.get('mac')
+
+        if _MAC_REGEX.match(mac) or ',' in mac:
+            for mac_addr in mac.split(','):
+                if _MAC_REGEX.match(mac_addr):
+                    devices[mac_addr] = name
+        else:
+            devices[mac] = name
+
+    return devices
--- a/homeassistant/components/device_tracker/ddwrt.py
+++ b/homeassistant/components/device_tracker/ddwrt.py
@@ -1,24 +1,22 @@
 """
-homeassistant.components.device_tracker.ddwrt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a DD-WRT router for device
-presence.
+Support for DD-WRT routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.ddwrt/
 """
 import logging
-from datetime import timedelta
 import re
 import threading
+from datetime import timedelta
+
 import requests

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
@@ -29,7 +27,7 @@ _MAC_REGEX = re.compile(r'(([0-9A-Fa-f]{1,2}\:){5}[0-9A-Fa-f]{1,2})')

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns a DD-WRT scanner. """
+    """Validate the configuration and return a DD-WRT scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -42,12 +40,10 @@ def get_scanner(hass, config):

 # pylint: disable=too-many-instance-attributes
 class DdWrtDeviceScanner(object):
-    """
-    This class queries a wireless router running DD-WRT firmware
-    for connected devices. Adapted from Tomato scanner.
-    """
+    """This class queries a wireless router running DD-WRT firmware."""

    def __init__(self, config):
+        """Initialize the scanner."""
        self.host = config[CONF_HOST]
        self.username = config[CONF_USERNAME]
        self.password = config[CONF_PASSWORD]
@@ -64,19 +60,15 @@ class DdWrtDeviceScanner(object):
        self.success_init = data is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()

        return self.last_results

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
-
+        """Return the name of the given device or None if we don't know."""
        with self.lock:
-            # if not initialised and not already scanned and not found
+            # If not initialised and not already scanned and not found.
            if device not in self.mac2name:
                url = 'http://{}/Status_Lan.live.asp'.format(self.host)
                data = self.get_ddwrt_data(url)
@@ -89,15 +81,15 @@ class DdWrtDeviceScanner(object):
                if not dhcp_leases:
                    return None

-                # remove leading and trailing single quotes
+                # Remove leading and trailing single quotes.
                cleaned_str = dhcp_leases.strip().strip('"')
                elements = cleaned_str.split('","')
                num_clients = int(len(elements)/5)
                self.mac2name = {}
                for idx in range(0, num_clients):
-                    # this is stupid but the data is a single array
+                    # This is stupid but the data is a single array
                    # every 5 elements represents one hosts, the MAC
-                    # is the third element and the name is the first
+                    # is the third element and the name is the first.
                    mac_index = (idx * 5) + 2
                    if mac_index < len(elements):
                        mac = elements[mac_index]
@@ -107,9 +99,9 @@ class DdWrtDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the DD-WRT router is up to date.
-        Returns boolean if scanning successful.
+        """Ensure the information from the DD-WRT router is up to date.
+
+        Return boolean if scanning successful.
        """
        if not self.success_init:
            return False
@@ -134,7 +126,7 @@ class DdWrtDeviceScanner(object):
            # regex's out values so I guess I have to do the same,
            # LAME!!!

-            # remove leading and trailing single quotes
+            # Remove leading and trailing single quotes.
            clean_str = active_clients.strip().strip("'")
            elements = clean_str.split("','")

@@ -144,7 +136,7 @@ class DdWrtDeviceScanner(object):
            return True

    def get_ddwrt_data(self, url):
-        """ Retrieve data from DD-WRT and return parsed result. """
+        """Retrieve data from DD-WRT and return parsed result."""
        try:
            response = requests.get(
                url,
@@ -166,7 +158,7 @@ class DdWrtDeviceScanner(object):


 def _parse_ddwrt_response(data_str):
-    """ Parse the DD-WRT data format. """
+    """Parse the DD-WRT data format."""
    return {
        key: val for key, val in _DDWRT_DATA_REGEX
        .findall(data_str)}
--- a/homeassistant/components/device_tracker/demo.py
+++ b/homeassistant/components/device_tracker/demo.py
@@ -1,25 +1,17 @@
-"""
-homeassistant.components.device_tracker.demo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Demo platform for the device tracker.
-
-device_tracker:
-  platform: demo
-"""
+"""Demo platform for the device tracker."""
 import random

 from homeassistant.components.device_tracker import DOMAIN


 def setup_scanner(hass, config, see):
-    """ Set up a demo tracker. """
-
+    """Setup the demo tracker."""
    def offset():
-        """ Return random offset. """
+        """Return random offset."""
        return (random.randrange(500, 2000)) / 2e5 * random.choice((-1, 1))

    def random_see(dev_id, name):
-        """ Randomize a sighting. """
+        """Randomize a sighting."""
        see(
            dev_id=dev_id,
            host_name=name,
@@ -30,7 +22,7 @@ def setup_scanner(hass, config, see):
        )

    def observe(call=None):
-        """ Observe three entities. """
+        """Observe three entities."""
        random_see('demo_paulus', 'Paulus')
        random_see('demo_anne_therese', 'Anne Therese')

--- a/homeassistant/components/device_tracker/fritz.py
+++ b/homeassistant/components/device_tracker/fritz.py
@@ -1,8 +1,5 @@
 """
-homeassistant.components.device_tracker.fritz
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a FRITZ!Box router for device
-presence.
+Support for FRITZ!Box routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.fritz/
@@ -10,22 +7,23 @@ https://home-assistant.io/components/device_tracker.fritz/
 import logging
 from datetime import timedelta

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-REQUIREMENTS = ['fritzconnection==0.4.6']
+REQUIREMENTS = ['https://github.com/deisi/fritzconnection/archive/'
+                'b5c14515e1c8e2652b06b6316a7f3913df942841.zip'
+                '#fritzconnection==0.4.6']

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)


-# noinspection PyUnusedLocal
 def get_scanner(hass, config):
-    """ Validates config and returns FritzBoxScanner. """
+    """Validate the configuration and return FritzBoxScanner."""
    if not validate_config(config,
                           {DOMAIN: []},
                           _LOGGER):
@@ -37,22 +35,12 @@ def get_scanner(hass, config):

 # pylint: disable=too-many-instance-attributes
 class FritzBoxScanner(object):
-    """
-    This class queries a FRITZ!Box router. It is using the
-    fritzconnection library for communication with the router.
+    """This class queries a FRITZ!Box router."""

-    The API description can be found under:
-    https://pypi.python.org/pypi/fritzconnection/0.4.6
-
-    This scanner retrieves the list of known hosts and checks their
-    corresponding states (on, or off).
-
-    Due to a bug of the fritzbox api (router side) it is not possible
-    to track more than 16 hosts.
-    """
    def __init__(self, config):
+        """Initialize the scanner."""
        self.last_results = []
-        self.host = '169.254.1.1'  # This IP is valid for all fritzboxes
+        self.host = '169.254.1.1'  # This IP is valid for all FRITZ!Box router.
        self.username = 'admin'
        self.password = ''
        self.success_init = True
@@ -68,7 +56,7 @@ class FritzBoxScanner(object):
        if CONF_PASSWORD in config.keys():
            self.password = config[CONF_PASSWORD]

-        # Establish a connection to the FRITZ!Box
+        # Establish a connection to the FRITZ!Box.
        try:
            self.fritz_box = fc.FritzHosts(address=self.host,
                                           user=self.username,
@@ -77,7 +65,7 @@ class FritzBoxScanner(object):
            self.fritz_box = None

        # At this point it is difficult to tell if a connection is established.
-        # So just check for null objects ...
+        # So just check for null objects.
        if self.fritz_box is None or not self.fritz_box.modelname:
            self.success_init = False

@@ -90,7 +78,7 @@ class FritzBoxScanner(object):
                          "with IP: %s", self.host)

    def scan_devices(self):
-        """ Scan for new devices and return a list of found device ids. """
+        """Scan for new devices and return a list of found device ids."""
        self._update_info()
        active_hosts = []
        for known_host in self.last_results:
@@ -99,7 +87,7 @@ class FritzBoxScanner(object):
        return active_hosts

    def get_device_name(self, mac):
-        """ Returns the name of the given device or None if is not known. """
+        """Return the name of the given device or None if is not known."""
        ret = self.fritz_box.get_specific_host_entry(mac)["NewHostName"]
        if ret == {}:
            return None
@@ -107,7 +95,7 @@ class FritzBoxScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """ Retrieves latest information from the FRITZ!Box. """
+        """Retrieve latest information from the FRITZ!Box."""
        if not self.success_init:
            return False

--- a/homeassistant/components/device_tracker/icloud.py
+++ b/homeassistant/components/device_tracker/icloud.py
@@ -1,32 +1,30 @@
 """
-homeassistant.components.device_tracker.icloud
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning iCloud devices.
+Support for iCloud connected devices.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.icloud/
 """
 import logging
-
 import re
-from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
+
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.event import track_utc_time_change

 _LOGGER = logging.getLogger(__name__)

-REQUIREMENTS = ['pyicloud==0.7.2']
+REQUIREMENTS = ['pyicloud==0.8.3']

 CONF_INTERVAL = 'interval'
 DEFAULT_INTERVAL = 8


 def setup_scanner(hass, config, see):
-    """ Set up the iCloud Scanner. """
+    """Setup the iCloud Scanner."""
    from pyicloud import PyiCloudService
    from pyicloud.exceptions import PyiCloudFailedLoginException
    from pyicloud.exceptions import PyiCloudNoDevicesException

-    # Get the username and password from the configuration
+    # Get the username and password from the configuration.
    username = config.get(CONF_USERNAME)
    password = config.get(CONF_PASSWORD)

@@ -45,14 +43,14 @@ def setup_scanner(hass, config, see):
        return False

    def keep_alive(now):
-        """ Keeps authenticating iCloud connection. """
+        """Keep authenticating iCloud connection."""
        api.authenticate()
        _LOGGER.info("Authenticate against iCloud")

    track_utc_time_change(hass, keep_alive, second=0)

    def update_icloud(now):
-        """ Authenticate against iCloud and scan for devices. """
+        """Authenticate against iCloud and scan for devices."""
        try:
            # The session timeouts if we are not using it so we
            # have to re-authenticate. This will send an email.
--- a/homeassistant/components/device_tracker/locative.py
+++ b/homeassistant/components/device_tracker/locative.py
@@ -1,104 +1,96 @@
 """
-homeassistant.components.device_tracker.locative
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Locative platform for the device tracker.
+Support for the Locative platform.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.locative/
 """
 import logging
-from functools import partial

-from homeassistant.const import (
-    HTTP_UNPROCESSABLE_ENTITY, STATE_NOT_HOME)
 from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import HTTP_UNPROCESSABLE_ENTITY, STATE_NOT_HOME
+from homeassistant.components.http import HomeAssistantView

 _LOGGER = logging.getLogger(__name__)

 DEPENDENCIES = ['http']

-URL_API_LOCATIVE_ENDPOINT = "/api/locative"
-

 def setup_scanner(hass, config, see):
-    """ Set up an endpoint for the Locative app. """
-
-    # POST would be semantically better, but that currently does not work
-    # since Locative sends the data as key1=value1&key2=value2
-    # in the request body, while Home Assistant expects json there.
-
-    hass.http.register_path(
-        'GET', URL_API_LOCATIVE_ENDPOINT,
-        partial(_handle_get_api_locative, hass, see))
+    """Setup an endpoint for the Locative application."""
+    hass.wsgi.register_view(LocativeView(hass, see))

    return True


-def _handle_get_api_locative(hass, see, handler, path_match, data):
-    """ Locative message received. """
+class LocativeView(HomeAssistantView):
+    """View to handle locative requests."""

-    if not _check_data(handler, data):
-        return
+    url = "/api/locative"
+    name = "api:locative"

-    device = data['device'].replace('-', '')
-    location_name = data['id'].lower()
-    direction = data['trigger']
+    def __init__(self, hass, see):
+        """Initialize Locative url endpoints."""
+        super().__init__(hass)
+        self.see = see

-    if direction == 'enter':
-        see(dev_id=device, location_name=location_name)
-        handler.write_text("Setting location to {}".format(location_name))
+    def get(self, request):
+        """Locative message received as GET."""
+        return self.post(request)

-    elif direction == 'exit':
-        current_state = hass.states.get("{}.{}".format(DOMAIN, device))
+    def post(self, request):
+        """Locative message received."""
+        # pylint: disable=too-many-return-statements
+        data = request.values
+
+        if 'latitude' not in data or 'longitude' not in data:
+            return ("Latitude and longitude not specified.",
+                    HTTP_UNPROCESSABLE_ENTITY)
+
+        if 'device' not in data:
+            _LOGGER.error("Device id not specified.")
+            return ("Device id not specified.",
+                    HTTP_UNPROCESSABLE_ENTITY)
+
+        if 'id' not in data:
+            _LOGGER.error("Location id not specified.")
+            return ("Location id not specified.",
+                    HTTP_UNPROCESSABLE_ENTITY)
+
+        if 'trigger' not in data:
+            _LOGGER.error("Trigger is not specified.")
+            return ("Trigger is not specified.",
+                    HTTP_UNPROCESSABLE_ENTITY)
+
+        device = data['device'].replace('-', '')
+        location_name = data['id'].lower()
+        direction = data['trigger']
+
+        if direction == 'enter':
+            self.see(dev_id=device, location_name=location_name)
+            return "Setting location to {}".format(location_name)
+
+        elif direction == 'exit':
+            current_state = self.hass.states.get(
+                "{}.{}".format(DOMAIN, device))
+
+            if current_state is None or current_state.state == location_name:
+                self.see(dev_id=device, location_name=STATE_NOT_HOME)
+                return "Setting location to not home"
+            else:
+                # Ignore the message if it is telling us to exit a zone that we
+                # aren't currently in. This occurs when a zone is entered
+                # before the previous zone was exited. The enter message will
+                # be sent first, then the exit message will be sent second.
+                return 'Ignoring exit from {} (already in {})'.format(
+                    location_name, current_state)
+
+        elif direction == 'test':
+            # In the app, a test message can be sent. Just return something to
+            # the user to let them know that it works.
+            return "Received test message."

-        if current_state is None or current_state.state == location_name:
-            see(dev_id=device, location_name=STATE_NOT_HOME)
-            handler.write_text("Setting location to not home")
        else:
-            # Ignore the message if it is telling us to exit a zone that we
-            # aren't currently in. This occurs when a zone is entered before
-            # the previous zone was exited. The enter message will be sent
-            # first, then the exit message will be sent second.
-            handler.write_text(
-                'Ignoring exit from {} (already in {})'.format(
-                    location_name, current_state))
-
-    elif direction == 'test':
-        # In the app, a test message can be sent. Just return something to
-        # the user to let them know that it works.
-        handler.write_text("Received test message.")
-
-    else:
-        handler.write_text(
-            "Received unidentified message: {}".format(direction),
-            HTTP_UNPROCESSABLE_ENTITY)
-        _LOGGER.error("Received unidentified message from Locative: %s",
-                      direction)
-
-
-def _check_data(handler, data):
-    if 'latitude' not in data or 'longitude' not in data:
-        handler.write_text("Latitude and longitude not specified.",
-                           HTTP_UNPROCESSABLE_ENTITY)
-        _LOGGER.error("Latitude and longitude not specified.")
-        return False
-
-    if 'device' not in data:
-        handler.write_text("Device id not specified.",
-                           HTTP_UNPROCESSABLE_ENTITY)
-        _LOGGER.error("Device id not specified.")
-        return False
-
-    if 'id' not in data:
-        handler.write_text("Location id not specified.",
-                           HTTP_UNPROCESSABLE_ENTITY)
-        _LOGGER.error("Location id not specified.")
-        return False
-
-    if 'trigger' not in data:
-        handler.write_text("Trigger is not specified.",
-                           HTTP_UNPROCESSABLE_ENTITY)
-        _LOGGER.error("Trigger is not specified.")
-        return False
-
-    return True
+            _LOGGER.error("Received unidentified message from Locative: %s",
+                          direction)
+            return ("Received unidentified message: {}".format(direction),
+                    HTTP_UNPROCESSABLE_ENTITY)
--- a/homeassistant/components/device_tracker/luci.py
+++ b/homeassistant/components/device_tracker/luci.py
@@ -1,32 +1,30 @@
 """
-homeassistant.components.device_tracker.luci
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a OpenWRT router for device
-presence.
+Support for OpenWRT (luci) routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.luci/
 """
-import logging
 import json
-from datetime import timedelta
+import logging
 import re
 import threading
+from datetime import timedelta
+
 import requests

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)


 def get_scanner(hass, config):
-    """ Validates config and returns a Luci scanner. """
+    """Validate the configuration and return a Luci scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -39,20 +37,13 @@ def get_scanner(hass, config):

 # pylint: disable=too-many-instance-attributes
 class LuciDeviceScanner(object):
-    """
-    This class queries a wireless router running OpenWrt firmware
-    for connected devices. Adapted from Tomato scanner.
+    """This class queries a wireless router running OpenWrt firmware.

-    # opkg install luci-mod-rpc
-    for this to work on the router.
-
-    The API is described here:
-    http://luci.subsignal.org/trac/wiki/Documentation/JsonRpcHowTo
-
-    (Currently, we do only wifi iwscan, and no DHCP lease access.)
+    Adapted from Tomato scanner.
    """

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

@@ -69,17 +60,12 @@ class LuciDeviceScanner(object):
        self.success_init = self.token is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
-
        return self.last_results

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
-
+        """Return the name of the given device or None if we don't know."""
        with self.lock:
            if self.mac2name is None:
                url = 'http://{}/cgi-bin/luci/rpc/uci'.format(self.host)
@@ -99,8 +85,8 @@ class LuciDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the Luci router is up to date.
+        """Ensure the information from the Luci router is up to date.
+
        Returns boolean if scanning successful.
        """
        if not self.success_init:
@@ -126,7 +112,7 @@ class LuciDeviceScanner(object):


 def _req_json_rpc(url, method, *args, **kwargs):
-    """ Perform one JSON RPC operation. """
+    """Perform one JSON RPC operation."""
    data = json.dumps({'method': method, 'params': args})
    try:
        res = requests.post(url, data=data, timeout=5, **kwargs)
@@ -156,6 +142,6 @@ def _req_json_rpc(url, method, *args, **kwargs):


 def _get_token(host, username, password):
-    """ Get authentication token for the given host+username+password. """
+    """Get authentication token for the given host+username+password."""
    url = 'http://{}/cgi-bin/luci/rpc/auth'.format(host)
    return _req_json_rpc(url, 'login', username, password)
--- a/homeassistant/components/device_tracker/mqtt.py
+++ b/homeassistant/components/device_tracker/mqtt.py
@@ -1,39 +1,37 @@
 """
-homeassistant.components.device_tracker.mqtt
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-MQTT platform for the device tracker.
+Support for tracking MQTT enabled devices.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.mqtt/
 """
 import logging
-from homeassistant import util
+
+import voluptuous as vol
+
 import homeassistant.components.mqtt as mqtt
+from homeassistant.components.mqtt import CONF_QOS
+import homeassistant.helpers.config_validation as cv

 DEPENDENCIES = ['mqtt']

-CONF_QOS = 'qos'
 CONF_DEVICES = 'devices'

-DEFAULT_QOS = 0
-
 _LOGGER = logging.getLogger(__name__)

+PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_DEVICES): {cv.string: mqtt.valid_subscribe_topic},
+})
+

 def setup_scanner(hass, config, see):
-    """ Set up a MQTT tracker. """
-    devices = config.get(CONF_DEVICES)
-    qos = util.convert(config.get(CONF_QOS), int, DEFAULT_QOS)
-
-    if not isinstance(devices, dict):
-        _LOGGER.error('Expected %s to be a dict, found %s', CONF_DEVICES,
-                      devices)
-        return False
+    """Setup the MQTT tracker."""
+    devices = config[CONF_DEVICES]
+    qos = config[CONF_QOS]

    dev_id_lookup = {}

    def device_tracker_message_received(topic, payload, qos):
-        """ MQTT message received. """
+        """MQTT message received."""
        see(dev_id=dev_id_lookup[topic], location_name=payload)

    for dev_id, topic in devices.items():
--- a/homeassistant/components/device_tracker/netgear.py
+++ b/homeassistant/components/device_tracker/netgear.py
@@ -1,47 +1,47 @@
 """
-homeassistant.components.device_tracker.netgear
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a Netgear router for device
-presence.
+Support for Netgear routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.netgear/
 """
 import logging
-from datetime import timedelta
 import threading
+from datetime import timedelta

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
-from homeassistant.util import Throttle
 from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, \
+ CONF_PORT
+from homeassistant.util import Throttle

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['pynetgear==0.3.2']
+REQUIREMENTS = ['pynetgear==0.3.3']


 def get_scanner(hass, config):
-    """ Validates config and returns a Netgear scanner. """
+    """Validate the configuration and returns a Netgear scanner."""
    info = config[DOMAIN]
    host = info.get(CONF_HOST)
    username = info.get(CONF_USERNAME)
    password = info.get(CONF_PASSWORD)
+    port = info.get(CONF_PORT)

    if password is not None and host is None:
        _LOGGER.warning('Found username or password but no host')
        return None

-    scanner = NetgearDeviceScanner(host, username, password)
+    scanner = NetgearDeviceScanner(host, username, password, port)

    return scanner if scanner.success_init else None


 class NetgearDeviceScanner(object):
-    """ This class queries a Netgear wireless router using the SOAP-API. """
+    """Queries a Netgear wireless router using the SOAP-API."""

-    def __init__(self, host, username, password):
+    def __init__(self, host, username, password, port):
+        """Initialize the scanner."""
        import pynetgear

        self.last_results = []
@@ -51,8 +51,10 @@ class NetgearDeviceScanner(object):
            self._api = pynetgear.Netgear()
        elif username is None:
            self._api = pynetgear.Netgear(password, host)
-        else:
+        elif port is None:
            self._api = pynetgear.Netgear(password, host, username)
+        else:
+            self._api = pynetgear.Netgear(password, host, username, port)

        _LOGGER.info("Logging in")

@@ -66,15 +68,13 @@ class NetgearDeviceScanner(object):
            _LOGGER.error("Failed to Login")

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()

        return (device.mac for device in self.last_results)

    def get_device_name(self, mac):
-        """ Returns the name of the given device or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        try:
            return next(device.name for device in self.last_results
                        if device.mac == mac)
@@ -83,8 +83,8 @@ class NetgearDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Retrieves latest information from the Netgear router.
+        """Retrieve latest information from the Netgear router.
+
        Returns boolean if scanning successful.
        """
        if not self.success_init:
@@ -93,4 +93,9 @@ class NetgearDeviceScanner(object):
        with self.lock:
            _LOGGER.info("Scanning")

-            self.last_results = self._api.get_attached_devices() or []
+            results = self._api.get_attached_devices()
+
+            if results is None:
+                _LOGGER.warning('Error scanning devices')
+
+            self.last_results = results or []
--- a/homeassistant/components/device_tracker/nmap_tracker.py
+++ b/homeassistant/components/device_tracker/nmap_tracker.py
@@ -1,22 +1,20 @@
 """
-homeassistant.components.device_tracker.nmap
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a network with nmap.
+Support for scanning a network with nmap.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.nmap_scanner/
 """
 import logging
-from datetime import timedelta
-from collections import namedtuple
-import subprocess
 import re
+import subprocess
+from collections import namedtuple
+from datetime import timedelta

 import homeassistant.util.dt as dt_util
+from homeassistant.components.device_tracker import DOMAIN
 from homeassistant.const import CONF_HOSTS
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle, convert
-from homeassistant.components.device_tracker import DOMAIN

 # Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
@@ -26,11 +24,11 @@ _LOGGER = logging.getLogger(__name__)
 # interval in minutes to exclude devices from a scan while they are home
 CONF_HOME_INTERVAL = "home_interval"

-REQUIREMENTS = ['python-nmap==0.4.3']
+REQUIREMENTS = ['python-nmap==0.6.0']


 def get_scanner(hass, config):
-    """ Validates config and returns a Nmap scanner. """
+    """Validate the configuration and return a Nmap scanner."""
    if not validate_config(config, {DOMAIN: [CONF_HOSTS]},
                           _LOGGER):
        return None
@@ -43,7 +41,7 @@ Device = namedtuple("Device", ["mac", "name", "ip", "last_update"])


 def _arp(ip_address):
-    """ Get the MAC address for a given IP. """
+    """Get the MAC address for a given IP."""
    cmd = ['arp', '-n', ip_address]
    arp = subprocess.Popen(cmd, stdout=subprocess.PIPE)
    out, _ = arp.communicate()
@@ -55,9 +53,10 @@ def _arp(ip_address):


 class NmapDeviceScanner(object):
-    """ This class scans for devices using nmap. """
+    """This class scans for devices using nmap."""

    def __init__(self, config):
+        """Initialize the scanner."""
        self.last_results = []

        self.hosts = config[CONF_HOSTS]
@@ -68,17 +67,13 @@ class NmapDeviceScanner(object):
        _LOGGER.info("nmap scanner initialized")

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()

        return [device.mac for device in self.last_results]

    def get_device_name(self, mac):
-        """ Returns the name of the given device or None if we don't know. """
-
+        """Return the name of the given device or None if we don't know."""
        filter_named = [device.name for device in self.last_results
                        if device.mac == mac]

@@ -89,8 +84,8 @@ class NmapDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Scans the network for devices.
+        """Scan the network for devices.
+
        Returns boolean if scanning successful.
        """
        _LOGGER.info("Scanning")
--- a/homeassistant/components/device_tracker/owntracks.py
+++ b/homeassistant/components/device_tracker/owntracks.py
@@ -1,7 +1,5 @@
 """
-homeassistant.components.device_tracker.owntracks
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-OwnTracks platform for the device tracker.
+Support the OwnTracks platform.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.owntracks/
@@ -13,6 +11,7 @@ from collections import defaultdict

 import homeassistant.components.mqtt as mqtt
 from homeassistant.const import STATE_HOME
+from homeassistant.util import convert, slugify

 DEPENDENCIES = ['mqtt']

@@ -28,24 +27,46 @@ _LOGGER = logging.getLogger(__name__)

 LOCK = threading.Lock()

+CONF_MAX_GPS_ACCURACY = 'max_gps_accuracy'
+

 def setup_scanner(hass, config, see):
-    """ Set up an OwnTracks tracker. """
+    """Setup an OwnTracks tracker."""
+    max_gps_accuracy = config.get(CONF_MAX_GPS_ACCURACY)

-    def owntracks_location_update(topic, payload, qos):
-        """ MQTT message received. """
-
-        # Docs on available data:
-        # http://owntracks.org/booklet/tech/json/#_typelocation
+    def validate_payload(payload, data_type):
+        """Validate OwnTracks payload."""
        try:
            data = json.loads(payload)
        except ValueError:
            # If invalid JSON
-            _LOGGER.error(
-                'Unable to parse payload as JSON: %s', payload)
-            return
+            _LOGGER.error('Unable to parse payload as JSON: %s', payload)
+            return None
+        if not isinstance(data, dict) or data.get('_type') != data_type:
+            _LOGGER.debug('Skipping %s update for following data '
+                          'because of missing or malformatted data: %s',
+                          data_type, data)
+            return None
+        if max_gps_accuracy is not None and \
+                convert(data.get('acc'), float, 0.0) > max_gps_accuracy:
+            _LOGGER.debug('Skipping %s update because expected GPS '
+                          'accuracy %s is not met: %s',
+                          data_type, max_gps_accuracy, data)
+            return None
+        if convert(data.get('acc'), float, 1.0) == 0.0:
+            _LOGGER.debug('Skipping %s update because GPS accuracy'
+                          'is zero',
+                          data_type)
+            return None

-        if not isinstance(data, dict) or data.get('_type') != 'location':
+        return data
+
+    def owntracks_location_update(topic, payload, qos):
+        """MQTT message received."""
+        # Docs on available data:
+        # http://owntracks.org/booklet/tech/json/#_typelocation
+        data = validate_payload(payload, 'location')
+        if not data:
            return

        dev_id, kwargs = _parse_see_args(topic, data)
@@ -62,73 +83,84 @@ def setup_scanner(hass, config, see):
            see_beacons(dev_id, kwargs)

    def owntracks_event_update(topic, payload, qos):
-        # pylint: disable=too-many-branches
-        """ MQTT event (geofences) received. """
-
+        """MQTT event (geofences) received."""
        # Docs on available data:
        # http://owntracks.org/booklet/tech/json/#_typetransition
-        try:
-            data = json.loads(payload)
-        except ValueError:
-            # If invalid JSON
+        data = validate_payload(payload, 'transition')
+        if not data:
+            return
+
+        if data.get('desc') is None:
            _LOGGER.error(
-                'Unable to parse payload as JSON: %s', payload)
+                "Location missing from `Entering/Leaving` message - "
+                "please turn `Share` on in OwnTracks app")
            return
-
-        if not isinstance(data, dict) or data.get('_type') != 'transition':
-            return
-
        # OwnTracks uses - at the start of a beacon zone
        # to switch on 'hold mode' - ignore this
-        location = data['desc'].lstrip("-")
+        location = slugify(data['desc'].lstrip("-"))
        if location.lower() == 'home':
            location = STATE_HOME

        dev_id, kwargs = _parse_see_args(topic, data)

-        if data['event'] == 'enter':
+        def enter_event():
+            """Execute enter event."""
            zone = hass.states.get("zone.{}".format(location))
            with LOCK:
-                if zone is None:
-                    if data['t'] == 'b':
-                        # Not a HA zone, and a beacon so assume mobile
-                        MOBILE_BEACONS_ACTIVE[dev_id].append(location)
+                if zone is None and data.get('t') == 'b':
+                    # Not a HA zone, and a beacon so assume mobile
+                    beacons = MOBILE_BEACONS_ACTIVE[dev_id]
+                    if location not in beacons:
+                        beacons.append(location)
+                    _LOGGER.info("Added beacon %s", location)
                else:
                    # Normal region
-                    kwargs['location_name'] = location
-
                    regions = REGIONS_ENTERED[dev_id]
                    if location not in regions:
                        regions.append(location)
                    _LOGGER.info("Enter region %s", location)
-                    _set_gps_from_zone(kwargs, zone)
+                    _set_gps_from_zone(kwargs, location, zone)

                see(**kwargs)
                see_beacons(dev_id, kwargs)

+        def leave_event():
+            """Execute leave event."""
+            with LOCK:
+                regions = REGIONS_ENTERED[dev_id]
+                if location in regions:
+                    regions.remove(location)
+                new_region = regions[-1] if regions else None
+
+                if new_region:
+                    # Exit to previous region
+                    zone = hass.states.get("zone.{}".format(new_region))
+                    _set_gps_from_zone(kwargs, new_region, zone)
+                    _LOGGER.info("Exit to %s", new_region)
+                    see(**kwargs)
+                    see_beacons(dev_id, kwargs)
+
+                else:
+                    _LOGGER.info("Exit to GPS")
+                    # Check for GPS accuracy
+                    if not ('acc' in data and
+                            max_gps_accuracy is not None and
+                            data['acc'] > max_gps_accuracy):
+
+                        see(**kwargs)
+                        see_beacons(dev_id, kwargs)
+                    else:
+                        _LOGGER.info("Inaccurate GPS reported")
+
+                beacons = MOBILE_BEACONS_ACTIVE[dev_id]
+                if location in beacons:
+                    beacons.remove(location)
+                    _LOGGER.info("Remove beacon %s", location)
+
+        if data['event'] == 'enter':
+            enter_event()
        elif data['event'] == 'leave':
-            regions = REGIONS_ENTERED[dev_id]
-            if location in regions:
-                regions.remove(location)
-            new_region = regions[-1] if regions else None
-
-            if new_region:
-                # Exit to previous region
-                zone = hass.states.get("zone.{}".format(new_region))
-                kwargs['location_name'] = new_region
-                _set_gps_from_zone(kwargs, zone)
-                _LOGGER.info("Exit from to %s", new_region)
-
-            else:
-                _LOGGER.info("Exit to GPS")
-
-            see(**kwargs)
-            see_beacons(dev_id, kwargs)
-
-            beacons = MOBILE_BEACONS_ACTIVE[dev_id]
-            if location in beacons:
-                beacons.remove(location)
-
+            leave_event()
        else:
            _LOGGER.error(
                'Misformatted mqtt msgs, _type=transition, event=%s',
@@ -136,27 +168,25 @@ def setup_scanner(hass, config, see):
            return

    def see_beacons(dev_id, kwargs_param):
-        """ Set active beacons to the current location """
-
+        """Set active beacons to the current location."""
        kwargs = kwargs_param.copy()
+        # the battery state applies to the tracking device, not the beacon
+        kwargs.pop('battery', None)
        for beacon in MOBILE_BEACONS_ACTIVE[dev_id]:
            kwargs['dev_id'] = "{}_{}".format(BEACON_DEV_ID, beacon)
            kwargs['host_name'] = beacon
            see(**kwargs)

    mqtt.subscribe(hass, LOCATION_TOPIC, owntracks_location_update, 1)
-
    mqtt.subscribe(hass, EVENT_TOPIC, owntracks_event_update, 1)

    return True


 def _parse_see_args(topic, data):
-    """ Parse the OwnTracks location parameters,
-        into the format see expects. """
-
+    """Parse the OwnTracks location parameters, into the format see expects."""
    parts = topic.split('/')
-    dev_id = '{}_{}'.format(parts[1], parts[2])
+    dev_id = slugify('{}_{}'.format(parts[1], parts[2]))
    host_name = parts[1]
    kwargs = {
        'dev_id': dev_id,
@@ -170,12 +200,12 @@ def _parse_see_args(topic, data):
    return dev_id, kwargs


-def _set_gps_from_zone(kwargs, zone):
-    """ Set the see parameters from the zone parameters """
-
+def _set_gps_from_zone(kwargs, location, zone):
+    """Set the see parameters from the zone parameters."""
    if zone is not None:
        kwargs['gps'] = (
            zone.attributes['latitude'],
            zone.attributes['longitude'])
        kwargs['gps_accuracy'] = zone.attributes['radius']
+        kwargs['location_name'] = location
    return kwargs
--- a/homeassistant/components/device_tracker/snmp.py
+++ b/homeassistant/components/device_tracker/snmp.py
@@ -1,27 +1,24 @@
 """
-homeassistant.components.device_tracker.snmp
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports fetching WiFi associations
-through SNMP.
+Support for fetching WiFi associations through SNMP.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.snmp/
 """
-import logging
-from datetime import timedelta
-import threading
 import binascii
+import logging
+import threading
+from datetime import timedelta

+from homeassistant.components.device_tracker import DOMAIN
 from homeassistant.const import CONF_HOST
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)

 _LOGGER = logging.getLogger(__name__)
-REQUIREMENTS = ['pysnmp==4.2.5']
+REQUIREMENTS = ['pysnmp==4.3.2']

 CONF_COMMUNITY = "community"
 CONF_BASEOID = "baseoid"
@@ -29,7 +26,7 @@ CONF_BASEOID = "baseoid"

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns an snmp scanner """
+    """Validate the configuration and return an snmp scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_COMMUNITY, CONF_BASEOID]},
                           _LOGGER):
@@ -41,10 +38,10 @@ def get_scanner(hass, config):


 class SnmpScanner(object):
-    """
-    This class queries any SNMP capable Acces Point for connected devices.
-    """
+    """Queries any SNMP capable Access Point for connected devices."""
+
    def __init__(self, config):
+        """Initialize the scanner."""
        from pysnmp.entity.rfc3413.oneliner import cmdgen
        self.snmp = cmdgen.CommandGenerator()

@@ -61,25 +58,23 @@ class SnmpScanner(object):
        self.success_init = data is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device IDs.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
-        return [client['mac'] for client in self.last_results]
+        return [client['mac'] for client in self.last_results
+                if client.get('mac')]

    # Supressing no-self-use warning
    # pylint: disable=R0201
    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        # We have no names
        return None

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the WAP is up to date.
-        Returns boolean if scanning successful.
+        """Ensure the information from the device is up to date.
+
+        Return boolean if scanning successful.
        """
        if not self.success_init:
            return False
@@ -93,8 +88,7 @@ class SnmpScanner(object):
            return True

    def get_snmp_data(self):
-        """ Fetch mac addresses from WAP via SNMP. """
-
+        """Fetch MAC addresses from access point via SNMP."""
        devices = []

        errindication, errstatus, errindex, restable = self.snmp.nextCmd(
@@ -103,14 +97,16 @@ class SnmpScanner(object):
        if errindication:
            _LOGGER.error("SNMPLIB error: %s", errindication)
            return
+        # pylint: disable=no-member
        if errstatus:
            _LOGGER.error('SNMP error: %s at %s', errstatus.prettyPrint(),
-                          errindex and restable[-1][int(errindex)-1] or '?')
+                          errindex and restable[int(errindex) - 1][0] or '?')
            return

        for resrow in restable:
            for _, val in resrow:
                mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                _LOGGER.debug('Found mac %s', mac)
                mac = ':'.join([mac[i:i+2] for i in range(0, len(mac), 2)])
                devices.append({'mac': mac})
        return devices
--- a/homeassistant/components/device_tracker/thomson.py
+++ b/homeassistant/components/device_tracker/thomson.py
@@ -1,24 +1,21 @@
 """
-homeassistant.components.device_tracker.thomson
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a THOMSON router for device
-presence.
+Support for THOMSON routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.thomson/
 """
 import logging
-from datetime import timedelta
 import re
-import threading
 import telnetlib
+import threading
+from datetime import timedelta

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)

 _LOGGER = logging.getLogger(__name__)
@@ -35,7 +32,7 @@ _DEVICES_REGEX = re.compile(

 # pylint: disable=unused-argument
 def get_scanner(hass, config):
-    """ Validates config and returns a THOMSON scanner. """
+    """Validate the configuration and return a THOMSON scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -47,12 +44,10 @@ def get_scanner(hass, config):


 class ThomsonDeviceScanner(object):
-    """
-    This class queries a router running THOMSON firmware
-    for connected devices. Adapted from ASUSWRT scanner.
-    """
+    """This class queries a router running THOMSON firmware."""

    def __init__(self, config):
+        """Initialize the scanner."""
        self.host = config[CONF_HOST]
        self.username = config[CONF_USERNAME]
        self.password = config[CONF_PASSWORD]
@@ -61,20 +56,17 @@ class ThomsonDeviceScanner(object):

        self.last_results = {}

-        # Test the router is accessible
+        # Test the router is accessible.
        data = self.get_thomson_data()
        self.success_init = data is not None

    def scan_devices(self):
-        """ Scans for new devices and return a
-            list containing found device ids. """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return [client['mac'] for client in self.last_results]

    def get_device_name(self, device):
-        """ Returns the name of the given device
-            or None if we don't know. """
+        """Return the name of the given device or None if we don't know."""
        if not self.last_results:
            return None
        for client in self.last_results:
@@ -84,9 +76,9 @@ class ThomsonDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the THOMSON router is up to date.
-        Returns boolean if scanning successful.
+        """Ensure the information from the THOMSON router is up to date.
+
+        Return boolean if scanning successful.
        """
        if not self.success_init:
            return False
@@ -97,14 +89,14 @@ class ThomsonDeviceScanner(object):
            if not data:
                return False

-            # flag C stands for CONNECTED
+            # Flag C stands for CONNECTED
            active_clients = [client for client in data.values() if
                              client['status'].find('C') != -1]
            self.last_results = active_clients
            return True

    def get_thomson_data(self):
-        """ Retrieve data from THOMSON and return parsed result. """
+        """Retrieve data from THOMSON and return parsed result."""
        try:
            telnet = telnetlib.Telnet(self.host)
            telnet.read_until(b'Username : ')
--- a/homeassistant/components/device_tracker/tomato.py
+++ b/homeassistant/components/device_tracker/tomato.py
@@ -1,26 +1,23 @@
 """
-homeassistant.components.device_tracker.tomato
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a Tomato router for device
-presence.
+Support for Tomato routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.tomato/
 """
-import logging
 import json
-from datetime import timedelta
+import logging
 import re
 import threading
+from datetime import timedelta

 import requests

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 CONF_HTTP_ID = "http_id"
@@ -29,7 +26,7 @@ _LOGGER = logging.getLogger(__name__)


 def get_scanner(hass, config):
-    """ Validates config and returns a Tomato scanner. """
+    """Validate the configuration and returns a Tomato scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME,
                                     CONF_PASSWORD, CONF_HTTP_ID]},
@@ -40,14 +37,10 @@ def get_scanner(hass, config):


 class TomatoDeviceScanner(object):
-    """ This class queries a wireless router running Tomato firmware
-    for connected devices.
-
-    A description of the Tomato API can be found on
-    http://paulusschoutsen.nl/blog/2013/10/tomato-api-documentation/
-    """
+    """This class queries a wireless router running Tomato firmware."""

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

@@ -68,16 +61,13 @@ class TomatoDeviceScanner(object):
        self.success_init = self._update_tomato_info()

    def scan_devices(self):
-        """ Scans for new devices and return a
-            list containing found device ids. """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_tomato_info()

        return [item[1] for item in self.last_results['wldev']]

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
-
+        """Return the name of the given device or None if we don't know."""
        filter_named = [item[0] for item in self.last_results['dhcpd_lease']
                        if item[2] == device]

@@ -88,19 +78,17 @@ class TomatoDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_tomato_info(self):
-        """ Ensures the information from the Tomato router is up to date.
-            Returns boolean if scanning successful. """
+        """Ensure the information from the Tomato router is up to date.

+        Return boolean if scanning successful.
+        """
        with self.lock:
            self.logger.info("Scanning")

            try:
                response = requests.Session().send(self.req, timeout=3)
-
                # Calling and parsing the Tomato api here. We only need the
-                # wldev and dhcpd_lease values. For API description see:
-                # http://paulusschoutsen.nl/
-                #   blog/2013/10/tomato-api-documentation/
+                # wldev and dhcpd_lease values.
                if response.status_code == 200:

                    for param, value in \
@@ -109,7 +97,6 @@ class TomatoDeviceScanner(object):
                        if param == 'wldev' or param == 'dhcpd_lease':
                            self.last_results[param] = \
                                json.loads(value.replace("'", '"'))
-
                    return True

                elif response.status_code == 401:
@@ -117,29 +104,25 @@ class TomatoDeviceScanner(object):
                    self.logger.exception((
                        "Failed to authenticate, "
                        "please check your username and password"))
-
                    return False

            except requests.exceptions.ConnectionError:
                # We get this if we could not connect to the router or
-                # an invalid http_id was supplied
+                # an invalid http_id was supplied.
                self.logger.exception((
                    "Failed to connect to the router"
                    " or invalid http_id supplied"))
-
                return False

            except requests.exceptions.Timeout:
                # We get this if we could not connect to the router or
-                # an invalid http_id was supplied
+                # an invalid http_id was supplied.
                self.logger.exception(
                    "Connection to the router timed out")
-
                return False

            except ValueError:
-                # If json decoder could not parse the response
+                # If JSON decoder could not parse the response.
                self.logger.exception(
                    "Failed to parse response from router")
-
                return False
--- a/homeassistant/components/device_tracker/tplink.py
+++ b/homeassistant/components/device_tracker/tplink.py
@@ -1,23 +1,22 @@
 """
-homeassistant.components.device_tracker.tplink
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a TP-Link router for device
-presence.
+Support for TP-Link routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.tplink/
 """
 import base64
+import hashlib
 import logging
-from datetime import timedelta
 import re
 import threading
+from datetime import timedelta
+
 import requests

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

 # Return cached results if last scan was less then this time ago
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
@@ -26,30 +25,31 @@ _LOGGER = logging.getLogger(__name__)


 def get_scanner(hass, config):
-    """ Validates config and returns a TP-Link scanner. """
+    """Validate the configuration and return a TP-Link scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
        return None

-    scanner = Tplink3DeviceScanner(config[DOMAIN])
+    scanner = Tplink4DeviceScanner(config[DOMAIN])
+
+    if not scanner.success_init:
+        scanner = Tplink3DeviceScanner(config[DOMAIN])

    if not scanner.success_init:
        scanner = Tplink2DeviceScanner(config[DOMAIN])

-        if not scanner.success_init:
-            scanner = TplinkDeviceScanner(config[DOMAIN])
+    if not scanner.success_init:
+        scanner = TplinkDeviceScanner(config[DOMAIN])

    return scanner if scanner.success_init else None


 class TplinkDeviceScanner(object):
-    """
-    This class queries a wireless router running TP-Link firmware
-    for connected devices.
-    """
+    """This class queries a wireless router running TP-Link firmware."""

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

@@ -65,29 +65,21 @@ class TplinkDeviceScanner(object):
        self.success_init = self._update_info()

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
-
        return self.last_results

    # pylint: disable=no-self-use
    def get_device_name(self, device):
-        """
-        The TP-Link firmware doesn't save the name of the wireless device.
-        """
-
+        """The firmware doesn't save the name of the wireless device."""
        return None

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the TP-Link router is up to date.
-        Returns boolean if scanning successful.
-        """
+        """Ensure the information from the TP-Link router is up to date.

+        Return boolean if scanning successful.
+        """
        with self.lock:
            _LOGGER.info("Loading wireless clients...")

@@ -106,34 +98,24 @@ class TplinkDeviceScanner(object):


 class Tplink2DeviceScanner(TplinkDeviceScanner):
-    """
-    This class queries a wireless router running newer version of TP-Link
-    firmware for connected devices.
-    """
+    """This class queries a router with newer version of TP-Link firmware."""

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return self.last_results.keys()

    # pylint: disable=no-self-use
    def get_device_name(self, device):
-        """
-        The TP-Link firmware doesn't save the name of the wireless device.
-        """
-
+        """The firmware doesn't save the name of the wireless device."""
        return self.last_results.get(device)

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the TP-Link router is up to date.
-        Returns boolean if scanning successful.
-        """
+        """Ensure the information from the TP-Link router is up to date.

+        Return boolean if scanning successful.
+        """
        with self.lock:
            _LOGGER.info("Loading wireless clients...")

@@ -171,46 +153,36 @@ class Tplink2DeviceScanner(TplinkDeviceScanner):


 class Tplink3DeviceScanner(TplinkDeviceScanner):
-    """
-    This class queries the Archer C9 router running version 150811 or higher
-    of TP-Link firmware for connected devices.
-    """
+    """This class queries the Archer C9 router with version 150811 or high."""

    def __init__(self, config):
+        """Initialize the scanner."""
        self.stok = ''
        self.sysauth = ''
        super(Tplink3DeviceScanner, self).__init__(config)

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
        return self.last_results.keys()

    # pylint: disable=no-self-use
    def get_device_name(self, device):
-        """
-        The TP-Link firmware doesn't save the name of the wireless device.
+        """The firmware doesn't save the name of the wireless device.
+
        We are forced to use the MAC address as name here.
        """
-
        return self.last_results.get(device)

    def _get_auth_tokens(self):
-        """
-        Retrieves auth tokens from the router.
-        """
-
+        """Retrieve auth tokens from the router."""
        _LOGGER.info("Retrieving auth tokens...")

        url = 'http://{}/cgi-bin/luci/;stok=/login?form=login' \
            .format(self.host)
        referer = 'http://{}/webpages/login.html'.format(self.host)

-        # if possible implement rsa encryption of password here
-
+        # If possible implement rsa encryption of password here.
        response = requests.post(url,
                                 params={'operation': 'login',
                                         'username': self.username,
@@ -231,11 +203,10 @@ class Tplink3DeviceScanner(TplinkDeviceScanner):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the TP-Link router is up to date.
-        Returns boolean if scanning successful.
-        """
+        """Ensure the information from the TP-Link router is up to date.

+        Return boolean if scanning successful.
+        """
        with self.lock:
            if (self.stok == '') or (self.sysauth == ''):
                self._get_auth_tokens()
@@ -280,3 +251,81 @@ class Tplink3DeviceScanner(TplinkDeviceScanner):
                return True

            return False
+
+
+class Tplink4DeviceScanner(TplinkDeviceScanner):
+    """This class queries an Archer C7 router with TP-Link firmware 150427."""
+
+    def __init__(self, config):
+        """Initialize the scanner."""
+        self.credentials = ''
+        self.token = ''
+        super(Tplink4DeviceScanner, self).__init__(config)
+
+    def scan_devices(self):
+        """Scan for new devices and return a list with found device IDs."""
+        self._update_info()
+        return self.last_results
+
+    # pylint: disable=no-self-use
+    def get_device_name(self, device):
+        """The firmware doesn't save the name of the wireless device."""
+        return None
+
+    def _get_auth_tokens(self):
+        """Retrieve auth tokens from the router."""
+        _LOGGER.info("Retrieving auth tokens...")
+        url = 'http://{}/userRpm/LoginRpm.htm?Save=Save'.format(self.host)
+
+        # Generate md5 hash of password
+        password = hashlib.md5(self.password.encode('utf')).hexdigest()
+        credentials = '{}:{}'.format(self.username, password).encode('utf')
+
+        # Encode the credentials to be sent as a cookie.
+        self.credentials = base64.b64encode(credentials).decode('utf')
+
+        # Create the authorization cookie.
+        cookie = 'Authorization=Basic {}'.format(self.credentials)
+
+        response = requests.get(url, headers={'cookie': cookie})
+
+        try:
+            result = re.search(r'window.parent.location.href = '
+                               r'"https?:\/\/.*\/(.*)\/userRpm\/Index.htm";',
+                               response.text)
+            if not result:
+                return False
+            self.token = result.group(1)
+            return True
+        except ValueError:
+            _LOGGER.error("Couldn't fetch auth tokens!")
+            return False
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """Ensure the information from the TP-Link router is up to date.
+
+        Return boolean if scanning successful.
+        """
+        with self.lock:
+            if (self.credentials == '') or (self.token == ''):
+                self._get_auth_tokens()
+
+            _LOGGER.info("Loading wireless clients...")
+
+            url = 'http://{}/{}/userRpm/WlanStationRpm.htm' \
+                .format(self.host, self.token)
+            referer = 'http://{}'.format(self.host)
+            cookie = 'Authorization=Basic {}'.format(self.credentials)
+
+            page = requests.get(url, headers={
+                'cookie': cookie,
+                'referer': referer
+            })
+            result = self.parse_macs.findall(page.text)
+
+            if not result:
+                return False
+
+            self.last_results = [mac.replace("-", ":") for mac in result]
+            return True
--- a/homeassistant/components/device_tracker/ubus.py
+++ b/homeassistant/components/device_tracker/ubus.py
@@ -1,32 +1,30 @@
 """
-homeassistant.components.device_tracker.ubus
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Device tracker platform that supports scanning a OpenWRT router for device
-presence.
+Support for OpenWRT (ubus) routers.

 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.ubus/
 """
-import logging
 import json
-from datetime import timedelta
+import logging
 import re
 import threading
+from datetime import timedelta
+
 import requests

-from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+from homeassistant.components.device_tracker import DOMAIN
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import validate_config
 from homeassistant.util import Throttle
-from homeassistant.components.device_tracker import DOMAIN

-# Return cached results if last scan was less then this time ago
+# Return cached results if last scan was less then this time ago.
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)

 _LOGGER = logging.getLogger(__name__)


 def get_scanner(hass, config):
-    """ Validates config and returns a Luci scanner. """
+    """Validate the configuration and return an ubus scanner."""
    if not validate_config(config,
                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
                           _LOGGER):
@@ -40,23 +38,13 @@ def get_scanner(hass, config):
 # pylint: disable=too-many-instance-attributes
 class UbusDeviceScanner(object):
    """
-    This class queries a wireless router running OpenWrt firmware
-    for connected devices. Adapted from Tomato scanner.
-
-    Configure your routers' ubus ACL based on following instructions:
-
-    http://wiki.openwrt.org/doc/techref/ubus
-
-    Read only access will be fine.
-
-    To use this class you have to install rpcd-mod-file package
-    in your OpenWrt router:
-
-    opkg install rpcd-mod-file
+    This class queries a wireless router running OpenWrt firmware.

+    Adapted from Tomato scanner.
    """

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

@@ -72,17 +60,12 @@ class UbusDeviceScanner(object):
        self.success_init = self.session_id is not None

    def scan_devices(self):
-        """
-        Scans for new devices and return a list containing found device ids.
-        """
-
+        """Scan for new devices and return a list with found device IDs."""
        self._update_info()
-
        return self.last_results

    def get_device_name(self, device):
-        """ Returns the name of the given device or None if we don't know. """
-
+        """Return the name of the given device or None if we don't know."""
        with self.lock:
            if self.leasefile is None:
                result = _req_json_rpc(self.url, self.session_id,
@@ -111,8 +94,8 @@ class UbusDeviceScanner(object):

    @Throttle(MIN_TIME_BETWEEN_SCANS)
    def _update_info(self):
-        """
-        Ensures the information from the Luci router is up to date.
+        """Ensure the information from the Luci router is up to date.
+
        Returns boolean if scanning successful.
        """
        if not self.success_init:
@@ -140,8 +123,7 @@ class UbusDeviceScanner(object):


 def _req_json_rpc(url, session_id, rpcmethod, subsystem, method, **params):
-    """ Perform one JSON RPC operation. """
-
+    """Perform one JSON RPC operation."""
    data = json.dumps({"jsonrpc": "2.0",
                       "id": 1,
                       "method": rpcmethod,
@@ -166,7 +148,7 @@ def _req_json_rpc(url, session_id, rpcmethod, subsystem, method, **params):


 def _get_session_id(url, username, password):
-    """ Get authentication token for the given host+username+password. """
+    """Get the authentication token for the given host+username+password."""
    res = _req_json_rpc(url, "00000000000000000000000000000000", 'call',
                        'session', 'login', username=username,
                        password=password)
--- a/Show More
+++ b/Show More