Remove unused shader state code from tr_local.h
Remove vertexLightmap from textureBundle_t, it's never qtrue
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/renderergl1/tr_shade.c