fix brew for non-brew machines
Add support for MacVim