Better regex for Location

Rather than using keywords (which would miss trailing commas) or a
word-based regex, match any location better.

Should match any type of location now.