Using Upstart scripts instead of daemon command. Minor cleanup