Added --download_dir command line option, improved operation when
using a download or download cache dir.