Replace files from the same datastream rather than renaming
Avoid notice of unset value
Big clean up, few bug fixes snuck in
Removed unneeded todo
Merge pull request #4 from mitchmac/master

Cleanup and bug fixes