Fix compilation with rust 0.6
Removed FIXME in sdl.rc
Made play nice with existing pull requests