...
Merge branch 'master' of https://github.com/jack-w/vim-settings