adhere more to best practices

http://crosbymichael.com/dockerfile-best-practices-take-2.html