WIP
Merge branch 'master' of github.com:alpaca/scrape
WIP and backups