Use honza/snipmate-snippets refs #36
Merge branch 'develop'