diff --git a/README.md b/README.md
index 5dbe07dfee268..35d2576f4f598 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Websites built with Gatsby:
 
 [Migrating from v0 to v1?](https://www.gatsbyjs.org/docs/migrating-from-v0-to-v1/)
 
-[v0 docs](/v0-README.md)
+[v0 docs](https://github.com/gatsbyjs/gatsby/blob/v0.12.48/docs/index.md)
 
 ## Packages
 
diff --git a/docs/docs/gatsby-starters.md b/docs/docs/gatsby-starters.md
index 3ac53d50edaa3..af82bd83a51f4 100644
--- a/docs/docs/gatsby-starters.md
+++ b/docs/docs/gatsby-starters.md
@@ -176,3 +176,26 @@ Community:
   * Simple one page site that's perfect for personal portfolios
   * Fully Responsive
   * Styling with SCSS
+
+* [gatsby-starter-docs](https://github.com/ericwindmill/gatsby-starter-docs) [(demo)](https://gatsby-docs-starter.netlify.com/)
+  
+  Features:
+  * All the features from [gatsby-advanced-starter](https://github.com/Vagr9K/gatsby-advanced-starter), plus:
+  * Designed for Documentation / Tutorial Websites
+  * 'Table of Contents' Component: Auto generates ToC from posts - just follow the file frontmatter conventions from markdown files in 'lessons'. 
+  * Styled Components w/ ThemeProvider
+  * Basic UI
+  * A few extra components
+  * Custom prismjs theme
+  * React Icons
+
+* [gatsby-styled-blog-starter](https://github.com/greglobinski/gatsby-styled-blog-starter) [(demo)](https://gsbs.greglobinski.com/)
+
+  Features:
+  * sidebar navigation
+  * look like an app
+  * page transitions
+  * pwa
+  * styling with styled-components
+  * easily restyled through theme object
+  * [README](https://github.com/greglobinski/gatsby-styled-blog-starter)
\ No newline at end of file
diff --git a/docs/docs/plugins.md b/docs/docs/plugins.md
index 95fbe2c470480..f1ecfd05f49cb 100644
--- a/docs/docs/plugins.md
+++ b/docs/docs/plugins.md
@@ -136,6 +136,7 @@ you can place the files in a `src` subfolder and build them to the plugin folder
 * [gatsby-plugin-klipse](https://github.com/ahmedelgabri/gatsby-plugin-klipse)
 * [gatsby-plugin-stripe-checkout](https://github.com/njosefbeck/gatsby-plugin-stripe-checkout)
 * [gatsby-plugin-stripe-elements](https://github.com/njosefbeck/gatsby-plugin-stripe-elements)
+* [gatsby-plugin-hotjar](https://github.com/pavloko/gatsby-plugin-hotjar)
 * [gatsby-remark-emoji](https://github.com/Rulikkk/gatsby-remark-emoji)
 * [gatsby-remark-external-links](https://github.com/JLongley/gatsby-remark-external-links)
 * [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)
diff --git a/examples/using-css-modules/src/pages/index.js b/examples/using-css-modules/src/pages/index.js
index 94795a602af8a..789135ab89c02 100644
--- a/examples/using-css-modules/src/pages/index.js
+++ b/examples/using-css-modules/src/pages/index.js
@@ -24,7 +24,7 @@ class IndexComponent extends React.Component {
         <p>
           <a
             className={indexStyles.link}
-            href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-css-modules"
+            href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-css-modules"
           >
             cODe for eXAMple sIte on GiTHUb
           </a>
diff --git a/examples/using-sass/src/pages/index.js b/examples/using-sass/src/pages/index.js
index f6e0e32587bab..3e0f49d278139 100644
--- a/examples/using-sass/src/pages/index.js
+++ b/examples/using-sass/src/pages/index.js
@@ -18,7 +18,7 @@ class Index extends React.Component {
               <a href="#">Logout</a>
             </li>
             <li>
-              <a href="https://github.com/gatsbyjs/gatsby/tree/1.0/examples/using-sass">
+              <a href="https://github.com/gatsbyjs/gatsby/tree/master/examples/using-sass">
                 Code for site on GitHub
               </a>
             </li>
diff --git a/packages/gatsby-source-contentful/README.md b/packages/gatsby-source-contentful/README.md
index 9d4396abb1060..6563a9d8dca12 100644
--- a/packages/gatsby-source-contentful/README.md
+++ b/packages/gatsby-source-contentful/README.md
@@ -3,7 +3,7 @@
 Source plugin for pulling content types, entries, and assets into Gatsby from Contentful spaces. It creates links between entry types and asset so they can be queried in Gatsby using GraphQL.
 
 An example site for using this plugin is at
-https://using-contentful.netlify.com/
+https://using-contentful.gatsbyjs.org/
 
 ## Install
 
diff --git a/packages/gatsby/src/commands/develop.js b/packages/gatsby/src/commands/develop.js
index 0212bc5bbb636..9a8f150c9ca70 100644
--- a/packages/gatsby/src/commands/develop.js
+++ b/packages/gatsby/src/commands/develop.js
@@ -203,7 +203,6 @@ module.exports = async (program: any) => {
     typeof program.port === `string` ? parseInt(program.port, 10) : program.port
 
   let compiler
-  let listener
   await new Promise(resolve => {
     detect(port, (err, _port) => {
       if (err) {
@@ -223,14 +222,12 @@ module.exports = async (program: any) => {
 
           startServer(program).then(([c, l]) => {
             compiler = c
-            listener = l
             resolve()
           })
         })
       } else {
         startServer(program).then(([c, l]) => {
           compiler = c
-          listener = l
           resolve()
         })
       }
diff --git a/www/src/pages/docs/doc-links.yaml b/www/src/pages/docs/doc-links.yaml
index f890d4172fce0..061e880c79474 100644
--- a/www/src/pages/docs/doc-links.yaml
+++ b/www/src/pages/docs/doc-links.yaml
@@ -49,7 +49,7 @@
     - title: Adding Tags and Categories to Blog Posts*
       link: /docs/adding-tags-and-categories-to-blog-posts/
     - title: Adding Markdown Pages*
-      link: /adding-markdown-pages/
+      link: /docs/adding-markdown-pages/
     - title: Creating Dynamically-Rendered Navigation*
       link: /docs/creating-dynamically-rendered-navigation/
     - title: Dropping Images into Static Folders*