childcare amenity

Added childcare amenity tag. Removed conflicting terms in kindergarten tag.
Merge pull request #1630 from awright/master

childcare amenity