Merge branch 'master' of github.com:moiatgit/vim-config