Replace os.rename with shutil.move to handle cases where the destination is not the same filesystem

This has been Certified: Works on My Machine http://www.codinghorror.com/blog/2007/03/the-works-on-my-machine-certification-program.html

(Which means someone else should try running it)