Update .gitignore post merge w/ scraper.
Merge branch 'master' into scraper

Conflicts:
	.gitignore