Merge branch 'master' into 2221-complete-docker

Conflicts:
	doc/user/topics/tutorial-job-debug.html.textile.liquid
	doc/user/tutorials/tutorial-keep.html.textile.liquid

diff --cc doc/install/client.html.textile.liquid
Simple merge

diff --cc doc/user/topics/tutorial-job-debug.html.textile.liquid
index 3a3cbace550f7fe85b75b144a0fa8d65b07b13d1,0974e51697031449259f89221e4a0dc18e81658c..a28a793d47df725cec8e1d529dd8cf7960da2810
--- 1/doc/user/tutorials/tutorial-job-debug.html.textile.liquid
--- 2/doc/user/topics/tutorial-job-debug.html.textile.liquid
+++ b/doc/user/topics/tutorial-job-debug.html.textile.liquid
@@@ -109,8 -105,8 +105,8 @@@ EOF</span
  2013-12-12_21:56:59 qr1hi-8i9sb-79260ykfew5trzl 31578  check slurm allocation
  2013-12-12_21:56:59 qr1hi-8i9sb-79260ykfew5trzl 31578  node localhost - 1 slots
  2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  start
 -2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  script hello-world.py
 +2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  script hello-world-fixed.py
- 2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  script_version /home/you/you
+ 2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  script_version /home/<b>you</b>/<b>you</b>
  2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  script_parameters {}
  2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  runtime_constraints {"max_tasks_per_node":0}
  2013-12-12_21:57:00 qr1hi-8i9sb-79260ykfew5trzl 31578  start level 0