Further cleanup
Merge pull request #64 from scraperwiki/cleanup

Further cleanup