Updates to sdl2 contrib
Revert "Travis: still install SDL1.2, so tile gen utils can use it."

Now that SDL2 is working for and used by tilegen, remove this since it
may interfere with the travis build.

This reverts commit c371c2d767e79df2fc687b535fbff1dcc79ac0ed.
OS X Makefile updates to add missing frameworks