Mid-swing on porting to SDL2.0.  2.0 is where we want to be in the long run, easier to make the switch now.
Clean up in the make file.