Remove duplicate vim-snippets bundle option
Update some stuff
Merge conflicts