Some fixes.
Merge https://github.com/Homebrew/homebrew-science