Fixes presentation and presenter templates so they're legible at all.
Merge branch 'presentation-speaker-templates' into pyconca2013