Replaces request with jsdom for site scraping
Merge branch 'master' into email-alerts

Conflicts:
	package.json