Merge pull request #118 from davidkbainbridge/docker-changes

Docker changes