Homebrew install edits (rebased onto dev_5_0)



This is the same as gh-709 but rebased onto dev_5_0.

----

A couple of minor improvements to hopefully catch the mistakes that I made with my recent install attempt.