Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
	docker/base/Dockerfile

diff --cc docker/README
Simple merge

diff --cc docker/base/Dockerfile
index 38fb78fbc514e2d7df7003e27191b2dd87954fdd,6df048b85b966e0d771430b777930ca3d3e74d35..749b1ef160a581329b5fdb08b9a91aa41aa5ceb7
--- 1/docker/base/Dockerfile
--- 2/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@@ -20,5 -21,4 +21,9 @@@ ENV GEM_HOME /usr/local/rvm/gems/ruby-2
  ENV GEM_PATH /usr/local/rvm/gems/ruby-2.0.0-p247:/usr/local/rvm/gems/ruby-2.0.0-p247@global
  ENV PATH /usr/local/rvm/gems/ruby-2.0.0-p247/bin:/usr/local/rvm/gems/ruby-2.0.0-p247@global/bin:/usr/local/rvm/rubies/ruby-2.0.0-p247/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
  
++# Update gem. This (hopefully) fixes
++# https://github.com/rubygems/rubygems.org/issues/613.
 +RUN gem update --system 
 +
+ ENV DEBIAN_FRONTEND noninteractive
++