diff --git a/_includes/analytics-providers/custom b/_includes/analytics-providers/custom.html
similarity index 100%
rename from _includes/analytics-providers/custom
rename to _includes/analytics-providers/custom.html
diff --git a/_includes/analytics-providers/google-universal b/_includes/analytics-providers/google-universal.html
similarity index 100%
rename from _includes/analytics-providers/google-universal
rename to _includes/analytics-providers/google-universal.html
diff --git a/_includes/analytics-providers/google b/_includes/analytics-providers/google.html
similarity index 100%
rename from _includes/analytics-providers/google
rename to _includes/analytics-providers/google.html
diff --git a/_includes/analytics b/_includes/analytics.html
similarity index 55%
rename from _includes/analytics
rename to _includes/analytics.html
index 295516aa..64a3359a 100644
--- a/_includes/analytics
+++ b/_includes/analytics.html
@@ -2,11 +2,11 @@
{% case site.analytics.provider %}
{% when "google" %}
- {% include /analytics-providers/google %}
+ {% include /analytics-providers/google.html %}
{% when "google-universal" %}
- {% include /analytics-providers/google-universal %}
+ {% include /analytics-providers/google-universal.html %}
{% when "custom" %}
- {% include /analytics-providers/custom %}
+ {% include /analytics-providers/custom.html %}
{% endcase %}
{% endif %}
\ No newline at end of file
diff --git a/_includes/archive-list-single b/_includes/archive-list-single.html
similarity index 100%
rename from _includes/archive-list-single
rename to _includes/archive-list-single.html
diff --git a/_includes/author-profile b/_includes/author-profile.html
similarity index 100%
rename from _includes/author-profile
rename to _includes/author-profile.html
diff --git a/_includes/breadcrumbs b/_includes/breadcrumbs.html
similarity index 100%
rename from _includes/breadcrumbs
rename to _includes/breadcrumbs.html
diff --git a/_includes/browser-upgrade b/_includes/browser-upgrade
deleted file mode 100644
index 99d9cbc2..00000000
--- a/_includes/browser-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade.html
new file mode 100644
index 00000000..f3ccb820
--- /dev/null
+++ b/_includes/browser-upgrade.html
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/_includes/comments-providers/custom b/_includes/comments-providers/custom.html
similarity index 100%
rename from _includes/comments-providers/custom
rename to _includes/comments-providers/custom.html
diff --git a/_includes/comments-providers/disqus b/_includes/comments-providers/disqus.html
similarity index 100%
rename from _includes/comments-providers/disqus
rename to _includes/comments-providers/disqus.html
diff --git a/_includes/comments-providers/facebook b/_includes/comments-providers/facebook.html
similarity index 100%
rename from _includes/comments-providers/facebook
rename to _includes/comments-providers/facebook.html
diff --git a/_includes/comments-providers/google-plus b/_includes/comments-providers/google-plus.html
similarity index 100%
rename from _includes/comments-providers/google-plus
rename to _includes/comments-providers/google-plus.html
diff --git a/_includes/comments b/_includes/comments.html
similarity index 100%
rename from _includes/comments
rename to _includes/comments.html
diff --git a/_includes/footer b/_includes/footer.html
similarity index 100%
rename from _includes/footer
rename to _includes/footer.html
diff --git a/_includes/head b/_includes/head.html
similarity index 96%
rename from _includes/head
rename to _includes/head.html
index aae86334..1ef0fa01 100644
--- a/_includes/head
+++ b/_includes/head.html
@@ -1,6 +1,6 @@
-{% include seo %}
+{% include seo.html %}
diff --git a/_includes/navigation b/_includes/masthead.html
similarity index 100%
rename from _includes/navigation
rename to _includes/masthead.html
diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html
new file mode 100644
index 00000000..1538d5b9
--- /dev/null
+++ b/_includes/page__taxonomy.html
@@ -0,0 +1,15 @@
+{% comment %}
+
+
+{% endcomment %}
+
+{% capture page_tags %}{% for tag in page.tags %}{{ tag | downcase }}#{{ tag }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+{% assign tag_hashes = (page_tags | split: ',' | sort:0) %}
+
+Filed under:
+{% for hash in tag_hashes %}
+ {% assign keyValue = hash | split: '#' %}
+ {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
+ {% if forloop.last %} and{% endif %} {{ tag_word }}{% unless forloop.last %}, {% endunless %}
+{% endfor %}
+
\ No newline at end of file
diff --git a/_includes/pagination b/_includes/pagination.html
similarity index 100%
rename from _includes/pagination
rename to _includes/pagination.html
diff --git a/_includes/scripts b/_includes/scripts.html
similarity index 82%
rename from _includes/scripts
rename to _includes/scripts.html
index 6c185307..55feefae 100644
--- a/_includes/scripts
+++ b/_includes/scripts.html
@@ -2,5 +2,5 @@
-{% include analytics %}
-{% include comments %}
+{% include analytics.html %}
+{% include comments.html %}
diff --git a/_includes/seo b/_includes/seo.html
similarity index 100%
rename from _includes/seo
rename to _includes/seo.html
diff --git a/_includes/social-share b/_includes/social-share.html
similarity index 100%
rename from _includes/social-share
rename to _includes/social-share.html
diff --git a/_layouts/default.html b/_layouts/default.html
index 3742f98d..4f36a104 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -7,13 +7,13 @@ layout: compress
- {% include head %}
+ {% include head.html %}
- {% include browser-upgrade %}
- {% include navigation %}
+ {% include browser-upgrade.html %}
+ {% include masthead.html %}
{% if page.header.image %}
@@ -31,12 +31,12 @@ layout: compress
{% endif %}
{% if site.breadcrumbs %}
- {% include breadcrumbs %}
+ {% include breadcrumbs.html %}
{% endif %}
- {% if page.author_profile %}{% include author-profile %}{% endif %}
+ {% if page.author_profile %}{% include author-profile.html %}{% endif %}
{% if page.sidebar %}
{% for s in page.sidebar %}
{% if s.image %}
@@ -59,11 +59,11 @@ layout: compress
- {% include scripts %}
+ {% include scripts.html %}
diff --git a/_layouts/single.html b/_layouts/single.html
index ea3fbb89..2f24ae0b 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -19,10 +19,8 @@ layout: default
{% if page.link %}