Make sure scale is included in the normal matrix

I had built normal matricies withotu scale thinking to keep
the normals as unit normals. But scale has to be included to
get correct normals and now the normals are always normalized in
the fragment shader anyhow so it is all good.  This change fixes
the failing TestParametricFunctions tests.

Change-Id: Ibc27e631de1c41e38258c9b8c9c76b23ac962f42
Merge topic 'fix_normal_matrix' into master

54d1dc20 Make sure scale is included in the normal matrix