Docker integration updates
Resolved merge conflicts
Merge pull request #12 from kartoza/docker

Docker integration updates