Merge branch 'gh-pages' into 237

diff --cc _includes/lesson_footer.html
index 763463be868445275c6571a61fb4a4e553c6f568,9c98502006598649727ab3434ec208e9f0219bc1..c6934e04b6b09f9661f80ddd47182c62638766e4
--- 1/_includes/lesson_footer.html
--- 2/_includes/lesson_footer.html
+++ b/_includes/lesson_footer.html
@@@ -4,27 -4,16 +4,24 @@@
  <footer>
    <div class="row">
      <div class="col-md-6" align="left">
-       <h4>
 -      Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        {% if site.carpentry == "swc" %}
 +      Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
 +      <a href="{{ site.carpentries_site }}">The Carpentries</a>
 +        <br>
 +        Copyright &copy; 2016–2018
        <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
        {% elsif site.carpentry == "dc" %}
 +      Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
 +      <a href="{{ site.carpentries_site }}">The Carpentries</a>
 +        <br>
 +        Copyright &copy; 2016–2018
        <a href="{{ site.dc_site }}">Data Carpentry</a>
        {% elsif site.carpentry == "lc" %}
 +      Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        <a href="{{ site.lc_site }}">Library Carpentry</a>
        {% endif %}
-       </h4>
      </div>
      <div class="col-md-6" align="right">
-       <h4>
        {% if page.source %}
        {% if page.source == "Rmd" %}
        <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>