Adding rpy2 commits so I can update without some conflicts against chang...

...es over the weekend