Rich's stuff
Merge branch 'master' of https://github.com/swcarpentry/2013-04-az