Use Rserve directly installed from CRAN instead of APT package
Allow choice of Rserve installations, including Github versions
Merge branch 'rserve_test'