Bring over changes from History.markdown...

CHANGELOG.markdown

@@ -7,6 +7,13 @@
 - Added list of categories into atom.xml (#421)
 - Added default support for guag.es analytics (#827)
 - `rake preview` binds to IP and HOST, which can be set through OCTOPRESS_IP and OCTOPRESS_HOST, respectively (#780)
+- New configuration structure (#958)
+- Improved draft management options
+  - rake list_drafts shows current drafts.
+  - Rake generate, watch, and preview can compile future dated posts (defaults to false).
+- FIX: `full_configuration` in Rakefile was uninitialized (#1021)
+- Site Enhancements
+- Development fixes
 
 ## 2.0
 
@@ -35,3 +42,5 @@
 - **No longer supported.**
 - Jekyll Matured, but Henrik's Jekyll fork did not.
 - Thanks for all your pull requests, I learned a lot.
+
+# HEAD