Makefile tweaks for downloading contrib