Fix log path for real this time
Fix upstart script to work with both package and tarball based installs