work on stage two clustering

Conflicts:
	sheepdog/g6/Player.java
second stage clustering more work
better baseline strategy
improved final stage
more work
final improvements