Ensure that we remove the old file when we rename.
Merge pull request #2 from jaminben/fix-renaming-files

Ensure that we remove the old file when we rename.