tuning up clustering based on initial geometry fixes

Conflicts:
	RecoParticleFlow/PFClusterProducer/test/run_display.sh