Several Makefile tweaks
<SERVICE> and <CONTAINER> now seperate variables that can be different if required.
Merge branch 'master' of github.com:flungo/docker-init-script