what I'm running atm
Merge branch 'master' of github.com:SvenDowideit/dockerfiles
move Dockerfile into a Makfile so I can give useful defaults to both build and run