diff --git a/_site/content/modules/github.md b/_site/content/modules/github.md
index 6063e54e..e12ef93c 100644
--- a/_site/content/modules/github.md
+++ b/_site/content/modules/github.md
@@ -67,7 +67,7 @@ github:
 ### Attributes
 
 `apiKey` <br />
-Value: Your <a href="https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization">GitHub API</a> token.
+Value: Your <a href="https://blog.github.com/2013-05-16-personal-api-tokens/">GitHub API</a> token.
 
 `baseURL` <br />
 _Optional_ <br />
diff --git a/docs/modules/gerrit/index.html b/docs/modules/gerrit/index.html
index 586c804d..cd1ff3c8 100644
--- a/docs/modules/gerrit/index.html
+++ b/docs/modules/gerrit/index.html
@@ -148,6 +148,27 @@
       <a href="/modules/cryptocurrencies/">Crypo Currencies</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
       </div>
         <ul>
+      <li data-nav-id="/modules/cryptocurrencies/bittrex/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/bittrex/">
+            Bittrex
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/blockfolio/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/blockfolio/">
+            Blockfolio
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/cryptolive/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/cryptolive/">
+            CryptoLive
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
         </ul>
     </li>
       <li data-nav-id="/modules/datadog/" class="dd-item">
diff --git a/docs/modules/github/index.html b/docs/modules/github/index.html
index 7cffd48f..55fa7e9e 100644
--- a/docs/modules/github/index.html
+++ b/docs/modules/github/index.html
@@ -472,7 +472,7 @@
     
     
 
-<p><img class="screenshot" src="/imgs/modules/github.png" width="640" height="384" alt="github screenshot" /></p>
+<p><img class="screenshot" src="/imgs/modules/github.png" width="480" height="288" alt="github screenshot" /></p>
 
 <p>Displays information about your git repositories hosted on GitHub:</p>
 
@@ -526,7 +526,7 @@
 <h3 id="attributes">Attributes</h3>
 
 <p><code>apiKey</code> <br />
-Value: Your <a href="https://developer.github.com/v3/oauth_authorizations/#create-a-new-authorization">GitHub API</a> token.</p>
+Value: Your <a href="https://blog.github.com/2013-05-16-personal-api-tokens/">GitHub API</a> token.</p>
 
 <p><code>baseURL</code> <br />
 <em>Optional</em> <br />
diff --git a/docs/modules/google/index.html b/docs/modules/google/index.html
index bc3a2ba5..3eaade88 100644
--- a/docs/modules/google/index.html
+++ b/docs/modules/google/index.html
@@ -141,35 +141,6 @@
             CmdRunner
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/cryptocurrencies/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/cryptocurrencies/">Crypo Currencies</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/cryptocurrencies/bittrex/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/bittrex/">
-            Bittrex
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/cryptocurrencies/blockfolio/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/blockfolio/">
-            Blockfolio
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/cryptocurrencies/cryptolive/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/cryptolive/">
-            CryptoLive
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/datadog/" class="dd-item">
         <div>
@@ -212,29 +183,6 @@
             Gitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/google/" class="dd-item parent active haschildren
-        ">
-      <div>
-      <a href="/modules/google/">Google Apps</a>
-            <i class="fa fa-angle-down fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/google/gcal/" class="dd-item">
-        <div>
-          <a href="/modules/google/gcal/">
-            Google Calendar
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/google/gspreadsheet/" class="dd-item">
-        <div>
-          <a href="/modules/google/gspreadsheet/">
-            Google Spreadsheets
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/hackernews/" class="dd-item">
         <div>
@@ -242,28 +190,6 @@
             Hacker News
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/ipaddress/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/ipaddress/">IP Addresses</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/ipaddress/ipapi/" class="dd-item">
-        <div>
-          <a href="/modules/ipaddress/ipapi/">
-            IP-API
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/ipaddress/ipinfo/" class="dd-item">
-        <div>
-          <a href="/modules/ipaddress/ipinfo/">
-            IPInfo
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/jenkins/" class="dd-item">
         <div>
@@ -355,28 +281,6 @@
             Twitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/weather_services/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/weather_services/">Weather Services</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/weather_services/prettyweather/" class="dd-item">
-        <div>
-          <a href="/modules/weather_services/prettyweather/">
-            Pretty Weather
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/weather_services/weather/" class="dd-item">
-        <div>
-          <a href="/modules/weather_services/weather/">
-            Weather
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/zendesk/" class="dd-item">
         <div>
diff --git a/docs/modules/hackernews/index.html b/docs/modules/hackernews/index.html
index d0b26ad8..b63a531a 100644
--- a/docs/modules/hackernews/index.html
+++ b/docs/modules/hackernews/index.html
@@ -219,178 +219,17 @@
       <a href="/modules/google/">Google Apps</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
       </div>
         <ul>
-      <li data-nav-id="/modules/bamboohr/" class="dd-item">
+      <li data-nav-id="/modules/google/gcal/" class="dd-item">
         <div>
-          <a href="/modules/bamboohr/">
-            BambooHR
+          <a href="/modules/google/gcal/">
+            Google Calendar
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
     </li>
-      <li data-nav-id="/modules/circleci/" class="dd-item">
+      <li data-nav-id="/modules/google/gspreadsheet/" class="dd-item">
         <div>
-          <a href="/modules/circleci/">
-            CircleCI
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/clocks/" class="dd-item">
-        <div>
-          <a href="/modules/clocks/">
-            Clocks
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/cmdrunner/" class="dd-item">
-        <div>
-          <a href="/modules/cmdrunner/">
-            CmdRunner
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/datadog/" class="dd-item">
-        <div>
-          <a href="/modules/datadog/">
-            Datadog
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/gerrit/" class="dd-item">
-        <div>
-          <a href="/modules/gerrit/">
-            Gerrit
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/git/" class="dd-item">
-        <div>
-          <a href="/modules/git/">
-            Git
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/github/" class="dd-item">
-        <div>
-          <a href="/modules/github/">
-            GitHub
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/gitlab/" class="dd-item">
-        <div>
-          <a href="/modules/gitlab/">
-            GitLab
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/gitter/" class="dd-item">
-        <div>
-          <a href="/modules/gitter/">
-            Gitter
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/hackernews/" class="dd-item active">
-        <div>
-          <a href="/modules/hackernews/">
-            Hacker News
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/jenkins/" class="dd-item">
-        <div>
-          <a href="/modules/jenkins/">
-            Jenkins
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/jira/" class="dd-item">
-        <div>
-          <a href="/modules/jira/">
-            Jira
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/logger/" class="dd-item">
-        <div>
-          <a href="/modules/logger/">
-            Logger
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/newrelic/" class="dd-item">
-        <div>
-          <a href="/modules/newrelic/">
-            New Relic
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/opsgenie/" class="dd-item">
-        <div>
-          <a href="/modules/opsgenie/">
-            OpsGenie
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/power/" class="dd-item">
-        <div>
-          <a href="/modules/power/">
-            Power
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/security/" class="dd-item">
-        <div>
-          <a href="/modules/security/">
-            Security
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/textfile/" class="dd-item">
-        <div>
-          <a href="/modules/textfile/">
-            Textfile
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/todo/" class="dd-item">
-        <div>
-          <a href="/modules/todo/">
-            Todo
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/todoist/" class="dd-item">
-        <div>
-          <a href="/modules/todoist/">
-            Todoist
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/travisci/" class="dd-item">
-        <div>
-          <a href="/modules/travisci/">
-            TravisCI
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/trello/" class="dd-item">
-        <div>
-          <a href="/modules/trello/">
-            Trello
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/twitter/" class="dd-item">
-        <div>
-          <a href="/modules/twitter/">
-            Twitter
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/zendesk/" class="dd-item">
-        <div>
-          <a href="/modules/zendesk/">
-            Zendesk
+          <a href="/modules/google/gspreadsheet/">
+            Google Spreadsheets
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
     </li>
diff --git a/docs/modules/ipaddress/ipinfo/index.html b/docs/modules/ipaddress/ipinfo/index.html
index a5dafd50..01f1eba1 100644
--- a/docs/modules/ipaddress/ipinfo/index.html
+++ b/docs/modules/ipaddress/ipinfo/index.html
@@ -114,6 +114,277 @@
             <i class="fa fa-angle-down fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
       </div>
         <ul>
+      <li data-nav-id="/modules/bamboohr/" class="dd-item">
+        <div>
+          <a href="/modules/bamboohr/">
+            BambooHR
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/circleci/" class="dd-item">
+        <div>
+          <a href="/modules/circleci/">
+            CircleCI
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/clocks/" class="dd-item">
+        <div>
+          <a href="/modules/clocks/">
+            Clocks
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cmdrunner/" class="dd-item">
+        <div>
+          <a href="/modules/cmdrunner/">
+            CmdRunner
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+    <li data-nav-id="/modules/cryptocurrencies/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/cryptocurrencies/">Crypo Currencies</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/cryptocurrencies/bittrex/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/bittrex/">
+            Bittrex
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/blockfolio/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/blockfolio/">
+            Blockfolio
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/cryptolive/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/cryptolive/">
+            CryptoLive
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
+    </li>
+      <li data-nav-id="/modules/datadog/" class="dd-item">
+        <div>
+          <a href="/modules/datadog/">
+            Datadog
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/gerrit/" class="dd-item">
+        <div>
+          <a href="/modules/gerrit/">
+            Gerrit
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/git/" class="dd-item">
+        <div>
+          <a href="/modules/git/">
+            Git
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/github/" class="dd-item">
+        <div>
+          <a href="/modules/github/">
+            GitHub
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/gitlab/" class="dd-item">
+        <div>
+          <a href="/modules/gitlab/">
+            GitLab
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/gitter/" class="dd-item">
+        <div>
+          <a href="/modules/gitter/">
+            Gitter
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+    <li data-nav-id="/modules/google/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/google/">Google Apps</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/google/gcal/" class="dd-item">
+        <div>
+          <a href="/modules/google/gcal/">
+            Google Calendar
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/google/gspreadsheet/" class="dd-item">
+        <div>
+          <a href="/modules/google/gspreadsheet/">
+            Google Spreadsheets
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
+    </li>
+      <li data-nav-id="/modules/hackernews/" class="dd-item">
+        <div>
+          <a href="/modules/hackernews/">
+            Hacker News
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+    <li data-nav-id="/modules/ipaddress/" class="dd-item parent haschildren
+        ">
+      <div>
+      <a href="/modules/ipaddress/">IP Addresses</a>
+            <i class="fa fa-angle-down fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/ipaddress/ipapi/" class="dd-item">
+        <div>
+          <a href="/modules/ipaddress/ipapi/">
+            IP-API
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/ipaddress/ipinfo/" class="dd-item active">
+        <div>
+          <a href="/modules/ipaddress/ipinfo/">
+            IPInfo
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
+    </li>
+      <li data-nav-id="/modules/jenkins/" class="dd-item">
+        <div>
+          <a href="/modules/jenkins/">
+            Jenkins
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/jira/" class="dd-item">
+        <div>
+          <a href="/modules/jira/">
+            Jira
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/logger/" class="dd-item">
+        <div>
+          <a href="/modules/logger/">
+            Logger
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/newrelic/" class="dd-item">
+        <div>
+          <a href="/modules/newrelic/">
+            New Relic
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/opsgenie/" class="dd-item">
+        <div>
+          <a href="/modules/opsgenie/">
+            OpsGenie
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/power/" class="dd-item">
+        <div>
+          <a href="/modules/power/">
+            Power
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/security/" class="dd-item">
+        <div>
+          <a href="/modules/security/">
+            Security
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/textfile/" class="dd-item">
+        <div>
+          <a href="/modules/textfile/">
+            Textfile
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/todo/" class="dd-item">
+        <div>
+          <a href="/modules/todo/">
+            Todo
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/todoist/" class="dd-item">
+        <div>
+          <a href="/modules/todoist/">
+            Todoist
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/travisci/" class="dd-item">
+        <div>
+          <a href="/modules/travisci/">
+            TravisCI
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/trello/" class="dd-item">
+        <div>
+          <a href="/modules/trello/">
+            Trello
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/twitter/" class="dd-item">
+        <div>
+          <a href="/modules/twitter/">
+            Twitter
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+    <li data-nav-id="/modules/weather_services/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/weather_services/">Weather Services</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/weather_services/prettyweather/" class="dd-item">
+        <div>
+          <a href="/modules/weather_services/prettyweather/">
+            Pretty Weather
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/weather_services/weather/" class="dd-item">
+        <div>
+          <a href="/modules/weather_services/weather/">
+            Weather
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
+    </li>
+      <li data-nav-id="/modules/zendesk/" class="dd-item">
+        <div>
+          <a href="/modules/zendesk/">
+            Zendesk
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
         </ul>
     </li>
 
diff --git a/docs/modules/todoist/index.html b/docs/modules/todoist/index.html
index 13aaefed..f6c6ee0c 100644
--- a/docs/modules/todoist/index.html
+++ b/docs/modules/todoist/index.html
@@ -141,35 +141,6 @@
             CmdRunner
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/cryptocurrencies/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/cryptocurrencies/">Crypo Currencies</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/cryptocurrencies/bittrex/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/bittrex/">
-            Bittrex
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/cryptocurrencies/blockfolio/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/blockfolio/">
-            Blockfolio
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/cryptocurrencies/cryptolive/" class="dd-item">
-        <div>
-          <a href="/modules/cryptocurrencies/cryptolive/">
-            CryptoLive
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/datadog/" class="dd-item">
         <div>
@@ -212,28 +183,6 @@
             Gitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/google/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/google/">Google Apps</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/google/gcal/" class="dd-item">
-        <div>
-          <a href="/modules/google/gcal/">
-            Google Calendar
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/google/gspreadsheet/" class="dd-item">
-        <div>
-          <a href="/modules/google/gspreadsheet/">
-            Google Spreadsheets
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/hackernews/" class="dd-item">
         <div>
@@ -241,28 +190,6 @@
             Hacker News
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/ipaddress/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/ipaddress/">IP Addresses</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/ipaddress/ipapi/" class="dd-item">
-        <div>
-          <a href="/modules/ipaddress/ipapi/">
-            IP-API
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/ipaddress/ipinfo/" class="dd-item">
-        <div>
-          <a href="/modules/ipaddress/ipinfo/">
-            IPInfo
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/jenkins/" class="dd-item">
         <div>
@@ -354,28 +281,6 @@
             Twitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
-    </li>
-    <li data-nav-id="/modules/weather_services/" class="dd-item haschildren
-        ">
-      <div>
-      <a href="/modules/weather_services/">Weather Services</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
-      </div>
-        <ul>
-      <li data-nav-id="/modules/weather_services/prettyweather/" class="dd-item">
-        <div>
-          <a href="/modules/weather_services/prettyweather/">
-            Pretty Weather
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-      <li data-nav-id="/modules/weather_services/weather/" class="dd-item">
-        <div>
-          <a href="/modules/weather_services/weather/">
-            Weather
-          </a><i class="fa fa-circle-thin read-icon"></i>
-        </div>
-    </li>
-        </ul>
     </li>
       <li data-nav-id="/modules/zendesk/" class="dd-item">
         <div>
diff --git a/docs/modules/twitter/index.html b/docs/modules/twitter/index.html
index 813e0033..16e58683 100644
--- a/docs/modules/twitter/index.html
+++ b/docs/modules/twitter/index.html
@@ -410,22 +410,13 @@
       <option value="/modules/circleci/" >- CircleCI</option>
       <option value="/modules/clocks/" >- Clocks</option>
       <option value="/modules/cmdrunner/" >- CmdRunner</option>
-    <option value="/modules/cryptocurrencies/" >
-  - 
-   Crypo Currencies</option>
       <option value="/modules/datadog/" >- Datadog</option>
       <option value="/modules/gerrit/" >- Gerrit</option>
       <option value="/modules/git/" >- Git</option>
       <option value="/modules/github/" >- GitHub</option>
       <option value="/modules/gitlab/" >- GitLab</option>
       <option value="/modules/gitter/" >- Gitter</option>
-    <option value="/modules/google/" >
-  - 
-   Google Apps</option>
       <option value="/modules/hackernews/" >- Hacker News</option>
-    <option value="/modules/ipaddress/" >
-  - 
-   IP Addresses</option>
       <option value="/modules/jenkins/" >- Jenkins</option>
       <option value="/modules/jira/" >- Jira</option>
       <option value="/modules/logger/" >- Logger</option>
@@ -439,9 +430,6 @@
       <option value="/modules/travisci/" >- TravisCI</option>
       <option value="/modules/trello/" >- Trello</option>
       <option value="/modules/twitter/"  selected>- Twitter</option>
-    <option value="/modules/weather_services/" >
-  - 
-   Weather Services</option>
       <option value="/modules/zendesk/" >- Zendesk</option>
   
 
diff --git a/docs/modules/weather_services/prettyweather/index.html b/docs/modules/weather_services/prettyweather/index.html
index 654deffc..695684c7 100644
--- a/docs/modules/weather_services/prettyweather/index.html
+++ b/docs/modules/weather_services/prettyweather/index.html
@@ -141,6 +141,35 @@
             CmdRunner
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
+    </li>
+    <li data-nav-id="/modules/cryptocurrencies/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/cryptocurrencies/">Crypo Currencies</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/cryptocurrencies/bittrex/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/bittrex/">
+            Bittrex
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/blockfolio/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/blockfolio/">
+            Blockfolio
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/cryptocurrencies/cryptolive/" class="dd-item">
+        <div>
+          <a href="/modules/cryptocurrencies/cryptolive/">
+            CryptoLive
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
     </li>
       <li data-nav-id="/modules/datadog/" class="dd-item">
         <div>
@@ -183,6 +212,28 @@
             Gitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
+    </li>
+    <li data-nav-id="/modules/google/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/google/">Google Apps</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/google/gcal/" class="dd-item">
+        <div>
+          <a href="/modules/google/gcal/">
+            Google Calendar
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/google/gspreadsheet/" class="dd-item">
+        <div>
+          <a href="/modules/google/gspreadsheet/">
+            Google Spreadsheets
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
     </li>
       <li data-nav-id="/modules/hackernews/" class="dd-item">
         <div>
@@ -190,6 +241,28 @@
             Hacker News
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
+    </li>
+    <li data-nav-id="/modules/ipaddress/" class="dd-item haschildren
+        ">
+      <div>
+      <a href="/modules/ipaddress/">IP Addresses</a><i class="fa fa-angle-right fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/ipaddress/ipapi/" class="dd-item">
+        <div>
+          <a href="/modules/ipaddress/ipapi/">
+            IP-API
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/ipaddress/ipinfo/" class="dd-item">
+        <div>
+          <a href="/modules/ipaddress/ipinfo/">
+            IPInfo
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
     </li>
       <li data-nav-id="/modules/jenkins/" class="dd-item">
         <div>
@@ -281,6 +354,29 @@
             Twitter
           </a><i class="fa fa-circle-thin read-icon"></i>
         </div>
+    </li>
+    <li data-nav-id="/modules/weather_services/" class="dd-item parent haschildren
+        ">
+      <div>
+      <a href="/modules/weather_services/">Weather Services</a>
+            <i class="fa fa-angle-down fa-lg category-icon"></i><i class="fa fa-circle-thin read-icon"></i>
+      </div>
+        <ul>
+      <li data-nav-id="/modules/weather_services/prettyweather/" class="dd-item active">
+        <div>
+          <a href="/modules/weather_services/prettyweather/">
+            Pretty Weather
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+      <li data-nav-id="/modules/weather_services/weather/" class="dd-item">
+        <div>
+          <a href="/modules/weather_services/weather/">
+            Weather
+          </a><i class="fa fa-circle-thin read-icon"></i>
+        </div>
+    </li>
+        </ul>
     </li>
       <li data-nav-id="/modules/zendesk/" class="dd-item">
         <div>