pjenvey Merge pull request #95 from mozilla-services/bug/94-docker