no more conflicts with vim bin
Merge branch 'master' of github.com:weldyss/dotfiles