Update Brewfile, remove Java install (now with brew-cask) and other small fixes.