Uncommitted changes from 2012.
Merge branch 'master' of github.com:sgillies/lawdi-presentation