Added vim-sneak; solve conflict with vim-yankstack