Merge Tim's feature/hoodie_integration into Doug's feature/create_proximity_searches