Merge branch 'gh-pages' of github.com:gvwilson/new-template into gh-pages

_includes/carpentries.html

 {% comment %}
     Display information about the Carpentries.
 {% endcomment %}
+
+<h2>About Software and Data Carpentry</h2>
+
 <div class="row">
-  <div class="col-md-3" align="center">
+  <div class="col-md-2" align="center">
     <a href="{{ site.swc_site }}"><img src="{{ site.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>
   </div>
-  <div class="col-md-6">
+  <div class="col-md-8">
     Since 1998,
     <a href="{{ site.swc_site }}">Software Carpentry</a>
     has been teaching researchers in science, engineering, medicine, and related disciplines
@@ -13,19 +16,18 @@
     Its volunteer instructors have run hundreds of events
     for thousands of learners in the past two and a half years.
   </div>
-  <div class="col-md-3">
-  </div>
 </div>
+<br/>
 <div class="row">
-  <div class="col-md-3">
+  <div class="col-md-2" align="center">
+    <a href="{{ site.dc_site }}"><img src="{{ site.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>
   </div>
-  <div class="col-md-6">
+  <div class="col-md-8">
     <a href="{{ site.dc_site }}">Data Carpentry</a> develops and teaches workshops on the fundamental data skills needed to conduct research.
     Its target audience is researchers who have little to no prior computational experience,
     and its lessons are domain specific,
     building on learners' existing knowledge to enable them to quickly apply skills learned to their own research.
   </div>
-  <div class="col-md-3" align="center">
-    <a href="{{ site.dc_site }}"><img src="{{ site.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>
-  </div>
 </div>
+
+