Lighting fixes

Lighting code should merge fine. To actually see the lights, they need to be set. Look in SampleMain to see example of setting positions and colors (w value is radius of light).