Merge branch 'gh-pages' into library-carpentry

diff --combined bin/lesson_initialize.py
index 71f508e3f652f47ec35e221a4a4d6f51f46a6b1b,e0c2881bf80d35a1a0550ec29b9c497da2d90ad9..bce8323c2f0449edd56edc8c8effecb87e78a0a6
--- 1/bin/lesson_initialize.py
--- 2/bin/lesson_initialize.py
+++ b/bin/lesson_initialize.py
@@@ -175,16 -175,14 +175,16 @@@ ROOT_CONFIG_YML = '''
  # Values for this lesson.
  #------------------------------------------------------------
  
 -# Which carpentry is this ("swc" or "dc")?
 +# Which carpentry is this ("swc", "dc", or "lc")?
  carpentry: "swc"
  
  # Overall title for pages.
  title: "Lesson Title"
  
 -# Contact email address.
 -email: lessons@software-carpentry.org
 +# Contact.  This *must* include the protocol: if it's an email
 +# address, it must look like "mailto:lessons@software-carpentry.org",
 +# or if it's a URL, "https://gitter.im/username/ProjectName".
 +contact: "mailto:lessons@software-carpentry.org"
  
  #------------------------------------------------------------
  # Generic settings (should not need to change).
@@@ -203,7 -201,6 +203,7 @@@ dc_site: "http://datacarpentry.org
  swc_github: "https://github.com/swcarpentry"
  swc_site: "https://software-carpentry.org"
  swc_pages: "https://swcarpentry.github.io"
 +lc_site: "http://datacarpentry.org"
  template_repo: "https://github.com/swcarpentry/styles"
  example_repo: "https://github.com/swcarpentry/lesson-example"
  example_site: "https://swcarpentry.github.com/lesson-example"
@@@ -214,6 -211,7 +214,7 @@@ training_site: "https://swcarpentry.git
  # Surveys.
  pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="
  post_survey: "https://www.surveymonkey.com/r/swc_post_workshop_v1?workshop_id="
+ training_post_survey: "https://www.surveymonkey.com/r/post-instructor-training"
  
  # Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am).
  start_time: 0