PupZip - huge rewrite + added a few more common formats