Changed room watcher to return standard room rather than just room name.
Updated volume controller to handle volume devices coming and going in a
room. This makes the class generally more useful.