Merge branch 'develop-ranked-corr' into 'master'

Modification of Corr to accomodate ranked correlation

Could you please make sure I didn't screw this up.

Thx.

@nevensf
@mmenegoz