Switched back to using uniforms for light parameters, as using the fixed
function state killed my frame rate.  Also cleaned up some of the location
tracking.
Merge pull request #3197 from ey6es/master

Not sure if everyone sees this or it's just my machine, but the frame rate slowed dramatically using the fixed function state for lights.  This switches back to using uniforms.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #3196 from PhilipRosedale/master

Tweaks to world and avatar lights, add angular acceleration to hair
Multiply local light colors by material diffuse reflectance.
Merge pull request #3198 from ey6es/master

Multiply local light colors by material diffuse reflectance.
Merge branch 'master' of https://github.com/worklist/hifi
add velocity filtering to eyePosition to reduce camera jitter from faceshift
made calculateAverageEyePosition private, changed to getEyePosition() where used outside head