Merge branch 'master' into agent_future

Conflicts:
	cloudeebus/cloudeebus.js
	cloudeebus/cloudeebus.py
	setup.py

diff --cc TODO
index a3f4fd3,14f47b1..975ac47
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -10,12 -10,7 +10,6 @@@ Proxy object properties
  - support cloning proxies so that introspection is called only once per object type.
  
  
- API style:
- ----------
- - use "Promises" pattern for asynchronous APIs 
- - force JSON description of numbers as floats when needed 
- 
- 
  DBus service support:
  ---------------------
 -- support publishing a DBus service
  - support sending signals

diff --cc cloudeebus/cloudeebus.js
Simple merge