got search by location to work, I think
fixed merge conflicts
search with location definitely works, so that's nice
merging pg search