Fix Jacobian cases for wedge and pyramid

When the implementation for the cell derivative functions was made, the special cases for creating the Jacobian for wedge and pyramid cell shapes was not working. Instead, it just used the hexahedra case for a degenerate cell. This fixes the issues with the special cases.

There were multiple issues to be fixed. There were some complaints by the compiler about types. There was a mistake in the pyramid table. But the biggest issue was a problem with macro expansions. It was the classic tale of forgetting that you have to encase parameters in parenthesis to make sure that operator precedence comes out as expected.