Much improved handling when zone is not coordinator
Changing zone back to 'family room' to match docs
Fix merge problem