Removed merge conflict droppings and cleaned up a bit of formatting.
Removed merge conflict droppings and cleaned up a bit of formatting.

londoncalling/docker.github.io,thaJeztah/docker.github.io,docker/docker.github.io,thaJeztah/docker.github.io,thaJeztah/docker.github.io,londoncalling/docker.github.io,londoncalling/docker.github.io,thaJeztah/docker.github.io,thaJeztah/docker.github.io,docker/docker.github.io,docker/docker.github.io,docker/docker.github.io,londoncalling/docker.github.io,docker/docker.github.io,londoncalling/docker.github.io