resolve
merge
rename test files
update the counties example to use new async style rtree
rtree file is all messed up
finish merging rtree off geostore branch