Update vim config
Merge branch 'master' into osx