Update for language changes
Merge branch 'language-changes' of git://github.com/pcwalton/rust-sdl into pcwalton-language-changes

Conflicts:
	src/audio.rs
	src/mouse.rs
	src/video.rs