Added macvim to cask installations
Updated git configuration to use mvim and diffmerge as diff tools