Added logic to main that prefers .yaml-config over .conf

homeassistant/__main__.py

@@ -72,15 +72,19 @@ def ensure_config_path(config_dir):
                'directory {} ').format(config_dir))
         sys.exit()
 
-    config_path = os.path.join(config_dir, 'home-assistant.conf')
+    # Try to use yaml configuration first
+    config_path = os.path.join(config_dir, 'configuration.yaml')
+    if not os.path.isfile(config_path):
+        config_path = os.path.join(config_dir, 'home-assistant.conf')
 
     # Ensure a config file exists to make first time usage easier
     if not os.path.isfile(config_path):
+        config_path = os.path.join(config_dir, 'configuration.yaml')
         try:
             with open(config_path, 'w') as conf:
-                conf.write("[frontend]\n\n")
-                conf.write("[discovery]\n\n")
-                conf.write("[history]\n\n")
+                conf.write("frontend:\n\n")
+                conf.write("discovery:\n\n")
+                conf.write("history:\n\n")
         except IOError:
             print(('Fatal Error: No configuration file found and unable '
                    'to write a default one to {}').format(config_path))

homeassistant/bootstrap.py

@@ -112,6 +112,7 @@ def from_config_file(config_path, hass=None):
         # Set config dir to directory holding config file
         hass.config_dir = os.path.abspath(os.path.dirname(config_path))
 
+    config_dict = {}
     # check config file type
     if(os.path.splitext(config_path)[1] == '.yaml'):
         # Read yaml