Clean up convert_cytokine_annotations in pheatmap; allow user to prevent row cytokine reordering (but don't change defaults)