Add --dirty=+ to the Makefile version tag

Also update the Makefile slightly to remove broken targets.