More fixes and general cleanup.  Add more fine-grained control over what is fetched and what is actually unpacked.
More fixes and general cleanup.  Add more fine-grained control over what
is fetched and what is actually unpacked.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase