merge snipmate-snippets master in supertab