Minor changes

Ooh, just remembered something.  An upstart restart does not necessarily mean that the upstart conf is re-read.  For all I know this has been fixed in 14.04, but that was one of the biggest reasons why I stopped using restart during deploys.