ENH callable metrics now work for the hierarchical clustering
FIX the option affinity wasn't used in the hierarchical clustering