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

Conflicts:
	builder/bin/boot