Clean up the TinderboxScraper and fix #103

Hopefully this makes the code a little more readable. This pull replaces #111 (sorry to hijack your pull @Nebelhom)