Merge branch 'dev'

* dev:
  Fix a config bug in Automation

homeassistant/components/automation/__init__.py

@@ -5,11 +5,10 @@ homeassistant.components.automation
 Allows to setup simple automation rules via the config file.
 """
 import logging
-import json
 
 from homeassistant.loader import get_component
 from homeassistant.helpers import config_per_platform
-from homeassistant.util import convert, split_entity_id
+from homeassistant.util import split_entity_id
 from homeassistant.const import ATTR_ENTITY_ID
 
 DOMAIN = "automation"