# This is a combination of 2 commits.
# The first commit's message is:

Add pyvideo spider

# This is the 2nd commit message:

add conference to spiders
Merge pull request #15 from shane42/master

pyvideo spider and conference names