Fixup
Merge branch 'master' of github.com:dandavison/scraper

Conflicts:
	js/scrape.coffee