Fix 4 issues

This PR covers all OS X Mavericks issues that I've recently discovered in my testing on a clean Mavericks install. (And reinstall to test idempotence.)

Here's an install log for the [first install on a clean Mavericks](https://gist.github.com/gohanlon/d0e694667ad5e15cfba1) and a the [second install](https://gist.github.com/gohanlon/2cf6a178831c54e2d484) to show idempotence.
Do we want this to be verbose?