more changes to Makefile and packaging, updating to pull more data from git