RF: use new syntax for cosmo_confusion_matrix
ENH: use "safer" comparison by first checking whether values are a vector, then taking the un-vectorized maximum
Merge branch 'master' into cimec2014