Ensuring the locality/localityname classes do not collide.
Adding tests to ensure class names for locality/localityname do not clash.
Merge pull request #10 from asmallwebfirm/fix-missing-city

Fix missing localityname (city) field in some situations.