Trailing slash no longer breaks zipping
Fix case of empty directories in zip, increment