Updated everything.
Merge branch 'master' of https://github.com/evanye/scraper_factory
Attempted fix for slide2
Merge branch 'master' of https://github.com/evanye/scraper_factory