feat(builder) allow custom slugbuilder and slugrunner images
Merge branch 'builder_custom_images' of https://github.com/soficom/deis into builder_custom_images

Conflicts:
	builder/bin/boot