Update Makefile to use "docker:GIT_BRANCH" as the generated image name

... for increased versatility

... and other minor Makefile improvements :)

See also #3471 for more discussion on this.