Geolocate: Fix bug with SPIDER+addtopo, some code cleanup in CoTraining section
Geolocate/CoTrain: Split resolver into base-ranker and cotrain-ranker, for cases (addtopo, weights) where the ranker is used