Refactor saveContext
Update ContactsViewController as relationships are synced
Cleanup commented-out code