More accurate matcher for Vignette URLs

Merging this now because we've got 404s in production.