Modified:   library/Collections/CoalescedGeomData.cpp
Modified:   library/FieldUtils/ProcessModules/ProcessJacobianEnergy.cpp
Modified:   library/MultiRegions/DisContField2D.cpp

- Fix margins / line up vars / remove an unused var.

Modified:   library/LocalRegions/Expansion.cpp

- Remove old commented out line.

Modified:   library/LocalRegions/Expansion.h

- Remove old, commented out lines.

Modified:   library/MultiRegions/ExpList.cpp

- Bring over a fix from the trunk that somehow didn't merge correctly the first time.