added adaptive thresholding
added options to clusterPhase.py
Merge branch 'shapeDesc' into debug