Tidy up Dockerfile a bit. cut down on number of layers.