rpearce: Merging storage_service

Conflicts:
	home/image_builders/grow.rb