update slides
Merge pull request #83 from purple-martins-2013/presentation-consolidation

update slides