Added --working-directory to unittest; bug fixes
Fixing for archive contents that have spaces in the filename
Initial commit of cleaned-up dev branch