Mac hotfix for texture.cpp

Commented switch in Texture.cpp, added call to rebinde() in
TextureMan.cpp (see FIXME)
Commented out defines.
Merging commits
more merging
Merge coflict.