Merge pull request #77 from appropriate/minor-docker-cleanups

Minor Docker cleanups