Changed the way data is saved to the additionalFormFields and schoolFormData objects.

Changed the way data is saved to the multistep.additionalFormFields and
multistep.schoolFormData objects.  Also, reworked the loops that run
through these objects so they extract the correct data.