Use consistent coding style and fix upstart

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>