Skip when image already provided
Merge branch 'master' of github.com:Papiel/hydrater-image

Conflicts:
	test/image.js