Make Ad Targeting Consistent

This change:
* sets video ads to use the same targeting as standard ads
* Adds Audience Science Gateway segment targeting
* Adds Criteo segment targeting