Created an SDL2 branch: removed all SDL1-specific code
Merge head into SDL2
Cleaned up SDL window mode code a bit
Merge branch 'master' into SDL2