Makefile: Allow building ZIP bundles from local directories
Makefile: Get rid of leftover 2.0 directory