update celluloid
correct a spec
Merge branch 'master' into features/docker-cpusets

Conflicts:
	spec/config_spec.rb