Merge branch 'core' into gh-pages

LICENSE.md

 ---
-layout: lesson
+layout: page
 title: Licenses
 ---
 ### Instructional Material

_includes/footer.html

 <div class="footer">
-  <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Email</a>
-  <a class="label swc-blue-bg" href="http://github.com/swcarpentry">GitHub</a>
+  <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
+  <a class="label swc-blue-bg" href="https://github.com/swcarpentry/lesson-template">Source</a>
+  <a class="label swc-blue-bg" href="mailto:admin@software-carpentry.org">Contact</a>
   <a class="label swc-blue-bg" href="LICENSE.html">License</a>
-  <a class="bugreport label swc-blue-bg" href="mailto:admin@software-carpentry.org?subject=bug%20in%20{{page.path}}">Bug Report</a>
 </div>

requirements.txt

+CommonMark
+pandocfilters
\ No newline at end of file

tools/filters/id4glossary.py

@@ -24,12 +24,11 @@ def keyword2html(keyword_node):
 
 def id4glossary(key, value, format, meta):
     """Add id to keywords at glossary."""
-    if "subtitle" in meta and pf.stringify(meta['subtitle']) == 'Reference':
-        if key == "DefinitionList":
-            for definition in value:
-                definition[0] = keyword2html(definition[0])
-            return {"t": key,
-                    "c": value}
+    if key == "DefinitionList":
+        for definition in value:
+            definition[0] = keyword2html(definition[0])
+        return {"t": key,
+                "c": value}
 
 if __name__ == '__main__':
     pf.toJSONFilter(id4glossary)