Updated to match SDL2 updates
Merge pull request #68 from AngryLawyer/update-to-latest-sdl2

Updated to match SDL2 updates