merge in changes from bobtfish

Bring the changes we're using in to the Yelp fork