renamed location to user_location and added tweet_location to default co...

...lumns