updates to rpy 2.5, need to split this out