Merge pull request #1062 from bridgetkromhout/master

Adding video to Dan Slimmon's talk.