pull in changes from honza/vim-snippets