Only allow zip file prefixes of one directory deep. Partial fix for #118.
Only upgrade branch packages if required and never upgrade the same package twice. Fixes #110.