Apply dockerfile best practices [http://docs.docker.com/articles/dockerfile_best-practices/]
Merge branch 'master' of github.com:parikhkc/docker