Fix upstart dependency being included by accident, + style fixes