Samplereturn modernization

Apparently I don't have write access to the cdist repo, so here's a pull request! This rolls up to the latest and greatest cdist and fixes the ros version.