One giant-ass commit
Merge pull request #3 from seanot/scraping

One giant-ass commit