Fix merge conflicts, removed sdlgears because it killed compilation
You can add it back, @four04, I just needed to compile it to make sure I didn't break anything.  Hopefully I didn't.