User model now has location_id and location_name fields
Removed matchee_name field from matches table