Move to python*-r1

This should be all remaining in #60.