add pxd files to version 1
fix merge conflicts
finish ball tree v2