Lots of changes to try and get the village data
Merge remote-tracking branch 'fodaro/master'
Display some not quite yet complete data
Dont just use amenity nodes
Put settlements into one layer, add to control