Changed regex that picked out city and state; now pulls the entire location, which may or may not be in a city. This also covers locations that are on water bodies. Issue #69