cleanup in effect
Fixes the good_device_id branching
Merge pull request #60 from mpath/py26_compat

Py26 compat
Merge pull request #61 from mpath/endpoint_stuff

Endpoint stuff