Improved feature matching

Should not accept weak matches any more, because it now has a constraint
on the average 2-way rank.