add marker clustering (refs #3)
merging conflicts