Use 'mvim -v' for 'vim' on mac
Merge branch 'master' of https://github.com/ellis/prezto