refactored extractor data model.  Local only.  Cluster version is not functional
Removed the hitlist from the lookahead
Merge branch 'master' into firefox-addon-fixes