diff --git a/CHANGELOG.md b/CHANGELOG.md
index 402ca773..2c400b8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## 2.0
+
+* Cryptographical backend changed from PyCrypto to cryptography.io
+* Config now respects XDG conventions and may move accordingly
+* Config now saved as YAML
+* Config name changed from `journals.jrnl_name.journal` to `journals.jrnl_name.path`
 
 ### 1.9 (July 21, 2014)
 
diff --git a/jrnl/util.py b/jrnl/util.py
index 14dd3876..bc94f24b 100644
--- a/jrnl/util.py
+++ b/jrnl/util.py
@@ -103,7 +103,6 @@ def yesno(prompt, default=True):
 
 def load_config(config_path):
     """Tries to load a config file from YAML.
-    If that fails, fall back to JSON.
     """
     with open(config_path) as f:
         config = yaml.load(f)