Merge branch 'htmlimprove' into html2
Merge pull request #67 from scraperwiki/html2

Improvements to HTML parsing
Build 156 failed due to 2.6 not supporting dict comprehensions - hopefully fixed
Merge remote-tracking branch 'upstream/master'