Use macvim in CLI mode instead of regular vim
Merge