Fixing broken topN sort due to bad thread co-ordination. Also fixing nested string aggregation.
Merge branch 'master' of github.com:Netflix/Turbine

Conflicts:
	turbine-core/src/main/java/com/netflix/turbine/data/AggDataFromCluster.java