Sdl2

Merged this branch with the 1.0.0 release in master.