We broke freeimage again ohno!  Also, removed a bunch of stray STL dependencies and fixed the makefiles.