Merge branch 'master' of github.com:JerrySievert/RTree
get some tests working after refactor