Import
Merge branch 'master' of https://github.com/andrewcstewart/galaxy-docker