updated stuff and changed talks
Merge pull request #60 from jared-schmidt/updateAndTalks

updated stuff and changed talks