Add macvim settings
Merge branch 'macvim' into ghc7.8.2