make sure equality uses eq for now
refactor scope resolution to create fewer blocks and treat binding groups more uniformly
Merge branch 'master' into ref
initial insufficient implementation of graph -- what to do with multiple/zero annotations