Added deactivating texture units

This was allowing untexture renderable to
be textured via the last active texture.

Fixed minor build issues.
Fixed a memory issue by using assign instead of insert on a vector