Touching up Dockerfile and Makefile a bit before tackling hipchat