Blend the normals, too.
Remove option to use Faceshift rig (using the "macaw" model has much the same
result, and it lets other people see it).
Trying a different method of updating the normals.
Revert "Trying a different method of updating the normals."

This reverts commit 8e2be380f61e85ee36b08e2299ce25a080bb8374.
Apply the skin color to the blend face.
Temporarily render the normals for debugging.
Scale the normal contributions down.  For some reason, their magnitudes are
higher than one would expect.
Merge branch 'master' of https://github.com/worklist/hifi into blendface
Let's actually use the variable we initialized.
Merge pull request #974 from ey6es/blendface

Render blended faces as solid and remove the "Use Faceshift Rig" option (which isn't visible to others).