Point to the correct macvim version.
Some vimrc changes.