Update for language changes
Merge branch 'master' of https://github.com/mozilla-servo/rust-stb-image

Conflicts:
	image.rs