alarm clustering without changing defuse
Merge branch 'master' of https://github.com/skcho/zooberry

Conflicts:
	analyzer/research/newClustering.ml
Merge branch 'master' of https://github.com/skcho/zooberry
Merge branch 'master' of https://github.com/skcho/zooberry
interval clustering
minor
Merge branch 'master' of https://github.com/skcho/zooberry

Conflicts:
	analyzer/research/newClustering.ml
minor fix