condor analysis updates
Merge branch 'master' of github.com:zooniverse/reduction

Conflicts:
	experimental/condor/divisiveClustering.py