Use adam greens suggestion to simplify the way the git version string is generated
Merge branch 'upstreamedge' into fix/version-makefile
Merge pull request #174 from wolfmanjm/fix/version-makefile

Fix/version makefile