New "geo" datapoint

In an effort to improve and simplify the JSON response of our API, we are going to merge the "location" and "country" datapoints into a single "geo" node.

To avoid any service destruption the JSON response will contain both the old datapoints and the new one.

Please note, both "location" and "country" datapoints will be removed from the JSON response by Nov 1st in favour of the new "geo".