Switch from os.rename to shutil.move to support cross-fs renames when ne...

...eded.

https://rbcommons.com/s/twitter/r/1157/