Merge pull request #1182 from balloob/dev

0.13
Version bump to 0.13
2025-09-21 19:09:35 +00:00 · 2016-02-12 21:55:24 -08:00 · 2016-02-12 21:51:34 -08:00 · 2016-02-12 19:31:07 -08:00 · 2016-02-12 19:03:22 -08:00 · 2016-02-12 19:01:41 -08:00
480 changed files with 61112 additions and 5110 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -0,0 +1,167 @@
+[run]
+source = homeassistant
+
+omit =
+    homeassistant/__main__.py
+
+    # omit pieces of code that rely on external devices being present
+    homeassistant/components/alarm_control_panel/alarmdotcom.py
+    homeassistant/components/alarm_control_panel/nx584.py
+
+    homeassistant/components/arduino.py
+    homeassistant/components/*/arduino.py
+
+    homeassistant/components/apcupsd.py
+    homeassistant/components/*/apcupsd.py
+
+    homeassistant/components/bloomsky.py
+    homeassistant/components/*/bloomsky.py
+
+    homeassistant/components/insteon_hub.py
+    homeassistant/components/*/insteon_hub.py
+
+    homeassistant/components/isy994.py
+    homeassistant/components/*/isy994.py
+
+    homeassistant/components/modbus.py
+    homeassistant/components/*/modbus.py
+
+    homeassistant/components/*/tellstick.py
+
+    homeassistant/components/tellduslive.py
+    homeassistant/components/*/tellduslive.py
+
+    homeassistant/components/*/vera.py
+
+    homeassistant/components/ecobee.py
+    homeassistant/components/*/ecobee.py
+
+    homeassistant/components/verisure.py
+    homeassistant/components/*/verisure.py
+
+    homeassistant/components/wink.py
+    homeassistant/components/*/wink.py
+
+    homeassistant/components/zigbee.py
+    homeassistant/components/*/zigbee.py
+
+    homeassistant/components/zwave.py
+    homeassistant/components/*/zwave.py
+
+    homeassistant/components/rfxtrx.py
+    homeassistant/components/*/rfxtrx.py
+
+    homeassistant/components/mysensors.py
+    homeassistant/components/*/mysensors.py
+
+    homeassistant/components/nest.py
+    homeassistant/components/*/nest.py
+
+    homeassistant/components/rpi_gpio.py
+    homeassistant/components/*/rpi_gpio.py
+
+    homeassistant/components/scsgate.py
+    homeassistant/components/*/scsgate.py
+
+    homeassistant/components/binary_sensor/arest.py
+    homeassistant/components/binary_sensor/rest.py
+    homeassistant/components/browser.py
+    homeassistant/components/camera/*
+    homeassistant/components/device_tracker/actiontec.py
+    homeassistant/components/device_tracker/aruba.py
+    homeassistant/components/device_tracker/asuswrt.py
+    homeassistant/components/device_tracker/ddwrt.py
+    homeassistant/components/device_tracker/fritz.py
+    homeassistant/components/device_tracker/icloud.py
+    homeassistant/components/device_tracker/luci.py
+    homeassistant/components/device_tracker/netgear.py
+    homeassistant/components/device_tracker/nmap_tracker.py
+    homeassistant/components/device_tracker/snmp.py
+    homeassistant/components/device_tracker/thomson.py
+    homeassistant/components/device_tracker/tomato.py
+    homeassistant/components/device_tracker/tplink.py
+    homeassistant/components/device_tracker/ubus.py
+    homeassistant/components/discovery.py
+    homeassistant/components/downloader.py
+    homeassistant/components/garage_door/wink.py
+    homeassistant/components/ifttt.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/media_player/cast.py
+    homeassistant/components/media_player/denon.py
+    homeassistant/components/media_player/firetv.py
+    homeassistant/components/media_player/itunes.py
+    homeassistant/components/media_player/kodi.py
+    homeassistant/components/media_player/mpd.py
+    homeassistant/components/media_player/plex.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/notify/free_mobile.py
+    homeassistant/components/notify/googlevoice.py
+    homeassistant/components/notify/instapush.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/slack.py
+    homeassistant/components/notify/smtp.py
+    homeassistant/components/notify/syslog.py
+    homeassistant/components/notify/telegram.py
+    homeassistant/components/notify/twitter.py
+    homeassistant/components/notify/xmpp.py
+    homeassistant/components/sensor/arest.py
+    homeassistant/components/sensor/bitcoin.py
+    homeassistant/components/sensor/cpuspeed.py
+    homeassistant/components/sensor/dht.py
+    homeassistant/components/sensor/dweet.py
+    homeassistant/components/sensor/efergy.py
+    homeassistant/components/sensor/eliqonline.py
+    homeassistant/components/sensor/forecast.py
+    homeassistant/components/sensor/glances.py
+    homeassistant/components/sensor/netatmo.py
+    homeassistant/components/sensor/onewire.py
+    homeassistant/components/sensor/openweathermap.py
+    homeassistant/components/sensor/rest.py
+    homeassistant/components/sensor/sabnzbd.py
+    homeassistant/components/sensor/speedtest.py
+    homeassistant/components/sensor/swiss_public_transport.py
+    homeassistant/components/sensor/systemmonitor.py
+    homeassistant/components/sensor/temper.py
+    homeassistant/components/sensor/time_date.py
+    homeassistant/components/sensor/torque.py
+    homeassistant/components/sensor/transmission.py
+    homeassistant/components/sensor/twitch.py
+    homeassistant/components/sensor/worldclock.py
+    homeassistant/components/switch/arest.py
+    homeassistant/components/switch/edimax.py
+    homeassistant/components/switch/hikvisioncam.py
+    homeassistant/components/switch/mystrom.py
+    homeassistant/components/switch/orvibo.py
+    homeassistant/components/switch/rest.py
+    homeassistant/components/switch/transmission.py
+    homeassistant/components/switch/wemo.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
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,20 @@
-home-assistant.log
-home-assistant.conf
-known_devices.csv
+config/*
+!config/home-assistant.conf.default
+homeassistant/components/frontend/www_static/polymer/bower_components/*
+
+# There is not a better solution afaik..
+!config/custom_components
+config/custom_components/*
+!config/custom_components/example.py
+!config/custom_components/hello_world.py
+!config/custom_components/mqtt_example.py
+
+tests/config/home-assistant.log

 # Hide sublime text stuff
 *.sublime-project
 *.sublime-workspace

-# Hide code validator output
-pep8.txt
-pylint.txt
-
 # Hide some OS X stuff
 .DS_Store
 .AppleDouble
@@ -21,6 +26,9 @@ Icon

 .idea

+# pytest
+.cache
+
 # GITHUB Proposed Python stuff:
 *.py[cod]

@@ -33,6 +41,7 @@ Icon
 dist
 build
 eggs
+.eggs
 parts
 bin
 var
@@ -56,4 +65,20 @@ nosetests.xml
 # Mr Developer
 .mr.developer.cfg
 .project
-.pydevproject
+.pydevproject
+
+.python-version
+
+# emacs auto backups
+*~
+*#
+*.orig
+
+# venv stuff
+pyvenv.cfg
+pip-selfcheck.json
+venv
+
+# vimmy stuff
+*.swp
+*.swo
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "homeassistant/external/pychromecast"]
-	path = homeassistant/external/pychromecast
-	url = https://github.com/balloob/pychromecast.git
-[submodule "homeassistant/external/pynetgear"]
-	path = homeassistant/external/pynetgear
-	url = https://github.com/balloob/pynetgear.git
+[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
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+sudo: false
+language: python
+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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,71 @@
+# Contributing to Home Assistant
+
+Everybody is invited and welcome to contribute to Home Assistant. There is a lot to do...if you are not a developer perhaps you would like to help with the documentation on [home-assistant.io](https://home-assistant.io/)? If you are a developer and have devices in your home which aren't working with Home Assistant yet, why not spent a couple of hours and help to integrate them? 
+
+The process is straight-forward.
+
+ - Fork the Home Assistant [git repository](https://github.com/balloob/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.
+
+Still interested? Then you should read the next sections and get more details. 
+
+## Adding support for a new device
+
+For help on building your component, please see the [developer documentation](https://home-assistant.io/developers/) on [home-assistant.io](https://home-assistant.io/).
+
+After you finish adding support for your device:
+
+ - 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/).
+
+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 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.
+
+### Setting states
+
+It is the responsibility of the component to maintain the states of the devices in your domain. Each device should be a single state and, if possible, a group should be provided that tracks the combined state of the devices.
+
+A state can have several attributes that will help the frontend in displaying your state:
+
+ - `friendly_name`: this name will be used as the name of the device
+ - `entity_picture`: this picture will be shown instead of the domain icon
+ - `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).
+
+### 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. 
+You can set a suggestion for your entity's visibility by setting the hidden property by doing something similar to the following.
+
+```python
+self.hidden = True
+```
+
+This will SUGGEST that the active frontend hides the entity. This requires that the active frontend support hidden cards (the default frontend does) and that the value of hidden be included in your attributes dictionary (see above). The Entity abstract class will take care of this for you.
+
+Remember: The suggestion set by your component's code will always be overwritten by user settings in the configuration.yaml file. This is why you may set hidden to be False, but the property may remain True (or vice-versa).
+
+### Working on the frontend
+
+The frontend is composed of [Polymer](https://www.polymer-project.org) web-components and compiled into the file `frontend.html`. During development you do not want to work with the compiled version but with the seperate files. To have Home Assistant serve the seperate files, set `development=1` for the *http-component* in your config.
+
+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.
+
+### 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/27
+++ b/27
@@ -0,0 +1,27 @@
+FROM python:3.4
+MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
+
+VOLUME /config
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+# For the nmap tracker
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends nmap net-tools && \
+    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
+
+COPY requirements_all.txt requirements_all.txt
+RUN pip3 install --no-cache-dir -r requirements_all.txt
+
+# Copy source
+COPY . .
+
+CMD [ "python", "-m", "homeassistant", "--config", "/config" ]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013 Paulus Schoutsen
+Copyright (c) 2016 Paulus Schoutsen

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include README.rst
+include LICENSE
+graft homeassistant
+prune homeassistant/components/frontend/www_static/home-assistant-polymer
+recursive-exclude * *.py[co]
--- a/README.md
+++ b/README.md
@@ -1,240 +0,0 @@
-Home Assistant
-==============
-
-Home Assistant provides a platform for home automation. It does so by having modules that observe and trigger actors to do various tasks.
-
-It is currently able to do the following things:
- * Track if devices are home by monitoring connected devices to a wireless router (currently supporting modern Netgear routers or routers running Tomato firmware)
- * Track and control lights
- * Track and control WeMo switches
- * Track and control Chromecasts
- * Turn on the lights when people get home when the sun is setting or has set
- * Slowly turn on the lights to compensate for light loss when the sun sets and people are home
- * Turn off lights and connected devices when everybody leaves the house
- * Download files to the host machine
- * Open a url in the default browser at the host machine
- * Simulate key presses on the host for Play/Pause, Next track, Prev track, Volume up, Volume Down
- * Controllable via a REST API and web interface
- * Support for remoting Home Assistant instances through a Python API
- * Android Tasker project to control Home Assistant from your phone and report charging state.
-
-![screenshot-states](https://raw.github.com/balloob/home-assistant/master/docs/states.png)
-
-Current compatible devices:
- * [WeMo switches](http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/)
- * [Philips Hue](http://meethue.com)
- * [Google Chromecast](http://www.google.com/intl/en/chrome/devices/chromecast)
- * Wireless router running [Tomato firmware](http://www.polarcloud.com/tomato)
- * Netgear wireless routers (tested with R6300)
-
-The system is built modular so support for other devices or actions can be implemented easily.
-
-Installation instructions
-------------------------
-* The core depends on [PyEphem](http://rhodesmill.org/pyephem/) and [Requests](http://python-requests.org). Depending on the components you would like to use you will need [PHue](https://github.com/studioimaginaire/phue) for Philips Hue support, [PyChromecast](https://github.com/balloob/pychromecast) for Chromecast support and [ouimeaux](https://github.com/iancmcc/ouimeaux) for WeMo support. Install these using `pip install pyephem requests phue ouimeaux pychromecast`.
-* Clone the repository and pull in the submodules `git clone --recursive https://github.com/balloob/home-assistant.git`
-* Copy home-assistant.conf.default to home-assistant.conf and adjust the config values to match your setup.
-  * For Tomato you will have to not only setup your host, username and password but also a http_id. The http_id can be retrieved by going to the admin console of your router, view the source of any of the pages and search for `http_id`.
-* If you want to use Hue, setup PHue by running `python -m phue --host HUE_BRIDGE_IP_ADDRESS` from the commandline and follow the instructions.
-* While running the script it will create and maintain a file called `known_devices.csv` which will contain the detected devices. Adjust the track variable for the devices you want the script to act on and restart the script or call the service `device_tracker/reload_devices_csv`.
-
-Done. Start it now by running `python start.py`
-
-Web interface and API
---------------------
-Home Assistent runs a webserver accessible on port 8123. 
-
-  * At http://localhost:8123/ it will provide a debug interface showing the current state of the system and an overview of registered services.
-  * At http://localhost:8123/api/ it provides a password protected API.
-
-A screenshot of the debug interface:
-![screenshot-debug-interface](https://raw.github.com/balloob/home-assistant/master/docs/screenshot-debug-interface.png)
-
-All API calls have to be accompanied by an 'api_password' parameter (as specified in `home-assistant.conf`) and will
-return JSON encoded objects. If successful calls will return status code 200 or 201.
-
-Other status codes that can occur are:
- - 400 (Bad Request)
- - 401 (Unauthorized)
- - 404 (Not Found)
- - 405 (Method not allowed)
-
-The api supports the following actions:
-
-**/api/states - GET**<br>
-Returns a list of entity ids for which a state is available
-
-```json
-{
-    "entity_ids": [
-        "Paulus_Nexus_4", 
-        "weather.sun", 
-        "all_devices"
-    ]
-}
-```
-
-**/api/events - GET**<br>
-Returns a dict with as keys the events and as value the number of listeners.
-
-```json
-{
-    "event_listeners": {
-      "state_changed": 5,
-      "time_changed": 2
-    }  
-}
-```
-
-**/api/services - GET**<br>
-Returns a dict with as keys the domain and as value a list of published services.
-
-```json
-{
-    "services": {
-      "browser": [
-          "browse_url"
-      ],
-      "keyboard": [
-          "volume_up",
-          "volume_down"
-      ]
-    }  
-}
-```
-
-**/api/states/&lt;entity_id>** - GET<br>
-Returns the current state from an entity
-
-```json
-{
-    "attributes": {
-        "next_rising": "07:04:15 29-10-2013", 
-        "next_setting": "18:00:31 29-10-2013"
-    }, 
-    "entity_id": "weather.sun", 
-    "last_changed": "23:24:33 28-10-2013", 
-    "state": "below_horizon"
-}
-```
-
-**/api/states/&lt;entity_id>** - POST<br>
-Updates the current state of an entity. Returns status code 201 if successful with location header of updated resource and the new state in the body.<br>
-parameter: new_state - string<br>
-optional parameter: attributes - JSON encoded object
-
-```json
-{
-    "attributes": {
-        "next_rising": "07:04:15 29-10-2013", 
-        "next_setting": "18:00:31 29-10-2013"
-    }, 
-    "entity_id": "weather.sun", 
-    "last_changed": "23:24:33 28-10-2013", 
-    "state": "below_horizon"
-}
-```
-
-**/api/events/&lt;event_type>** - POST<br>
-Fires an event with event_type<br>
-optional parameter: event_data - JSON encoded object
-
-```json
-{
-    "message": "Event download_file fired."
-}
-```
-
-**/api/services/&lt;domain>/&lt;service>** - POST<br>
-Calls a service within a specific domain.<br>
-optional parameter: service_data - JSON encoded object
-
-```json
-{
-    "message": "Service keyboard/volume_up called."
-}
-```
-
-Android remote control
----------------------
-
-An app has been built using [Tasker for Android](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm) that:
-
- * Provides buttons to control the lights and the chromecast
- * Reports the charging state and battery level of the phone
-
-The [APK](https://raw.github.com/balloob/home-assistant/master/android-tasker/Home_Assistant.apk) and [Tasker project XML](https://raw.github.com/balloob/home-assistant/master/android-tasker/Home_Assistant.prj.xml) can be found in [/android-tasker/](https://github.com/balloob/home-assistant/tree/master/android-tasker)
-
-![screenshot-android-tasker.jpg](https://raw.github.com/balloob/home-assistant/master/docs/screenshot-android-tasker.png)
-
-Architecture
------------
-The core of Home Assistant exists of two parts; a Bus for calling services and firing events and a State Machine that keeps track of the state of things.
-
-![screenshot-android-tasker.jpg](https://raw.github.com/balloob/home-assistant/master/docs/architecture.png)
-
-For example to control the lights there are two components. One is the device_tracker that polls the wireless router for connected devices and updates the state of the tracked devices in the State Machine to be either 'Home' or 'Not Home'.
-
-When a state is changed a state_changed event is fired for which the device_sun_light_trigger component is listening. Based on the new state of the device combined with the state of the sun it will decide if it should turn the lights on or off:
-
-    In the event that the state of device 'Paulus Nexus 5' changes to the 'Home' state:
-      If the sun has set and the lights are not on:
-        Turn on the lights
-    
-    In the event that the combined state of all tracked devices changes to 'Not Home':
-      If the lights are on:
-        Turn off the lights
-        
-    In the event of the sun setting:
-      If the lights are off and the combined state of all tracked device equals 'Home':
-        Turn on the lights
-
-By using the Bus as a central communication hub between components it is easy to replace components or add functionality. For example if you would want to change the way devices are detected you only have to write a component that updates the device states in the State Machine.
-
-### Components
-
-**sun**
-Tracks the state of the sun and when the next sun rising and setting will occur.
-Depends on: latitude and longitude
-Action: maintains state of `weather.sun` including attributes `next_rising` and `next_setting`
-
-**device_tracker**
-Keeps track of which devices are currently home.
-Action: sets the state per device and maintains a combined state called `all_devices`. Keeps track of known devices in the file `known_devices.csv`. 
-
-**Light**
-Keeps track which lights are turned on and can control the lights.
-
-**WeMo**
-Keeps track which WeMo switches are in the network and allows you to control them.
-
-**device_sun_light_trigger**
-Turns lights on or off using a light control component based on state of the sun and devices that are home.
-Depends on: light control, track_sun, DeviceTracker
-Action: 
- * Turns lights off when all devices leave home. 
- * Turns lights on when a device is home while sun is setting. 
- * Turns lights on when a device gets home after sun set.
-
-Registers services `light_control/turn_light_on` and `light_control/turn_light_off` to turn a or all lights on or off.
-
-Optional service data:
-  - `light_id` - only act on specific light. Else targets all.
-  - `transition_seconds` - seconds to take to swithc to new state.
-
-**chromecast**
-Registers three services to start playing YouTube video's on the ChromeCast.
-
-Service `chromecast/play_youtube_video` starts playing the specified video on the YouTube app on the ChromeCast. Specify video using `video` in service_data.
-
-Service `chromecast/start_fireplace` will start a YouTube movie simulating a fireplace and the `chromecast/start_epic_sax` service will start playing Epic Sax Guy 10h version.
-
-**media_buttons**
-Registers services that will simulate key presses on the keyboard. It currently offers the following Buttons as a Service (BaaS): `keyboard/volume_up`, `keyboard/volume_down` and `keyboard/media_play_pause`
-This actor depends on: PyUserInput
-
-**downloader**
-Registers service `downloader/download_file` that will download files. File to download is specified in the `url` field in the service data.
-
-**browser**
-Registers service `browser/browse_url` that opens `url` as specified in event_data in the system default browser.
--- a/README.rst
+++ b/README.rst
@@ -0,0 +1,98 @@
+Home Assistant |Build Status| |Coverage Status| |Join the chat at https://gitter.im/balloob/home-assistant|
+===========================================================================================================
+
+Home Assistant is a home automation platform running on Python 3. The
+goal of Home Assistant is to be able to track and control all devices at
+home and offer a platform for automating control.
+
+To get started:
+
+.. code:: bash
+
+    python3 -m pip install homeassistant
+    hass --open-ui
+
+Check out `the website <https://home-assistant.io>`__ for `a
+demo <https://home-assistant.io/demo/>`__, installation instructions,
+tutorials and documentation.
+
+|screenshot-states|
+
+Examples of devices it can interface it:
+
+-  Monitoring connected devices to a wireless router:
+   `OpenWrt <https://openwrt.org/>`__,
+   `Tomato <http://www.polarcloud.com/tomato>`__,
+   `Netgear <http://netgear.com>`__,
+   `DD-WRT <http://www.dd-wrt.com/site/index>`__,
+   `TPLink <http://www.tp-link.us/>`__,
+   `ASUSWRT <http://event.asus.com/2013/nw/ASUSWRT/>`__ and any SNMP
+   capable Linksys WAP/WRT
+-  `Philips Hue <http://meethue.com>`__ lights,
+   `WeMo <http://www.belkin.com/us/Products/home-automation/c/wemo-home-automation/>`__
+   switches, `Edimax <http://www.edimax.com/>`__ switches,
+   `Efergy <https://efergy.com>`__ energy monitoring, and
+   `Tellstick <http://www.telldus.se/products/tellstick>`__ devices and
+   sensors
+-  `Google
+   Chromecasts <http://www.google.com/intl/en/chrome/devices/chromecast>`__,
+   `Music Player Daemon <http://www.musicpd.org/>`__, `Logitech
+   Squeezebox <https://en.wikipedia.org/wiki/Squeezebox_%28network_music_player%29>`__,
+   `Plex <https://plex.tv/>`__, `Kodi (XBMC) <http://kodi.tv/>`__,
+   iTunes (by way of
+   `itunes-api <https://github.com/maddox/itunes-api>`__), and Amazon
+   Fire TV (by way of
+   `python-firetv <https://github.com/happyleavesaoc/python-firetv>`__)
+-  Support for
+   `ISY994 <https://www.universal-devices.com/residential/isy994i-series/>`__
+   (Insteon and X10 devices), `Z-Wave <http://www.z-wave.com/>`__, `Nest
+   Thermostats <https://nest.com/>`__,
+   `RFXtrx <http://www.rfxcom.com/>`__,
+   `Arduino <https://www.arduino.cc/>`__, `Raspberry
+   Pi <https://www.raspberrypi.org/>`__, and
+   `Modbus <http://www.modbus.org/>`__
+-  Interaction with `IFTTT <https://ifttt.com/>`__
+-  Integrate data from the `Bitcoin <https://bitcoin.org>`__ network,
+   meteorological data from
+   `OpenWeatherMap <http://openweathermap.org/>`__ and
+   `Forecast.io <https://forecast.io/>`__,
+   `Transmission <http://www.transmissionbt.com/>`__, or
+   `SABnzbd <http://sabnzbd.org>`__.
+-  `See full list of supported
+   devices <https://home-assistant.io/components/>`__
+
+Built home automation on top of your devices:
+
+-  Keep a precise history of every change to the state of your house
+-  Turn on the lights when people get home after sun set
+-  Turn on lights slowly during sun set to compensate for less light
+-  Turn off all lights and devices when everybody leaves the house
+-  Offers a `REST API <https://home-assistant.io/developers/api/>`__
+   and can interface with MQTT for easy integration with other projects
+   like `OwnTracks <http://owntracks.org/>`__
+-  Allow sending notifications using
+   `Instapush <https://instapush.im>`__, `Notify My Android
+   (NMA) <http://www.notifymyandroid.com/>`__,
+   `PushBullet <https://www.pushbullet.com/>`__,
+   `PushOver <https://pushover.net/>`__, `Slack <https://slack.com/>`__,
+   `Telegram <https://telegram.org/>`__, and `Jabber
+   (XMPP) <http://xmpp.org>`__
+
+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>`__
+and the `section on creating your own
+components <https://home-assistant.io/developers/creating_components.html>`__.
+
+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
+   :target: https://home-assistant.io/demo/
--- a/android-tasker/Home_Assistant.apk
+++ b/android-tasker/Home_Assistant.apk
--- a/android-tasker/Home_Assistant.prj.xml
+++ b/android-tasker/Home_Assistant.prj.xml
@@ -1,871 +0,0 @@
-<TaskerData sr="" dvi="1" tv="4.2u3m">
-	<dmetric>1080.0,1776.0</dmetric>
-	<Profile sr="prof25" ve="2">
-		<cdate>1380613730755</cdate>
-		<clp>true</clp>
-		<edate>1382769497429</edate>
-		<id>25</id>
-		<mid0>23</mid0>
-		<mid1>20</mid1>
-		<nme>HA Power USB</nme>
-		<pri>10</pri>
-		<State sr="con0">
-			<code>10</code>
-			<Int sr="arg0" val="2"/>
-		</State>
-	</Profile>
-	<Profile sr="prof26" ve="2">
-		<cdate>1380613730755</cdate>
-		<clp>true</clp>
-		<edate>1383003483161</edate>
-		<id>26</id>
-		<mid0>22</mid0>
-		<mid1>20</mid1>
-		<nme>HA Power Wireless</nme>
-		<pri>10</pri>
-		<State sr="con0">
-			<code>10</code>
-			<Int sr="arg0" val="3"/>
-		</State>
-	</Profile>
-	<Profile sr="prof3" ve="2">
-		<cdate>1380613730755</cdate>
-		<clp>true</clp>
-		<edate>1383003498566</edate>
-		<id>3</id>
-		<mid0>10</mid0>
-		<mid1>20</mid1>
-		<nme>HA Power AC</nme>
-		<pri>10</pri>
-		<State sr="con0">
-			<code>10</code>
-			<Int sr="arg0" val="1"/>
-		</State>
-	</Profile>
-	<Profile sr="prof5" ve="2">
-		<cdate>1380496514959</cdate>
-		<cldm>1500</cldm>
-		<clp>true</clp>
-		<edate>1382769618501</edate>
-		<id>5</id>
-		<mid0>19</mid0>
-		<nme>HA Battery Changed</nme>
-		<Event sr="con0" ve="2">
-			<code>203</code>
-			<pri>0</pri>
-		</Event>
-	</Profile>
-	<Project sr="proj0">
-		<cdate>1381110247781</cdate>
-		<name>Home Assistant</name>
-		<pids>3,25,26,5</pids>
-		<scenes>Variable Query,Home Assistant Start</scenes>
-		<tids>20,19,9,24,4,8,22,10,30,31,16,6,15,35,13,23,14,11,12,7,28,32,29</tids>
-		<Kid sr="Kid">
-			<launchID>12</launchID>
-			<pkg>nl.paulus.homeassistant</pkg>
-			<vnme>1.2</vnme>
-			<vnum>16</vnum>
-		</Kid>
-		<Img sr="icon" ve="2">
-			<nme>cust_animal_penguin</nme>
-		</Img>
-	</Project>
-	<Scene sr="sceneHome Assistant Start">
-		<cdate>1381113309678</cdate>
-		<edate>1381162068611</edate>
-		<heightLand>-1</heightLand>
-		<heightPort>688</heightPort>
-		<nme>Home Assistant Start</nme>
-		<widthLand>-1</widthLand>
-		<widthPort>523</widthPort>
-		<TextElement sr="elements0" ve="2">
-			<flags>4</flags>
-			<geom>0,17,523,107,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">TextTitle</Str>
-			<Str sr="arg1" ve="3">Home Assistant</Str>
-			<Int sr="arg2" val="33"/>
-			<Int sr="arg3" val="100"/>
-			<Str sr="arg4" ve="3">#FFFFFFFF</Str>
-			<Int sr="arg5" val="0"/>
-			<Int sr="arg6" val="0"/>
-			<Int sr="arg7" val="0"/>
-		</TextElement>
-		<ListElement sr="elements1">
-			<flags>4</flags>
-			<geom>23,136,477,514,-1,-1,-1,-1</geom>
-			<itemclickTask>13</itemclickTask>
-			<Str sr="arg0" ve="3">Menu1</Str>
-			<Int sr="arg1" val="0"/>
-			<Str sr="arg2" ve="3"/>
-			<Int sr="arg3" val="0"/>
-			<Scene sr="arg4">
-				<Scene sr="val">
-					<cdate>1381113396824</cdate>
-					<edate>1381113396824</edate>
-					<heightLand>-1</heightLand>
-					<heightPort>100</heightPort>
-					<nme>Builtin Item Layout</nme>
-					<widthLand>-1</widthLand>
-					<widthPort>440</widthPort>
-					<ImageElement sr="elements0">
-						<flags>5</flags>
-						<geom>340,10,90,80,-1,-1,-1,-1</geom>
-						<Str sr="arg0" ve="3">Icon</Str>
-						<Img sr="arg1" ve="2">
-							<nme>hd_aaa_ext_tiles_small</nme>
-						</Img>
-						<Int sr="arg2" val="255"/>
-					</ImageElement>
-					<TextElement sr="elements1" ve="2">
-						<flags>5</flags>
-						<geom>60,10,270,80,-1,-1,-1,-1</geom>
-						<Str sr="arg0" ve="3">Label</Str>
-						<Str sr="arg1" ve="3"/>
-						<Int sr="arg2" val="18"/>
-						<Int sr="arg3"/>
-						<Str sr="arg4" ve="3">#FFFFFFFF</Str>
-						<Int sr="arg5" val="3"/>
-						<Int sr="arg6"/>
-						<Int sr="arg7"/>
-					</TextElement>
-					<TextElement sr="elements2" ve="2">
-						<flags>1</flags>
-						<geom>10,10,40,80,-1,-1,-1,-1</geom>
-						<Str sr="arg0" ve="3">Index</Str>
-						<Str sr="arg1" ve="3">1.</Str>
-						<Int sr="arg2" val="18"/>
-						<Int sr="arg3"/>
-						<Str sr="arg4" ve="3">#FFFFFFFF</Str>
-						<Int sr="arg5" val="3"/>
-						<Int sr="arg6"/>
-						<Int sr="arg7"/>
-					</TextElement>
-					<PropertiesElement sr="props">
-						<Int sr="arg0" val="1"/>
-						<Int sr="arg1" val="0"/>
-						<Str sr="arg2" ve="3">#00000000</Str>
-						<Int sr="arg3" val="0"/>
-						<Str sr="arg4" ve="3">Builtin Item Layout</Str>
-						<Str sr="arg5" ve="3"/>
-						<Img sr="arg6" ve="2"/>
-						<Str sr="arg7" ve="3"/>
-					</PropertiesElement>
-				</Scene>
-			</Scene>
-			<Int sr="arg5" val="1"/>
-			<Int sr="arg6" val="1"/>
-			<RectElement sr="background">
-				<flags>4</flags>
-				<geom>-1,-1,-1,-1,-1,-1,-1,-1</geom>
-				<Str sr="arg0" ve="3"/>
-				<Int sr="arg1" val="0"/>
-				<Str sr="arg2" ve="3">#77333333</Str>
-				<Str sr="arg3" ve="3">#77333333</Str>
-				<Int sr="arg4" val="0"/>
-				<Str sr="arg5" ve="3">#FF000000</Str>
-				<Int sr="arg6" val="0"/>
-				<Int sr="arg7" val="0"/>
-			</RectElement>
-			<ListElementItem sr="item0">
-				<label>Light On</label>
-				<Action sr="action" ve="3">
-					<code>130</code>
-					<Str sr="arg0" ve="3">Light On</Str>
-					<Int sr="arg1" val="0"/>
-					<Int sr="arg2" val="5"/>
-					<Str sr="arg3" ve="3"/>
-					<Str sr="arg4" ve="3"/>
-					<Str sr="arg5" ve="3"/>
-				</Action>
-				<Img sr="icon" ve="2">
-					<nme>hd_aaa_ext_sun</nme>
-				</Img>
-			</ListElementItem>
-			<ListElementItem sr="item1">
-				<label>Light Off</label>
-				<Action sr="action" ve="3">
-					<code>130</code>
-					<Str sr="arg0" ve="3">Light Off</Str>
-					<Int sr="arg1" val="0"/>
-					<Int sr="arg2" val="5"/>
-					<Str sr="arg3" ve="3"/>
-					<Str sr="arg4" ve="3"/>
-					<Str sr="arg5" ve="3"/>
-				</Action>
-				<Img sr="icon" ve="2">
-					<nme>hd_device_access_bightness_low</nme>
-				</Img>
-			</ListElementItem>
-			<ListElementItem sr="item2">
-				<label>Start Fireplace</label>
-				<Action sr="action" ve="3">
-					<code>130</code>
-					<Str sr="arg0" ve="3">Start Fireplace</Str>
-					<Int sr="arg1" val="0"/>
-					<Int sr="arg2" val="5"/>
-					<Str sr="arg3" ve="3"/>
-					<Str sr="arg4" ve="3"/>
-					<Str sr="arg5" ve="3"/>
-				</Action>
-				<Img sr="icon" ve="2">
-					<nme>hd_aaa_ext_coffee</nme>
-				</Img>
-			</ListElementItem>
-			<ListElementItem sr="item3">
-				<label>Start Epic Sax</label>
-				<Action sr="action" ve="3">
-					<code>130</code>
-					<Str sr="arg0" ve="3">Start Epic Sax</Str>
-					<Int sr="arg1" val="0"/>
-					<Int sr="arg2" val="5"/>
-					<Str sr="arg3" ve="3"/>
-					<Str sr="arg4" ve="3"/>
-					<Str sr="arg5" ve="3"/>
-				</Action>
-				<Img sr="icon" ve="2">
-					<nme>hd_aaa_ext_guitar</nme>
-				</Img>
-			</ListElementItem>
-			<ListElementItem sr="item4">
-				<label>Settings</label>
-				<Action sr="action" ve="3">
-					<code>130</code>
-					<Str sr="arg0" ve="3">Setup</Str>
-					<Int sr="arg1" val="0"/>
-					<Int sr="arg2" val="5"/>
-					<Str sr="arg3" ve="3"/>
-					<Str sr="arg4" ve="3"/>
-					<Str sr="arg5" ve="3"/>
-				</Action>
-				<Img sr="icon" ve="2">
-					<nme>hd_action_settings</nme>
-				</Img>
-			</ListElementItem>
-		</ListElement>
-		<PropertiesElement sr="props">
-			<Int sr="arg0" val="1"/>
-			<Int sr="arg1" val="0"/>
-			<Str sr="arg2" ve="3">#DA000000</Str>
-			<Int sr="arg3" val="0"/>
-			<Str sr="arg4" ve="3">Home Assistant Start</Str>
-			<Str sr="arg5" ve="3"/>
-			<Img sr="arg6" ve="2"/>
-			<Str sr="arg7" ve="3"/>
-		</PropertiesElement>
-	</Scene>
-	<Scene sr="sceneVariable Query">
-		<cdate>1381112175910</cdate>
-		<edate>1381112254701</edate>
-		<heightLand>-1</heightLand>
-		<heightPort>380</heightPort>
-		<nme>Variable Query</nme>
-		<widthLand>-1</widthLand>
-		<widthPort>440</widthPort>
-		<TextElement sr="elements0" ve="2">
-			<flags>4</flags>
-			<geom>8,0,432,96,8,0,432,96</geom>
-			<Str sr="arg0" ve="3">Title</Str>
-			<Str sr="arg1" ve="3">Title</Str>
-			<Int sr="arg2" val="32"/>
-			<Int sr="arg3"/>
-			<Str sr="arg4" ve="3">#FF0099CC</Str>
-			<Int sr="arg5" val="3"/>
-			<Int sr="arg6"/>
-			<Int sr="arg7"/>
-		</TextElement>
-		<RectElement sr="elements1">
-			<flags>5</flags>
-			<geom>0,96,440,4,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">Header</Str>
-			<Int sr="arg1" val="0"/>
-			<Str sr="arg2" ve="3">#77333333</Str>
-			<Str sr="arg3" ve="3">#77333333</Str>
-			<Int sr="arg4" val="0"/>
-			<Str sr="arg5" ve="3">#FF000000</Str>
-			<Int sr="arg6" val="0"/>
-			<Int sr="arg7" val="0"/>
-		</RectElement>
-		<EditTextElement sr="elements2">
-			<flags>13</flags>
-			<geom>20,156,400,96,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">TextEdit1</Str>
-			<Str sr="arg1" ve="3"/>
-			<Int sr="arg2" val="16"/>
-			<Int sr="arg3" val="100"/>
-			<Str sr="arg4" ve="3">#FFFFFFFF</Str>
-			<Int sr="arg5" val="0"/>
-			<Int sr="arg6" val="0"/>
-			<Int sr="arg7" val="1000"/>
-		</EditTextElement>
-		<RectElement sr="elements3">
-			<flags>5</flags>
-			<geom>0,300,440,4,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">Footer</Str>
-			<Int sr="arg1" val="0"/>
-			<Str sr="arg2" ve="3">#77333333</Str>
-			<Str sr="arg3" ve="3">#77333333</Str>
-			<Int sr="arg4" val="0"/>
-			<Str sr="arg5" ve="3">#FF000000</Str>
-			<Int sr="arg6" val="0"/>
-			<Int sr="arg7" val="0"/>
-		</RectElement>
-		<ImageElement sr="elements4">
-			<clickTask>-936</clickTask>
-			<flags>4</flags>
-			<geom>70,300,80,80,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">Accept</Str>
-			<Img sr="arg1" ve="2">
-				<nme>hd_navigation_accept</nme>
-			</Img>
-			<Int sr="arg2" val="255"/>
-		</ImageElement>
-		<ImageElement sr="elements5">
-			<clickTask>-936</clickTask>
-			<flags>4</flags>
-			<geom>290,300,80,80,-1,-1,-1,-1</geom>
-			<Str sr="arg0" ve="3">Cancel</Str>
-			<Img sr="arg1" ve="2">
-				<nme>hd_content_remove</nme>
-			</Img>
-			<Int sr="arg2" val="255"/>
-		</ImageElement>
-		<PropertiesElement sr="props">
-			<Int sr="arg0" val="1"/>
-			<Int sr="arg1" val="0"/>
-			<Str sr="arg2" ve="3">#FF000000</Str>
-			<Int sr="arg3" val="0"/>
-			<Str sr="arg4" ve="3">Variable Query</Str>
-			<Str sr="arg5" ve="3"/>
-			<Img sr="arg6" ve="2"/>
-			<Str sr="arg7" ve="3"/>
-		</PropertiesElement>
-	</Scene>
-	<Task sr="task10">
-		<cdate>1380613530339</cdate>
-		<edate>1383030846230</edate>
-		<id>10</id>
-		<nme>Charging AC</nme>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">_Update Charging</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">ac</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task11">
-		<cdate>1381110672417</cdate>
-		<edate>1384035370683</edate>
-		<id>11</id>
-		<nme>Open Debug Interface</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>104</code>
-			<Str sr="arg0" ve="3">http://%HA_HOST:%HA_PORT/?api_password=%HA_API_PASSWORD</Str>
-		</Action>
-	</Task>
-	<Task sr="task12">
-		<cdate>1381113015963</cdate>
-		<edate>1384219718372</edate>
-		<id>12</id>
-		<nme>Start Screen</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>47</code>
-			<Str sr="arg0" ve="3">Home Assistant Start</Str>
-			<Int sr="arg1" val="5"/>
-			<Int sr="arg2" val="100"/>
-			<Int sr="arg3" val="100"/>
-			<Int sr="arg4" val="1"/>
-			<Int sr="arg5" val="0"/>
-			<Int sr="arg6" val="0"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>49</code>
-			<Str sr="arg0" ve="3">Home Assistant Start</Str>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>cust_animal_penguin</nme>
-		</Img>
-	</Task>
-	<Task sr="task13">
-		<cdate>1381114398467</cdate>
-		<edate>1381114398467</edate>
-		<id>13</id>
-		<pri>11</pri>
-		<Action sr="act0" ve="3">
-			<code>49</code>
-			<lhs>%tap_label</lhs>
-			<op>2</op>
-			<rhs>Settings</rhs>
-			<Str sr="arg0" ve="3">Home Assistant Start</Str>
-		</Action>
-	</Task>
-	<Task sr="task14">
-		<cdate>1381114829583</cdate>
-		<edate>1385537340259</edate>
-		<id>14</id>
-		<nme>API Fire Event</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>116</code>
-			<Str sr="arg0" ve="3">%HA_HOST:%HA_PORT</Str>
-			<Str sr="arg1" ve="3">/api/events/%par1</Str>
-			<Str sr="arg2" ve="3">api_password=%HA_API_PASSWORD</Str>
-			<Str sr="arg3" ve="3"/>
-			<Int sr="arg4" val="10"/>
-			<Str sr="arg5" ve="3"/>
-			<Str sr="arg6" ve="3"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>548</code>
-			<Str sr="arg0" ve="3">Fired event %par1</Str>
-			<Int sr="arg1" val="0"/>
-		</Action>
-	</Task>
-	<Task sr="task15">
-		<cdate>1380262442154</cdate>
-		<edate>1386787405570</edate>
-		<id>15</id>
-		<nme>Light On</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">light/turn_on</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hd_aaa_ext_sun</nme>
-		</Img>
-	</Task>
-	<Task sr="task16">
-		<cdate>1380262442154</cdate>
-		<edate>1385172575157</edate>
-		<id>16</id>
-		<nme>Start Epic Sax</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">chromecast/start_epic_sax</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hd_aaa_ext_guitar</nme>
-		</Img>
-	</Task>
-	<Task sr="task19">
-		<cdate>1380262442154</cdate>
-		<edate>1386695312804</edate>
-		<id>19</id>
-		<nme>Update Battery</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>547</code>
-			<label>Make sure charging var exist</label>
-			<lhs>%HA_CHARGING</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">%HA_CHARGING</Str>
-			<Str sr="arg1" ve="3">none</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>116</code>
-			<Str sr="arg0" ve="3">%HA_HOST:%HA_PORT</Str>
-			<Str sr="arg1" ve="3">/api/states/devices.%HA_DEVICE_NAME.charging</Str>
-			<Str sr="arg2" ve="3">api_password=%HA_API_PASSWORD
-new_state=%HA_CHARGING
-attributes={"battery":%BATT}</Str>
-			<Str sr="arg3" ve="3"/>
-			<Int sr="arg4" val="10"/>
-			<Str sr="arg5" ve="3"/>
-			<Str sr="arg6" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task20">
-		<cdate>1380613530339</cdate>
-		<edate>1386695398714</edate>
-		<id>20</id>
-		<nme>Charging None</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">_Update Charging</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">none</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task22">
-		<cdate>1380613530339</cdate>
-		<edate>1383030909347</edate>
-		<id>22</id>
-		<nme>Charging Wireless</nme>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">_Update Charging</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">wireless</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task23">
-		<cdate>1380613530339</cdate>
-		<edate>1383030849758</edate>
-		<id>23</id>
-		<nme>Charging USB</nme>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">_Update Charging</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">usb</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task24">
-		<cdate>1381114829583</cdate>
-		<edate>1385537314797</edate>
-		<id>24</id>
-		<nme>API Call Service</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>116</code>
-			<Str sr="arg0" ve="3">%HA_HOST:%HA_PORT</Str>
-			<Str sr="arg1" ve="3">/api/services/%par1</Str>
-			<Str sr="arg2" ve="3">api_password=%HA_API_PASSWORD</Str>
-			<Str sr="arg3" ve="3"/>
-			<Int sr="arg4" val="10"/>
-			<Str sr="arg5" ve="3"/>
-			<Str sr="arg6" ve="3"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>548</code>
-			<Str sr="arg0" ve="3">Called service %par1</Str>
-			<Int sr="arg1" val="0"/>
-		</Action>
-	</Task>
-	<Task sr="task28">
-		<cdate>1384035383644</cdate>
-		<edate>1385172806993</edate>
-		<id>28</id>
-		<nme>Volume Down</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/volume_down</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_images_rotate_left</nme>
-		</Img>
-	</Task>
-	<Task sr="task29">
-		<cdate>1384035383644</cdate>
-		<edate>1385172552470</edate>
-		<id>29</id>
-		<nme>Play Pause</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/media_play_pause</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_av_pause</nme>
-		</Img>
-	</Task>
-	<Task sr="task30">
-		<cdate>1384035383644</cdate>
-		<edate>1385172803463</edate>
-		<id>30</id>
-		<nme>Volume Mute Toggle</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/volume_mute</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_device_access_volume_muted</nme>
-		</Img>
-	</Task>
-	<Task sr="task31">
-		<cdate>1384035383644</cdate>
-		<edate>1385172559562</edate>
-		<id>31</id>
-		<nme>Next Track</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/media_next_track</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_av_next</nme>
-		</Img>
-	</Task>
-	<Task sr="task32">
-		<cdate>1384035383644</cdate>
-		<edate>1385172567948</edate>
-		<id>32</id>
-		<nme>Prev Track</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/media_prev_track</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_av_previous</nme>
-		</Img>
-	</Task>
-	<Task sr="task35">
-		<cdate>1381114829583</cdate>
-		<edate>1385537324133</edate>
-		<id>35</id>
-		<nme>API Call Service With Data</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>116</code>
-			<Str sr="arg0" ve="3">%HA_HOST:%HA_PORT</Str>
-			<Str sr="arg1" ve="3">/api/services/%par1</Str>
-			<Str sr="arg2" ve="3">api_password=%HA_API_PASSWORD
-service_data=%par2</Str>
-			<Str sr="arg3" ve="3"/>
-			<Int sr="arg4" val="10"/>
-			<Str sr="arg5" ve="3"/>
-			<Str sr="arg6" ve="3"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>548</code>
-			<Str sr="arg0" ve="3">Called service %par1</Str>
-			<Int sr="arg1" val="0"/>
-		</Action>
-	</Task>
-	<Task sr="task4">
-		<cdate>1380262442154</cdate>
-		<edate>1386787393520</edate>
-		<id>4</id>
-		<nme>Light Off</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">light/turn_off</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_device_access_bightness_low</nme>
-		</Img>
-	</Task>
-	<Task sr="task6">
-		<cdate>1380522560890</cdate>
-		<edate>1383958813434</edate>
-		<id>6</id>
-		<nme>Setup</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>118</code>
-			<lhs>%HA_HOST</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">icanhazip.com</Str>
-			<Str sr="arg1" ve="3"/>
-			<Str sr="arg2" ve="3"/>
-			<Str sr="arg3" ve="3"/>
-			<Int sr="arg4" val="10"/>
-			<Str sr="arg5" ve="3"/>
-			<Str sr="arg6" ve="3">%HA_HOST</Str>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>547</code>
-			<lhs>%HA_HOST</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">%HA_HOST</Str>
-			<Str sr="arg1" ve="3">%HTTPD</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act2" ve="3">
-			<code>547</code>
-			<lhs>%HA_PORT</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">%HA_PORT</Str>
-			<Str sr="arg1" ve="3">8123</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act3" ve="3">
-			<code>547</code>
-			<lhs>%HA_API_PASSWORD</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">%HA_API_PASSWORD</Str>
-			<Str sr="arg1" ve="3">My password</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act4" ve="3">
-			<code>547</code>
-			<lhs>%HA_DEVICE_NAME</lhs>
-			<op>10</op>
-			<rhs></rhs>
-			<Str sr="arg0" ve="3">%HA_DEVICE_NAME</Str>
-			<Str sr="arg1" ve="3">%DEVMOD</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act5" ve="3">
-			<code>595</code>
-			<Str sr="arg0" ve="3">Host</Str>
-			<Str sr="arg1" ve="3">%HA_HOST</Str>
-			<Int sr="arg2" val="0"/>
-			<Str sr="arg3" ve="3">%HA_HOST</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3">Variable Query</Str>
-			<Int sr="arg6" val="40"/>
-			<Int sr="arg7" val="1"/>
-		</Action>
-		<Action sr="act6" ve="3">
-			<code>595</code>
-			<Str sr="arg0" ve="3">Port</Str>
-			<Str sr="arg1" ve="3">%HA_PORT</Str>
-			<Int sr="arg2" val="4"/>
-			<Str sr="arg3" ve="3">%HA_PORT</Str>
-			<Str sr="arg4" ve="3">%HA_PORT</Str>
-			<Str sr="arg5" ve="3">Variable Query</Str>
-			<Int sr="arg6" val="40"/>
-			<Int sr="arg7" val="1"/>
-		</Action>
-		<Action sr="act7" ve="3">
-			<code>595</code>
-			<Str sr="arg0" ve="3">API Password</Str>
-			<Str sr="arg1" ve="3">%HA_API_PASSWORD</Str>
-			<Int sr="arg2" val="0"/>
-			<Str sr="arg3" ve="3">%HA_API_PASSWORD</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3">Variable Query</Str>
-			<Int sr="arg6" val="40"/>
-			<Int sr="arg7" val="1"/>
-		</Action>
-		<Action sr="act8" ve="3">
-			<code>595</code>
-			<label>Ask device name</label>
-			<Str sr="arg0" ve="3">Device name</Str>
-			<Str sr="arg1" ve="3">%HA_DEVICE_NAME</Str>
-			<Int sr="arg2" val="0"/>
-			<Str sr="arg3" ve="3">%HA_DEVICE_NAME</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3">Variable Query</Str>
-			<Int sr="arg6" val="40"/>
-			<Int sr="arg7" val="1"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hd_ab_action_settings</nme>
-		</Img>
-	</Task>
-	<Task sr="task7">
-		<cdate>1384035383644</cdate>
-		<edate>1386787431769</edate>
-		<id>7</id>
-		<nme>Volume Up</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">keyboard/volume_up</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hl_images_rotate_right</nme>
-		</Img>
-	</Task>
-	<Task sr="task8">
-		<cdate>1380262442154</cdate>
-		<edate>1386695263222</edate>
-		<id>8</id>
-		<nme>_Update Charging</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>547</code>
-			<Str sr="arg0" ve="3">%HA_CHARGING</Str>
-			<Str sr="arg1" ve="3">%par1</Str>
-			<Int sr="arg2" val="0"/>
-			<Int sr="arg3" val="0"/>
-		</Action>
-		<Action sr="act1" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">Update Battery</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3"/>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-	</Task>
-	<Task sr="task9">
-		<cdate>1380262442154</cdate>
-		<edate>1386787379497</edate>
-		<id>9</id>
-		<nme>Start Fireplace</nme>
-		<pri>10</pri>
-		<Action sr="act0" ve="3">
-			<code>130</code>
-			<Str sr="arg0" ve="3">API Call Service</Str>
-			<Int sr="arg1" val="0"/>
-			<Int sr="arg2" val="5"/>
-			<Str sr="arg3" ve="3">chromecast/start_fireplace</Str>
-			<Str sr="arg4" ve="3"/>
-			<Str sr="arg5" ve="3"/>
-		</Action>
-		<Img sr="icn" ve="2">
-			<nme>hd_aaa_ext_coffee</nme>
-		</Img>
-	</Task>
-</TaskerData>
--- a/config/configuration.yaml.example
+++ b/config/configuration.yaml.example
@@ -0,0 +1,200 @@
+homeassistant:
+  # Omitted values in this section will be auto detected using freegeoip.net
+
+  # 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.
+  latitude: 32.87336
+  longitude: 117.22743
+
+  # C for Celcius, F for Fahrenheit
+  temperature_unit: C
+
+  # Pick yours from here:
+  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  time_zone: America/Los_Angeles
+
+  # Name of the location where Home Assistant is running
+  name: Home
+
+http:
+  api_password: mypass
+  # Set to 1 to enable development mode
+  # development: 1
+
+light:
+#  platform: hue
+
+wink:
+  # Get your token at https://winkbearertoken.appspot.com
+  access_token: 'YOUR_TOKEN'
+
+device_tracker:
+  # The following types are available: ddwrt, netgear, tomato, luci,
+  # and nmap_tracker
+  platform: netgear
+  host: 192.168.1.1
+  username: admin
+  password: PASSWORD
+  # http_id is needed for Tomato routers only
+  # http_id: ABCDEFGHH
+  # For nmap_tracker, only the IP addresses to scan are needed:
+  # hosts: 192.168.1.1/24 # netmask prefix notation or
+  # hosts: 192.168.1.1-255 # address range
+
+chromecast:
+
+switch:
+  platform: wemo
+
+thermostat:
+  platform: nest
+  # Required: username and password that are used to login to the Nest thermostat.
+  username: myemail@mydomain.com
+  password: mypassword
+
+downloader:
+  download_dir: downloads
+
+notify:
+  platform: pushbullet
+  api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
+
+device_sun_light_trigger:
+  # Optional: specify a specific light/group of lights that has to be turned on
+  light_group: group.living_room
+  # Optional: specify which light profile to use when turning lights on
+  light_profile: relax
+  # Optional: disable lights being turned off when everybody leaves the house
+  # disable_turn_off: 1
+
+# A comma separated list of states that have to be tracked as a single group
+# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
+# You can also have groups within groups.
+group:
+  Home:
+    - group.living_room
+    - group.kitchen
+  living_room:
+    - light.Bowl
+    - light.Ceiling
+    - light.TV_back_light
+  kitchen:
+    - light.fan_bulb_1
+    - light.fan_bulb_2
+  children:
+   - device_tracker.child_1
+   - device_tracker.child_2
+
+process:
+  # items are which processes to look for: <entity_id>: <search string within ps>
+  xbmc: XBMC.App
+
+example:
+
+simple_alarm:
+  # Which light/light group has to flash when a known device comes home
+  known_light: light.Bowl
+  # Which light/light group has to flash red when light turns on while no one home
+  unknown_light: group.living_room
+
+browser:
+
+keyboard:
+
+automation:
+- alias: 'Rule 1 Light on in the evening'
+  trigger:
+    - platform: sun
+      event: sunset
+      offset: "-01:00:00"
+    - platform: state
+      entity_id: group.all_devices
+      state: home
+  condition:
+    - platform: state
+      entity_id: group.all_devices
+      state: home
+    - platform: time
+      after: "16:00:00"
+      before: "23:00:00"
+  action:
+    service: homeassistant.turn_on
+    entity_id: group.living_room
+
+- alias: 'Rule 2 - Away Mode'
+
+  trigger:
+   - platform: state
+     entity_id: group.all_devices
+     state: 'not_home'
+
+  condition: use_trigger_values
+  action:
+     service: light.turn_off
+     entity_id: group.all_lights
+
+# Sensors need to be added into the configuration.yaml as sensor:, sensor 2:, sensor 3:, etc. 
+# Each sensor label should be unique or your sensors might not load correctly.
+
+sensor:
+  platform: systemmonitor
+  resources:
+    - type: 'disk_use_percent'
+      arg: '/'
+    - type: 'disk_use_percent'
+      arg: '/home'
+    - type: 'disk_use'
+      arg: '/home'
+    - type: 'disk_free'
+      arg: '/'
+    - type: 'memory_use_percent'
+    - type: 'memory_use'
+    - type: 'memory_free'
+    - type: 'processor_use'
+    - type: 'process'
+      arg: 'octave-cli'
+
+sensor 2:
+  platform: forecast
+  api_key: <register on Forecast.io for your PRIVATE API>
+  monitored_conditions:
+    - summary
+    - precip_type
+    - precip_intensity
+    - temperature
+    - dew_point
+    - wind_speed
+    - wind_bearing
+    - cloud_cover
+    - humidity
+    - pressure
+    - visibility
+    - ozone
+
+script:
+  # Turns on the bedroom lights and then the living room lights 1 minute later
+  wakeup:
+    alias: Wake Up
+    sequence:
+      # alias is optional
+      - alias: Bedroom lights on
+        execute_service: light.turn_on
+        service_data:
+          entity_id: group.bedroom
+      - delay:
+          # supports seconds, milliseconds, minutes, hours, etc.
+          minutes: 1
+      - alias: Living room lights on
+        execute_service: light.turn_on
+        service_data:
+          entity_id: group.living_room
+
+scene:
+  - name: Romantic
+    entities:
+      light.tv_back_light: on
+      light.ceiling:
+        state: on
+        xy_color: [0.33, 0.66]
+        brightness: 200
--- a/config/custom_components/example.py
+++ b/config/custom_components/example.py
@@ -0,0 +1,148 @@
+"""
+custom_components.example
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Example component to target an entity_id to:
+ - turn it on at 7AM in the morning
+ - turn it on if anyone comes home and it is off
+ - turn it off if all lights are turned off
+ - turn it off if all people leave the house
+ - offer a service to turn it on for 10 seconds
+
+Configuration:
+
+To use the Example custom component you will need to add the following to
+your configuration.yaml file.
+
+example:
+  target: TARGET_ENTITY
+
+Variable:
+
+target
+*Required
+TARGET_ENTITY should be one of your devices that can be turned on and off,
+ie a light or a switch. Example value could be light.Ceiling or switch.AC
+(if you have these devices with those names).
+"""
+import time
+import logging
+
+from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_ON, STATE_OFF
+from homeassistant.helpers import validate_config
+from homeassistant.helpers.event_decorators import \
+    track_state_change, track_time_change
+from homeassistant.helpers.service import service
+import homeassistant.components as core
+from homeassistant.components import device_tracker
+from homeassistant.components import light
+
+# The domain of your component. Should be equal to the name of your component
+DOMAIN = "example"
+
+# List of component names (string) your component depends upon
+# We depend on group because group will be loaded after all the components that
+# initialize devices have been setup.
+DEPENDENCIES = ['group', 'device_tracker', 'light']
+
+# Configuration key for the entity id we are targetting
+CONF_TARGET = 'target'
+
+# Variable for storing configuration parameters
+TARGET_ID = None
+
+# Name of the service that we expose
+SERVICE_FLASH = 'flash'
+
+# Shortcut for the logger
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup(hass, config):
+    """ Setup example component. """
+    global TARGET_ID
+
+    # Validate that all required config options are given
+    if not validate_config(config, {DOMAIN: [CONF_TARGET]}, _LOGGER):
+        return False
+
+    TARGET_ID = config[DOMAIN][CONF_TARGET]
+
+    # Validate that the target entity id exists
+    if hass.states.get(TARGET_ID) is None:
+        _LOGGER.error("Target entity id %s does not exist",
+                      TARGET_ID)
+
+        # Tell the bootstrapper that we failed to initialize and clear the
+        # stored target id so our functions don't run.
+        TARGET_ID = None
+        return False
+
+    # Tell the bootstrapper that we initialized successfully
+    return True
+
+
+@track_state_change(device_tracker.ENTITY_ID_ALL_DEVICES)
+def track_devices(hass, entity_id, old_state, new_state):
+    """ Called when the group.all devices change state. """
+    # If the target id is not set, return
+    if not TARGET_ID:
+        return
+
+    # If anyone comes home and the entity is not on, turn it on.
+    if new_state.state == STATE_HOME and not core.is_on(hass, TARGET_ID):
+
+        core.turn_on(hass, TARGET_ID)
+
+    # If all people leave the house and the entity is on, turn it off
+    elif new_state.state == STATE_NOT_HOME and core.is_on(hass, TARGET_ID):
+
+        core.turn_off(hass, TARGET_ID)
+
+
+@track_time_change(hour=7, minute=0, second=0)
+def wake_up(hass, now):
+    """
+    Turn it on in the morning (7 AM) if there are people home and
+    it is not already on.
+    """
+    if not TARGET_ID:
+        return
+
+    if device_tracker.is_on(hass) and not core.is_on(hass, TARGET_ID):
+        _LOGGER.info('People home at 7AM, turning it on')
+        core.turn_on(hass, TARGET_ID)
+
+
+@track_state_change(light.ENTITY_ID_ALL_LIGHTS, STATE_ON, STATE_OFF)
+def all_lights_off(hass, entity_id, old_state, new_state):
+    """ If all lights turn off, turn off. """
+    if not TARGET_ID:
+        return
+
+    if core.is_on(hass, TARGET_ID):
+        _LOGGER.info('All lights have been turned off, turning it off')
+        core.turn_off(hass, TARGET_ID)
+
+
+@service(DOMAIN, SERVICE_FLASH)
+def flash_service(hass, call):
+    """
+    Service that will turn the target off for 10 seconds if on and vice versa.
+    """
+    if not TARGET_ID:
+        return
+
+    if core.is_on(hass, TARGET_ID):
+        core.turn_off(hass, TARGET_ID)
+
+        time.sleep(10)
+
+        core.turn_on(hass, TARGET_ID)
+
+    else:
+        core.turn_on(hass, TARGET_ID)
+
+        time.sleep(10)
+
+        core.turn_off(hass, TARGET_ID)
--- a/config/custom_components/hello_world.py
+++ b/config/custom_components/hello_world.py
@@ -0,0 +1,28 @@
+"""
+custom_components.hello_world
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Implements the bare minimum that a component should implement.
+
+Configuration:
+
+To use the hello_word component you will need to add the following to your
+configuration.yaml file.
+
+hello_world:
+"""
+
+# The domain of your component. Should be equal to the name of your component
+DOMAIN = "hello_world"
+
+# List of component names (string) your component depends upon
+DEPENDENCIES = []
+
+
+def setup(hass, config):
+    """ Setup our skeleton component. """
+
+    # States are in the format DOMAIN.OBJECT_ID
+    hass.states.set('hello_world.Hello_World', 'Works!')
+
+    # return boolean to indicate that initialization was successful
+    return True
--- a/config/custom_components/mqtt_example.py
+++ b/config/custom_components/mqtt_example.py
@@ -0,0 +1,59 @@
+"""
+custom_components.mqtt_example
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Shows how to communicate with MQTT. Follows a topic on MQTT and updates the
+state of an entity to the last message received on that topic.
+
+Also offers a service 'set_state' that will publish a message on the topic that
+will be passed via MQTT to our message received listener. Call the service with
+example payload {"new_state": "some new state"}.
+
+Configuration:
+
+To use the mqtt_example component you will need to add the following to your
+configuration.yaml file.
+
+mqtt_example:
+  topic: home-assistant/mqtt_example
+
+"""
+import homeassistant.loader as loader
+
+# The domain of your component. Should be equal to the name of your component
+DOMAIN = "mqtt_example"
+
+# List of component names (string) your component depends upon
+DEPENDENCIES = ['mqtt']
+
+
+CONF_TOPIC = 'topic'
+DEFAULT_TOPIC = 'home-assistant/mqtt_example'
+
+
+def setup(hass, config):
+    """ Setup our mqtt_example component. """
+    mqtt = loader.get_component('mqtt')
+    topic = config[DOMAIN].get('topic', DEFAULT_TOPIC)
+    entity_id = 'mqtt_example.last_message'
+
+    # Listen to a message on MQTT
+
+    def message_received(topic, payload, qos):
+        """ A new MQTT message has been received. """
+        hass.states.set(entity_id, payload)
+
+    mqtt.subscribe(hass, topic, message_received)
+
+    hass.states.set(entity_id, 'No messages')
+
+    # Service to publish a message on MQTT
+
+    def set_state_service(call):
+        """ Service to send a message. """
+        mqtt.publish(hass, topic, call.data.get('new_state'))
+
+    # Register our service with Home Assistant
+    hass.services.register(DOMAIN, 'set_state', set_state_service)
+
+    # return boolean to indicate that initialization was successful
+    return True
--- a/docs/architecture.png
+++ b/docs/architecture.png
--- a/docs/screenshot-android-tasker.png
+++ b/docs/screenshot-android-tasker.png
--- a/docs/screenshot-debug-interface.png
+++ b/docs/screenshot-debug-interface.png
--- a/docs/screenshots.png
+++ b/docs/screenshots.png
--- a/docs/states.png
+++ b/docs/states.png
--- a/home-assistant.conf.default
+++ b/home-assistant.conf.default
@@ -1,39 +0,0 @@
-[common]
-latitude=32.87336
-longitude=-117.22743
-
-[httpinterface]
-api_password=mypass
-
-[light.hue]
-host=192.168.1.2
-
-[device_tracker.tomato]
-host=192.168.1.1
-username=admin
-password=PASSWORD
-http_id=aaaaaaaaaaaaaaa
-
-[device_tracker.netgear]
-host=192.168.1.1
-username=admin
-password=PASSWORD
-
-[chromecast]
-
-[wemo]
-
-[downloader]
-download_dir=downloads
-
-[device_sun_light_trigger]
-# Example how you can specify a specific group that has to be turned on
-# light_group=group.living_room
-# Example how you can specify which light profile to use when turning lights on
-# light_profile=relax
-
-# A comma seperated list of states that have to be tracked
-# As a single group
-[group]
-living_room=light.Bowl,light.Ceiling,light.TV_back_light
-bedroom=light.Bed_light
--- a/homeassistant/init.py
+++ b/homeassistant/init.py
@@ -1,577 +0,0 @@
-"""
-homeassistant
-~~~~~~~~~~~~~
-
-Home Assistant is a Home Automation framework for observing the state
-of entities and react to changes.
-"""
-
-import time
-import logging
-import threading
-import datetime as dt
-import functools as ft
-
-import homeassistant.util as util
-
-MATCH_ALL = '*'
-
-DOMAIN = "homeassistant"
-
-SERVICE_HOMEASSISTANT_STOP = "stop"
-
-EVENT_HOMEASSISTANT_START = "homeassistant_start"
-EVENT_STATE_CHANGED = "state_changed"
-EVENT_TIME_CHANGED = "time_changed"
-
-TIMER_INTERVAL = 10  # seconds
-
-# We want to be able to fire every time a minute starts (seconds=0).
-# We want this so other modules can use that to make sure they fire
-# every minute.
-assert 60 % TIMER_INTERVAL == 0, "60 % TIMER_INTERVAL should be 0!"
-
-BUS_NUM_THREAD = 4
-BUS_REPORT_BUSY_TIMEOUT = dt.timedelta(minutes=1)
-PRIO_SERVICE_DEFAULT = 1
-PRIO_EVENT_STATE = 2
-PRIO_EVENT_TIME = 3
-PRIO_EVENT_DEFAULT = 4
-
-
-def start_home_assistant(bus):
-    """ Start home assistant. """
-    request_shutdown = threading.Event()
-
-    bus.register_service(DOMAIN, SERVICE_HOMEASSISTANT_STOP,
-                         lambda service: request_shutdown.set())
-
-    Timer(bus)
-
-    bus.fire_event(EVENT_HOMEASSISTANT_START)
-
-    while not request_shutdown.isSet():
-        try:
-            time.sleep(1)
-
-        except KeyboardInterrupt:
-            break
-
-
-def _process_match_param(parameter):
-    """ Wraps parameter in a list if it is not one and returns it. """
-    if not parameter:
-        return MATCH_ALL
-    elif isinstance(parameter, list):
-        return parameter
-    else:
-        return [parameter]
-
-
-def _matcher(subject, pattern):
-    """ Returns True if subject matches the pattern.
-
-    Pattern is either a list of allowed subjects or a `MATCH_ALL`.
-    """
-    return MATCH_ALL == pattern or subject in pattern
-
-
-def track_state_change(bus, entity_id, action, from_state=None, to_state=None):
-    """ Helper method to track specific state changes. """
-    from_state = _process_match_param(from_state)
-    to_state = _process_match_param(to_state)
-
-    @ft.wraps(action)
-    def state_listener(event):
-        """ State change listener that listens for specific state changes. """
-        if entity_id == event.data['entity_id'] and \
-                _matcher(event.data['old_state'].state, from_state) and \
-                _matcher(event.data['new_state'].state, to_state):
-
-            action(event.data['entity_id'],
-                   event.data['old_state'],
-                   event.data['new_state'])
-
-    bus.listen_event(EVENT_STATE_CHANGED, state_listener)
-
-
-def track_point_in_time(bus, action, point_in_time):
-    """ Adds a listener that will fire once after a spefic point in time. """
-
-    @ft.wraps(action)
-    def point_in_time_listener(event):
-        """ Listens for matching time_changed events. """
-        now = event.data['now']
-
-        if now > point_in_time and not hasattr(point_in_time_listener, 'run'):
-
-            # Set variable so that we will never run twice.
-            # Because the event bus might have to wait till a thread comes
-            # available to execute this listener it might occur that the
-            # listener gets lined up twice to be executed. This will make sure
-            # the second time it does nothing.
-            point_in_time_listener.run = True
-
-            bus.remove_event_listener(EVENT_TIME_CHANGED,
-                                      point_in_time_listener)
-
-            action(now)
-
-    bus.listen_event(EVENT_TIME_CHANGED, point_in_time_listener)
-
-
-# pylint: disable=too-many-arguments
-def track_time_change(bus, action,
-                      year=None, month=None, day=None,
-                      hour=None, minute=None, second=None):
-    """ Adds a listener that will fire if time matches a pattern. """
-
-    # We do not have to wrap the function with time pattern matching logic if
-    # no pattern given
-    if any((val is not None for val in
-            (year, month, day, hour, minute, second))):
-
-        pmp = _process_match_param
-        year, month, day = pmp(year), pmp(month), pmp(day)
-        hour, minute, second = pmp(hour), pmp(minute), pmp(second)
-
-        @ft.wraps(action)
-        def time_listener(event):
-            """ Listens for matching time_changed events. """
-            now = event.data['now']
-
-            mat = _matcher
-
-            if mat(now.year, year) and \
-               mat(now.month, month) and \
-               mat(now.day, day) and \
-               mat(now.hour, hour) and \
-               mat(now.minute, minute) and \
-               mat(now.second, second):
-
-                action(now)
-
-    else:
-        @ft.wraps(action)
-        def time_listener(event):
-            """ Fires every time event that comes in. """
-            action(event.data['now'])
-
-    bus.listen_event(EVENT_TIME_CHANGED, time_listener)
-
-
-def create_bus_job_handler(logger):
-    """ Creates a job handler that logs errors to supplied `logger`. """
-
-    def job_handler(job):
-        """ Called whenever a job is available to do. """
-        try:
-            func, arg = job
-            func(arg)
-        except Exception:  # pylint: disable=broad-except
-            # Catch any exception our service/event_listener might throw
-            # We do not want to crash our ThreadPool
-            logger.exception(u"BusHandler:Exception doing job")
-
-    return job_handler
-
-
-# pylint: disable=too-few-public-methods
-class ServiceCall(object):
-    """ Represents a call to a service. """
-
-    __slots__ = ['domain', 'service', 'data']
-
-    def __init__(self, domain, service, data=None):
-        self.domain = domain
-        self.service = service
-        self.data = data or {}
-
-    def __repr__(self):
-        if self.data:
-            return u"<ServiceCall {}.{}: {}>".format(
-                self.domain, self.service, util.repr_helper(self.data))
-        else:
-            return u"<ServiceCall {}.{}>".format(self.domain, self.service)
-
-
-# pylint: disable=too-few-public-methods
-class Event(object):
-    """ Represents an event within the Bus. """
-
-    __slots__ = ['event_type', 'data']
-
-    def __init__(self, event_type, data=None):
-        self.event_type = event_type
-        self.data = data or {}
-
-    def __repr__(self):
-        if self.data:
-            return u"<Event {}: {}>".format(
-                self.event_type, util.repr_helper(self.data))
-        else:
-            return u"<Event {}>".format(self.event_type)
-
-
-class Bus(object):
-    """ Class that allows different components to communicate via services
-    and events.
-    """
-
-    # pylint: disable=too-many-instance-attributes
-    def __init__(self, thread_count=None):
-        self.thread_count = thread_count or BUS_NUM_THREAD
-        self._event_listeners = {}
-        self._services = {}
-        self.logger = logging.getLogger(__name__)
-        self.event_lock = threading.Lock()
-        self.service_lock = threading.Lock()
-        self.last_busy_notice = dt.datetime.now()
-
-        self.pool = util.ThreadPool(self.thread_count,
-                                    create_bus_job_handler(self.logger))
-
-    @property
-    def services(self):
-        """ Dict with per domain a list of available services. """
-        with self.service_lock:
-            return {domain: self._services[domain].keys()
-                    for domain in self._services}
-
-    @property
-    def event_listeners(self):
-        """ Dict with events that is being listened for and the number
-        of listeners.
-        """
-        with self.event_lock:
-            return {key: len(self._event_listeners[key])
-                    for key in self._event_listeners}
-
-    def has_service(self, domain, service):
-        """ Returns True if specified service exists. """
-        try:
-            return service in self._services[domain]
-        except KeyError:  # if key 'domain' does not exist
-            return False
-
-    def call_service(self, domain, service, service_data=None):
-        """ Calls a service. """
-        service_call = ServiceCall(domain, service, service_data)
-
-        with self.service_lock:
-            try:
-                self.pool.add_job(PRIO_SERVICE_DEFAULT,
-                                  (self._services[domain][service],
-                                   service_call))
-
-                self._check_busy()
-
-            except KeyError:  # if key domain or service does not exist
-                raise ServiceDoesNotExistError(
-                    u"Service does not exist: {}/{}".format(domain, service))
-
-    def register_service(self, domain, service, service_func):
-        """ Register a service. """
-        with self.service_lock:
-            try:
-                self._services[domain][service] = service_func
-
-            except KeyError:  # Domain does not exist yet in self._services
-                self._services[domain] = {service: service_func}
-
-    def fire_event(self, event_type, event_data=None):
-        """ Fire an event. """
-        with self.event_lock:
-            # Copy the list of the current listeners because some listeners
-            # remove themselves as a listener while being executed which
-            # causes the iterator to be confused.
-            get = self._event_listeners.get
-            listeners = get(MATCH_ALL, []) + get(event_type, [])
-
-            event = Event(event_type, event_data)
-
-            self.logger.info(u"Bus:Handling {}".format(event))
-
-            if not listeners:
-                return
-
-            if event_type == EVENT_TIME_CHANGED:
-                prio = PRIO_EVENT_TIME
-            elif event_type == EVENT_STATE_CHANGED:
-                prio = PRIO_EVENT_STATE
-            else:
-                prio = PRIO_EVENT_DEFAULT
-
-            for func in listeners:
-                self.pool.add_job(prio, (func, event))
-
-            self._check_busy()
-
-    def listen_event(self, event_type, listener):
-        """ Listen for all events or events of a specific type.
-
-        To listen to all events specify the constant ``MATCH_ALL``
-        as event_type.
-        """
-        with self.event_lock:
-            try:
-                self._event_listeners[event_type].append(listener)
-
-            except KeyError:  # event_type did not exist
-                self._event_listeners[event_type] = [listener]
-
-    def listen_once_event(self, event_type, listener):
-        """ Listen once for event of a specific type.
-
-        To listen to all events specify the constant ``MATCH_ALL``
-        as event_type.
-
-        Note: at the moment it is impossible to remove a one time listener.
-        """
-        @ft.wraps(listener)
-        def onetime_listener(event):
-            """ Removes listener from eventbus and then fires listener. """
-            if not hasattr(onetime_listener, 'run'):
-                # Set variable so that we will never run twice.
-                # Because the event bus might have to wait till a thread comes
-                # available to execute this listener it might occur that the
-                # listener gets lined up twice to be executed.
-                # This will make sure the second time it does nothing.
-                onetime_listener.run = True
-
-                self.remove_event_listener(event_type, onetime_listener)
-
-                listener(event)
-
-        self.listen_event(event_type, onetime_listener)
-
-    def remove_event_listener(self, event_type, listener):
-        """ Removes a listener of a specific event_type. """
-        with self.event_lock:
-            try:
-                self._event_listeners[event_type].remove(listener)
-
-                # delete event_type list if empty
-                if not self._event_listeners[event_type]:
-                    self._event_listeners.pop(event_type)
-
-            except (KeyError, AttributeError):
-                # KeyError is key event_type listener did not exist
-                # AttributeError if listener did not exist within event_type
-                pass
-
-    def _check_busy(self):
-        """ Complain if we have more than twice as many jobs queued as threads
-        and if we didn't complain about it recently. """
-        if self.pool.queue.qsize() / self.thread_count >= 2 and \
-           dt.datetime.now()-self.last_busy_notice > BUS_REPORT_BUSY_TIMEOUT:
-
-            self.last_busy_notice = dt.datetime.now()
-
-            log_error = self.logger.error
-
-            log_error(
-                u"Bus:All {} threads are busy and {} jobs pending".format(
-                    self.thread_count, self.pool.queue.qsize()))
-
-            jobs = self.pool.current_jobs
-
-            for start, job in jobs:
-                log_error(u"Bus:Current job from {}: {}".format(
-                    util.datetime_to_str(start), job))
-
-
-class State(object):
-    """ Object to represent a state within the state machine. """
-
-    __slots__ = ['entity_id', 'state', 'attributes', 'last_changed']
-
-    def __init__(self, entity_id, state, attributes=None, last_changed=None):
-        self.entity_id = entity_id
-        self.state = state
-        self.attributes = attributes or {}
-        last_changed = last_changed or dt.datetime.now()
-
-        # Strip microsecond from last_changed else we cannot guarantee
-        # state == State.from_dict(state.as_dict())
-        # This behavior occurs because to_dict uses datetime_to_str
-        # which strips microseconds
-        if last_changed.microsecond:
-            self.last_changed = last_changed - dt.timedelta(
-                microseconds=last_changed.microsecond)
-        else:
-            self.last_changed = last_changed
-
-    def copy(self):
-        """ Creates a copy of itself. """
-        return State(self.entity_id, self.state,
-                     dict(self.attributes), self.last_changed)
-
-    def as_dict(self):
-        """ Converts State to a dict to be used within JSON.
-        Ensures: state == State.from_dict(state.as_dict()) """
-
-        return {'entity_id': self.entity_id,
-                'state': self.state,
-                'attributes': self.attributes,
-                'last_changed': util.datetime_to_str(self.last_changed)}
-
-    @staticmethod
-    def from_dict(json_dict):
-        """ Static method to create a state from a dict.
-        Ensures: state == State.from_json_dict(state.to_json_dict()) """
-
-        try:
-            last_changed = json_dict.get('last_changed')
-
-            if last_changed:
-                last_changed = util.str_to_datetime(last_changed)
-
-            return State(json_dict['entity_id'],
-                         json_dict['state'],
-                         json_dict.get('attributes'),
-                         last_changed)
-        except KeyError:  # if key 'entity_id' or 'state' did not exist
-            return None
-
-    def __repr__(self):
-        if self.attributes:
-            return u"<state {}:{} @ {}>".format(
-                self.state, util.repr_helper(self.attributes),
-                util.datetime_to_str(self.last_changed))
-        else:
-            return u"<state {} @ {}>".format(
-                self.state, util.datetime_to_str(self.last_changed))
-
-
-class StateMachine(object):
-    """ Helper class that tracks the state of different entities. """
-
-    def __init__(self, bus):
-        self.states = {}
-        self.bus = bus
-        self.lock = threading.Lock()
-
-    @property
-    def entity_ids(self):
-        """ List of entitie ids that are being tracked. """
-        with self.lock:
-            return self.states.keys()
-
-    def remove_entity(self, entity_id):
-        """ Removes a entity from the state machine.
-
-        Returns boolean to indicate if a entity was removed. """
-        with self.lock:
-            try:
-                del self.states[entity_id]
-
-                return True
-
-            except KeyError:
-                # if entity does not exist
-                return False
-
-    def set_state(self, entity_id, new_state, attributes=None):
-        """ Set the state of an entity, add entity if it does not exist.
-
-        Attributes is an optional dict to specify attributes of this state. """
-
-        attributes = attributes or {}
-
-        with self.lock:
-            # Change state and fire listeners
-            try:
-                old_state = self.states[entity_id]
-
-            except KeyError:
-                # If state did not exist yet
-                self.states[entity_id] = State(entity_id, new_state,
-                                               attributes)
-
-            else:
-                if old_state.state != new_state or \
-                   old_state.attributes != attributes:
-
-                    state = self.states[entity_id] = \
-                        State(entity_id, new_state, attributes)
-
-                    self.bus.fire_event(EVENT_STATE_CHANGED,
-                                        {'entity_id': entity_id,
-                                         'old_state': old_state,
-                                         'new_state': state})
-
-    def get_state(self, entity_id):
-        """ Returns the state of the specified entity. """
-        with self.lock:
-            try:
-                # Make a copy so people won't mutate the state
-                return self.states[entity_id].copy()
-
-            except KeyError:
-                # If entity does not exist
-                return None
-
-    def is_state(self, entity_id, state):
-        """ Returns True if entity exists and is specified state. """
-        try:
-            return self.get_state(entity_id).state == state
-        except AttributeError:
-            # get_state returned None
-            return False
-
-
-class Timer(threading.Thread):
-    """ Timer will sent out an event every TIMER_INTERVAL seconds. """
-
-    def __init__(self, bus):
-        threading.Thread.__init__(self)
-
-        self.daemon = True
-        self.bus = bus
-
-        bus.listen_once_event(EVENT_HOMEASSISTANT_START,
-                              lambda event: self.start())
-
-    def run(self):
-        """ Start the timer. """
-
-        logging.getLogger(__name__).info("Timer:starting")
-
-        last_fired_on_second = -1
-
-        calc_now = dt.datetime.now
-
-        while True:
-            now = calc_now()
-
-            # First check checks if we are not on a second matching the
-            # timer interval. Second check checks if we did not already fire
-            # this interval.
-            if now.second % TIMER_INTERVAL or \
-               now.second == last_fired_on_second:
-
-                # Sleep till it is the next time that we have to fire an event.
-                # Aim for halfway through the second that fits TIMER_INTERVAL.
-                # If TIMER_INTERVAL is 10 fire at .5, 10.5, 20.5, etc seconds.
-                # This will yield the best results because time.sleep() is not
-                # 100% accurate because of non-realtime OS's
-                slp_seconds = TIMER_INTERVAL - now.second % TIMER_INTERVAL + \
-                    .5 - now.microsecond/1000000.0
-
-                time.sleep(slp_seconds)
-
-                now = calc_now()
-
-            last_fired_on_second = now.second
-
-            self.bus.fire_event(EVENT_TIME_CHANGED,
-                                {'now': now})
-
-
-class HomeAssistantError(Exception):
-    """ General Home Assistant exception occured. """
-
-
-class ServiceDoesNotExistError(HomeAssistantError):
-    """ A service has been referenced that deos not exist. """
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -0,0 +1,335 @@
+""" Starts home assistant. """
+from __future__ import print_function
+
+from multiprocessing import Process
+import signal
+import sys
+import threading
+import os
+import argparse
+import time
+
+from homeassistant import bootstrap
+import homeassistant.config as config_util
+from homeassistant.const import (__version__, EVENT_HOMEASSISTANT_START,
+                                 RESTART_EXIT_CODE)
+
+
+def validate_python():
+    """ Validate we're running the right Python version. """
+    major, minor = sys.version_info[:2]
+
+    if major < 3 or (major == 3 and minor < 4):
+        print("Home Assistant requires atleast Python 3.4")
+        sys.exit(1)
+
+
+def ensure_config_path(config_dir):
+    """ Validates configuration directory. """
+
+    lib_dir = os.path.join(config_dir, 'lib')
+
+    # Test if configuration directory exists
+    if not os.path.isdir(config_dir):
+        if config_dir != config_util.get_default_config_dir():
+            print(('Fatal Error: Specified configuration directory does '
+                   'not exist {} ').format(config_dir))
+            sys.exit(1)
+
+        try:
+            os.mkdir(config_dir)
+        except OSError:
+            print(('Fatal Error: Unable to create default configuration '
+                   'directory {} ').format(config_dir))
+            sys.exit(1)
+
+    # Test if library directory exists
+    if not os.path.isdir(lib_dir):
+        try:
+            os.mkdir(lib_dir)
+        except OSError:
+            print(('Fatal Error: Unable to create library '
+                   'directory {} ').format(lib_dir))
+            sys.exit(1)
+
+
+def ensure_config_file(config_dir):
+    """ Ensure configuration file exists. """
+    config_path = config_util.ensure_config_exists(config_dir)
+
+    if config_path is None:
+        print('Error getting configuration path')
+        sys.exit(1)
+
+    return config_path
+
+
+def get_arguments():
+    """ Get parsed passed in arguments. """
+    parser = argparse.ArgumentParser(
+        description="Home Assistant: Observe, Control, Automate.")
+    parser.add_argument('--version', action='version', version=__version__)
+    parser.add_argument(
+        '-c', '--config',
+        metavar='path_to_config_dir',
+        default=config_util.get_default_config_dir(),
+        help="Directory that contains the Home Assistant configuration")
+    parser.add_argument(
+        '--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. Runs in single process to '
+        'enable use of interactive debuggers.')
+    parser.add_argument(
+        '--open-ui',
+        action='store_true',
+        help='Open the webinterface in a browser')
+    parser.add_argument(
+        '--skip-pip',
+        action='store_true',
+        help='Skips pip install of required packages on startup')
+    parser.add_argument(
+        '-v', '--verbose',
+        action='store_true',
+        help="Enable verbose logging to file.")
+    parser.add_argument(
+        '--pid-file',
+        metavar='path_to_pid_file',
+        default=None,
+        help='Path to PID file useful for running as daemon')
+    parser.add_argument(
+        '--log-rotate-days',
+        type=int,
+        default=None,
+        help='Enables daily log rotation and keeps up to the specified days')
+    parser.add_argument(
+        '--install-osx',
+        action='store_true',
+        help='Installs as a service on OS X and loads on boot.')
+    parser.add_argument(
+        '--uninstall-osx',
+        action='store_true',
+        help='Uninstalls from OS X.')
+    parser.add_argument(
+        '--restart-osx',
+        action='store_true',
+        help='Restarts on OS X.')
+    if os.name != "nt":
+        parser.add_argument(
+            '--daemon',
+            action='store_true',
+            help='Run Home Assistant as daemon')
+
+    arguments = parser.parse_args()
+    if os.name == "nt":
+        arguments.daemon = False
+    return arguments
+
+
+def daemonize():
+    """ Move current process to daemon process """
+    # create first fork
+    pid = os.fork()
+    if pid > 0:
+        sys.exit(0)
+
+    # decouple fork
+    os.setsid()
+    os.umask(0)
+
+    # create second fork
+    pid = os.fork()
+    if pid > 0:
+        sys.exit(0)
+
+
+def check_pid(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
+
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        # PID does not exist
+        return
+    print('Fatal Error: HomeAssistant is already running.')
+    sys.exit(1)
+
+
+def write_pid(pid_file):
+    """ Create PID File """
+    pid = os.getpid()
+    try:
+        open(pid_file, 'w').write(str(pid))
+    except IOError:
+        print('Fatal Error: Unable to write pid file {}'.format(pid_file))
+        sys.exit(1)
+
+
+def install_osx():
+    """ Setup to run via launchd on OS X """
+    with os.popen('which hass') as inp:
+        hass_path = inp.read().strip()
+
+    with os.popen('whoami') as inp:
+        user = inp.read().strip()
+
+    cwd = os.path.dirname(__file__)
+    template_path = os.path.join(cwd, 'startup', 'launchd.plist')
+
+    with open(template_path, 'r', encoding='utf-8') as inp:
+        plist = inp.read()
+
+    plist = plist.replace("$HASS_PATH$", hass_path)
+    plist = plist.replace("$USER$", user)
+
+    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
+
+    try:
+        with open(path, 'w', encoding='utf-8') as outp:
+            outp.write(plist)
+    except IOError as err:
+        print('Unable to write to ' + path, err)
+        return
+
+    os.popen('launchctl load -w -F ' + path)
+
+    print("Home Assistant has been installed. \
+        Open it here: http://localhost:8123")
+
+
+def uninstall_osx():
+    """ 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 setup_and_run_hass(config_dir, args, top_process=False):
+    """
+    Setup HASS and run. Block until stopped. Will assume it is running in a
+    subprocess unless top_process is set to true.
+    """
+    if args.demo_mode:
+        config = {
+            'frontend': {},
+            '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)
+    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)
+
+    if args.open_ui:
+        def open_browser(event):
+            """ Open the webinterface in a browser. """
+            if hass.config.api is not None:
+                import webbrowser
+                webbrowser.open(hass.config.api.base_url)
+
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser)
+
+    hass.start()
+    exit_code = int(hass.block_till_stopped())
+
+    if not top_process:
+        sys.exit(exit_code)
+    return exit_code
+
+
+def run_hass_process(hass_proc):
+    """ Runs a child hass process. Returns True if it should be restarted.  """
+    requested_stop = threading.Event()
+    hass_proc.daemon = True
+
+    def request_stop(*args):
+        """ request hass stop, *args is for signal handler callback """
+        requested_stop.set()
+        hass_proc.terminate()
+
+    try:
+        signal.signal(signal.SIGTERM, request_stop)
+    except ValueError:
+        print('Could not bind to SIGTERM. Are you running in a thread?')
+
+    hass_proc.start()
+    try:
+        hass_proc.join()
+    except KeyboardInterrupt:
+        request_stop()
+        try:
+            hass_proc.join()
+        except KeyboardInterrupt:
+            return False
+
+    return (not requested_stop.isSet() and
+            hass_proc.exitcode == RESTART_EXIT_CODE,
+            hass_proc.exitcode)
+
+
+def main():
+    """ Starts 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)
+
+    # Run hass in debug mode if requested
+    if args.debug:
+        sys.stderr.write('Running in debug mode. '
+                         'Home Assistant will not be able to restart.\n')
+        exit_code = setup_and_run_hass(config_dir, args, top_process=True)
+        if exit_code == RESTART_EXIT_CODE:
+            sys.stderr.write('Home Assistant requested a '
+                             'restart in debug mode.\n')
+        return exit_code
+
+    # Run hass as child process. Restart if necessary.
+    keep_running = True
+    while keep_running:
+        hass_proc = Process(target=setup_and_run_hass, args=(config_dir, args))
+        keep_running, exit_code = run_hass_process(hass_proc)
+    return exit_code
+
+
+if __name__ == "__main__":
+    sys.exit(main())
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -1,199 +1,393 @@
 """
+homeassistant.bootstrap
+~~~~~~~~~~~~~~~~~~~~~~~
 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)
 """

-import importlib
-import ConfigParser
+from collections import defaultdict
 import logging
+import logging.handlers
+import os
+import shutil
+import sys

-import homeassistant as ha
-import homeassistant.components as components
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_COMPONENT = 'component'
+
+PLATFORM_FORMAT = '{}.{}'
+ERROR_LOG_FILENAME = 'home-assistant.log'


-# pylint: disable=too-many-branches,too-many-locals,too-many-statements
-def from_config_file(config_path):
-    """ Starts home assistant with all possible functionality
-        based on a config file. """
+def setup_component(hass, domain, config=None):
+    """ Setup a component and all its dependencies. """

-    # Setup the logging for home assistant.
-    logging.basicConfig(level=logging.INFO)
+    if domain in hass.config.components:
+        return True

-    # Log errors to a file
-    err_handler = logging.FileHandler("home-assistant.log",
-                                      mode='w', delay=True)
-    err_handler.setLevel(logging.ERROR)
-    err_handler.setFormatter(
-        logging.Formatter('%(asctime)s %(name)s: %(message)s',
-                          datefmt='%H:%M %d-%m-%y'))
-    logging.getLogger('').addHandler(err_handler)
+    _ensure_loader_prepared(hass)

-    # Start the actual bootstrapping
-    logger = logging.getLogger(__name__)
+    if config is None:
+        config = defaultdict(dict)

-    statusses = []
+    components = loader.load_order_component(domain)

-    # Read config
-    config = ConfigParser.SafeConfigParser()
-    config.read(config_path)
+    # OrderedSet is empty if component or dependencies could not be resolved
+    if not components:
+        return False

-    # Init core
-    bus = ha.Bus()
-    statemachine = ha.StateMachine(bus)
+    for component in components:
+        if not _setup_component(hass, component, config):
+            return False

-    has_opt = config.has_option
-    get_opt = config.get
-    has_section = config.has_section
-    add_status = lambda name, result: statusses.append((name, result))
-    load_module = lambda module: importlib.import_module(
-        'homeassistant.components.'+module)
+    return True

-    def get_opt_safe(section, option, default=None):
-        """ Failure proof option retriever. """
-        try:
-            return config.get(section, option)
-        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-            return default

-    # Device scanner
-    dev_scan = None
+def _handle_requirements(hass, component, name):
+    """ Installs requirements for 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')):
+            _LOGGER.error('Not initializing %s because could not install '
+                          'dependency %s', name, req)
+            return False
+
+    return True
+
+
+def _setup_component(hass, domain, config):
+    """ Setup a component for Home Assistant. """
+    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]
+
+    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:
-        # For the error message if not all option fields exist
-        opt_fields = "host, username, password"
+        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

-        if has_section('device_tracker.tomato'):
-            device_tracker = load_module('device_tracker')
+    hass.config.components.append(component.DOMAIN)

-            dev_scan_name = "Tomato"
-            opt_fields += ", http_id"
+    # 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()

-            dev_scan = device_tracker.TomatoDeviceScanner(
-                get_opt('device_tracker.tomato', 'host'),
-                get_opt('device_tracker.tomato', 'username'),
-                get_opt('device_tracker.tomato', 'password'),
-                get_opt('device_tracker.tomato', 'http_id'))
+    hass.bus.fire(
+        EVENT_COMPONENT_LOADED, {ATTR_COMPONENT: component.DOMAIN})

-        elif has_section('device_tracker.netgear'):
-            device_tracker = load_module('device_tracker')
+    return True

-            dev_scan_name = "Netgear"

-            dev_scan = device_tracker.NetgearDeviceScanner(
-                get_opt('device_tracker.netgear', 'host'),
-                get_opt('device_tracker.netgear', 'username'),
-                get_opt('device_tracker.netgear', 'password'))
+def prepare_setup_platform(hass, config, domain, platform_name):
+    """ Loads a platform and makes sure dependencies are setup. """
+    _ensure_loader_prepared(hass)

-    except ConfigParser.NoOptionError:
-        # If one of the options didn't exist
-        logger.exception(("Error initializing {}DeviceScanner, "
-                          "could not find one of the following config "
-                          "options: {}".format(dev_scan_name, opt_fields)))
+    platform_path = PLATFORM_FORMAT.format(domain, platform_name)

-        add_status("Device Scanner - {}".format(dev_scan_name), False)
+    platform = loader.get_component(platform_path)

-    if dev_scan:
-        add_status("Device Scanner - {}".format(dev_scan_name),
-                   dev_scan.success_init)
+    # Not found
+    if platform is None:
+        _LOGGER.error('Unable to find platform %s', platform_path)
+        return None

-        if not dev_scan.success_init:
-            dev_scan = None
+    # Already loaded
+    elif platform_path in hass.config.components:
+        return platform

-    # Device Tracker
-    if dev_scan:
-        device_tracker.DeviceTracker(bus, statemachine, dev_scan)
+    # Load dependencies
+    for component in getattr(platform, 'DEPENDENCIES', []):
+        if not setup_component(hass, component, config):
+            _LOGGER.error(
+                'Unable to prepare setup for platform %s because '
+                'dependency %s could not be initialized', platform_path,
+                component)
+            return None

-        add_status("Device Tracker", True)
+    if not _handle_requirements(hass, platform, platform_path):
+        return None

-    # Sun tracker
-    if has_opt("common", "latitude") and \
-       has_opt("common", "longitude"):
+    return platform

-        sun = load_module('sun')

-        add_status("Weather - Ephem",
-                   sun.setup(
-                       bus, statemachine,
-                       get_opt("common", "latitude"),
-                       get_opt("common", "longitude")))
+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,
+                     log_rotate_days=None):
+    """
+    Tries to configure Home Assistant from a config dict.
+
+    Dynamically loads required components and its dependencies.
+    """
+    if hass is None:
+        hass = core.HomeAssistant()
+        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)
+
+    process_ha_config_upgrade(hass)
+    process_ha_core_config(hass, config.get(core.DOMAIN, {}))
+
+    if enable_log:
+        enable_logging(hass, verbose, daemon, log_rotate_days)
+
+    hass.config.skip_pip = skip_pip
+    if skip_pip:
+        _LOGGER.warning('Skipping pip installation of required modules. '
+                        'This may cause issues.')
+
+    _ensure_loader_prepared(hass)
+
+    # Make a copy because we are mutating it.
+    # Convert it to defaultdict so components can always have config dict
+    # Convert values to dictionaries if they are None
+    config = defaultdict(
+        dict, {key: value or {} for key, value in config.items()})
+
+    # Filter out the repeating and common config section [homeassistant]
+    components = set(key.split(' ')[0] for key in config.keys()
+                     if key != core.DOMAIN)
+
+    if not core_components.setup(hass, config):
+        _LOGGER.error('Home Assistant core failed to initialize. '
+                      'Further initialization aborted.')
+
+        return hass
+
+    _LOGGER.info('Home Assistant core initialized')
+
+    # give event decorators access to HASS
+    event_decorators.HASS = hass
+    service.HASS = hass
+
+    # Setup the components
+    for domain in loader.load_order_components(components):
+        _setup_component(hass, domain, config)
+
+    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,
+    instantiates a new Home Assistant object if 'hass' is not given.
+    """
+    if hass is None:
+        hass = core.HomeAssistant()
+
+    # 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)
+
+    enable_logging(hass, verbose, daemon, log_rotate_days)
+
+    config_dict = config_util.load_yaml_config_file(config_path)
+
+    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")
+
+    # Log errors to a file if we have write access to file or config dir
+    err_log_path = hass.config.path(ERROR_LOG_FILENAME)
+    err_path_exists = os.path.isfile(err_log_path)
+
+    # Check if we can write to the error log if it exists or that
+    # we can create files in the containing directory if not.
+    if (err_path_exists and os.access(err_log_path, os.W_OK)) or \
+       (not err_path_exists and os.access(hass.config.config_dir, os.W_OK)):
+
+        if log_rotate_days:
+            err_handler = logging.handlers.TimedRotatingFileHandler(
+                err_log_path, when='midnight', backupCount=log_rotate_days)
+        else:
+            err_handler = logging.FileHandler(
+                err_log_path, mode='w', delay=True)
+
+        err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
+        err_handler.setFormatter(
+            logging.Formatter('%(asctime)s %(name)s: %(message)s',
+                              datefmt='%y-%m-%d %H:%M:%S'))
+        logger = logging.getLogger('')
+        logger.addHandler(err_handler)
+        logger.setLevel(logging.INFO)
+
    else:
-        sun = None
+        _LOGGER.error(
+            'Unable to setup error log %s (access denied)', err_log_path)

-    # Chromecast
-    if has_section("chromecast"):
-        chromecast = load_module('chromecast')

-        chromecast_started = chromecast.setup(bus, statemachine)
+def process_ha_config_upgrade(hass):
+    """ Upgrade config if necessary. """
+    version_path = hass.config.path('.HA_VERSION')

-        add_status("Chromecast", chromecast_started)
-    else:
-        chromecast_started = False
+    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'

-    # WeMo
-    if has_section("wemo"):
-        wemo = load_module('wemo')
+    if conf_version == __version__:
+        return

-        add_status("WeMo", wemo.setup(bus, statemachine))
+    _LOGGER.info('Upgrading config directory from %s to %s', conf_version,
+                 __version__)

-    # Light control
-    if has_section("light.hue"):
-        light = load_module('light')
+    lib_path = hass.config.path('lib')
+    if os.path.isdir(lib_path):
+        shutil.rmtree(lib_path)

-        light_control = light.HueLightControl(get_opt_safe("hue", "host"))
+    with open(version_path, 'wt') as outp:
+        outp.write(__version__)

-        add_status("Light - Hue", light_control.success_init)

-        light.setup(bus, statemachine, light_control)
-    else:
-        light_control = None
+def process_ha_core_config(hass, config):
+    """ Processes the [homeassistant] section from the config. """
+    hac = hass.config

-    if has_opt("downloader", "download_dir"):
-        downloader = load_module('downloader')
+    def set_time_zone(time_zone_str):
+        """ Helper method to set time zone in HA. """
+        if time_zone_str is None:
+            return

-        add_status("Downloader", downloader.setup(
-            bus, get_opt("downloader", "download_dir")))
+        time_zone = date_util.get_time_zone(time_zone_str)

-    add_status("Core components", components.setup(bus, statemachine))
+        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)

-    if has_section('browser'):
-        add_status("Browser", load_module('browser').setup(bus))
+    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)

-    if has_section('keyboard'):
-        add_status("Keyboard", load_module('keyboard').setup(bus))
+    set_time_zone(config.get(CONF_TIME_ZONE))

-    # Init HTTP interface
-    if has_opt("httpinterface", "api_password"):
-        httpinterface = load_module('httpinterface')
+    customize = config.get(CONF_CUSTOMIZE)

-        httpinterface.HTTPInterface(
-            bus, statemachine,
-            get_opt("httpinterface", "api_password"))
+    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())

-        add_status("HTTPInterface", True)
+    if CONF_TEMPERATURE_UNIT in config:
+        unit = config[CONF_TEMPERATURE_UNIT]

-    # Init groups
-    if has_section("group"):
-        group = load_module('group')
+        if unit == 'C':
+            hac.temperature_unit = TEMP_CELCIUS
+        elif unit == 'F':
+            hac.temperature_unit = TEMP_FAHRENHEIT

-        for name, entity_ids in config.items("group"):
-            add_status("Group - {}".format(name),
-                       group.setup(bus, statemachine, name,
-                                   entity_ids.split(",")))
+    # 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

-    # Light trigger
-    if light_control and sun:
-        device_sun_light_trigger = load_module('device_sun_light_trigger')
+    _LOGGER.info('Auto detecting location and temperature unit')

-        light_group = get_opt_safe("device_sun_light_trigger", "light_group")
-        light_profile = get_opt_safe("device_sun_light_trigger",
-                                     "light_profile")
+    info = loc_util.detect_location_info()

-        add_status("Device Sun Light Trigger",
-                   device_sun_light_trigger.setup(bus, statemachine,
-                                                  light_group, light_profile))
+    if info is None:
+        _LOGGER.error('Could not detect location information')
+        return

-    for component, success_init in statusses:
-        status = "initialized" if success_init else "Failed to initialize"
+    if hac.latitude is None and hac.longitude is None:
+        hac.latitude = info.latitude
+        hac.longitude = info.longitude

-        logger.info("{}: {}".format(component, status))
+    if hac.temperature_unit is None:
+        if info.use_fahrenheit:
+            hac.temperature_unit = TEMP_FAHRENHEIT
+        else:
+            hac.temperature_unit = TEMP_CELCIUS

-    ha.start_home_assistant(bus)
+    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. """
+    if not loader.PREPARED:
+        loader.prepare(hass)
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -1,7 +1,6 @@
 """
 homeassistant.components
 ~~~~~~~~~~~~~~~~~~~~~~~~
-
 This package contains components that can be plugged into Home Assistant.

 Component design guidelines:
@@ -12,151 +11,108 @@ 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 importlib
+import logging

-import homeassistant as ha
-import homeassistant.util as util
+import homeassistant.core as ha
+from homeassistant.helpers.entity import split_entity_id
+from homeassistant.helpers.service import extract_entity_ids
+from homeassistant.loader import get_component
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF, SERVICE_TOGGLE)

-# Contains one string or a list of strings, each being an entity id
-ATTR_ENTITY_ID = 'entity_id'
-
-# String with a friendly name for the entity
-ATTR_FRIENDLY_NAME = "friendly_name"
-
-STATE_ON = 'on'
-STATE_OFF = 'off'
-STATE_NOT_HOME = 'not_home'
-STATE_HOME = 'home'
-
-SERVICE_TURN_ON = 'turn_on'
-SERVICE_TURN_OFF = 'turn_off'
-
-SERVICE_VOLUME_UP = "volume_up"
-SERVICE_VOLUME_DOWN = "volume_down"
-SERVICE_VOLUME_MUTE = "volume_mute"
-SERVICE_MEDIA_PLAY_PAUSE = "media_play_pause"
-SERVICE_MEDIA_NEXT_TRACK = "media_next_track"
-SERVICE_MEDIA_PREV_TRACK = "media_prev_track"
-
-_LOADED_COMP = {}
+_LOGGER = logging.getLogger(__name__)


-def _get_component(component):
-    """ Returns requested component. Imports it if necessary. """
-
-    comps = _LOADED_COMP
-
-    # See if we have the module locally cached, else import it
-    try:
-        return comps[component]
-
-    except KeyError:
-        # If comps[component] does not exist, import module
-        try:
-            comps[component] = importlib.import_module(
-                'homeassistant.components.'+component)
-
-        except ImportError:
-            # If we got a bogus component the input will fail
-            comps[component] = None
-
-        return comps[component]
-
-
-def is_on(statemachine, entity_id=None):
+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. """
    if entity_id:
-        group = _get_component('group')
+        group = get_component('group')

-        entity_ids = group.expand_entity_ids([entity_id])
+        entity_ids = group.expand_entity_ids(hass, [entity_id])
    else:
-        entity_ids = statemachine.entity_ids
+        entity_ids = hass.states.entity_ids()

    for entity_id in entity_ids:
-        domain = util.split_entity_id(entity_id)[0]
+        domain = split_entity_id(entity_id)[0]

-        module = _get_component(domain)
+        module = get_component(domain)

        try:
-            if module.is_on(statemachine, entity_id):
+            if module.is_on(hass, entity_id):
                return True

        except AttributeError:
            # module is None or method is_on does not exist
-            pass
+            _LOGGER.exception("Failed to call %s.is_on for %s",
+                              module, entity_id)

    return False


-def turn_on(bus, **service_data):
+def turn_on(hass, entity_id=None, **service_data):
    """ Turns specified entity on if possible. """
-    bus.call_service(ha.DOMAIN, SERVICE_TURN_ON, service_data)
+    if entity_id is not None:
+        service_data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(ha.DOMAIN, SERVICE_TURN_ON, service_data)


-def turn_off(bus, **service_data):
+def turn_off(hass, entity_id=None, **service_data):
    """ Turns specified entity off. """
-    bus.call_service(ha.DOMAIN, SERVICE_TURN_OFF, service_data)
+    if entity_id is not None:
+        service_data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(ha.DOMAIN, SERVICE_TURN_OFF, service_data)


-def extract_entity_ids(statemachine, service):
-    """
-    Helper method to extract a list of entity ids from a service call.
-    Will convert group entity ids to the entity ids it represents.
-    """
-    entity_ids = []
+def toggle(hass, entity_id=None, **service_data):
+    """ Toggles specified entity. """
+    if entity_id is not None:
+        service_data[ATTR_ENTITY_ID] = entity_id

-    if service.data and ATTR_ENTITY_ID in service.data:
-        group = _get_component('group')
-
-        # Entity ID attr can be a list or a string
-        service_ent_id = service.data[ATTR_ENTITY_ID]
-        if isinstance(service_ent_id, list):
-            ent_ids = service_ent_id
-        else:
-            ent_ids = [service_ent_id]
-
-        entity_ids.extend(
-            ent_id for ent_id
-            in group.expand_entity_ids(statemachine, ent_ids)
-            if ent_id not in entity_ids)
-
-    return entity_ids
+    hass.services.call(ha.DOMAIN, SERVICE_TOGGLE, service_data)


-def setup(bus, statemachine):
+def setup(hass, config):
    """ Setup general services related to homeassistant. """

    def handle_turn_service(service):
        """ Method to handle calls to homeassistant.turn_on/off. """
-
-        entity_ids = extract_entity_ids(statemachine, service)
+        entity_ids = extract_entity_ids(hass, service)

        # Generic turn on/off method requires entity id
        if not entity_ids:
+            _LOGGER.error(
+                "homeassistant/%s cannot be called without entity_id",
+                service.service)
            return

        # Group entity_ids by domain. groupby requires sorted data.
        by_domain = it.groupby(sorted(entity_ids),
-                               lambda item: util.split_entity_id(item)[0])
+                               lambda item: split_entity_id(item)[0])

        for domain, ent_ids in by_domain:
+            # We want to block for all calls and only return when all calls
+            # have been processed. If a service does not exist it causes a 10
+            # second delay while we're blocking waiting for a response.
+            # But services can be registered on other HA instances that are
+            # listening to the bus too. So as a in between solution, we'll
+            # block only if the service is defined in the current HA instance.
+            blocking = hass.services.has_service(domain, service.service)
+
            # Create a new dict for this call
            data = dict(service.data)

            # ent_ids is a generator, convert it to a list.
            data[ATTR_ENTITY_ID] = list(ent_ids)

-            try:
-                bus.call_service(domain, service.service, data)
-            except ha.ServiceDoesNotExistError:
-                # turn_on service does not exist
-                pass
+            hass.services.call(domain, service.service, data, blocking)

-    bus.register_service(ha.DOMAIN, SERVICE_TURN_OFF, handle_turn_service)
-    bus.register_service(ha.DOMAIN, SERVICE_TURN_ON, handle_turn_service)
+    hass.services.register(ha.DOMAIN, SERVICE_TURN_OFF, handle_turn_service)
+    hass.services.register(ha.DOMAIN, SERVICE_TURN_ON, handle_turn_service)
+    hass.services.register(ha.DOMAIN, SERVICE_TOGGLE, handle_turn_service)

    return True
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -0,0 +1,152 @@
+"""
+homeassistant.components.alarm_control_panel
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Component to interface with a alarm control panel.
+"""
+import logging
+import os
+
+from homeassistant.components import verisure
+from homeassistant.const import (
+    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.entity import Entity
+from homeassistant.helpers.entity_component import EntityComponent
+
+DOMAIN = 'alarm_control_panel'
+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',
+    SERVICE_ALARM_ARM_AWAY: 'alarm_arm_away',
+    SERVICE_ALARM_TRIGGER: 'alarm_trigger'
+}
+
+ATTR_CODE = 'code'
+ATTR_CODE_FORMAT = 'code_format'
+
+ATTR_TO_PROPERTY = [
+    ATTR_CODE,
+    ATTR_CODE_FORMAT
+]
+
+
+def setup(hass, config):
+    """ Track states and offer events for sensors. """
+    component = EntityComponent(
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
+        DISCOVERY_PLATFORMS)
+
+    component.setup(config)
+
+    def alarm_service_handler(service):
+        """ Maps 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]
+
+        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))
+
+    return True
+
+
+def alarm_disarm(hass, code=None, entity_id=None):
+    """ Send the alarm the command for disarm. """
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_DISARM, data)
+
+
+def alarm_arm_home(hass, code=None, entity_id=None):
+    """ Send the alarm the command for arm home. """
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_HOME, data)
+
+
+def alarm_arm_away(hass, code=None, entity_id=None):
+    """ Send the alarm the command for arm away. """
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_ARM_AWAY, data)
+
+
+def alarm_trigger(hass, code=None, entity_id=None):
+    """ Send the alarm the command for trigger. """
+    data = {}
+    if code:
+        data[ATTR_CODE] = code
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_ALARM_TRIGGER, data)
+
+
+# pylint: disable=no-self-use
+class AlarmControlPanel(Entity):
+    """ ABC for alarm control devices. """
+
+    @property
+    def code_format(self):
+        """ regex for code format or None if no code is required. """
+        return None
+
+    def alarm_disarm(self, code=None):
+        """ Send disarm command. """
+        raise NotImplementedError()
+
+    def alarm_arm_home(self, code=None):
+        """ Send arm home command. """
+        raise NotImplementedError()
+
+    def alarm_arm_away(self, code=None):
+        """ Send arm away command. """
+        raise NotImplementedError()
+
+    def alarm_trigger(self, code=None):
+        """ Send alarm trigger command. """
+        raise NotImplementedError()
+
+    @property
+    def state_attributes(self):
+        """ 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
@@ -0,0 +1,117 @@
+"""
+homeassistant.components.alarm_control_panel.alarmdotcom
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Interfaces with Verisure alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+REQUIREMENTS = ['https://github.com/Xorso/pyalarmdotcom'
+                '/archive/0.0.7.zip'
+                '#pyalarmdotcom==0.0.7']
+DEFAULT_NAME = 'Alarm.com'
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Setup an Alarm.com control panel. """
+
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+
+    if username is None or password is None:
+        _LOGGER.error('Must specify username and password!')
+        return False
+
+    add_devices([AlarmDotCom(hass,
+                             config.get('name', DEFAULT_NAME),
+                             config.get('code'),
+                             username,
+                             password)])
+
+
+# pylint: disable=too-many-arguments, too-many-instance-attributes
+# pylint: disable=abstract-method
+class AlarmDotCom(alarm.AlarmControlPanel):
+    """ Represents a Alarm.com status. """
+
+    def __init__(self, hass, name, code, username, password):
+        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
+        self._alarm = Alarmdotcom(username, password, timeout=10)
+        self._hass = hass
+        self._name = name
+        self._code = str(code) if code else None
+        self._username = username
+        self._password = password
+
+    @property
+    def should_poll(self):
+        """ No polling needed. """
+        return True
+
+    @property
+    def name(self):
+        """ Returns the name of the device. """
+        return self._name
+
+    @property
+    def code_format(self):
+        """ 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. """
+        if self._alarm.state == 'Disarmed':
+            return STATE_ALARM_DISARMED
+        elif self._alarm.state == 'Armed Stay':
+            return STATE_ALARM_ARMED_HOME
+        elif self._alarm.state == 'Armed Away':
+            return STATE_ALARM_ARMED_AWAY
+        else:
+            return STATE_UNKNOWN
+
+    def alarm_disarm(self, code=None):
+        """ 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()
+
+    def alarm_arm_home(self, code=None):
+        """ Send arm home command. """
+        if not self._validate_code(code, 'arming home'):
+            return
+        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
+        # Open another session to alarm.com to fire off the command
+        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
+        _alarm.arm_stay()
+
+    def alarm_arm_away(self, code=None):
+        """ Send arm away command. """
+        if not self._validate_code(code, 'arming home'):
+            return
+        from pyalarmdotcom.pyalarmdotcom import Alarmdotcom
+        # Open another session to alarm.com to fire off the command
+        _alarm = Alarmdotcom(self._username, self._password, timeout=10)
+        _alarm.arm_away()
+
+    def _validate_code(self, code, state):
+        """ Validate given code. """
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning('Wrong code entered for %s', state)
+        return check
--- a/homeassistant/components/alarm_control_panel/demo.py
+++ b/homeassistant/components/alarm_control_panel/demo.py
@@ -0,0 +1,13 @@
+"""
+homeassistant.components.alarm_control_panel.demo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Demo platform that has two fake alarm control panels.
+"""
+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. """
+    add_devices([
+        manual.ManualAlarm(hass, 'Alarm', '1234', 5, 10),
+    ])
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -0,0 +1,148 @@
+"""
+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
+
+from homeassistant.const import (
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_ALARM_NAME = 'HA Alarm'
+DEFAULT_PENDING_TIME = 60
+DEFAULT_TRIGGER_TIME = 120
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the manual alarm platform. """
+
+    add_devices([ManualAlarm(
+        hass,
+        config.get('name', DEFAULT_ALARM_NAME),
+        config.get('code'),
+        config.get('pending_time', DEFAULT_PENDING_TIME),
+        config.get('trigger_time', DEFAULT_TRIGGER_TIME),
+        )])
+
+
+# pylint: disable=too-many-arguments, too-many-instance-attributes
+# pylint: disable=abstract-method
+class ManualAlarm(alarm.AlarmControlPanel):
+    """
+    Represents an alarm status.
+
+    When armed, will be pending for 'pending_time', after that armed.
+    When triggered, will be pending for 'trigger_time'. After that will be
+    triggered for 'trigger_time', after that we return to disarmed.
+    """
+
+    def __init__(self, hass, name, code, pending_time, trigger_time):
+        self._state = STATE_ALARM_DISARMED
+        self._hass = hass
+        self._name = name
+        self._code = str(code) if code else None
+        self._pending_time = datetime.timedelta(seconds=pending_time)
+        self._trigger_time = datetime.timedelta(seconds=trigger_time)
+        self._state_ts = None
+
+    @property
+    def should_poll(self):
+        """ No polling needed. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device. """
+        return self._name
+
+    @property
+    def state(self):
+        """ Returns 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 > \
+           dt_util.utcnow():
+            return STATE_ALARM_PENDING
+
+        if self._state == STATE_ALARM_TRIGGERED and self._trigger_time:
+            if self._state_ts + self._pending_time > dt_util.utcnow():
+                return STATE_ALARM_PENDING
+            elif (self._state_ts + self._pending_time +
+                  self._trigger_time) < dt_util.utcnow():
+                return STATE_ALARM_DISARMED
+
+        return self._state
+
+    @property
+    def code_format(self):
+        """ One or more characters. """
+        return None if self._code is None else '.+'
+
+    def alarm_disarm(self, code=None):
+        """ Send disarm command. """
+        if not self._validate_code(code, STATE_ALARM_DISARMED):
+            return
+
+        self._state = STATE_ALARM_DISARMED
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+    def alarm_arm_home(self, code=None):
+        """ Send arm home command. """
+        if not self._validate_code(code, STATE_ALARM_ARMED_HOME):
+            return
+
+        self._state = STATE_ALARM_ARMED_HOME
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._pending_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+    def alarm_arm_away(self, code=None):
+        """ Send arm away command. """
+        if not self._validate_code(code, STATE_ALARM_ARMED_AWAY):
+            return
+
+        self._state = STATE_ALARM_ARMED_AWAY
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._pending_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+    def alarm_trigger(self, code=None):
+        """ Send alarm trigger command. No code needed. """
+        self._state = STATE_ALARM_TRIGGERED
+        self._state_ts = dt_util.utcnow()
+        self.update_ha_state()
+
+        if self._trigger_time:
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time)
+
+            track_point_in_time(
+                self._hass, self.update_ha_state,
+                self._state_ts + self._pending_time + self._trigger_time)
+
+    def _validate_code(self, code, state):
+        """ Validate given code. """
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning('Invalid code given for %s', state)
+        return check
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -0,0 +1,127 @@
+"""
+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
+
+from homeassistant.const import (
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
+
+_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']
+
+
+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
+
+    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'))])
+
+
+# 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. """
+
+    def __init__(self, hass, name, state_topic, command_topic, qos,
+                 payload_disarm, payload_arm_home, payload_arm_away, code):
+        self._state = STATE_UNKNOWN
+        self._hass = hass
+        self._name = name
+        self._state_topic = state_topic
+        self._command_topic = command_topic
+        self._qos = qos
+        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
+
+        def message_received(topic, payload, qos):
+            """ 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):
+                _LOGGER.warning('Received unexpected payload: %s', payload)
+                return
+            self._state = payload
+            self.update_ha_state()
+
+        mqtt.subscribe(hass, self._state_topic, message_received, self._qos)
+
+    @property
+    def should_poll(self):
+        """ No polling needed """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device. """
+        return self._name
+
+    @property
+    def state(self):
+        """ Returns the state of the device. """
+        return self._state
+
+    @property
+    def code_format(self):
+        """ 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. """
+        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. """
+        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. """
+        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. """
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning('Wrong code entered for %s', state)
+        return check
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -0,0 +1,105 @@
+"""
+homeassistant.components.alarm_control_panel.nx584
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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
+
+from homeassistant.const import (STATE_UNKNOWN, STATE_ALARM_DISARMED,
+                                 STATE_ALARM_ARMED_HOME,
+                                 STATE_ALARM_ARMED_AWAY)
+import homeassistant.components.alarm_control_panel as alarm
+
+REQUIREMENTS = ['pynx584==0.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Setup nx584. """
+    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):
+    """ NX584-based alarm panel. """
+    def __init__(self, hass, host, name):
+        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):
+        """ Returns the name of the device. """
+        return self._name
+
+    @property
+    def code_format(self):
+        """ Characters if code is defined. """
+        return '[0-9]{4}([0-9]{2})?'
+
+    @property
+    def state(self):
+        """ Returns 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/services.yaml
+++ b/homeassistant/components/alarm_control_panel/services.yaml
--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -0,0 +1,96 @@
+"""
+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/
+"""
+import logging
+
+import homeassistant.components.verisure as verisure
+import homeassistant.components.alarm_control_panel as alarm
+
+from homeassistant.const import (
+    STATE_UNKNOWN,
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+
+_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
+
+    alarms = []
+
+    alarms.extend([
+        VerisureAlarm(value)
+        for value in verisure.ALARM_STATUS.values()
+        if verisure.SHOW_ALARM
+        ])
+
+    add_devices(alarms)
+
+
+# pylint: disable=abstract-method
+class VerisureAlarm(alarm.AlarmControlPanel):
+    """ Represents a Verisure alarm status. """
+
+    def __init__(self, alarm_status):
+        self._id = alarm_status.id
+        self._state = STATE_UNKNOWN
+
+    @property
+    def name(self):
+        """ Returns the name of the device. """
+        return 'Alarm {}'.format(self._id)
+
+    @property
+    def state(self):
+        """ Returns the state of the device. """
+        return self._state
+
+    @property
+    def code_format(self):
+        """ Four digit code required. """
+        return '^\\d{%s}$' % verisure.CODE_DIGITS
+
+    def update(self):
+        """ Update alarm status """
+        verisure.update_alarm()
+
+        if verisure.ALARM_STATUS[self._id].status == 'unarmed':
+            self._state = STATE_ALARM_DISARMED
+        elif verisure.ALARM_STATUS[self._id].status == 'armedhome':
+            self._state = STATE_ALARM_ARMED_HOME
+        elif verisure.ALARM_STATUS[self._id].status == 'armed':
+            self._state = STATE_ALARM_ARMED_AWAY
+        elif verisure.ALARM_STATUS[self._id].status != 'pending':
+            _LOGGER.error(
+                'Unknown alarm state %s',
+                verisure.ALARM_STATUS[self._id].status)
+
+    def alarm_disarm(self, code=None):
+        """ Send disarm command. """
+        verisure.MY_PAGES.alarm.set(code, 'DISARMED')
+        _LOGGER.info('verisure alarm disarming')
+        verisure.MY_PAGES.alarm.wait_while_pending()
+        verisure.update_alarm()
+
+    def alarm_arm_home(self, code=None):
+        """ Send arm home command. """
+        verisure.MY_PAGES.alarm.set(code, 'ARMED_HOME')
+        _LOGGER.info('verisure alarm arming home')
+        verisure.MY_PAGES.alarm.wait_while_pending()
+        verisure.update_alarm()
+
+    def alarm_arm_away(self, code=None):
+        """ Send arm away command. """
+        verisure.MY_PAGES.alarm.set(code, 'ARMED_AWAY')
+        _LOGGER.info('verisure alarm arming away')
+        verisure.MY_PAGES.alarm.wait_while_pending()
+        verisure.update_alarm()
--- a/homeassistant/components/alexa.py
+++ b/homeassistant/components/alexa.py
@@ -0,0 +1,192 @@
+"""
+components.alexa
+~~~~~~~~~~~~~~~~
+Component to offer a service end point for an Alexa skill.
+
+For more details about this component, please refer to the documentation at
+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
+
+DOMAIN = 'alexa'
+DEPENDENCIES = ['http']
+
+_LOGGER = logging.getLogger(__name__)
+_CONFIG = {}
+
+API_ENDPOINT = '/api/alexa'
+
+CONF_INTENTS = 'intents'
+CONF_CARD = 'card'
+CONF_SPEECH = 'speech'
+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)
+
+    return True
+
+
+def _handle_alexa(handler, path_match, data):
+    """ Handle Alexa. """
+    _LOGGER.debug('Received Alexa request: %s', data)
+
+    req = data.get('request')
+
+    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
+
+    req_type = req['type']
+
+    if req_type == 'SessionEndedRequest':
+        handler.send_response(HTTP_OK)
+        handler.end_headers()
+        return
+
+    intent = req.get('intent')
+    response = AlexaResponse(handler.server.hass, intent)
+
+    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
+
+    if req_type != 'IntentRequest':
+        _LOGGER.warning('Received unsupported request: %s', req_type)
+        return
+
+    intent_name = intent['name']
+    config = _CONFIG.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.")
+        handler.write_json(response.as_dict())
+        return
+
+    speech = config.get(CONF_SPEECH)
+    card = config.get(CONF_CARD)
+    action = config.get(CONF_ACTION)
+
+    # 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'])
+
+    if action is not None:
+        call_from_config(handler.server.hass, action, True)
+
+    handler.write_json(response.as_dict())
+
+
+class SpeechType(enum.Enum):
+    """ Alexa speech types. """
+    plaintext = "PlainText"
+    ssml = "SSML"
+
+
+class CardType(enum.Enum):
+    """ Alexa card types. """
+    simple = "Simple"
+    link_account = "LinkAccount"
+
+
+class AlexaResponse(object):
+    """ Helps generating the response for Alexa. """
+
+    def __init__(self, hass, intent=None):
+        self.hass = hass
+        self.speech = None
+        self.card = None
+        self.reprompt = None
+        self.session_attributes = {}
+        self.should_end_session = True
+        if intent is not None and 'slots' in intent:
+            self.variables = {key: value['value'] for key, value
+                              in intent['slots'].items() if 'value' in value}
+        else:
+            self.variables = {}
+
+    def add_card(self, card_type, title, content):
+        """ Add a card to the response. """
+        assert self.card is None
+
+        card = {
+            "type": card_type.value
+        }
+
+        if card_type == CardType.link_account:
+            self.card = card
+            return
+
+        card["title"] = self._render(title),
+        card["content"] = self._render(content)
+        self.card = card
+
+    def add_speech(self, speech_type, text):
+        """ Add speech to the response. """
+        assert self.speech is None
+
+        key = 'ssml' if speech_type == SpeechType.ssml else 'text'
+
+        self.speech = {
+            'type': speech_type.value,
+            key: self._render(text)
+        }
+
+    def add_reprompt(self, speech_type, text):
+        """ Add repromopt if user does not answer. """
+        assert self.reprompt is None
+
+        key = 'ssml' if speech_type == SpeechType.ssml else 'text'
+
+        self.reprompt = {
+            'type': speech_type.value,
+            key: self._render(text)
+        }
+
+    def as_dict(self):
+        """ Returns response in an Alexa valid dict. """
+        response = {
+            'shouldEndSession': self.should_end_session
+        }
+
+        if self.card is not None:
+            response['card'] = self.card
+
+        if self.speech is not None:
+            response['outputSpeech'] = self.speech
+
+        if self.reprompt is not None:
+            response['reprompt'] = {
+                'outputSpeech': self.reprompt
+            }
+
+        return {
+            'version': '1.0',
+            'sessionAttributes': self.session_attributes,
+            'response': response,
+        }
+
+    def _render(self, template_string):
+        """ 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,84 @@
+"""
+homeassistant.components.apcupsd
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sets up and provides access to the 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):
+        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 and store it in self._status.
+        """
+        self._status = self._get_status()
--- a/homeassistant/components/api.py
+++ b/homeassistant/components/api.py
@@ -0,0 +1,402 @@
+"""
+homeassistant.components.api
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides a 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 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)
+
+
+DOMAIN = 'api'
+DEPENDENCIES = ['http']
+
+STREAM_PING_PAYLOAD = "ping"
+STREAM_PING_INTERVAL = 50  # seconds
+
+_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)
+
+    return True
+
+
+def _handle_get_api(handler, path_match, data):
+    """ Renders the debug interface. """
+    handler.write_json_message("API running.")
+
+
+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
+
+    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)
+
+            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()
+
+    def forward_events(event):
+        """ Forwards events to the open request. """
+        nonlocal gracefully_closed
+
+        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
+
+        handler.server.sessions.extend_validation(session_id)
+        write_message(json.dumps(event, cls=rem.JSONEncoder))
+
+    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:
+        for event in restrict:
+            hass.bus.listen(event, forward_events)
+    else:
+        hass.bus.listen(MATCH_ALL, forward_events)
+
+    while True:
+        write_message(STREAM_PING_PAYLOAD)
+
+        block.wait(STREAM_PING_INTERVAL)
+
+        if block.is_set():
+            break
+
+    if not gracefully_closed:
+        _LOGGER.info("Found broken event stream to %s, cleaning up",
+                     handler.client_address[0])
+
+    if restrict:
+        for event in restrict:
+            hass.bus.remove_listener(event, forward_events)
+    else:
+        hass.bus.remove_listener(MATCH_ALL, forward_events)
+
+
+def _handle_get_api_config(handler, path_match, data):
+    """ Returns the Home Assistant config. """
+    handler.write_json(handler.server.hass.config.as_dict())
+
+
+def _handle_get_api_bootstrap(handler, path_match, data):
+    """ Returns all data needed to bootstrap Home Assistant. """
+    hass = handler.server.hass
+
+    handler.write_json({
+        'config': hass.config.as_dict(),
+        'states': hass.states.all(),
+        'events': _events_json(hass),
+        'services': _services_json(hass),
+    })
+
+
+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())
+
+
+def _handle_get_api_states_entity(handler, path_match, data):
+    """ Returns the state of a specific entity. """
+    entity_id = path_match.group('entity_id')
+
+    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)
+
+
+def _handle_post_state_entity(handler, path_match, data):
+    """ Handles updating the state of an entity.
+
+    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
+
+    attributes = data['attributes'] if 'attributes' in data else None
+
+    is_new_state = handler.server.hass.states.get(entity_id) is None
+
+    # Write state
+    handler.server.hass.states.set(entity_id, new_state, attributes)
+
+    state = handler.server.hass.states.get(entity_id)
+
+    status_code = HTTP_CREATED if is_new_state else HTTP_OK
+
+    handler.write_json(
+        state.as_dict(),
+        status_code=status_code,
+        location=URL_API_STATES_ENTITY.format(entity_id))
+
+
+def _handle_get_api_events(handler, path_match, data):
+    """ Handles getting overview of event listeners. """
+    handler.write_json(_events_json(handler.server.hass))
+
+
+def _handle_api_post_events_event(handler, path_match, event_data):
+    """ Handles firing of an event.
+
+    This handles the following paths:
+    /api/events/<event_type>
+
+    Events from /api are threated as remote events.
+    """
+    event_type = path_match.group('event_type')
+
+    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)
+
+    event_origin = ha.EventOrigin.remote
+
+    # 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
+
+    handler.server.hass.bus.fire(event_type, event_data, event_origin)
+
+    handler.write_json_message("Event {} fired.".format(event_type))
+
+
+def _handle_get_api_services(handler, path_match, data):
+    """ Handles getting overview of services. """
+    handler.write_json(_services_json(handler.server.hass))
+
+
+# pylint: disable=invalid-name
+def _handle_post_api_services_domain_service(handler, path_match, data):
+    """ Handles calling a service.
+
+    This handles the following paths:
+    /api/services/<domain>/<service>
+    """
+    domain = path_match.group('domain')
+    service = path_match.group('service')
+
+    with TrackStates(handler.server.hass) as changed_states:
+        handler.server.hass.services.call(domain, service, data, True)
+
+    handler.write_json(changed_states)
+
+
+# pylint: disable=invalid-name
+def _handle_post_api_event_forward(handler, path_match, data):
+    """ Handles adding an event forwarding target. """
+
+    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
+
+    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)
+
+    if not api.validate_api():
+        handler.write_json_message(
+            "Unable to validate API", HTTP_UNPROCESSABLE_ENTITY)
+        return
+
+    if handler.server.event_forwarder is None:
+        handler.server.event_forwarder = \
+            rem.EventForwarder(handler.server.hass)
+
+    handler.server.event_forwarder.connect(api)
+
+    handler.write_json_message("Event forwarding setup.")
+
+
+def _handle_delete_api_event_forward(handler, path_match, data):
+    """ Handles deleting an event forwarding target. """
+
+    try:
+        host = data['host']
+    except KeyError:
+        handler.write_json_message("No host received.", HTTP_BAD_REQUEST)
+        return
+
+    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
+
+    if handler.server.event_forwarder is not None:
+        api = rem.API(host, None, port)
+
+        handler.server.event_forwarder.disconnect(api)
+
+    handler.write_json_message("Event forwarding cancelled.")
+
+
+def _handle_get_api_components(handler, path_match, data):
+    """ Returns all the loaded components. """
+
+    handler.write_json(handler.server.hass.config.components)
+
+
+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)
+
+
+def _handle_post_api_log_out(handler, path_match, data):
+    """ Log user out. """
+    handler.send_response(HTTP_OK)
+    handler.destroy_session()
+    handler.end_headers()
+
+
+def _handle_post_api_template(handler, path_match, data):
+    """ Log user out. """
+    template_string = data.get('template', '')
+
+    try:
+        rendered = template.render(handler.server.hass, template_string)
+
+        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
+
+
+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. """
+    return [{"event": key, "listener_count": value}
+            for key, value in hass.bus.listeners.items()]
--- a/homeassistant/components/arduino.py
+++ b/homeassistant/components/arduino.py
@@ -0,0 +1,114 @@
+"""
+components.arduino
+~~~~~~~~~~~~~~~~~~
+Arduino component that connects to a directly attached Arduino board which
+runs 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.helpers import validate_config
+from homeassistant.const import (EVENT_HOMEASSISTANT_START,
+                                 EVENT_HOMEASSISTANT_STOP)
+
+DOMAIN = "arduino"
+REQUIREMENTS = ['PyMata==2.07a']
+BOARD = None
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup(hass, config):
+    """ Setup the Arduino component. """
+
+    if not validate_config(config,
+                           {DOMAIN: ['port']},
+                           _LOGGER):
+        return False
+
+    import serial
+    global BOARD
+    try:
+        BOARD = ArduinoBoard(config[DOMAIN]['port'])
+    except (serial.serialutil.SerialException, FileNotFoundError):
+        _LOGGER.exception("Your port is not accessible.")
+        return False
+
+    if BOARD.get_firmata()[1] <= 2:
+        _LOGGER.error("The StandardFirmata sketch should be 2.2 or newer.")
+        return False
+
+    def stop_arduino(event):
+        """ Stop the Arduino service. """
+        BOARD.disconnect()
+
+    def start_arduino(event):
+        """ Start the Arduino service. """
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_arduino)
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_arduino)
+
+    return True
+
+
+class ArduinoBoard(object):
+    """ Represents an Arduino board. """
+
+    def __init__(self, port):
+        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. """
+        if mode == 'analog' and direction == 'in':
+            self._board.set_pin_mode(pin,
+                                     self._board.INPUT,
+                                     self._board.ANALOG)
+        elif mode == 'analog' and direction == 'out':
+            self._board.set_pin_mode(pin,
+                                     self._board.OUTPUT,
+                                     self._board.ANALOG)
+        elif mode == 'digital' and direction == 'in':
+            self._board.set_pin_mode(pin,
+                                     self._board.OUTPUT,
+                                     self._board.DIGITAL)
+        elif mode == 'digital' and direction == 'out':
+            self._board.set_pin_mode(pin,
+                                     self._board.OUTPUT,
+                                     self._board.DIGITAL)
+        elif mode == 'pwm':
+            self._board.set_pin_mode(pin,
+                                     self._board.OUTPUT,
+                                     self._board.PWM)
+
+    def get_analog_inputs(self):
+        """ 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. """
+        self._board.digital_write(pin, 1)
+
+    def set_digital_out_low(self, pin):
+        """ Sets 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. """
+        self._board.digital_read(pin)
+
+    def get_analog_in(self, pin):
+        """ Gets the value from a given analog pin. """
+        self._board.analog_read(pin)
+
+    def get_firmata(self):
+        """ Return the version of the Firmata firmware. """
+        return self._board.get_firmata_version()
+
+    def disconnect(self):
+        """ Disconnects the board and closes the serial connection. """
+        self._board.reset()
+        self._board.close()
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -0,0 +1,208 @@
+"""
+homeassistant.components.automation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows 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
+
+from homeassistant.bootstrap import prepare_setup_platform
+from homeassistant.const import CONF_PLATFORM
+from homeassistant.components import logbook
+from homeassistant.helpers.service import call_from_config
+
+DOMAIN = 'automation'
+
+DEPENDENCIES = ['group']
+
+CONF_ALIAS = 'alias'
+CONF_SERVICE = 'service'
+
+CONF_CONDITION = 'condition'
+CONF_ACTION = 'action'
+CONF_TRIGGER = 'trigger'
+CONF_CONDITION_TYPE = 'condition_type'
+
+CONDITION_USE_TRIGGER_VALUES = 'use_trigger_values'
+CONDITION_TYPE_AND = 'and'
+CONDITION_TYPE_OR = 'or'
+
+DEFAULT_CONDITION_TYPE = CONDITION_TYPE_AND
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup(hass, config):
+    """ Sets up automation. """
+    config_key = DOMAIN
+    found = 1
+
+    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)
+
+        # 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
+
+
+def _setup_automation(hass, config_block, name, config):
+    """ 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:
+        action = _process_if(hass, config, config_block, action)
+
+        if action is None:
+            return False
+
+    _process_trigger(hass, config, config_block.get(CONF_TRIGGER, []), name,
+                     action)
+    return True
+
+
+def _get_action(hass, config, name):
+    """ Return an action based on a config. """
+
+    if CONF_SERVICE not in config:
+        _LOGGER.error('Error setting up %s, no action specified.', name)
+        return None
+
+    def action():
+        """ Action to be executed. """
+        _LOGGER.info('Executing %s', name)
+        logbook.log_entry(hass, name, 'has been triggered', DOMAIN)
+
+        call_from_config(hass, config)
+
+    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. """
+
+    cond_type = p_config.get(CONF_CONDITION_TYPE,
+                             DEFAULT_CONDITION_TYPE).lower()
+
+    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
+
+        check = platform.if_action(hass, if_config)
+
+        # Invalid conditions are allowed if we base it on trigger
+        if check is None and not use_trigger:
+            return None
+
+        checks.append(check)
+
+    if cond_type == CONDITION_TYPE_AND:
+        def if_action():
+            """ AND all conditions. """
+            if all(check() for check in checks):
+                action()
+    else:
+        def if_action():
+            """ OR all conditions. """
+            if any(check() for check in checks):
+                action()
+
+    return if_action
+
+
+def _process_trigger(hass, config, trigger_configs, name, action):
+    """ Setup triggers. """
+    if isinstance(trigger_configs, dict):
+        trigger_configs = [trigger_configs]
+
+    for conf in trigger_configs:
+        platform = _resolve_platform('trigger', hass, config,
+                                     conf.get(CONF_PLATFORM))
+        if platform is None:
+            continue
+
+        if platform.trigger(hass, conf, action):
+            _LOGGER.info("Initialized rule %s", name)
+        else:
+            _LOGGER.error("Error setting up rule %s", name)
+
+
+def _resolve_platform(method, hass, config, platform):
+    """ Find automation platform. """
+    if platform is None:
+        return None
+    platform = prepare_setup_platform(hass, config, DOMAIN, platform)
+
+    if platform is None or not hasattr(platform, method):
+        _LOGGER.error("Unknown automation platform specified for %s: %s",
+                      method, platform)
+        return None
+
+    return platform
--- a/homeassistant/components/automation/event.py
+++ b/homeassistant/components/automation/event.py
@@ -0,0 +1,34 @@
+"""
+homeassistant.components.automation.event
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+
+CONF_EVENT_TYPE = "event_type"
+CONF_EVENT_DATA = "event_data"
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def trigger(hass, config, action):
+    """ Listen for events based on config. """
+    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. """
+        if not event_data or all(val == event.data.get(key) for key, val
+                                 in event_data.items()):
+            action()
+
+    hass.bus.listen(event_type, handle_event)
+    return True
--- a/homeassistant/components/automation/mqtt.py
+++ b/homeassistant/components/automation/mqtt.py
@@ -0,0 +1,36 @@
+"""
+homeassistant.components.automation.mqtt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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 homeassistant.components.mqtt as mqtt
+
+DEPENDENCIES = ['mqtt']
+
+CONF_TOPIC = 'topic'
+CONF_PAYLOAD = 'payload'
+
+
+def trigger(hass, config, action):
+    """ Listen for state changes based on `config`. """
+    topic = config.get(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. """
+        if payload is None or payload == msg_payload:
+            action()
+
+    mqtt.subscribe(hass, topic, mqtt_automation_listener)
+
+    return True
--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -0,0 +1,110 @@
+"""
+homeassistant.components.automation.numeric_state
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+from homeassistant.helpers.event import track_state_change
+from homeassistant.util import template
+
+
+CONF_ENTITY_ID = "entity_id"
+CONF_BELOW = "below"
+CONF_ABOVE = "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`. """
+    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. """
+
+        # 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()
+
+    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
@@ -0,0 +1,65 @@
+"""
+homeassistant.components.automation.state
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+
+
+CONF_ENTITY_ID = "entity_id"
+CONF_FROM = "from"
+CONF_TO = "to"
+CONF_STATE = "state"
+
+
+def trigger(hass, config, action):
+    """ Listen for state changes based on `config`. """
+    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
+
+    def state_automation_listener(entity, from_s, to_s):
+        """ Listens for state changes and calls action. """
+        action()
+
+    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
@@ -0,0 +1,148 @@
+"""
+homeassistant.components.automation.sun
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+
+from homeassistant.components import sun
+from homeassistant.helpers.event import track_sunrise, track_sunset
+import homeassistant.util.dt as dt_util
+
+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__)
+
+
+def trigger(hass, config, action):
+    """ Listen for events based on config. """
+    event = config.get(CONF_EVENT)
+
+    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
+
+    # Do something to call action
+    if event == EVENT_SUNRISE:
+        track_sunrise(hass, action, offset)
+    else:
+        track_sunset(hass, 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
@@ -0,0 +1,65 @@
+"""
+homeassistant.components.automation.template
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def trigger(hass, config, action):
+    """ Listen for state changes based on `config`. """
+    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. """
+        nonlocal already_triggered
+        template_result = _check_template(hass, value_template)
+
+        # Check to see if template returns true
+        if template_result and not already_triggered:
+            already_triggered = True
+            action()
+        elif not template_result:
+            already_triggered = False
+
+    hass.bus.listen(EVENT_STATE_CHANGED, event_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
@@ -0,0 +1,106 @@
+"""
+homeassistant.components.automation.time
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+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__)
+
+
+def trigger(hass, config, action):
+    """ Listen for state changes based on `config`. """
+    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
+        hours, minutes, seconds = after.hour, after.minute, after.second
+    elif (CONF_HOURS in config or CONF_MINUTES in config or
+          CONF_SECONDS in config):
+        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()
+
+    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
@@ -0,0 +1,88 @@
+"""
+homeassistant.components.automation.zone
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Offers 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
+
+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_ENTITY_ID = "entity_id"
+CONF_ZONE = "zone"
+CONF_EVENT = "event"
+EVENT_ENTER = "enter"
+EVENT_LEAVE = "leave"
+DEFAULT_EVENT = EVENT_ENTER
+
+
+def trigger(hass, config, action):
+    """ Listen for state changes based on `config`. """
+    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)
+
+    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)):
+            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)
+
+        # 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()
+
+    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
@@ -0,0 +1,49 @@
+"""
+homeassistant.components.binary_sensor
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Component to interface with binary sensors (sensors which only know two states)
+that can be monitored.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor/
+"""
+import logging
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.entity import Entity
+from homeassistant.const import (STATE_ON, STATE_OFF)
+
+DOMAIN = 'binary_sensor'
+SCAN_INTERVAL = 30
+
+ENTITY_ID_FORMAT = DOMAIN + '.{}'
+
+
+def setup(hass, config):
+    """ Track states and offer events for binary sensors. """
+    component = EntityComponent(
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
+
+    component.setup(config)
+
+    return True
+
+
+# pylint: disable=no-self-use
+class BinarySensorDevice(Entity):
+    """ Represents a binary sensor. """
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return None
+
+    @property
+    def state(self):
+        """ Returns 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. """
+        return None
--- a/homeassistant/components/binary_sensor/apcupsd.py
+++ b/homeassistant/components/binary_sensor/apcupsd.py
@@ -0,0 +1,44 @@
+"""
+homeassistant.components.binary_sensor.apcupsd
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides a binary sensor to track 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.binary_sensor import BinarySensorDevice
+from homeassistant.components import apcupsd
+
+DEPENDENCIES = [apcupsd.DOMAIN]
+DEFAULT_NAME = "UPS Online Status"
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """ Instantiate an OnlineStatus binary sensor entity and add it to HA. """
+    add_entities((OnlineStatus(config, apcupsd.DATA),))
+
+
+class OnlineStatus(BinarySensorDevice):
+    """ Binary sensor to represent UPS online status. """
+    def __init__(self, config, data):
+        self._config = config
+        self._data = data
+        self._state = None
+        self.update()
+
+    @property
+    def name(self):
+        """ The name of the UPS online status sensor. """
+        return self._config.get("name", DEFAULT_NAME)
+
+    @property
+    def is_on(self):
+        """ True if the UPS is online, else False. """
+        return self._state == apcupsd.VALUE_ONLINE
+
+    def update(self):
+        """
+        Get the status report from APCUPSd (or cache) 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
@@ -0,0 +1,107 @@
+"""
+homeassistant.components.binary_sensor.arest
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The arest sensor will consume an exposed aREST 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
+
+import requests
+
+from homeassistant.util import Throttle
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+# Return cached results if last scan was less then this time ago
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
+
+CONF_RESOURCE = 'resource'
+CONF_PIN = 'pin'
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Get the aREST binary sensor. """
+
+    resource = config.get(CONF_RESOURCE)
+    pin = config.get(CONF_PIN)
+
+    if None in (resource, pin):
+        _LOGGER.error('Not all required config keys present: %s',
+                      ', '.join((CONF_RESOURCE, CONF_PIN)))
+        return False
+
+    try:
+        response = requests.get(resource, timeout=10).json()
+    except requests.exceptions.MissingSchema:
+        _LOGGER.error('Missing resource or schema in configuration. '
+                      'Add http:// to your URL.')
+        return False
+    except requests.exceptions.ConnectionError:
+        _LOGGER.error('No route to device at %s. '
+                      'Please check the IP address in the configuration file.',
+                      resource)
+        return False
+
+    arest = ArestData(resource, pin)
+
+    add_devices([ArestBinarySensor(arest,
+                                   resource,
+                                   config.get('name', response['name']),
+                                   pin)])
+
+
+# pylint: disable=too-many-instance-attributes, too-many-arguments
+class ArestBinarySensor(BinarySensorDevice):
+    """ Implements an aREST binary sensor for a pin. """
+
+    def __init__(self, arest, resource, name, pin):
+        self.arest = arest
+        self._resource = resource
+        self._name = name
+        self._pin = pin
+        self.update()
+
+        if self._pin is not None:
+            request = requests.get('{}/mode/{}/i'.format
+                                   (self._resource, self._pin), timeout=10)
+            if request.status_code is not 200:
+                _LOGGER.error("Can't set mode. Is device offline?")
+
+    @property
+    def name(self):
+        """ The name of the binary sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return bool(self.arest.data.get('state'))
+
+    def update(self):
+        """ Gets 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. """
+
+    def __init__(self, resource, pin):
+        self._resource = resource
+        self._pin = pin
+        self.data = {}
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self):
+        """ Gets the latest data from aREST device. """
+        try:
+            response = requests.get('{}/digital/{}'.format(
+                self._resource, self._pin), timeout=10)
+            self.data = {'state': response.json()['return_value']}
+        except requests.exceptions.ConnectionError:
+            _LOGGER.error("No route to device '%s'. Is device offline?",
+                          self._resource)
--- a/homeassistant/components/binary_sensor/command_sensor.py
+++ b/homeassistant/components/binary_sensor/command_sensor.py
@@ -0,0 +1,84 @@
+"""
+homeassistant.components.binary_sensor.command_sensor
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows to configure custom shell commands to turn a value
+into a logical value for a binary sensor.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.command/
+"""
+import logging
+from datetime import timedelta
+
+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
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = "Binary Command Sensor"
+DEFAULT_PAYLOAD_ON = 'ON'
+DEFAULT_PAYLOAD_OFF = 'OFF'
+
+# Return cached results if last scan was less then this time ago
+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. """
+
+    if config.get('command') is None:
+        _LOGGER.error('Missing required variable: "command"')
+        return False
+
+    data = CommandSensorData(config.get('command'))
+
+    add_devices([CommandBinarySensor(
+        hass,
+        data,
+        config.get('name', DEFAULT_NAME),
+        config.get('payload_on', DEFAULT_PAYLOAD_ON),
+        config.get('payload_off', DEFAULT_PAYLOAD_OFF),
+        config.get(CONF_VALUE_TEMPLATE)
+    )])
+
+
+# pylint: disable=too-many-arguments
+class CommandBinarySensor(BinarySensorDevice):
+    """ Represents a binary sensor that is returning
+    a value of a shell commands. """
+    def __init__(self, hass, data, name, payload_on,
+                 payload_off, value_template):
+        self._hass = hass
+        self.data = data
+        self._name = name
+        self._state = False
+        self._payload_on = payload_on
+        self._payload_off = payload_off
+        self._value_template = value_template
+        self.update()
+
+    @property
+    def name(self):
+        """ The name of the sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return self._state
+
+    def update(self):
+        """ Gets the latest data and updates the state. """
+        self.data.update()
+        value = self.data.value
+
+        if self._value_template is not None:
+            value = template.render_with_possible_json_value(
+                self._hass, self._value_template, value, False)
+        if value == self._payload_on:
+            self._state = True
+        elif value == self._payload_off:
+            self._state = False
--- a/homeassistant/components/binary_sensor/demo.py
+++ b/homeassistant/components/binary_sensor/demo.py
@@ -0,0 +1,37 @@
+"""
+homeassistant.components.binary_sensor.demo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Demo platform that has two fake binary sensors.
+"""
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the Demo binary sensors. """
+    add_devices([
+        DemoBinarySensor('Basement Floor Wet', False),
+        DemoBinarySensor('Movement Backyard', True),
+    ])
+
+
+class DemoBinarySensor(BinarySensorDevice):
+    """ A Demo binary sensor. """
+
+    def __init__(self, name, state):
+        self._name = name
+        self._state = state
+
+    @property
+    def should_poll(self):
+        """ No polling needed for a demo binary sensor. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the binary sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return self._state
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -0,0 +1,84 @@
+"""
+homeassistant.components.binary_sensor.mqtt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows to configure a MQTT binary sensor.
+
+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 homeassistant.components.mqtt as mqtt
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'MQTT Binary sensor'
+DEFAULT_QOS = 0
+DEFAULT_PAYLOAD_ON = 'ON'
+DEFAULT_PAYLOAD_OFF = 'OFF'
+
+DEPENDENCIES = ['mqtt']
+
+
+# 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_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))])
+
+
+# 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):
+        self._hass = hass
+        self._name = name
+        self._state = False
+        self._state_topic = state_topic
+        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. """
+            if value_template is not None:
+                payload = template.render_with_possible_json_value(
+                    hass, value_template, payload)
+            if payload == self._payload_on:
+                self._state = True
+                self.update_ha_state()
+            elif payload == self._payload_off:
+                self._state = False
+                self.update_ha_state()
+
+        mqtt.subscribe(hass, self._state_topic, message_received, self._qos)
+
+    @property
+    def should_poll(self):
+        """ No polling needed. """
+        return False
+
+    @property
+    def name(self):
+        """ The name of the binary sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return self._state
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -0,0 +1,56 @@
+"""
+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 homeassistant.components.nest as nest
+
+from homeassistant.components.sensor.nest import NestSensor
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+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',
+                'hvac_alt_heat_x2_state',
+                'hvac_emer_heat_state',
+                'online']
+
+
+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."
+        )
+
+
+class NestBinarySensor(NestSensor, BinarySensorDevice):
+    """ Represents a Nest binary sensor. """
+
+    @property
+    def is_on(self):
+        """ True if the binary sensor is on. """
+        return bool(getattr(self.device, self.variable))
--- a/homeassistant/components/binary_sensor/rest.py
+++ b/homeassistant/components/binary_sensor/rest.py
@@ -0,0 +1,73 @@
+"""
+homeassistant.components.binary_sensor.rest
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The rest binary sensor will consume responses sent by an exposed REST API.
+
+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.sensor.rest import RestData
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'REST Binary Sensor'
+DEFAULT_METHOD = 'GET'
+
+
+# pylint: disable=unused-variable
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Setup REST binary sensors. """
+    resource = config.get('resource', None)
+    method = config.get('method', DEFAULT_METHOD)
+    payload = config.get('payload', None)
+    verify_ssl = config.get('verify_ssl', True)
+
+    rest = RestData(method, resource, payload, verify_ssl)
+    rest.update()
+
+    if rest.data is None:
+        _LOGGER.error('Unable to fetch Rest data')
+        return False
+
+    add_devices([RestBinarySensor(
+        hass, rest, config.get('name', DEFAULT_NAME),
+        config.get(CONF_VALUE_TEMPLATE))])
+
+
+# pylint: disable=too-many-arguments
+class RestBinarySensor(BinarySensorDevice):
+    """ A REST binary sensor. """
+
+    def __init__(self, hass, rest, name, value_template):
+        """ Initialize a REST binary sensor. """
+        self._hass = hass
+        self.rest = rest
+        self._name = name
+        self._state = False
+        self._value_template = value_template
+        self.update()
+
+    @property
+    def name(self):
+        """ Name of the binary sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ Return 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(
+                self._hass, self._value_template, self.rest.data, False)
+        return bool(int(self.rest.data))
+
+    def update(self):
+        """ Get the latest data from REST API and updates the state. """
+        self.rest.update()
--- a/homeassistant/components/binary_sensor/rpi_gpio.py
+++ b/homeassistant/components/binary_sensor/rpi_gpio.py
@@ -0,0 +1,73 @@
+"""
+homeassistant.components.binary_sensor.rpi_gpio
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Allows to configure a 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)
+
+DEFAULT_PULL_MODE = "UP"
+DEFAULT_BOUNCETIME = 50
+DEFAULT_INVERT_LOGIC = False
+
+DEPENDENCIES = ['rpi_gpio']
+_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. """
+
+    pull_mode = config.get('pull_mode', DEFAULT_PULL_MODE)
+    bouncetime = config.get('bouncetime', DEFAULT_BOUNCETIME)
+    invert_logic = config.get('invert_logic', DEFAULT_INVERT_LOGIC)
+
+    binary_sensors = []
+    ports = config.get('ports')
+    for port_num, port_name in ports.items():
+        binary_sensors.append(RPiGPIOBinarySensor(
+            port_name, port_num, pull_mode, bouncetime, invert_logic))
+    add_devices(binary_sensors)
+
+
+# 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
+
+        self._name = name or DEVICE_DEFAULT_NAME
+        self._port = port
+        self._pull_mode = pull_mode
+        self._bouncetime = bouncetime
+        self._invert_logic = invert_logic
+
+        rpi_gpio.setup_input(self._port, self._pull_mode)
+        self._state = rpi_gpio.read_input(self._port)
+
+        def read_gpio(port):
+            """ Reads 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. """
+        return False
+
+    @property
+    def name(self):
+        """ The name of the sensor. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ Returns the state of the entity. """
+        return self._state != self._invert_logic
--- a/homeassistant/components/binary_sensor/zigbee.py
+++ b/homeassistant/components/binary_sensor/zigbee.py
@@ -0,0 +1,29 @@
+"""
+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. """
+    add_entities([
+        ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))
+    ])
+
+
+class ZigBeeBinarySensor(ZigBeeDigitalIn, BinarySensorDevice):
+    """
+    Use multiple inheritance to turn a ZigBeeDigitalIn into a
+    BinarySensorDevice.
+    """
+    pass
--- a/homeassistant/components/bloomsky.py
+++ b/homeassistant/components/bloomsky.py
@@ -0,0 +1,77 @@
+"""
+homeassistant.components.bloomsky
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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.util import Throttle
+from homeassistant.helpers import validate_config
+from homeassistant.const import CONF_API_KEY
+
+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
+
+    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):
+        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):
+        """
+        Uses the API to retreive a list of devices associated with an
+        account along with all the sensors on the device.
+        """
+        _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,8 +1,10 @@
 """
 homeassistant.components.browser
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to launch a webbrowser on the host machine.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/browser/
 """

 DOMAIN = "browser"
@@ -10,16 +12,16 @@ DOMAIN = "browser"
 SERVICE_BROWSE_URL = "browse_url"


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

    import webbrowser

-    bus.register_service(DOMAIN, SERVICE_BROWSE_URL,
-                         lambda service:
-                         webbrowser.open(
-                             service.data.get('url',
-                                              'https://www.google.com')))
+    hass.services.register(DOMAIN, SERVICE_BROWSE_URL,
+                           lambda service:
+                           webbrowser.open(
+                               service.data.get(
+                                   'url', 'https://www.google.com')))

    return True
--- a/homeassistant/components/camera/init.py
+++ b/homeassistant/components/camera/init.py
@@ -0,0 +1,218 @@
+# pylint: disable=too-many-lines
+"""
+homeassistant.components.camera
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Component to interface with various 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,
+    )
+
+
+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'
+
+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_RECORDING = 'recording'
+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'
+
+
+# pylint: disable=too-many-branches
+def setup(hass, config):
+    """ Track states and offer events for cameras. """
+
+    component = EntityComponent(
+        logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
+        DISCOVERY_PLATFORMS)
+
+    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()
+            camera.mjpeg_stream(handler)
+
+        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. """
+
+    def __init__(self):
+        self.is_streaming = False
+
+    @property
+    # pylint: disable=no-self-use
+    def is_recording(self):
+        """ Returns 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. """
+        return None
+
+    @property
+    # pylint: disable=no-self-use
+    def model(self):
+        """ Returns string of camera model. """
+        return None
+
+    def camera_image(self):
+        """ Return bytes of camera image. """
+        raise NotImplementedError()
+
+    def mjpeg_stream(self, handler):
+        """ Generate an HTTP MJPEG stream from camera images. """
+        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 = self.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)
+
+    @property
+    def state(self):
+        """ Returns the state of the entity. """
+        if self.is_recording:
+            return STATE_RECORDING
+        elif self.is_streaming:
+            return STATE_STREAMING
+        else:
+            return STATE_IDLE
+
+    @property
+    def state_attributes(self):
+        """ Returns optional state attributes. """
+        attr = {
+            ATTR_ENTITY_PICTURE: ENTITY_IMAGE_URL.format(
+                self.entity_id, time.time()),
+        }
+
+        if self.model:
+            attr['model_name'] = self.model
+
+        if self.brand:
+            attr['brand'] = self.brand
+
+        return attr
--- a/homeassistant/components/camera/bloomsky.py
+++ b/homeassistant/components/camera/bloomsky.py
@@ -0,0 +1,60 @@
+"""
+homeassistant.components.camera.bloomsky
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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
+import homeassistant.components.bloomsky as bloomsky
+from homeassistant.components.camera import Camera
+
+DEPENDENCIES = ["bloomsky"]
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ set up access to BloomSky cameras """
+    for device in bloomsky.BLOOMSKY.devices.values():
+        add_devices_callback([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
+
+
+class BloomSkyCamera(Camera):
+    """ Represents the images published from the BloomSky's camera. """
+
+    def __init__(self, bs, device):
+        """ set up 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):
+        """ The name of this BloomSky device. """
+        return self._name
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -0,0 +1,37 @@
+"""
+homeassistant.components.camera.demo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Demo platform that has a fake camera.
+"""
+import os
+from homeassistant.components.camera import Camera
+import homeassistant.util.dt as dt_util
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Sets up the Demo camera. """
+    add_devices([
+        DemoCamera('Demo camera')
+    ])
+
+
+class DemoCamera(Camera):
+    """ A Demo camera. """
+
+    def __init__(self, name):
+        super().__init__()
+        self._name = name
+
+    def camera_image(self):
+        """ Return a faked still image response. """
+        now = dt_util.utcnow()
+
+        image_path = os.path.join(os.path.dirname(__file__),
+                                  'demo_{}.jpg'.format(now.second % 4))
+        with open(image_path, 'rb') as file:
+            return file.read()
+
+    @property
+    def name(self):
+        """ Return the name of this device. """
+        return self._name
--- a/homeassistant/components/camera/demo_0.jpg
+++ b/homeassistant/components/camera/demo_0.jpg
--- a/homeassistant/components/camera/demo_1.jpg
+++ b/homeassistant/components/camera/demo_1.jpg
--- a/homeassistant/components/camera/demo_2.jpg
+++ b/homeassistant/components/camera/demo_2.jpg
--- a/homeassistant/components/camera/demo_3.jpg
+++ b/homeassistant/components/camera/demo_3.jpg
--- a/homeassistant/components/camera/foscam.py
+++ b/homeassistant/components/camera/foscam.py
@@ -0,0 +1,61 @@
+"""
+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
+https://home-assistant.io/components/camera.foscam/
+"""
+import logging
+
+import requests
+
+from homeassistant.helpers import validate_config
+from homeassistant.components.camera import DOMAIN, Camera
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Adds a Foscam IP Camera. """
+    if not validate_config({DOMAIN: config},
+                           {DOMAIN: ['username', 'password', 'ip']}, _LOGGER):
+        return None
+
+    add_devices_callback([FoscamCamera(config)])
+
+
+# pylint: disable=too-many-instance-attributes
+class FoscamCamera(Camera):
+    """ An implementation of a Foscam IP camera. """
+
+    def __init__(self, device_info):
+        super(FoscamCamera, self).__init__()
+
+        ip_address = device_info.get('ip')
+        port = device_info.get('port', 88)
+
+        self._base_url = 'http://' + ip_address + ':' + str(port) + '/'
+        self._username = device_info.get('username')
+        self._password = device_info.get('password')
+        self._snap_picture_url = self._base_url \
+            + 'cgi-bin/CGIProxy.fcgi?cmd=snapPicture2&usr=' \
+            + self._username + '&pwd=' + self._password
+        self._name = device_info.get('name', 'Foscam Camera')
+
+        _LOGGER.info('Using the following URL for %s: %s',
+                     self._name, self._snap_picture_url)
+
+    def camera_image(self):
+        """ Return a still image reponse from the camera. """
+
+        # Send the request to snap a picture and return raw jpg data
+        response = requests.get(self._snap_picture_url)
+
+        return response.content
+
+    @property
+    def name(self):
+        """ Return the name of this device. """
+        return self._name
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -0,0 +1,65 @@
+"""
+homeassistant.components.camera.generic
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for IP Cameras.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/camera.generic/
+"""
+import logging
+
+import requests
+from requests.auth import HTTPBasicAuth
+
+from homeassistant.helpers import validate_config
+from homeassistant.components.camera import DOMAIN, Camera
+
+_LOGGER = logging.getLogger(__name__)
+
+
+# pylint: disable=unused-argument
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Adds a generic IP Camera. """
+    if not validate_config({DOMAIN: config}, {DOMAIN: ['still_image_url']},
+                           _LOGGER):
+        return None
+
+    add_devices_callback([GenericCamera(config)])
+
+
+# pylint: disable=too-many-instance-attributes
+class GenericCamera(Camera):
+    """
+    A generic implementation of an IP camera that is reachable over a URL.
+    """
+
+    def __init__(self, device_info):
+        super().__init__()
+        self._name = device_info.get('name', 'Generic Camera')
+        self._username = device_info.get('username')
+        self._password = device_info.get('password')
+        self._still_image_url = device_info['still_image_url']
+
+    def camera_image(self):
+        """ 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))
+            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)
+            except requests.exceptions.RequestException as error:
+                _LOGGER.error('Error getting camera image: %s', error)
+                return None
+
+        return response.content
+
+    @property
+    def name(self):
+        """ Return the name of this device. """
+        return self._name
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -0,0 +1,92 @@
+"""
+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
+
+import requests
+from requests.auth import HTTPBasicAuth
+
+from homeassistant.helpers import validate_config
+from homeassistant.components.camera import DOMAIN, Camera
+from homeassistant.const import HTTP_OK
+
+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. """
+    if not validate_config({DOMAIN: config}, {DOMAIN: ['mjpeg_url']},
+                           _LOGGER):
+        return None
+
+    add_devices_callback([MjpegCamera(config)])
+
+
+# pylint: disable=too-many-instance-attributes
+class MjpegCamera(Camera):
+    """
+    A generic implementation of an IP camera that is reachable over a URL.
+    """
+
+    def __init__(self, device_info):
+        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_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)
+        else:
+            return requests.get(self._mjpeg_url,
+                                stream=True)
+
+    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. """
+            data = b''
+            for chunk in response.iter_content(1024):
+                data += chunk
+                jpg_start = data.find(b'\xff\xd8')
+                jpg_end = data.find(b'\xff\xd9')
+                if jpg_start != -1 and jpg_end != -1:
+                    jpg = data[jpg_start:jpg_end + 2]
+                    return jpg
+
+        with closing(self.camera_stream()) as response:
+            return process_response(response)
+
+    def mjpeg_stream(self, handler):
+        """ Generate an HTTP MJPEG stream from the camera. """
+        response = self.camera_stream()
+        content_type = response.headers[CONTENT_TYPE_HEADER]
+
+        handler.send_response(HTTP_OK)
+        handler.send_header(CONTENT_TYPE_HEADER, content_type)
+        handler.end_headers()
+
+        for chunk in response.iter_content(chunk_size=1024):
+            if not chunk:
+                break
+            handler.wfile.write(chunk)
+
+    @property
+    def name(self):
+        """ Return the name of this device. """
+        return self._name
--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -0,0 +1,91 @@
+"""
+homeassistant.components.camera.uvc
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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.helpers import validate_config
+from homeassistant.components.camera import DOMAIN, Camera
+
+REQUIREMENTS = ['uvcclient==0.5']
+
+_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')
+    port = int(config.get('port', 7080))
+    key = config.get('key')
+
+    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
+
+    for camera in cameras:
+        add_devices([UnifiVideoCamera(nvrconn,
+                                      camera['uuid'],
+                                      camera['name'])])
+
+
+class UnifiVideoCamera(Camera):
+    """ A Ubiquiti Unifi Video Camera. """
+
+    def __init__(self, nvr, uuid, name):
+        super(UnifiVideoCamera, self).__init__()
+        self._nvr = nvr
+        self._uuid = uuid
+        self._name = name
+        self.is_streaming = False
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def is_recording(self):
+        caminfo = self._nvr.get_camera(self._uuid)
+        return caminfo['recordingSettings']['fullTimeRecordEnabled']
+
+    def camera_image(self):
+        from uvcclient import camera as uvc_camera
+
+        caminfo = self._nvr.get_camera(self._uuid)
+        camera = None
+        for addr in [caminfo['host'], caminfo['internalHost']]:
+            try:
+                camera = uvc_camera.UVCCameraClient(addr,
+                                                    caminfo['username'],
+                                                    'ubnt')
+                _LOGGER.debug('Logged into UVC camera %(name)s via %(addr)s',
+                              dict(name=self._name, addr=addr))
+            except socket.error:
+                pass
+
+        if not camera:
+            _LOGGER.error('Unable to login to camera')
+            return None
+
+        camera.login()
+        return camera.get_snapshot()
--- a/homeassistant/components/chromecast.py
+++ b/homeassistant/components/chromecast.py
@@ -1,275 +0,0 @@
-"""
-homeassistant.components.chromecast
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Provides functionality to interact with Chromecasts.
-"""
-import logging
-
-import homeassistant as ha
-import homeassistant.util as util
-import homeassistant.components as components
-
-DOMAIN = 'chromecast'
-
-SERVICE_YOUTUBE_VIDEO = 'play_youtube_video'
-
-ENTITY_ID_FORMAT = DOMAIN + '.{}'
-STATE_NO_APP = 'no_app'
-
-ATTR_HOST = 'host'
-ATTR_STATE = 'state'
-ATTR_OPTIONS = 'options'
-ATTR_MEDIA_STATE = 'media_state'
-ATTR_MEDIA_CONTENT_ID = 'media_content_id'
-ATTR_MEDIA_TITLE = 'media_title'
-ATTR_MEDIA_ARTIST = 'media_artist'
-ATTR_MEDIA_ALBUM = 'media_album'
-ATTR_MEDIA_IMAGE_URL = 'media_image_url'
-ATTR_MEDIA_VOLUME = 'media_volume'
-ATTR_MEDIA_DURATION = 'media_duration'
-
-MEDIA_STATE_UNKNOWN = 'unknown'
-MEDIA_STATE_PLAYING = 'playing'
-MEDIA_STATE_STOPPED = 'stopped'
-
-
-def is_on(statemachine, entity_id=None):
-    """ Returns true if specified ChromeCast entity_id is on.
-    Will check all chromecasts if no entity_id specified. """
-
-    entity_ids = [entity_id] if entity_id \
-        else util.filter_entity_ids(statemachine.entity_ids, DOMAIN)
-
-    return any(not statemachine.is_state(entity_id, STATE_NO_APP)
-               for entity_id in entity_ids)
-
-
-def turn_off(bus, entity_id=None):
-    """ Will turn off specified Chromecast or all. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_TURN_OFF, data)
-
-
-def volume_up(bus, entity_id=None):
-    """ Send the chromecast the command for volume up. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_VOLUME_UP, data)
-
-
-def volume_down(bus, entity_id=None):
-    """ Send the chromecast the command for volume down. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_VOLUME_DOWN, data)
-
-
-def media_play_pause(bus, entity_id=None):
-    """ Send the chromecast the command for play/pause. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_MEDIA_PLAY_PAUSE, data)
-
-
-def media_next_track(bus, entity_id=None):
-    """ Send the chromecast the command for next track. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_MEDIA_NEXT_TRACK, data)
-
-
-def media_prev_track(bus, entity_id=None):
-    """ Send the chromecast the command for prev track. """
-    data = {components.ATTR_ENTITY_ID: entity_id} if entity_id else {}
-
-    bus.call_service(DOMAIN, components.SERVICE_MEDIA_PREV_TRACK, data)
-
-
-# pylint: disable=too-many-locals, too-many-branches
-def setup(bus, statemachine):
-    """ Listen for chromecast events. """
-    logger = logging.getLogger(__name__)
-
-    try:
-        import pychromecast
-    except ImportError:
-        logger.exception(("Failed to import pychromecast. "
-                          "Did you maybe not install the 'pychromecast' "
-                          "dependency?"))
-
-        return False
-
-    logger.info("Scanning for Chromecasts")
-    hosts = pychromecast.discover_chromecasts()
-
-    casts = {}
-
-    for host in hosts:
-        try:
-            cast = pychromecast.PyChromecast(host)
-
-            entity_id = util.ensure_unique_string(
-                ENTITY_ID_FORMAT.format(
-                    util.slugify(cast.device.friendly_name)),
-                casts.keys())
-
-            casts[entity_id] = cast
-
-        except pychromecast.ConnectionError:
-            pass
-
-    if not casts:
-        logger.error("Could not find Chromecasts")
-        return False
-
-    def update_chromecast_state(entity_id, chromecast):
-        """ Retrieve state of Chromecast and update statemachine. """
-        chromecast.refresh()
-
-        status = chromecast.app
-
-        state_attr = {ATTR_HOST: chromecast.host,
-                      components.ATTR_FRIENDLY_NAME:
-                      chromecast.device.friendly_name}
-
-        if status and status.app_id != pychromecast.APP_ID['HOME']:
-            state = status.app_id
-
-            ramp = chromecast.get_protocol(pychromecast.PROTOCOL_RAMP)
-
-            if ramp and ramp.state != pychromecast.RAMP_STATE_UNKNOWN:
-
-                if ramp.state == pychromecast.RAMP_STATE_PLAYING:
-                    state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_PLAYING
-                else:
-                    state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_STOPPED
-
-                if ramp.content_id:
-                    state_attr[ATTR_MEDIA_CONTENT_ID] = ramp.content_id
-
-                if ramp.title:
-                    state_attr[ATTR_MEDIA_TITLE] = ramp.title
-
-                if ramp.artist:
-                    state_attr[ATTR_MEDIA_ARTIST] = ramp.artist
-
-                if ramp.album:
-                    state_attr[ATTR_MEDIA_ALBUM] = ramp.album
-
-                if ramp.image_url:
-                    state_attr[ATTR_MEDIA_IMAGE_URL] = ramp.image_url
-
-                if ramp.duration:
-                    state_attr[ATTR_MEDIA_DURATION] = ramp.duration
-
-                state_attr[ATTR_MEDIA_VOLUME] = ramp.volume
-        else:
-            state = STATE_NO_APP
-
-        statemachine.set_state(entity_id, state, state_attr)
-
-    def update_chromecast_states(time):  # pylint: disable=unused-argument
-        """ Updates all chromecast states. """
-        logger.info("Updating Chromecast status")
-
-        for entity_id, cast in casts.items():
-            update_chromecast_state(entity_id, cast)
-
-    def _service_to_entities(service):
-        """ Helper method to get entities from service. """
-        entity_ids = components.extract_entity_ids(statemachine, service)
-
-        if entity_ids:
-            for entity_id in entity_ids:
-                cast = casts.get(entity_id)
-
-                if cast:
-                    yield entity_id, cast
-
-        else:
-            for item in casts.items():
-                yield item
-
-    def turn_off_service(service):
-        """ Service to exit any running app on the specified ChromeCast and
-        shows idle screen. Will quit all ChromeCasts if nothing specified.
-        """
-        for entity_id, cast in _service_to_entities(service):
-            cast.quit_app()
-            update_chromecast_state(entity_id, cast)
-
-    def volume_up_service(service):
-        """ Service to send the chromecast the command for volume up. """
-        for _, cast in _service_to_entities(service):
-            ramp = cast.get_protocol(pychromecast.PROTOCOL_RAMP)
-
-            if ramp:
-                ramp.volume_up()
-
-    def volume_down_service(service):
-        """ Service to send the chromecast the command for volume down. """
-        for _, cast in _service_to_entities(service):
-            ramp = cast.get_protocol(pychromecast.PROTOCOL_RAMP)
-
-            if ramp:
-                ramp.volume_down()
-
-    def media_play_pause_service(service):
-        """ Service to send the chromecast the command for play/pause. """
-        for _, cast in _service_to_entities(service):
-            ramp = cast.get_protocol(pychromecast.PROTOCOL_RAMP)
-
-            if ramp:
-                ramp.playpause()
-
-    def media_next_track_service(service):
-        """ Service to send the chromecast the command for next track. """
-        for entity_id, cast in _service_to_entities(service):
-            ramp = cast.get_protocol(pychromecast.PROTOCOL_RAMP)
-
-            if ramp:
-                ramp.next()
-                update_chromecast_state(entity_id, cast)
-
-    def play_youtube_video_service(service, video_id):
-        """ Plays specified video_id on the Chromecast's YouTube channel. """
-        if video_id:  # if service.data.get('video') returned None
-            for entity_id, cast in _service_to_entities(service):
-                pychromecast.play_youtube_video(video_id, cast.host)
-                update_chromecast_state(entity_id, cast)
-
-    ha.track_time_change(bus, update_chromecast_states)
-
-    bus.register_service(DOMAIN, components.SERVICE_TURN_OFF,
-                         turn_off_service)
-
-    bus.register_service(DOMAIN, components.SERVICE_VOLUME_UP,
-                         volume_up_service)
-
-    bus.register_service(DOMAIN, components.SERVICE_VOLUME_DOWN,
-                         volume_down_service)
-
-    bus.register_service(DOMAIN, components.SERVICE_MEDIA_PLAY_PAUSE,
-                         media_play_pause_service)
-
-    bus.register_service(DOMAIN, components.SERVICE_MEDIA_NEXT_TRACK,
-                         media_next_track_service)
-
-    bus.register_service(DOMAIN, "start_fireplace",
-                         lambda service:
-                         play_youtube_video_service(service, "eyU3bRy2x44"))
-
-    bus.register_service(DOMAIN, "start_epic_sax",
-                         lambda service:
-                         play_youtube_video_service(service, "kxopViU98Xo"))
-
-    bus.register_service(DOMAIN, SERVICE_YOUTUBE_VIDEO,
-                         lambda service:
-                         play_youtube_video_service(service,
-                                                    service.data.get('video')))
-
-    update_chromecast_states(None)
-
-    return True
--- a/homeassistant/components/configurator.py
+++ b/homeassistant/components/configurator.py
@@ -0,0 +1,189 @@
+"""
+homeassistant.components.configurator
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A component 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.
+A callback has to be provided to `request_config` which will be called when
+the user has submitted configuration information.
+"""
+import logging
+
+from homeassistant.helpers.entity import generate_entity_id
+from homeassistant.const import EVENT_TIME_CHANGED
+
+DOMAIN = "configurator"
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
+
+SERVICE_CONFIGURE = "configure"
+
+STATE_CONFIGURE = "configure"
+STATE_CONFIGURED = "configured"
+
+ATTR_CONFIGURE_ID = "configure_id"
+ATTR_DESCRIPTION = "description"
+ATTR_DESCRIPTION_IMAGE = "description_image"
+ATTR_SUBMIT_CAPTION = "submit_caption"
+ATTR_FIELDS = "fields"
+ATTR_ERRORS = "errors"
+
+_REQUESTS = {}
+_INSTANCES = {}
+_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. """
+
+    instance = _get_instance(hass)
+
+    request_id = instance.request_config(
+        name, callback,
+        description, description_image, submit_caption, fields)
+
+    _REQUESTS[request_id] = instance
+
+    return request_id
+
+
+def notify_errors(request_id, error):
+    """ Add errors to a config request. """
+    try:
+        _REQUESTS[request_id].notify_errors(request_id, error)
+    except KeyError:
+        # If request_id does not exist
+        pass
+
+
+def request_done(request_id):
+    """ Mark a config request as done. """
+    try:
+        _REQUESTS.pop(request_id).request_done(request_id)
+    except KeyError:
+        # If request_id does not exist
+        pass
+
+
+def setup(hass, config):
+    """ Set up Configurator. """
+    return True
+
+
+def _get_instance(hass):
+    """ Get an instance per hass object. """
+    try:
+        return _INSTANCES[hass]
+    except KeyError:
+        _INSTANCES[hass] = Configurator(hass)
+
+        if DOMAIN not in hass.config.components:
+            hass.config.components.append(DOMAIN)
+
+        return _INSTANCES[hass]
+
+
+class Configurator(object):
+    """
+    Class to keep track of current configuration requests.
+    """
+
+    def __init__(self, hass):
+        self.hass = hass
+        self._cur_id = 0
+        self._requests = {}
+        hass.services.register(
+            DOMAIN, SERVICE_CONFIGURE, self.handle_service_call)
+
+    # pylint: disable=too-many-arguments
+    def request_config(
+            self, name, callback,
+            description, description_image, submit_caption, fields):
+        """ Setup a request for configuration. """
+
+        entity_id = generate_entity_id(ENTITY_ID_FORMAT, name, hass=self.hass)
+
+        if fields is None:
+            fields = []
+
+        request_id = self._generate_unique_id()
+
+        self._requests[request_id] = (entity_id, fields, callback)
+
+        data = {
+            ATTR_CONFIGURE_ID: request_id,
+            ATTR_FIELDS: fields,
+        }
+
+        data.update({
+            key: value for key, value in [
+                (ATTR_DESCRIPTION, description),
+                (ATTR_DESCRIPTION_IMAGE, description_image),
+                (ATTR_SUBMIT_CAPTION, submit_caption),
+            ] if value is not None
+        })
+
+        self.hass.states.set(entity_id, STATE_CONFIGURE, data)
+
+        return request_id
+
+    def notify_errors(self, request_id, error):
+        """ Update the state with errors. """
+        if not self._validate_request_id(request_id):
+            return
+
+        entity_id = self._requests[request_id][0]
+
+        state = self.hass.states.get(entity_id)
+
+        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. """
+        if not self._validate_request_id(request_id):
+            return
+
+        entity_id = self._requests.pop(request_id)[0]
+
+        # If we remove the state right away, it will not be included with
+        # the result fo the service call (current design limitation).
+        # Instead, we will set it to configured to give as feedback but delete
+        # it shortly after so that it is deleted when the client updates.
+        self.hass.states.set(entity_id, STATE_CONFIGURED)
+
+        def deferred_remove(event):
+            """ 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. """
+        request_id = call.data.get(ATTR_CONFIGURE_ID)
+
+        if not self._validate_request_id(request_id):
+            return
+
+        # pylint: disable=unused-variable
+        entity_id, fields, callback = self._requests[request_id]
+
+        # field validation goes here?
+
+        callback(call.data.get(ATTR_FIELDS, {}))
+
+    def _generate_unique_id(self):
+        """ Generates 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. """
+        return request_id in self._requests
--- a/homeassistant/components/conversation.py
+++ b/homeassistant/components/conversation.py
@@ -0,0 +1,77 @@
+"""
+homeassistant.components.conversation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides 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
+
+
+from homeassistant import core
+from homeassistant.const import (
+    ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF)
+
+DOMAIN = "conversation"
+
+SERVICE_PROCESS = "process"
+
+ATTR_TEXT = "text"
+
+REGEX_TURN_COMMAND = re.compile(r'turn (?P<name>(?: |\w)+) (?P<command>\w+)')
+
+REQUIREMENTS = ['fuzzywuzzy==0.8.0']
+
+
+def setup(hass, config):
+    """ Registers the process service. """
+    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()
+
+        match = REGEX_TURN_COMMAND.match(text)
+
+        if not match:
+            logger.error("Unable to process: %s", text)
+            return
+
+        name, command = match.groups()
+
+        entities = {state.entity_id: state.name for state in hass.states.all()}
+
+        entity_ids = fuzzyExtract.extractOne(name,
+                                             entities,
+                                             score_cutoff=65)[2]
+
+        if not entity_ids:
+            logger.error(
+                "Could not find entity id %s from text %s", name, text)
+            return
+
+        if command == 'on':
+            hass.services.call(core.DOMAIN, SERVICE_TURN_ON, {
+                ATTR_ENTITY_ID: entity_ids,
+            }, blocking=True)
+
+        elif command == 'off':
+            hass.services.call(core.DOMAIN, SERVICE_TURN_OFF, {
+                ATTR_ENTITY_ID: entity_ids,
+            }, blocking=True)
+
+        else:
+            logger.error(
+                'Got unsupported command %s from text %s', command, text)
+
+    hass.services.register(DOMAIN, SERVICE_PROCESS, process)
+
+    return True
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -0,0 +1,143 @@
+"""
+homeassistant.components.demo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets up a demo environment that mimics interaction with devices.
+"""
+import time
+
+import homeassistant.core as ha
+import homeassistant.bootstrap as bootstrap
+import homeassistant.loader as loader
+from homeassistant.const import (
+    CONF_PLATFORM, ATTR_ENTITY_ID)
+
+DOMAIN = "demo"
+
+DEPENDENCIES = ['conversation', 'introduction', 'zone']
+
+COMPONENTS_WITH_DEMO_PLATFORM = [
+    'alarm_control_panel',
+    'binary_sensor',
+    'camera',
+    'device_tracker',
+    'garage_door',
+    'light',
+    'lock',
+    'media_player',
+    'notify',
+    'rollershutter',
+    'sensor',
+    'switch',
+    'thermostat',
+]
+
+
+def setup(hass, config):
+    """ Setup a demo environment. """
+    group = loader.get_component('group')
+    configurator = loader.get_component('configurator')
+
+    config.setdefault(ha.DOMAIN, {})
+    config.setdefault(DOMAIN, {})
+
+    if config[DOMAIN].get('hide_demo_state') != 1:
+        hass.states.set('a.Demo_Mode', 'Enabled')
+
+    # Setup sun
+    if not hass.config.latitude:
+        hass.config.latitude = 32.87336
+
+    if not hass.config.longitude:
+        hass.config.longitude = 117.22743
+
+    bootstrap.setup_component(hass, 'sun')
+
+    # Setup demo platforms
+    demo_config = config.copy()
+    for component in COMPONENTS_WITH_DEMO_PLATFORM:
+        demo_config[component] = {CONF_PLATFORM: 'demo'}
+        bootstrap.setup_component(hass, component, demo_config)
+
+    # 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],
+        'scene.romantic_lights'])
+    group.Group(hass, 'bedroom', [lights[0], switches[1],
+                                  media_players[0]])
+    group.Group(hass, 'Rooms', [
+        'group.living_room', 'group.bedroom',
+        'scene.romantic_lights', 'rollershutter.kitchen_window',
+        'rollershutter.living_room_window',
+    ], view=True)
+
+    # Setup scripts
+    bootstrap.setup_component(
+        hass, 'script',
+        {'script': {
+            'demo': {
+                'alias': 'Toggle {}'.format(lights[0].split('.')[1]),
+                'sequence': [{
+                    'execute_service': 'light.turn_off',
+                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                }, {
+                    'delay': {'seconds': 5}
+                }, {
+                    'execute_service': 'light.turn_on',
+                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                }, {
+                    'delay': {'seconds': 5}
+                }, {
+                    'execute_service': 'light.turn_off',
+                    'service_data': {ATTR_ENTITY_ID: lights[0]}
+                }]
+            }}})
+
+    # Setup scenes
+    bootstrap.setup_component(
+        hass, 'scene',
+        {'scene': [
+            {'name': 'Romantic lights',
+             'entities': {
+                 lights[0]: True,
+                 lights[1]: {'state': 'on', 'xy_color': [0.33, 0.66],
+                             'brightness': 200},
+             }},
+            {'name': 'Switch on and off',
+             'entities': {
+                 switches[0]: True,
+                 switches[1]: False,
+             }},
+            ]})
+
+    # Setup configurator
+    configurator_ids = []
+
+    def hue_configuration_callback(data):
+        """ Fake callback, mark config as done. """
+        time.sleep(2)
+
+        # First time it is called, pretend it failed.
+        if len(configurator_ids) == 1:
+            configurator.notify_errors(
+                configurator_ids[0],
+                "Failed to register, please try again.")
+
+            configurator_ids.append(0)
+        else:
+            configurator.request_done(configurator_ids[0])
+
+    request_id = configurator.request_config(
+        hass, "Philips Hue", hue_configuration_callback,
+        description=("Press the button on the bridge to register Philips Hue "
+                     "with Home Assistant."),
+        description_image="/static/images/config_philips_hue.jpg",
+        submit_caption="I have pressed the button"
+    )
+
+    configurator_ids.append(request_id)
+
+    return True
--- a/homeassistant/components/device_sun_light_trigger.py
+++ b/homeassistant/components/device_sun_light_trigger.py
@@ -1,35 +1,51 @@
 """
 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 state of the sun and devices.
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/device_sun_light_trigger/
 """
 import logging
-from datetime import datetime, timedelta
+from datetime import timedelta

-import homeassistant as ha
-import homeassistant.util as util
-import homeassistant.components as components
+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

+DOMAIN = "device_sun_light_trigger"
+DEPENDENCIES = ['light', 'device_tracker', 'group', 'sun']

 LIGHT_TRANSITION_TIME = timedelta(minutes=15)

 # Light profile to be used if none given
 LIGHT_PROFILE = 'relax'

+CONF_LIGHT_PROFILE = 'light_profile'
+CONF_LIGHT_GROUP = 'light_group'
+CONF_DEVICE_GROUP = 'device_group'
+

 # pylint: disable=too-many-branches
-def setup(bus, statemachine,
-          light_group=light.GROUP_NAME_ALL_LIGHTS,
-          light_profile=LIGHT_PROFILE):
+def setup(hass, config):
    """ Triggers to turn lights on or off based on device precense. """

+    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 = util.filter_entity_ids(statemachine.entity_ids,
-                                               device_tracker.DOMAIN)
+    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")
@@ -37,8 +53,7 @@ def setup(bus, statemachine,
        return False

    # Get the light IDs from the specified group
-    light_ids = util.filter_entity_ids(
-        group.get_entity_ids(statemachine, light_group), light.DOMAIN)
+    light_ids = group.get_entity_ids(hass, light_group, light.DOMAIN)

    if not light_ids:
        logger.error("No lights found to turn on ")
@@ -48,14 +63,13 @@ def setup(bus, statemachine,
    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. """
-        next_setting = sun.next_setting(statemachine)
+        next_setting = sun.next_setting(hass)

        if next_setting:
-            return (next_setting - LIGHT_TRANSITION_TIME * len(light_ids))
+            return next_setting - LIGHT_TRANSITION_TIME * len(light_ids)
        else:
            return None

-    # pylint: disable=unused-argument
    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
@@ -64,10 +78,9 @@ def setup(bus, statemachine,
        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(statemachine) and
-               not light.is_on(statemachine, light_id)):
+            if device_tracker.is_on(hass) and not light.is_on(hass, light_id):

-                light.turn_on(bus, light_id,
+                light.turn_on(hass, light_id,
                              transition=LIGHT_TRANSITION_TIME.seconds,
                              profile=light_profile)

@@ -81,58 +94,55 @@ def setup(bus, statemachine,

        if start_point:
            for index, light_id in enumerate(light_ids):
-                ha.track_point_in_time(bus, turn_on(light_id),
-                                       (start_point +
-                                        index * LIGHT_TRANSITION_TIME))
+                track_point_in_time(
+                    hass, turn_on(light_id),
+                    (start_point + index * LIGHT_TRANSITION_TIME))

    # Track every time sun rises so we can schedule a time-based
    # pre-sun set event
-    ha.track_state_change(bus, sun.ENTITY_ID,
-                          schedule_light_on_sun_rise,
-                          sun.STATE_BELOW_HORIZON, sun.STATE_ABOVE_HORIZON)
+    track_state_change(hass, sun.ENTITY_ID, schedule_light_on_sun_rise,
+                       sun.STATE_BELOW_HORIZON, sun.STATE_ABOVE_HORIZON)

    # If the sun is already above horizon
    # schedule the time-based pre-sun set event
-    if sun.is_on(statemachine):
+    if sun.is_on(hass):
        schedule_light_on_sun_rise(None, None, None)

    def check_light_on_dev_state_change(entity, old_state, new_state):
        """ Function to handle tracked device state changes. """
-        lights_are_on = group.is_on(statemachine, light_group)
+        lights_are_on = group.is_on(hass, light_group)

-        light_needed = not (lights_are_on or sun.is_on(statemachine))
+        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 == components.STATE_HOME):
+        if entity != device_tracker.ENTITY_ID_ALL_DEVICES and \
+           new_state.state == STATE_HOME:

            # These variables are needed for the elif check
-            now = datetime.now()
+            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 {}. Turning lights on".
-                    format(entity))
+                    "Home coming event for %s. Turning lights on", entity)

-                light.turn_on(bus, light_ids,
-                              profile=light_profile)
+                light.turn_on(hass, light_ids, profile=light_profile)

            # 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(statemachine)):
+                  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(bus, light_id)
+                        light.turn_on(hass, light_id)

                    else:
                        # If this light didn't happen to be turned on yet so
@@ -140,22 +150,23 @@ def setup(bus, statemachine,
                        break

        # Did all devices leave the house?
-        elif (entity == device_tracker.ENTITY_ID_ALL_DEVICES and
-              new_state.state == components.STATE_NOT_HOME and lights_are_on):
+        elif (entity == device_group and
+              new_state.state == STATE_NOT_HOME and lights_are_on and
+              not disable_turn_off):

            logger.info(
-                "Everyone has left but there are devices on. Turning them off")
+                "Everyone has left but there are lights on. Turning them off")

-            light.turn_off(bus)
+            light.turn_off(hass, light_ids)

-    # Track home coming of each seperate device
-    for entity in device_entity_ids:
-        ha.track_state_change(bus, entity, check_light_on_dev_state_change,
-                              components.STATE_NOT_HOME, components.STATE_HOME)
+    # 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
-    ha.track_state_change(bus, device_tracker.ENTITY_ID_ALL_DEVICES,
-                          check_light_on_dev_state_change,
-                          components.STATE_HOME, components.STATE_NOT_HOME)
+    track_state_change(
+        hass, device_group, check_light_on_dev_state_change,
+        STATE_HOME, STATE_NOT_HOME)

    return True
--- a/homeassistant/components/device_tracker.py
+++ b/homeassistant/components/device_tracker.py
@@ -1,458 +0,0 @@
-"""
-homeassistant.components.tracker
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Provides functionality to keep track of devices.
-"""
-import logging
-import threading
-import os
-import csv
-import re
-import json
-from datetime import datetime, timedelta
-
-import requests
-
-import homeassistant as ha
-import homeassistant.util as util
-import homeassistant.components as components
-
-from homeassistant.components import group
-
-DOMAIN = "device_tracker"
-
-SERVICE_DEVICE_TRACKER_RELOAD = "reload_devices_csv"
-
-GROUP_NAME_ALL_DEVICES = 'all_tracked_devices'
-ENTITY_ID_ALL_DEVICES = group.ENTITY_ID_FORMAT.format(
-    GROUP_NAME_ALL_DEVICES)
-
-ENTITY_ID_FORMAT = DOMAIN + '.{}'
-
-# After how much time do we consider a device not home if
-# it does not show up on scans
-TIME_SPAN_FOR_ERROR_IN_SCANNING = timedelta(minutes=3)
-
-# Return cached results if last scan was less then this time ago
-MIN_TIME_BETWEEN_SCANS = timedelta(seconds=5)
-
-# Filename to save known devices to
-KNOWN_DEVICES_FILE = "known_devices.csv"
-
-
-def is_on(statemachine, entity_id=None):
-    """ Returns if any or specified device is home. """
-    entity = entity_id or ENTITY_ID_ALL_DEVICES
-
-    return statemachine.is_state(entity, components.STATE_HOME)
-
-
-# pylint: disable=too-many-instance-attributes
-class DeviceTracker(object):
-    """ Class that tracks which devices are home and which are not. """
-
-    def __init__(self, bus, statemachine, device_scanner, error_scanning=None):
-        self.statemachine = statemachine
-        self.bus = bus
-        self.device_scanner = device_scanner
-
-        self.error_scanning = error_scanning or TIME_SPAN_FOR_ERROR_IN_SCANNING
-
-        self.logger = logging.getLogger(__name__)
-
-        self.lock = threading.Lock()
-
-        # Dictionary to keep track of known devices and devices we track
-        self.known_devices = {}
-
-        # Did we encounter an invalid known devices file
-        self.invalid_known_devices_file = False
-
-        self._read_known_devices_file()
-
-        # Wrap it in a func instead of lambda so it can be identified in
-        # the bus by its __name__ attribute.
-        def update_device_state(time):  # pylint: disable=unused-argument
-            """ Triggers update of the device states. """
-            self.update_devices()
-
-        ha.track_time_change(bus, update_device_state)
-
-        bus.register_service(DOMAIN,
-                             SERVICE_DEVICE_TRACKER_RELOAD,
-                             lambda service: self._read_known_devices_file())
-
-        self.update_devices()
-
-        group.setup(bus, statemachine, GROUP_NAME_ALL_DEVICES,
-                    list(self.device_entity_ids))
-
-    @property
-    def device_entity_ids(self):
-        """ Returns a set containing all device entity ids
-            that are being tracked. """
-        return set([self.known_devices[device]['entity_id'] for device
-                    in self.known_devices
-                    if self.known_devices[device]['track']])
-
-    def update_devices(self, found_devices=None):
-        """ Update device states based on the found devices. """
-        self.lock.acquire()
-
-        found_devices = found_devices or self.device_scanner.scan_devices()
-
-        now = datetime.now()
-
-        known_dev = self.known_devices
-
-        temp_tracking_devices = [device for device in known_dev
-                                 if known_dev[device]['track']]
-
-        for device in found_devices:
-            # Are we tracking this device?
-            if device in temp_tracking_devices:
-                temp_tracking_devices.remove(device)
-
-                known_dev[device]['last_seen'] = now
-
-                self.statemachine.set_state(
-                    known_dev[device]['entity_id'], components.STATE_HOME)
-
-        # For all devices we did not find, set state to NH
-        # But only if they have been gone for longer then the error time span
-        # Because we do not want to have stuff happening when the device does
-        # not show up for 1 scan beacuse of reboot etc
-        for device in temp_tracking_devices:
-            if (now - known_dev[device]['last_seen'] > self.error_scanning):
-
-                self.statemachine.set_state(known_dev[device]['entity_id'],
-                                            components.STATE_NOT_HOME)
-
-        # If we come along any unknown devices we will write them to the
-        # known devices file but only if we did not encounter an invalid
-        # known devices file
-        if not self.invalid_known_devices_file:
-
-            unknown_devices = [device for device in found_devices
-                               if device not in known_dev]
-
-            if unknown_devices:
-                try:
-                    # If file does not exist we will write the header too
-                    is_new_file = not os.path.isfile(KNOWN_DEVICES_FILE)
-
-                    with open(KNOWN_DEVICES_FILE, 'a') as outp:
-                        self.logger.info((
-                            "DeviceTracker:Found {} new devices,"
-                            " updating {}").format(len(unknown_devices),
-                                                   KNOWN_DEVICES_FILE))
-
-                        writer = csv.writer(outp)
-
-                        if is_new_file:
-                            writer.writerow(("device", "name", "track"))
-
-                        for device in unknown_devices:
-                            # See if the device scanner knows the name
-                            # else defaults to unknown device
-                            name = (self.device_scanner.get_device_name(device)
-                                    or "unknown_device")
-
-                            writer.writerow((device, name, 0))
-                            known_dev[device] = {'name': name,
-                                                 'track': False}
-
-                except IOError:
-                    self.logger.exception((
-                        "DeviceTracker:Error updating {}"
-                        "with {} new devices").format(
-                        KNOWN_DEVICES_FILE, len(unknown_devices)))
-
-        self.lock.release()
-
-    def _read_known_devices_file(self):
-        """ Parse and process the known devices file. """
-
-        # Read known devices if file exists
-        if os.path.isfile(KNOWN_DEVICES_FILE):
-            self.lock.acquire()
-
-            known_devices = {}
-
-            with open(KNOWN_DEVICES_FILE) as inp:
-                default_last_seen = datetime(1990, 1, 1)
-
-                # Temp variable to keep track of which entity ids we use
-                # so we can ensure we have unique entity ids.
-                used_entity_ids = []
-
-                try:
-                    for row in csv.DictReader(inp):
-                        device = row['device']
-
-                        row['track'] = True if row['track'] == '1' else False
-
-                        # If we track this device setup tracking variables
-                        if row['track']:
-                            row['last_seen'] = default_last_seen
-
-                            # Make sure that each device is mapped
-                            # to a unique entity_id name
-                            name = util.slugify(row['name']) if row['name'] \
-                                else "unnamed_device"
-
-                            entity_id = ENTITY_ID_FORMAT.format(name)
-                            tries = 1
-
-                            while entity_id in used_entity_ids:
-                                tries += 1
-
-                                suffix = "_{}".format(tries)
-
-                                entity_id = ENTITY_ID_FORMAT.format(
-                                    name + suffix)
-
-                            row['entity_id'] = entity_id
-                            used_entity_ids.append(entity_id)
-
-                        known_devices[device] = row
-
-                    if not known_devices:
-                        self.logger.warning(
-                            "No devices to track. Please update {}.".format(
-                                KNOWN_DEVICES_FILE))
-
-                    # Remove entities that are no longer maintained
-                    new_entity_ids = set([known_devices[device]['entity_id']
-                                         for device in known_devices
-                                         if known_devices[device]['track']])
-
-                    for entity_id in \
-                            self.device_entity_ids - new_entity_ids:
-
-                        self.logger.info(
-                            "DeviceTracker:Removing entity {}".format(
-                                entity_id))
-                        self.statemachine.remove_entity(entity_id)
-
-                    # File parsed, warnings given if necessary
-                    # entities cleaned up, make it available
-                    self.known_devices = known_devices
-
-                    self.logger.info(
-                        "DeviceTracker:Loaded devices from {}".format(
-                            KNOWN_DEVICES_FILE))
-
-                except KeyError:
-                    self.invalid_known_devices_file = True
-                    self.logger.warning((
-                        "Invalid {} found. "
-                        "We won't update it with new found devices.").
-                        format(KNOWN_DEVICES_FILE))
-
-                finally:
-                    self.lock.release()
-
-
-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/
-    """
-
-    def __init__(self, host, username, password, http_id):
-        self.req = requests.Request('POST',
-                                    'http://{}/update.cgi'.format(host),
-                                    data={'_http_id': http_id,
-                                          'exec': 'devlist'},
-                                    auth=requests.auth.HTTPBasicAuth(
-                                        username, password)).prepare()
-
-        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
-
-        self.logger = logging.getLogger(__name__)
-        self.lock = threading.Lock()
-
-        self.date_updated = None
-        self.last_results = {"wldev": [], "dhcpd_lease": []}
-
-        self.success_init = self._update_tomato_info()
-
-    def scan_devices(self):
-        """ Scans for new devices and return a
-            list containing 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. """
-
-        # Make sure there are results
-        if not self.date_updated:
-            self._update_tomato_info()
-
-        filter_named = [item[0] for item in self.last_results['dhcpd_lease']
-                        if item[2] == device]
-
-        if not filter_named or not filter_named[0]:
-            return None
-        else:
-            return filter_named[0]
-
-    def _update_tomato_info(self):
-        """ Ensures the information from the Tomato router is up to date.
-            Returns boolean if scanning successful. """
-
-        self.lock.acquire()
-
-        # if date_updated is None or the date is too old we scan for new data
-        if (not self.date_updated or datetime.now() - self.date_updated >
-           MIN_TIME_BETWEEN_SCANS):
-
-            self.logger.info("Tomato: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/
-                if response.status_code == 200:
-
-                    for param, value in \
-                            self.parse_api_pattern.findall(response.text):
-
-                        if param == 'wldev' or param == 'dhcpd_lease':
-                            self.last_results[param] = \
-                                json.loads(value.replace("'", '"'))
-
-                    self.date_updated = datetime.now()
-
-                    return True
-
-                elif response.status_code == 401:
-                    # Authentication error
-                    self.logger.exception((
-                        "Tomato: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
-                self.logger.exception((
-                    "Tomato: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
-                self.logger.exception(
-                    "Tomato:Connection to the router timed out")
-
-                return False
-
-            except ValueError:
-                # If json decoder could not parse the response
-                self.logger.exception(
-                    "Tomato:Failed to parse response from router")
-
-                return False
-
-            finally:
-                self.lock.release()
-
-        else:
-            # We acquired the lock before the IF check,
-            # release it before we return True
-            self.lock.release()
-
-            return True
-
-
-class NetgearDeviceScanner(object):
-    """ This class queries a Netgear wireless router using the SOAP-api. """
-
-    def __init__(self, host, username, password):
-        self.logger = logging.getLogger(__name__)
-        self.date_updated = None
-        self.last_results = []
-
-        try:
-            import homeassistant.external.pynetgear as pynetgear
-        except ImportError:
-            self.logger.exception(
-                ("Netgear:Failed to import pynetgear. "
-                 "Did you maybe not cloned the git submodules?"))
-
-            self.success_init = False
-
-            return
-
-        self._api = pynetgear.Netgear(host, username, password)
-        self.lock = threading.Lock()
-
-        self.logger.info("Netgear:Logging in")
-        if self._api.login():
-            self.success_init = True
-            self._update_info()
-
-        else:
-            self.logger.error("Netgear:Failed to Login")
-
-            self.success_init = False
-
-    def scan_devices(self):
-        """ Scans for new devices and return a
-            list containing 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. """
-
-        # Make sure there are results
-        if not self.date_updated:
-            self._update_info()
-
-        filter_named = [device.name for device in self.last_results
-                        if device.mac == mac]
-
-        if filter_named:
-            return filter_named[0]
-        else:
-            return None
-
-    def _update_info(self):
-        """ Retrieves latest information from the Netgear router.
-            Returns boolean if scanning successful. """
-        if not self.success_init:
-            return
-
-        with self.lock:
-            # if date_updated is None or the date is too old we scan for
-            # new data
-            if (not self.date_updated or datetime.now() - self.date_updated >
-               MIN_TIME_BETWEEN_SCANS):
-
-                self.logger.info("Netgear:Scanning")
-
-                self.last_results = self._api.get_attached_devices()
-
-                self.date_updated = datetime.now()
-
-                return
-
-            else:
-                return
--- a/homeassistant/components/device_tracker/init.py
+++ b/homeassistant/components/device_tracker/init.py
@@ -0,0 +1,433 @@
+"""
+homeassistant.components.device_tracker
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Provides 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.config import load_yaml_config_file
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_per_platform
+from homeassistant.helpers.entity import Entity
+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,
+    DEVICE_DEFAULT_NAME, STATE_HOME, STATE_NOT_HOME)
+
+DOMAIN = "device_tracker"
+DEPENDENCIES = ['zone']
+
+GROUP_NAME_ALL_DEVICES = 'all devices'
+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"
+DEFAULT_CONF_TRACK_NEW = True
+
+CONF_CONSIDER_HOME = 'consider_home'
+DEFAULT_CONSIDER_HOME = 180  # seconds
+
+CONF_SCAN_INTERVAL = "interval_seconds"
+DEFAULT_SCAN_INTERVAL = 12
+
+CONF_AWAY_HIDE = 'hide_if_away'
+DEFAULT_AWAY_HIDE = False
+
+CONF_HOME_RANGE = 'home_range'
+DEFAULT_HOME_RANGE = 100
+
+SERVICE_SEE = 'see'
+
+ATTR_MAC = 'mac'
+ATTR_DEV_ID = 'dev_id'
+ATTR_HOST_NAME = 'host_name'
+ATTR_LOCATION_NAME = 'location_name'
+ATTR_GPS = 'gps'
+ATTR_BATTERY = 'battery'
+
+DISCOVERY_PLATFORMS = {
+    discovery.SERVICE_NETGEAR: 'netgear',
+}
+_LOGGER = logging.getLogger(__name__)
+
+# pylint: disable=too-many-arguments
+
+
+def is_on(hass, entity_id=None):
+    """ Returns if any or specified device is home. """
+    entity = entity_id or ENTITY_ID_ALL_DEVICES
+
+    return hass.states.is_state(entity, STATE_HOME)
+
+
+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. """
+    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}
+    hass.services.call(DOMAIN, SERVICE_SEE, data)
+
+
+def setup(hass, config):
+    """ 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, {})
+    if isinstance(conf, list):
+        conf = conf[0]
+    consider_home = timedelta(
+        seconds=util.convert(conf.get(CONF_CONSIDER_HOME), int,
+                             DEFAULT_CONSIDER_HOME))
+    track_new = util.convert(conf.get(CONF_TRACK_NEW), bool,
+                             DEFAULT_CONF_TRACK_NEW)
+    home_range = util.convert(conf.get(CONF_HOME_RANGE), int,
+                              DEFAULT_HOME_RANGE)
+
+    devices = load_config(yaml_path, hass, consider_home, home_range)
+    tracker = DeviceTracker(hass, consider_home, track_new, home_range,
+                            devices)
+
+    def setup_platform(p_type, p_config, disc_info=None):
+        """ Setup a device tracker platform. """
+        platform = prepare_setup_platform(hass, config, DOMAIN, p_type)
+        if platform is None:
+            return
+
+        try:
+            if hasattr(platform, 'get_scanner'):
+                scanner = platform.get_scanner(hass, {DOMAIN: p_config})
+
+                if scanner is None:
+                    _LOGGER.error('Error setting up platform %s', p_type)
+                    return
+
+                setup_scanner_platform(hass, p_config, scanner, tracker.see)
+                return
+
+            if not platform.setup_scanner(hass, p_config, tracker.see):
+                _LOGGER.error('Error setting up platform %s', p_type)
+        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):
+        setup_platform(p_type, p_config)
+
+    def device_tracker_discovered(service, info):
+        """ 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. """
+        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. """
+        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)}
+        tracker.see(**args)
+
+    descriptions = load_yaml_config_file(
+        os.path.join(os.path.dirname(__file__), 'services.yaml'))
+    hass.services.register(DOMAIN, SERVICE_SEE, see_service,
+                           descriptions.get(SERVICE_SEE))
+
+    return True
+
+
+class DeviceTracker(object):
+    """ Track devices """
+    def __init__(self, hass, consider_home, track_new, home_range, devices):
+        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}
+        self.consider_home = consider_home
+        self.track_new = track_new
+        self.home_range = home_range
+        self.lock = threading.Lock()
+
+        for device in devices:
+            if device.track:
+                device.update_ha_state()
+
+        self.group = None
+
+    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. """
+        with self.lock:
+            if mac is None and dev_id is None:
+                raise HomeAssistantError('Neither mac or device id passed in')
+            elif mac is not None:
+                mac = mac.upper()
+                device = self.mac_to_dev.get(mac)
+                if not device:
+                    dev_id = util.slugify(host_name or '') or util.slugify(mac)
+            else:
+                dev_id = str(dev_id).lower()
+                device = self.devices.get(dev_id)
+
+            if device:
+                device.seen(host_name, location_name, gps, gps_accuracy,
+                            battery)
+                if device.track:
+                    device.update_ha_state()
+                return
+
+            # If no device can be found, create it
+            device = Device(
+                self.hass, self.consider_home, self.home_range, self.track_new,
+                dev_id, mac, (host_name or dev_id).replace('_', ' '))
+            self.devices[dev_id] = device
+            if mac is not None:
+                self.mac_to_dev[mac] = device
+
+            device.seen(host_name, location_name, gps, gps_accuracy, battery)
+            if device.track:
+                device.update_ha_state()
+
+            # During init, we ignore the group
+            if self.group is not None:
+                self.group.update_tracked_entity_ids(
+                    list(self.group.tracking) + [device.entity_id])
+            update_config(self.hass.config.path(YAML_DEVICES), dev_id, device)
+
+    def setup_group(self):
+        """ Initializes 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. """
+        with self.lock:
+            for device in self.devices.values():
+                if (device.track and device.last_update_home and
+                        device.stale(now)):
+                    device.update_ha_state(True)
+
+
+class Device(Entity):
+    """ Tracked device. """
+
+    host_name = None
+    location_name = None
+    gps = None
+    gps_accuracy = 0
+    last_seen = None
+    battery = None
+
+    # 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):
+        self.hass = hass
+        self.entity_id = ENTITY_ID_FORMAT.format(dev_id)
+
+        # Timedelta object how long we consider a device home if it is not
+        # detected anymore.
+        self.consider_home = consider_home
+
+        # Distance in meters
+        self.home_range = home_range
+        # Device ID
+        self.dev_id = dev_id
+        self.mac = mac
+
+        # If we should track this device
+        self.track = track
+
+        # Configured name
+        self.config_name = name
+
+        # Configured picture
+        self.config_picture = picture
+        self.away_hide = away_hide
+
+    @property
+    def gps_home(self):
+        """ 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 self.config_name or self.host_name or DEVICE_DEFAULT_NAME
+
+    @property
+    def state(self):
+        """ State of the device. """
+        return self._state
+
+    @property
+    def state_attributes(self):
+        """ Device state attributes. """
+        attr = {}
+
+        if self.config_picture:
+            attr[ATTR_ENTITY_PICTURE] = self.config_picture
+
+        if self.gps:
+            attr[ATTR_LATITUDE] = self.gps[0]
+            attr[ATTR_LONGITUDE] = self.gps[1]
+            attr[ATTR_GPS_ACCURACY] = self.gps_accuracy
+
+        if self.battery:
+            attr[ATTR_BATTERY] = self.battery
+
+        return attr
+
+    @property
+    def hidden(self):
+        """ 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. """
+        self.last_seen = dt_util.utcnow()
+        self.host_name = host_name
+        self.location_name = location_name
+        self.gps_accuracy = gps_accuracy or 0
+        self.battery = battery
+        if gps is None:
+            self.gps = None
+        else:
+            try:
+                self.gps = tuple(float(val) for val in gps)
+            except ValueError:
+                _LOGGER.warning('Could not parse gps value for %s: %s',
+                                self.dev_id, gps)
+                self.gps = None
+        self.update()
+
+    def stale(self, now=None):
+        """ 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. """
+        if not self.last_seen:
+            return
+        elif self.location_name:
+            self._state = self.location_name
+        elif self.gps is not None:
+            zone_state = zone.active_zone(self.hass, self.gps[0], self.gps[1],
+                                          self.gps_accuracy)
+            if zone_state is None:
+                self._state = STATE_NOT_HOME
+            elif zone_state.entity_id == zone.ENTITY_ID_HOME:
+                self._state = STATE_HOME
+            else:
+                self._state = zone_state.name
+
+        elif self.stale():
+            self._state = STATE_NOT_HOME
+            self.last_update_home = False
+        else:
+            self._state = STATE_HOME
+            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. """
+    if not os.path.isfile(path):
+        return []
+    return [
+        Device(hass, consider_home, home_range, device.get('track', False),
+               str(dev_id).lower(), str(device.get('mac')).upper(),
+               device.get('name'), device.get('picture'),
+               device.get(CONF_AWAY_HIDE, DEFAULT_AWAY_HIDE))
+        for dev_id, device in load_yaml_config_file(path).items()]
+
+
+def setup_scanner_platform(hass, config, scanner, see_device):
+    """ Helper method to connect scanner-based platform to device tracker. """
+    interval = util.convert(config.get(CONF_SCAN_INTERVAL), int,
+                            DEFAULT_SCAN_INTERVAL)
+
+    # Initial scan of each mac we also tell about host name for config
+    seen = set()
+
+    def device_tracker_scan(now):
+        """ Called when interval matches. """
+        for mac in scanner.scan_devices():
+            if mac in seen:
+                host_name = None
+            else:
+                host_name = scanner.get_device_name(mac)
+                seen.add(mac)
+            see_device(mac=mac, host_name=host_name)
+
+    track_utc_time_change(hass, device_tracker_scan, second=range(0, 60,
+                                                                  interval))
+
+    device_tracker_scan(None)
+
+
+def update_config(path, dev_id, device):
+    """ Add device to YAML config file. """
+    with open(path, 'a') as out:
+        out.write('\n')
+        out.write('{}:\n'.format(device.dev_id))
+
+        for key, value in (('name', device.name), ('mac', device.mac),
+                           ('picture', device.config_picture),
+                           ('track', 'yes' if device.track else 'no'),
+                           (CONF_AWAY_HIDE,
+                            'yes' if device.away_hide else 'no')):
+            out.write('  {}: {}\n'.format(key, '' if value is None else value))
--- a/homeassistant/components/device_tracker/actiontec.py
+++ b/homeassistant/components/device_tracker/actiontec.py
@@ -0,0 +1,134 @@
+"""
+homeassistant.components.device_tracker.actiontec
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning an Actiontec MI424WR
+(Verizon FIOS) router for device presence.
+
+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 homeassistant.util.dt as dt_util
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+_LEASES_REGEX = re.compile(
+    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})' +
+    r'\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))' +
+    r'\svalid\sfor:\s(?P<timevalid>(-?\d+))' +
+    r'\ssec')
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """ Validates config and returns an Actiontec scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+    scanner = ActiontecDeviceScanner(config[DOMAIN])
+    return scanner if scanner.success_init else None
+
+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.
+    """
+
+    def __init__(self, config):
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+        self.lock = threading.Lock()
+        self.last_results = []
+        data = self.get_actiontec_data()
+        self.success_init = data is not None
+        _LOGGER.info("actiontec scanner initialized")
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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. """
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client.mac == device:
+                return client.ip
+        return None
+
+    @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.
+        """
+        _LOGGER.info("Scanning")
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            now = dt_util.now()
+            actiontec_data = self.get_actiontec_data()
+            if not actiontec_data:
+                return False
+            self.last_results = [Device(data['mac'], name, now)
+                                 for name, data in actiontec_data.items()
+                                 if data['timevalid'] > -60]
+            _LOGGER.info("actiontec scan successful")
+            return True
+
+    def get_actiontec_data(self):
+        """ Retrieve data from Actiontec MI424WR and return parsed result. """
+        try:
+            telnet = telnetlib.Telnet(self.host)
+            telnet.read_until(b'Username: ')
+            telnet.write((self.username + '\n').encode('ascii'))
+            telnet.read_until(b'Password: ')
+            telnet.write((self.password + '\n').encode('ascii'))
+            prompt = telnet.read_until(
+                b'Wireless Broadband Router> ').split(b'\n')[-1]
+            telnet.write('firewall mac_cache_dump\n'.encode('ascii'))
+            telnet.write('\n'.encode('ascii'))
+            telnet.read_until(prompt)
+            leases_result = telnet.read_until(prompt).split(b'\n')[1:-1]
+            telnet.write('exit\n'.encode('ascii'))
+        except EOFError:
+            _LOGGER.exception("Unexpected response from router")
+            return
+        except ConnectionRefusedError:
+            _LOGGER.exception("Connection refused by router," +
+                              " is telnet enabled?")
+            return None
+
+        devices = {}
+        for lease in leases_result:
+            match = _LEASES_REGEX.search(lease.decode('utf-8'))
+            if match is not None:
+                devices[match.group('ip')] = {
+                    'ip': match.group('ip'),
+                    'mac': match.group('mac').upper(),
+                    'timevalid': int(match.group('timevalid'))
+                    }
+        return devices
--- a/homeassistant/components/device_tracker/aruba.py
+++ b/homeassistant/components/device_tracker/aruba.py
@@ -0,0 +1,140 @@
+"""
+homeassistant.components.device_tracker.aruba
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a Aruba Access Point for device
+presence.
+
+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
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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(
+    r'(?P<name>([^\s]+))\s+' +
+    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s+' +
+    r'(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))\s+')
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """ Validates config and returns a Aruba scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = ArubaDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+class ArubaDeviceScanner(object):
+    """ This class queries a Aruba Acces Point for connected devices. """
+
+    def __init__(self, config):
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        # 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.
+        """
+
+        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. """
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client['mac'] == device:
+                return client['name']
+        return None
+
+    @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.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            data = self.get_aruba_data()
+            if not data:
+                return False
+
+            self.last_results = data.values()
+            return True
+
+    def get_aruba_data(self):
+        """ 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
+        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:
+            match = _DEVICES_REGEX.search(device.decode('utf-8'))
+            if match:
+                devices[match.group('ip')] = {
+                    '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
@@ -0,0 +1,162 @@
+"""
+homeassistant.components.device_tracker.asuswrt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a ASUSWRT router for device
+presence.
+
+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 telnetlib
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+_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]+))')
+
+_IP_NEIGH_REGEX = re.compile(
+    r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s' +
+    r'\w+\s' +
+    r'\w+\s' +
+    r'(\w+\s(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))))?\s' +
+    r'(?P<status>(\w+))')
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """ Validates config and returns an ASUS-WRT scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = AsusWrtDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+class AsusWrtDeviceScanner(object):
+    """
+    This class queries a router running ASUSWRT firmware
+    for connected devices. Adapted from DD-WRT scanner.
+    """
+
+    def __init__(self, config):
+        self.host = config[CONF_HOST]
+        self.username = str(config[CONF_USERNAME])
+        self.password = str(config[CONF_PASSWORD])
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        # 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.
+        """
+
+        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. """
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client['mac'] == device:
+                return client['host']
+        return None
+
+    @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.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+            data = self.get_asuswrt_data()
+            if not data:
+                return False
+
+            active_clients = [client for client in data.values() if
+                              client['status'] == 'REACHABLE' or
+                              client['status'] == 'DELAY' or
+                              client['status'] == 'STALE']
+            self.last_results = active_clients
+            return True
+
+    def get_asuswrt_data(self):
+        """ Retrieve data from ASUSWRT and return parsed result. """
+        try:
+            telnet = telnetlib.Telnet(self.host)
+            telnet.read_until(b'login: ')
+            telnet.write((self.username + '\n').encode('ascii'))
+            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'))
+            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]
+            telnet.write('exit\n'.encode('ascii'))
+        except EOFError:
+            _LOGGER.exception("Unexpected response from router")
+            return
+        except ConnectionRefusedError:
+            _LOGGER.exception("Connection refused by router," +
+                              " is telnet enabled?")
+            return
+
+        devices = {}
+        for lease in leases_result:
+            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 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(),
+                }
+
+        for neighbor in neighbors:
+            match = _IP_NEIGH_REGEX.search(neighbor.decode('utf-8'))
+            if not match:
+                _LOGGER.warning("Could not parse neighbor row: %s", neighbor)
+                continue
+            if match.group('ip') in devices:
+                devices[match.group('ip')]['status'] = match.group('status')
+        return devices
--- a/homeassistant/components/device_tracker/ddwrt.py
+++ b/homeassistant/components/device_tracker/ddwrt.py
@@ -0,0 +1,172 @@
+"""
+homeassistant.components.device_tracker.ddwrt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a DD-WRT router for device
+presence.
+
+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
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+_DDWRT_DATA_REGEX = re.compile(r'\{(\w+)::([^\}]*)\}')
+_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. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = DdWrtDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+# 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.
+    """
+
+    def __init__(self, config):
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        self.mac2name = {}
+
+        # Test the router is accessible
+        url = 'http://{}/Status_Wireless.live.asp'.format(self.host)
+        data = self.get_ddwrt_data(url)
+        self.success_init = data is not None
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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. """
+
+        with self.lock:
+            # 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)
+
+                if not data:
+                    return None
+
+                dhcp_leases = data.get('dhcp_leases', None)
+
+                if not dhcp_leases:
+                    return None
+
+                # 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
+                    # every 5 elements represents one hosts, the MAC
+                    # is the third element and the name is the first
+                    mac_index = (idx * 5) + 2
+                    if mac_index < len(elements):
+                        mac = elements[mac_index]
+                        self.mac2name[mac] = elements[idx * 5]
+
+            return self.mac2name.get(device)
+
+    @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.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+
+            url = 'http://{}/Status_Wireless.live.asp'.format(self.host)
+            data = self.get_ddwrt_data(url)
+
+            if not data:
+                return False
+
+            self.last_results = []
+
+            active_clients = data.get('active_wireless', None)
+            if not active_clients:
+                return False
+
+            # This is really lame, instead of using JSON the DD-WRT UI
+            # uses its own data format for some reason and then
+            # regex's out values so I guess I have to do the same,
+            # LAME!!!
+
+            # remove leading and trailing single quotes
+            clean_str = active_clients.strip().strip("'")
+            elements = clean_str.split("','")
+
+            self.last_results.extend(item for item in elements
+                                     if _MAC_REGEX.match(item))
+
+            return True
+
+    def get_ddwrt_data(self, url):
+        """ Retrieve data from DD-WRT and return parsed result. """
+        try:
+            response = requests.get(
+                url,
+                auth=(self.username, self.password),
+                timeout=4)
+        except requests.exceptions.Timeout:
+            _LOGGER.exception("Connection to the router timed out")
+            return
+        if response.status_code == 200:
+            return _parse_ddwrt_response(response.text)
+        elif response.status_code == 401:
+            # Authentication error
+            _LOGGER.exception(
+                "Failed to authenticate, "
+                "please check your username and password")
+            return
+        else:
+            _LOGGER.error("Invalid response from ddwrt: %s", response)
+
+
+def _parse_ddwrt_response(data_str):
+    """ 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
@@ -0,0 +1,49 @@
+"""
+homeassistant.components.device_tracker.demo
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Demo platform for the device tracker.
+
+device_tracker:
+  platform: demo
+"""
+import random
+
+from homeassistant.components.device_tracker import DOMAIN
+
+
+def setup_scanner(hass, config, see):
+    """ Set up a demo tracker. """
+
+    def offset():
+        """ Return random offset. """
+        return (random.randrange(500, 2000)) / 2e5 * random.choice((-1, 1))
+
+    def random_see(dev_id, name):
+        """ Randomize a sighting. """
+        see(
+            dev_id=dev_id,
+            host_name=name,
+            gps=(hass.config.latitude + offset(),
+                 hass.config.longitude + offset()),
+            gps_accuracy=random.randrange(50, 150),
+            battery=random.randrange(10, 90)
+        )
+
+    def observe(call=None):
+        """ Observe three entities. """
+        random_see('demo_paulus', 'Paulus')
+        random_see('demo_anne_therese', 'Anne Therese')
+
+    observe()
+
+    see(
+        dev_id='demo_home_boy',
+        host_name='Home Boy',
+        gps=[hass.config.latitude - 0.00002, hass.config.longitude + 0.00002],
+        gps_accuracy=20,
+        battery=53
+    )
+
+    hass.services.register(DOMAIN, 'demo', observe)
+
+    return True
--- a/homeassistant/components/device_tracker/fritz.py
+++ b/homeassistant/components/device_tracker/fritz.py
@@ -0,0 +1,116 @@
+"""
+homeassistant.components.device_tracker.fritz
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a FRITZ!Box router for device
+presence.
+
+For more details about this platform, please refer to the documentation at
+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.helpers import validate_config
+from homeassistant.util import Throttle
+from homeassistant.components.device_tracker import DOMAIN
+
+REQUIREMENTS = ['fritzconnection==0.4.6']
+
+# 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. """
+    if not validate_config(config,
+                           {DOMAIN: []},
+                           _LOGGER):
+        return None
+
+    scanner = FritzBoxScanner(config[DOMAIN])
+    return scanner if scanner.success_init else None
+
+
+# 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.
+
+    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):
+        self.last_results = []
+        self.host = '169.254.1.1'  # This IP is valid for all fritzboxes
+        self.username = 'admin'
+        self.password = ''
+        self.success_init = True
+
+        # pylint: disable=import-error
+        import fritzconnection as fc
+
+        # Check for user specific configuration
+        if CONF_HOST in config.keys():
+            self.host = config[CONF_HOST]
+        if CONF_USERNAME in config.keys():
+            self.username = config[CONF_USERNAME]
+        if CONF_PASSWORD in config.keys():
+            self.password = config[CONF_PASSWORD]
+
+        # Establish a connection to the FRITZ!Box
+        try:
+            self.fritz_box = fc.FritzHosts(address=self.host,
+                                           user=self.username,
+                                           password=self.password)
+        except (ValueError, TypeError):
+            self.fritz_box = None
+
+        # At this point it is difficult to tell if a connection is established.
+        # So just check for null objects ...
+        if self.fritz_box is None or not self.fritz_box.modelname:
+            self.success_init = False
+
+        if self.success_init:
+            _LOGGER.info("Successfully connected to %s",
+                         self.fritz_box.modelname)
+            self._update_info()
+        else:
+            _LOGGER.error("Failed to establish connection to FRITZ!Box "
+                          "with IP: %s", self.host)
+
+    def scan_devices(self):
+        """ Scan for new devices and return a list of found device ids. """
+        self._update_info()
+        active_hosts = []
+        for known_host in self.last_results:
+            if known_host["status"] == "1":
+                active_hosts.append(known_host["mac"])
+        return active_hosts
+
+    def get_device_name(self, mac):
+        """ Returns 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
+        return ret
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """ Retrieves latest information from the FRITZ!Box. """
+        if not self.success_init:
+            return False
+
+        _LOGGER.info("Scanning")
+        self.last_results = self.fritz_box.get_hosts_info()
+        return True
--- a/homeassistant/components/device_tracker/icloud.py
+++ b/homeassistant/components/device_tracker/icloud.py
@@ -0,0 +1,87 @@
+"""
+homeassistant.components.device_tracker.icloud
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning iCloud 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.helpers.event import track_utc_time_change
+
+_LOGGER = logging.getLogger(__name__)
+
+REQUIREMENTS = ['pyicloud==0.7.2']
+
+CONF_INTERVAL = 'interval'
+DEFAULT_INTERVAL = 8
+
+
+def setup_scanner(hass, config, see):
+    """ Set up 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
+    username = config.get(CONF_USERNAME)
+    password = config.get(CONF_PASSWORD)
+
+    if username is None or password is None:
+        _LOGGER.error('Must specify a username and password')
+        return False
+
+    try:
+        _LOGGER.info('Logging into iCloud Account')
+        # Attempt the login to iCloud
+        api = PyiCloudService(username,
+                              password,
+                              verify=True)
+    except PyiCloudFailedLoginException as error:
+        _LOGGER.exception('Error logging into iCloud Service: %s', error)
+        return False
+
+    def keep_alive(now):
+        """ Keeps 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. """
+        try:
+            # The session timeouts if we are not using it so we
+            # have to re-authenticate. This will send an email.
+            api.authenticate()
+            # Loop through every device registered with the iCloud account
+            for device in api.devices:
+                status = device.status()
+                location = device.location()
+                # If the device has a location add it. If not do nothing
+                if location:
+                    see(
+                        dev_id=re.sub(r"(\s|\W|')",
+                                      '',
+                                      status['name']),
+                        host_name=status['name'],
+                        gps=(location['latitude'], location['longitude']),
+                        battery=status['batteryLevel']*100,
+                        gps_accuracy=location['horizontalAccuracy']
+                    )
+                else:
+                    # No location found for the device so continue
+                    continue
+        except PyiCloudNoDevicesException:
+            _LOGGER.info('No iCloud Devices found!')
+
+    track_utc_time_change(
+        hass, update_icloud,
+        minute=range(0, 60, config.get(CONF_INTERVAL, DEFAULT_INTERVAL)),
+        second=0
+    )
+
+    return True
--- a/homeassistant/components/device_tracker/locative.py
+++ b/homeassistant/components/device_tracker/locative.py
@@ -0,0 +1,104 @@
+"""
+homeassistant.components.device_tracker.locative
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Locative platform for the device tracker.
+
+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
+
+_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))
+
+    return True
+
+
+def _handle_get_api_locative(hass, see, handler, path_match, data):
+    """ Locative message received. """
+
+    if not _check_data(handler, data):
+        return
+
+    device = data['device'].replace('-', '')
+    location_name = data['id'].lower()
+    direction = data['trigger']
+
+    if direction == 'enter':
+        see(dev_id=device, location_name=location_name)
+        handler.write_text("Setting location to {}".format(location_name))
+
+    elif direction == 'exit':
+        current_state = hass.states.get("{}.{}".format(DOMAIN, device))
+
+        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
--- a/homeassistant/components/device_tracker/luci.py
+++ b/homeassistant/components/device_tracker/luci.py
@@ -0,0 +1,161 @@
+"""
+homeassistant.components.device_tracker.luci
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a OpenWRT router for device
+presence.
+
+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 re
+import threading
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Luci scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = LuciDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+# 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.
+
+    # 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.)
+    """
+
+    def __init__(self, config):
+        host = config[CONF_HOST]
+        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+
+        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        self.token = _get_token(host, username, password)
+        self.host = host
+
+        self.mac2name = None
+        self.success_init = self.token is not None
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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. """
+
+        with self.lock:
+            if self.mac2name is None:
+                url = 'http://{}/cgi-bin/luci/rpc/uci'.format(self.host)
+                result = _req_json_rpc(url, 'get_all', 'dhcp',
+                                       params={'auth': self.token})
+                if result:
+                    hosts = [x for x in result.values()
+                             if x['.type'] == 'host' and
+                             'mac' in x and 'name' in x]
+                    mac2name_list = [
+                        (x['mac'].upper(), x['name']) for x in hosts]
+                    self.mac2name = dict(mac2name_list)
+                else:
+                    # Error, handled in the _req_json_rpc
+                    return
+            return self.mac2name.get(device.upper(), None)
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Ensures the information from the Luci router is up to date.
+        Returns boolean if scanning successful.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+
+            url = 'http://{}/cgi-bin/luci/rpc/sys'.format(self.host)
+            result = _req_json_rpc(url, 'net.arptable',
+                                   params={'auth': self.token})
+            if result:
+                self.last_results = []
+                for device_entry in result:
+                    # Check if the Flags for each device contain
+                    # NUD_REACHABLE and if so, add it to last_results
+                    if int(device_entry['Flags'], 16) & 0x2:
+                        self.last_results.append(device_entry['HW address'])
+
+                return True
+
+            return False
+
+
+def _req_json_rpc(url, method, *args, **kwargs):
+    """ Perform one JSON RPC operation. """
+    data = json.dumps({'method': method, 'params': args})
+    try:
+        res = requests.post(url, data=data, timeout=5, **kwargs)
+    except requests.exceptions.Timeout:
+        _LOGGER.exception("Connection to the router timed out")
+        return
+    if res.status_code == 200:
+        try:
+            result = res.json()
+        except ValueError:
+            # If json decoder could not parse the response
+            _LOGGER.exception("Failed to parse response from luci")
+            return
+        try:
+            return result['result']
+        except KeyError:
+            _LOGGER.exception("No result in response from luci")
+            return
+    elif res.status_code == 401:
+        # Authentication error
+        _LOGGER.exception(
+            "Failed to authenticate, "
+            "please check your username and password")
+        return
+    else:
+        _LOGGER.error("Invalid response from luci: %s", res)
+
+
+def _get_token(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
@@ -0,0 +1,43 @@
+"""
+homeassistant.components.device_tracker.mqtt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+MQTT platform for the device tracker.
+
+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 homeassistant.components.mqtt as mqtt
+
+DEPENDENCIES = ['mqtt']
+
+CONF_QOS = 'qos'
+CONF_DEVICES = 'devices'
+
+DEFAULT_QOS = 0
+
+_LOGGER = logging.getLogger(__name__)
+
+
+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
+
+    dev_id_lookup = {}
+
+    def device_tracker_message_received(topic, payload, qos):
+        """ MQTT message received. """
+        see(dev_id=dev_id_lookup[topic], location_name=payload)
+
+    for dev_id, topic in devices.items():
+        dev_id_lookup[topic] = dev_id
+        mqtt.subscribe(hass, topic, device_tracker_message_received, qos)
+
+    return True
--- a/homeassistant/components/device_tracker/netgear.py
+++ b/homeassistant/components/device_tracker/netgear.py
@@ -0,0 +1,96 @@
+"""
+homeassistant.components.device_tracker.netgear
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a Netgear router for device
+presence.
+
+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 homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['pynetgear==0.3.2']
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Netgear scanner. """
+    info = config[DOMAIN]
+    host = info.get(CONF_HOST)
+    username = info.get(CONF_USERNAME)
+    password = info.get(CONF_PASSWORD)
+
+    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)
+
+    return scanner if scanner.success_init else None
+
+
+class NetgearDeviceScanner(object):
+    """ This class queries a Netgear wireless router using the SOAP-API. """
+
+    def __init__(self, host, username, password):
+        import pynetgear
+
+        self.last_results = []
+        self.lock = threading.Lock()
+
+        if host is None:
+            self._api = pynetgear.Netgear()
+        elif username is None:
+            self._api = pynetgear.Netgear(password, host)
+        else:
+            self._api = pynetgear.Netgear(password, host, username)
+
+        _LOGGER.info("Logging in")
+
+        results = self._api.get_attached_devices()
+
+        self.success_init = results is not None
+
+        if self.success_init:
+            self.last_results = results
+        else:
+            _LOGGER.error("Failed to Login")
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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. """
+        try:
+            return next(device.name for device in self.last_results
+                        if device.mac == mac)
+        except StopIteration:
+            return None
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Retrieves latest information from the Netgear router.
+        Returns boolean if scanning successful.
+        """
+        if not self.success_init:
+            return
+
+        with self.lock:
+            _LOGGER.info("Scanning")
+
+            self.last_results = self._api.get_attached_devices() or []
--- a/homeassistant/components/device_tracker/nmap_tracker.py
+++ b/homeassistant/components/device_tracker/nmap_tracker.py
@@ -0,0 +1,134 @@
+"""
+homeassistant.components.device_tracker.nmap
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports 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 homeassistant.util.dt as dt_util
+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)
+
+_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']
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Nmap scanner. """
+    if not validate_config(config, {DOMAIN: [CONF_HOSTS]},
+                           _LOGGER):
+        return None
+
+    scanner = NmapDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+Device = namedtuple("Device", ["mac", "name", "ip", "last_update"])
+
+
+def _arp(ip_address):
+    """ Get the MAC address for a given IP. """
+    cmd = ['arp', '-n', ip_address]
+    arp = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    out, _ = arp.communicate()
+    match = re.search(r'(([0-9A-Fa-f]{1,2}\:){5}[0-9A-Fa-f]{1,2})', str(out))
+    if match:
+        return match.group(0)
+    _LOGGER.info("No MAC address found for %s", ip_address)
+    return None
+
+
+class NmapDeviceScanner(object):
+    """ This class scans for devices using nmap. """
+
+    def __init__(self, config):
+        self.last_results = []
+
+        self.hosts = config[CONF_HOSTS]
+        minutes = convert(config.get(CONF_HOME_INTERVAL), int, 0)
+        self.home_interval = timedelta(minutes=minutes)
+
+        self.success_init = self._update_info()
+        _LOGGER.info("nmap scanner initialized")
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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. """
+
+        filter_named = [device.name for device in self.last_results
+                        if device.mac == mac]
+
+        if filter_named:
+            return filter_named[0]
+        else:
+            return None
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Scans the network for devices.
+        Returns boolean if scanning successful.
+        """
+        _LOGGER.info("Scanning")
+
+        from nmap import PortScanner, PortScannerError
+        scanner = PortScanner()
+
+        options = "-F --host-timeout 5s"
+
+        if self.home_interval:
+            boundary = dt_util.now() - self.home_interval
+            last_results = [device for device in self.last_results
+                            if device.last_update > boundary]
+            if last_results:
+                # Pylint is confused here.
+                # pylint: disable=no-member
+                options += " --exclude {}".format(",".join(device.ip for device
+                                                           in last_results))
+        else:
+            last_results = []
+
+        try:
+            result = scanner.scan(hosts=self.hosts, arguments=options)
+        except PortScannerError:
+            return False
+
+        now = dt_util.now()
+        for ipv4, info in result['scan'].items():
+            if info['status']['state'] != 'up':
+                continue
+            name = info['hostnames'][0]['name'] if info['hostnames'] else ipv4
+            # Mac address only returned if nmap ran as root
+            mac = info['addresses'].get('mac') or _arp(ipv4)
+            if mac is None:
+                continue
+            last_results.append(Device(mac.upper(), name, ipv4, now))
+
+        self.last_results = last_results
+
+        _LOGGER.info("nmap scan successful")
+        return True
--- a/homeassistant/components/device_tracker/owntracks.py
+++ b/homeassistant/components/device_tracker/owntracks.py
@@ -0,0 +1,183 @@
+"""
+homeassistant.components.device_tracker.owntracks
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+OwnTracks platform for the device tracker.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.owntracks/
+"""
+import json
+import logging
+import threading
+from collections import defaultdict
+
+import homeassistant.components.mqtt as mqtt
+from homeassistant.const import STATE_HOME
+
+DEPENDENCIES = ['mqtt']
+
+REGIONS_ENTERED = defaultdict(list)
+MOBILE_BEACONS_ACTIVE = defaultdict(list)
+
+BEACON_DEV_ID = 'beacon'
+
+LOCATION_TOPIC = 'owntracks/+/+'
+EVENT_TOPIC = 'owntracks/+/+/event'
+
+_LOGGER = logging.getLogger(__name__)
+
+LOCK = threading.Lock()
+
+
+def setup_scanner(hass, config, see):
+    """ Set up an OwnTracks tracker. """
+
+    def owntracks_location_update(topic, payload, qos):
+        """ MQTT message received. """
+
+        # Docs on available data:
+        # http://owntracks.org/booklet/tech/json/#_typelocation
+        try:
+            data = json.loads(payload)
+        except ValueError:
+            # If invalid JSON
+            _LOGGER.error(
+                'Unable to parse payload as JSON: %s', payload)
+            return
+
+        if not isinstance(data, dict) or data.get('_type') != 'location':
+            return
+
+        dev_id, kwargs = _parse_see_args(topic, data)
+
+        # Block updates if we're in a region
+        with LOCK:
+            if REGIONS_ENTERED[dev_id]:
+                _LOGGER.debug(
+                    "location update ignored - inside region %s",
+                    REGIONS_ENTERED[-1])
+                return
+
+            see(**kwargs)
+            see_beacons(dev_id, kwargs)
+
+    def owntracks_event_update(topic, payload, qos):
+        # pylint: disable=too-many-branches
+        """ 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
+            _LOGGER.error(
+                'Unable to parse payload as JSON: %s', payload)
+            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("-")
+        if location.lower() == 'home':
+            location = STATE_HOME
+
+        dev_id, kwargs = _parse_see_args(topic, data)
+
+        if data['event'] == 'enter':
+            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)
+                else:
+                    # Normal region
+                    if not zone.attributes.get('passive'):
+                        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)
+
+                see(**kwargs)
+                see_beacons(dev_id, kwargs)
+
+        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))
+                if not zone.attributes.get('passive'):
+                    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)
+
+        else:
+            _LOGGER.error(
+                'Misformatted mqtt msgs, _type=transition, event=%s',
+                data['event'])
+            return
+
+    def see_beacons(dev_id, kwargs_param):
+        """ Set active beacons to the current location """
+
+        kwargs = kwargs_param.copy()
+        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. """
+
+    parts = topic.split('/')
+    dev_id = '{}_{}'.format(parts[1], parts[2])
+    host_name = parts[1]
+    kwargs = {
+        'dev_id': dev_id,
+        'host_name': host_name,
+        'gps': (data['lat'], data['lon'])
+    }
+    if 'acc' in data:
+        kwargs['gps_accuracy'] = data['acc']
+    if 'batt' in data:
+        kwargs['battery'] = data['batt']
+    return dev_id, kwargs
+
+
+def _set_gps_from_zone(kwargs, 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']
+    return kwargs
--- a/homeassistant/components/device_tracker/services.yaml
+++ b/homeassistant/components/device_tracker/services.yaml
@@ -0,0 +1,33 @@
+# Describes the format for available device tracker services
+
+see:
+  description: Control tracked device
+
+  fields:
+    mac:
+      description: MAC address of device
+      example: 'FF:FF:FF:FF:FF:FF'
+
+    dev_id:
+      description: Id of device (find id in known_devices.yaml)
+      example: 'phonedave'
+
+    host_name:
+      description: Hostname of device
+      example: 'Dave'
+
+    location_name:
+      description: Name of location where device is located (not_home is away)
+      example: 'home'
+
+    gps:
+      description: GPS coordinates where device is located (latitude, longitude)
+      example: '[51.509802, -0.086692]'
+
+    gps_accuracy:
+      description: Accuracy of GPS coordinates
+      example: '80'
+
+    battery:
+      description: Battery level of device
+      example: '100'
--- a/homeassistant/components/device_tracker/snmp.py
+++ b/homeassistant/components/device_tracker/snmp.py
@@ -0,0 +1,116 @@
+"""
+homeassistant.components.device_tracker.snmp
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports 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
+
+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
+MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
+
+_LOGGER = logging.getLogger(__name__)
+REQUIREMENTS = ['pysnmp==4.2.5']
+
+CONF_COMMUNITY = "community"
+CONF_BASEOID = "baseoid"
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """ Validates config and returns an snmp scanner """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_COMMUNITY, CONF_BASEOID]},
+                           _LOGGER):
+        return None
+
+    scanner = SnmpScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+class SnmpScanner(object):
+    """
+    This class queries any SNMP capable Acces Point for connected devices.
+    """
+    def __init__(self, config):
+        from pysnmp.entity.rfc3413.oneliner import cmdgen
+        self.snmp = cmdgen.CommandGenerator()
+
+        self.host = cmdgen.UdpTransportTarget((config[CONF_HOST], 161))
+        self.community = cmdgen.CommunityData(config[CONF_COMMUNITY])
+        self.baseoid = cmdgen.MibVariable(config[CONF_BASEOID])
+
+        self.lock = threading.Lock()
+
+        self.last_results = []
+
+        # Test the router is accessible
+        data = self.get_snmp_data()
+        self.success_init = data is not None
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing found device IDs.
+        """
+
+        self._update_info()
+        return [client['mac'] for client in self.last_results]
+
+    # 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. """
+        # 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.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            data = self.get_snmp_data()
+            if not data:
+                return False
+
+            self.last_results = data
+            return True
+
+    def get_snmp_data(self):
+        """ Fetch mac addresses from WAP via SNMP. """
+
+        devices = []
+
+        errindication, errstatus, errindex, restable = self.snmp.nextCmd(
+            self.community, self.host, self.baseoid)
+
+        if errindication:
+            _LOGGER.error("SNMPLIB error: %s", errindication)
+            return
+        if errstatus:
+            _LOGGER.error('SNMP error: %s at %s', errstatus.prettyPrint(),
+                          errindex and restable[-1][int(errindex)-1] or '?')
+            return
+
+        for resrow in restable:
+            for _, val in resrow:
+                mac = binascii.hexlify(val.asOctets()).decode('utf-8')
+                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
@@ -0,0 +1,136 @@
+"""
+homeassistant.components.device_tracker.thomson
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a THOMSON router for device
+presence.
+
+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
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+_DEVICES_REGEX = re.compile(
+    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<status>([^\s]+))\s+' +
+    r'(?P<type>([^\s]+))\s+' +
+    r'(?P<intf>([^\s]+))\s+' +
+    r'(?P<hwintf>([^\s]+))\s+' +
+    r'(?P<host>([^\s]+))')
+
+
+# pylint: disable=unused-argument
+def get_scanner(hass, config):
+    """ Validates config and returns a THOMSON scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = ThomsonDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+class ThomsonDeviceScanner(object):
+    """
+    This class queries a router running THOMSON firmware
+    for connected devices. Adapted from ASUSWRT scanner.
+    """
+
+    def __init__(self, config):
+        self.host = config[CONF_HOST]
+        self.username = config[CONF_USERNAME]
+        self.password = config[CONF_PASSWORD]
+
+        self.lock = threading.Lock()
+
+        self.last_results = {}
+
+        # 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. """
+
+        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. """
+        if not self.last_results:
+            return None
+        for client in self.last_results:
+            if client['mac'] == device:
+                return client['host']
+        return None
+
+    @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.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+            data = self.get_thomson_data()
+            if not data:
+                return False
+
+            # 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. """
+        try:
+            telnet = telnetlib.Telnet(self.host)
+            telnet.read_until(b'Username : ')
+            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(('hostmgr list\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")
+            return
+        except ConnectionRefusedError:
+            _LOGGER.exception("Connection refused by router," +
+                              " is telnet enabled?")
+            return
+
+        devices = {}
+        for device in devices_result:
+            match = _DEVICES_REGEX.search(device.decode('utf-8'))
+            if match:
+                devices[match.group('ip')] = {
+                    'ip': match.group('ip'),
+                    'mac': match.group('mac').upper(),
+                    'host': match.group('host'),
+                    'status': match.group('status')
+                    }
+        return devices
--- a/homeassistant/components/device_tracker/tomato.py
+++ b/homeassistant/components/device_tracker/tomato.py
@@ -0,0 +1,145 @@
+"""
+homeassistant.components.device_tracker.tomato
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a Tomato router for device
+presence.
+
+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 re
+import threading
+
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+CONF_HTTP_ID = "http_id"
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Tomato scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME,
+                                     CONF_PASSWORD, CONF_HTTP_ID]},
+                           _LOGGER):
+        return None
+
+    return TomatoDeviceScanner(config[DOMAIN])
+
+
+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/
+    """
+
+    def __init__(self, config):
+        host, http_id = config[CONF_HOST], config[CONF_HTTP_ID]
+        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+
+        self.req = requests.Request('POST',
+                                    'http://{}/update.cgi'.format(host),
+                                    data={'_http_id': http_id,
+                                          'exec': 'devlist'},
+                                    auth=requests.auth.HTTPBasicAuth(
+                                        username, password)).prepare()
+
+        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
+
+        self.logger = logging.getLogger("{}.{}".format(__name__, "Tomato"))
+        self.lock = threading.Lock()
+
+        self.last_results = {"wldev": [], "dhcpd_lease": []}
+
+        self.success_init = self._update_tomato_info()
+
+    def scan_devices(self):
+        """ Scans for new devices and return a
+            list containing 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. """
+
+        filter_named = [item[0] for item in self.last_results['dhcpd_lease']
+                        if item[2] == device]
+
+        if not filter_named or not filter_named[0]:
+            return None
+        else:
+            return filter_named[0]
+
+    @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. """
+
+        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/
+                if response.status_code == 200:
+
+                    for param, value in \
+                            self.parse_api_pattern.findall(response.text):
+
+                        if param == 'wldev' or param == 'dhcpd_lease':
+                            self.last_results[param] = \
+                                json.loads(value.replace("'", '"'))
+
+                    return True
+
+                elif response.status_code == 401:
+                    # Authentication error
+                    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
+                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
+                self.logger.exception(
+                    "Connection to the router timed out")
+
+                return False
+
+            except ValueError:
+                # 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
@@ -0,0 +1,282 @@
+"""
+homeassistant.components.device_tracker.tplink
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a TP-Link router for device
+presence.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/device_tracker.tplink/
+"""
+import base64
+import logging
+from datetime import timedelta
+import re
+import threading
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a TP-Link scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = Tplink3DeviceScanner(config[DOMAIN])
+
+    if not scanner.success_init:
+        scanner = Tplink2DeviceScanner(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.
+    """
+
+    def __init__(self, config):
+        host = config[CONF_HOST]
+        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+
+        self.parse_macs = re.compile('[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-' +
+                                     '[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}')
+
+        self.host = host
+        self.username = username
+        self.password = password
+
+        self.last_results = {}
+        self.lock = threading.Lock()
+        self.success_init = self._update_info()
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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.
+        """
+
+        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.
+        """
+
+        with self.lock:
+            _LOGGER.info("Loading wireless clients...")
+
+            url = 'http://{}/userRpm/WlanStationRpm.htm'.format(self.host)
+            referer = 'http://{}'.format(self.host)
+            page = requests.get(url, auth=(self.username, self.password),
+                                headers={'referer': referer})
+
+            result = self.parse_macs.findall(page.text)
+
+            if result:
+                self.last_results = [mac.replace("-", ":") for mac in result]
+                return True
+
+            return False
+
+
+class Tplink2DeviceScanner(TplinkDeviceScanner):
+    """
+    This class queries a wireless router running newer version of TP-Link
+    firmware for connected devices.
+    """
+
+    def scan_devices(self):
+        """
+        Scans for new devices and return a list containing 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.
+        """
+
+        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.
+        """
+
+        with self.lock:
+            _LOGGER.info("Loading wireless clients...")
+
+            url = 'http://{}/data/map_access_wireless_client_grid.json' \
+                .format(self.host)
+            referer = 'http://{}'.format(self.host)
+
+            # Router uses Authorization cookie instead of header
+            # Let's create the cookie
+            username_password = '{}:{}'.format(self.username, self.password)
+            b64_encoded_username_password = base64.b64encode(
+                username_password.encode('ascii')
+            ).decode('ascii')
+            cookie = 'Authorization=Basic {}' \
+                .format(b64_encoded_username_password)
+
+            response = requests.post(url, headers={'referer': referer,
+                                                   'cookie': cookie})
+
+            try:
+                result = response.json().get('data')
+            except ValueError:
+                _LOGGER.error("Router didn't respond with JSON. "
+                              "Check if credentials are correct.")
+                return False
+
+            if result:
+                self.last_results = {
+                    device['mac_addr'].replace('-', ':'): device['name']
+                    for device in result
+                    }
+                return True
+
+            return False
+
+
+class Tplink3DeviceScanner(TplinkDeviceScanner):
+    """
+    This class queries the Archer C9 router running version 150811 or higher
+    of TP-Link firmware for connected devices.
+    """
+
+    def __init__(self, config):
+        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.
+        """
+
+        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.
+        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.
+        """
+
+        _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
+
+        response = requests.post(url,
+                                 params={'operation': 'login',
+                                         'username': self.username,
+                                         'password': self.password},
+                                 headers={'referer': referer})
+
+        try:
+            self.stok = response.json().get('data').get('stok')
+            _LOGGER.info(self.stok)
+            regex_result = re.search('sysauth=(.*);',
+                                     response.headers['set-cookie'])
+            self.sysauth = regex_result.group(1)
+            _LOGGER.info(self.sysauth)
+            return True
+        except ValueError:
+            _LOGGER.error("Couldn't fetch auth tokens!")
+            return False
+
+    @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.
+        """
+
+        with self.lock:
+            if (self.stok == '') or (self.sysauth == ''):
+                self._get_auth_tokens()
+
+            _LOGGER.info("Loading wireless clients...")
+
+            url = ('http://{}/cgi-bin/luci/;stok={}/admin/wireless?'
+                   'form=statistics').format(self.host, self.stok)
+            referer = 'http://{}/webpages/index.html'.format(self.host)
+
+            response = requests.post(url,
+                                     params={'operation': 'load'},
+                                     headers={'referer': referer},
+                                     cookies={'sysauth': self.sysauth})
+
+            try:
+                json_response = response.json()
+
+                if json_response.get('success'):
+                    result = response.json().get('data')
+                else:
+                    if json_response.get('errorcode') == 'timeout':
+                        _LOGGER.info("Token timed out. "
+                                     "Relogging on next scan.")
+                        self.stok = ''
+                        self.sysauth = ''
+                        return False
+                    else:
+                        _LOGGER.error("An unknown error happened "
+                                      "while fetching data.")
+                        return False
+            except ValueError:
+                _LOGGER.error("Router didn't respond with JSON. "
+                              "Check if credentials are correct.")
+                return False
+
+            if result:
+                self.last_results = {
+                    device['mac'].replace('-', ':'): device['mac']
+                    for device in result
+                    }
+                return True
+
+            return False
--- a/homeassistant/components/device_tracker/ubus.py
+++ b/homeassistant/components/device_tracker/ubus.py
@@ -0,0 +1,173 @@
+"""
+homeassistant.components.device_tracker.ubus
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Device tracker platform that supports scanning a OpenWRT router for device
+presence.
+
+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 re
+import threading
+import requests
+
+from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
+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)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def get_scanner(hass, config):
+    """ Validates config and returns a Luci scanner. """
+    if not validate_config(config,
+                           {DOMAIN: [CONF_HOST, CONF_USERNAME, CONF_PASSWORD]},
+                           _LOGGER):
+        return None
+
+    scanner = UbusDeviceScanner(config[DOMAIN])
+
+    return scanner if scanner.success_init else None
+
+
+# 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
+
+    """
+
+    def __init__(self, config):
+        host = config[CONF_HOST]
+        username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
+
+        self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);")
+        self.lock = threading.Lock()
+        self.last_results = {}
+        self.url = 'http://{}/ubus'.format(host)
+
+        self.session_id = _get_session_id(self.url, username, password)
+        self.hostapd = []
+        self.leasefile = None
+        self.mac2name = None
+        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.
+        """
+
+        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. """
+
+        with self.lock:
+            if self.leasefile is None:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', 'uci', 'get',
+                                       config="dhcp", type="dnsmasq")
+                if result:
+                    values = result["values"].values()
+                    self.leasefile = next(iter(values))["leasefile"]
+                else:
+                    return
+
+            if self.mac2name is None:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', 'file', 'read',
+                                       path=self.leasefile)
+                if result:
+                    self.mac2name = dict()
+                    for line in result["data"].splitlines():
+                        hosts = line.split(" ")
+                        self.mac2name[hosts[1].upper()] = hosts[3]
+                else:
+                    # Error, handled in the _req_json_rpc
+                    return
+
+            return self.mac2name.get(device.upper(), None)
+
+    @Throttle(MIN_TIME_BETWEEN_SCANS)
+    def _update_info(self):
+        """
+        Ensures the information from the Luci router is up to date.
+        Returns boolean if scanning successful.
+        """
+        if not self.success_init:
+            return False
+
+        with self.lock:
+            _LOGGER.info("Checking ARP")
+
+            if not self.hostapd:
+                hostapd = _req_json_rpc(self.url, self.session_id,
+                                        'list', 'hostapd.*', '')
+                self.hostapd.extend(hostapd.keys())
+
+            self.last_results = []
+            results = 0
+            for hostapd in self.hostapd:
+                result = _req_json_rpc(self.url, self.session_id,
+                                       'call', hostapd, 'get_clients')
+
+                if result:
+                    results = results + 1
+                    self.last_results.extend(result['clients'].keys())
+
+            return bool(results)
+
+
+def _req_json_rpc(url, session_id, rpcmethod, subsystem, method, **params):
+    """ Perform one JSON RPC operation. """
+
+    data = json.dumps({"jsonrpc": "2.0",
+                       "id": 1,
+                       "method": rpcmethod,
+                       "params": [session_id,
+                                  subsystem,
+                                  method,
+                                  params]})
+
+    try:
+        res = requests.post(url, data=data, timeout=5)
+
+    except requests.exceptions.Timeout:
+        return
+
+    if res.status_code == 200:
+        response = res.json()
+
+        if rpcmethod == "call":
+            return response["result"][1]
+        else:
+            return response["result"]
+
+
+def _get_session_id(url, username, password):
+    """ Get authentication token for the given host+username+password. """
+    res = _req_json_rpc(url, "00000000000000000000000000000000", 'call',
+                        'session', 'login', username=username,
+                        password=password)
+    return res["ubus_rpc_session"]
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -0,0 +1,100 @@
+"""
+homeassistant.components.discovery
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Starts a service to scan in intervals for new devices.
+
+Will emit EVENT_PLATFORM_DISCOVERED whenever a new service has been discovered.
+
+Knows which components handle certain types, will make sure they are
+loaded before the EVENT_PLATFORM_DISCOVERED is fired.
+"""
+import logging
+import threading
+
+from homeassistant import bootstrap
+from homeassistant.const import (
+    EVENT_HOMEASSISTANT_START, EVENT_PLATFORM_DISCOVERED,
+    ATTR_SERVICE, ATTR_DISCOVERED)
+
+DOMAIN = "discovery"
+REQUIREMENTS = ['netdisco==0.5.2']
+
+SCAN_INTERVAL = 300  # seconds
+
+SERVICE_WEMO = 'belkin_wemo'
+SERVICE_HUE = 'philips_hue'
+SERVICE_CAST = 'google_cast'
+SERVICE_NETGEAR = 'netgear_router'
+SERVICE_SONOS = 'sonos'
+SERVICE_PLEX = 'plex_mediaserver'
+
+SERVICE_HANDLERS = {
+    SERVICE_WEMO: "switch",
+    SERVICE_CAST: "media_player",
+    SERVICE_HUE: "light",
+    SERVICE_NETGEAR: 'device_tracker',
+    SERVICE_SONOS: 'media_player',
+    SERVICE_PLEX: 'media_player',
+}
+
+
+def listen(hass, service, callback):
+    """
+    Setup listener for discovery of specific service.
+    Service can be a string or a list/tuple.
+    """
+
+    if isinstance(service, str):
+        service = (service,)
+    else:
+        service = tuple(service)
+
+    def discovery_event_listener(event):
+        """ Listens for discovery events. """
+        if event.data[ATTR_SERVICE] in service:
+            callback(event.data[ATTR_SERVICE], event.data[ATTR_DISCOVERED])
+
+    hass.bus.listen(EVENT_PLATFORM_DISCOVERED, discovery_event_listener)
+
+
+def setup(hass, config):
+    """ Starts a discovery service. """
+    logger = logging.getLogger(__name__)
+
+    from netdisco.service import DiscoveryService
+
+    # Disable zeroconf logging, it spams
+    logging.getLogger('zeroconf').setLevel(logging.CRITICAL)
+
+    lock = threading.Lock()
+
+    def new_service_listener(service, info):
+        """ Called when a new service is found. """
+        with lock:
+            logger.info("Found new service: %s %s", service, info)
+
+            component = SERVICE_HANDLERS.get(service)
+
+            # We do not know how to handle this service
+            if not component:
+                return
+
+            # This component cannot be setup.
+            if not bootstrap.setup_component(hass, component, config):
+                return
+
+            hass.bus.fire(EVENT_PLATFORM_DISCOVERED, {
+                ATTR_SERVICE: service,
+                ATTR_DISCOVERED: info
+            })
+
+    # pylint: disable=unused-argument
+    def start_discovery(event):
+        """ Start discovering. """
+        netdisco = DiscoveryService(SCAN_INTERVAL)
+        netdisco.add_listener(new_service_listener)
+        netdisco.start()
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START, start_discovery)
+
+    return True
--- a/homeassistant/components/downloader.py
+++ b/homeassistant/components/downloader.py
@@ -1,15 +1,20 @@
 """
 homeassistant.components.downloader
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Provides functionality to download files.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/downloader/
 """
 import os
 import logging
 import re
 import threading

-import homeassistant.util as util
+import requests
+
+from homeassistant.helpers import validate_config
+from homeassistant.util import sanitize_filename

 DOMAIN = "downloader"

@@ -18,33 +23,36 @@ SERVICE_DOWNLOAD_FILE = "download_file"
 ATTR_URL = "url"
 ATTR_SUBDIR = "subdir"

+CONF_DOWNLOAD_DIR = 'download_dir'
+

 # pylint: disable=too-many-branches
-def setup(bus, download_path):
+def setup(hass, config):
    """ Listens for download events to download files. """

    logger = logging.getLogger(__name__)

-    try:
-        import requests
-    except ImportError:
-        logger.exception(("Failed to import requests. "
-                          "Did you maybe not execute 'pip install requests'?"))
-
+    if not validate_config(config, {DOMAIN: [CONF_DOWNLOAD_DIR]}, logger):
        return False

+    download_path = config[DOMAIN][CONF_DOWNLOAD_DIR]
+
+    # If path is relative, we assume relative to HASS config dir
+    if not os.path.isabs(download_path):
+        download_path = hass.config.path(download_path)
+
    if not os.path.isdir(download_path):

        logger.error(
-            ("Download path {} does not exist. File Downloader not active.").
-            format(download_path))
+            "Download path %s does not exist. File Downloader not active.",
+            download_path)

        return False

    def download_file(service):
        """ Starts thread to download file specified in the url. """

-        if not ATTR_URL in service.data:
+        if ATTR_URL not in service.data:
            logger.error("Service called but 'url' parameter not specified.")
            return

@@ -56,11 +64,11 @@ def setup(bus, download_path):
                subdir = service.data.get(ATTR_SUBDIR)

                if subdir:
-                    subdir = util.sanitize_filename(subdir)
+                    subdir = sanitize_filename(subdir)

                final_path = None

-                req = requests.get(url, stream=True)
+                req = requests.get(url, stream=True, timeout=10)

                if req.status_code == 200:
                    filename = None
@@ -80,7 +88,7 @@ def setup(bus, download_path):
                        filename = "ha_download"

                    # Remove stuff to ruin paths
-                    filename = util.sanitize_filename(filename)
+                    filename = sanitize_filename(filename)

                    # Do we want to download to subdir, create if needed
                    if subdir:
@@ -106,19 +114,16 @@ def setup(bus, download_path):

                        final_path = "{}_{}.{}".format(path, tries, ext)

-                    logger.info("{} -> {}".format(
-                                url, final_path))
+                    logger.info("%s -> %s", url, final_path)

                    with open(final_path, 'wb') as fil:
                        for chunk in req.iter_content(1024):
                            fil.write(chunk)

-                    logger.info("Downloading of {} done".format(
-                        url))
+                    logger.info("Downloading of %s done", url)

            except requests.exceptions.ConnectionError:
-                logger.exception("ConnectionError occured for {}".
-                                 format(url))
+                logger.exception("ConnectionError occured for %s", url)

                # Remove file if we started downloading but failed
                if final_path and os.path.isfile(final_path):
@@ -126,7 +131,7 @@ def setup(bus, download_path):

        threading.Thread(target=do_download).start()

-    bus.register_service(DOMAIN, SERVICE_DOWNLOAD_FILE,
-                         download_file)
+    hass.services.register(DOMAIN, SERVICE_DOWNLOAD_FILE,
+                           download_file)

    return True
--- a/homeassistant/components/ecobee.py
+++ b/homeassistant/components/ecobee.py
@@ -0,0 +1,155 @@
+"""
+homeassistant.components.ecobee
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ecobee Component
+
+This component adds support for Ecobee3 Wireless Thermostats.
+You will need to setup developer access to your thermostat,
+and create and API key on the ecobee website.
+
+The first time you run this component you will see a configuration
+component card in Home Assistant.  This card will contain a PIN code
+that you will need to use to authorize access to your thermostat.  You
+can do this at https://www.ecobee.com/consumerportal/index.html
+Click My Apps, Add application, Enter Pin and click Authorize.
+
+After authorizing the application click the button in the configuration
+card.  Now your thermostat and sensors should shown in home-assistant.
+
+You can use the optional hold_temp parameter to set whether or not holds
+are set indefintely or until the next scheduled event.
+
+ecobee:
+  api_key: asdfasdfasdfasdfasdfaasdfasdfasdfasdf
+  hold_temp: True
+
+"""
+
+from datetime import timedelta
+import logging
+import os
+
+from homeassistant.loader import get_component
+from homeassistant import bootstrap
+from homeassistant.util import Throttle
+from homeassistant.const import (
+    EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE, ATTR_DISCOVERED, CONF_API_KEY)
+
+DOMAIN = "ecobee"
+DISCOVER_THERMOSTAT = "ecobee.thermostat"
+DISCOVER_SENSORS = "ecobee.sensor"
+NETWORK = None
+HOLD_TEMP = 'hold_temp'
+
+REQUIREMENTS = [
+    'https://github.com/nkgilley/python-ecobee-api/archive/'
+    '92a2f330cbaf601d0618456fdd97e5a8c42c1c47.zip#python-ecobee==0.0.4']
+
+_LOGGER = logging.getLogger(__name__)
+
+ECOBEE_CONFIG_FILE = 'ecobee.conf'
+_CONFIGURING = {}
+
+# Return cached results if last scan was less then this time ago
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=180)
+
+
+def request_configuration(network, hass, config):
+    """ Request configuration steps from the user. """
+    configurator = get_component('configurator')
+    if 'ecobee' in _CONFIGURING:
+        configurator.notify_errors(
+            _CONFIGURING['ecobee'], "Failed to register, please try again.")
+
+        return
+
+    # pylint: disable=unused-argument
+    def ecobee_configuration_callback(callback_data):
+        """ Actions to do when our configuration callback is called. """
+        network.request_tokens()
+        network.update()
+        setup_ecobee(hass, network, config)
+
+    _CONFIGURING['ecobee'] = configurator.request_config(
+        hass, "Ecobee", ecobee_configuration_callback,
+        description=(
+            'Please authorize this app at https://www.ecobee.com/consumer'
+            'portal/index.html with pin code: ' + network.pin),
+        description_image="/static/images/config_ecobee_thermostat.png",
+        submit_caption="I have authorized the app."
+    )
+
+
+def setup_ecobee(hass, network, config):
+    """ Setup ecobee thermostat """
+    # If ecobee has a PIN then it needs to be configured.
+    if network.pin is not None:
+        request_configuration(network, hass, config)
+        return
+
+    if 'ecobee' in _CONFIGURING:
+        configurator = get_component('configurator')
+        configurator.request_done(_CONFIGURING.pop('ecobee'))
+
+    # Ensure component is loaded
+    bootstrap.setup_component(hass, 'thermostat', config)
+    bootstrap.setup_component(hass, 'sensor', config)
+
+    hold_temp = config[DOMAIN].get(HOLD_TEMP, False)
+
+    # Fire thermostat discovery event
+    hass.bus.fire(EVENT_PLATFORM_DISCOVERED, {
+        ATTR_SERVICE: DISCOVER_THERMOSTAT,
+        ATTR_DISCOVERED: {'hold_temp': hold_temp}
+    })
+
+    # Fire sensor discovery event
+    hass.bus.fire(EVENT_PLATFORM_DISCOVERED, {
+        ATTR_SERVICE: DISCOVER_SENSORS,
+        ATTR_DISCOVERED: {}
+    })
+
+
+# pylint: disable=too-few-public-methods
+class EcobeeData(object):
+    """ Gets the latest data and update the states. """
+
+    def __init__(self, config_file):
+        from pyecobee import Ecobee
+        self.ecobee = Ecobee(config_file)
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self):
+        """ Get the latest data from pyecobee. """
+        self.ecobee.update()
+        _LOGGER.info("ecobee data updated successfully.")
+
+
+def setup(hass, config):
+    """
+    Setup Ecobee.
+    Will automatically load thermostat and sensor components to support
+    devices discovered on the network.
+    """
+    # pylint: disable=global-statement, import-error
+    global NETWORK
+
+    if 'ecobee' in _CONFIGURING:
+        return
+
+    from pyecobee import config_from_file
+
+    # Create ecobee.conf if it doesn't exist
+    if not os.path.isfile(hass.config.path(ECOBEE_CONFIG_FILE)):
+        if config[DOMAIN].get(CONF_API_KEY) is None:
+            _LOGGER.error("No ecobee api_key found in config.")
+            return
+        jsonconfig = {"API_KEY": config[DOMAIN].get(CONF_API_KEY)}
+        config_from_file(hass.config.path(ECOBEE_CONFIG_FILE), jsonconfig)
+
+    NETWORK = EcobeeData(hass.config.path(ECOBEE_CONFIG_FILE))
+
+    setup_ecobee(hass, NETWORK.ecobee, config)
+
+    return True
--- a/homeassistant/components/frontend/init.py
+++ b/homeassistant/components/frontend/init.py
@@ -0,0 +1,115 @@
+"""
+homeassistant.components.frontend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Provides a frontend for Home Assistant.
+"""
+import re
+import os
+import logging
+
+from . import version, mdi_version
+import homeassistant.util as util
+from homeassistant.const import URL_ROOT, HTTP_OK
+
+DOMAIN = 'frontend'
+DEPENDENCIES = ['api']
+
+INDEX_PATH = os.path.join(os.path.dirname(__file__), 'index.html.template')
+
+_LOGGER = logging.getLogger(__name__)
+
+FRONTEND_URLS = [
+    URL_ROOT, '/logbook', '/history', '/map', '/devService', '/devState',
+    '/devEvent', '/devInfo', '/devTemplate',
+    re.compile(r'/states(/([a-zA-Z\._\-0-9/]+)|)'),
+]
+
+_FINGERPRINT = re.compile(r'^(\w+)-[a-z0-9]{32}\.(\w+)$', re.IGNORECASE)
+
+
+def setup(hass, config):
+    """ Setup serving the frontend. """
+    if 'http' not in hass.config.components:
+        _LOGGER.error('Dependency http is not loaded')
+        return False
+
+    for url in FRONTEND_URLS:
+        hass.http.register_path('GET', url, _handle_get_root, False)
+
+    hass.http.register_path('GET', '/service_worker.js',
+                            _handle_get_service_worker, False)
+
+    # Static files
+    hass.http.register_path(
+        'GET', re.compile(r'/static/(?P<file>[a-zA-Z\._\-0-9/]+)'),
+        _handle_get_static, False)
+    hass.http.register_path(
+        'HEAD', re.compile(r'/static/(?P<file>[a-zA-Z\._\-0-9/]+)'),
+        _handle_get_static, False)
+    hass.http.register_path(
+        'GET', re.compile(r'/local/(?P<file>[a-zA-Z\._\-0-9/]+)'),
+        _handle_get_local, False)
+
+    return True
+
+
+def _handle_get_root(handler, path_match, data):
+    """ Renders the frontend. """
+    handler.send_response(HTTP_OK)
+    handler.send_header('Content-type', 'text/html; charset=utf-8')
+    handler.end_headers()
+
+    if handler.server.development:
+        app_url = "home-assistant-polymer/src/home-assistant.html"
+    else:
+        app_url = "frontend-{}.html".format(version.VERSION)
+
+    # auto login if no password was set, else check api_password param
+    auth = ('no_password_set' if handler.server.api_password is None
+            else data.get('api_password', ''))
+
+    with open(INDEX_PATH) as template_file:
+        template_html = template_file.read()
+
+    template_html = template_html.replace('{{ app_url }}', app_url)
+    template_html = template_html.replace('{{ auth }}', auth)
+    template_html = template_html.replace('{{ icons }}', mdi_version.VERSION)
+
+    handler.wfile.write(template_html.encode("UTF-8"))
+
+
+def _handle_get_service_worker(handler, path_match, data):
+    """ Returns service worker for the frontend. """
+    if handler.server.development:
+        sw_path = "home-assistant-polymer/build/service_worker.js"
+    else:
+        sw_path = "service_worker.js"
+
+    handler.write_file(os.path.join(os.path.dirname(__file__), 'www_static',
+                                    sw_path))
+
+
+def _handle_get_static(handler, path_match, data):
+    """ Returns a static file for the frontend. """
+    req_file = util.sanitize_path(path_match.group('file'))
+
+    # Strip md5 hash out
+    fingerprinted = _FINGERPRINT.match(req_file)
+    if fingerprinted:
+        req_file = "{}.{}".format(*fingerprinted.groups())
+
+    path = os.path.join(os.path.dirname(__file__), 'www_static', req_file)
+
+    handler.write_file(path)
+
+
+def _handle_get_local(handler, path_match, data):
+    """
+    Returns a static file from the hass.config.path/www for the frontend.
+    """
+    req_file = util.sanitize_path(path_match.group('file'))
+
+    path = handler.server.hass.config.path('www', req_file)
+
+    handler.write_file(path)
--- a/Show More
+++ b/Show More