added boto support
Merge branch 'master' of https://github.com/bensw/etrescrape

Conflicts:
	scrape.py