Rework Dockerfile a bit

Cut out some redundant steps, make more use of Docker primitives like
ADD for downloads.