Merge my Puppetfile.tmbundle
Use longer tab triggers for snippets
Clean up snippets