pre-bc commit
Merge branch 'gh-pages' of https://github.com/swcarpentry/2014-04-14-pycon-ngs into gh-pages