Merge pull request #79 from justinmclean/ApacheConSlides

Resolve issues from merge and update conference dates