merge of slides for 2013-04-18 presentation
Merge branch 'master' into barbadoro_dev_branch