Add an interpolator that weighs by th correlation function.
Merge branch 'master' into corrfun
Merge branch 'corrfun'