Merge branch '2221-complete-docker' (closes #2325, closes #2221)

Conflicts:
	.gitignore

diff --cc .gitignore
index 4fe6ac8b19ef4c2b97c8994913a403e05578895d,f27930edc8e21749c176acd1c3e4d4dbc5f794bb..8cf65b56b86c6726fefa74bf280d0c2b1c089563
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,5 -2,10 +2,9 @@@
  *.pyc
  docker/*/generated/*
  docker/config.yml
 -doc/_site/*
  doc/.site/*
  doc/sdk/python/arvados
+ sdk/perl/MYMETA.*
+ sdk/perl/Makefile
+ sdk/perl/blib/*
+ sdk/perl/pm_to_blib

diff --cc doc/user/topics/tutorial-job-debug.html.textile.liquid
Simple merge

diff --cc sdk/cli/bin/crunch-job
Simple merge