Fix filetype snippet to neosnippet
Delete snip.snip
Merge remote-tracking branch 'upstream/master'