Remove shapefile tables admin_unit_simplified_global and admin_unit_simplified_tropical by moving their geom columns to admin_unit_global and admin_unit_tropical respectively.
This requires a change to GeoServer configuration - the simplified base layer must be a SQL View rather than accessing a table directly. The SQL View text is "select simplified_geom from admin_unit_global".
Also ordered the admin_units test data, to aid difference comparisons in the future.
Fix tests
Fix index names and duplicated lines
Merge pull request #83 from SEEG-Oxford/147-simplified-shapefiles

Combine simplified and non-simplified shapefile tables