incomplete progress towards getting filtering right
fixed off-by-one error in daily and weekly, improved detection of visited sites
fix merge conflicts
Merge pull request #358 from mozilla/341_filtering

341 filtering