Fix python quirk with os.rename sometimes failing

> The operation may fail on some Unix flavors if src and dst are on
> different filesystems

https://docs.python.org/2/library/os.html#os.rename