John/marker clustering

Adds the default marker clustering logic. Does *not* include cluster-marker scaling, which will be added in my next branch.