Add <div> sections to clean up contact form
Moved grade labels into model

Also switched school parameter to school_id (needed to set school).
Merge pull request #3 from kevinemoore/cleanup-edit-contact

Cleanup edit contact