Update macvim settings
Merge branch 'master' of github.com:lambdalisue/vim-castle
Update