avoid calling deploy() for the same service more than once
add debugging for machine_id bug
fix pep8 errors

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>