Maintenance Cleanup
Includes mwerezak's fore solar area changes.
Merge pull request #6255 from PsiOmegaDelta/AreasStage2

Re-arranges Areas - Stage 2