Updated/New Composer support for Services_GeoNames

See diff for full changes