Configuration for annotation clustering

Enable or disable clustering, on by default. Should resolve #854