Make yelp optional everywhere. Fix namcap errors.