Restore variable number ordering for SCALAR dofs

Putting them out of order was screwing up FEMContext initialization,
and I'd prefer to make this code less complicated rather than make
that code more complicated.

Hopefully nobody else has hard coded the previous wacky ordering into
their applications...