Revert "Only use admin_levels from ways."

This reverts commit b0842bd7a34d761618d405200778909a09ee1655.

Refs #348 #344

https://github.com/gravitystorm/openstreetmap-carto/pull/348#issuecomment-35800733

If this is making some boundaries disappear, then this clearly
needs a different approach or much more discussion.
Add labels for rendered landuse and leisure polygons
Added nature_reserve, track, pitch
Adjust dy on labels colliding with their symbols
Rename a .16.png that's actually 24x24
Merge pull request #357 from mrwojo/fix-historic-labels

Fix historic labels
Merge branch 'area-labels' of https://github.com/mrwojo/openstreetmap-carto into mrwojo-area-labels
Change the wood text label to fit with other similar labels.