Updating talk to version 2
Merge branch 'master' into gh-pages