More brew cask fixes

@rudle @matthewtodd 

I'm not sure this'll be the last of it, but I think this makes things better.