Add pyRserve
Resolve merge conflicts