Add a --filtering flag and make no filtering the default
Remove --filtering and --no-filtering from the help text
Merge branch 'upstream-filtering' into apnic