I've finished my second-round submission to the Software Carpentry contest.
I'm pretty disappointed with myself for not having had the discipline to work more on it earlier. Owing to this laziness, and in part to catastrophic failure of my laptop (twice!), the latter half of the paper is severely rushed. I would have preferred to include lots more examples and explain things in more detail. I'm annotating the document with Crit to add some of the missing commentary.