Improve consistency between demos and slides
Merge remote-tracking branch 'origin/IowaCodeCamp11'