Added shp testing, needs more data examples, but we need to wait for paging because of the size of the shp data
Merge branch 'blackwell' of github.com:tdt/core into blackwell