Merge branch 'master' into canary

exampleSite/config/_default/hugo.yaml

@@ -1,6 +1,6 @@
 baseurl: https://stack.jimmycai.com/demo/
 languageCode: en-us
-paginate: 5
+paginate: 3
 
 # Note: This title is overridden by the title in i18n config file
 title: Hugo Theme Stack Starter
@@ -13,9 +13,11 @@ DefaultContentLanguage: en
 # This will make .Summary and .WordCount behave correctly for CJK languages.
 hasCJKLanguage: false
 
-disqusShortname: hugo-theme-stack
+services:
+  disqus:
+    shortname: hugo-theme-stack
+  # GA Tracking ID
+  googleAnalytics:
+    id:
 
-# GA Tracking ID
-googleAnalytics: ""
-
-publishDir: ../public/demo
+publishDir: ../public/demo