Fixed #6042 -- ModelForms? implementation from Joseph Kocherhans. Still might need a little tweaking as people start to use it, but this is mostly complete.
