Revert "switch to macvim"

This reverts commit 399b7e157d4fbe659317757d813639f1e9c892bf.