Re-checking in everything to gh-pages to try to get it to update (arghh)
Merge branch 'master' of github.com:poshaughnessy/good-to-be-a-geek-talk into gh-pages