replace neocomplcache-snippets-complete with neosnippet
Merge branch 'work'