Keep MacVim from crashing
Merge branch 'master' of https://github.com/telemachus/dotfiles