Added map from hpath/hid to greek god names; changed autolabeling to use short names
Merge branch 'master' into dev-subrad (named halos)

Conflicts:
	caterpillaranalysis.py