More cleanup
Merge pull request #8 from pmorie/docker

More cleanup