[fix #1] bring in latest changes

diff --combined _includes/lesson_footer.html
index c781a021c10b0f8e3b838dda56998d1c400cd295,e88210ef728b02dc96e627d049fbeee80945e1ad..16cf7d0d39b1be7a995a3a54aac389340cc4d345
--- 1/_includes/lesson_footer.html
--- 2/_includes/lesson_footer.html
+++ b/_includes/lesson_footer.html
@@@ -1,5 -1,5 +1,5 @@@
  {% comment %}
 -  Footer for lesson pages.
 +  Pie de página para las páginas de lecciones.
  {% endcomment %}
  <footer>
    <div class="row">
@@@ -19,19 -19,19 +19,20 @@@
        <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>
 +      <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Editar en GitHub</a>
        {% endif %}
        {% else %}
 -      <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Edit on GitHub</a>
 +      <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Editar en GitHub</a>
        {% endif %}
        /
 -      <a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>
 +      <a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contribuir</a>
        /
 -      <a href="{{ site.github.repository_url }}/">Source</a>
 +      <a href="{{ site.github.repository_url }}/">Fuente</a>
        /
        <a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
        /
-       <a href="{{ site.email }}">Contacto</a>
 -      <a href="mailto:{{ site.email }}">Contact</a>
++
++      <a href="mailto:{{ site.email }}">Contacto</a>
        </h4>
      </div>
    </div>

diff --combined _includes/workshop_footer.html
index b52aac86cd8560e67ee628b203ef60e6e3112a55,bc44f286ad2cf01ee60bf9d32596088564a34f30..e6610e134da3dd49bb3f4170e8855f99387a668f
--- 1/_includes/workshop_footer.html
--- 2/_includes/workshop_footer.html
+++ b/_includes/workshop_footer.html
@@@ -1,11 -1,11 +1,11 @@@
  {% comment %}
 -  Footer for a standard workshop.
 +  Pie de página para un taller estándar.
  {% endcomment %}
  <footer>
    <div class="row">
      <div class="col-md-6" align="left">
        <h4>
-       Copyright &copy; 2016
+       Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        {% if site.carpentry == "swc" %}
        <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
        {% elsif site.carpentry == "dc" %}
@@@ -17,7 -17,7 +17,7 @@@
      </div>
      <div class="col-md-6" align="right">
        <h4>
 -      <a href="mailto:{{ site.email }}">Contact</a>
 +      <a href="mailto:{{ site.email }}">Contacto</a>
        </h4>
      </div>
    </div>