Added controller locator functions to VeraController class
removed duplicate functionality and fixed conflicts
Added room property to ZWaveNode
Added scene support
Merge pull request #2 from javaguy/master

Scene support, and misc updates