diff --git a/atom.xml b/atom.xml
index d29a441c4d..e65dbb159c 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 5a8563f266..2696b2cf53 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index 9512ae13cd..11b15ef0b3 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index f75e357eb3..c730c9b236 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index e6aeee5c30..dfca586a6d 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 5fc1eb33c3..7e37b9be09 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 2331ccc5d8..b7a4fb77ca 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index c819901aad..2eda7f4666 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index 268f153430..1070b2171f 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 4098d06f04..308949c478 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 633c19c575..be89b3fe86 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index 98db2f29ac..7a0efed846 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 15daa8e914..6138a9ac7c 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 007a65631c..0616d67083 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index f51770e3c6..965d0d0175 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 26430f0d52..7f9229873c 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 4796c99fe7..d0a917e540 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index c4dd78df77..0975d1cd73 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 1cfb0d062f..1d1075f764 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 0861e96f73..c66a140228 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-08-22T01:10:54+00:00</updated>
+  <updated>2016-08-22T07:26:42+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/recorder/index.html b/components/recorder/index.html
index 54ade9637c..b6dfa76f4e 100644
--- a/components/recorder/index.html
+++ b/components/recorder/index.html
@@ -95,14 +95,12 @@
 
 <p>The default database engine is <a href="https://www.sqlite.org/">SQLite</a> which doesn’t require any configuration. The database is stored in your Home Assistant configuration directory (<code>.homeassistant</code>) and called <code>home-assistant.db</code>.</p>
 
-<div class="highlighter-coderay"><div class="CodeRay">
-  <div class="code"><pre>
-To setup the `recorder` component in your installation, add the following to your `configuration.yaml` file:
+<p>To setup the <code>recorder</code> component in your installation, add the following to your <code>configuration.yaml</code> file:</p>
 
-```yaml
-# Example configuration.yaml entry
-recorder:
-  purge_days: 14
+<div class="highlighter-coderay"><div class="CodeRay">
+  <div class="code"><pre><span class="comment"># Example configuration.yaml entry</span>
+<span class="key">recorder</span>:
+  <span class="key">purge_days</span>: <span class="string"><span class="content">14</span></span>
 </pre></div>
 </div>
 </div>
diff --git a/developers/website/index.html b/developers/website/index.html
index 64c714edf9..61f58032f0 100644
--- a/developers/website/index.html
+++ b/developers/website/index.html
@@ -91,7 +91,7 @@
 
   <p>The website you’re reading now is the home of Home Assistant: <a href="https://home-assistant.io">https://home-assistant.io</a>. This is the place where we provide documentation and additional details about Home Assistant for end users and developers.</p>
 
-<p>home-assistant.io uses the <a href="http://octopress.org/">Octopress</a> framework for <a href="http://github.com/mojombo/jekyll">Jekyll</a>. To get more details, please checkout the <a href="http://octopress.org/docs/">Octopress documentation</a>.  <br />
+<p>home-assistant.io uses the <a href="http://octopress.org/">Octopress</a> framework for <a href="http://github.com/mojombo/jekyll">Jekyll</a>. To get more details, please checkout the <a href="http://octopress.org/docs/">Octopress documentation</a>.<br />
 That means that creating a new page is simple. The pages are written in <a href="http://daringfireball.net/projects/markdown/">markdown</a>; you don’t need to care about HTML or the like.</p>
 
 <p>The process for working on the website is no different from working on Home Assistant itself.</p>
@@ -107,11 +107,11 @@ That means that creating a new page is simple. The pages are written in <a href=
 <p>Then you can work on the documentation:</p>
 
 <ul>
-  <li>Fork home-assistant.io <a href="https://github.com/home-assistant/home-assistant.io">git repository</a>.</li>
+  <li>Fork home-assistant.io <a href="https://github.com/home-assistant/home-assistant.github.io">git repository</a>.</li>
   <li>Create/edit/update a page in the directory <code>source/_components/</code> for your platform/component.</li>
   <li>Test your changes to home-assistant.io locally: run <code>rake preview</code> and navigate to <a href="http://127.0.0.1:4000">http://127.0.0.1:4000</a></li>
   <li>Create a Pull Request (PR) against the <strong>next</strong> branch of home-assistant.io if your documentation is for a new feature, platform, or component.</li>
-  <li>Create a Pull Request (PR) against the <strong>master</strong> branch of home-assistant.io if you fix stuff, create Cookbook entries, or expand existing documentation.</li>
+  <li>Create a Pull Request (PR) against the <strong>current</strong> branch of home-assistant.io if you fix stuff, create Cookbook entries, or expand existing documentation.</li>
 </ul>
 
 <p>For a platform page, the fastest way is to make a copy of an existing page and edit it. The <a href="/components/">component overview</a> is generated automatically, so there is no need to add a link to your page.</p>
diff --git a/sitemap.xml b/sitemap.xml
index d46c97eda5..8684100520 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2095,62 +2095,62 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:25:59+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:26:00+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:26:00+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-08-22T01:10:11+00:00</lastmod>
+    <lastmod>2016-08-22T07:26:00+00:00</lastmod>
   </url>
 </urlset>