Misc changes to support using homebrew-installed vim by default.