Fixing references to the config file

earwigbot/config.py

@@ -110,7 +110,7 @@ class _BotConfig(object):
         filename = self._config_path
         with open(filename, 'r') as fp:
             try:
-                self._data = yml.load(fp)
+                self._data = yaml.load(fp)
             except yaml.YAMLError as error:
                 print "Error parsing config file {0}:".format(filename)
                 print error

earwigbot/runner.py

@@ -44,7 +44,7 @@ def run():
     from earwigbot import main
 
     root_dir = raw_input()
-    config_path = path.join(root_dir, "config.json")
+    config_path = path.join(root_dir, "config.yml")
     log_dir = path.join(root_dir, "logs")
     is_encrypted = config.load(config_path, log_dir)
     if is_encrypted:

earwigbot/wiki/functions.py

@@ -63,8 +63,8 @@ def _get_cookiejar():
     one is returned every time.
 
     The .cookies file is located in the project root, same directory as
-    config.json and earwigbot.py. If it doesn't exist, we will create the file
-    and set it to be readable and writeable only by us. If it exists but the
+    config.yml and bot.py. If it doesn't exist, we will create the file and set
+    it to be readable and writeable only by us. If it exists but the
     information inside is bogus, we will ignore it.
 
     This is normally called by _get_site_object_from_dict() (in turn called by