setting stuff in makefile for macro expansion, pulling data from git &etc rather than hard coded in the Makefile
testing
fixing make for untagged commits
fixing merge conflict for makefile