Started work on docker
Some docker fixes
Merge pull request #5 from zsommers/docker

Docker