Merge pull request #7 from pmorie/docker

Cleanup
More cleanup