diff --git a/atom.xml b/atom.xml
index 59ad2e429d..645900faeb 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 9d511dde6c..f5bac5f2b2 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 c31442ea95..a0ab9c9f5e 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 ce91ef532b..0c796b4a78 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 853b02d8ab..edd3804db1 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 32c91967c6..436ec5b2ff 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 3ea695cbd4..05589e3dcb 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 7e423aa684..da14dbc3a4 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 de16a24392..3e0bcade81 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 5fd9f06af5..296a02db61 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 edfef71a06..148876f2c5 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 aafdaf0ec2..1f74fd76e6 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 276bb8a96d..83744ae6bd 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 baf8f3be49..8e81b41a4e 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 6301c42fa8..f89ac882e3 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 c4ad581e6b..33469889c9 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 f81635693d..a5f015c5a1 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 a29f701778..54de377f96 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 55141ffad4..7d00d5a040 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+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 55bb22f093..8de8c7cdf7 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-19T11:39:29+00:00</updated>
+  <updated>2016-08-20T13:19:55+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/notify.slack/index.html b/components/notify.slack/index.html
index f568fc80f3..da3c982687 100644
--- a/components/notify.slack/index.html
+++ b/components/notify.slack/index.html
@@ -110,7 +110,7 @@
 
 <ul>
   <li><strong>name</strong> (<em>Optional</em>): Setting the optional parameter <code>name</code> allows multiple notifiers to be created. The default value is <code>notify</code>. The notifier will bind to the service <code>notify.NOTIFIER_NAME</code>.</li>
-  <li><strong>api_key</strong> (<em>Required</em>): The slack API token to use for sending slack messages. You can get your slack API token here https://api.slack.com/web?sudo=1</li>
+  <li><strong>api_key</strong> (<em>Required</em>): The slack API token to use for sending slack messages.</li>
   <li><strong>default_channel</strong> (<em>Required</em>): The default channel to post to if no channel is explicitly specified when sending the notification message.</li>
 </ul>
 
diff --git a/components/notify.smtp/index.html b/components/notify.smtp/index.html
index 2b12a1bd00..b20e6000e8 100644
--- a/components/notify.smtp/index.html
+++ b/components/notify.smtp/index.html
@@ -117,12 +117,12 @@
   <li><strong>port</strong> (<em>Optional</em>): The port that the SMTP server is using, eg. 587 for Google Mail and STARTTLS or 465/993 depending on your SMTP servers.  Defaults to 25.</li>
   <li><strong>sender</strong> (<em>Optional</em>): E-mail address of the sender.</li>
   <li><strong>username</strong> (<em>Optional</em>): Username for the SMTP account.</li>
-  <li><strong>password</strong> (<em>Optional</em>):Password for the SMTP server that belongs to the given username. If the password contains a colon it need to be wrapped in apostrophes.</li>
+  <li><strong>password</strong> (<em>Optional</em>): Password for the SMTP server that belongs to the given username. If the password contains a colon it need to be wrapped in apostrophes.</li>
   <li><strong>recipient</strong> (<em>Required</em>): Recipient of the notification.</li>
   <li><strong>starttls</strong> (<em>Optional</em>): Enables STARTTLS, eg. 1 or 0. Defaults to 0.</li>
 </ul>
 
-<p>To use the smtp notification, refer to it in an automation or script like in this example:</p>
+<p>To use the SMTP notification, refer to it in an automation or script like in this example:</p>
 
 <div class="highlighter-coderay"><div class="CodeRay">
   <div class="code"><pre>  <span class="key">burglar</span>: 
@@ -143,7 +143,7 @@
 </div>
 </div>
 
-<p>The optional <strong>images</strong> field adds in-line image attachments to the email. This sends a text/HTML multi-part message instead of the plain text default.</p>
+<p>The optional <code>images</code> field adds in-line image attachments to the email. This sends a text/HTML multi-part message instead of the plain text default.</p>
 
 <p>This platform is fragile and not able to catch all exceptions in a smart way because of the large number of possible configuration combinations.</p>
 
diff --git a/sitemap.xml b/sitemap.xml
index 2e7d50ed46..44834a03cf 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-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-08-19T11:38:38+00:00</lastmod>
+    <lastmod>2016-08-20T13:19:17+00:00</lastmod>
   </url>
 </urlset>