not sure if this merge is going to work ...
Merge branch 'master' of https://github.com/thequbit/BarkingOwl

Conflicts:
	barking_owl/scraper/scraper.py