Clean up repo to include GIS and get rid of unpublished stuff
fix merge