Merge branch 'master' into talks

source/themes/opdavies/oliverdavies/_layouts/post.html.twig

@@ -1,10 +1,10 @@
-{% extends 'default.html.twig' %}
+{% extends 'default' %}
 
 {% block body_classes 'page--blog page--blog__post' %}
 
 {% block content_wrapper %}
     <main class="col-md-9">
-        {% include 'post-header' %}
+        {% include 'post_header' %}
 
         {% block content %}{% endblock content %}