diff --git a/atom.xml b/atom.xml
index cb9555f406..281c9a9e03 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml
index 79d37440ca..d4734827c5 100644
--- a/blog/categories/announcements/atom.xml
+++ b/blog/categories/announcements/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Announcements | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/announcements/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 8263db074d..1472fb3a88 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 d0d5d10be5..1650ef0a01 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 052a42d993..f782cbbe99 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 1fa679797d..15d1a30300 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 0f6afe6a21..e8848c4a6f 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 bda9ff28bd..7ef6d536e1 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 acfeda96f7..29c777f0d5 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/media/atom.xml b/blog/categories/media/atom.xml
index 87b118b03a..6fb3464f64 100644
--- a/blog/categories/media/atom.xml
+++ b/blog/categories/media/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Media | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/media/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml
index 516aac07f7..fe9c343b65 100644
--- a/blog/categories/merchandise/atom.xml
+++ b/blog/categories/merchandise/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Merchandise | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/merchandise/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 3f3ccfbb5e..a5b099333a 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 5e4260eac2..18a2cb5a1a 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 c8c4a6a912..286cb21ab1 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 acca590c99..86801637c4 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 cd5db6e5a2..d06ac42d75 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 cefe0cf80b..51c9750b45 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 a821f5b842..8906f65d14 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 8df297044e..a76d09afb4 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 f9462ff079..a5c97e2cef 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 61d172d8ca..ec31460365 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 5e79a178ac..5aa357b503 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 bb5c6b1514..9a2491003d 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+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 454a789549..ebf7ae1add 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>2017-08-04T15:06:50+00:00</updated>
+  <updated>2017-08-04T15:59:06+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/docs/configuration/secrets/index.html b/docs/configuration/secrets/index.html
index d1210243f2..c2155792b2 100644
--- a/docs/configuration/secrets/index.html
+++ b/docs/configuration/secrets/index.html
@@ -133,7 +133,7 @@ Please enter password <span class="k">for </span>encrypted keyring:
 <p class="note warning">
   If you are using the Python Keyring, <a href="/getting-started/autostart/">autostarting</a> of Home Assistant will no longer work.
 </p>
-<h3><a class="title-link" name="storing-passwords-in-a-keyring-managed-by-your-os" href="#storing-passwords-in-a-keyring-managed-by-your-os"></a> Storing passwords in a keyring managed by your OS</h3>
+<h3><a class="title-link" name="storing-passwords-securely-in-aws" href="#storing-passwords-securely-in-aws"></a> Storing passwords securely in AWS</h3>
 <p>Using <a href="https://github.com/fugue/credstash">Credstash</a> is an alternative way to <code class="highlighter-rouge">secrets.yaml</code>. They can be managed from the command line via the credstash script.</p>
 <p>Before using credstash, you need to set up AWS credentials either via the <code class="highlighter-rouge">aws</code> command line tool, or using environment variables as explained in the <a href="http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html">AWS CLI docs</a> as well as creating a KMS key named ‘credstash’ as explained in the <a href="https://github.com/fugue/credstash#setting-up-kms">credstash readme</a>. After that is complete, you can use the provided script to add secrets to your Home Assistant secret store in credstash</p>
 <div class="language-bash highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>hass --script credstash --help
diff --git a/sitemap.xml b/sitemap.xml
index 07bebf5d48..761abe4646 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3823,62 +3823,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-08-04T15:05:30+00:00</lastmod>
+<lastmod>2017-08-04T15:57:42+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-08-04T15:05:31+00:00</lastmod>
+<lastmod>2017-08-04T15:57:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-08-04T15:05:31+00:00</lastmod>
+<lastmod>2017-08-04T15:57:43+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-08-04T15:05:31+00:00</lastmod>
+<lastmod>2017-08-04T15:57:43+00:00</lastmod>
 </url>
 </urlset>