Fixed issue with removing and then readding a caregiver to a child
Removed pending unit test for remove and readd.  Its in the children spec.
Fixed edit caregiver issue.