Make it easier to add more zip exclude files
When creating zip file, don't include udid.mk.  That a templated file
Until we can automatically generate these template files, we need to keep them in git
Merge branch 'master' into move-tests-to-separte-files

Conflicts:
	Makefile