Upstream

Only merge crawl.py the other files are a little mesed up.