Rewrite

  Following crosbymichael's best-practice recommendations in
  dockerfiles to reduce cruft
Merge branch 'master' of https://github.com/kaernyk/docker

Merge