machine list
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-pycon-ngs into gh-pages