add @smathermather lightning talk
Merge branch 'master' of https://github.com/skorasaurus/sotmus2014 into gh-pages
update html