Added some test data and added shapefile reader
Fixed a numbe of things - still working on shapefile