Refined Clustering Algorithm, fixes Mysterious Cluster Disappearance.

Also switched drawing of markers to a single draw class to remove
repeated code.
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Plus small updates