Fix installation directory for the daemon.
Minor style changes, such as indenting.
Merge branch 'master' into Xcode5-noSign