minor changes to interface with cathrin's r-tree
Revert "minor changes to interface with cathrin's r-tree"

This reverts commit 17273094ac222923dc99d3148641aeba78962062.
Attempting to solve detached head problem
Revert "minor changes to interface with cathrin's r-tree"

This reverts commit 17273094ac222923dc99d3148641aeba78962062.
Merge branch 'deadhead'