Update for 0.6 language changes

This PR updates rust-sdl for the recent language changes, both those in incoming and the ones in my local branch.