Merge core to avoid warning when check gh-pages

~~~
$ python tools/check
WARNING:root:In /home/raniere/software-carpentry/lesson-template/motivation.md: Unrecognized label in header section: subtitle
WARNING:root:Some errors were encountered during validation. See log for details.
~~~