Show name for motels, as with hotels (fixes trac 4011)
#204 - Remove large_village
#204 - Remove place=metropolis
#204 - Remove large_town, small_town
Increase text-dy spacing for some shops

This might be the cause of #235 and #232
Change amenity to tourism for chalet
mention shapeindex dependency - mapnik-utils is not installed by default
Display SCALERANK=0 and fix positioning on natural earth layer

SCALERANK=0 is cities like London, Paris, New York, etc. It's wrong to
be showing Denver, Atlanta, etc but not New York, LA, etc.

Fixes #246
Add dy spacing for spring names

Allows their display.

Fixes #253
Merge branch 'motelname' of https://github.com/danstowell/openstreetmap-carto
Merge branch 'remove_large_village' of https://github.com/CloCkWeRX/openstreetmap-carto
Merge branch 'remove_place_metropolis' of https://github.com/CloCkWeRX/openstreetmap-carto
Merge branch 'remove_large_and_small_town' of https://github.com/CloCkWeRX/openstreetmap-carto

Conflicts:
	project.mml
Merge branch 'convenience_spacing' of https://github.com/pnorman/openstreetmap-carto
Merge branch 'amenity_chalet' of https://github.com/pnorman/openstreetmap-carto
Merge branch 'patch-1' of https://github.com/woodpeck/openstreetmap-carto
Merge branch 'natural_earth_dy' of https://github.com/pnorman/openstreetmap-carto
Move the populated places text above all lines and polygons.
Merge branch 'spring_spacing' of https://github.com/pnorman/openstreetmap-carto