SDL2 Testing round 2 merge

We're getting pretty close to feature parity with the original SDL target.