Updated neighborhood names
Updated grammar
Fix typo
Merge branch 'names'

Conflicts:
	www/js/map/map.tpl.html