Strip ", " separator off end of location string
Collapse separate city & state columns into single "Location" column