improve official matching
Merge branch 'master' of github.com:blackmad/zetashapes
start preparing for overlapping neighborhoods