Merge pull request #1 from gvwilson/gh-pages

Getting venue right so that the Software Carpentry website will format properly.
Fixing the country name