Revert "Revert "Merge remote-tracking branch 'origin/remove_sdl1_support'""

This reverts commit 1fae126570a28f2df14f375e74dbf156799b5d53.
Try to make travis use sdl2