Attempt to only merge an Org and its Site if there is only one main occupier
Fix Naptan importer lat/lon
Merge branch 'index-shapes' into oxpoints-improvements

* index-shapes:
  Fix Naptan importer lat/lon