Lots of bug fixes, refactoring, etc.
Merge branch 'master' of github.com:drewying/VeraControl

Conflicts:
	VeraController.m
-Cleanup from javaguys merge. (Thank you javaguy!)
-Moved ZWave allocations to device implementation files. (Cleaner code!)
-Removed "Simple" device discover, all device discovery is now "extended"
-Bug fixes in status discovery
-Misc code refactors