Fixes for windows

Had isses with unlinking before fh.close().
My Python 2.7 didn't like self.retry and self.retry() so I renamed the member var so the script didn't error out when retires were needed.

Downloads from flikr of files with something like "6/2013" weren't cleaned up, so I changed the filename fixes to be much more aggressive.