Fixes for windows.

Had usses with unlink before fh.close().
My Python 2.7 didn't like self.retry and self.retry() so renamed the member var
Downloads from flikr of file names with something like 6/2013 weren't cleaned up, so the filename fixes are now much more agressive.