Increase number of results for Yahoo and GeoNames

Also set GeoNames language to en
Add country to results to help identify common places
Use unused centroid element to get long/lat in yahoo
Tidy up formatting