Add --keep-files flag; patch from Brian Bloniarz