Merge SDL2 branch

Since I've allowed the source to still compile using SDL1.2, I'm merging this branch. Also, I guess I don't understand the use of branches fully, because I'm wanting to make changes to the master branch, but Github for Windows is giving me some grief.