Added rendering of Neighbourhood Place names, at same level as Hamlet
Merge branch 'neighbourhood2' of https://github.com/chrisfleming/openstreetmap-carto into chrisfleming-neighbourhood2

Conflicts:
	project.mml