lint and add proxy, webdriver
update requirements
Merge branch 'master' of https://github.com/titanjer/scraper

Conflicts:
	scraper/local_settings_example.py